Skip to content

Commit

Permalink
Merge pull request #135 from mayank2021/master
Browse files Browse the repository at this point in the history
Update Programs and added web dev club page
  • Loading branch information
dinskid authored Dec 30, 2021
2 parents a5ad0ea + cd12578 commit 60cb96a
Show file tree
Hide file tree
Showing 17 changed files with 847 additions and 212 deletions.
52 changes: 35 additions & 17 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,25 @@ function App() {
loading: () => loading,
});

const AdmissionFeeStructure = Loadable({
loader: () => import("./pages/admissionfeestructure/index"),
loading: () => loading,
});
// const AdmissionFeeStructure = Loadable({
// loader: () => import("./pages/admissionfeestructure/index"),
// loading: () => loading,
// });

const AdmissionForms = Loadable({
loader: () => import("./pages/admissionforms/index"),
loading: () => loading,
});
// const AdmissionForms = Loadable({
// loader: () => import("./pages/admissionforms/index"),
// loading: () => loading,
// });

const AntiRagging = Loadable({
loader: () => import("./pages/antiragging/index.js"),
loading: () => loading,
});

const AdmissionContact = Loadable({
loader: () => import("./pages/admissioncontact/index"),
loading: () => loading,
});
// const AdmissionContact = Loadable({
// loader: () => import("./pages/admissioncontact/index"),
// loading: () => loading,
// });

