Merge pull request #620 from worcestertechnicalhighschool/civics

Merge Civics Branch with Main

Gemfile.lock

@@ -9,8 +9,10 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
+    ffi (1.16.3)
     ffi (1.16.3-x64-mingw-ucrt)
     forwardable-extended (2.6.0)
+    google-protobuf (3.25.2-arm64-darwin)
     google-protobuf (3.25.2-x64-mingw-ucrt)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
@@ -61,6 +63,8 @@ GEM
     rexml (3.2.6)
     rouge (4.2.0)
     safe_yaml (1.0.5)
+    sass-embedded (1.70.0-arm64-darwin)
+      google-protobuf (~> 3.25)
     sass-embedded (1.70.0-x64-mingw-ucrt)
       google-protobuf (~> 3.25)
     terminal-table (3.0.2)
@@ -75,6 +79,7 @@ GEM
     webrick (1.8.1)
 
 PLATFORMS
+  arm64-darwin-23
   x64-mingw-ucrt
 
 DEPENDENCIES

_academics/history.markdown

@@ -26,4 +26,11 @@ courses:
 
 description: Students explore the past in order to guide us in the present by studying our rich history.
 ---
+<section>
+    <div>
+      <p>The civics project is made by the history department. Here's the link to it.</p>
+      <a href="/civics/">The Civics Project.</a>
+    </div>  
+</section>
+
 

_civics/experiences.html

@@ -0,0 +1,13 @@
+---
+layout: default
+---
+
+<header class="hero-entry">
+    <h1>War Experiences</h1>
+</header>
+
+<p>What was a typical day like for you in Vietnam? What was your daily routine? What was the most intense/dangerous moment for you?</p>
+<p>Being from New England, how was it adjusting to the climate of Vietnam? Were you able to get in touch with your family and friends while you were there? What did you miss the most about home while you were there?</p>
+<p>Did you have any interesting experiences with the wildlife of Vietnam?</p>
+<p>How did you feel about the Vietnamese people while you were there? Did you have respect/contempt for the enemy that you were fighting while you were there? </p>
+<p>Did you ever disobey or question an order because of conflicted feelings about a certain situation while you were there?</p>

_civics/first-impressions.html

@@ -0,0 +1,12 @@
+---
+layout: default
+---
+
+<header class="hero-entry">
+    <h1>First Impressions on Arrival</h1>
+</header>
+
+<p>What was your training like?  Do you think your training prepared you for what you faced when you got to Vietnam?</p>
+<p>What was daily life like for the soldiers in Vietnam?  How often was there combat involved?</p>
+<p>Did you make friends when you served?  Did you have any leisure time, and if so how did you usually spend it?</p>
+<p>Did you ever write a letter back home? If so, how many? Did you ever receive letters back? Did you ever write one thinking this could be your last one? </p>

_civics/homecoming-reception.html

@@ -0,0 +1,11 @@
+---
+layout: default
+---
+
+<header class="hero-entry">
+    <h1>Homecoming/Reception back in America.</h1>
+</header>
+
+<p>What was the expectation of coming home and how did that compare to the reality of coming home?</p>
+<p>From your perspective, how were Vietnam veterans treated by society upon returning home? What about within your personal experiences with your own family and friends?</p>
+<p>What helped you cope with the trauma of war as you transitioned back to civilian life? Was it difficult to adjust to living in the U.S. again?</p>

_civics/misconceptions.html

@@ -0,0 +1,12 @@
+---
+layout: default
+---
+
+<header class="hero-entry">
+    <h1>Misconceptions on Vietnam</h1>
+</header>
+
+<p>The Vietnam war is sometimes referred to as the only war America has lost. However some argue that America didn’t lose, as the domino theory was proved correct and communism did not spread to the southern Asian countries. Yet, southern Vietnam was still occupied by communists. Based on your experiences, which belief is more accurate?</p>
+<p>Americans who opposed the war by protesting and insulting returning veterans, what would have you liked to have explained to them about the war?</p>
+<p>Did your views on the war itself and/or the United States itself change at all throughout the duration of the war?</p>
+<p>What advice would you give to someone considering joining the military today?</p>

_civics/reflections.html

@@ -0,0 +1,12 @@
+---
+layout: default
+---
+
+<header class="hero-entry">
+    <h1>Reflections on The War</h1>
+</header>
+
+<p>Is there anything you regret? Or overall do you feel like you did the right thing?</p>
+<p>What are some of the biggest changes for you after the war? Psychologically and physically.</p>
+<p>How would you compare your life and the way you're treated now compared to how it was when you came back from the war?</p>
+<p>Although a big part of your life is associated with the Vietnam War, how would you like to be remembered or have your kids & grandkids remember you?</p>

