Skip to content

Commit

Permalink
modify eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
saiankit committed Aug 13, 2021
1 parent 3503b59 commit 6b63496
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 73 deletions.
6 changes: 4 additions & 2 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"singleQuote": true

"singleQuote": true,
"trailingComma": "all",
"printWidth": 100,
"tabWidth": 2
}
17 changes: 0 additions & 17 deletions components/header/ActiveLink.jsx

This file was deleted.

18 changes: 18 additions & 0 deletions components/header/DiscordJoinCommunity.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { FaDiscord } from 'react-icons/fa';

function DiscordJoinCommunity() {
const style = { color: 'white', fontSize: '1em' };

return (
<a href="https://discord.gg/F2QF5eG9">
<div className="flex gap-2 items-center bg-google-blue hover:bg-google-blue font-bold p-2 rounded transition duration-500 hover:scale-110">
<FaDiscord style={style} />
<h1 style={style} className="text-red">
Join Community
</h1>
</div>
</a>
);
}

export default DiscordJoinCommunity;
10 changes: 2 additions & 8 deletions components/header/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { FaDiscord } from 'react-icons/fa';
import DiscordJoinCommunity from './DiscordJoinCommunity';
import Logo from './Logo';
import NavItem from './NavItem';
import ThemeToggleButton from './ThemeToggleButton';
import ActiveLink from './ActiveLink';

function Header() {
return (
Expand All @@ -13,12 +12,7 @@ function Header() {
<NavItem text="Events" href="/events" />
<NavItem text="Team" href="/team" />
<NavItem text="Projects" href="https://github.com/dscbitshyd" />
<a href="https://discord.gg/F2QF5eG9">
<button className="flex gap-2 items-center bg-google-blue hover:bg-google-blue text-white dark:text-white font-bold p-2 rounded transition duration-500 hover:scale-110">
<FaDiscord />
<h1 className="text-red">Join Community</h1>
</button>
</a>
<DiscordJoinCommunity />
</div>
<ThemeToggleButton />
</ul>
Expand Down
20 changes: 11 additions & 9 deletions components/hero/Hero.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { motion } from 'framer-motion';
import Image from 'next/image';
import { FaDiscord } from 'react-icons/fa';

import {
RiFacebookCircleLine,
RiLinkedinBoxLine,
RiInstagramLine,
RiMediumLine,
RiYoutubeLine,
RiMailLine,
} from 'react-icons/ri';
import DiscordJoinCommunity from '../header/DiscordJoinCommunity';

import GoogleRectangle from './GoogleRectangle';
import SocialIcon from './SocialIcon';

Expand All @@ -27,7 +28,7 @@ function Hero() {
lg:mt-20
"
>
<div className="flex flex-1 flex-col items-center lg:items-start">
<div className="flex flex-1 flex-col items-center lg:items-start gap-2">
<motion.h2
initial={{ scale: 0.8, opacity: 0 }}
animate={{ scale: 1, opacity: 1 }}
Expand Down Expand Up @@ -93,14 +94,15 @@ function Hero() {
href="www.instagram.com"
icon={<RiYoutubeLine size={50} />}
/>
<SocialIcon
href="www.instagram.com"
icon={<RiMailLine size={50} />}
/>
</motion.div>
</div>
<a href="https://discord.gg/F2QF5eG9">
<div className="md:hidden mt-5 flex gap-2 items-center bg-blue-500 hover:bg-blue-700 text-white font-bold p-2 rounded transition duration-500 hover:scale-110">
<FaDiscord />
<h1>Join Community</h1>
</div>
</a>
<div className="block lg:hidden md:hidden">
<DiscordJoinCommunity />
</div>
</div>
{/* <!-- The Dome --> */}
<motion.div
Expand Down
2 changes: 1 addition & 1 deletion components/team/BusinessDivision.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function BusinessDivision() {
<h1 className="text-2xl font-light p-8">Business Division</h1>
<div className="grid-cols-1 md:flex gap-16 justify-center items-center">
<TeamItem
url="/Mani DSC.jpg"
url="/Mani Venkat DSC.jpeg"
name="Mani Venkat"
position="Business Lead"
github="www.github.com/saiankit"
Expand Down
38 changes: 2 additions & 36 deletions pages/events.jsx
Original file line number Diff line number Diff line change
@@ -1,40 +1,7 @@
/* eslint-disable jsx-a11y/alt-text */
import Head from 'next/head';
import { motion } from 'framer-motion';
import Header from '../components/header/Header';
import Hero from '../components/hero/Hero';
import Team from '../components/team/Team';

// Our custom easing
const easing = [0.6, -0.05, 0.01, 0.99];

// animate: defines animation
// initial: defines initial state of animation or stating point.
// exit: defines animation when component exits

// Custom variant
const fadeInUp = {
initial: {
y: 60,
opacity: 0,
transition: { duration: 0.6, ease: easing },
},
animate: {
y: 0,
opacity: 1,
transition: {
duration: 0.6,
ease: easing,
},
},
};

const stagger = {
animate: {
transition: {
staggerChildren: 0.1,
},
},
};

export default function Events() {
return (
Expand Down Expand Up @@ -69,8 +36,7 @@ export default function Events() {
>
<div className="flex">
<h1 className="text-5xl font-bold tracking-wide mx-auto">
Stay Tuned! DSC is supercharged for providing many events
throughout the year!
Stay Tuned! DSC is supercharged for providing many events throughout the year!
</h1>
<img src="/events.svg" height={300} width={300} />
</div>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Mani Venkat DSC.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/ToDoList.zip
Binary file not shown.

0 comments on commit 6b63496

Please sign in to comment.