Merge pull request #18 from jerseyctf/main

Initial 2023 pushes, updated repo+NICC
njitacm · Jan 14, 2023 · 7517748 · 7517748
2 parents 29e426d + 49bf062
commit 7517748
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ NJIT ACM's website for registration and information on the JerseyCTF event. ([je
 # To test JCTF site locally
 # Required: go (golang) 
 # Optional: make
-$ git clone https://github.com/njitacm/jerseyctf-website.git
+$ git clone https://github.com/jerseyctf/jerseyctf-website.git
 $ cd jerseyctf-website/src
 $ go build main.go
 # Optionally: use `make`

diff --git a/src/img/white_hollow_acm.png → src/img/acm_logo.png b/src/img/white_hollow_acm.png → src/img/acm_logo.png
diff --git a/src/img/github-logo.png b/src/img/github-logo.png
diff --git a/src/img/nicc_logo.png b/src/img/nicc_logo.png
diff --git a/src/lib/faq.go b/src/lib/faq.go
@@ -10,7 +10,7 @@ func GetFaq() []Faq {
 	return []Faq{
 		{
 			Question: "What is JerseyCTF?",
-			Answer:   "JerseyCTF is a beginner-friendly Capture the Flag competition that aims to inspire interest in cybersecurity. Hosted by the <a target=\"_blank\" href=https://njit.acm.org>NJIT ACM</a> organization and <a target=\"_blank\" href=https://sci.njit.edu>NJIT SCI</a> program, it is geared towards students, beginners, and professionals alike. JerseyCTF provides participants with jeopardy-style questions in categories including cryptography, forensics, binary exploitation/reversing, open-source intelligence, and web exploitation.  JerseyCTF features a track parallel to the CTF competition, consisting of presentations and panels with renowned speakers from industry and government.",
+			Answer:   "JerseyCTF is a beginner-friendly Capture the Flag competition that aims to inspire interest in cybersecurity. Hosted by the NJIT <a target='_blank' href=https://njit.acm.org>ACM</a> and <a target='_blank' href= https://njiticc.com>NICC</a> organizations and the <a target='_blank' href=https://sci.njit.edu>NJIT SCI</a> program, it is geared towards students, beginners, and professionals alike. JerseyCTF provides participants with jeopardy-style questions in categories including cryptography, forensics, binary exploitation/reversing, open-source intelligence, and web exploitation.  JerseyCTF features a track parallel to the CTF competition, consisting of presentations and panels with renowned speakers from industry and government.",
 		},
 		{
 			Question: "Who can sign up to compete?",

diff --git a/src/main.exe b/src/main.exe
diff --git a/src/main.go b/src/main.go
@@ -23,7 +23,7 @@ func index(w http.ResponseWriter, r *http.Request) {
 
 	// Nav Bar Template in Layout.html
 
-	navBar := []string{"Registration", "FAQ", "Recognitions","Resources"} //"Schedule","Speakers","Sponsors",
+	navBar := []string{ "FAQ","Resources"} //"Schedule","Speakers","Sponsors","Registration","Recognitions"
 	tmpl.ExecuteTemplate(w, "navNBody", navBar)
 
 	// Infographic in Infographic.html

diff --git a/src/templates/infographic.html b/src/templates/infographic.html
@@ -8,10 +8,10 @@
     </div>
     <div class="col-6 col align-self-center">
         <div class="d-flex justify-content-beginning">
-            <h5 class="title-info"><b>When: </b>Coming back Spring 2023</h5>
+            <h5 class="title-info"><b>When: </b>April 15-16th, 2023</h5>
         </div>
         <div class="d-flex justify-content-beginning">
-            <h5 class="title-info"><b>Where: </b>Online via Discord!</h5>
+            <h5 class="title-info"><b>Where: </b>Online and In-Person!</h5>
         </div>
         <p class="footnote-info">&emsp;*Discord link emailed upon registration.</p>
     </div>

diff --git a/src/templates/layout.html b/src/templates/layout.html
@@ -46,10 +46,11 @@
 </div> {{- /*<!-- To close div from before ^ ^ ^-->*/ -}}
 <div id="foots">
     <footer class="foots">
-        <div class="col">JerseyCTF</div>
+        <div class="col"><h5>JerseyCTF</h5></div>
         <div class="col">
-            <a target="_blank" href="https://njit.acm.org"><img class="img-fluid foots-img" src="/assets/img/white_hollow_acm.png" alt="NJIT ACM Logo"></a>
-            <a target="_blank" href="https://github.com/njitacm/jerseyctf-website"><img class="img-fluid foots-img" src="/assets/img/github-logo.png" alt="Github Repo"></a>
+            <a target="_blank" href="https://njit.acm.org"><img class="img-fluid foots-img" src="/assets/img/acm_logo.png" alt="ACM Logo"></a>
+            <a target="_blank" href="https://github.com/jerseyctf/jerseyctf-website"><img class="img-fluid foots-img" src="/assets/img/github-logo.png" alt="Github Repo"></a>
+            <a target="_blank" href="https://njiticc.com"><img class="img-fluid foots-img" src="/assets/img/nicc_logo.png" alt="NICC Logo"></a>
             <br>
             <a target="_blank" href="https://computing.njit.edu/"><img class="img-fluid foots-img" src="/assets/img/ywcc_logo.png" alt="NJIT YWCC Logo"></a>
             <a target="_blank" href="https://sci.njit.edu/"><img class="img-fluid foots-img" src="/assets/img/sci_logo_tall.png" alt="NJIT SCI Logo"></a>