_civics/sacrifices.html

@@ -0,0 +1,13 @@
+---
+layout: default
+---
+
+<header class="hero-entry">
+    <h1>Personal/Family Sacrifices</h1>
+</header>
+
+<p>What personal or family sacrifice was the hardest for you to take in or to witness?</p>
+<p>Who was the hardest person to say goodbye to?</p>
+<p>What was the hardest challenge you had to face before leaving to go to war?</p>
+<p>What were the major lifestyle changes when going from civilian to military life during the Vietnam War?</p>
+<p>Who was the first person you wanted to see when you came back?</p>

_civics/veteran-biography.html

@@ -0,0 +1,14 @@
+---
+layout: default
+---
+<header class="hero-entry">
+    <h1>Veteran Biography</h1>
+</header>
+
+<p>Where were you and your family living during the time of the Vietnam War?</p>
+
+<p>Were you drafted or did you enlist in the war?</p>
+
+<p>What was your original opinion about the war before you arrived?</p>
+
+<p>What did you leave behind as you went off to war? (Family, job, dreams, etc..)</p>

_config.yml

@@ -107,11 +107,15 @@ collections:
 
   pages:
     output: true
-    permalink: :path/
+    permalink: /:path/
 
   summer_work:
     output: true
     permalink: /summer-work/:path/
+
+  civics:
+    output: true
+    permalink: /civics/:path
 
 
 # Exclude from processing.

_construction_academy/electrical.md

@@ -2,7 +2,7 @@
 layout: shop-pages
 title: Electrical
 date: 2022-10-25
-# featured_image: https://images.unsplash.com/photo-1517420704952-d9f39e95b43e?w=500&auto=format&fit=crop&q=60&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8ZWxlY3RyaWNhbCUyMGVuZ2luZWVyaW5nfGVufDB8fDB8fHww
+featured_image: https://images.unsplash.com/photo-1517420704952-d9f39e95b43e?q=80&w=2340&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D
 tags: [electric, wiring, electricity, maintenance]
 
 redirect_from:
@@ -18,9 +18,9 @@ shop_images:
     - src: https://wordpress.techhigh.us/wp-content/uploads/2023/06/IMG_9814.JPG.jpg
       description: "A group of student figuring out the wiring to a solar panel"
     - src: https://wordpress.techhigh.us/wp-content/uploads/2023/06/IMG_2667.HEIC.jpg
-      description: "One student being trained to stablized the wiring"
+      description: "One student being trained to stabilize the wiring"
     - src: https://wordpress.techhigh.us/wp-content/uploads/2023/06/IMG_5545.JPG.jpg
-      description: "A student workng on a light switch"
+      description: "A student working on a light switch"
     - src: https://wordpress.techhigh.us/wp-content/uploads/2023/06/IMG-0845.jpg
       description: "Two student testing out a light bulb ability to turn on bright"
     - src: https://wordpress.techhigh.us/wp-content/uploads/2022/05/FDC66482-DC22-451F-B3AD-B6921EF997D9-scaled.jpg

_construction_academy/hvac.markdown

@@ -2,7 +2,7 @@
 layout: shop-pages
 title: HVAC/R
 date: 2022-10-25
-featured_image: https://wordpress.techhigh.us/wp-content/uploads/2022/04/troy-bridges-kXC6XhVL1e4-unsplash-1.jpg
+featured_image: https://wordpress.techhigh.us/wp-content/uploads/2024/03/dean-brierley-yTyXzvRJCUQ-unsplash.jpg
 tags: [ventilation, cooling, heating, maintenance]
 
 redirect_from:

_data/contributors.json

@@ -167,27 +167,6 @@
     "site_admin": false,
     "contributions": 22
   },
-  {
-    "login": "Josef-dev",
-    "id": 79469627,
-    "node_id": "MDQ6VXNlcjc5NDY5NjI3",
-    "avatar_url": "https://avatars.githubusercontent.com/u/79469627?v=4",
-    "gravatar_id": "",
-    "url": "https://api.github.com/users/Josef-dev",
-    "html_url": "https://github.com/Josef-dev",
-    "followers_url": "https://api.github.com/users/Josef-dev/followers",
-    "following_url": "https://api.github.com/users/Josef-dev/following{/other_user}",
-    "gists_url": "https://api.github.com/users/Josef-dev/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/Josef-dev/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/Josef-dev/subscriptions",
-    "organizations_url": "https://api.github.com/users/Josef-dev/orgs",
-    "repos_url": "https://api.github.com/users/Josef-dev/repos",
-    "events_url": "https://api.github.com/users/Josef-dev/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/Josef-dev/received_events",
-    "type": "User",
-    "site_admin": false,
-    "contributions": 19
-  },
   {
     "login": "masteroogway12",
     "id": 83360011,
@@ -209,6 +188,27 @@
     "site_admin": false,
     "contributions": 19
   },
