Schedule improvements

.github/workflows/docker.yml

@@ -5,34 +5,52 @@ on:
     - cron: "42 2 2 * *"
   workflow_dispatch:
 
-env:
-  REGISTRY: ghcr.io
-  REPO_NAME: ${{ github.repository }}
-
 jobs:
   buildDockerImage:
     name: Build Docker image
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: nschloe/action-cached-lfs-checkout@v1
+        uses: actions/checkout@v4
         with:
           submodules: recursive
+          lfs: false
+      - name: Create LFS file list
+        run: git lfs ls-files --long | cut -d ' ' -f1 | sort > .lfs-assets-id
+      - name: LFS Cache
+        uses: actions/cache@v4
+        with:
+          path: .git/lfs/objects
+          key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}
+          restore-keys: |
+            ${{ runner.os }}-lfs-
+      - name: Git LFS Pull
+        run: git lfs pull
+      # remove the git lfs directory to free up disk space
+      - name: Remove File
+        uses: JesseTG/[email protected]
+        with:
+          path: ./git/lfs
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: '0.135.0'
+          extended: true
+      - name: Build
+        run: hugo --minify --noTimes=false
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Repo name
-        run: echo "IMAGE_ID=$(echo ${{ env.REGISTRY }}/${{ env.REPO_NAME }} | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v3
         with:
-          images: "${{ env.IMAGE_ID }}"
+          images: ghcr.io/wisvch/nwerc-2024
           tags: type=sha, prefix={{date 'YYYYMMDD'}}-
       - name: Build and push Docker image
         uses: docker/build-push-action@v2

Dockerfile

@@ -1,12 +1,7 @@
-FROM klakegg/hugo:ext AS  builder
-ENV HUGO_ENV=production
-COPY . /src
-RUN hugo
-
 FROM wisvch/nginx
 # Change the config file to serve index for urls
 USER root
 RUN sed -i -r '/404.html;/a\    error_page  404              /404.html;' /etc/nginx/conf.d/default.conf
 RUN sed -i -r '/^server \{.*/a     absolute_redirect off;' /etc/nginx/conf.d/default.conf
 USER 100
-COPY --from=builder /src/public/ /srv/
+COPY --link ./public /srv

content/schedule/coach_meeting_bapc.md

@@ -5,11 +5,11 @@ day: sunday
 start: 12:15
 duration: 1h15m
 width: 1
-location: Building 35 - meeting room 1
+location: Building 35 - Meeting room 1
 people: coaches from Benelux area
 ---
 ## Location
-The BAPC coach meeting takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The meeting room 1 (IZ2) is located on the second floor.
+The BAPC coach meeting takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+Meeting room 1 is located on the second floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/coach_meeting_gcpc.md

@@ -9,7 +9,7 @@ location: Building 35 - Meeting room 1
 people: German coaches
 ---
 ## Location
-The GCPC Coach meeting takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The meeting room 1 (IZ2) is located on the second floor. 
+The GCPC coach meeting takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+Meeting room 1 is located on the second floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/coach_meeting_general.md

@@ -5,13 +5,13 @@ day: sunday
 start: 13:30
 duration: 1h30m
 width: 2
-location: Building 35 - Coach hall
-people: coaches
+location: Building 35 - Coaches room
+people: All coaches
 ---
 During this meeting, the coaches will discuss future plans for the NWERC. Bids may be presented to host the NWERC in 2027 and later.
 
 ## Location
-The General coach meeting takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The coach hall (IZ3) is located on the second flor floor.
+The general coach meeting takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The coaches room is located on the second floor.
 
-For directions, see the [Location page]({{< relref "location" >}} "Location").
+For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/coach_meeting_ncpc.md

@@ -9,7 +9,7 @@ location: Building 35 - Meeting room 2
 people: Nordic and Baltic coaches
 ---
 ## Location
-The NCPC coach meeting takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The meeting room 2 (IZ4) is located on the second floor.
+The NCPC coach meeting takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+Meeting room 2 is located on the second floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/coach_meeting_ukiepc.md

@@ -9,7 +9,7 @@ location: Building 35 - Meeting room 2
 people: UK and Ireland coaches
 ---
 ## Location
