Merge pull request #34 from hariclerry/bugfix/code-merge

Bugfix/code merge
hariclerry · Jul 18, 2024 · 07be05b · 07be05b
2 parents 09a386d + 9f74041
commit 07be05b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/frontend/src/core/component/NavBar.jsx b/frontend/src/core/component/NavBar.jsx
@@ -1,6 +1,6 @@
-import {Container, Nav, Navbar, NavDropdown} from 'react-bootstrap';
+import { Container, Nav, Navbar, NavDropdown } from 'react-bootstrap';
 import getCurrentProfile from '../utils/current-profile';
-import {Roles} from '../constants';
+import { Roles } from '../constants';
 
 export default function NavBar() {
   const profile = getCurrentProfile();
@@ -26,6 +26,13 @@ export default function NavBar() {
             <Nav.Link href="/resources" className="text-white">
               Resources
             </Nav.Link>
+            <Nav.Link href="/discussions" className="text-white">
+              Discussions
+            </Nav.Link>
+            <Nav.Link href="/discussion-create" className="text-white">
+              Post
+            </Nav.Link>
+
           </Nav>
           <Nav>
             <NavDropdown title="Profile" id="profile-dropdown" align="end" className="text-white">

diff --git a/frontend/src/features/dashboard/dashboard-student.jsx b/frontend/src/features/dashboard/dashboard-student.jsx
@@ -1,30 +1,31 @@
 import NavBar from '../../core/component/NavBar';
-import {fa8, faCalendarAlt, faComment, faUserGraduate} from '@fortawesome/free-solid-svg-icons';
+import {faCalendarAlt, faComment, faUserGraduate} from '@fortawesome/free-solid-svg-icons';
 import {Container, Row} from 'react-bootstrap';
 import DashboardCard from '../dashboard-card/dashboard-card';
 
 export default function StudentDashboard() {
-  const options = [
-    {icon: faUserGraduate, title: 'Students', link: '/students'},
-    {icon: faCalendarAlt, title: 'Events', link: '/events'},
-<<<<<<< HEAD
-    {icon: faCalendarAlt, title: 'Feedback', link: '/feedbacks'},
-    {icon: faUserGraduate, title: 'Academic Resouces', link: '/academic-resouces'}
-=======
-    {icon: faComment, title: 'Discussion', link: '/discussions'}
->>>>>>> develop
-  ];
+    const options = [
+        {icon: faUserGraduate, title: 'Students', link: '/students'},
+        {icon: faCalendarAlt, title: 'Events', link: '/events'},
+        {icon: faComment, title: 'Discussion', link: '/discussions'},
+        {icon: faCalendarAlt, title: 'Events', link: '/events'},
 
-  return (
-    <>
-      <NavBar />
-      <Container className="mt-5">
-        <Row>
-          {options.map(opt => (
-            <DashboardCard icon={opt.icon} link={opt.link} title={opt.title} />
-          ))}
-        </Row>
-      </Container>
-    </>
-  );
+        {icon: faCalendarAlt, title: 'Feedback', link: '/feedbacks'},
+        {icon: faUserGraduate, title: 'Academic Resouces', link: '/academic-resouces'},
+
+        {icon: faComment, title: 'Discussion', link: '/discussions'}
+    ];
+
+    return (
+        <>
+            <NavBar/>
+            <Container className="mt-5">
+                <Row>
+                    {options.map(opt => (
+                        <DashboardCard icon={opt.icon} link={opt.link} title={opt.title}/>
+                    ))}
+                </Row>
+            </Container>
+        </>
+    );
 }