fix conflicts

src/Components/common/AppBar/drawerItems.js

@@ -85,6 +85,13 @@ const drawerItems = [
     path: '/api',
     materialIcon: true,
   },
+  {
+    id: 12,
+    name: 'ICPC',
+    icon: 'group',
+    path: '/icpc',
+    materialIcon: true,
+  },
 ];
 
 export default drawerItems;

src/Components/drawer/ICPC/Index.jsx

@@ -0,0 +1,74 @@
+import React from 'react';
+import Typography from '@material-ui/core/Typography';
+import { Box, Container } from '@material-ui/core';
+import NavButtons from './common/NavButtons';
+import './Style.css';
+
+const Index = () => {
+  return (
+    <Container className="container-center">
+      <Typography variant="h4" className="purple" align="left">
+        SIESGST @ ACM ICPC
+      </Typography>
+      <NavButtons />
+      <Box className="container-center">
+        <Typography variant="h6" color="textPrimary">
+          What is ACM ICPC?
+        </Typography>
+      </Box>
+      <Typography variant="body2" color="textSecondary">
+        The ACM ICPC is considered as the &quot;Olympics of Programming Competitions. It is quite
+        simply, the oldest, largest, and most prestigious programming contest in the world. The
+        ACM-ICPC (Association for Computing Machinery - International Collegiate Programming
+        Contest) is a multi-tier, team-based, programming competition. The contest participants come
+        from over 2,000 universities that are spread across 80 countries and six continents. In
+        terms of prize money, the top team takes home $15,000 along with the ICPC Gold medal. Three
+        other teams getting Gold Medal are awarded $7,500. Each Silver Medal team gets $6,000 and
+        each Bronze Medal team is awarded $3,000. Courtesy of the UPE Computer Science Honor
+        Society, the First Solution Award will be $1,500. For the other solved problems, The First
+        to Solve Award will be $1,200.
+      </Typography>
+      <Box className="container-center">
+        <Typography variant="h6" color="textPrimary">
+          Our History
+        </Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        {' '}
+        4 Years of Participation
+      </Typography>
+      SIESGST first participated in ACM ICPC 2016-17
+      <Typography variant="body1" color="textSecondary">
+        3 Time Regionalists
+      </Typography>
+      Teams from SIESGST have ranked in regionals twice
+      <Typography variant="body1" color="textSecondary">
+        5 Problems Solved
+      </Typography>
+      Current record is of maximum 5 solved problems at any regionals
+      <Box className="container-center">
+        <Typography variant="h5" color="textPrimary" align="left">
+          Updates
+        </Typography>
+      </Box>
+      <Typography variant="body2" color="textSecondary">
+        <li>Team Floor Gang participated at ACM ICPC Amritapuri Regionals 2020-21!</li>
+        <li>Team CoffeeCode participated at ACM ICPC Gwalior Regionals 2019-20!</li>
+        <li>Team Firebase participated at ACM ICPC Amritapuri Regionals 2017-18!</li>
+      </Typography>
+      <Box className="container-center">
+        <Typography variant="h5" color="textPrimary" align="left">
+          I want to participate
+        </Typography>
+      </Box>
+      <Typography variant="body2">
+        For more details on contest eligibility, structure and its registration
+        <a href="https://www.codechef.com/icpc" className="ml1">
+          visit here
+        </a>
+      </Typography>
+    </Container>
+  );
+};
+
+export default Index;

src/Components/drawer/ICPC/Style.css

@@ -0,0 +1,17 @@
+.container-center {
+  margin-top: 2rem !important;
+  /*margin-left: 0rem !important;
+  padding-left: 0rem !important;*/
+}
+.imagespacing {
+  margin-bottom: 1rem !important;
+}
+.twentyonesize {
+  width: 20rem !important;
+}
+.decor {
+  text-decoration: none;
+}
+.mt2 {
+  margin-top: 0.5rem !important;
+}

src/Components/drawer/ICPC/common/NavButtons.jsx

@@ -0,0 +1,32 @@
+import { Button, Typography } from '@material-ui/core';
+import React from 'react';
+import { Link } from 'react-router-dom';
+
+const NavButtons = () => {
+  return (
+    <Typography variant="body1" className="purple mt2">
+      <Button>
+        <Link to="/icpc/twentyone" className="decor">
+          2021
+        </Link>{' '}
+      </Button>
+      <Button>
+        <Link to="/icpc/twenty" className="decor">
+          2020
+        </Link>{' '}
+      </Button>
+      <Button>
+        <Link to="/icpc/eighteen" className="decor">
+          2018
+        </Link>{' '}
+      </Button>
+      <Button>
+        <Link to="/icpc/seventeen" className="decor">
+          2017
+        </Link>{' '}
+      </Button>
+    </Typography>
+  );
+};
+
+export default NavButtons;