-The UKIEPC coach meeting takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The meeting room 2 (IZ4) is located on the second floor.
+The UKIEPC coach meeting takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+Meeting room 2 is located on the second floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/company_market.md

@@ -1,5 +1,5 @@
 ---
-title: "Company Market"
+title: "Company market"
 type: event
 day: saturday
 start: 12:00
@@ -11,8 +11,8 @@ weight: 3
 ---
 
 ## Location
-The Opening ceremony takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The speeches hall (TZ2) is located on the ground floor.
+The company market takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The speeches hall is located on the ground floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").
 

content/schedule/contest.md

@@ -5,10 +5,11 @@ day: sunday
 start: 10:00
 duration: 5h0m
 width: 1
-location: Building 35 - Contest Halls
+location: Building 35 - Contest halls
 people: contestants
 weight: 10
 ---
 
 The contest will take 5 hours, with a score freeze at 14:00.
 
+The contest halls are located on the ground floor.

content/schedule/dinner.md

@@ -9,4 +9,4 @@ location: Flux
 people: all
 ---
 ## Location
-The Dinner takes place in the [Flux](https://map.tudelftcampus.nl/poi/flux/).
+The dinner takes place in the [Flux building](https://map.tudelftcampus.nl/poi/flux/).

content/schedule/last_info_speech.md

@@ -4,13 +4,13 @@ type: event
 day: sunday
 start: 9:00
 duration: 0h45m
-width: 3
+width: 4
 location: Building 35 - Speeches hall
 people: all
 ---
 
 ## Location
-The Last info speech takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The speeches hall (TZ2) is located on the ground floor.
+The last info speech takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The speeches hall is located on the ground floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/late_registration.md

@@ -9,11 +9,11 @@ location: Building 35 - Hall
 people: all
 ---
 
-Please [contact]({{< relref "Contact" >}} "Location") us if you want to use late registration. 
+Please [contact]({{< relref "contact" >}} "Contact") us if you want to use late registration.
 
-During registration all team members and on-site coaches need to register. You will receive your badge, T-Shirt and goody bag. Also a team picture will be taken.
+During registration all team members and on-site coaches need to register. You will receive your badge, T-shirt and goodie bag. Also, a team picture will be taken.
 
 ## Location
-The registration takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The registration takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/lunch.md

@@ -7,11 +7,11 @@ duration: 1h
 width: 1
 location: Building 35 - Speeches hall
 people: all
-weight: 2  
+weight: 2
 ---
 
 ## Location
-The Lunch takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The speeches hall (TZ2) is located on the ground floor.
+The lunch takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The speeches hall is located on the ground floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/q_a_testsession.md

@@ -1,5 +1,5 @@
 ---
-title: "Q&A Test session"
+title: "Q&A test session"
 type: event
 day: saturday
 start: 13:00
@@ -9,11 +9,10 @@ location: Building 35 - Speeches hall
 people: all
 ---
 
-This Q&A is your chance to ask your last questions to the people of the jury, and the people of the systems.
+This Q&A is your chance to ask your last questions to the people of the jury and the systems.
 
 ## Location
-The Q&A Test Session takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The speeches hall (TZ2) is located on the ground floor.
+The Q&A test session takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The speeches hall is located on the ground floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").
-.

content/schedule/registration.md

@@ -9,9 +9,10 @@ location: Faculty EEMCS
 people: all
 ---
 
-During registration all team members and on-site coaches need to register. You will receive your badge, T-Shirt and goody bag. Also a team picture will be taken.
+During registration all team members and on-site coaches need to register. You will receive your badge, T-shirt and goodie bag. Also, a team picture will be taken.
 
 ## Location
-The registration takes place in the [Faculty EEMCS](https://map.tudelftcampus.nl/poi/elektrotechniek-wiskunde-en-informatica-ewi/).
+The registration takes place in [Faculty EEMCS](https://map.tudelftcampus.nl/poi/elektrotechniek-wiskunde-en-informatica-ewi/).
+This is the tall red/blue building.
 Exact location will be added later.
-For directions, see the [Location page]({{< relref "location" >}} "Location"). This is the tall red/blue building.
+For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/seminar.md

@@ -1,19 +1,21 @@
 ---
-title: "Coach Seminar"
+title: "Coach seminar"
 type: event
 day: sunday
 start: 10:00
-duration: 1h
+duration: 1h00m
 width: 2
-location: Building 35 - Coach hall
+location: Building 35 - Coaches hall
 people: coaches
 ---
 The coach seminar will give an update on the latest developments and backgrounds on the World Finals 2023 and 2024, the
-European Championships and the growth of the NWERC in the future. These points can be discussed further during the
-subregional and general coach meeting. The seminar will start around 15 minutes after the contest started.
+European Championships and the growth of NWERC in the future. These points can be discussed further during the
+subregional and general coach meetings.
+
+The coach spectator room is on the first floor and can also be used to work in silence.
 
 ## Location
-The Last info speech takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The coach hall (IZ3) is located on the second floor. The coach spectator room is in PC3 on the first floor and can also be used to work in silence. 
+The Coach seminar takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The coaches hall is located on the second floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/solutions_presentation.md

@@ -4,16 +4,16 @@ type: event
 day: sunday
 start: 15:30
 duration: 1h30m
-width: 3
-location: Building 35 - Speeches Hall
+width: 4
+location: Building 35 - Speeches hall
 people: all
 ---
 
-Here the jury will present the solutions to the problems.
-After this, the frozen part of the scoreboard is slowly revealed and the winners are announced!
+Here, the jury will present the solutions to the problems.
+After this, the frozen part of the scoreboard is revealed and the winners are announced!
 
 ## Location
-The Solutions and awards ceremony takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The speeches hall (TZ2) is located on the ground floor.
+The Solutions and awards ceremony takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The speeches hall is located on the ground floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/tech_talk.md

@@ -1,5 +1,5 @@
 ---
-title: "TechTalk"
+title: "Tech talk"
 type: event
 day: saturday
 start: 13:30
@@ -9,11 +9,8 @@ location: Building 35 - Speeches hall
 people: all
 ---
 
-
-
 ## Location
-The TechTalk takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The speeches hall (TZ2) is located on the ground floor.
+The tech talk takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The speeches hall is located on the ground floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").
-.

content/schedule/test_session.md

@@ -11,4 +11,4 @@ people: contestants
 
 During the test session, the contestants will have a chance to test their workstation, and all the software they want to use.
 
-The Contest halls are located on the ground floor. Teams 1 to 65 are in Hall1 and 66 to 87 in PC2.
+The contest halls are located on the ground floor. 

content/schedule/walk_in.md

@@ -4,11 +4,12 @@ type: event
 day: sunday
 start: 8:30
 duration: 0h30m
-width: 3
+width: 4
 location: Building 35
 people: all
 ---
+
 ## Location
-The location is the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+On Sunday, you can enter [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/) from 8:30.
 
-For directions, see the [Location page]({{< relref "location" >}} "Location").
+For directions, see the [Location page]({{< relref "location" >}} "Location").

content/schedule/welcome_speech.md

@@ -1,5 +1,5 @@
 ---
-title: "Opening Ceremony"
+title: "Opening ceremony"
 type: event
 day: saturday
 start: 9:30
@@ -10,7 +10,7 @@ people: all
 ---
 
 ## Location
-The Opening ceremony takes place in the [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
-The speeches hall (TZ2) is located on the ground floor.
+The opening ceremony takes place in [Education Building 35](https://map.tudelftcampus.nl/poi/education-building-35/).
+The speeches hall is located on the ground floor.
 
 For directions, see the [Location page]({{< relref "location" >}} "Location").

layouts/partials/site-footer.html

@@ -69,6 +69,6 @@
         <a class="f4 fw4 hover-white no-underline white-70 dn dib-ns pv2 ph3" href="{{ .Site.Home.Permalink }}">
             &copy; {{ with .Site.Copyright | default .Site.Title }} {{ . | safeHTML }} {{ now.Format "2006"}} {{ end }}
         </a>
-        <div>{{ partial "social-follow.html" . }}</div>
+        <div>{{ partialCached "social/follow.html" . }}</div>
     </div>
 </footer>

layouts/partials/site-navigation.html

@@ -20,7 +20,7 @@
           {{ end }}
         </ul>
       {{ end }}
-      {{ partialCached "social-follow.html" . }}
+      {{ partialCached "social/follow.html" . }}
     </div>
   </div>
 </nav>