Skip to content

Commit

Permalink
Merge pull request #22 from jerseyctf/JerseyCTF2024-Dev
Browse files Browse the repository at this point in the history
Jersey ctf2024 dev
  • Loading branch information
AtomicPhoenix authored Feb 10, 2024
2 parents dea5cf6 + 3d02317 commit 96e0f8e
Show file tree
Hide file tree
Showing 11 changed files with 165 additions and 25 deletions.
127 changes: 127 additions & 0 deletions src/img/JCTFIV/JCTFIV_Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/sponsor/ISACA_logo_RGB.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/sponsor/JerseyCTF_IV_Sponsorship_Packet.pdf
Binary file not shown.
Binary file not shown.
Binary file added src/img/sponsor/crowdstrike.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/lib/sponsors.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ func GetSponsors() Sponsors {
ALT: "AWS",
Width: "200",
},
{
HREF: "https://www.crowdstrike.com/en-us/",
Source: "crowdstrike.png",
ALT: "CrowdStrike",
Width: "200",
},
{
HREF: "https://www.isaca.org/",
Source: "ISACA_logo_RGB.jpg",
ALT: "ISACA",
Width: "200",
},
}

tiers := []Tier{
Expand Down
37 changes: 19 additions & 18 deletions src/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"net/http"
"strconv"
"text/template"

L "github.com/njitacm/jerseyctf-website/src/lib" //Not the current Repo, but everything works, look into if changes should be made
)

Expand All @@ -20,36 +21,36 @@ func index(w http.ResponseWriter, r *http.Request) {
tmpl.ExecuteTemplate(w, "header", nil)

//The sections that load are based off of what strings are in this list
navBar := []string{ "Schedule","Speakers","Sponsors","FAQ","Resources"} // "Registration","Schedule","Speakers","Sponsors","Recognitions","FAQ","Resources"
navBar := []string{"Registration", "Schedule", "Speakers", "Sponsors", "FAQ", "Resources"} // "Registration","Schedule","Speakers","Sponsors","Recognitions","FAQ","Resources"
tmpl.ExecuteTemplate(w, "navNBody", navBar)

tmpl.ExecuteTemplate(w, "infographic", nil)

for _, value := range navBar {
switch value {
case "Registration":
tmpl.ExecuteTemplate(w, "registration", nil)
case "Registration":
tmpl.ExecuteTemplate(w, "registration", nil)

case "Schedule":
tmpl.ExecuteTemplate(w, "schedule", nil)
case "Schedule":
tmpl.ExecuteTemplate(w, "schedule", nil)

case "Speakers":
L.Speaker(w, tmpl)
case "Speakers":
L.Speaker(w, tmpl)

case "Sponsors":
sponsors := L.GetSponsors()
tmpl.ExecuteTemplate(w, "sponsors", sponsors)
case "Sponsors":
sponsors := L.GetSponsors()
tmpl.ExecuteTemplate(w, "sponsors", sponsors)

case "FAQ":
faq := L.GetFaq()
tmpl.ExecuteTemplate(w, "faq", faq)
case "FAQ":
faq := L.GetFaq()
tmpl.ExecuteTemplate(w, "faq", faq)

case "Recognitions":
L.Recognition(w, tmpl)
case "Recognitions":
L.Recognition(w, tmpl)

case "Resources":
resources := L.GetResources()
tmpl.ExecuteTemplate(w, "resources", resources)
case "Resources":
resources := L.GetResources()
tmpl.ExecuteTemplate(w, "resources", resources)
}
}
tmpl.ExecuteTemplate(w, "footer", nil)
Expand Down
2 changes: 1 addition & 1 deletion src/templates/infographic.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="infographic" class="row justify-content-center" style="background-color: #a8a8a8;">
<div class="col-6 d-flex justify-content-end">
<div class="d-flex justify-content-end">
<img src="/assets/img/JCTFIII/lock.png" class="mx-auto d-block" alt="JerseyCTF Landing Page" height="250">
<img src="/assets/img/JCTFIV/JCTFIV_Logo.svg" width="300rem" class="mx-auto d-block" alt="JerseyCTF Landing Page" height="250">
</div>
</div>
<div class="col-3 col align-self-center">
Expand Down
6 changes: 3 additions & 3 deletions src/templates/registration.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{block "registration" .}}
<div id="Registration" class="row">
<h4 class="jerctf">@registration</h4>
<h5 class="registText">
Registration is now open. Register at <a href="https://ctf.jerseyctf.com/register">ctf.jerseyctf.com/register</a> TODAY!
</h5>
<h4 class="registText">
<b>Registration is now open. Register at <a href="https://jerseyctf.ctfd.io/">ctf.jerseyctf.com/register</a> TODAY!</b>
</h4>
</div>
{{end}}
2 changes: 1 addition & 1 deletion src/templates/resources.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h4 class="jerctf">@resources</h4>
</a>
</div>
<div class="col mt-3">
<a href="https://www.majorleaguecyber.org/events/909/jerseyctf-iii" target="_blank">
<a href="https://www.majorleaguecyber.org/events/1164/jerseyctf-iv" target="_blank">
<img class="resourceImg" src="/assets/img/resources/majorleaguecyber.png" />
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/templates/speakers.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ <h4 class="jerctf">@speakers</h4>

{{block "speaker-card" .}}
{{if true}}
<div class="col-md-4 col-lg-3 col-sm-6">
<div class="card h-100" style="padding: 1rem;">
<div class="col-md-4 col-lg-3 col-sm-6" style="margin: auto;">
<div class="card h-100" style="padding: 1rem; margin: auto;">
<img src="/assets/img/speaker/{{.Pic}}" class="card-img-top" alt="{{.Name}}">
<div class="card-body">
<h5 style="font-weight: bold;" class="card-title">{{.Name}}</h5>
Expand Down

0 comments on commit 96e0f8e

Please sign in to comment.