Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jersey ctf2024 dev #21

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Jersey ctf2024 dev #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadbb8e
Updated Comp Date
AtomicPhoenix Jan 25, 2024
78b4fc4
Updated Speaker/Sponsor Information
AtomicPhoenix Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/img/speaker/JamesPerry.jpg
View file
Open in desktop
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/AWS_Logo.png
View file
Open in desktop
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/Merck.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
80 changes: 21 additions & 59 deletions src/lib/speakers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,65 +30,27 @@ type SpeakerStruct struct {

func GetSpeakers() []SpeakerStruct {
return []SpeakerStruct{
{},
/*
{
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: "",
},
*/
{
Pic: "personPlaceholder.png",
Name: "James Perry",
Position: "Security Lead at AWS",
Talk: "TBD",
Time: "",
},
{
Pic: "personPlaceholder.png",
Name: "TBD",
Position: "",
Talk: "",
Time: "",
},
{
Pic: "personPlaceholder.png",
Name: "TBD",
Position: "",
Talk: "",
Time: "",
},
}
}

Expand Down
47 changes: 14 additions & 33 deletions src/lib/sponsors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,43 +27,24 @@ func GetSponsors() Sponsors {
},
}

ciso := []Sponsor{}
ciso := []Sponsor{
{
HREF: "https://www.merck.com/",
Source: "Merck.png",
ALT: "Merck",
Width: "200",
},
}

manager := []Sponsor{}

analyst := []Sponsor{
/*
{
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",
},
*/
{
HREF: "https://aws.amazon.com/",
Source: "AWS_Logo.png",
ALT: "AWS",
Width: "200",
},
}

tiers := []Tier{
Expand Down
Binary file added src/src.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/templates/infographic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</div>
<div class="col-3 col align-self-center">
<div class="d-flex justify-content-beginning">
<h5 class="title-info">The competition has concluded. Stay tuned for JerseyCTF IV in Spring 2024!</h5>
<h5 class="title-info">The competition is being prepared. Get ready for JerseyCTF IV on March 23-24 (12:00pm to 12:00pm)!</h5>
</div>
<!-- <p class="footnote-info">*Discord link emailed upon registration.</p> -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/templates/speakers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h4 class="jerctf">@speakers</h4>
{{end}}

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