Skip to content

Commit

Permalink
did some foramtting chages
Browse files Browse the repository at this point in the history
  • Loading branch information
ShubhAgarwal-dev committed Jun 19, 2023
1 parent 386e1ed commit af50113
Show file tree
Hide file tree
Showing 32 changed files with 1,176 additions and 300 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.next
.vscode
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"singleQuote": true,
"bracketSpacing": true,
"printWidth": 120
}
20 changes: 10 additions & 10 deletions app/events/data.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
const data = [
{
heading: "AlgoUniversity Code Rush",
time: "May",
heading: 'AlgoUniversity Code Rush',
time: 'May',
content:
"We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA",
knowMoreLink: "https://www.granddecoder.mit.edu/",
image: "/Projects/Images/GRAND.png",
'We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA',
knowMoreLink: 'https://www.granddecoder.mit.edu/',
image: '/Projects/Images/GRAND.png',
},
{
heading: "Toolset Unbounded",
time: "June - July",
heading: 'Toolset Unbounded',
time: 'June - July',
content:
"We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA",
knowMoreLink: "https://www.granddecoder.mit.edu/",
image: "/Projects/Images/GRAND.png",
'We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA',
knowMoreLink: 'https://www.granddecoder.mit.edu/',
image: '/Projects/Images/GRAND.png',
},
];

Expand Down
4 changes: 2 additions & 2 deletions app/events/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import data from "./data";
import Block from "@/components/Block/Block";
import data from './data';
import Block from '@/components/Block/Block';