src/Components/drawer/ICPC/year/Eighteen.jsx

@@ -0,0 +1,45 @@
+import React from 'react';
+import Typography from '@material-ui/core/Typography';
+import { Box, Container } from '@material-ui/core';
+import NavButtons from '../common/NavButtons';
+import '../Style.css';
+
+export default function Eighteen() {
+  return (
+    <Container className="container-center">
+      <Typography variant="h4" className="purple" align="left">
+        SIESGST @ ACM ICPC 2018
+        <NavButtons />
+      </Typography>
+      <Box className="container-center">
+        <Box
+          component="img"
+          className="imagespacing twentyonesize"
+          sx={{
+            height: 233,
+            width: 350,
+            maxHeight: { xs: 233, md: 167 },
+            maxWidth: { xs: 350, md: 250 },
+          }}
+          alt="Not found."
+          src="https://res.cloudinary.com/siesgstarena/image/upload/v1576418366/arena/icpc/icpc_2018_1.jpg"
+        />
+      </Box>
+      <Box className="container-center">
+        <Typography variant="h6">Team Name: Firebase</Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        This year one team participated in ACM ICPC. Team Firebase is comprised of Omkar Prabhu (TE
+        CE), Aditya Kulkarni (TE CE) and Brijesh Reddy (TE CE). This team cleared online round and
+        was selected for Amritapuri Regionals. This was the maiden year for SIESGST as they marked
+        their first attendance at any regionals!
+      </Typography>
+      <Box className="container-center">
+        <Typography variant="h6">Performance</Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        Amritapuri Regionals Team was able to solve only 1 problem and ranked 204 out of 250+ teams.
+      </Typography>
+    </Container>
+  );
+}

src/Components/drawer/ICPC/year/Seventeen.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import Typography from '@material-ui/core/Typography';
+import { Box, Container } from '@material-ui/core';
+import NavButtons from '../common/NavButtons';
+
+const Seventeen = () => {
+  return (
+    <Container className="container-center">
+      <Typography variant="h4" className="purple" align="left">
+        SIESGST @ ACM ICPC 2017
+        <NavButtons />
+      </Typography>
+      <Box className="container-center">
+        <Typography variant="h6" color="textPrimary">
+          Team Name: never_lucky
+        </Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        This year one team participated in ACM ICPC. Team never_lucky is comprised of Omkar Prabhu
+        (SE CE), Rishabh Karnad (BE IT) and Ashwin Pillai (BE IT). This team cleared online round
+        and was selected for Amritapuri Regionals. But due to unforeseen circumstances, they could
+        not participate in regionals.
+      </Typography>
+      <Box className="container-center">
+        <Typography variant="h6" color="textPrimary">
+          Performance
+        </Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        Amritapuri Regionals Did not participate.
+      </Typography>
+    </Container>
+  );
+};
+
+export default Seventeen;

src/Components/drawer/ICPC/year/Twenty.jsx

@@ -0,0 +1,51 @@
+import React from 'react';
+import Typography from '@material-ui/core/Typography';
+import { Box, Container } from '@material-ui/core';
+import NavButtons from '../common/NavButtons';
+import '../Style.css';
+
+const Twenty = () => {
+  return (
+    <Container className="container-center">
+      <Typography variant="h4" className="purple" align="left">
+        SIESGST @ ACM ICPC 2020
+        <NavButtons />
+      </Typography>
+      <Box className="container-center">
+        <Box
+          component="img"
+          className="w100 twentyonesize"
+          sx={{
+            height: 233,
+
+            maxHeight: { xs: 233, md: 167 },
+            maxWidth: { xs: 350, md: 250 },
+          }}
+          alt="Not found"
+          src="https://res.cloudinary.com/siesgstarena/image/upload/v1576418726/arena/icpc/icpc_2020_1.jpg"
+        />
+      </Box>
+      <Box className="container-center">
+        <Typography variant="h6" color="textPrimary">
+          Team Name: CoffeeCode
+        </Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        This year one team participated in ACM ICPC. Team CoffeeCode is comprised of Rahul
+        Sawantdesai (TE CE), Ninad Chavan (TE CE) and Mithil Poojary (SE IT). This team cleared
+        online round easily and was selected for both Gwalior and Amritapuri Regionals.
+      </Typography>
+      <Box className="container-center">
+        <Typography variant="h6" color="textPrimary">
+          Performance
+        </Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        Gwalior Regionals: Team was able to solve 5 problems and ranked 70 out of 121 teams. I guess
+        they will agree that speed is what differentiates who is up or down in rankings.
+      </Typography>
+    </Container>
+  );
+};
+
+export default Twenty;