+  {
+    "login": "Josef-dev",
+    "id": 79469627,
+    "node_id": "MDQ6VXNlcjc5NDY5NjI3",
+    "avatar_url": "https://avatars.githubusercontent.com/u/79469627?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/Josef-dev",
+    "html_url": "https://github.com/Josef-dev",
+    "followers_url": "https://api.github.com/users/Josef-dev/followers",
+    "following_url": "https://api.github.com/users/Josef-dev/following{/other_user}",
+    "gists_url": "https://api.github.com/users/Josef-dev/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/Josef-dev/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/Josef-dev/subscriptions",
+    "organizations_url": "https://api.github.com/users/Josef-dev/orgs",
+    "repos_url": "https://api.github.com/users/Josef-dev/repos",
+    "events_url": "https://api.github.com/users/Josef-dev/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/Josef-dev/received_events",
+    "type": "User",
+    "site_admin": false,
+    "contributions": 19
+  },
   {
     "login": "Ensabanor15",
     "id": 91901344,
@@ -420,24 +420,24 @@
     "contributions": 1
   },
   {
-    "login": "WaffleLord360",
+    "login": "EduardoWebDevelopment",
     "id": 90159803,
     "node_id": "MDQ6VXNlcjkwMTU5ODAz",
     "avatar_url": "https://avatars.githubusercontent.com/u/90159803?v=4",
     "gravatar_id": "",
-    "url": "https://api.github.com/users/WaffleLord360",
-    "html_url": "https://github.com/WaffleLord360",
-    "followers_url": "https://api.github.com/users/WaffleLord360/followers",
-    "following_url": "https://api.github.com/users/WaffleLord360/following{/other_user}",
-    "gists_url": "https://api.github.com/users/WaffleLord360/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/WaffleLord360/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/WaffleLord360/subscriptions",
-    "organizations_url": "https://api.github.com/users/WaffleLord360/orgs",
-    "repos_url": "https://api.github.com/users/WaffleLord360/repos",
-    "events_url": "https://api.github.com/users/WaffleLord360/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/WaffleLord360/received_events",
+    "url": "https://api.github.com/users/EduardoWebDevelopment",
+    "html_url": "https://github.com/EduardoWebDevelopment",
+    "followers_url": "https://api.github.com/users/EduardoWebDevelopment/followers",
+    "following_url": "https://api.github.com/users/EduardoWebDevelopment/following{/other_user}",
+    "gists_url": "https://api.github.com/users/EduardoWebDevelopment/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/EduardoWebDevelopment/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/EduardoWebDevelopment/subscriptions",
+    "organizations_url": "https://api.github.com/users/EduardoWebDevelopment/orgs",
+    "repos_url": "https://api.github.com/users/EduardoWebDevelopment/repos",
+    "events_url": "https://api.github.com/users/EduardoWebDevelopment/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/EduardoWebDevelopment/received_events",
     "type": "User",
     "site_admin": false,
     "contributions": 1
   }
-]
+]

_includes/civics_link.html

@@ -0,0 +1,6 @@
+<section class="post-content">
+    <div class="shop-page-border">
+      <p>The civics project is made by the history department. Here's the link to it.</p>
+      <a href="/civics/">The Civics Project.</a>
+    </div>  
+</section>

_layouts/academies.html

@@ -14,7 +14,7 @@ <h1 class="post-title">{{ page.title | escape }}</h1>
       {% assign academy_name = page.slug | replace: "-", "_" %}    
       {% for shop in site[academy_name] %}
       <div class="card card--full-cover card--academy">
-        <img src="{{ shop.featured_image }} ">
+        <img src="{{ shop.featured_image }} " alt="Stock image for {{ shop.title }}">
         <div class="card-content">
             <a class="btn btn--ghost" href="{{ shop.url }}"> {{ shop.title }} </a>
         </div>

_layouts/department-pages.html

@@ -7,11 +7,15 @@
   {%- include components/hero-entry.html -%}
 
   <article class="post">
+    {% if page.title == "History" %}
+      {% include civics_link.html %}
+    {% endif %}
     <!-- <section class="post-content">
       <div class="shop-page-border">
         {{ content }}
