Fix incorrect times and info

config.json

@@ -35,7 +35,8 @@
   },
   "hackathon": {
     "start_time": "2024-03-20T00:15:00-08:00",
-    "duration": "150m"
+    "duration": "150m",
+    "location": "EC 063"
   },
   "open_registration_time": "2024-03-17T00:00:00-08:00"
 }

internal/config/config.go

@@ -37,6 +37,7 @@ type ProblemModule struct {
 type HackathonConfig struct {
 	StartTime time.Time `json:"start_time"`
 	Duration  Duration  `json:"duration"`
+	Location  string    `json:"location"`
 }
 
 func (c HackathonConfig) EndTime() time.Time {

server/frontend/frontend.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/Masterminds/sprig/v3"
+	"github.com/dustin/go-humanize"
 	"github.com/yuin/goldmark"
 	"libdb.so/tmplutil"
 )
@@ -65,6 +66,7 @@ func NewTemplater(fs fs.FS) *tmplutil.Templater {
 							int(d.Seconds())%60)
 					}
 				},
+				"ordinal": humanize.Ordinal,
 			},
 		),
 	}

server/frontend/pages/hackathon.html

@@ -13,12 +13,18 @@
     <hgroup>
       <h1>Mini Hackathon</h1>
       <p>
-        <b>Think</b>, <b>create</b> and <b>present</b> at this mini hackathon geared towards
-        beginners
+        {{ .StartTime.Format "Monday, January" }}
+        {{ .StartTime.Day | ordinal }}
+        in
+        {{ .Location }}
       </p>
     </hgroup>
 
     <section>
+      <p>
+        <b>Think</b>, <b>create</b> and <b>present</b> at this mini Hackathon geared towards
+        beginners.
+      </p>
       <p><strong>Move quickly, you've only got 2 hours!</strong></p>
     </section>
 

server/frontend/pages/index.html

@@ -37,7 +37,12 @@ <h2>Getting Started</h2>
     <section class="compete">
       <hgroup>
         <h2>Week of Code</h2>
-        <p>Monday, February 19th until 23rd</p>
+        <p>
+          {{ .Problems.StartedAt.Format "Monday, January" }}
+          {{ .Problems.StartedAt.Day | ordinal }}
+          until the
+          {{ .Problems.EndingAt.Day | ordinal }}
+        </p>
       </hgroup>
       <p>
         A week of coding challenges designed and curated by ACM to promote good problem-solving
@@ -58,7 +63,12 @@ <h2>Week of Code</h2>
     <section>
       <hgroup>
         <h2>Mini Hackathon</h2>
-        <p>Monday, February 23rd at ??? in CS ???</p>
+        <p>
+          {{ .HackathonConfig.StartTime.Format "Monday, January" }}
+          {{ .HackathonConfig.StartTime.Day | ordinal }}
+          in
+          {{ .HackathonConfig.Location }}
+        </p>
       </hgroup>
 
       <p>

server/frontend/pages/problems.html

@@ -8,13 +8,21 @@
   <article>
     <hgroup>
       <h2>Week of Code</h2>
-      <p>A new coding problem every day</p>
+      <p>
+        {{ .Problems.StartedAt.Format "Monday, January" }}
+        {{ .Problems.StartedAt.Day | ordinal }}
+        until the
+        {{ .Problems.EndingAt.Day | ordinal }}
+      </p>
     </hgroup>
 
-    <p>
-      Completing at least one part each day will result in a
-      <mark>1337</mark> score bonus for your team!
-    </p>
+    <section>
+      <p>A new coding problem every day!</p>
+      <p>
+        You may get more points for solving problems <b>as soon as they are released</b>, so keep an
+        eye out for the next problem!
+      </p>
+    </section>
 
     {{ if not (eq .Problems.TotalProblems 1) }}
       <ul class="problems">

server/problem/problemset.go

@@ -44,6 +44,15 @@ func (p *ProblemSet) StartedAt() time.Time {
 	return p.schedule.StartReleaseAt
 }
 
+// EndingAt returns the time at which the last problem is released. If the
+// problem set does not have a release schedule, it returns the zero time.
+func (p *ProblemSet) EndingAt() time.Time {
+	if p.schedule == nil {
+		return time.Time{}
+	}
+	return p.schedule.StartReleaseAt.Add(time.Duration(len(p.problems)) * p.schedule.ReleaseEvery)
+}
+
 // Problems returns all available problems in the set.
 func (p *ProblemSet) Problems() []Problem {
 	return p.problems[:p.AvailableProblems()]

server/server.go

@@ -109,7 +109,9 @@ func writeError(w http.ResponseWriter, code int, err error) {
 
 type indexPageData struct {
 	frontend.ComponentContext
-	InviteCode string
+	Problems        *problem.ProblemSet
+	HackathonConfig config.HackathonConfig
+	InviteCode      string
 }
 
 func (s *Server) index(w http.ResponseWriter, r *http.Request) {
@@ -130,7 +132,9 @@ func (s *Server) index(w http.ResponseWriter, r *http.Request) {
 			TeamName: u.TeamName,
 			Username: u.Username,
 		},
-		InviteCode: inviteCode,
+		Problems:        s.problems,
+		HackathonConfig: s.config.HackathonConfig,
+		InviteCode:      inviteCode,
 	})
 }