const Notices = Loadable({
loader: () => import("./pages/notices/index"),
Expand Down Expand Up @@ -271,6 +271,21 @@ function App() {
loading: () => loading,
});

const Admission_ug = Loadable({
loader: () => import("./pages/Admission_ug/index"),
loading: () => loading,
});

const Admission_pg = Loadable({
loader: () => import("./pages/Admission_pg/index"),
loading: () => loading,
});

const Admission_program = Loadable({
loader: () => import("./pages/Admission_program/index"),
loading: () => loading,
});

return (
<BrowserRouter history={window.history} basename={process.env.PUBLIC_URL}>
<link
Expand All @@ -287,15 +302,18 @@ function App() {
<Route path="/about" component={About} />
<Route path="/faculty" component={Faculty} />
<Route path="/staff" component={Staff} />
<Route path="/admission_procedure" component={AdmissionProcedure} />
<Route
<Route path="/admission" component={AdmissionProcedure} />
{/* <Route
path="/admission_fee_structure"
component={AdmissionFeeStructure}
/>
/> */}
<Route path="/webDevClub" component={WebDevClub} />
<Route path="/admission_forms" component={AdmissionForms} />
{/* <Route path="/admission_forms" component={AdmissionForms} /> */}
<Route path="/admission_ug" component={Admission_ug} />
<Route path="/admission_pg" component={Admission_pg} />
<Route path="/programs" component={Admission_program} />
<Route path="/anti_ragging_committee" component={AntiRagging} />
<Route path="/admission_contact" component={AdmissionContact} />
{/* <Route path="/admission_contact" component={AdmissionContact} /> */}
<Route path="/general" component={Notices} />
<Route path="/tenders" component={Tenders} />
<Route path="/news" component={News} />
Expand Down
11 changes: 11 additions & 0 deletions src/components/person_card/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Typography } from "@material-ui/core";
import { makeStyles } from "@material-ui/core/styles";
import Icon from '@material-ui/core/Icon';
import MailIcon from '@material-ui/icons/Mail';
import LocalPhoneIcon from '@material-ui/icons/LocalPhone';
import {
BrowserRouter as Router,
Route,
Expand Down Expand Up @@ -71,6 +72,16 @@ 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>
):null
}
</div>
</div>
</>
Expand Down
Binary file added src/images/people/faculty/adm_ece_1.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 src/images/people/staff/staff_1n.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 src/images/people/staff/staff_2n.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 src/images/people/staff/staff_3n.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 src/images/people/staff/staff_4n.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 src/images/people/staff/staff_5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 2 additions & 14 deletions src/json/navbar_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,12 @@
"icon": "note_add",
"submenu": [
{
"text": "Admission Procedure",
"link": "/admission_procedure"
},
{
"text": "Fee Structure",
"link": "/admission_fee_structure"
},
{
"text": "Admission Forms",
"link": "/admission_forms"
"text": "Admission",
"link": "/admission"
},
{
"text": "Anti Ragging Committee",
"link": "/anti_ragging_committee"
},
{
"text": "Contact",
"link": "/admission_contact"
}
]
},
Expand Down
32 changes: 22 additions & 10 deletions src/json/staff.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
{
"data": [
{
"name": "Mr. S. Selvarasu",
"designation": "Consultant-Accountant",
"emailID": "[email protected]",
"src": "staff_1.jpg"
"name": "Mr. M. Balamurugan",
"designation": "Site Engineer",
"emailID": "--",
"src": "staff_1n.jpg"
},
{
"name": "Ms. P. Leema",
"designation": "Office-Assistant",
"emailID": "[email protected]",
"src": "staff_2.jpg"
"name": "Mrs. M. Saraswathy",
"designation": "Administrative Assistant",
"emailID": "--",
"src": "staff_2n.jpg"
},
{
"name": "Mr. S. Selvarasu",
"name": "Mr. R. Kannan",
"designation": "Administrative Assistant",
"emailID": "--",
"src": "staff_3n.jpg"
},
{
"name": "Mr. S. Christu Raj",
"designation": "Administrative Assistant",
"emailID": "--",
"src": "staff_4n.jpg"
},
{
"name": "Mr. V. Logeswaran",
"designation": "Multi-tasking Staff",
"emailID": " ",
"emailID": "--",
"src": "staff_4.jpg"
}
]
Expand Down
85 changes: 85 additions & 0 deletions src/pages/Admission_pg/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import React from "react";
import '../Admission_ug/index.css';
import Navbar from "../../components/navbar/index";
import Footer from "../../components/footer";
import {
Typography,
Grid,
Box,
} from "@material-ui/core";
import { makeStyles } from "@material-ui/core/styles";

const Admission_pg = () => {
const createStyles = makeStyles({
themeText: {
color: "#2e8b57",
fontSize: 40,
fontWeight: "500",
},
container: {
padding: "1rem 1rem",
},
link: {
textDecoration: "none",
display: "block",
paddingTop: "1rem",
fontWeight: "500",
width: "auto",
color: "#2e8b57",
"&:hover": {
textDecoration: "underline",
color: "blueviolet",
},
},
});
const classes = createStyles();

return (
<div>
<Navbar />
<Grid container className={classes.container}>
<Grid item xs={false} sm={1} />
<Grid item xs={12} sm={10}>
<Typography
variant="h3"
component="h3"
gutterBottom
className={classes.themeText}
>
<Box component="span">M.Tech Admission</Box>
</Typography>

<h2 className="utility_margin-h4">CCMT 2021</h2>
<a
className={`${classes.link}`}
href="http://www.iiitt.ac.in/downloads/admission/BTechReporting_details_2021-22-updated71221.pdf"
target="_blank"
>
Online PI Reporting for M.Tech. provisional admission through
CCMT-2021
</a>
<hr className="utility-hr utility-hr-2"/>
<a className={`${classes.link}`} href="curriculum" target="_blank">
<h3>Curriculum and Syllabus</h3>{" "}
</a>
<hr className="utility-hr utility-hr-2"/>
<h2>Fee Structure</h2>
<ul className="utility-bullet">
<li>
<a
className={`${classes.link}`}
href="http://www.iiitt.ac.in/downloads/admission/MTechFeeRefundStructure2021.pdf"
target="_blank"
>
Fee Refund Structure 2021{" "}
</a>
</li>
</ul>
</Grid>
</Grid>
<Footer/>
</div>
);
};

export default Admission_pg;
Loading

0 comments on commit 60cb96a

Please sign in to comment.