-      </div>  
-    </section> -->
+      </div>   -->
+    </section>
+
     <!-- Renders alumni data (in page front matter) but splits them into img, and content for easier styling-->
     {% if page.alumni %}
       <section class="alumni-spotlight">

_layouts/shop-pages.html

@@ -37,7 +37,13 @@ <h3>Meet {{info.name}}</h3>
         <section class="shop-images">
           <div class="shop-img-grid">
             {% for image in page.shop_images %}
-              <img src="{{ image.src }}" alt="{{ image.description }}">
+            <style>
+              body {
+                background-image: "{{ image.src }}";
+                background-size: cover;
+              }
+            </style>
+            <!-- <img src="{{ image.src }}" alt="{{ image.description }}"> -->
             {% endfor %}
           </div>
         </section>

_pages/civics.html

@@ -0,0 +1,48 @@
+---
+layout: default
+---
+
+<!-- Using the default layout for now.-->
+
+<header class="hero-entry"
+    style="background-image:url()">
+    <h1>The Civics Project</h1>
+</header>
+
+<div class="post-content">
+    <h2 style="text-align:center">This project was done by the history department, with the help of the students.</h2>
+    <p style="font-size: large; text-align:center">All of the videos/interviews are on these pages, categorized by topic.</p>
+</div>
+
+<div class="list-group">
+    <ul>
+        <li class="list-group-item list-group-item-action">
+            <a href="veteran-biography.html">Short Bio of Each Veteran</a>
+
+        </li>
+        <li class="list-group-item list-group-item-action">
+            <a href="first-impressions.html">Arrival First Impressions</a>
+
+        </li>
+        <li class="list-group-item list-group-item-action">
+            <a href="experiences.html">Experiences from the war</a>
+
+        </li>
+        <li class="list-group-item list-group-item-action">
+            <a href="sacrifices.html">Personal/Family sacrifices</a>
+
+        </li>
+        <li class="list-group-item list-group-item-action">
+            <a href="homecoming-reception.html">Homecoming/Reception back at home</a>
+
+        </li>
+        <li class="list-group-item list-group-item-action">
+            <a href="misconceptions.html">Misconceptions on Vietnam</a>
+
+        </li>
+        <li class="list-group-item list-group-item-action">
+            <a href="reflections.html">Reflections on the War</a>
+
+        </li>
+    </ul>
+</div>

_pages/contributors.md

@@ -21,7 +21,7 @@ In 2007, we launched the Techhigh Portal, a Microsoft Sharepoint site. This site
 In 2014, We launched the new techhigh.us WordPress site. This site was built from scratch by Programming and Web Development students. All content and photos were generated by our student authors.
 
 <!-- ![Screenshot of the first techhigh.us WordPress site](https://wordpress.techhigh.us/wp-content/uploads/2023/01/techhigh-wp.png) -->
-<img class="img-fluid" src="https://wordpress.techhigh.us/wp-content/uploads/2023/01/techhigh-wp.png" alt="Screenshot of the first techigh.us WordPress site">
+<img class="img-fluid" src="https://wordpress.techhigh.us/wp-content/uploads/2023/01/techhigh-wp.png" alt="Screenshot of the first techhigh.us WordPress site">
 
 In September of 2017-2018 school year, Anthony Le, Jeffery Neal, and Mariah Donahue began work on the new site you see today. Their combined effort took an entire school-year to accomplish. The final result was over 2000 lines of code, spanning 30 files.
 
@@ -30,4 +30,4 @@ In September of 2017-2018 school year, Anthony Le, Jeffery Neal, and Mariah Dona
 This Wordpress theme is built with the mobile-first Bootstrap CSS framework and customized to look and feel like a modern, professional website. The information hierarchy utilizes categories to present the most relevant information to our visitors.
 
 ## Latest Version
-In 2022 we created a collaborative partnership between students in Programming and Web Development and Finance and Marketing. Through this partnership we rebuild techhigh.us with all new content, code, and workflow processes. This site is now build using Jekyll and is hosted on GitHub Pages. Students meet on Monday for our weekly production meeting. Features and content are discussed and assigned to students. Thursday is our regular build day where we push new versions of our code. Check back often to see our changes!
+In 2022 we created a collaborative partnership between students in Programming and Web Development and Finance and Marketing. Through this partnership we rebuilt techhigh.us with all new content, code, and workflow processes. This site is now built using Jekyll and is hosted on GitHub Pages. Students meet on Monday for our weekly production meeting. Features and content are discussed and assigned to students. Thursday is our regular build day where we push new versions of our code. Check back often to see our changes!