Skip to content

Commit 65f8c71

Browse files
committed
Merge branch 'main' into events-new-lines
2 parents b7aaf6d + fc72849 commit 65f8c71

File tree

10 files changed

+7025
-95
lines changed

10 files changed

+7025
-95
lines changed

components/ContentBanner.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
1-
import Link from 'next/link';
21
import React from 'react';
32

4-
function ContentBanner({ title, ctaText, ctaLink }) {
3+
function ContentBanner({ title }) {
54
return (
65
<div className="full-width blue">
7-
<div className="sign-up-section banner-section">
8-
<div id="banner-left" className="half-width">
9-
<h2 style={{fontSize: '1.6em'}}>{title}</h2>
10-
</div>
11-
<div id="banner-right" className="half-width">
12-
<Link href={ctaLink}>
13-
<a className="button tight dark">
14-
{ctaText}
15-
</a>
16-
</Link>
17-
</div>
18-
</div>
6+
<div id="banner-right" className="full-width">
7+
<h2 style={{fontSize: '1.6em'}}>{title}</h2>
8+
</div>
199
</div>
2010
);
2111
}

data/board.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default [
4444

4545
</ul> ),
4646
card: '/images/cards/board_card.svg',
47-
nextSteps: 'Dev Team interns have the opportunity to become Dev Team officers in the spring. All other Interns will run for a director position in the Spring or will no longer officially be a member of the board.',
47+
nextSteps: 'Dev Team interns have the opportunity to become Dev Team officers in the spring. All other interns will run for a director position in the Spring or will no longer officially be a member of the board.',
4848
},
4949
},
5050
];

data/committees.js

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -228,31 +228,39 @@ export default [
228228
platform: 'facebook',
229229
link: 'https://www.facebook.com/groups/320869398280511',
230230
},
231+
{
232+
platform: 'twitter',
233+
link: 'https://twitter.com/pbrucla',
234+
},
235+
{
236+
platform: 'website',
237+
link: 'https://lactf.uclaacm.com',
238+
},
231239
],
232240
infoCards: [
233241
{
234-
title: 'Cyber Academy: Cryptography and Reverse Engineering',
242+
title: 'Cyber Academy: Web Auditing x Bruinwalk',
235243
image: {
236-
src: '/images/committees/cyber/cryp_reverse.png',
244+
src: '/images/committees/cyber/cyber-academy-bruinwalk.png',
237245
alt: 'Image of forensics event flyer',
238246
},
239-
desc: 'Attend our weekly workshops on awesome topics such as classical ciphers, modern cryptography, cryptographic attacks, and advanced reverse engineering where we provide with in-depth demos and challenges. Our workshops are designed for beginners with no experience or just beginning in cybersecurity, and are self-encapsulated so feel free to attend even if you had to miss one!',
247+
desc: 'ACM Cyber collaborated up with the Bruinwalk team to perform a security audit of https://bruinwalk.com/. Throughout the quarter, members learned about web hacking and security vulnerabilities which culminated a hands on experience to audit the source code of the famous website! Teams were awarded bounties for finding bugs on the website allowing the team to patch these vulnerabilities.',
240248
},
241249
{
242-
title: 'CTF After Dark',
250+
title: 'LA CTF',
243251
image: {
244-
src: '/images/committees/cyber/cft_after_dark.png',
245-
alt: 'Capture the flag after dark',
252+
src: '/images/committees/cyber/lactf-logo.gif',
253+
alt: 'LA CTF 2023 mountains logo GIF.',
246254
},
247-
desc: 'Collaborate with your friends in our beginner friendly Capture The Flag (CTF) competition. Challenges will be targeted at the skills that you’ve learned from our Spring workshops. Top teams get bragging rights as well as prizes.',
255+
desc: 'LA CTF is an annual Capture the Flag (CTF) cybersecurity competition hosted by ACM Cyber at UCLA & Psi Beta Rho. LA CTF is open to all skill levels of cybersecurity! Whether you are tackling your first exploit or have professional experience, there will be challenges just right for you! There will be a variety of events ranging from the competition containing jeopardy-style cybersecurity challenges to talks from UCLA professors to fun events such as typing competitions! If you are interested in attending, join the Discord to stay up to date with the latest information about LA CTF!',
248256
},
249257
{
250-
title: 'Cyber x Studio: Video Game Hacking',
258+
title: 'Psi Beta Rho',
251259
image: {
252-
src: '',
260+
src: '/images/committees/cyber/pbr-team-photo.jpg',
253261
alt: '',
254262
},
255-
desc: 'Ever wanted to know how that guy snapped to your head in a shooter game right as you peeked or somehow knew what your next move was in a strategy game? If you want to learn how to make your own aimbot or learn more about how hackers can exploit multiplayer games through packet spoofing, then our Video Game Hacking workshop is for you! No prior experience necessary!',
263+
desc: 'Psi Beta Rho, also known as PBR, is UCLA\'s competetive cybersecurity team! We are a group of students who are passionate about learning more about cybersecurity and competing at CTFs. PBR attends a variety of different cybersecurity competitions throughout the year by we primarily compete in capture the flag (CTF) competitions. Psi Beta Rho is open to all skill levels. Whether you are just launching your cybersecurity career or are already an experienced professional, PBR is for you!',
256264
},
257265
],
258266
introImage: '/images/committees/cyber/cyber_motif_applied.png',

0 commit comments

Comments
 (0)