From eb0dba8cfaee018b9054f62fa784fa5acd4011f6 Mon Sep 17 00:00:00 2001 From: Matthew Obert Date: Mon, 8 Jul 2019 10:19:59 -0400 Subject: [PATCH 01/19] Accessibility fix for form input labels I ran the Tota11y plugin and it generated "Input is missing a label" warnings. This is a quick fix. --- _includes/contact.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_includes/contact.html b/_includes/contact.html index bbd0c9a..7963348 100644 --- a/_includes/contact.html +++ b/_includes/contact.html @@ -14,28 +14,28 @@
- +

- +

- +

- +

@@ -51,4 +51,4 @@
- \ No newline at end of file + From e921d9f116a2a16a0885c63ce2d673cdae66fcc7 Mon Sep 17 00:00:00 2001 From: Matthew Obert Date: Mon, 8 Jul 2019 10:26:44 -0400 Subject: [PATCH 02/19] Another accessibility fix Same as the last one: https://github.com/jeromelachaud/freelancer-theme/pull/99 --- _includes/contact_static.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/contact_static.html b/_includes/contact_static.html index 1170bfb..3713212 100644 --- a/_includes/contact_static.html +++ b/_includes/contact_static.html @@ -12,14 +12,14 @@
- +

- +

@@ -30,7 +30,7 @@
- +

