diff --git a/Gemfile b/Gemfile index 03aaf99..90da462 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 4.0.0" +gem "jekyll", "~> 4.2.2" # This is the default theme for new Jekyll sites. You may change this to anything you like. # gem "minima", "~> 2.5" @@ -23,6 +23,7 @@ group :jekyll_plugins do gem "jekyll-paginate-v2" gem 'jekyll_picture_tag', '~> 1.6' gem 'jekyll-strapi' + gem 'jekyll-admin' end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 48c468c..02f120a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,53 +1,58 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + backports (3.23.0) colorator (1.1.0) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.10) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.13.1) + ffi (1.15.5) forwardable-extended (2.6.0) http (3.3.0) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.6.0) - i18n (1.8.5) + i18n (1.10.0) concurrent-ruby (~> 1.0) - jekyll (4.0.1) + jekyll (4.2.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (>= 0.9.5, < 2) + i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 2.1) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) - terminal-table (~> 1.8) + terminal-table (~> 2.0) + jekyll-admin (0.11.0) + jekyll (>= 3.7, < 5.0) + sinatra (~> 1.4) + sinatra-contrib (~> 1.4) jekyll-archives (2.2.1) jekyll (>= 3.6, < 5.0) - jekyll-feed (0.15.1) + jekyll-feed (0.16.0) jekyll (>= 3.7, < 5.0) jekyll-menus (0.6.1) jekyll (>= 3.6, < 5.0) jekyll-paginate-v2 (3.0.0) jekyll (>= 3.0, < 5.0) - jekyll-sass-converter (2.1.0) + jekyll-sass-converter (2.2.0) sassc (> 2.0.1, < 3.0) jekyll-strapi (0.1.3) http (~> 3.2) @@ -57,57 +62,76 @@ GEM nuggets jekyll-watch (2.2.1) listen (~> 3.0) - jekyll_picture_tag (1.12.0) + jekyll_picture_tag (1.14.0) addressable (~> 2.6) jekyll (< 5) - mime-types (~> 3) - mini_magick (~> 4) - objective_elements (~> 1.1.2) - json (2.5.1) - kramdown (2.3.0) + mime-types (~> 3.0) + mini_magick (~> 4.0) + objective_elements (~> 1.1) + json (2.6.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.3.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) - mime-types (3.3.1) + mercenary (0.4.0) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) + mime-types-data (3.2022.0105) mini_magick (4.11.0) + multi_json (1.15.0) nuggets (1.6.0) objective_elements (1.1.2) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - rb-fsevent (0.10.4) + public_suffix (4.0.7) + rack (1.6.13) + rack-protection (1.5.5) + rack + rack-test (1.1.0) + rack (>= 1.0, < 3) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.4) - rouge (3.25.0) + rexml (3.2.5) + rouge (3.28.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - terminal-table (1.8.0) + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sinatra-contrib (1.4.7) + backports (>= 2.0) + multi_json + rack-protection + rack-test + sinatra (~> 1.4.0) + tilt (>= 1.3, < 3) + terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - tzinfo (1.2.8) + tilt (2.0.10) + tzinfo (1.2.9) thread_safe (~> 0.1) - tzinfo-data (1.2020.4) + tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8.1) + unicode-display_width (1.8.0) wdm (0.1.1) PLATFORMS - ruby + x86_64-linux-musl DEPENDENCIES - jekyll (~> 4.0.0) + jekyll (~> 4.2.2) + jekyll-admin jekyll-archives jekyll-feed (~> 0.12) jekyll-menus @@ -120,4 +144,4 @@ DEPENDENCIES wdm (~> 0.1.1) BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/README.md b/README.md index ae8b4ba..b662ad5 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ No proprietary operating system dependencies required, only Docker Engine super *All Ruby dependencies are created and stored in the Docker container. Simple, smooth and sweet :)* # API's -* Siteleaf CMS -* Staticman with GitHub +* Strapi CMS, Jekyll-Admin CMS +* ISSO (Comments) * Snipcart with Stripe * Mailjet Newsletters * Algolia Search diff --git a/_config.yml b/_config.yml index d389a75..eeeba0a 100644 --- a/_config.yml +++ b/_config.yml @@ -20,6 +20,7 @@ baseurl: "/" # the subpath of your site, e.g. /blog /galacticsociety.github.io url: "https://sharpetronics.github.io" # the base hostname & protocol for your site, e.g. https://sharpetronics.github.io +source: . #Latent Semantic Indexing for similarity bewtween documents. lsi: true @@ -67,6 +68,7 @@ picture: # Build settings plugins: - jekyll-feed #manually generated rss.xml https://jekyllrb.com/tutorials/convert-site-to-jekyll/#10-rss-feed + - jekyll-admin - jekyll-strapi - jekyll-menus - jekyll-archives diff --git a/_data/global-product.yml b/_data/global-product.yml new file mode 100644 index 0000000..a5ade9e --- /dev/null +++ b/_data/global-product.yml @@ -0,0 +1,6 @@ +#Product list for all items for SharpeTronics +global-product: + tax: 6% + shipping: $5.00 + delivery: 3-5 days + warranty: 30 days money back diff --git a/_data/products.yml b/_data/products.yml deleted file mode 100644 index 6bbd371..0000000 --- a/_data/products.yml +++ /dev/null @@ -1,166 +0,0 @@ -#Product list for all items for SharpeTronics -global-product: - tax: 6% - shipping: $5.00 - delivery: 3-5 days - warranty: 30 days money back - -product-ten: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-one: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-nine: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-two: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-three: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-four: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-five: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-six: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-seven: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in - -product-eight: - title: Peppermint Lip Balm - image: assets/images/Peppermint-Lip-Balm.jpg - description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! - excerpt: Our BEST SELLING lip balm - you'll love it! - category: Lip Balm - tag: Health - id: 201806 - sku: 2020 - quantity: 14 - price: $5.00 - weight: Peppermint - format: Physical - material: Wood, Steel - dimension: 15in x 35in diff --git a/_data/products/example.yml b/_data/products/example.yml new file mode 100644 index 0000000..455fc92 --- /dev/null +++ b/_data/products/example.yml @@ -0,0 +1,15 @@ +title: Cup +url: /products/2020-06-03-cup/ +id: 201806 +sku: 202055478373 +image: assets/images/Peppermint-Lip-Balm.jpg +description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! +excerpt: Our BEST SELLING lip balm - you'll love it! +category: Lip Balm +tag: Health +quantity: 14 +price: 125.00 +weight: Peppermint +format: Physical +material: Wood, Steel +dimension: 15in x 35in diff --git a/_data/products/sample.yml b/_data/products/sample.yml new file mode 100644 index 0000000..27e8d8b --- /dev/null +++ b/_data/products/sample.yml @@ -0,0 +1,15 @@ +title: Dragon +url: /products/2017-02-03-dragon/ +id: 201806 +sku: 202055478373 +image: assets/images/Peppermint-Lip-Balm.jpg +description: Our all natural Peppermint lip balm was a great hit with our family & friends. We hope you enjoy it too! +excerpt: Our BEST SELLING lip balm - you'll love it! +category: Lip Balm +tag: Health +quantity: 14 +price: 5.00 +weight: Peppermint +format: Physical +material: Wood, Steel +dimension: 15in x 35in diff --git a/api/pages.json b/api/pages.json new file mode 100644 index 0000000..5626707 --- /dev/null +++ b/api/pages.json @@ -0,0 +1,13 @@ +--- +layout: none +permalink: /api/pages/ +--- +[ + {%- for page in site.pages %} + { + "title": {{- page.title | jsonify }}, + "url": {{- page.url | jsonify }} + } + {% unless forloop.last %},{% endunless %} + {% endfor -%} +] diff --git a/api/posts.json b/api/posts.json new file mode 100644 index 0000000..cff8269 --- /dev/null +++ b/api/posts.json @@ -0,0 +1,22 @@ +--- +layout: none +permalink: /api/posts/ +--- +[ + {%- for post in site.posts %} + { + "id": {{- post.id | jsonify -}}, + "url": {{- post.url | jsonify }}, + "image": {{- post.banner_image | jsonify -}}, + "image-alt": {{- post.banner_image_alt | jsonify -}}, + "sub_heading":{{- post.sub_heading | jsonify -}}, + "title": {{- post.title | jsonify }}, + "author": {{- post.author | jsonify }}, + "date": {{- post.date | jsonify }}, + "tags": {{- post.tags | jsonify }}, + "categories": {{- post.categories | jsonify }}, + "content": {{- post.content | jsonify }} + } + {% unless forloop.last %},{% endunless %} + {% endfor -%} +] diff --git a/api/products.json b/api/products.json new file mode 100644 index 0000000..e3c3156 --- /dev/null +++ b/api/products.json @@ -0,0 +1,15 @@ +--- +layout: none +permalink: /api/products/ +--- +[ + {%- for product_hash in site.data.products %} + {% assign product = product_hash[1] %} + { + "title": {{- product.title | jsonify }}, + "url": {{- product.url | jsonify }}, + "price": {{- product.price | jsonify }} + } + {% unless forloop.last %},{% endunless %} + {% endfor -%} +] diff --git a/collections/_posts/2017-02-03-robotics.md b/collections/_drafts/2017-02-03-robotics.md similarity index 100% rename from collections/_posts/2017-02-03-robotics.md rename to collections/_drafts/2017-02-03-robotics.md diff --git a/collections/_posts/2017-02-03-teleportation.md b/collections/_drafts/2017-02-03-teleportation.md similarity index 100% rename from collections/_posts/2017-02-03-teleportation.md rename to collections/_drafts/2017-02-03-teleportation.md diff --git a/collections/_posts/2017-02-12-modern.md b/collections/_drafts/2017-02-12-modern.md similarity index 100% rename from collections/_posts/2017-02-12-modern.md rename to collections/_drafts/2017-02-12-modern.md diff --git a/collections/_posts/2017-08-01-welcome.md b/collections/_drafts/2017-08-01-welcome.md similarity index 100% rename from collections/_posts/2017-08-01-welcome.md rename to collections/_drafts/2017-08-01-welcome.md diff --git a/collections/_posts/2017-08-22-research.md b/collections/_drafts/2017-08-22-research.md similarity index 100% rename from collections/_posts/2017-08-22-research.md rename to collections/_drafts/2017-08-22-research.md diff --git a/humans.txt b/humans.txt index 4f27f60..c4c0b8b 100644 --- a/humans.txt +++ b/humans.txt @@ -1,11 +1,11 @@ - ____ __ ______ - /\ _`\ /\ \ /\__ _\ __ - \ \,\L\_\ \ \___ __ _ __ _____ _\/_/\ \/ _ __ ___ ___ /\_\ ___ ____ - \/_\__ \\ \ _ `\ /'__`\ /\`'__/\ '__`\ /'__`\\ \ \/\`'__/ __`\/' _ `\/\ \ /'___\ /',__\ - /\ \L\ \ \ \ \ \/\ \L\.\\ \ \/\ \ \L\ /\ __/ \ \ \ \ \/\ \L\ /\ \/\ \ \ \/\ \__//\__, `\ - \/_____/\/_/\/_/\/__/\/_/\/_/ \ \ \/ \/____/ \/_/\/_/\/___/ \/_/\/_/\/_/\/____/\/___/ - \ \_\ - \/_/ +____ __ ______ +/\ _`\ /\ \ /\__ _\ __ +\ \,\L\_\ \ \___ __ _ __ _____ _\/_/\ \/ _ __ ___ ___ /\_\ ___ ____ +\/_\__ \\ \ _ `\ /'__`\ /\`'__/\ '__`\ /'__`\\ \ \/\`'__/ __`\/' _ `\/\ \ /'___\ /',__\ + /\ \L\ \ \ \ \ \/\ \L\.\\ \ \/\ \ \L\ /\ __/ \ \ \ \ \/\ \L\ /\ \/\ \ \ \/\ \__//\__, `\ + \/_____/\/_/\/_/\/__/\/_/\/_/ \ \ \/ \/____/ \/_/\/_/\/___/ \/_/\/_/\/_/\/____/\/___/ + \ \_\ + \/_/ Owner: @csharpe_me (Charles Sharpe) Designer: @ajlkn, @csharpe_me Developer: @ajlkn, @csharpe_me @@ -32,12 +32,6 @@ SPECIAL THANKS @ajlkn aj.lkn.io -@oakstudios -oak.is - -@AlainHelaili -helaili.github.io - TECHNOLOGY ---------- @@ -62,7 +56,7 @@ yaml.org Docker - Container virtualization docker.com -Git, GitHub, GitHub Actions & GitHub Pages - Code collaboration, continuous delivery, version management, DevOps & static hosting +Git, Gitea, Drone, GitHub (Mirror) & Gitea Pages - Code collaboration, continuous delivery, version management, DevOps & static hosting github.com Font Awesome - Premium Web icons @@ -105,8 +99,8 @@ creativecommons.org, gnu.org, fsf.org Web Browser Testing - Testing UI/UX of the website google.com/chrome/, www.mozilla.org/en-US/firefox -DuckDuckGo - Search engine privacy -duckduckgo.com +Startpage - Search engine privacy +startpage.com FONTS