Skip to content

Commit

Permalink
Merge branch 'main' into fix/Icon-hover-in-Darkmode
Browse files Browse the repository at this point in the history
  • Loading branch information
Harshsaini001 authored Oct 7, 2023
2 parents 8635dad + ddd179a commit d38f391
Show file tree
Hide file tree
Showing 32 changed files with 849 additions and 610 deletions.
8 changes: 8 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"printWidth": 120,
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all",
"bracketSpacing": true
}
12 changes: 6 additions & 6 deletions components/BackToTop.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useEffect, useState } from "react";
import { BsFillArrowUpCircleFill } from "react-icons/bs";
import { motion } from "framer-motion";
import { useEffect, useState } from 'react';
import { BsFillArrowUpCircleFill } from 'react-icons/bs';
import { motion } from 'framer-motion';

const BackToTop = () => {
const [showButton, setShowButton] = useState(false);

useEffect(() => {
window.addEventListener("scroll", () => {
window.addEventListener('scroll', () => {
if (window.scrollY > 100) {
setShowButton(true);
} else {
Expand All @@ -18,7 +18,7 @@ const BackToTop = () => {
const scrollToTop = () => {
window.scrollTo({
top: 0,
behavior: "smooth",
behavior: 'smooth',
});
};

Expand All @@ -31,7 +31,7 @@ const BackToTop = () => {
whileHover={{ scale: 1.1 }}
whileTap={{ scale: 0.9 }}
>
<BsFillArrowUpCircleFill size={30} style={{color: "white"}}/>
<BsFillArrowUpCircleFill size={30} style={{ color: 'white' }} />
</motion.button>
)}
</>
Expand Down
66 changes: 38 additions & 28 deletions components/Error/NotFound.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,49 @@
import React from 'react';
// import astronaut from '/astronaut.svg';
// import saturn from '/saturn.svg';
import {useRouter} from 'next/router'
import { useRouter } from 'next/router';
import Image from 'next/image';

const NotFound = () => {
const navigate = useRouter();

const navigate = useRouter()

const handleRedirection = () => {
navigate.push('/')
}
return (
<div className="bg-[#24344c] h-screen relative overflow-hidden fontDosis">
<div id="particles-js" className=" bg-[#24344c] fixed w-full h-full opacity-20"></div>
<div className="denied__wrapper absolute bg-[#24344c] denied__wrapper h-[390px] left-1/2 max-w-[390px] mx-auto top-[30%] translate-x-[-50%] translate-y-[-50%] w-full">
<div className='relative'>
<h1 className="text-center text-white font-Dosis text-[100px] mb-0 font-extrabold">404</h1>
<h3 className="text-center text-white text-base md:text-xl leading-6 max-w-[330px] mx-auto mb-8 font-Dosis font-normal">
LOST IN
<span className="relative inline-block">
&nbsp; SPACE
<span className="strikeThru"></span>
</span>

&nbsp; GDSC? Hmm, looks like that page doesn&apos;t exist.
</h3>
<Image id="astronaut" src="/astronaut.svg" alt="Astronaut" className="w-[43px] absolute right-20 top-210 animate-spin animation-linear duration-100" width={43} height={43} />
<Image id="planet" src="/saturn.svg" alt="Planet" className="absolute w-[390px]" width={390} height={390}/>
</div>
</div>

<button className='bg-transparent text-white py-2 px-0 border border-white rounded-md w-[150px] text-15 text-center mx-auto align-middle block mb-4 mt-25 fontDosis font-normal bottom-0 absolute left-1/2 translate-x-[-50%] translate-y-[-50%]' onClick={handleRedirection} >Go Home</button>
const handleRedirection = () => {
navigate.push('/');
};
return (
<div className="bg-[#24344c] h-screen relative overflow-hidden fontDosis">
<div id="particles-js" className=" bg-[#24344c] fixed w-full h-full opacity-20"></div>
<div className="denied__wrapper absolute bg-[#24344c] denied__wrapper h-[390px] left-1/2 max-w-[390px] mx-auto top-[30%] translate-x-[-50%] translate-y-[-50%] w-full">
<div className="relative">
<h1 className="text-center text-white font-Dosis text-[100px] mb-0 font-extrabold">404</h1>
<h3 className="text-center text-white text-base md:text-xl leading-6 max-w-[330px] mx-auto mb-8 font-Dosis font-normal">
LOST IN
<span className="relative inline-block">
&nbsp; SPACE
<span className="strikeThru"></span>
</span>
&nbsp; GDSC? Hmm, looks like that page doesn&apos;t exist.
</h3>
<Image
id="astronaut"
src="/astronaut.svg"
alt="Astronaut"
className="w-[43px] absolute right-20 top-210 animate-spin animation-linear duration-100"
width={43}
height={43}
/>
<Image id="planet" src="/saturn.svg" alt="Planet" className="absolute w-[390px]" width={390} height={390} />
</div>
);
</div>

<button
className="bg-transparent text-white py-2 px-0 border border-white rounded-md w-[150px] text-15 text-center mx-auto align-middle block mb-4 mt-25 fontDosis font-normal bottom-0 absolute left-1/2 translate-x-[-50%] translate-y-[-50%]"
onClick={handleRedirection}
>
Go Home
</button>
</div>
);
};

export default NotFound;
25 changes: 25 additions & 0 deletions components/FAQS.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from "react";
import {Accordion, AccordionItem} from "@nextui-org/react";

export default function FAQS() {
const ans1=
" The GDSC JU community is open to both seasoned techies and beginners in the Tech world. Whether you are into development or CP, or even if you are into more non-coding related technical domains like graphic design and documentation, the commmunity is open to every Jadavpur University student with a passion for technology ";
const ans3=
"You can be involved in the community of one or more GDSC chapters, however you can be a core team member in only one GDSC chapter. ";
const ans2 =
"No, Code Club JU and GDSC, despite both being involved in encouraging coding habits among students, donot refer to the same entity.";

return (
<Accordion selectionMode="multiple">
<AccordionItem key="1" aria-label="Q 1" title="Can those new to programming join GDSC-JU community?">
{ans1}
</AccordionItem>
<AccordionItem key="2" aria-label="Q 2" title="Is GDSC same as CodeClub JU?">
{ans2}
</AccordionItem>
<AccordionItem key="3" aria-label="Q 3" title="Can I be a part of more than one GDSC chapter?">
{ans3}
</AccordionItem>
</Accordion>
);
}
46 changes: 17 additions & 29 deletions components/Fields.jsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
import React from "react";
import Image from "next/image";
import React from 'react';
import Image from 'next/image';

function Fields() {
return (
<div className="md:px-5 w-[95%] lg:w-[90%] relative mx-auto lg:mt-20 md:mt-[100px]">
<p className="text-6xl md:text-4xl font-semibold text-center my-5">
What We Do
</p>
<p className="text-6xl md:text-4xl font-semibold text-center my-5">What We Do</p>

{/* Web Development */}
<div className="grid grid-cols-2 mx-auto grid-col my-5 gap-5 md:grid-cols-1 items-center py-5">
<div className="w-10/12 ">
<p className="font-semibold text-6xl text-red-600 md:text-xl lg:mb-5">
Development
</p>
<p className="font-semibold text-6xl text-red-600 md:text-xl lg:mb-5">Development</p>
<p className="text-lg">
Development is the process of creating and maintaining software and
computer programs. Dev encompasses everything from coding, to
maintenance to debugging. The open source community is one of the
most popular &quot;developer&quot; communities
Development is the process of creating and maintaining software and computer programs. Dev encompasses
everything from coding, to maintenance to debugging. The open source community is one of the most popular
&quot;developer&quot; communities
</p>
</div>
<div className="mx-auto">
Expand All @@ -32,32 +27,25 @@ function Fields() {
<Image src="/dsacp-image.png" width={400} height={400} alt="" />
</div>
<div className="w-10/12 ">
<p className="font-semibold md:text-xl text-6xl text-green-600 lg:mb-5">
DSA And CP
</p>
<p className="font-semibold md:text-xl text-6xl text-green-600 lg:mb-5">DSA And CP</p>
<p className="text-lg dark:text-white">
DSA (Data Structures and Algorithms) is the study of organizing and
manipulating data efficiently to perform complex computations
Competitive programming is a sport of coding where individuals or
teams solve algorithmic problems in a timed competition using DSA
skills, and quick thinking to solve problems within constraints.
DSA (Data Structures and Algorithms) is the study of organizing and manipulating data efficiently to perform
complex computations Competitive programming is a sport of coding where individuals or teams solve
algorithmic problems in a timed competition using DSA skills, and quick thinking to solve problems within
constraints.
</p>
</div>
</div>

{/* Machine Learning */}
<div className="grid grid-cols-2 md:grid-cols-1 gap-5 items-center py-5">
<div className="w-10/12">
<p className="font-semibold text-6xl text-blue-600 md:text-xl lg:mb-5">
Machine Learning
</p>
<p className="font-semibold text-6xl text-blue-600 md:text-xl lg:mb-5">Machine Learning</p>
<p className="text-lg">
Machine learning is a sub domain of artificial intelligence that
lets computers learn from data and make predictions or decisions for
newer datasets. It involves using algorithms to analyze corelations,
patterns and relationships within datasets. This technology finds
applications in diverse fields, from autonomous driving to
bioinformatics.
Machine learning is a sub domain of artificial intelligence that lets computers learn from data and make
predictions or decisions for newer datasets. It involves using algorithms to analyze corelations, patterns
and relationships within datasets. This technology finds applications in diverse fields, from autonomous
driving to bioinformatics.
</p>
</div>
<div className="mx-auto">
Expand Down
46 changes: 23 additions & 23 deletions components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import React from "react";
import Link from "next/link";
import {
FaFacebook,
FaTwitter,
FaYoutube,
FaInstagram,
FaLinkedin,
FaGithub,
} from "react-icons/fa";
FaXTwitter,
} from "react-icons/fa6";

function Footer() {
const socials = [
{
name: "Facebook",
link: "https://www.facebook.com/googlefordevs",
name: 'Facebook',
link: 'https://www.facebook.com/googlefordevs',
icon: <FaFacebook />,
hoverColor: "hover:text-blue-600",
darkhoverColor: "dark:hover:text-blue-600",
Expand All @@ -26,29 +26,29 @@ function Footer() {
darkhoverColor: "dark:hover:text-blue-400",
},
{
name: "Youtube",
link: "https://www.youtube.com/googledevelopers",
name: 'Youtube',
link: 'https://www.youtube.com/googledevelopers',
icon: <FaYoutube />,
hoverColor: "hover:text-red-600",
darkhoverColor: "dark:hover:text-red-600",
},
{
name: "Instagram",
link: "https://www.instagram.com/gdsc_ju/",
name: 'Instagram',
link: 'https://www.instagram.com/gdsc_ju/',
icon: <FaInstagram />,
hoverColor: "hover:text-purple-600",
darkhoverColor: "dark:hover:text-purple-600",
},
{
name: "LinkedIn",
link: "https://www.linkedin.com/company/gdsc-jadavpur-university/",
name: 'LinkedIn',
link: 'https://www.linkedin.com/company/gdsc-jadavpur-university/',
icon: <FaLinkedin />,
hoverColor: "hover:text-blue-800",
darkhoverColor: "dark:hover:text-blue-800",
},
{
name: "Github",
link: "https://github.com/GDSC-Jadavpur-University/",
name: 'Github',
link: 'https://github.com/GDSC-Jadavpur-University/',
icon: <FaGithub />,
hoverColor: "hover:text-black",
darkhoverColor: "dark:hover:text-white",
Expand All @@ -57,29 +57,29 @@ function Footer() {

const footerData = [
{
name: "About",
link: "/about",
name: 'About',
link: '/about',
},
{
name: "Events",
link: "/events",
name: 'Events',
link: '/events',
},
{
name: "Gallery",
link: "/gallery",
name: 'Gallery',
link: '/gallery',
},
{
name: "Projects",
link: "/projects",
name: 'Projects',
link: '/projects',
},
{
name: "Team",
link: "/team",
name: 'Team',
link: '/team',
},
];

return (
<footer className="w-full bg-gray-100 dark:bg-black py-8">
<footer className="w-full bg-gray-100 dark:bg-black dark:border-t-1 py-8">
{/* Row with links */}
<div className="w-full flex flex-col sm:flex-row justify-center">
<div className="flex flex-col sm:flex-row justify-center items-center w-full sm:w-1/2">
Expand Down
17 changes: 6 additions & 11 deletions components/Landing.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Player } from "@lottiefiles/react-lottie-player";
import React from 'react';
import { Player } from '@lottiefiles/react-lottie-player';

function Landing() {
return (
Expand All @@ -17,12 +17,10 @@ function Landing() {
</strong>

<br />
<span className="text-gray-500 font-normal">
Google Developer Student Club
</span>
<span className="text-gray-500 font-normal">Google Developer Student Club</span>
</p>

<p className="w-4/5 text-gray-500 text-lg md:text-base leading-[2.4rem]">
<p className="w-4/5 text-gray-400 text-lg md:text-base leading-[2.4rem]">
Google Developer Student Clubs are university based community groups
for students interested in Google developer technologies. Students
from all undergraduate or graduate programs with an interest in
Expand All @@ -32,16 +30,13 @@ function Landing() {
</p>

<div className="flex mt-10">
<a
href="https://gdsc.community.dev/jadavpur-university-kolkata/"
target="_blank"
>
<a href="https://gdsc.community.dev/jadavpur-university-kolkata/" target="_blank">
<button className="bg-red-400 text-white px-5 py-2 rounded-lg font-semibold text-lg hover:bg-red-950">
Join Us
</button>
</a>
<a href="https://developers.google.com/community/gdsc">
<button className="bg-gray-200 text-gray-600 px-5 py-2 rounded-lg font-semibold text-lg ml-5 hover:bg-zinc-500">
<button className="bg-gray-200 text-gray-600 px-5 py-2 rounded-lg font-semibold text-lg ml-5 hover:bg-zinc-500 hover:text-white">
Learn More
</button>
</a>
Expand Down
Loading

0 comments on commit d38f391

Please sign in to comment.