From 93bcd7c05ab6c47612c73dbced5cfe41ece6fcd9 Mon Sep 17 00:00:00 2001 From: Julian Gentges Date: Thu, 10 Oct 2019 21:22:48 +0200 Subject: [PATCH 03/19] added '.DS_Store' --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 666de10..235bffd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store _site .sass-cache .jekyll-metadata From fb3ca41fc6d4ea176ea2f6b76822567fa49a59ca Mon Sep 17 00:00:00 2001 From: Julian Gentges Date: Thu, 10 Oct 2019 21:30:29 +0200 Subject: [PATCH 04/19] added '.jekyll-cache' --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 235bffd..81248f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ .DS_Store + _site .sass-cache +.jekyll-cache .jekyll-metadata + Gemfile.lock From e361649d939ebf4da40964a65a7c81e66632d809 Mon Sep 17 00:00:00 2001 From: Julian Gentges Date: Thu, 10 Oct 2019 21:31:28 +0200 Subject: [PATCH 05/19] updated '.gemspec' --- freelancer-theme-jekyll.gemspec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/freelancer-theme-jekyll.gemspec b/freelancer-theme-jekyll.gemspec index a07be6c..6dbe4a9 100644 --- a/freelancer-theme-jekyll.gemspec +++ b/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,14 @@ 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-gist", "~> 1.4" - spec.add_runtime_dependency "jekyll-feed", "~> 0.9.2" - spec.add_runtime_dependency "jekyll-data", "~> 1.0" - spec.add_runtime_dependency "jemoji", "~> 0.8" + spec.add_runtime_dependency "jekyll-sitemap", "~> 1.3" + spec.add_runtime_dependency "jekyll-gist", "~> 1.5" + spec.add_runtime_dependency "jekyll-feed", "~> 0.12" + spec.add_runtime_dependency "jekyll-data", "~> 1.1" + spec.add_runtime_dependency "jemoji", "~> 0.11" - spec.add_development_dependency "bundler", "~> 1.12" - spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "bundler", "~> 2.0" + spec.add_development_dependency "rake", "~> 13.0" end From 06a8503d2edb395c80af6177257a097ea272b10c Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:47:12 +0200 Subject: [PATCH 06/19] Remove deprecated travis settings --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87bb86f..97cf261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,3 @@ rvm: install: gem install jekyll script: jekyll build - -sudo: false -exclude: [vendor] From 48c722b002ece950bca2cedc397b0baf0b2b2a73 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:48:14 +0200 Subject: [PATCH 07/19] Use Travis default rvm --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97cf261..9205aba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ language: ruby -rvm: -- 2.3.3 install: gem install jekyll script: jekyll build From 59e8bfdf03301243508b691f811bc5017d586793 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:53:12 +0200 Subject: [PATCH 08/19] Try using bundler directly --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9205aba..97b5514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ language: ruby - -install: gem install jekyll -script: jekyll build +install: gem install jekyll bundler +script: bundle exec jekyll build From 94c330f212ae09ef8a30ee17eaf162cfa0d32845 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 10:55:26 +0200 Subject: [PATCH 09/19] Cache bundler on Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 97b5514..fc19138 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ language: ruby install: gem install jekyll bundler script: bundle exec jekyll build +cache: bundler From 71aafdad089faea063613386a36f6b36f8413213 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:03:07 +0200 Subject: [PATCH 10/19] Try bundle install --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc19138..9c427db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: ruby install: gem install jekyll bundler -script: bundle exec jekyll build +script: + - bundle install + - bundle exec jekyll build cache: bundler From fcdb484624a6cad796f4b085a4942e7b1d37c39c Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:06:53 +0200 Subject: [PATCH 11/19] Move installation within script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c427db..6ce4b3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby -install: gem install jekyll bundler script: + - gem install jekyll bundler - bundle install - bundle exec jekyll build cache: bundler From 5b04523de359a5407ddf6a9c27618de514ca7395 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:33:26 +0200 Subject: [PATCH 12/19] Update bundler requirement --- freelancer-theme-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freelancer-theme-jekyll.gemspec b/freelancer-theme-jekyll.gemspec index a07be6c..972a44f 100644 --- a/freelancer-theme-jekyll.gemspec +++ b/freelancer-theme-jekyll.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll-data", "~> 1.0" spec.add_runtime_dependency "jemoji", "~> 0.8" - spec.add_development_dependency "bundler", "~> 1.12" + spec.add_development_dependency "bundler", "~> 2.0.2" spec.add_development_dependency "rake", "~> 10.0" end From 34eb081c97bf57dc288e6108e5ebdb14824e59c9 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 19 Oct 2019 11:37:25 +0200 Subject: [PATCH 13/19] require any bundler newer than the original one --- freelancer-theme-jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freelancer-theme-jekyll.gemspec b/freelancer-theme-jekyll.gemspec index 972a44f..daac1c8 100644 --- a/freelancer-theme-jekyll.gemspec +++ b/freelancer-theme-jekyll.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll-data", "~> 1.0" spec.add_runtime_dependency "jemoji", "~> 0.8" - spec.add_development_dependency "bundler", "~> 2.0.2" + spec.add_development_dependency "bundler", ">= 1.12" spec.add_development_dependency "rake", "~> 10.0" end From d85839854a8e127b0a9acc415398eb52d852fd5f Mon Sep 17 00:00:00 2001 From: Matthew Obert Date: Tue, 26 Nov 2019 09:36:53 -0500 Subject: [PATCH 14/19] Disable form mail if spambot fills hidden field --- mail/contact_me.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mail/contact_me.php b/mail/contact_me.php index b231ed7..05170c0 100755 --- a/mail/contact_me.php +++ b/mail/contact_me.php @@ -20,13 +20,16 @@ if ($email_address === FALSE) { $phone = $_POST['phone']; $message = $_POST['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. -$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"; -$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"; -mail($to,$email_subject,$email_body,$headers); -return true; +if (empty($_POST['_gotcha'])) { // If hidden field was filled out (by spambots) don't send! + // 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. + $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"; + $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"; + mail($to,$email_subject,$email_body,$headers); + return true; +} +echo "Gotcha, spambot!"; +return false; ?> From cdfb8769c61353d9b74baa5005f44dc5cc725bf0 Mon Sep 17 00:00:00 2001 From: Jerome Lachaud Date: Mon, 27 Jan 2020 14:45:25 +0100 Subject: [PATCH 15/19] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..a6271ba --- /dev/null +++ b/.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. From 334d9de215483bcb6ddbf3094d76d385e59c2154 Mon Sep 17 00:00:00 2001 From: Jerome Lachaud Date: Mon, 27 Jan 2020 14:52:59 +0100 Subject: [PATCH 16/19] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c2aa387..f09c0ce 100644 --- a/README.md +++ b/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) From df6f86b61123501c45526af1685f541c9b6aec9d Mon Sep 17 00:00:00 2001 From: Jerome Lachaud Date: Wed, 8 Apr 2020 15:16:42 +0200 Subject: [PATCH 17/19] Prevent project files from being generated --- _config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_config.yml b/_config.yml index a5d9f62..9491fb9 100644 --- a/_config.yml +++ b/_config.yml @@ -61,3 +61,11 @@ credits: 'Freelancer is a free to use, open source Bootstrap theme created by Date: Wed, 8 Apr 2020 15:21:12 +0200 Subject: [PATCH 18/19] Add html-proofer script and related fixes --- Rakefile | 7 +++++++ _config.yml | 2 +- _includes/header.html | 28 ++++++++++++++-------------- _posts/2014-07-13-project-6.markdown | 3 +-- _posts/2014-07-14-project-5.markdown | 3 +-- _posts/2014-07-15-project-4.markdown | 3 +-- _posts/2014-07-16-project-3.markdown | 3 +-- _posts/2014-07-17-project-2.markdown | 3 +-- _posts/2014-07-18-project-1.markdown | 3 +-- freelancer-theme-jekyll.gemspec | 1 + 10 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 Rakefile diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..a87e531 --- /dev/null +++ b/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 diff --git a/_config.yml b/_config.yml index 9491fb9..25f5657 100644 --- a/_config.yml +++ b/_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" diff --git a/_includes/header.html b/_includes/header.html index fff0d73..4634c9a 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,15 +1,15 @@ - -
-
-
-
- -
- {{ site.title }} -
- {{ site.skills }} -
-
-
+ +
+
+
+
+ profile-pic +
+ {{ site.title }} +
+ {{ site.skills }}
-
\ No newline at end of file +
+
+ + diff --git a/_posts/2014-07-13-project-6.markdown b/_posts/2014-07-13-project-6.markdown index 645d4df..46cd737 100644 --- a/_posts/2014-07-13-project-6.markdown +++ b/_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 Flat Icons. 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. --- diff --git a/_posts/2014-07-14-project-5.markdown b/_posts/2014-07-14-project-5.markdown index 5ba85c4..dbb445e 100644 --- a/_posts/2014-07-14-project-5.markdown +++ b/_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 Flat Icons. 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. --- diff --git a/_posts/2014-07-15-project-4.markdown b/_posts/2014-07-15-project-4.markdown index d4763b3..a9fe86e 100644 --- a/_posts/2014-07-15-project-4.markdown +++ b/_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 Flat Icons. 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. --- diff --git a/_posts/2014-07-16-project-3.markdown b/_posts/2014-07-16-project-3.markdown index 1d92a61..d04c886 100644 --- a/_posts/2014-07-16-project-3.markdown +++ b/_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 Flat Icons. 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. --- diff --git a/_posts/2014-07-17-project-2.markdown b/_posts/2014-07-17-project-2.markdown index f4d71dc..3e3f622 100644 --- a/_posts/2014-07-17-project-2.markdown +++ b/_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 Flat Icons. 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. --- diff --git a/_posts/2014-07-18-project-1.markdown b/_posts/2014-07-18-project-1.markdown index 613b219..84a7a41 100644 --- a/_posts/2014-07-18-project-1.markdown +++ b/_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 Flat Icons. 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. --- diff --git a/freelancer-theme-jekyll.gemspec b/freelancer-theme-jekyll.gemspec index 0649cea..204cfa5 100644 --- a/freelancer-theme-jekyll.gemspec +++ b/freelancer-theme-jekyll.gemspec @@ -25,4 +25,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 2.0" spec.add_development_dependency "rake", "~> 13.0" + spec.add_development_dependency "html-proofer", "~> 3.15" end \ No newline at end of file From 6d3a4ce64324e2093b277f2261d0b2dfd588dc89 Mon Sep 17 00:00:00 2001 From: Jerome Lachaud Date: Wed, 8 Apr 2020 15:24:09 +0200 Subject: [PATCH 19/19] Update Travis script --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6ce4b3d..dc5c694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,6 @@ language: ruby script: - gem install jekyll bundler - bundle install + - bundle exec rake test - bundle exec jekyll build cache: bundler