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.

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

InfoSec Page and Replacement of undraw images #577

Merged
merged 6 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 2 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const Hackathon = lazy(() => import('./pages/Hackathon/Hackathon'));
const Privacy = lazy(() => import('./pages/Policy/Privacy'));
const Gallery = lazy(() => import('./pages/Gallery/Gallery'));
const GalleryEvent = lazy(() => import('./pages/Gallery/GalleryEvent'));
const InfoSec = lazy(() => import('./pages/InfoSec/InfoSec'));

const queryClient = new QueryClient();

Expand All @@ -43,6 +44,7 @@ const App = () => {
<Route path='/gallery/:event' element={<GalleryEvent />} />
<Route path='/404' element={<NotFound />} />
<Route path='*' element={<FourOFour />} />
<Route path='/InfoSec' element={<InfoSec />} />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move route between tutoring and gallery/event

</Routes>
<Footer />
</Suspense>
Expand Down
3 changes: 3 additions & 0 deletions src/assets/gallery/aboutuspic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/Navbar/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const NavBar = () => {
{/* when hackathon will return to active it again no need to delete */}
{/* <ActiveListItem url='/hackathons' name='Hackathons' /> */}
<ActiveListItem url='/contactus' name='Contact Us' />
<ActiveListItem url='/InfoSec' name='InfoSec' />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

url should be /infosec to be consistent with current style

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

info sec should be before contact us in the navbar.

<Nav.Link href='https://uhcode.red/' target='_blank' rel='noreferrer'>
CodeRED <i className='fas fa-external-link-alt'></i>
</Nav.Link>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/About/About.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { lazy, Suspense } from 'react';
import { Col, Container, Row } from 'react-bootstrap';
import gif from '../../assets/about.svg';
import aboutpic from '../../assets/gallery/aboutuspic.svg';
import { officersFall2023 } from '../../data/officers';
import cougarettesLogo from '../../assets/partner-logos/cougarettes.webp';
import csgirlsLogo from '../../assets/partner-logos/csgirls.webp';
Expand Down Expand Up @@ -28,7 +28,7 @@ const About = () => {
<Container fluid className='contained hero hero-about'>
<Row>
<Col md='6' className='order-md-2'>
<img src={gif} alt='undraw svg' className='img-fluid'></img>
<img src={aboutpic} alt='undraw svg' className='img-fluid'></img>
</Col>
<Col md='6' className='order-md-0'>
<div className='about-us'>
Expand Down
Empty file added src/pages/InfoSec/InfoSec.css
Empty file.
42 changes: 42 additions & 0 deletions src/pages/InfoSec/InfoSec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import React from 'react';
import { Col, Container, Row } from 'react-bootstrap';
import webgif from '../../assets/CougarCS_Banner.png';
import { MetaData } from '../../components/Meta/MetaData';
import './InfoSec.css';

const meta = {
title: 'Info-Sec',
desc: 'Learn more about CougarCS Web-Dev',
url: 'https://cougarcs.com/web-dev',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to be accurate to current site.
desc: 'Learn more about CougarCS Info-sec'
url: 'https://cougarcs.com/infosec'

img: 'https://i.ibb.co/NTLFrdj/cougarcs-background11.jpg',
};
const InfoSec = () => {
return (
<>
<MetaData {...meta} />
<Container fluid className='contained hero hero-web'>
<Row className='pb-5'>
<Col md='6' className='order-md-2'>
<img
src={webgif}
alt='banner svg'
className='img-fluid'
style={{ borderRadius: '10px' }}
></img>
</Col>
<Col md='6' className='order-md-0'>
<div className='about-us'>
<h1>InfoSec at CougarCS</h1>
<p className='lead-text'>
Information Security something maybe put team members below not
to sure what the vision is here
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

look at webdev/tutoring for help on making this page to look better.

Discord button should link to info sec discord.

</p>
</div>
</Col>
</Row>
</Container>
</>
);
};

export default InfoSec;
9 changes: 7 additions & 2 deletions src/pages/Tutoring/Tutoring.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios from 'axios';
import React from 'react';
import { Col, Container, Row, Button } from 'react-bootstrap';
import headerImage from '../../assets/tutoring.svg';
import headerImage from '../../assets//gallery/linuxw1.webp';
import discordIcon from '../../assets/icons/discord-icon.webp';
import { MetaData } from '../../components/Meta/MetaData';
import { useQuery, useQueryClient } from 'react-query';
Expand Down Expand Up @@ -57,7 +57,12 @@ const Tutoring = () => {
<Container fluid className='contained hero hero-tutoring'>
<Row className='pb-5'>
<Col md='6' className='order-md-2'>
<img src={headerImage} alt='undraw svg' className='img-fluid'></img>
<img
src={headerImage}
alt='Cougar Cs member tutoring'
className='img-fluid'
style={{ borderRadius: '10px' }}
></img>
</Col>
<Col md='6' className='order-md-0'>
<div className='about-us'>
Expand Down
Loading