diff --git a/.gitignore b/.gitignore index efb69af..45ef305 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ # Ignored executables written by Go -src/main \ No newline at end of file +**/main +**/main.exe +**/a.out \ No newline at end of file diff --git a/src/css/custom.css b/src/css/custom.css index d0eed40..9f52169 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -11,6 +11,7 @@ color:white; margin-top: -10px; font-size: 75%; + margin-left: 15%; } .registText{ margin: 10px 0px 20px 0px; @@ -66,6 +67,15 @@ li{ margin: .5% 0 .5% 5%; } +.resourceImg{ + height: 75px; +} + +.centered { + margin-left: auto; + margin-right: auto; +} + [id='Code of Conduct'] > p, [id='Privacy Policy'] > p{ padding: .5% 4% .5% 4%; @@ -74,4 +84,4 @@ li{ [id='Code of Conduct'] > h3, [id='Privacy Policy'] > h3{ font-weight: bold; -} \ No newline at end of file +} diff --git a/src/img/JCTFIII/JCTF_III_Run_of_Show.png b/src/img/JCTFIII/JCTF_III_Run_of_Show.png new file mode 100644 index 0000000..ce6407d Binary files /dev/null and b/src/img/JCTFIII/JCTF_III_Run_of_Show.png differ diff --git a/src/img/JCTFIII/lock.png b/src/img/JCTFIII/lock.png new file mode 100644 index 0000000..c4c7642 Binary files /dev/null and b/src/img/JCTFIII/lock.png differ diff --git a/src/img/JCTFIII/title.png b/src/img/JCTFIII/title.png new file mode 100644 index 0000000..4788344 Binary files /dev/null and b/src/img/JCTFIII/title.png differ diff --git a/src/img/acm_logo.png b/src/img/footer/acm_logo.png similarity index 100% rename from src/img/acm_logo.png rename to src/img/footer/acm_logo.png diff --git a/src/img/github-logo.png b/src/img/footer/github-logo.png similarity index 100% rename from src/img/github-logo.png rename to src/img/footer/github-logo.png diff --git a/src/img/nicc_logo.png b/src/img/footer/nicc_logo.png similarity index 100% rename from src/img/nicc_logo.png rename to src/img/footer/nicc_logo.png diff --git a/src/img/njit_logo.png b/src/img/footer/njit_logo.png similarity index 100% rename from src/img/njit_logo.png rename to src/img/footer/njit_logo.png diff --git a/src/img/sci_logo_tall.png b/src/img/footer/sci_logo_tall.png similarity index 100% rename from src/img/sci_logo_tall.png rename to src/img/footer/sci_logo_tall.png diff --git a/src/img/ywcc_logo.png b/src/img/footer/ywcc_logo.png similarity index 100% rename from src/img/ywcc_logo.png rename to src/img/footer/ywcc_logo.png diff --git a/src/img/Red_1.png b/src/img/previous/JCTFI/Red.png similarity index 100% rename from src/img/Red_1.png rename to src/img/previous/JCTFI/Red.png diff --git a/src/img/TopBitOfWebsite.png b/src/img/previous/JCTFI/TopBitOfWebsite.png similarity index 100% rename from src/img/TopBitOfWebsite.png rename to src/img/previous/JCTFI/TopBitOfWebsite.png diff --git a/img/fullsite-jerseyctf.png b/src/img/previous/JCTFI/fullsite-jerseyctf.png similarity index 100% rename from img/fullsite-jerseyctf.png rename to src/img/previous/JCTFI/fullsite-jerseyctf.png diff --git a/src/img/lock1.png b/src/img/previous/JCTFI/lock.png similarity index 100% rename from src/img/lock1.png rename to src/img/previous/JCTFI/lock.png diff --git a/src/img/wide_scren.png b/src/img/previous/JCTFI/wide_scren.png similarity index 100% rename from src/img/wide_scren.png rename to src/img/previous/JCTFI/wide_scren.png diff --git a/src/img/JerseyCTF_II_Schedule_Poster.png b/src/img/previous/JCTFII/JerseyCTF_II_Schedule_Poster.png similarity index 100% rename from src/img/JerseyCTF_II_Schedule_Poster.png rename to src/img/previous/JCTFII/JerseyCTF_II_Schedule_Poster.png diff --git a/src/img/lock_logo.png b/src/img/previous/JCTFII/lock.png similarity index 100% rename from src/img/lock_logo.png rename to src/img/previous/JCTFII/lock.png diff --git a/src/img/title.png b/src/img/previous/JCTFII/title.png similarity index 100% rename from src/img/title.png rename to src/img/previous/JCTFII/title.png diff --git a/src/img/resources/ctftime.png b/src/img/resources/ctftime.png new file mode 100644 index 0000000..831efee Binary files /dev/null and b/src/img/resources/ctftime.png differ diff --git a/src/img/resources/linkedin.png b/src/img/resources/linkedin.png new file mode 100644 index 0000000..ed80f2f Binary files /dev/null and b/src/img/resources/linkedin.png differ diff --git a/src/img/resources/majorleaguecyber.png b/src/img/resources/majorleaguecyber.png new file mode 100644 index 0000000..13e43b6 Binary files /dev/null and b/src/img/resources/majorleaguecyber.png differ diff --git a/src/img/speaker/AbdelSyFane.jpg b/src/img/speaker/AbdelSyFane.jpg deleted file mode 100644 index f28504b..0000000 Binary files a/src/img/speaker/AbdelSyFane.jpg and /dev/null differ diff --git a/src/img/speaker/AndrewGarcia.jpg b/src/img/speaker/AndrewGarcia.jpg new file mode 100644 index 0000000..48b7c59 Binary files /dev/null and b/src/img/speaker/AndrewGarcia.jpg differ diff --git a/src/img/speaker/CelinePedalino.jpg b/src/img/speaker/CelinePedalino.jpg new file mode 100644 index 0000000..a14f088 Binary files /dev/null and b/src/img/speaker/CelinePedalino.jpg differ diff --git a/src/img/speaker/GabrielleBotbol.jpg b/src/img/speaker/GabrielleBotbol.jpg deleted file mode 100644 index 1d95b68..0000000 Binary files a/src/img/speaker/GabrielleBotbol.jpg and /dev/null differ diff --git a/src/img/speaker/HopeWalker.jpg b/src/img/speaker/HopeWalker.jpg deleted file mode 100644 index 4f9114a..0000000 Binary files a/src/img/speaker/HopeWalker.jpg and /dev/null differ diff --git a/src/img/speaker/IlanPonimansky.jpg b/src/img/speaker/IlanPonimansky.jpg index 997c4c4..0e8db31 100644 Binary files a/src/img/speaker/IlanPonimansky.jpg and b/src/img/speaker/IlanPonimansky.jpg differ diff --git a/src/img/speaker/JoannaHuisman.jpg b/src/img/speaker/JoannaHuisman.jpg deleted file mode 100644 index 6aa1799..0000000 Binary files a/src/img/speaker/JoannaHuisman.jpg and /dev/null differ diff --git a/src/img/speaker/JohnHammond.png b/src/img/speaker/JohnHammond.png new file mode 100644 index 0000000..4e020b3 Binary files /dev/null and b/src/img/speaker/JohnHammond.png differ diff --git a/src/img/speaker/JohnJackson.jpg b/src/img/speaker/JohnJackson.jpg deleted file mode 100644 index cd941da..0000000 Binary files a/src/img/speaker/JohnJackson.jpg and /dev/null differ diff --git a/src/img/speaker/JonHelmus.jpg b/src/img/speaker/JonHelmus.jpg deleted file mode 100644 index 322a704..0000000 Binary files a/src/img/speaker/JonHelmus.jpg and /dev/null differ diff --git a/src/img/speaker/JosephRusso.jpg b/src/img/speaker/JosephRusso.jpg deleted file mode 100644 index 7b44e41..0000000 Binary files a/src/img/speaker/JosephRusso.jpg and /dev/null differ diff --git a/src/img/speaker/MichaelGeraghty.jpg b/src/img/speaker/MichaelGeraghty.jpg deleted file mode 100644 index de16ab1..0000000 Binary files a/src/img/speaker/MichaelGeraghty.jpg and /dev/null differ diff --git a/src/img/speaker/SeonukKim.jpg b/src/img/speaker/SeonukKim.jpg new file mode 100644 index 0000000..98923c7 Binary files /dev/null and b/src/img/speaker/SeonukKim.jpg differ diff --git a/src/img/speaker/SethKirschner.jpg b/src/img/speaker/SethKirschner.jpg deleted file mode 100644 index 3565c5b..0000000 Binary files a/src/img/speaker/SethKirschner.jpg and /dev/null differ diff --git a/src/img/speaker/SwathiParthibha.jpg b/src/img/speaker/SwathiParthibha.jpg new file mode 100644 index 0000000..c191eec Binary files /dev/null and b/src/img/speaker/SwathiParthibha.jpg differ diff --git a/src/img/speaker/TrentMeyers.jpg b/src/img/speaker/TrentMeyers.jpg new file mode 100644 index 0000000..91a6ce5 Binary files /dev/null and b/src/img/speaker/TrentMeyers.jpg differ diff --git a/src/img/speaker/WilliamPrice.png b/src/img/speaker/WilliamPrice.png deleted file mode 100644 index 7d910b9..0000000 Binary files a/src/img/speaker/WilliamPrice.png and /dev/null differ diff --git a/src/img/speaker/person_placeholder.png b/src/img/speaker/personPlaceholder.png similarity index 100% rename from src/img/speaker/person_placeholder.png rename to src/img/speaker/personPlaceholder.png diff --git a/src/img/sponsor/JerseyCTF_IV_Sponsorship_Packet.pdf b/src/img/sponsor/JerseyCTF_IV_Sponsorship_Packet.pdf new file mode 100644 index 0000000..445ef8d Binary files /dev/null and b/src/img/sponsor/JerseyCTF_IV_Sponsorship_Packet.pdf differ diff --git a/src/img/sponsor/crowdstrike_logo.png b/src/img/sponsor/crowdstrike_logo.png deleted file mode 100644 index 0f912cb..0000000 Binary files a/src/img/sponsor/crowdstrike_logo.png and /dev/null differ diff --git a/src/img/sponsor/frsecure_logo.png b/src/img/sponsor/frsecure_logo.png deleted file mode 100644 index 4bc4988..0000000 Binary files a/src/img/sponsor/frsecure_logo.png and /dev/null differ diff --git a/src/img/sponsor/gemini_logo.png b/src/img/sponsor/gemini_logo.png deleted file mode 100644 index ccb45dd..0000000 Binary files a/src/img/sponsor/gemini_logo.png and /dev/null differ diff --git a/src/img/sponsor/github_logo.png b/src/img/sponsor/github_logo.png new file mode 100644 index 0000000..026a98c Binary files /dev/null and b/src/img/sponsor/github_logo.png differ diff --git a/src/img/sponsor/jctf_ex_company_logo.png b/src/img/sponsor/jctf_ex_company_logo.png deleted file mode 100644 index 019e24a..0000000 Binary files a/src/img/sponsor/jctf_ex_company_logo.png and /dev/null differ diff --git a/src/img/sponsor/lutron_logo.png b/src/img/sponsor/lutron_logo.png deleted file mode 100644 index 70f8851..0000000 Binary files a/src/img/sponsor/lutron_logo.png and /dev/null differ diff --git a/src/img/sponsor/offsec_logo.jpg b/src/img/sponsor/offsec_logo.jpg new file mode 100644 index 0000000..21a1ec0 Binary files /dev/null and b/src/img/sponsor/offsec_logo.jpg differ diff --git a/src/img/sponsor/original_pro_logo.png b/src/img/sponsor/original_pro_logo.png deleted file mode 100644 index 8d3960b..0000000 Binary files a/src/img/sponsor/original_pro_logo.png and /dev/null differ diff --git a/src/img/sponsor/palo_alto_logo.png b/src/img/sponsor/palo_alto_logo.png index be4770b..abef6f3 100644 Binary files a/src/img/sponsor/palo_alto_logo.png and b/src/img/sponsor/palo_alto_logo.png differ diff --git a/src/img/sponsor/specterops_logo.png b/src/img/sponsor/specterops_logo.png new file mode 100644 index 0000000..3476c3d Binary files /dev/null and b/src/img/sponsor/specterops_logo.png differ diff --git a/src/img/sponsor/sponsor_placeholder.png b/src/img/sponsor/sponsor_placeholder.png deleted file mode 100644 index d3c000b..0000000 Binary files a/src/img/sponsor/sponsor_placeholder.png and /dev/null differ diff --git a/src/lib/faq.go b/src/lib/faq.go index 3d78d9b..c36d65f 100644 --- a/src/lib/faq.go +++ b/src/lib/faq.go @@ -14,11 +14,11 @@ func GetFaq() []Faq { }, { Question: "Who can sign up to compete?", - Answer: "Students, beginners, and professionals are all welcome to compete as long as they are over the age of 18.", + Answer: "Students, beginners, and professionals are all welcome to compete. Must be 18+ to attend in-person.", }, { Question: "What do I need to compete?", - Answer: "All you need is an Internet-connected device in order to compete. It is completely optional if you want to use ethical hacking/penetration testing Linux distributions like Kali or Parrot OS, but these may help you since there are many pre-installed tools. These distributions are open-source and can be deployed in VMware, VirtualBox, or any other virtualization software.", + Answer: "All you need is an Internet-connected device in order to compete and watch our tech talks. While optional, it is recommended for you to use penetration testing Linux distributions like Kali or Parrot OS because the many pre-installed tools will help you. These distributions are free, open-source, and can be deployed in VMware, VirtualBox, or any other virtualization software. Check out our beginner resources page for more recommendations. ", }, { Question: "Will there be prizes?", @@ -26,7 +26,7 @@ func GetFaq() []Faq { }, { Question: "How big is JerseyCTF?", - Answer: "JerseyCTF had 1,470 registrations in 2022. We are looking forward to welcoming more registrants and participants in 2023!", + Answer: "JerseyCTF had 1,515 registrations in 2023. We are looking forward to welcoming more registrants and participants in 2024!", }, { Question: "Do I have to pay to compete in JerseyCTF?", diff --git a/src/lib/resources.go b/src/lib/resources.go index dbb7fcf..4608445 100644 --- a/src/lib/resources.go +++ b/src/lib/resources.go @@ -6,12 +6,6 @@ type Resource struct { Playlist string } -// Copy and Paste Add -// { -// Year: "2022", -// Writeups: "#", -// Playlist: "#", -// }, // Returns an Array of Writeups for usage throughout program func GetResources() []Resource { @@ -26,5 +20,10 @@ func GetResources() []Resource { Writeups: "https://github.com/njitacm/jerseyctf-2022-challenges/tree/main/writeups", Playlist: "https://youtube.com/playlist?list=PLrcTWWy-esnCuaiEMSj6Bst4phnq-Qg6B", }, + { + Year:"2023", + Writeups: "https://ctftime.org/event/1908/tasks/", + Playlist: "https://www.youtube.com/playlist?list=PLrcTWWy-esnDXi3khogdlAgkisL19IM08", + }, } } diff --git a/src/lib/speakers.go b/src/lib/speakers.go index ab9fea8..816661e 100644 --- a/src/lib/speakers.go +++ b/src/lib/speakers.go @@ -8,14 +8,15 @@ import ( // Segment Number refers to how one wishes to break down // cards const ( - SEGMENT_NUM = 5 + SEGMENT_NUM = 1 ) type SpeakerStruct struct { Pic string Name string Position string - Role string + Talk string + Time string } // Copy and Paste Add @@ -29,72 +30,65 @@ type SpeakerStruct struct { func GetSpeakers() []SpeakerStruct { return []SpeakerStruct{ - { - Pic: "MichaelGeraghty.jpg", - Name: "Michael Geraghty", - Position: "CISO, State of New Jersey & Director | NJCCIC",//CISO, State of New Jersey & Director, - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Jon Taylor", - Position: "Senior Security Manager and Principal Consultant | Accenture", - Role: "Keynote Speaker", - },{ - Pic: "", - Name: "Brian Herron", - Position: "Supervisory Special Agent | FBI", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Kevin McKenzie", - Position: "Cyber Security Analyst | NJCCIC", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Max Saltonstall", - Position: "(Pre-Recorded) IT Technical Director | Google", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Donnie Rodgers", - Position: "Dynamic Site Security Analyst | PlainDilemma", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Debbi Blyth", - Position: "(Pre-Recorded) Executive Public Sector Strategist | CrowdStrike", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Mike \"Pinky\" Thompson", - Position: "Incident Response Team Lead | FRSecure", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Pat Rucker", - Position: "Named Account Manager | Palo Alto Networks", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Jermaine Bethune", - Position: "System Engineer | Palo Alto Networks", - Role: "Keynote Speaker", - }, - { - Pic: "", - Name: "Joe Kim", - Position: "CTO/EVP of Engineering | Squadra Solutions", - Role: "Keynote Speaker", - }, - + {}, + /* + { + Pic: "JohnHammond.png", + Name: "John Hammond", + Position: "Cybersecurity Researcher, Educator & Content Creator", + Talk: "Cybersecurity Shop Talk", + Time: "", + }, + { + Pic: "CelinePedalino.jpg", + Name: "Celine Pedalino", + Position: "SOC Analyst at the NJCCIC", + Talk: "Behind the Scenes of Cyber Defense: A Look into the SOC", + Time: "", + }, + { + Pic: "SeonukKim.jpg", + Name: "Seonuk Kim", + Position: "SOC Analyst at the NJCCIC", + Talk: "Behind the Scenes of Cyber Defense: A Look into the SOC", + Time: "", + }, + { + Pic: "TrentMeyers.jpg", + Name: "Trent Meyers", + Position: "SOC Analyst at the NJCCIC", + Talk: "Behind the Scenes of Cyber Defense: A Look into the SOC", + Time: "", + }, + { + Pic: "SwathiParthibha.jpg", + Name: "Swathi Parthibha", + Position: "Security Analyst at the NJCCIC", + Talk: "Behind the Scenes of Cyber Defense: A Look into the SOC", + Time: "", + }, + { + Pic: "personPlaceholder.png", + Name: "Andrew Garcia", + Position: "Security Analyst at the NJCCIC", + Talk: "Two-Factor Authentication: Not as Secure as You Think", + Time: "", + }, + { + Pic: "IlanPonimansky.jpg", + Name: "Ilan Ponimansky", + Position: "Staff Cloud Security Engineer at Block", + Talk: "Acing your Cloud Security Interviews AMA", + Time: "", + }, + { + Pic: "personPlaceholder.png", + Name: "Kevin Conklin", + Position: "Cyber National Security Supervisory Special Agent at FBI Newark", + Talk: "Inside the FBI Cyber Program", + Time: "", + }, + */ } } @@ -113,62 +107,13 @@ func Speaker(w http.ResponseWriter, tpl *template.Template) { tpl.ExecuteTemplate(w, "speaker-start", nil) - length := len(speakers) - - // Creates a single line of speakers - if length < 6 { - tpl.ExecuteTemplate(w, "speaker-card-group-start", nil) - - for _, speaker := range speakers { - tpl.ExecuteTemplate(w, "speaker-card", speaker) - } + tpl.ExecuteTemplate(w, "speaker-card-group-start", nil) - tpl.ExecuteTemplate(w, "speaker-div-end", nil) + for _, speaker := range speakers { + tpl.ExecuteTemplate(w, "speaker-card", speaker) } - // Creates 2 card groups, split by using some integer division - if length <= 12 && length >= 6 { - - // First Group of Speakers (Speakers[0: length/2]) - tpl.ExecuteTemplate(w, "speaker-card-group-start", nil) - - for _, speaker := range speakers[0 : length/2] { - tpl.ExecuteTemplate(w, "speaker-card", speaker) - } - - tpl.ExecuteTemplate(w, "speaker-div-end", nil) - - // Second Group of Speakers (Speakers[length/2: length]) - tpl.ExecuteTemplate(w, "speaker-card-group-start", nil) - - for _, speaker := range speakers[length/2 : length] { - tpl.ExecuteTemplate(w, "speaker-card", speaker) - } - - tpl.ExecuteTemplate(w, "speaker-div-end", nil) - - } - - // Creates a dynamic grid - if length > 12 { - var iter int - - for idx, speaker := range speakers { - - iter++ - - j := idx + 1 - if j%SEGMENT_NUM == 1 { - tpl.ExecuteTemplate(w, "speaker-card-group-start", nil) - } - - tpl.ExecuteTemplate(w, "speaker-card", speaker) - - if iter%SEGMENT_NUM == 0 { - tpl.ExecuteTemplate(w, "speaker-div-end", nil) - } - } - } + tpl.ExecuteTemplate(w, "speaker-div-end", nil) tpl.ExecuteTemplate(w, "speaker-div-end", nil) diff --git a/src/lib/sponsors.go b/src/lib/sponsors.go index e05b123..5cc1da5 100644 --- a/src/lib/sponsors.go +++ b/src/lib/sponsors.go @@ -1,9 +1,9 @@ package lib type Tier struct { - Spons []Sponsor + Spons []Sponsor TierName string - CSSName string + CSSName string } type Sponsor struct { @@ -26,67 +26,67 @@ func GetSponsors() Sponsors { Width: "200", }, } - - ciso := []Sponsor{ - { - HREF: "https://frsecure.com/", - Source: "frsecure_logo.png", - ALT: "FRSecure", - Width: "450", - }, - } - - manager := []Sponsor{ - { - HREF: "https://www.paloaltonetworks.com/", - Source: "palo_alto_logo.png", - ALT: "Palo Alto Networks", - Width: "350", - }, - { - HREF: "https://cloud.google.com/", - Source: "google_logo.gif", - ALT: "Google", - Width: "200", - }, - { - HREF: "https://www.crowdstrike.com/", - Source: "crowdstrike_logo.png", - ALT: "CrowdStrike", - Width: "350", - }, - } + + ciso := []Sponsor{} + + manager := []Sponsor{} analyst := []Sponsor{ - { - HREF: "https://www.lutron.com/en-US/pages/default.aspx", - Source: "lutron_logo.png", - ALT: "Lutron", - Width: "300", - }, + /* + { + HREF: "https://www.paloaltonetworks.com/", + Source: "palo_alto_logo.png", + ALT: "Palo Alto", + Width: "400", + }, + { + HREF: "https://cloud.google.com/", + Source: "google_logo.gif", + ALT: "Google", + Width: "200", + }, + { + HREF: "https://www.github.com/", + Source: "github_logo.png", + ALT: "GitHub", + Width: "150", + }, + { + HREF: "https://www.offsec.com/", + Source: "offsec_logo.jpg", + ALT: "OffSec", + Width: "400", + }, + { + HREF: "https://www.specterops.io", + Source: "specterops_logo.png", + ALT: "SpecterOps", + Width: "400", + }, + */ } - + tiers := []Tier{ { - Spons: title, + Spons: title, TierName: "Title Sponsor", - CSSName: "sponsor-title", + CSSName: "sponsor-title", }, - + { - Spons: ciso, + Spons: ciso, TierName: "CISO Sponsor", - CSSName: "sponsor-ciso", + CSSName: "sponsor-ciso", }, { - Spons: manager, + Spons: manager, TierName: "Security Manager Sponsor", - CSSName: "sponsor-manager", + CSSName: "sponsor-manager", }, { - Spons: analyst, + Spons: analyst, TierName: "Security Analyst Sponsor", - CSSName: "sponsor-analyst", + CSSName: "sponsor-analyst", }, } diff --git a/src/main.exe b/src/main.exe deleted file mode 100644 index edcebf1..0000000 Binary files a/src/main.exe and /dev/null differ diff --git a/src/main.go b/src/main.go index 7a87ab0..1626a25 100644 --- a/src/main.go +++ b/src/main.go @@ -6,8 +6,7 @@ import ( "net/http" "strconv" "text/template" - - L "github.com/njitacm/jerseyctf-website/src/lib" + L "github.com/njitacm/jerseyctf-website/src/lib" //Not the current Repo, but everything works, look into if changes should be made ) // CONSTANT @@ -18,53 +17,41 @@ func index(w http.ResponseWriter, r *http.Request) { // specific template are received before called tmpl := template.Must(template.ParseGlob("templates/*.html")) - // Header Template in Layout.html tmpl.ExecuteTemplate(w, "header", nil) - // Nav Bar Template in Layout.html - - navBar := []string{ "FAQ","Resources"} //"Schedule","Speakers","Sponsors","Registration","Recognitions" + //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" tmpl.ExecuteTemplate(w, "navNBody", navBar) - // Infographic in Infographic.html tmpl.ExecuteTemplate(w, "infographic", nil) for _, value := range navBar { switch value { - case "Registration": - // registration in registration.html tmpl.ExecuteTemplate(w, "registration", nil) case "Schedule": - // schedule in schedule.html tmpl.ExecuteTemplate(w, "schedule", nil) case "Speakers": - // speakers in speakers.html L.Speaker(w, tmpl) case "Sponsors": - // sponsors in sponsors.html sponsors := L.GetSponsors() tmpl.ExecuteTemplate(w, "sponsors", sponsors) case "FAQ": - // faq in faq.html faq := L.GetFaq() tmpl.ExecuteTemplate(w, "faq", faq) case "Recognitions": - // recongitions in recognitions.html L.Recognition(w, tmpl) case "Resources": - // writeups in writeups.html resources := L.GetResources() tmpl.ExecuteTemplate(w, "resources", resources) } } - // Footer Template in Layout.html tmpl.ExecuteTemplate(w, "footer", nil) } @@ -72,10 +59,8 @@ func index(w http.ResponseWriter, r *http.Request) { func ccpp(w http.ResponseWriter, r *http.Request) { tmpl := template.Must(template.ParseGlob("templates/*.html")) - // Header Template in Layout.html tmpl.ExecuteTemplate(w, "header", nil) - // Nav Bar Template in Layout.html navBar := []string{"Code of Conduct", "Privacy Policy"} tmpl.ExecuteTemplate(w, "navNBody", navBar) @@ -83,7 +68,6 @@ func ccpp(w http.ResponseWriter, r *http.Request) { tmpl.ExecuteTemplate(w, "privacy-policy", nil) - // Footer Template in Layout.html tmpl.ExecuteTemplate(w, "footer", nil) } diff --git a/src/src.exe b/src/src.exe deleted file mode 100644 index 7622b90..0000000 Binary files a/src/src.exe and /dev/null differ diff --git a/src/templates/infographic.html b/src/templates/infographic.html index 41187e3..08d96d4 100644 --- a/src/templates/infographic.html +++ b/src/templates/infographic.html @@ -2,19 +2,16 @@
- JerseyCTF Landing Page + JerseyCTF Landing Page
-
+
-
When: April 15-16th, 2023
+
The competition has concluded. Stay tuned for JerseyCTF IV in Spring 2024!
-
-
Where: Online and In-Person!
-
-

 *Discord link emailed upon registration.

+
+
Powered By:
diff --git a/src/templates/layout.html b/src/templates/layout.html index 23f8245..906c260 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -12,7 +12,7 @@ JerseyCTF - + {{end}} @@ -24,7 +24,7 @@