Merge remote-tracking branch 'upstream/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: to sort
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari] and version [e.g. 22]
+-  Ruby version [e.g. 2.6.3]
+
+**Additional context**
+Add any other context about the problem here.

.gitignore

@@ -1,4 +1,8 @@
+.DS_Store
+
 _site
 .sass-cache
+.jekyll-cache
 .jekyll-metadata
+
 Gemfile.lock

.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
-rvm:
+script:
-- 2.3.3
+  - gem install jekyll bundler
-
+  - bundle install
-install: gem install jekyll
+  - bundle exec rake test
-script: jekyll build
+  - bundle exec jekyll build
-
+cache: bundler
-sudo: false
-exclude: [vendor]

README.md

@@ -11,10 +11,10 @@ Jekyll theme based on [Freelancer bootstrap theme ](http://startbootstrap.com/te
 ---
 layout: default
 modal-id: 1
-date: 2014-07-18
+date: 2020-01-18
 img: cabin.png
 alt: image-alt
-project-date: July 2014
+project-date: January 2020
 client: The Client
 category: Web Development
 description: The description of the project
@@ -23,7 +23,7 @@ description: The description of the project
 ```
 
 ## Demo
-View this jekyll theme in action [here](https://jeromelachaud.github.io/freelancer-theme)
+View this jekyll theme in action [here](https://jeromelachaud.com/freelancer-theme)
 
 ## Screenshot
 ![screenshot](https://raw.githubusercontent.com/jeromelachaud/freelancer-theme/master/screenshot.png)

Rakefile

@@ -0,0 +1,7 @@
+require 'html-proofer'
+
+task :test do
+  sh "bundle exec jekyll build"
+  options = { :assume_extension => true, :only_4xx => true, :allow_hash_href => true}
+  HTMLProofer.check_directory("./_site", options).run
+end

_config.yml

@@ -1,7 +1,7 @@
 # Site settings
 title: Freelancer
 email: your-email@domain.com
-url: https://example.github.io
+url: https://github.com/jeromelachaud/freelancer-theme
 description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
 keywords: "your keywords, separated by commas"
 skills: "Web Developer - Graphic Artist - User Experience Designer"
@@ -61,3 +61,11 @@ credits: 'Freelancer is a free to use, open source Bootstrap theme created by <a
 # Build settings
 markdown: kramdown
 permalink: pretty
+
+#for posts
+defaults:
+  - scope:
+      path: ""
+      type: "posts"
+    values:
+      permalink: ""

_includes/header.html

@@ -1,15 +1,15 @@
-    <!-- Header -->
+<!-- Header -->
-    <header>
+<header>
-        <div class="container">
+  <div class="container">
-            <div class="row">
+    <div class="row">
-                <div class="col-lg-12">
+      <div class="col-lg-12">
-                    <img class="img-responsive" src="img/profile.png" alt="">
+        <img class="img-responsive" src="img/profile.png" alt="profile-pic" />
-                    <div class="intro-text">
+        <div class="intro-text">
-                        <span class="name">{{ site.title }}</span>
+          <span class="name">{{ site.title }}</span>
-                        <hr class="star-light">
+          <hr class="star-light" />
-                        <span class="skills">{{ site.skills }}</span>
+          <span class="skills">{{ site.skills }}</span>
-                    </div>
-                </div>
-            </div>
         </div>
-    </header>
+      </div>
+    </div>
+  </div>
+</header>

_posts/2014-07-13-project-6.markdown

@@ -7,6 +7,5 @@ alt: image-alt
 project-date: April 2014
 client: Start Bootstrap
 category: Web Development
-description: Use this area of the page to describe your project. The icon above is part of a free icon set by <a href="https://sellfy.com/p/8Q9P/jV3VZ/">Flat Icons</a>. On their website, you can download their free set with 16 icons, or you can purchase the entire set with 146 icons for only $12!
+description: Use this area of the page to describe your project. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia neque assumenda ipsam nihil, molestias magnam, recusandae quos quis inventore quisquam velit asperiores, vitae? Reprehenderit soluta, eos quod consequuntur itaque. Nam.
-
 ---

_posts/2014-07-14-project-5.markdown

@@ -7,6 +7,5 @@ alt: image-alt
 project-date: April 2014
 client: Start Bootstrap
 category: Web Development
-description: Use this area of the page to describe your project. The icon above is part of a free icon set by <a href="https://sellfy.com/p/8Q9P/jV3VZ/">Flat Icons</a>. On their website, you can download their free set with 16 icons, or you can purchase the entire set with 146 icons for only $12!
+description: Use this area of the page to describe your project. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia neque assumenda ipsam nihil, molestias magnam, recusandae quos quis inventore quisquam velit asperiores, vitae? Reprehenderit soluta, eos quod consequuntur itaque. Nam.
-
 ---

_posts/2014-07-15-project-4.markdown

@@ -7,6 +7,5 @@ alt: image-alt
 project-date: April 2014
 client: Start Bootstrap
 category: Web Development
-description: Use this area of the page to describe your project. The icon above is part of a free icon set by <a href="https://sellfy.com/p/8Q9P/jV3VZ/">Flat Icons</a>. On their website, you can download their free set with 16 icons, or you can purchase the entire set with 146 icons for only $12!
+description: Use this area of the page to describe your project. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia neque assumenda ipsam nihil, molestias magnam, recusandae quos quis inventore quisquam velit asperiores, vitae? Reprehenderit soluta, eos quod consequuntur itaque. Nam.
-
 ---

_posts/2014-07-16-project-3.markdown

@@ -7,6 +7,5 @@ alt: image-alt
 project-date: April 2014
 client: Start Bootstrap
 category: Web Development
-description: Use this area of the page to describe your project. The icon above is part of a free icon set by <a href="https://sellfy.com/p/8Q9P/jV3VZ/">Flat Icons</a>. On their website, you can download their free set with 16 icons, or you can purchase the entire set with 146 icons for only $12!
+description: Use this area of the page to describe your project. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia neque assumenda ipsam nihil, molestias magnam, recusandae quos quis inventore quisquam velit asperiores, vitae? Reprehenderit soluta, eos quod consequuntur itaque. Nam.
-
 ---

_posts/2014-07-17-project-2.markdown

@@ -7,6 +7,5 @@ alt: image-alt
 project-date: April 2014
 client: Start Bootstrap
 category: Web Development
-description: Use this area of the page to describe your project. The icon above is part of a free icon set by <a href="https://sellfy.com/p/8Q9P/jV3VZ/">Flat Icons</a>. On their website, you can download their free set with 16 icons, or you can purchase the entire set with 146 icons for only $12!
+description: Use this area of the page to describe your project. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia neque assumenda ipsam nihil, molestias magnam, recusandae quos quis inventore quisquam velit asperiores, vitae? Reprehenderit soluta, eos quod consequuntur itaque. Nam.
-
 ---

_posts/2014-07-18-project-1.markdown

@@ -7,6 +7,5 @@ alt: image-alt
 project-date: April 2014
 client: Start Bootstrap
 category: Web Development
-description: Use this area of the page to describe your project. The icon above is part of a free icon set by <a href="https://sellfy.com/p/8Q9P/jV3VZ/">Flat Icons</a>. On their website, you can download their free set with 16 icons, or you can purchase the entire set with 146 icons for only $12!
+description: Use this area of the page to describe your project. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia neque assumenda ipsam nihil, molestias magnam, recusandae quos quis inventore quisquam velit asperiores, vitae? Reprehenderit soluta, eos quod consequuntur itaque. Nam.
-
 ---

freelancer-theme-jekyll.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                    = "freelancer-theme-jekyll"
-  spec.version                 = "1.0.0"
+  spec.version                 = "1.0.1"
   spec.authors                 = ["Start Bootstrap"]
 
   spec.summary                 = %q{Freelancer is a one page Bootstrap portfolio theme for freelancers.}
@@ -15,14 +15,15 @@ Gem::Specification.new do |spec|
     f.match(%r{^(assets|_(includes|layouts|posts)/|(LICENSE|README)((\.(txt|md|markdown)|$)))}i)
   end
 
-  spec.add_runtime_dependency "jekyll", "~> 3.6"
+  spec.add_runtime_dependency "jekyll", "~> 4.0"
   spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
-  spec.add_runtime_dependency "jekyll-sitemap", "~> 1.1"
+  spec.add_runtime_dependency "jekyll-sitemap", "~> 1.3"
-  spec.add_runtime_dependency "jekyll-gist", "~> 1.4"
+  spec.add_runtime_dependency "jekyll-gist", "~> 1.5"
-  spec.add_runtime_dependency "jekyll-feed", "~> 0.9.2"
+  spec.add_runtime_dependency "jekyll-feed", "~> 0.12"
-  spec.add_runtime_dependency "jekyll-data", "~> 1.0"
+  spec.add_runtime_dependency "jekyll-data", "~> 1.1"
-  spec.add_runtime_dependency "jemoji", "~> 0.8"
+  spec.add_runtime_dependency "jemoji", "~> 0.11"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
-end
+  spec.add_development_dependency "html-proofer", "~> 3.15"
+end

mail/contact_me.php

@@ -20,13 +20,16 @@ if ($email_address === FALSE) {
 $phone = $_POST['phone'];
 $message = $_POST['message'];
 
-
+if (empty($_POST['_gotcha'])) { // If hidden field was filled out (by spambots) don't send!
-// Create the email and send the message
+    // Create the email and send the message
-$to = 'yourname@yourdomain.com'; // Add your email address inbetween the '' replacing yourname@yourdomain.com - This is where the form will send a message to.
+    $to = 'yourname@yourdomain.com'; // Add your email address inbetween the '' replacing yourname@yourdomain.com - This is where the form will send a message to.
-$email_subject = "Website Contact Form:  $name";
+    $email_subject = "Website Contact Form:  $name";
-$email_body = "You have received a new message from your website contact form.\n\n"."Here are the details:\n\nName: $name\n\nEmail: $email_address\n\nPhone: $phone\n\nMessage:\n$message";
+    $email_body = "You have received a new message from your website contact form.\n\n"."Here are the details:\n\nName: $name\n\nEmail: $email_address\n\nPhone: $phone\n\nMessage:\n$message";
-$headers = "From: noreply@yourdomain.com\n"; // This is the email address the generated message will be from. We recommend using something like noreply@yourdomain.com.
+    $headers = "From: noreply@yourdomain.com\n"; // This is the email address the generated message will be from. We recommend using something like noreply@yourdomain.com.
-$headers .= "Reply-To: $email_address";
+    $headers .= "Reply-To: $email_address";
-mail($to,$email_subject,$email_body,$headers);
+    mail($to,$email_subject,$email_body,$headers);
-return true;
+    return true;
+}
+echo "Gotcha, spambot!";
+return false;
 ?>