diff --git a/components/About/index.tsx b/components/About/index.tsx index a04a53c..04e0353 100644 --- a/components/About/index.tsx +++ b/components/About/index.tsx @@ -5,7 +5,7 @@ const About = () => {

01

-

ABOUT

+

ABOUT

@@ -14,7 +14,7 @@ const About = () => {
CSESoc Icon
-

CSESoc

+

CSESoc

unsw-computer-science-soc

@@ -40,7 +40,7 @@ const About = () => {

{/* RIGHT SIDE */}
-
+

csesoc/README.md

diff --git a/components/Footer.tsx b/components/Footer.tsx index 46111f3..1c7ff2d 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -1,38 +1,51 @@ +import Image from 'next/image'; import Link from 'next/link'; +import { socialLinks } from '../public/data/data'; const Footer = () => { return (
-
-
- CSESoc Logo - - Ollie - - Ollie +
+
+
+ + CSESoc Logo + Ollie + +
+
+ {socialLinks.map((item, index) => { + return ( + + {item.alt} + + ); + })} +

B03 CSE Building K17, UNSW csesoc@csesoc.org.au

© 2021 — CSESoc UNSW

- Sponsors backdrop
diff --git a/components/Hamburger.tsx b/components/Hamburger.tsx new file mode 100644 index 0000000..bbeb2c5 --- /dev/null +++ b/components/Hamburger.tsx @@ -0,0 +1,56 @@ +import React from 'react'; +import { AnimatePresence, motion, useCycle } from 'framer-motion'; +import Link from 'next/link'; + +export default function Hamburger() { + const [isOpen, toggleOpen] = useCycle(false, true); + + return ( + + ); +} diff --git a/components/Landing/index.tsx b/components/Landing/index.tsx index 111ee8f..b5002be 100644 --- a/components/Landing/index.tsx +++ b/components/Landing/index.tsx @@ -13,7 +13,7 @@ const Landing = () => {

{'

'}

-

Hello World!

+

Hello World!

{''}

diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 9e395bb..4dfade2 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -1,6 +1,7 @@ import Image from 'next/image'; import Link from 'next/link'; import { useEffect, useState } from 'react'; +import Hamburger from './Hamburger'; const Navbar = () => { const [path, setPath] = useState(''); @@ -24,11 +25,11 @@ const Navbar = () => {
- +

01

{'//'} about us
- +

02

{'//'} events
@@ -41,6 +42,9 @@ const Navbar = () => {
{'//'} sponsors
+
+ +
); diff --git a/components/ResourcesAndContacts/index.tsx b/components/ResourcesAndContacts/index.tsx index 3acb046..459abbe 100644 --- a/components/ResourcesAndContacts/index.tsx +++ b/components/ResourcesAndContacts/index.tsx @@ -15,7 +15,7 @@ const ResourcesAndContacts = () => {

03

-

RESOURCES & CONTACTS

+

RESOURCES & CONTACTS

@@ -122,7 +122,13 @@ const ResourcesAndContacts = () => {
diff --git a/components/Sponsors/index.tsx b/components/Sponsors/index.tsx index 46190e4..18d6b99 100644 --- a/components/Sponsors/index.tsx +++ b/components/Sponsors/index.tsx @@ -8,7 +8,10 @@ const Sponsors = () => { 'xl:p-16 p-10 flex justify-center items-center xl:col-span-3 sm:col-span-5 col-span-10 xl:row-start-2 xl:row-end-3 sm:row-start-4 sm:row-end-5 sm:h-auto h-36'; return ( -
+

04

SUPPORT CSESOC

diff --git a/components/Sponsors/sponsorlinks.tsx b/components/Sponsors/sponsorlinks.tsx index e09ac7e..6c9c297 100644 --- a/components/Sponsors/sponsorlinks.tsx +++ b/components/Sponsors/sponsorlinks.tsx @@ -2,8 +2,7 @@ import { diamondLinks, goldLinks, silverLinks } from '../../public/data/data'; //import '/styles/sponsorLinks.module.css'; const logostyle = 'h-14'; const logodiv = 'block gap-y-8 h-14'; -const background = - 'radial-gradient(50% 50% at 50% 50%, rgba(235, 1, 255, 0.6) 0%, rgba(121, 73, 255, 0.6) 48.96%, rgba(57, 119, 248, 0.6) 100%)'; +const background = 'rgba(57, 119, 248, 0.6)'; // const outer = 'rounded-[4rem] w-[90rem] flex flex-col pl-14 py-14 gap-16'; function SponsorLinks() { @@ -11,8 +10,8 @@ function SponsorLinks() {

Diamond Sponsors

{diamondLinks.map((item, index) => { @@ -24,23 +23,21 @@ function SponsorLinks() { })}
-

Gold Sponsors

-
- {goldLinks.map((item, index) => { - return ( - - {item.alt} - - ); - })} -
+

Gold Sponsors

+ {goldLinks.map((item, index) => { + return ( + + {item.alt} + + ); + })}

Silver Sponsors

{silverLinks.map((item, index) => { diff --git a/components/Sponsors/subpage.tsx b/components/Sponsors/subpage.tsx deleted file mode 100644 index 6af78b6..0000000 --- a/components/Sponsors/subpage.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react'; -//import '/styles/sponsors.module.css'; -import SponsorLinks from './sponsorlinks'; - -const SponsorsPage = () => { - return ( -
- -
- ); -}; - -export default SponsorsPage; diff --git a/package-lock.json b/package-lock.json index d5cafbf..3405fa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@types/react-dom": "18.2.7", "autoprefixer": "10.4.15", "eslint-config-next": "13.4.19", + "framer-motion": "^11.1.2", "next": "13.4.19", "postcss": "8.4.29", "react": "18.2.0", @@ -2133,6 +2134,30 @@ "url": "https://github.com/sponsors/rawify" } }, + "node_modules/framer-motion": { + "version": "11.1.2", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.1.2.tgz", + "integrity": "sha512-flRo14ImBGRbOFz9KsXQ9ty3wWW2zFk0Gp4VbvZ5bG+1gZg/1CNWj9ZHtsCmZSPkBgZNOVkVf6aEtW5YxOITfw==", + "dependencies": { + "tslib": "^2.4.0" + }, + "peerDependencies": { + "@emotion/is-prop-valid": "*", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependenciesMeta": { + "@emotion/is-prop-valid": { + "optional": true + }, + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -5999,6 +6024,14 @@ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz", "integrity": "sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==" }, + "framer-motion": { + "version": "11.1.2", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.1.2.tgz", + "integrity": "sha512-flRo14ImBGRbOFz9KsXQ9ty3wWW2zFk0Gp4VbvZ5bG+1gZg/1CNWj9ZHtsCmZSPkBgZNOVkVf6aEtW5YxOITfw==", + "requires": { + "tslib": "^2.4.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", diff --git a/package.json b/package.json index b99482d..11cb6f8 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@types/react-dom": "18.2.7", "autoprefixer": "10.4.15", "eslint-config-next": "13.4.19", + "framer-motion": "^11.1.2", "next": "13.4.19", "postcss": "8.4.29", "react": "18.2.0", diff --git a/pages/about.tsx b/pages/about.tsx new file mode 100644 index 0000000..a3ac9e6 --- /dev/null +++ b/pages/about.tsx @@ -0,0 +1,13 @@ +import Navbar from '@/components/Navbar'; +import Footer from '@/components/Footer'; +import About from '@/components/About'; + +export default function AboutPage() { + return ( +
+ + +
+
+ ); +} diff --git a/pages/events.tsx b/pages/events.tsx new file mode 100644 index 0000000..b7889f6 --- /dev/null +++ b/pages/events.tsx @@ -0,0 +1,12 @@ +import Navbar from '@/components/Navbar'; +import Footer from '@/components/Footer'; + +export default function EventsPage() { + return ( +
+ +
Events
+
+
+ ); +} diff --git a/pages/resources.tsx b/pages/resources.tsx new file mode 100644 index 0000000..b634ac2 --- /dev/null +++ b/pages/resources.tsx @@ -0,0 +1,13 @@ +import Navbar from '@/components/Navbar'; +import Footer from '@/components/Footer'; +import ResourcesAndContacts from '@/components/ResourcesAndContacts'; + +export default function ResourcesPage() { + return ( +
+ + +
+
+ ); +} diff --git a/pages/sponsors.tsx b/pages/sponsors.tsx index d2e2d1a..94de148 100644 --- a/pages/sponsors.tsx +++ b/pages/sponsors.tsx @@ -1,12 +1,12 @@ -import SponsorsPage from '@/components/Sponsors/subpage'; +import SponsorLinks from '@/components/Sponsors/sponsorlinks'; import Navbar from '@/components/Navbar'; import Footer from '@/components/Footer'; -export default function Home() { +export default function SponsorsPage() { return (
- +
); diff --git a/public/data/data.ts b/public/data/data.ts index ced261f..df77c79 100644 --- a/public/data/data.ts +++ b/public/data/data.ts @@ -4,6 +4,12 @@ export type sponsorInfo = { alt: string; }; +export type socialInfo = { + href: string; + src: string; + alt: string; +}; + export const diamondLinks: sponsorInfo[] = [ { href: 'https://www.janestreet.com/', @@ -102,3 +108,41 @@ export const silverLinks: sponsorInfo[] = [ alt: 'Canva logo' } ]; + +export const socialLinks: socialInfo[] = [ + { + href: 'https://bit.ly/CSESocDiscord', + src: 'assets/discord_logo.svg', + alt: 'Discord' + }, + { + href: 'https://www.facebook.com/csesoc/', + src: 'assets/fb_logo.svg', + alt: 'Facebook' + }, + { + href: 'https://twitter.com/csesoc?lang=en', + src: 'assets/x_twitter_icon.svg', + alt: 'X/Twitter' + }, + { + href: 'https://www.youtube.com/@CSESocUNSW', + src: 'assets/youtube_logo.svg', + alt: 'Youtube' + }, + { + href: 'https://www.instagram.com/csesoc_unsw/?hl=en', + src: 'assets/instagram_logo.svg', + alt: 'Instagram' + }, + { + href: 'https://www.tiktok.com/@csesoc?lang=en', + src: 'assets/tiktok_logo.svg', + alt: 'TikTok' + }, + { + href: 'https://www.linkedin.com/company/csesoc?originalSubdomain=au', + src: 'assets/linkedin_logo.svg', + alt: 'LinkedIn' + } +];