Merge pull request #19 from jerseyctf/JerseyCTF2024-Dev

Jersey ctf2024 dev

.gitignore

@@ -1,2 +1,4 @@
 # Ignored executables written by Go
-src/main
+**/main
+**/main.exe
+**/a.out

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;
-}
+}

src/lib/faq.go

@@ -14,19 +14,19 @@ 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 <a href=https://ctf.jerseyctf.com/resources target='_blank'> beginner resources page</a> for more recommendations. ",
 		},
 		{
 			Question: "Will there be prizes?",
 			Answer:   "Yes! There are 2 leaderboard divisions: Student and Open. Prizes will be awarded in both divisions for top scoring teams and participants residing in the United States will receive a complimentary JerseyCTF t-shirt.",
 		},
 		{
 			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?",

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",
+		},
 	}
 }

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)