export default function Events() {
return (
Expand Down
13 changes: 6 additions & 7 deletions app/globals.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import url("https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;500;700&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;400;500;600&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Inconsolata:wght@300;400;500;700&display=swap");
@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;500;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;400;500;600&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Inconsolata:wght@300;400;500;700&display=swap');
@import url(https://fonts.googleapis.com/css?family=Inconsolata);

@tailwind base;
Expand Down Expand Up @@ -34,8 +34,8 @@
--primary-light-pastel-gray: #dbdbd0;

/*---------Fonts--------------------*/
--font-fancy: "Inconsolata", monospace;
--font-regular: "Inconsolata", monospace;
--font-fancy: 'Inconsolata', monospace;
--font-regular: 'Inconsolata', monospace;
}

body {
Expand Down Expand Up @@ -78,8 +78,7 @@ html {
}

.vertical-timeline-element-icon {
box-shadow: 0 0 0 4px var(--text-black), inset 0 2px 0 rgba(0, 0, 0, 0.08),
0 3px 0 4px rgba(0, 0, 0, 0.05) !important;
box-shadow: 0 0 0 4px var(--text-black), inset 0 2px 0 rgba(0, 0, 0, 0.08), 0 3px 0 4px rgba(0, 0, 0, 0.05) !important;
}

@media (max-width: 900px) {
Expand Down
20 changes: 8 additions & 12 deletions app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
import AppBar from "@/components/AppBar/AppBar";
import "./globals.css";
import { Inter } from "next/font/google";
import Footer from "@/components/Footer/Footer";
import AppBar from '@/components/AppBar/AppBar';
import './globals.css';
import { Inter } from 'next/font/google';
import Footer from '@/components/Footer/Footer';

const inter = Inter({ subsets: ["latin"] });
const inter = Inter({ subsets: ['latin'] });

export const metadata = {
title: "Coding Club Website",
description: "Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)",
title: 'Coding Club Website',
description: 'Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)',
};

export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
<html lang="en">
<body className={inter.className}>
Expand Down
14 changes: 7 additions & 7 deletions app/leaderboard/page.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { NextPage } from 'next'
import { NextPage } from 'next';

interface Props {}

export const metadata = {
title: "Codeforces Leaderboard",
description: "Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)",
}
title: 'Codeforces Leaderboard',
description: 'Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)',
};

const Leaderboard: NextPage<Props> = ({}) => {
return <div></div>
}
return <div></div>;
};

export default Leaderboard
export default Leaderboard;
8 changes: 4 additions & 4 deletions app/members/[slug]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { NextPage } from 'next'
import { NextPage } from 'next';

interface Props {}

const Page: NextPage<Props> = ({}) => {
return <div></div>
}
return <div></div>;
};

export default Page
export default Page;
28 changes: 14 additions & 14 deletions app/members/admins_data.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { admin_data } from "@/components/Member/admins.types";
import { admin_data } from '@/components/Member/admins.types';

const admin_data_val : admin_data = [
const admin_data_val: admin_data = [
{
name: "Shubh Agarwal",
img: "/Team/xyz.jpg",
email: "",
linkedIn:"https://youtu.be/dQw4w9WgXcQ",
instagram: "https://www.instagram.com/virat.kohli/",
name: 'Shubh Agarwal',
img: '/Team/xyz.jpg',
email: '',
linkedIn: 'https://youtu.be/dQw4w9WgXcQ',
instagram: 'https://www.instagram.com/virat.kohli/',
},
{
name: "Saksham Chhimwal",
img: "/Team/xyz.jpg",
email: "",
linkedIn:"https://youtu.be/dQw4w9WgXcQ",
instagram: "https://www.instagram.com/virat.kohli/",
name: 'Saksham Chhimwal',
img: '/Team/xyz.jpg',
email: '',
linkedIn: 'https://youtu.be/dQw4w9WgXcQ',
instagram: 'https://www.instagram.com/virat.kohli/',
},
]
];

export default admin_data_val
export default admin_data_val;
6 changes: 3 additions & 3 deletions app/members/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Member from "@/components/Member/Member";
import Admins from "@/components/Member/admins";
import admin_data_val from "./admins_data";
import Member from '@/components/Member/Member';
import Admins from '@/components/Member/admins';
import admin_data_val from './admins_data';

export default function Members() {
return (
Expand Down
8 changes: 4 additions & 4 deletions app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Hero from "@/components/Hero/Hero";
import Image from "next/image";
import Hero from '@/components/Hero/Hero';
import Image from 'next/image';

export const metadata = {
title: "Coding Club Website",
description: "Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)",
title: 'Coding Club Website',
description: 'Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)',
};

export default function Home() {
Expand Down
8 changes: 4 additions & 4 deletions app/projects/data.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const data = [
{
heading: "GrandChip Replication",
heading: 'GrandChip Replication',
content:
"We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA",
knowMoreLink: "https://www.granddecoder.mit.edu/",
image: "/Projects/Images/GRAND.png",
'We will try to replicate GRAND Chip, or try to get near that to make a universal encoding and decoding FPGA',
knowMoreLink: 'https://www.granddecoder.mit.edu/',
image: '/Projects/Images/GRAND.png',
},
];

Expand Down
8 changes: 4 additions & 4 deletions app/projects/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Block from "@/components/Block/Block";
import data from "./data";
import Block from '@/components/Block/Block';
import data from './data';

export const metadata = {
title: "Projects for Coding Club",
description: "Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)",
title: 'Projects for Coding Club',
description: 'Coded by Shubh Agarwal (https://github.com/ShubhAgarwal-dev)',
};

export default function Project() {
Expand Down
6 changes: 3 additions & 3 deletions components/AppBar/AppBar.module.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("https://fonts.googleapis.com/css2?family=Syne+Mono");
@import url('https://fonts.googleapis.com/css2?family=Syne+Mono');

.navBarWrapper {
width: 100%;
Expand Down Expand Up @@ -39,7 +39,7 @@
cursor: pointer;
font-weight: 400;
font-size: 1.25rem;
font-family: "Syne Mono", monospace;
font-family: 'Syne Mono', monospace;
position: relative;
}

Expand All @@ -62,7 +62,7 @@
}

.option::before {
content: "";
content: '';
position: absolute;
left: 0;
bottom: -2px;
Expand Down
41 changes: 13 additions & 28 deletions components/AppBar/AppBar.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"use client";
'use client';

import { useState, useEffect } from "react";
import Image from "next/image";
import Link from "next/link";
import styles from "./AppBar.module.css";
import { useState, useEffect } from 'react';
import Image from 'next/image';
import Link from 'next/link';
import styles from './AppBar.module.css';

const prefix = process.env.NEXT_PUBLIC_BASE_PATH || "";
const prefix = process.env.NEXT_PUBLIC_BASE_PATH || '';

export default function AppBar() {
const [active, setActive] = useState(false);
Expand All @@ -23,34 +23,21 @@ export default function AppBar() {
setPreviousScrollPosition(currentScrollPos);
setVisible(visible);
};
window.addEventListener("scroll", handleScroll);
return () => window.removeEventListener("scroll", handleScroll);
window.addEventListener('scroll', handleScroll);
return () => window.removeEventListener('scroll', handleScroll);
}, [previousScrollPosition]);

return (
<div id="homeId">
<nav
className={styles.navBarWrapper}
style={{ top: visible ? 0 : "-6rem" }}
>
<nav className={styles.navBarWrapper} style={{ top: visible ? 0 : '-6rem' }}>
<div className={styles.navBarMain}>
<div className={styles.logoWrapper}>
<Link href={`${prefix + "/soi"}`}>
<Image
src="/Logo4xWithoutFade.png"
width={70}
height={50}
alt="Picture of the club"
priority
/>
<Link href={`${prefix + '/soi'}`}>
<Image src="/Logo4xWithoutFade.png" width={70} height={50} alt="Picture of the club" priority />
</Link>
</div>
<div className={styles.optionsWrapper}>
<div
className={`${styles.optionsMenu} ${
active && styles.activeSidebar
}`}
>
<div className={`${styles.optionsMenu} ${active && styles.activeSidebar}`}>
<div className={styles.option}>
<Link href="/" scroll={false}>
<div>Home</div>
Expand Down Expand Up @@ -79,9 +66,7 @@ export default function AppBar() {
</div>
<div className={styles.hamBurgerWrapper}>
<div
className={`${styles.hamburger} ${
active ? styles.active : styles["not-active"]
}`}
className={`${styles.hamburger} ${active ? styles.active : styles['not-active']}`}
onClick={clickHandler}
>
<span className={styles.spans}></span>
Expand Down
13 changes: 3 additions & 10 deletions components/Block/Block.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styles from "./Block.module.css";
import BlockCard from "./BlockCard/BlockCard";
import styles from './Block.module.css';
import BlockCard from './BlockCard/BlockCard';

// interface datablock {
// heading: string
Expand Down Expand Up @@ -27,14 +27,7 @@ export default function Block({ title, blocksData }) {
</div>
<div className={styles.blocksCardWrapper}>
{blocksData.map((data, index) => {
return (
<BlockCard
data={data}
key={index}
number={index + 1}
leftSideImage={index % 2 ? false : true}
/>
);
return <BlockCard data={data} key={index} number={index + 1} leftSideImage={index % 2 ? false : true} />;
})}
</div>
</div>
Expand Down
23 changes: 5 additions & 18 deletions components/Block/BlockCard/BlockCard.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
import styles from "./BlockCard.module.css";
import Image from "next/image";
import styles from './BlockCard.module.css';
import Image from 'next/image';

export default function BlockCard({ leftSideImage, data, number }) {
return (
<>
<div className={styles.blockCardWrapper}>
<div className={styles.blockCardMain}>
<div
className={`${styles.blockInfo} ${
leftSideImage && styles.blockInfoLeft
}`}
>
<div className={`${styles.blockInfo} ${leftSideImage && styles.blockInfoLeft}`}>
<div className={styles.blockNumber}>
<h1>{number < 10 ? `0${number}` : number}</h1>
<div className={styles.styleDiv}></div>
Expand All @@ -25,21 +21,12 @@ export default function BlockCard({ leftSideImage, data, number }) {
<a href={data.knowMoreLink} target="_blank">
<div>Know More</div>
<div className={styles.buttonImage}>
<Image
alt="button"
src="/Events/event-button.svg"
fill
priority
/>
<Image alt="button" src="/Events/event-button.svg" fill priority />
</div>
</a>
</div>
</div>
<div
className={`${styles.blockImageWrapper} ${
leftSideImage && styles.blockImageWrapperLeft
}`}
>
<div className={`${styles.blockImageWrapper} ${leftSideImage && styles.blockImageWrapperLeft}`}>
<div className={styles.blockImageCard}>
<Image src={data.image} fill alt="user provided image" />
</div>
Expand Down
Loading

0 comments on commit af50113

Please sign in to comment.