src/Components/drawer/ICPC/year/Twentyone.jsx

@@ -0,0 +1,57 @@
+import React from 'react';
+import Typography from '@material-ui/core/Typography';
+import { Box, Container } from '@material-ui/core';
+import NavButtons from '../common/NavButtons';
+import '../Style.css';
+
+const Twentyone = () => {
+  return (
+    <Container className="container-center">
+      <Typography variant="h4" className="purple" align="left">
+        SIESGST @ ACM ICPC 2021
+        <NavButtons />
+      </Typography>
+      <Box className="container-center">
+        <Box
+          component="img"
+          className="mr2 w100 twentyonesize"
+          alt="Not found"
+          src="https://res.cloudinary.com/siesgstarena/image/upload/v1630910944/arena/icpc/icpc_2021_1.png"
+        />
+        <Box
+          component="img"
+          className="mr2 w100 twentyonesize"
+          alt="Not found"
+          src="https://res.cloudinary.com/siesgstarena/image/upload/v1630910944/arena/icpc/icpc_2021_3.png"
+        />
+        <Box
+          component="img"
+          className="mr1 w200 twentyonesize"
+          alt="Not found"
+          src="https://res.cloudinary.com/siesgstarena/image/upload/v1630910944/arena/icpc/icpc_2021_2.png"
+        />
+      </Box>
+      <Box className="container-center">
+        <Typography variant="h6" className="container-center" color="textPrimary">
+          Team Name: Floor Gang
+        </Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        This year one team participated in ACM ICPC. Team Floor Gang is comprised of Rahul
+        Sawantdesai (BE CE) , Ninad Chavan (BE CE) and Shambhavi Sudarshan (BE CE). This team
+        cleared preliminary round and was selected for Amritapuri Regionals.
+      </Typography>
+      <Box className="container-center">
+        <Typography variant="h6" color="textPrimary">
+          Performance
+        </Typography>
+      </Box>
+      <Typography variant="body1" color="textSecondary">
+        Preliminary round: Team was able to solve 3 problems and ranked 295 out of 3505 teams.
+        Amritapuri Regionals: Team was able to solve 4 problems and ranked 114 out of 722 teams.
+      </Typography>
+    </Container>
+  );
+};
+
+export default Twentyone;

src/Routes.jsx

@@ -10,7 +10,13 @@ import { GET_LOGGED_IN_USER } from './graphql/queries';
 import ErrorBoundary from './Components/common/ErrorBoundary/index';
 import SomethingWentWrong from './Components/common/SomethingWentWrong/index';
 import './App.scss';
+// import Eighteen from './Components/icpc team py/Eighteen';
 
+const icpc = lazy(() => import('./Components/drawer/ICPC/Index'));
+const eighteen = lazy(() => import('./Components/drawer/ICPC/year/Eighteen'));
+const seventeen = lazy(() => import('./Components/drawer/ICPC/year/Seventeen'));
+const twenty = lazy(() => import('./Components/drawer/ICPC/year/Twenty'));
+const twentyone = lazy(() => import('./Components/drawer/ICPC/year/Twentyone'));
 const PrivateRoute = lazy(() => import('./Components/common/PrivateRoute'));
 const SignIn = lazy(() => import('./Components/auth/signin/index'));
 const SignUp = lazy(() => import('./Components/auth/signup/index'));
@@ -184,6 +190,11 @@ const Routes = () => {
                   <Route path="/auth/confirm/:userId" exact component={ConfirmEmail} />
                   <Route path="/contests" exact component={ContestsSchedule} />
                   <Route path="/learn" exact component={Learn} />
+                  <Route path="/icpc" exact component={icpc} />
+                  <Route path="/icpc/eighteen" exact component={eighteen} />
+                  <Route path="/icpc/seventeen" exact component={seventeen} />
+                  <Route path="/icpc/twenty" exact component={twenty} />
+                  <Route path="/icpc/twentyone" exact component={twentyone} />
                   <Route path="/ratings" exact component={Ratings} />
                   <Route path="/blogs" exact component={BlogsList} />
                   <PrivateRoute path="/blogs/create" exact component={CreateBlog} />