Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Improvement #57

Merged
merged 3 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added frontend/public/images/icons/alumni.png
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 frontend/public/images/icons/angular.png
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 frontend/public/images/icons/c.png
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 frontend/public/images/icons/event.png
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 frontend/public/images/icons/github.png
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 frontend/public/images/icons/go.png
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 frontend/public/images/icons/java.png
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 frontend/public/images/icons/logout.png
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 frontend/public/images/icons/projects.png
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 frontend/public/images/icons/python.png
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 frontend/public/images/icons/react.png
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 frontend/public/images/icons/registration.png
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 frontend/public/images/icons/team.png
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 frontend/public/images/icons/vue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 17 additions & 12 deletions frontend/src/components/Cards/TeamsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
import { Typography } from "@material-ui/core";
import DomainCard from "src/components/Cards/DomainCard";
import { teamList } from "../../pages/Domains/teamList";
import AnimateOnScroll from "src/utils/animateonscroll";

const useStyles = makeStyles((theme: Theme) =>
createStyles({
Expand Down Expand Up @@ -77,18 +78,22 @@ const TeamCard: React.FC<TeamcardProps> = ({ domain, batch }) => {
<div className={classes.flexbox}>
{teamList.map((memberData, i) => {
return memberData.team === domain && memberData.batch === batch ? (
<DomainCard
key={i}
{...{
...memberData,
team:
domain === "cp"
? "Competitive Programmer"
: domain === "dev"
? "Developer"
: "Designer",
}}
/>
<>
<AnimateOnScroll>
<DomainCard
key={i}
{...{
...memberData,
team:
domain === "cp"
? "Competitive Programmer"
: domain === "dev"
? "Developer"
: "Designer",
}}
/>
</AnimateOnScroll>
</>
) : null;
})}
</div>
Expand Down
42 changes: 38 additions & 4 deletions frontend/src/components/Nav/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,35 @@ const useStyles = makeStyles((theme: Theme) =>
pseudolink: {
cursor: "pointer",
},
topNav: {
textAlign: "center",
paddingTop: 20,
paddingBottom: 20,
background: "#171717",
color: "white",
},
divider: {
height: 3,
width: "100%",
background: "#1d1d1d",
},
list: {
marginTop: 10,
display: "flex",
flexDirection: "column",
gap: 8,
},
link: {
textDecoration: "none",
},
btn: {
display: "flex",
gap: 20,
borderRadius: 5,
"&:hover": {
background: "#1d1d1d",
},
},
})
);
const Nav: React.FC = () => {
Expand All @@ -76,7 +105,7 @@ const Nav: React.FC = () => {
role="presentation"
onClick={toggleDrawer}
>
<List>
<List className={classes.list}>
{linklist.map((linkData, key) => {
if (linkData.loginReq) {
return !!token ? (
Expand All @@ -85,7 +114,7 @@ const Nav: React.FC = () => {
onClick={async () => await handleLogout(linkData.url)}
key={key}
>
<ListItem button>
<ListItem button className={classes.btn}>
<Typography className={classes.other}>
{linkData.name}
</Typography>
Expand All @@ -94,8 +123,9 @@ const Nav: React.FC = () => {
) : null;
}
return (
<Link to={linkData.url} key={key}>
<ListItem button>
<Link className={classes.link} to={linkData.url} key={key}>
<ListItem button className={classes.btn}>
<img width={20} height={20} src={linkData.icon} />
<Typography className={classes.other}>
{linkData.name}
</Typography>
Expand Down Expand Up @@ -130,6 +160,10 @@ const Nav: React.FC = () => {
</Toolbar>
</AppBar>
<Drawer anchor={"right"} open={drawerOpen} onClose={toggleDrawer}>
<div className={classes.topNav}>
<Typography>MENU</Typography>
</div>
<div className={classes.divider}></div>
{drawerList}
</Drawer>
</div>
Expand Down
11 changes: 11 additions & 0 deletions frontend/src/components/Nav/linklist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@ export const linklist = [
name: "Team",
url: "/team",
loginReq: false,
icon: "/webix.iiitdmj.ac.in/images/icons/team.png",
},
{
name: "Projects",
url: "/projects",
loginReq: false,
icon: "/webix.iiitdmj.ac.in/images/icons/projects.png",
},
{
name: "Alumni",
url: "/alumni",
loginReq: false,
icon: "/webix.iiitdmj.ac.in/images/icons/alumni.png",
},
{
name: "Alumni",
Expand All @@ -18,15 +26,18 @@ export const linklist = [
name: "Events",
url: "/events",
loginReq: true,
icon: "/webix.iiitdmj.ac.in/images/icons/event.png",
},
{
name: "Registration",
url: "/registration",
loginReq: true,
icon: "/webix.iiitdmj.ac.in/images/icons/registration.png",
},
{
name: "Logout",
url: "/",
loginReq: true,
icon: "/webix.iiitdmj.ac.in/images/icons/logout.png",
},
];
73 changes: 68 additions & 5 deletions frontend/src/components/WhyUs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,74 @@ const WhyUs: React.FC = () => {
</p>
</div>
<div className={styles.vectors}>
<img
className={styles.aboutImg}
src="/webix.iiitdmj.ac.in/images/other/why_us.png"
alt="tech"
/>
<div className={styles.circlecontainer}>
<div className={styles.outercircle}>
<div className={styles.circle}>
<img
width="80px"
height="80px"
className={styles.github}
src="/webix.iiitdmj.ac.in/images/icons/github.png"
alt=""
/>
<img
width="80px"
height="80px"
className={styles.react}
src="/webix.iiitdmj.ac.in/images/icons/react.png"
alt=""
/>
<img
width="80px"
height="80px"
className={styles.angular}
src="/webix.iiitdmj.ac.in/images/icons/angular.png"
alt=""
/>
<img
width="80px"
height="80px"
className={styles.vue}
src="/webix.iiitdmj.ac.in/images/icons/vue.png"
alt=""
/>
</div>
<div className={styles.middlewrapper}>
<div className={styles.middlecircle}>
<div className={styles.circle}>
<img
width="80px"
height="80px"
className={styles.c}
src="/webix.iiitdmj.ac.in/images/icons/c.png"
alt=""
/>
<img
width="80px"
height="80px"
className={styles.java}
src="/webix.iiitdmj.ac.in/images/icons/java.png"
alt=""
/>
<img
width="80px"
height="80px"
className={styles.python}
src="/webix.iiitdmj.ac.in/images/icons/python.png"
alt=""
/>
<img
width="80px"
height="80px"
className={styles.go}
src="/webix.iiitdmj.ac.in/images/icons/go.png"
alt=""
/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
);
Expand Down
147 changes: 144 additions & 3 deletions frontend/src/components/WhyUs/style.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,156 @@
justify-content: space-around;
align-items: center;
height: 80%;
}
.vectors > img {
width: 40vw;
margin-right: 5vw;
}

.break {
margin-bottom: 5vh;
}

.circlecontainer {
display: flex;
justify-content: center;
align-items: center;
}

.outercircle {
width: 400px;
height: 400px;
background-color: #00050b;
border-radius: 50%;
margin: 50px auto;
position: relative;
animation: rotate 30s linear infinite;
padding: 80px;
}

.middlewrapper {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
background-color: #00050b;
border-radius: 50%;
}

.middlecircle {
width: 250px;
height: 250px;
background-color: #00050b;
border-radius: 50%;
animation: rotate-reverse 15s linear infinite;
}

.github {
position: absolute;
top: 0;
left: 50%;
transform: translate(-50%, -50%);
font-size: 40px;
color: red;
border-radius: 50%;
box-shadow: 0 0 30px 15px #08ffea;
}

.react {
position: absolute;
bottom: 0;
left: 50%;
transform: translate(-50%, 50%);
font-size: 40px;
color: red;
box-shadow: 0 0 30px 15px #08ffea;
border-radius: 50%;
}

.angular {
position: absolute;
left: 0;
top: 50%;
transform: translate(-50%, -50%);
font-size: 40px;
color: red;
box-shadow: 0 0 30px 15px #08ffea;
border-radius: 50%;
}

.vue {
position: absolute;
right: 0;
top: 50%;
transform: translate(50%, -50%);
font-size: 40px;
color: red;
box-shadow: 0 0 30px 15px #08ffea;
border-radius: 50%;
}

.c {
position: absolute;
top: 0;
left: 50%;
transform: translate(-50%, -50%);
font-size: 40px;
color: red;
box-shadow: 0 0 30px 15px #08ffea;
border-radius: 50%;
}

.java {
position: absolute;
bottom: 0;
left: 50%;
transform: translate(-50%, 50%);
font-size: 40px;
color: red;
box-shadow: 0 0 30px 15px #08ffea;
border-radius: 50%;
}

.go {
position: absolute;
left: 0;
top: 50%;
transform: translate(-50%, -50%);
font-size: 40px;
color: red;
box-shadow: 0 0 30px 15px #08ffea;
border-radius: 50%;
}

.python {
position: absolute;
right: 0;
top: 50%;
transform: translate(50%, -50%);
font-size: 40px;
color: red;
box-shadow: 0 0 30px 15px #08ffea;
border-radius: 50%;
}

@keyframes rotate {
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(360deg);
}
}

@keyframes rotate-reverse {
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(-360deg);
}
}

@media only screen and (max-width: 1180px) {
.container {
margin-top: 15vh;
Expand Down
Loading