Merge pull request #133 from Jagmohan-Dixit/master

Update Staff, Club and RTI Page and Correction in Navbar Buttons

src/components/footer/index.js

@@ -56,28 +56,28 @@ const Footer = () => {
           <div className="acedemics">
             <h2>Academics</h2>
             <div className="main-hr ace"></div>
-            <a href="departments">Department</a>
+            <a href="/departments">Department</a>
             <hr />
-            <a href="curriculum">Curriculum</a>
+            <a href="/curriculum">Curriculum</a>
             <hr />
-            <a href="programs">Programs</a>
+            <a href="/programs">Programs</a>
             <hr />
-            <a href="calendar">Calender</a>
+            <a href="/calendar">Calender</a>
             <hr />
-            <a href="holidays">Holidays</a>
+            <a href="/holidays">Holidays</a>
           </div>
           <div className="line"></div>
           <hr className="mobile" />
           <div className="quick-explore">
             <h2>Quick Explore</h2>
             <div className="main-hr  quick-ex"></div>
-            <a href="anti_ragging_committee">Anti Ragging Committee</a>
+            <a href="/anti_ragging_committee">Anti Ragging Committee</a>
             <hr />
-            <a href="admission_procedure">Admission Procedure</a>
+            <a href="/admission_procedure">Admission Procedure</a>
             <hr />
-            <a href="admission_fee_structure">Fee Structure</a>
+            <a href="/admission_fee_structure">Fee Structure</a>
             <hr />
-            <a href="faq">FAQ's</a>
+            <a href="/faq">FAQ's</a>
           </div>
           <div className="last line"></div>
           <hr className="mobile" />

src/components/navbar/desktop-items.js

@@ -89,7 +89,7 @@ export default function MenuListComposition(props) {
             <Paper>
               <ClickAwayListener onClickAway={handleClose}>
                 <MenuList id="menu-list-grow" onKeyDown={handleListKeyDown}>
-                  {props.submenu.map((item) => {
+                {props.submenu.map((item) => {
                     return (
                       <Link
                         to={item.link}

src/components/navbar/drawer.js

@@ -3,6 +3,7 @@ import clsx from "clsx";
 import { makeStyles } from "@material-ui/core/styles";
 import Drawer from "@material-ui/core/Drawer";
 import IconButton from "@material-ui/core/IconButton";
+import Icon from "@material-ui/core/Icon";
 import MenuIcon from "@material-ui/icons/Menu";
 import List from "@material-ui/core/List";
 import Divider from "@material-ui/core/Divider";
@@ -64,13 +65,31 @@ export default function TemporaryDrawer(props) {
           </Link>
         )}
         {props.items.map((menu_item, index) => {
+          if(menu_item.name)
+            {
+            return (
+              <div className="single_navmob">
+                <ListItemIcon className="scholaricon">
+                  <Icon>{menu_item.icon}</Icon>
+                  {/* <HomeIcon color="rgba(0,0,0,0.54)" nopadding /> */}
+                  {/* {console.log(menu_item.icon)} */}
+                </ListItemIcon>
+              <Link
+                to={menu_item.name}
+                draggable="false"
+                className="single_nav_routesmob"
+              >{menu_item.text}</Link>
+              </div>
+            );
+          } else {
           return (
             <NestedList
               menu={menu_item}
               toggleDrawer={toggleDrawer}
               anchor={anchor}
             />
           );
+          }
         })}
       </List>
       <Divider />

src/components/navbar/index.js

@@ -18,6 +18,7 @@ import ListItemText from "@material-ui/core/ListItemText";
 import HomeRoundedIcon from "@material-ui/icons/HomeRounded";
 import LocalLibraryIcon from "@material-ui/icons/LocalLibrary";
 import {HashLink} from 'react-router-hash-link';
+import { Link } from "react-router-dom";
 import MenuListComposition from "./desktop-items";
 import HomeIcon from "./homeicon";
 import TemporaryDrawer from "./drawer";
@@ -119,12 +120,25 @@ export default class Navbar extends React.Component {
                           this.state.navbar_data.data.length
                         )
                         .map((item, id) => {
-                          return (
-                            <MenuListComposition
-                              nav_head={item.text}
-                              submenu={item.submenu}
-                            />
-                          );
+                          if(item.name)
+                          {
+                            return (
+                              <div className="navhead">
+                              <Link
+                                to={item.name}
+                                draggable="false"
+                                className="single_nav_routes"
+                              >{item.text}</Link>
+                              </div>
+                            );
+                          } else {
+                            return (
+                              <MenuListComposition
+                                nav_head={item.text}
+                                submenu={item.submenu}
+                              />
+                            );
+                            }
                         })}
                     </div>
                   </>

src/components/navbar/nestedlist.js

@@ -46,6 +46,12 @@ export default function NestedList(props) {
       </ListItem>
       <Collapse in={open} timeout="auto" unmountOnExit>
         {props.menu.submenu.map((item) => {
+          if(props.menu.name)
+          {
+            return(
+                <></>
+              );
+          } 
           return (
             <Link to={item.link} draggable="false" className="nav_routes">
               <List component="div" disablePadding>

src/components/navbar/style.css

@@ -60,6 +60,62 @@
   color: #000;
   opacity: 0.9;
 }
+.navhead {
+  width: auto;
+  height: auto;
+}
+.navhead:hover {
+  border-radius: 5px;
+  background: rgb(255, 255, 255, 0.25) !important;
+}
+.single_nav_routes { 
+  margin-top: 6px;
+  padding-left: 10px;
+  padding-right: 10px;
+  text-decoration: none;
+  color: white !important;
+  font-size: 0.875rem;
+  font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+  font-weight: 500;
+  line-height: 1.75;
+  letter-spacing: 0.02857em;
+  text-transform: uppercase;
+}
+.single_nav_routes:hover {
+  color: white !important;
+}
+
+.single_navmob {
+  padding-bottom: 10px;
+  padding-top: 10px;
+  display: flex;
+  font-size: 0.875rem;
+  font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+  font-weight: 500;
+  line-height: 1.75;
+  letter-spacing: 0.02857em;
+}
+
+.single_nav_routesmob {
+  text-decoration: none;
+  opacity: 0.7;
+  font-weight: 500;
+  color: black;
+  font-size: 1.05rem;
+}
+.scholaricon {
+    padding-left: 17px;
+    padding-right: 55px;
+    fill: currentColor;
+    width: 1em;
+    height: 1em;
+    display: inline-block;
+    font-size: 1.5rem;
+    transition: fill 200ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+    flex-shrink: 0;
+    user-select: none;
+}
+
 #home_button > button:hover {
   background-color: rgb(255, 255, 255, 0.25);
 }
@@ -73,4 +129,6 @@
 #quick_nav>a>svg{
   color: #fff;
   font-size: 24px;
-}
+}
+
+

src/components/person_card/index.js

@@ -72,16 +72,9 @@ const PersonCard = (props) => {
               {props.emailID}
             </a>
           </div>
-          {
-            props.mobile?(
-              <div className="info-div">
-            <LocalPhoneIcon className="info-icon" />
-            <a href={`tel::${props.mobile}`} className="info">
-              {props.mobile}
-            </a>
+          <div className="info-div">
+          <a href={`Phone:${props.phone}`} style={{color:"white"}}>{props.phone}</a>
           </div>
-            ):null
-          }
         </div>
       </div>
     </>

src/components/person_card/styles.css

@@ -59,7 +59,7 @@ text-decoration: none;
   opacity: 0.8;
 }
 .text h4{
-  font-size: 1.0rem;
+  font-size: 0.99rem;
   color:#fff;
   margin-left:6%;
   margin-top: 10px;

src/json/achievements.json

@@ -2,25 +2,25 @@
   "data": [
     {
       "title": "Google Summer Of Code 2020 ",
-      "link": "PhD_Interview_date_and_time_updated_scheduleAug2020.pdf",
+      "link": "/docs/news/PhD_Interview_date_and_time_updated_scheduleAug2020.pdf",
       "text": "Participation in Hacktober fest",
       "date": "20/07/2020"
     },
     {
       "title": "FOSSEE 2020 ",
-      "link": "PhD_Interview_date_and_time_updated_scheduleAug2020.pdf",
+      "link": "/docs/news/PhD_Interview_date_and_time_updated_scheduleAug2020.pdf",
       "text": "Fossee 2020",
       "date": "20/07/2020"
     },
     {
       "title": "Selected for Higer Education in Top Institutes of the World",
-      "link": "Ph.D_instructions_for_applicants.pdf",
+      "link": "/docs/news/Ph.D_instructions_for_applicants.pdf",
       "text": "Participation in Hacktober fest",
       "date": "25/07/2020"
     },
     {
       "title": "Participation in Inter IIIT Sports fest",
-      "link": "List_of_Candidates_shortlisted(Ph.D)for_interview.pdf",
+      "link": "/docs/news/List_of_Candidates_shortlisted(Ph.D)for_interview.pdf",
       "text": "Participation in Inter IIIT Sports fest",
       "date": "8/08/2020"
     }