From 8a6a6234c3e070a69eb5e3ba6fa23526502fc6fe Mon Sep 17 00:00:00 2001 From: Starlight220 Date: Sun, 1 Nov 2020 08:49:36 +0200 Subject: [PATCH 1/3] rebase --- _config.yml | 3 +++ _includes/navigation.html | 48 ++++++++++++++++++++++++++++++++++++++ index.html | 49 +-------------------------------------- 3 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 _config.yml create mode 100644 _includes/navigation.html diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..b83c716 --- /dev/null +++ b/_config.yml @@ -0,0 +1,3 @@ +name: 6738 Excalibur +description: Website for FRC team 6738 Excalibur +markdown: GFM \ No newline at end of file diff --git a/_includes/navigation.html b/_includes/navigation.html new file mode 100644 index 0000000..f3de588 --- /dev/null +++ b/_includes/navigation.html @@ -0,0 +1,48 @@ +
+ +
+ + +
\ No newline at end of file diff --git a/index.html b/index.html index 7c342ce..7f035f2 100644 --- a/index.html +++ b/index.html @@ -30,54 +30,7 @@ -
- -
- - -
+ {% include navigation.html %} From 2fe1fe0c13da7e59e1259f7aab6213753ac63044 Mon Sep 17 00:00:00 2001 From: Starlight220 Date: Sun, 1 Nov 2020 13:27:06 +0200 Subject: [PATCH 2/3] migrate to jekyll --- .gitignore | 1 + 404.html | 39 ++++ 404.md | 5 - AboutFRC.html | 102 +-------- AboutUs.html | 102 +-------- Gemfile | 3 + Gemfile.lock | 261 +++++++++++++++++++++ Outreach.html | 104 +-------- Resources.html | 107 +-------- Seasons.html | 100 +------- Sponsors.html | 98 +------- _includes/head.html | 24 ++ _includes/navigation.html | 20 +- _layouts/default.html | 31 +++ index.html | 305 +++++++++++-------------- resources/code-standards.md | 7 +- resources/color-standards.md | 14 +- scripts/countdown.js | 26 +++ quoteTyper.js => scripts/quoteTyper.js | 0 styles.css | 21 ++ 20 files changed, 585 insertions(+), 785 deletions(-) create mode 100644 .gitignore create mode 100644 404.html delete mode 100644 404.md create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 _includes/head.html create mode 100644 _layouts/default.html create mode 100644 scripts/countdown.js rename quoteTyper.js => scripts/quoteTyper.js (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..72a5c3b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +_site/ \ No newline at end of file diff --git a/404.html b/404.html new file mode 100644 index 0000000..aee5856 --- /dev/null +++ b/404.html @@ -0,0 +1,39 @@ +--- +permalink: /404.html +--- + + + + {% include head.html %} + + + +
+

404 Page Not Found

+
+
+

Back to home

+
+ + + + + + + +
+ + + + diff --git a/404.md b/404.md deleted file mode 100644 index aef8945..0000000 --- a/404.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -permalink: /404.html ---- -# 404 - Page not found -## Back to [home](index.html) diff --git a/AboutFRC.html b/AboutFRC.html index b275e74..fd6b4e9 100644 --- a/AboutFRC.html +++ b/AboutFRC.html @@ -1,82 +1,7 @@ - - - - - - - - - - - - - - - - - Team 6738 ｜ Excalibur - - - - - - - - - -
- - -
- +--- +permalink: /AboutFRC.html +layout: default +---
The FRC is a competition in which teams, consisting of high school students from around the world. Every year, the teams are presented with a unique challenge. The teams must then build a robot that can effectively perform all the necessary parts of the challenge. Every team is given 6 weeks for building the robot and preparing it for the competitions. During that time period, the teams build many prototypes, design in “SolidWorks”, create part while using Complex machinery, such as CNC machines and 3D printers, build the mechanical elements of the robot, implement electronics, motors, and pneumatics into the system, and of course - program it. Meanwhile, the teams make posts and their robots on social media, and document the work that they do. @@ -85,21 +10,4 @@
...
-
- - - - - - - - \ No newline at end of file +
\ No newline at end of file diff --git a/AboutUs.html b/AboutUs.html index 9470fa9..5886684 100644 --- a/AboutUs.html +++ b/AboutUs.html @@ -1,83 +1,8 @@ - - - - - - - - - - - - - - - - - Team 6738 ｜ Excalibur - - - - - - - - - -
- - -
- -
+--- +permalink: /AboutUs.html +layout: default +--- +
Our group, 6738 #Excalibur is an FRC Group which was established in 2017. The group now has about 35 high school students. In our first year, we won the Rookie All-Star and Rookie Inspiration awards, given to a group which shows potential and inspires. @@ -90,20 +15,3 @@ ...
- - - - - - - - \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..b0ba5aa --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "github-pages", group: :jekyll_plugins \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..fe1c975 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,261 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.3.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.11.1) + colorator (1.1.0) + commonmarker (0.17.13) + ruby-enum (~> 0.5) + concurrent-ruby (1.1.7) + dnsruby (1.61.5) + simpleidn (~> 0.1) + em-websocket (0.5.2) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + ethon (0.12.0) + ffi (>= 1.3.0) + eventmachine (1.2.7-x64-mingw32) + execjs (2.7.0) + faraday (1.1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords + ffi (1.13.1-x64-mingw32) + forwardable-extended (2.6.0) + gemoji (3.0.1) + github-pages (209) + github-pages-health-check (= 1.16.1) + jekyll (= 3.9.0) + jekyll-avatar (= 0.7.0) + jekyll-coffeescript (= 1.1.1) + jekyll-commonmark-ghpages (= 0.1.6) + jekyll-default-layout (= 0.1.4) + jekyll-feed (= 0.15.1) + jekyll-gist (= 1.5.0) + jekyll-github-metadata (= 2.13.0) + jekyll-mentions (= 1.6.0) + jekyll-optional-front-matter (= 0.3.2) + jekyll-paginate (= 1.1.0) + jekyll-readme-index (= 0.3.0) + jekyll-redirect-from (= 0.16.0) + jekyll-relative-links (= 0.6.1) + jekyll-remote-theme (= 0.4.2) + jekyll-sass-converter (= 1.5.2) + jekyll-seo-tag (= 2.6.1) + jekyll-sitemap (= 1.4.0) + jekyll-swiss (= 1.0.0) + jekyll-theme-architect (= 0.1.1) + jekyll-theme-cayman (= 0.1.1) + jekyll-theme-dinky (= 0.1.1) + jekyll-theme-hacker (= 0.1.2) + jekyll-theme-leap-day (= 0.1.1) + jekyll-theme-merlot (= 0.1.1) + jekyll-theme-midnight (= 0.1.1) + jekyll-theme-minimal (= 0.1.1) + jekyll-theme-modernist (= 0.1.1) + jekyll-theme-primer (= 0.5.4) + jekyll-theme-slate (= 0.1.1) + jekyll-theme-tactile (= 0.1.1) + jekyll-theme-time-machine (= 0.1.1) + jekyll-titles-from-headings (= 0.5.3) + jemoji (= 0.12.0) + kramdown (= 2.3.0) + kramdown-parser-gfm (= 1.1.0) + liquid (= 4.0.3) + mercenary (~> 0.3) + minima (= 2.5.1) + nokogiri (>= 1.10.4, < 2.0) + rouge (= 3.23.0) + terminal-table (~> 1.4) + github-pages-health-check (1.16.1) + addressable (~> 2.3) + dnsruby (~> 1.60) + octokit (~> 4.0) + public_suffix (~> 3.0) + typhoeus (~> 1.3) + html-pipeline (2.14.0) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.9.0) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 2.0) + kramdown (>= 1.17, < 3) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (>= 1.7, < 4) + safe_yaml (~> 1.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) + jekyll-coffeescript (1.1.1) + coffee-script (~> 2.2) + coffee-script-source (~> 1.11.1) + jekyll-commonmark (1.3.1) + commonmarker (~> 0.14) + jekyll (>= 3.7, < 5.0) + jekyll-commonmark-ghpages (0.1.6) + commonmarker (~> 0.17.6) + jekyll-commonmark (~> 1.2) + rouge (>= 2.0, < 4.0) + jekyll-default-layout (0.1.4) + jekyll (~> 3.0) + jekyll-feed (0.15.1) + jekyll (>= 3.7, < 5.0) + jekyll-gist (1.5.0) + octokit (~> 4.2) + jekyll-github-metadata (2.13.0) + jekyll (>= 3.4, < 5.0) + octokit (~> 4.0, != 4.4.0) + jekyll-mentions (1.6.0) + html-pipeline (~> 2.3) + jekyll (>= 3.7, < 5.0) + jekyll-optional-front-matter (0.3.2) + jekyll (>= 3.0, < 5.0) + jekyll-paginate (1.1.0) + jekyll-readme-index (0.3.0) + jekyll (>= 3.0, < 5.0) + jekyll-redirect-from (0.16.0) + jekyll (>= 3.3, < 5.0) + jekyll-relative-links (0.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-remote-theme (0.4.2) + addressable (~> 2.0) + jekyll (>= 3.5, < 5.0) + jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) + rubyzip (>= 1.3.0, < 3.0) + jekyll-sass-converter (1.5.2) + sass (~> 3.4) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) + jekyll-sitemap (1.4.0) + jekyll (>= 3.7, < 5.0) + jekyll-swiss (1.0.0) + jekyll-theme-architect (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-cayman (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-dinky (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-hacker (0.1.2) + jekyll (> 3.5, < 5.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-leap-day (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-merlot (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-midnight (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-minimal (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-modernist (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-primer (0.5.4) + jekyll (> 3.5, < 5.0) + jekyll-github-metadata (~> 2.9) + jekyll-seo-tag (~> 2.0) + jekyll-theme-slate (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-tactile (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-time-machine (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-titles-from-headings (0.5.3) + jekyll (>= 3.3, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + jemoji (0.12.0) + gemoji (~> 3.0) + html-pipeline (~> 2.2) + jekyll (>= 3.0, < 5.0) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.3) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.3.6) + mini_portile2 (2.4.0) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + minitest (5.13.0) + multipart-post (2.1.1) + nokogiri (1.10.10-x64-mingw32) + mini_portile2 (~> 2.4.0) + octokit (4.19.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (3.1.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.3) + rouge (3.23.0) + ruby-enum (0.8.0) + i18n + ruby2_keywords (0.0.2) + rubyzip (2.3.0) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + simpleidn (0.1.1) + unf (~> 0.1.4) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + thread_safe (0.3.6) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7-x64-mingw32) + unicode-display_width (1.7.0) + zeitwerk (2.4.1) + +PLATFORMS + x64-mingw32 + +DEPENDENCIES + github-pages + +BUNDLED WITH + 2.1.4 diff --git a/Outreach.html b/Outreach.html index 8a4d62e..3625e9a 100644 --- a/Outreach.html +++ b/Outreach.html @@ -1,79 +1,7 @@ - - - - - - - - - - - - - - - - Team 6738 ｜ Excalibur - - - - - - - - -
- - -
+--- +permalink: /Outreach.html +layout: default +---
@@ -87,26 +15,4 @@
...
-
- -
-
-
-
- - - - - - - - \ No newline at end of file +
\ No newline at end of file diff --git a/Resources.html b/Resources.html index 26fee6e..69e6e06 100644 --- a/Resources.html +++ b/Resources.html @@ -1,80 +1,7 @@ - - - - - - - - - - - - - - - - - Team 6738 ｜ Excalibur - - - - - - - - -
- - -
+--- +permalink: /Resources.html +layout: default +---
@@ -172,29 +99,3 @@
- - - - - - - - diff --git a/Seasons.html b/Seasons.html index 4c34a70..09aacd7 100644 --- a/Seasons.html +++ b/Seasons.html @@ -1,81 +1,8 @@ - - - - - - - - - - - - - - - - Team 6738 ｜ Excalibur - - - - - - - - -
- - -
- -
+--- +permalink: /Seasons.html +layout: default +--- +
@@ -158,20 +85,3 @@
- - - - - - - - \ No newline at end of file diff --git a/Sponsors.html b/Sponsors.html index c077fe2..ee36258 100644 --- a/Sponsors.html +++ b/Sponsors.html @@ -1,80 +1,7 @@ - - - - - - - - - - - - - - - - Team 6738 ｜ Excalibur - - - - - - - - -
- - -
- +--- +permalink: /Sponsors.html +layout: default +---
@@ -139,20 +66,3 @@
- - - - - - - - \ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html new file mode 100644 index 0000000..e33ed23 --- /dev/null +++ b/_includes/head.html @@ -0,0 +1,24 @@ + + + + + + + + + + + + + +Team 6738 ｜ Excalibur + + + + diff --git a/_includes/navigation.html b/_includes/navigation.html index f3de588..890f8ec 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -3,37 +3,37 @@