diff --git a/package.json b/package.json index 9e0f09b..605f186 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fabric-engineering-web", - "version": "1.2.4", + "version": "1.2.5", "author": "Arnob Mahmud", "private": true, "dependencies": { diff --git a/src/components/students/Palette.js b/src/components/archive/Palette.js similarity index 100% rename from src/components/students/Palette.js rename to src/components/archive/Palette.js diff --git a/src/components/students/assets/zer.jpg b/src/components/archive/assets/zer.jpg similarity index 100% rename from src/components/students/assets/zer.jpg rename to src/components/archive/assets/zer.jpg diff --git a/src/components/students/config/custom.js b/src/components/archive/config/custom.js similarity index 100% rename from src/components/students/config/custom.js rename to src/components/archive/config/custom.js diff --git a/src/components/students/json/students-data.json b/src/components/archive/json/students-data.json similarity index 100% rename from src/components/students/json/students-data.json rename to src/components/archive/json/students-data.json diff --git a/src/components/students/pages/AchievementInfo.js b/src/components/archive/pages/AchievementInfo.js similarity index 100% rename from src/components/students/pages/AchievementInfo.js rename to src/components/archive/pages/AchievementInfo.js diff --git a/src/components/archive/pages/ExamRoutine.js b/src/components/archive/pages/ExamRoutine.js new file mode 100644 index 0000000..b085d0d --- /dev/null +++ b/src/components/archive/pages/ExamRoutine.js @@ -0,0 +1,63 @@ +import React from "react"; +import { SafeArea } from "../config/custom"; +export default function TermExamRoutine() { + return ( + +
+
+
+
+

Fabric Engineering

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {" "} + + + + + + + +
DateTimeCourse CodeCourse
09 June, 202210:00Am - 1:00PMMS 103Mathematics - II
13 June, 202210:00Am - 1:00PMPHY 103Physics - II
19 June, 202210:00Am - 1:00PMCHEM 103Chemistry - II
23 June, 202210:00Am - 1:00PMIPE 101Engineering Materials (EM)
27 June, 202210:00Am - 1:00PMMDM 101Computer Programming (CP)
03 July, 202210:00Am - 1:00PMWPE 101Polymer Science Engineering (PSE)
+
+
+
+
+ ); +} diff --git a/src/components/students/pages/LabRoutine.js b/src/components/archive/pages/LabRoutine.js similarity index 100% rename from src/components/students/pages/LabRoutine.js rename to src/components/archive/pages/LabRoutine.js diff --git a/src/components/students/pages/StudentsInfo.js b/src/components/archive/pages/StudentsInfo.js similarity index 100% rename from src/components/students/pages/StudentsInfo.js rename to src/components/archive/pages/StudentsInfo.js diff --git a/src/components/students/screen/StudentsHomeScreen.js b/src/components/archive/screen/Archives.js similarity index 60% rename from src/components/students/screen/StudentsHomeScreen.js rename to src/components/archive/screen/Archives.js index f277f4e..8efccec 100644 --- a/src/components/students/screen/StudentsHomeScreen.js +++ b/src/components/archive/screen/Archives.js @@ -1,5 +1,5 @@ import React from "react"; -import StudentsDataCard from "../widgets/StudentsCornerCard"; +import ArchiveCard from "../widgets/ArchivesCard"; import { InfoArea } from "../Palette"; export default function StudentsHomeScreen() { return ( @@ -7,26 +7,40 @@ export default function StudentsHomeScreen() {
- +
+
+
-
-
+
+ +
diff --git a/src/components/students/widgets/StudentsCornerCard.js b/src/components/archive/widgets/ArchivesCard.js similarity index 87% rename from src/components/students/widgets/StudentsCornerCard.js rename to src/components/archive/widgets/ArchivesCard.js index 54c432a..0ffd46e 100644 --- a/src/components/students/widgets/StudentsCornerCard.js +++ b/src/components/archive/widgets/ArchivesCard.js @@ -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 ( <> @@ -22,4 +22,4 @@ class StudentsDataCard extends Component { } } -export default StudentsDataCard; +export default ArchivesDataCard; diff --git a/src/components/includes/Footer.js b/src/components/includes/Footer.js index ba1b11e..0100433 100644 --- a/src/components/includes/Footer.js +++ b/src/components/includes/Footer.js @@ -46,6 +46,11 @@ function Footer() { } link4={ + + Exam Routine + + } + link5={ } + link5={ + + Archives + + } />
diff --git a/src/components/includes/NavigationBar.js b/src/components/includes/NavigationBar.js index 815cfc3..816ab3e 100644 --- a/src/components/includes/NavigationBar.js +++ b/src/components/includes/NavigationBar.js @@ -42,21 +42,6 @@ const NavigationBar = () => { Resources - {/* */}
  • @@ -75,45 +60,18 @@ const NavigationBar = () => {
  • - + Archives
  • -
  • - +
  • + - Production + Developer -
      -
    • - - - Covid Update - - -
    • {" "} -
    • - - - Developer - - -
    • -
  • diff --git a/src/pages/Archives.js b/src/pages/Archives.js new file mode 100644 index 0000000..e8ad1a8 --- /dev/null +++ b/src/pages/Archives.js @@ -0,0 +1,12 @@ +import React from "react"; +import Archive from "../components/archive/screen/Archives.js"; + +function ArchivePage() { + return ( +
    + +
    + ); +} + +export default ArchivePage; diff --git a/src/pages/StudentsCorner.js b/src/pages/StudentsCorner.js deleted file mode 100644 index 0b2587f..0000000 --- a/src/pages/StudentsCorner.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from "react"; -import StudentsHomeScreen from "../components/students/screen/StudentsHomeScreen"; - -function StudentsCornerPage() { - return ( -
    - -
    - ); -} - -export default StudentsCornerPage; diff --git a/src/routes/Routers.js b/src/routes/Routers.js index 82820aa..9b360d0 100644 --- a/src/routes/Routers.js +++ b/src/routes/Routers.js @@ -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"; @@ -111,9 +112,10 @@ const RouteHandle = () => { {/********* Students Section Starts Here ************/} - + +