Skip to content

Commit

Permalink
~v1.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ArnobMahmud committed May 30, 2022
1 parent bf9810b commit 0635d76
Show file tree
Hide file tree
Showing 16 changed files with 117 additions and 70 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-engineering-web",
"version": "1.2.4",
"version": "1.2.5",
"author": "Arnob Mahmud",
"private": true,
"dependencies": {
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
63 changes: 63 additions & 0 deletions src/components/archive/pages/ExamRoutine.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import React from "react";
import { SafeArea } from "../config/custom";
export default function TermExamRoutine() {
return (
<SafeArea>
<div className="container">
<div className="row justify-content-center">
<div className="card col-xl-11 col-md-12 col-sm-12">
<div className="section-title">
<h1>Fabric Engineering</h1>
</div>
<table>
<tr>
<th>Date</th>
<th>Time</th>
<th>Course Code</th>
<th>Course</th>
</tr>
<tbody>
<tr>
<td>09 June, 2022</td>
<td>10:00Am - 1:00PM</td>
<td>MS 103</td>
<td>Mathematics - II</td>
</tr>
<tr>
<td>13 June, 2022</td>
<td>10:00Am - 1:00PM</td>
<td>PHY 103</td>
<td>Physics - II</td>
</tr>
<tr>
<td>19 June, 2022</td>
<td>10:00Am - 1:00PM</td>
<td>CHEM 103</td>
<td>Chemistry - II</td>
</tr>
<tr>
<td>23 June, 2022</td>
<td>10:00Am - 1:00PM</td>
<td>IPE 101</td>
<td>Engineering Materials (EM)</td>
</tr>
<tr>
<td>27 June, 2022</td>
<td>10:00Am - 1:00PM</td>
<td>MDM 101</td>
<td>Computer Programming (CP)</td>
</tr>{" "}
<tr>
<td>03 July, 2022</td>
<td>10:00Am - 1:00PM</td>
<td>WPE 101</td>
<td>Polymer Science Engineering (PSE)</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</SafeArea>
);
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,32 +1,46 @@
import React from "react";
import StudentsDataCard from "../widgets/StudentsCornerCard";
import ArchiveCard from "../widgets/ArchivesCard";
import { InfoArea } from "../Palette";
export default function StudentsHomeScreen() {
return (
<InfoArea>
<div className="container">
<div className="row justify-content-center">
<div className="col-lg-5 col-md-6 col-sm-12">
<StudentsDataCard
<ArchiveCard
title="Covid'19 Updates"
subTitle="Real time Covid'19 updates of every country worldwide!"
accessLink="/covid19updates"
/>
</div>
<div className="col-lg-5 col-md-6 col-sm-12">
<ArchiveCard
title="Student's Info"
subTitle="Academic info of all fabric engineering 46th batch's student."
accessLink="/studentsinfo"
/>
</div>
<div className="col-lg-5 col-md-6 col-sm-12">
<StudentsDataCard
<ArchiveCard
title="Student's Achievement"
subTitle="Academic achievement of fabric engineering 46th batch's student."
accessLink="/studentsachievement"
/>
</div>
<div className="col-lg-5 col-md-6 col-sm-12">
<StudentsDataCard
<ArchiveCard
title="Lab Routine"
subTitle="Level 1 - Term 2 Lab Routine of Fabric Engineering Department."
accessLink="/l1t2lab"
/>
</div>
<div className="col-lg-5 col-md-6 col-sm-12">
<ArchiveCard
title="Exam Routine"
subTitle="Level 1 - Term 2 Final Exam Routine of Fabric Engineering Department."
accessLink="/l1t2exam"
/>
</div>
</div>
</div>
</InfoArea>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from "react";
import { Link } from "react-router-dom";
import { ImTree } from "react-icons/im";

class StudentsDataCard extends Component {
class ArchivesDataCard extends Component {
render() {
return (
<>
Expand All @@ -22,4 +22,4 @@ class StudentsDataCard extends Component {
}
}

export default StudentsDataCard;
export default ArchivesDataCard;
10 changes: 10 additions & 0 deletions src/components/includes/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ function Footer() {
</Link>
}
link4={
<Link className="foot-link" to="/l1t2exam">
Exam Routine
</Link>
}
link5={
<a
className="foot-link"
href="https://fabricweb-backend-server.herokuapp.com/"
Expand Down Expand Up @@ -81,6 +86,11 @@ function Footer() {
Covid Updates
</Link>
}
link5={
<Link className="foot-link" to="/archives">
Archives
</Link>
}
/>
</div>
<div className="col-lg-3 col-md-6 col-sm-12">
Expand Down
50 changes: 4 additions & 46 deletions src/components/includes/NavigationBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,6 @@ const NavigationBar = () => {
Resources
</IconContext.Provider>
</Link>
{/* <ul
className="dropdown-menu"
aria-labelledby="navbarDropdown"
>
<li>
<Link className="nav-link" to="/level1-term1">
Level 1 Term 1
</Link>
</li>
<li>
<Link className="nav-link" to="/level1-term2">
Level 1 Term 2
</Link>
</li>
</ul> */}
</li>
<li className="nav-item">
<Link className="nav-link" to="/syllabus">
Expand All @@ -75,45 +60,18 @@ const NavigationBar = () => {
</Link>
</li>
<li className="nav-item">
<Link className="nav-link" to="/studentscorner">
<Link className="nav-link" to="/archives">
<IconContext.Provider value={{ size: "25" }}>
Archives
</IconContext.Provider>
</Link>
</li>
<li className="nav-item dropdown">
<Link
className="nav-link dropdown-toggle"
href="#"
id="navbarDropdown"
role="button"
data-bs-toggle="dropdown"
aria-expanded="false"
to=""
>
<li className="nav-item">
<Link className="nav-link" to="/developer">
<IconContext.Provider value={{ size: "25" }}>
Production
Developer
</IconContext.Provider>
</Link>
<ul
className="dropdown-menu"
aria-labelledby="navbarDropdown"
>
<li className="nav-item">
<Link className="nav-link" to="/covid19updates">
<IconContext.Provider value={{ size: "25" }}>
Covid Update
</IconContext.Provider>
</Link>
</li>{" "}
<li className="nav-item">
<Link className="nav-link" to="/developer">
<IconContext.Provider value={{ size: "25" }}>
Developer
</IconContext.Provider>
</Link>
</li>
</ul>
</li>
</ul>
</div>
Expand Down
12 changes: 12 additions & 0 deletions src/pages/Archives.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from "react";
import Archive from "../components/archive/screen/Archives.js";

function ArchivePage() {
return (
<div>
<Archive />
</div>
);
}

export default ArchivePage;
12 changes: 0 additions & 12 deletions src/pages/StudentsCorner.js

This file was deleted.

12 changes: 7 additions & 5 deletions src/routes/Routers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { Route, Switch } from "react-router-dom";
import Navbar from "../components/includes/NavigationBar";
import HomePage from "../pages/HomePage";

import StudentsCornerPage from "../pages/StudentsCorner";
import StudentsInfo from "../components/students/pages/StudentsInfo";
import StudentsAchievementInfo from "../components/students/pages/AchievementInfo";
import Level1Term2Lab from "../components/students/pages/LabRoutine";
import ArchivePage from "../pages/Archives.js";
import StudentsInfo from "../components/archive/pages/StudentsInfo";
import StudentsAchievementInfo from "../components/archive/pages/AchievementInfo";
import Level1Term2Lab from "../components/archive/pages/LabRoutine";
import Level1Term2Exam from "../components/archive/pages/ExamRoutine";

import SyllabusPage from "../pages/SyllabusPage";
import ResourcePage from "../pages/ResourcePage";
Expand Down Expand Up @@ -111,9 +112,10 @@ const RouteHandle = () => {
<Route exact path="/accessories" component={AccessoriesPage} />

{/********* Students Section Starts Here ************/}
<Route exact path="/studentscorner" component={StudentsCornerPage} />
<Route exact path="/archives" component={ArchivePage} />
<Route exact path="/studentsinfo" component={StudentsInfo} />
<Route exact path="/l1t2lab" component={Level1Term2Lab} />
<Route exact path="/l1t2exam" component={Level1Term2Exam} />
<Route
exact
path="/studentsachievement"
Expand Down

0 comments on commit 0635d76

Please sign in to comment.