Update modules, cleanup themeing and structure of header

.dockerignore

@@ -10,5 +10,6 @@ tmp
 .gitmodules
 .hugo_build.lock
 Dockerfile
+docker-compose.yaml
 hugo_stats.json
 README.md

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "themes/dot-org-hugo-theme"]
 	path = themes/dot-org-hugo-theme
 	url = https://github.com/NE-Collegiate-Cyber-Defense-League/dot-org-hugo-theme.git
-	branch = release
+	branch = main

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:latest AS build
+FROM node:26 AS build
 
 ARG WORKDIR=/app
 ARG BUILD_URL=http://localhost:8080
-ARG HUGO_VERSION=0.154.2 \
+ARG HUGO_VERSION=0.159.1 \
     DART_SASS_VERSION=1.97.1
 
 WORKDIR $WORKDIR

README.md

@@ -31,8 +31,6 @@ npx -y pagefind --site public
 
 - https://github.com/cncf/dot-org-hugo-theme/
     - https://dot-org-hugo-theme-demo.netlify.app/demo-page/
-- https://github.com/deepcausality-rs/sites
-  - https://beta-7j9.pages.dev/
 - https://github.com/todogroup/todogroup.org/
   - https://todogroup.org/
 

assets/scss/_typography.scss

@@ -36,7 +36,6 @@ h1,
 .h1 {
   font-family: var(--condensed-font-family);
   font-weight: 700;
-
   color: var(--primary-400);
   text-transform: uppercase;
   line-height: 112.2%;
@@ -65,8 +64,9 @@ h2,
 
 h3,
 .h3 {
-  font-family: var(--rounded-font-family);
+  font-family: var(--condensed-font-family);
   font-size: 20px;
+  color: var(--primary-400);
   line-height: 150%;
   text-transform: none;
   margin-block-start: 40px;
@@ -78,12 +78,13 @@ h3,
 
 h4,
 .h4 {
-  font-family: var(--rounded-font-family);
-  font-weight: 900;
+  font-family: var(--condensed-font-family);
+  font-weight: 700;
+  color: var(--primary-400);
   font-size: 16px;
   line-height: 150%;
   text-transform: uppercase;
-  letter-spacing: 2.4px;
+  letter-spacing: 1px;
   margin-block-start: 28px;
   margin-block-end: 18px;
   @media (min-width: variables.$min-desktop) {

config/_default/hugo.yaml

@@ -2,7 +2,7 @@
 # Your theme name
 theme: "dot-org-hugo-theme"
 # Title of your website (required).
-title: "Dot Org Theme Demo"
+title: "NECCDL"
 # Default time zone for time stamps; use any valid tz database name: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
 timeZone: "America/New_York"
 

config/_default/languages.yaml

@@ -1,5 +1,5 @@
 en:
-  languageName: English
+  label: English
   weight: 1
   ### copyright (markdown can be used) ###
   copyright: " "
@@ -48,11 +48,25 @@ en:
     #   post: "Learn how to impact the next generation of cybersecurity professionals"
     #   parent: "support"
 
-    - identifier: "neccdc-2026"
-      name: "NECCDC 2026"
-      url: "/history/2026/"
+    - identifier: "resources"
+      name: "Resources"
       weight: 4
 
+    - identifier: "neccdc"
+      name: "NECCDC"
+      url: "/docs/neccdc"
+      weight: 1
+      post: "Documentation about the competition"
+      parent: "resources"
+
+    - identifier: "volunteer"
+      name: "Volunteer"
+      url: "/volunteer/"
+      weight: 2
+      post: "Get involved with League"
+      parent: "resources"
+
+
     - identifier: "history"
       name: "History"
       url: "/history/"

config/production/hugo.yaml

@@ -1,7 +1,6 @@
 ######################## production configuration ####################
 # The base URL of your site (required). This will be prepended to all relative URLs.
-baseURL: https://beta.neccdl.org
-googleAnalytics:
+baseURL: https://neccdl.org
 enableRobotsTXT: true
 build:
   writeStats: true

content/en/docs/neccdc/operational-aid.md → content/en/docs/neccdc/operational-aid/index.md

@@ -13,9 +13,6 @@ The goal behind this change is to balance between encouraging teams to seek help
 Each team is given a budget of 1000 points that they can spend on assistance from the Black Team.
 Spent points will count against system scoring.
 
-Each assistance request that has a point cost will be multiplied by the corresponding number in the [Fibonacci sequence](https://en.wikipedia.org/wiki/Fibonacci_sequence) (excluding 0).
-For example, the first request will cost x1, the second x1, the third x2, and so on, following the sequence of Fibonacci numbers.
-
 | Type                                  | Description                                                                                                                                                                                                         | Cost |
 | ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
 | Server Redeployments                  | Cleanly redeploy the server to a pre-competition state.                                                                                                                                                             | 30   |
@@ -25,12 +22,20 @@ For example, the first request will cost x1, the second x1, the third x2, and so
 | Competent Questions                   | Thoughtful questions that include information on what your team has already tried, including results if applicable.<br>Abuse of this offering or questions that lack any prior effort will result in a 5-point fee. | 0\*  |
 | Competition Setup Questions           | This includes questions related to initial environment VPN setup, access to initial credentials, questions designated to Black, White or Red Teams, and the like.                                                   | 0    |
 
-## Additional Information
+<br>
+
+Each assistance request that has a point cost will be multiplied by the corresponding number in the [Fibonacci sequence](https://en.wikipedia.org/wiki/Fibonacci_sequence) (excluding 0).
+For example, the first request will cost x1, the second x1, the third x2, and so on, following the sequence of Fibonacci numbers.
+
+<br>
+
+{{< image alt="Price Multiplier by Occurrence" src="price_multiplier.svg" >}}
+
+---
 
 - When servers are redeployed or access is restored, teams do not get refunded for the missing points they could have gained from injects or service checks.
 - Server redeployments cannot be performed during the end of the competition.
 - Submit a ticket and use the **@BlackTeam** handle in the competition Discord, otherwise, your message will not be noticed. Keep in mind that the Black Team is also responding to other teams. If there is no response in five minutes, please ping us again.
-- The more point-costing requests you make to the Black Team for assistance, the higher the cost of each subsequent request.
-- Upon request after competition completion, teams can request a summary of events that required the Black Teams' intervention.
-- In case of _force majeure_ or proven hosting issues, lost points can be refunded.
+- Upon request after competition completion, teams can request a summary of events that required intervention from the Black Team.
+- In case of _force majeure_ or confirmed hosting issues, lost points can be refunded.
 - The Black Team has full discretion to assign point pricing to help events.

content/en/volunteer/_index.md

@@ -17,11 +17,11 @@ Representatives who serve as competition officials, moderators, and rule enforce
 - Supply and score Blue Team tasks in the form of competition injects
 - Adjudicate the scoring for the competition
 
-#### Chief Judge
+### Chief Judge
 Responsible for final decisions concerning scoring.
 The chief judge has no active or historical, professional or personal affiliation with any school in the league.
 
-#### Moderators
+### Moderators
 - Undertake moderator training offered by NECCDC
 - Gain familiarity with using the required communication tools (e.g., Competition Discord)
 - Submit questions and requests from the blue team members to the designated communication channels
@@ -32,7 +32,7 @@ The chief judge has no active or historical, professional or personal affiliatio
 ## [Black Team]({{< ref "black-team" >}})
 Black Team members are our competition technicians. They develop, deploy, and maintain a unique competition environment every year. They also configure remote access, Discord, the service scoring.
 
-#### Gray Team
+### Gray Team
 Helps write technical injects alongside the White Team.
 
 ## Red Team

docker-compose.yaml

@@ -0,0 +1,19 @@
+services:
+  hugo:
+    container_name: neccdl-hugo
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: build
+    platform: linux/amd64
+    entrypoint: hugo
+    command:
+      - server
+      - -D
+      - --bind
+      - 0.0.0.0
+    ports:
+      - "1313:1313"
+    volumes:
+      - ./:/app
+    restart: unless-stopped

layouts/partials/footer/github.html

@@ -2,7 +2,7 @@
 {{ if and .repo_url .show_edit_link }}
 {{ with $.File }}
 {{ $pageRelPath := replace .Path "\\" "/" }}
-{{ $langPrefix := $.Site.LanguageCode }}
+{{ $langPrefix := $.Site.Language.Locale }}
 {{ $editURL := printf "%s/content/%s/%s" $.Site.Params.github.repo_url $langPrefix $pageRelPath }}
 
 <a target="_blank" rel="noopener noreferrer" href="{{ $editURL }}" class="nowrap" style="font-size: small; font-weight: 700;">
@@ -11,4 +11,4 @@
 
 {{ end }}
 {{ end }}
-{{ end }}
+{{ end }}