Skip to content

Commit

Permalink
First Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
ShreyashYewale committed Aug 15, 2021
1 parent 5973215 commit 91533b5
Show file tree
Hide file tree
Showing 15 changed files with 473 additions and 151 deletions.
20 changes: 20 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"configurations": [
{
"name": "windows-gcc-x86",
"includePath": [
"${workspaceFolder}/**"
],
"compilerPath": "C:\\MinGW\\bin\\gcc.exe",
"cStandard": "${default}",
"cppStandard": "${default}",
"intelliSenseMode": "windows-gcc-x86",
"compilerArgs": [
"-Wall",
"-Wextra",
"-Wpedantic"
]
}
],
"version": 4
}
19 changes: 19 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"C_Cpp_Runner.cCompilerPath": "C:\\MinGW\\bin\\gcc.exe",
"C_Cpp_Runner.cppCompilerPath": "C:\\MinGW\\bin\\g++.exe",
"C_Cpp_Runner.debuggerPath": "C:\\MinGW\\bin\\gdb.exe",
"C_Cpp_Runner.makePath": "C:\\MinGW\\bin\\make.exe",
"C_Cpp_Runner.warnings": [
"-Wall",
"-Wextra",
"-Wpedantic"
],
"C_Cpp_Runner.compilerArgs": [],
"C_Cpp_Runner.includePaths": [],
"C_Cpp_Runner.linkerArgs": [],
"C_Cpp_Runner.cStandard": "",
"C_Cpp_Runner.cppStandard": "",
"C_Cpp_Runner.excludeSearch": [],
"C_Cpp_Runner.enableWarnings": true,
"C_Cpp_Runner.warningsAsError": false
}
Binary file added client/public/Images/Dhruvil.jpg
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 client/public/Images/Karan.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/src/components/navigation/DSCNavBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default class DSCNavBar extends Component {
textDecoration: 'inherit'
}}
>
DSC MESCOE
GDSC MESCOE
</Link>
</Col>
<Col lg="8" className="my-auto">
Expand Down
2 changes: 1 addition & 1 deletion client/src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const ROUTES = [
icon: <People style={{ color: 'black' }} />,
name: 'Team',
path: '/team',
component: <Team />,
component: <Team/>,
type: RouteType.PAGE
},
{
Expand Down
104 changes: 104 additions & 0 deletions client/src/views/CSSFiles/Team.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
.black {
color: black;
font-weight: bolder;
}
.person {
width: 600px;
padding: 70px 0 0 230px;
min-height: 200px;
margin: auto;
position: relative;
}
.person-badge {
width: 200px;
height: 280px;
border-radius: 0 0 100px 100px;
overflow: hidden;
transform: rotate(0deg); /* To force its own layer */
position: absolute;
top: 0;
left: 0;
}
.person-badge:before,
.person-badge:after{
content: "";
position: absolute;
bottom: 0;
border-radius: 50%;
z-index:-1;
width: 200px;
height: 200px;
background: #DDD;
background: linear-gradient(to bottom, #EEE 0%,#CCC 100%);
transition:500ms;
}
.person-badge:after {
background: linear-gradient(to top, #F88 0%,#EEE 100%);
opacity: 0;
}
.person:nth-child(2) .person-badge:after {
background: linear-gradient(to top, #5AB 0%,#EEE 100%);
}
.person:nth-child(3) .person-badge:after {
background: linear-gradient(to top, #FC0 0%,#EEE 100%);
}
.person-badge:hover:after {
opacity: 1;
}

.person-badge img {
width: 200px;
position: absolute;
bottom: 0;
left: 0;
transition: 500ms;
}
.person-badge img.peculiar {
opacity: 0;
transform: translateY(80px)
}

.person-badge:hover img.normal {opacity: 0;transform: translateY(80px)}
.person-badge:hover img.peculiar {opacity: 1;transform: translateY(0)}

.person h3 {
margin: 0;
font-weight: 200;
font-size: 28px;
}

strong {color: #888;margin:-5px 0 5px 0;display:block;font-size:.8em;}

@media only screen and (max-width: 425px) {

.person h3 {
font-size: 24px;
}
.person-badge {
position: relative;
margin: 0 auto;
width: 100px;
height: 150px;
}
.person-badge img {
width: 100px;
}
.person {
width: 400px;
padding: 10px 0 0 10px;
}

.person-badge:before,
.person-badge:after{
content: "";
position: absolute;
bottom: 0;
border-radius: 50%;
z-index:-1;
width: 100px;
height: 100px;
background: #DDD;
background: linear-gradient(to bottom, #EEE 0%,#CCC 100%);
transition:500ms;
}
}
21 changes: 21 additions & 0 deletions client/src/views/DemoTeam.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from "react";
import {Toolbar} from "@material-ui/core";
import {Container, Row, Col} from "react-bootstrap";
import {resetFooterStyle, resetNavStyle} from "../utils/utils";
import Dhruvil from "../assets/img/Dhruvil.jpg";
import Kaif from "../assets/img/Kaif.jpg";
import Karan from "../assets/img/Karan.jpg";
import Prem from "../assets/img/Prem.jpg";
import Varun from "../assets/img/Varun.jpg";
import Sakshi from "../assets/img/Sakshi.jpg";
import Tanya from "../assets/img/Tanya.jpg";
import Pratik from "../assets/img/Pratik.jpg";
import Laukik from "../assets/img/Laukik.jpg";
import Gaurav from "../assets/img/Gaurav.jpg";

import TeamComponent from "../components/team/team-component";

export default class DemoTeam extends React.Component {


}
2 changes: 1 addition & 1 deletion client/src/views/Events.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class Events extends React.Component {
}

componentDidMount() {
document.title = 'Events - DSC MESCOE';
document.title = 'Events - GDSC MESCOE';
resetNavStyle({page: 'Events'})

Axios.get(`${serverURL}/api/events`).then(result => {
Expand Down
6 changes: 3 additions & 3 deletions client/src/views/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default class Home extends React.Component {
}

componentDidMount() {
document.title = 'Home - DSC MESCOE';
document.title = 'Home - GDSC MESCOE';
resetNavStyle({page: 'Home'})
window.addEventListener('scroll', this.handleScroll);

Expand Down Expand Up @@ -97,7 +97,7 @@ export default class Home extends React.Component {
textDecoration: 'inherit',
}}
>
DSC MESCOE
GDSC MESCOE
</Link>
</Col>
</Row>
Expand Down Expand Up @@ -132,7 +132,7 @@ export default class Home extends React.Component {
textDecoration: 'inherit'
}}
>
Our aim at DSC MESCOE is to learn and teach. Developers, designers and managers come together under
Our aim at GDSC MESCOE is to learn and teach. Developers, designers and managers come together under
one roof to create a community which inspires others.
</p>
</Col>
Expand Down
2 changes: 1 addition & 1 deletion client/src/views/Projects.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default class Projects extends React.Component {
}

componentDidMount() {
document.title = 'Projects - DSC MESCOE';
document.title = 'Projects - GDSC MESCOE';
resetNavStyle({page: 'Projects'});

axios.get(`${serverURL}/api/projects`)
Expand Down
Loading

0 comments on commit 91533b5

Please sign in to comment.