diff --git a/src/pages/Events/Events.js b/src/pages/Events/Events.js
index 4c88a0f8..e12f351d 100644
--- a/src/pages/Events/Events.js
+++ b/src/pages/Events/Events.js
@@ -45,9 +45,9 @@ const formatDates = (date) => {
};
const meta = {
- title: 'Calendar',
+ title: 'Events',
desc: 'Checkout our events.',
- url: 'https://cougarcs.com/calendar',
+ url: 'https://cougarcs.com/events',
img: 'https://i.ibb.co/NTLFrdj/cougarcs-background11.jpg',
};
diff --git a/src/pages/InfoSec/InfoSec.css b/src/pages/InfoSec/InfoSec.css
new file mode 100644
index 00000000..278ead4a
--- /dev/null
+++ b/src/pages/InfoSec/InfoSec.css
@@ -0,0 +1,51 @@
+.discord-button {
+ background-color: #7289da;
+ padding: 13px 25px;
+ display: flex;
+ align-items: center;
+ gap: 15px;
+ border: 0;
+ border-radius: 7px;
+ font-weight: 600;
+ outline: 0px;
+ box-shadow: none !important;
+}
+
+.discord-button:hover,
+.discord-button:active,
+.discord-button:focus {
+ background-color: #627ee2 !important;
+}
+
+.discord-button-wrapper small {
+ color: #777;
+ font-size: 11px;
+}
+
+
+.info-cta {
+ margin-top: 60px;
+}
+
+.info-cta p {
+ font-size: 18px;
+ margin-bottom: 30px;
+}
+.ghost-button {
+ background-color: transparent;
+ border: 2px solid;
+ color: var(--color-on-labelAndHeaders);
+ padding: 13px 25px;
+ border-radius: 7px;
+ font-weight: 600;
+ outline: none;
+ box-shadow: none !important;
+}
+
+.ghost-button:hover,
+.ghost-button:active,
+.ghost-button:focus {
+ background-color: var(--color-on-labelAndHeaders) !important;
+ border-color: var(--color-on-labelAndHeaders) !important;
+ color: #fff !important;
+}
\ No newline at end of file
diff --git a/src/pages/InfoSec/InfoSec.js b/src/pages/InfoSec/InfoSec.js
new file mode 100644
index 00000000..491b022a
--- /dev/null
+++ b/src/pages/InfoSec/InfoSec.js
@@ -0,0 +1,78 @@
+import React from 'react';
+import { Col, Container, Row, Button } from 'react-bootstrap';
+import webgif from '../../assets/CougarCS_Banner.png';
+import { MetaData } from '../../components/Meta/MetaData';
+import discordIcon from '../../assets/icons/discord-icon.webp';
+import './InfoSec.css';
+
+const meta = {
+ title: 'Info-Sec',
+ desc: 'Learn more about CougarCS InfoSec',
+ url: 'https://cougarcs.com/infosec',
+ img: 'https://i.ibb.co/NTLFrdj/cougarcs-background11.jpg',
+};
+const InfoSec = () => {
+ return (
+ <>
+
+
+
+
+
+
+
+
+
InfoSec at CougarCS
+
+ Have you ever wanted to learn how to hack into computers or
+ phish someone through email ? Perhaps you’d like to learn about
+ best information security practices to protect yourself and
+ others? Or maybe you are down for competitive hacking in a
+ controlled environment against external clubs!
+
+
+
+
+
+ More Information is provided via Discord
+
+
+
+
+
+
+
+
+ Interested in InfoSec at CougarCS?
+
+
+ Develop Soft & Technical Skills - Learn Linux - Protect yourself
+ on the Internet - Partticapte in Security Challenenges - Earn
+ CougarCS Member Points
+
+
+
+
+ >
+ );
+};
+
+export default InfoSec;
diff --git a/src/pages/Tutoring/Tutoring.js b/src/pages/Tutoring/Tutoring.js
index 7e18b656..1a444b70 100644
--- a/src/pages/Tutoring/Tutoring.js
+++ b/src/pages/Tutoring/Tutoring.js
@@ -1,7 +1,6 @@
-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';
@@ -15,11 +14,15 @@ const meta = {
img: 'https://i.ibb.co/NTLFrdj/cougarcs-background11.jpg',
};
-const url = `${process.env.REACT_APP_API_URL}/api/tutors`;
+const url =
+ process.env.NODE_ENV === 'development'
+ ? 'http://localhost:3000'
+ : 'https://api.cougarcs.com';
const fetchTutors = async () => {
- const res = await axios.get(url);
- return res.data.tutors;
+ const res = await fetch(url + '/v1/tutors/names');
+ const { data } = await res.json();
+ return data;
};
const Tutoring = () => {
@@ -28,7 +31,6 @@ const Tutoring = () => {
initialData: () => queryClient.getQueryData('tutors'),
staleTime: 300000,
});
-
const displayTutors = () => {
return isFetching ? (
@@ -45,7 +47,7 @@ const Tutoring = () => {
) : (
-