From f52e184732bf746dd442378931fa8c55e463df0f Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Mon, 15 Jul 2024 22:03:33 -0500
Subject: [PATCH 1/9] React-boostrap added and removed native boostrap

---
 frontend/src/App.js                           |   9 ++
 .../component/dialogs/ConfirmationDialog.jsx  |  23 ++++
 .../AcademicResourceType.jsx                  |  84 ++++++++++++++
 .../AcademicResourceTypeList.jsx              |  58 ++++++++++
 .../AcademicResourceTypeModal.jsx             |  42 +++++++
 .../academicResources/AcademicResource.jsx    | 105 ++++++++++++++++++
 .../AcademicResourceList.jsx                  |  90 +++++++++++++++
 .../AcademicResourceModal.jsx                 |  93 ++++++++++++++++
 .../features/dashboard/dashboard-student.jsx  |   4 +
 .../feedbackCategories/FeedbackCategory.jsx   |  86 ++++++++++++++
 .../FeedbackCategoryList.jsx                  |  60 ++++++++++
 .../FeedbackCategoryModal.jsx                 |  57 ++++++++++
 frontend/src/features/feedbacks/Feedback.jsx  | 100 +++++++++++++++++
 .../src/features/feedbacks/FeedbackList.jsx   |  63 +++++++++++
 .../src/features/feedbacks/FeedbackModal.jsx  |  77 +++++++++++++
 frontend/src/service/apiAcademicResource.js   |  82 ++++++++++++++
 .../src/service/apiAcademicResourceTypes.js   |  34 ++++++
 frontend/src/service/apiFeedbackCategory.js   |  30 +++++
 frontend/src/service/apiFeedbackService.js    |  44 ++++++++
 frontend/src/types/types.js                   |  23 ++++
 20 files changed, 1164 insertions(+)
 create mode 100644 frontend/src/core/component/dialogs/ConfirmationDialog.jsx
 create mode 100644 frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
 create mode 100644 frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
 create mode 100644 frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx
 create mode 100644 frontend/src/features/academicResources/AcademicResource.jsx
 create mode 100644 frontend/src/features/academicResources/AcademicResourceList.jsx
 create mode 100644 frontend/src/features/academicResources/AcademicResourceModal.jsx
 create mode 100644 frontend/src/features/feedbackCategories/FeedbackCategory.jsx
 create mode 100644 frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
 create mode 100644 frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx
 create mode 100644 frontend/src/features/feedbacks/Feedback.jsx
 create mode 100644 frontend/src/features/feedbacks/FeedbackList.jsx
 create mode 100644 frontend/src/features/feedbacks/FeedbackModal.jsx
 create mode 100644 frontend/src/service/apiAcademicResource.js
 create mode 100644 frontend/src/service/apiAcademicResourceTypes.js
 create mode 100644 frontend/src/service/apiFeedbackCategory.js
 create mode 100644 frontend/src/service/apiFeedbackService.js
 create mode 100644 frontend/src/types/types.js

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 5f1aa6a2..c41eb9a8 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -4,6 +4,10 @@ import {Route, Routes} from 'react-router';
 import Login from './features/authentication/login/Login';
 import Register from './features/authentication/register/Register';
 import Students from './features/students/Students';
+import FeedbackCategory from './features/feedbackCategories/FeedbackCategory';
+import Feedback from './features/feedbacks/Feedback';
+import AcademicResourceType from './features/academicResourceTypes/AcademicResourceType';
+import AcademicResource from './features/academicResources/AcademicResource';
 
 function App() {
   return (
@@ -12,6 +16,11 @@ function App() {
       <Route path="/login" element={<Login />} />
       <Route path="/register" element={<Register />} />
       <Route path="/students" element={<Students />} />
+
+      <Route path="/feedback-categories" element={<FeedbackCategory />} />
+      <Route path="/feedbacks" element={<Feedback />} />
+      <Route path="/academic-resouce-type" element={<AcademicResourceType />} />
+      <Route path="/academic-resouces" element={<AcademicResource />} />
     </Routes>
   );
 }
diff --git a/frontend/src/core/component/dialogs/ConfirmationDialog.jsx b/frontend/src/core/component/dialogs/ConfirmationDialog.jsx
new file mode 100644
index 00000000..9acb68db
--- /dev/null
+++ b/frontend/src/core/component/dialogs/ConfirmationDialog.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import {Modal, Button} from 'react-bootstrap';
+
+const ConfirmationDialog = ({show, handleClose, handleConfirm, title, body}) => {
+  return (
+    <Modal show={show} onHide={handleClose}>
+      <Modal.Header closeButton>
+        <Modal.Title>{title}</Modal.Title>
+      </Modal.Header>
+      <Modal.Body>{body}</Modal.Body>
+      <Modal.Footer>
+        <Button variant="secondary" onClick={handleClose}>
+          No
+        </Button>
+        <Button variant="danger" onClick={handleConfirm}>
+          Yes
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export default ConfirmationDialog;
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
new file mode 100644
index 00000000..aaeb2828
--- /dev/null
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
@@ -0,0 +1,84 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import {initialAcademicResourceTypeForm as initialForm} from '../../types/types';
+import {getAllApi, saveApi, updateApi} from '../../service/apiAcademicResourceTypes';
+import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
+import AcademicResourceTypeList from './AcademicResourceTypeList';
+import AcademicResourceTypeModal from './AcademicResourceTypeModal';
+
+const AcademicResourceType = () => {
+  const [resourceTypeForm, setResourceTypeForm] = useState(initialForm);
+  const [resourceTypesList, setResourceTypesList] = useState([]);
+  const [refresh, setRefresh] = useState(false);
+
+  useEffect(() => {
+    fetchAcademicResourceTypes();
+  }, [refresh]);
+
+  const fetchAcademicResourceTypes = useCallback(async () => {
+    try {
+      const data = await getAllApi();
+      setResourceTypesList(data);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+  }, []);
+
+  const resetForm = () => {
+    setResourceTypeForm(initialForm);
+  };
+
+  const [show, setShow] = useState(false);
+
+  const handleClose = () => {
+    resetForm();
+    setShow(false);
+  };
+  const handleShow = () => setShow(true);
+
+  const handleSave = async event => {
+    event.preventDefault();
+    try {
+      resourceTypeForm.id > 0 ? await updateApi(resourceTypeForm) : await saveApi(resourceTypeForm);
+      setRefresh(!refresh);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+    resetForm();
+    setShow(false);
+  };
+
+  const handleChange = event => {
+    const {name, value} = event.target;
+
+    setResourceTypeForm(prevFeedbackCategoryForm => ({
+      ...prevFeedbackCategoryForm,
+      [name]: value
+    }));
+  };
+
+  return (
+    <div className="App">
+      <button className="btn btn-primary" onClick={handleShow}>
+        Add Academic Resource Type
+      </button>
+
+      <AcademicResourceTypeModal
+        show={show}
+        handleClose={handleClose}
+        handleSave={handleSave}
+        title="Academic Resource Category"
+        resourceTypeForm={resourceTypeForm}
+        handleChange={handleChange}
+      />
+
+      <AcademicResourceTypeList
+        resourceTypesList={resourceTypesList}
+        setResourceTypeForm={setResourceTypeForm}
+        setResourceTypesList={setResourceTypesList}
+        setShow={setShow}
+      />
+    </div>
+  );
+};
+
+export default AcademicResourceType;
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
new file mode 100644
index 00000000..ea3a1589
--- /dev/null
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import {deleteApi} from '../../service/apiAcademicResourceTypes';
+
+const AcademicResourceTypeList = ({resourceTypesList, setResourceTypeForm, setResourceTypesList, setShow}) => {
+  const editHandler = id => {
+    if (id) {
+      setShow(true);
+      const result = resourceTypesList.find(cat => cat.id === id);
+      if (result) {
+        setResourceTypeForm({
+          id: result.id,
+          name: result.name
+        });
+      }
+    }
+  };
+
+  const deleteHandler = async id => {
+    try {
+      const data = await deleteApi(id);
+      setResourceTypesList(data);
+    } catch (error) {
+      console.error('Error deleting feedbackcategory:', error);
+    }
+  };
+
+  return (
+    <div className="container">
+      <table className="table">
+        <thead>
+          <tr>
+            <th scope="col">#</th>
+            <th scope="col">Name</th>
+            <th scope="col">Description</th>
+            <th scope="col"></th>
+            <th scope="col"></th>
+          </tr>
+        </thead>
+        <tbody>
+          {resourceTypesList.map((data, index) => (
+            <tr key={data.id}>
+              <td>{index + 1}</td>
+              <td>{data.name}</td>
+              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
+                Edit
+              </td>
+              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
+                Delete
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+export default AcademicResourceTypeList;
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx
new file mode 100644
index 00000000..e6c01b12
--- /dev/null
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import {Modal, Button} from 'react-bootstrap';
+
+const AcademicResourceTypeModal = ({show, handleClose, handleSave, title, handleChange, resourceTypeForm}) => {
+  return (
+    <Modal show={show} onHide={handleClose}>
+      <Modal.Header className="bg-info">
+        <Modal.Title>
+          {resourceTypeForm.id > 0 ? 'Edit ' : 'Add '}
+          {title}
+        </Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <div className="mb-3 text-start fw-bold">
+          <label htmlFor="name" className="form-label">
+            Category Name
+          </label>
+          <input
+            type="text"
+            className="form-control"
+            name="name"
+            value={resourceTypeForm.name}
+            onChange={handleChange}
+            placeholder="Enter Category"
+            required
+          />
+        </div>
+      </Modal.Body>
+
+      <Modal.Footer className="bg-light">
+        <Button variant="secondary" className="flex-fill rounded" onClick={handleClose}>
+          Close
+        </Button>
+        <Button variant="primary" className="flex-fill rounded" onClick={handleSave}>
+          {resourceTypeForm.id > 0 ? 'Update ' : 'Add '}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export default AcademicResourceTypeModal;
diff --git a/frontend/src/features/academicResources/AcademicResource.jsx b/frontend/src/features/academicResources/AcademicResource.jsx
new file mode 100644
index 00000000..83a2ef62
--- /dev/null
+++ b/frontend/src/features/academicResources/AcademicResource.jsx
@@ -0,0 +1,105 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import {initialAcademicForm as initialForm} from '../../types/types';
+import {getAllApi, getAllCategoriesApi, saveApi, updateApi} from '../../service/apiAcademicResource';
+import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
+import AcademicResourceModal from './AcademicResourceModal';
+import AcademicResourceList from './AcademicResourceList';
+
+const AcademicResource = () => {
+  const [academicResForm, setAcademicResForm] = useState(initialForm);
+  const [academicResourceList, setAcademicResourceList] = useState([]);
+  const [resCategory, setResCategory] = useState([]);
+  const [refresh, setRefresh] = useState(false);
+
+  useEffect(() => {
+    fetchAcademicResource();
+    fetchAllCategories();
+  }, [refresh]);
+
+  const fetchAcademicResource = useCallback(async () => {
+    try {
+      const data = await getAllApi();
+      setAcademicResourceList(data);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+  }, []);
+
+  const fetchAllCategories = useCallback(async () => {
+    try {
+      const data = await getAllCategoriesApi();
+
+      setResCategory(data);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+  }, []);
+
+  const resetForm = () => {
+    setAcademicResForm(initialForm);
+  };
+
+  const [show, setShow] = useState(false);
+
+  const handleClose = () => {
+    resetForm();
+    setShow(false);
+  };
+
+  const handleShow = () => setShow(true);
+
+  const handleSave = async event => {
+    event.preventDefault();
+    try {
+      academicResForm.id > 0 ? await updateApi(academicResForm) : await saveApi(academicResForm);
+      setRefresh(!refresh);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+    resetForm();
+    setShow(false);
+  };
+
+  const handleChange = event => {
+    const {name, value, files} = event.target;
+
+    if (name === 'file') {
+      setAcademicResForm(prevFormData => ({
+        ...prevFormData,
+        file: files[0]
+      }));
+    } else {
+      setAcademicResForm(prevFormData => ({
+        ...prevFormData,
+        [name]: value
+      }));
+    }
+  };
+
+  return (
+    <div className="App">
+      <button className="btn btn-primary" onClick={handleShow}>
+        Add Academic Resource
+      </button>
+
+      <AcademicResourceModal
+        show={show}
+        handleClose={handleClose}
+        handleSave={handleSave}
+        title="Academic Resource"
+        academicResForm={academicResForm}
+        allCategories={resCategory}
+        handleChange={handleChange}
+      />
+
+      <AcademicResourceList
+        setAcademicResForm={setAcademicResForm}
+        setAcademicResourceList={setAcademicResourceList}
+        academicResourceList={academicResourceList}
+        setShow={setShow}
+      />
+    </div>
+  );
+};
+
+export default AcademicResource;
diff --git a/frontend/src/features/academicResources/AcademicResourceList.jsx b/frontend/src/features/academicResources/AcademicResourceList.jsx
new file mode 100644
index 00000000..27fa8175
--- /dev/null
+++ b/frontend/src/features/academicResources/AcademicResourceList.jsx
@@ -0,0 +1,90 @@
+import React, {useState} from 'react';
+import {deleteApi} from '../../service/apiAcademicResource';
+import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
+
+const AcademicResourceList = ({academicResourceList, setAcademicResourceList, setAcademicResForm, setShow}) => {
+  const [showDialog, setShowDialog] = useState(false);
+  const [itemToDelete, setItemToDelete] = useState(null); // State to keep track of the item to delete
+
+  const editHandler = id => {
+    if (id) {
+      setShow(true);
+      const result = academicResourceList.find(cat => cat.id === id);
+      if (result) {
+        setAcademicResForm({
+          id: result.id,
+          name: result.name,
+          body: result.body,
+          resourceCategory: result.resourceType ? result.resourceType.id : '',
+          file: null
+        });
+      }
+    }
+  };
+
+  const handleConfirmDelete = async () => {
+    if (itemToDelete) {
+      try {
+        const data = await deleteApi(itemToDelete);
+        setAcademicResourceList(data);
+        setItemToDelete(null); // Reset the item to delete
+      } catch (error) {
+        console.error('Error deleting feedbackcategory:', error);
+      }
+      setShowDialog(false); // Close the dialog after deletion
+    }
+  };
+
+  const handleCloseDialog = () => {
+    setShowDialog(false);
+    setItemToDelete(null); // Reset the item to delete on dialog close
+  };
+
+  const deleteHandler = id => {
+    setItemToDelete(id); // Set the item to delete
+    setShowDialog(true); // Show the confirmation dialog
+  };
+
+  return (
+    <div className="container">
+      <table className="table">
+        <thead>
+          <tr>
+            <th scope="col">#</th>
+            <th scope="col">Name</th>
+            <th scope="col">Description</th>
+            <th scope="col">Category</th>
+            <th scope="col"></th>
+            <th scope="col"></th>
+          </tr>
+        </thead>
+        <tbody>
+          {academicResourceList.map((data, index) => (
+            <tr key={data.id}>
+              <td>{index + 1}</td>
+              <td>{data.name}</td>
+              <td>{data.body}</td>
+              <td>{data.resourceType.name}</td>
+              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
+                Edit
+              </td>
+              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
+                Delete
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+
+      <ConfirmationDialog
+        show={showDialog}
+        handleClose={handleCloseDialog}
+        handleConfirm={handleConfirmDelete}
+        title="Confirm Delete"
+        body="Are you sure you want to delete this item?"
+      />
+    </div>
+  );
+};
+
+export default AcademicResourceList;
diff --git a/frontend/src/features/academicResources/AcademicResourceModal.jsx b/frontend/src/features/academicResources/AcademicResourceModal.jsx
new file mode 100644
index 00000000..1c4c8316
--- /dev/null
+++ b/frontend/src/features/academicResources/AcademicResourceModal.jsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import {Modal, Button} from 'react-bootstrap';
+
+const AcademicResourceModal = ({
+  show,
+  handleClose,
+  handleSave,
+  title,
+  handleChange,
+  allCategories,
+  academicResForm
+}) => {
+  return (
+    <Modal show={show} onHide={handleClose}>
+      <Modal.Header className="bg-info">
+        <Modal.Title>
+          {academicResForm.id > 0 ? 'Edit ' : 'Add '}
+          {title}
+        </Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <div className="mb-3 text-start fw-bold">
+          <label htmlFor="title" className="form-label">
+            Name
+          </label>
+          <input
+            type="text"
+            className="form-control"
+            name="name"
+            value={academicResForm.name}
+            onChange={handleChange}
+            placeholder="Enter Name"
+            required
+          />
+        </div>
+
+        <div className="mb-3 text-start fw-bold">
+          <label htmlFor="body" className="form-label">
+            Description
+          </label>
+          <textarea
+            type="text"
+            className="form-control"
+            name="body"
+            value={academicResForm.body}
+            onChange={handleChange}
+            placeholder="Enter Description"
+            required
+          />
+        </div>
+
+        <div className="mb-3 text-start fw-bold">
+          <label htmlFor="resourceCategory" className="col-form-label">
+            Resource Category
+          </label>
+          <select
+            className="form-control"
+            name="resourceCategory"
+            onChange={handleChange}
+            value={academicResForm.resourceCategory}
+            required
+          >
+            <option value="">Select</option>
+            {allCategories.map(cat => (
+              <option key={cat.id} value={cat.id}>
+                {cat.name}
+              </option>
+            ))}
+          </select>
+        </div>
+
+        <div className="mb-5 text-start fw-bold">
+          <label htmlFor="file" className="form-label">
+            File
+          </label>
+
+          <input type="file" className="form-control" name="file" onChange={handleChange} />
+        </div>
+      </Modal.Body>
+
+      <Modal.Footer className="bg-light">
+        <Button variant="secondary" className="flex-fill rounded" onClick={handleClose}>
+          Close
+        </Button>
+        <Button variant="primary" className="flex-fill rounded" onClick={handleSave}>
+          {academicResForm.id > 0 ? 'Update ' : 'Add '}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export default AcademicResourceModal;
diff --git a/frontend/src/features/dashboard/dashboard-student.jsx b/frontend/src/features/dashboard/dashboard-student.jsx
index ec1e8ac7..33ecd8e6 100644
--- a/frontend/src/features/dashboard/dashboard-student.jsx
+++ b/frontend/src/features/dashboard/dashboard-student.jsx
@@ -8,6 +8,10 @@ export default function StudentDashboard() {
         <li>
           <Link to="/students">Student</Link>
         </li>
+
+        <li>
+          <Link to="/myapp">MyAPp</Link>
+        </li>
       </ul>
     </>
   );
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
new file mode 100644
index 00000000..0575d401
--- /dev/null
+++ b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
@@ -0,0 +1,86 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import {initialFeedbackCategoryForm as initialForm} from '../../types/types';
+import {getAllApi, saveApi, updateApi} from '../../service/apiFeedbackCategory';
+import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
+import FeedbaclCategoryList from './FeedbackCategoryList';
+import FeedbackCategoryModal from './FeedbackCategoryModal';
+
+const FeedbackCategory = () => {
+  const [feedbackCategoryForm, setFeedbackCategoryForm] = useState(initialForm);
+  const [feedbackCategorysList, setFeedbackCategorysList] = useState([]);
+
+  const [refresh, setRefresh] = useState(false);
+
+  useEffect(() => {
+    fetchFeedbackCategorys();
+  }, [refresh]);
+
+  const fetchFeedbackCategorys = useCallback(async () => {
+    try {
+      const data = await getAllApi();
+      setFeedbackCategorysList(data);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+  }, []);
+
+  const resetForm = () => {
+    setFeedbackCategoryForm(initialForm);
+  };
+
+  const [show, setShow] = useState(false);
+
+  const handleClose = () => {
+    resetForm();
+    setShow(false);
+  };
+  const handleShow = () => setShow(true);
+
+  const handleSave = async event => {
+    console.log(feedbackCategoryForm);
+    event.preventDefault();
+    try {
+      feedbackCategoryForm.id > 0 ? await updateApi(feedbackCategoryForm) : await saveApi(feedbackCategoryForm);
+      setRefresh(!refresh);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+    resetForm();
+    setShow(false);
+  };
+
+  const handleChange = event => {
+    const {name, value} = event.target;
+
+    setFeedbackCategoryForm(prevFeedbackCategoryForm => ({
+      ...prevFeedbackCategoryForm,
+      [name]: value
+    }));
+  };
+
+  return (
+    <div className="App">
+      <button className="btn btn-primary" onClick={handleShow}>
+        Add Feedback Category
+      </button>
+
+      <FeedbackCategoryModal
+        show={show}
+        handleClose={handleClose}
+        handleSave={handleSave}
+        title="Feedback Category"
+        feedbackCategoryForm={feedbackCategoryForm}
+        handleChange={handleChange}
+      />
+
+      <FeedbaclCategoryList
+        feedbackCategorysList={feedbackCategorysList}
+        setFeedbackCategoryForm={setFeedbackCategoryForm}
+        setFeedbackCategorysList={setFeedbackCategorysList}
+        setShow={setShow}
+      />
+    </div>
+  );
+};
+
+export default FeedbackCategory;
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx b/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
new file mode 100644
index 00000000..32a93c79
--- /dev/null
+++ b/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import {deleteApi} from '../../service/apiFeedbackCategory';
+
+const FeedbaclCategoryList = ({feedbackCategorysList, setFeedbackCategoryForm, setFeedbackCategorysList, setShow}) => {
+  const editHandler = id => {
+    if (id) {
+      setShow(true);
+      const result = feedbackCategorysList.find(cat => cat.id === id);
+      if (result) {
+        setFeedbackCategoryForm({
+          id: result.id,
+          name: result.name,
+          description: result.description
+        });
+      }
+    }
+  };
+
+  const deleteHandler = async id => {
+    try {
+      const data = await deleteApi(id);
+      setFeedbackCategorysList(data);
+    } catch (error) {
+      console.error('Error deleting feedbackcategory:', error);
+    }
+  };
+
+  return (
+    <div className="container">
+      <table className="table">
+        <thead>
+          <tr>
+            <th scope="col">#</th>
+            <th scope="col">Name</th>
+            <th scope="col">Description</th>
+            <th scope="col"></th>
+            <th scope="col"></th>
+          </tr>
+        </thead>
+        <tbody>
+          {feedbackCategorysList.map((data, index) => (
+            <tr key={data.id}>
+              <td>{index + 1}</td>
+              <td>{data.name}</td>
+              <td>{data.description}</td>
+              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
+                Edit
+              </td>
+              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
+                Delete
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+export default FeedbaclCategoryList;
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx b/frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx
new file mode 100644
index 00000000..8e26ab3b
--- /dev/null
+++ b/frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import {Modal, Button} from 'react-bootstrap';
+
+const FeedbackCategoryModal = ({show, handleClose, handleSave, title, handleChange, feedbackCategoryForm}) => {
+  return (
+    <Modal show={show} onHide={handleClose}>
+      <Modal.Header className="bg-info">
+        <Modal.Title>
+          {feedbackCategoryForm.id > 0 ? 'Edit ' : 'Add '}
+          {title}
+        </Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <div className="mb-3 text-start fw-bold">
+          <label htmlFor="name" className="form-label">
+            Category Name
+          </label>
+          <input
+            type="text"
+            className="form-control"
+            name="name"
+            value={feedbackCategoryForm.name}
+            onChange={handleChange}
+            placeholder="Enter Category"
+            required
+          />
+        </div>
+
+        <div className="mb-5 text-start fw-bold">
+          <label htmlFor="description" className="col-form-label">
+            Description
+          </label>
+          <textarea
+            type="text"
+            className="form-control"
+            name="description"
+            value={feedbackCategoryForm.description}
+            onChange={handleChange}
+            placeholder="Enter description"
+            required
+          />
+        </div>
+      </Modal.Body>
+
+      <Modal.Footer className="bg-light">
+        <Button variant="secondary" className="flex-fill rounded" onClick={handleClose}>
+          Close
+        </Button>
+        <Button variant="primary" className="flex-fill rounded" onClick={handleSave}>
+          {feedbackCategoryForm.id > 0 ? 'Update ' : 'Add '}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export default FeedbackCategoryModal;
diff --git a/frontend/src/features/feedbacks/Feedback.jsx b/frontend/src/features/feedbacks/Feedback.jsx
new file mode 100644
index 00000000..0871a22d
--- /dev/null
+++ b/frontend/src/features/feedbacks/Feedback.jsx
@@ -0,0 +1,100 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import {initialFeedbackForm as initialForm} from '../../types/types';
+import {getAllApi, getAllCategoriesApi, saveApi, updateApi} from '../../service/apiFeedbackService';
+import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
+import FeedbackModal from './FeedbackModal';
+import FeedbackList from './FeedbackList';
+
+const Feedback = () => {
+  const [feedbackForm, setFeedbackForm] = useState(initialForm);
+  const [feedbacksList, setFeedbacksList] = useState([]);
+  const [feedbackCategory, setFeedbackCategory] = useState([]);
+  const [refresh, setRefresh] = useState(false);
+
+  useEffect(() => {
+    fetchFeedbacks();
+    fetchAllCategories();
+  }, [refresh]);
+
+  const fetchFeedbacks = useCallback(async () => {
+    try {
+      const data = await getAllApi();
+      setFeedbacksList(data);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+      console.error('Error fetching feedback:', error);
+    }
+  }, []);
+
+  const fetchAllCategories = useCallback(async () => {
+    try {
+      const data = await getAllCategoriesApi();
+      setFeedbackCategory(data);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+      console.error('Error fetching feedback:', error);
+    }
+  }, []);
+
+  const resetForm = () => {
+    setFeedbackForm(initialForm);
+  };
+
+  const [show, setShow] = useState(false);
+
+  const handleClose = () => {
+    resetForm();
+    setShow(false);
+  };
+
+  const handleShow = () => setShow(true);
+
+  const handleSave = async event => {
+    event.preventDefault();
+    try {
+      console.log(feedbackForm.id);
+      feedbackForm.id > 0 ? await updateApi(feedbackForm) : await saveApi(feedbackForm);
+      setRefresh(!refresh);
+    } catch (error) {
+      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+    }
+    resetForm();
+    setShow(false);
+  };
+
+  const handleChange = event => {
+    const {name, value} = event.target;
+
+    setFeedbackForm(prevFeedbackCategoryForm => ({
+      ...prevFeedbackCategoryForm,
+      [name]: value
+    }));
+  };
+
+  return (
+    <div className="App">
+      <button className="btn btn-primary" onClick={handleShow}>
+        Add Feedback
+      </button>
+
+      <FeedbackModal
+        show={show}
+        handleClose={handleClose}
+        handleSave={handleSave}
+        title="Feedback"
+        feedbackForm={feedbackForm}
+        allCategories={feedbackCategory}
+        handleChange={handleChange}
+      />
+
+      <FeedbackList
+        setFeedbackForm={setFeedbackForm}
+        setFeedbacksList={setFeedbacksList}
+        feedbacksList={feedbacksList}
+        setShow={setShow}
+      />
+    </div>
+  );
+};
+
+export default Feedback;
diff --git a/frontend/src/features/feedbacks/FeedbackList.jsx b/frontend/src/features/feedbacks/FeedbackList.jsx
new file mode 100644
index 00000000..b383e615
--- /dev/null
+++ b/frontend/src/features/feedbacks/FeedbackList.jsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import {deleteApi} from '../../service/apiFeedbackService';
+
+const FeedbackList = ({feedbacksList, setFeedbacksList, setFeedbackForm, setShow}) => {
+  const editHandler = id => {
+    if (id) {
+      setShow(true);
+      const result = feedbacksList.find(cat => cat.id === id);
+      if (result) {
+        setFeedbackForm({
+          id: result.id,
+          title: result.title,
+          body: result.body,
+          feedbackCategory: result.category.id
+        });
+      }
+    }
+  };
+
+  const deleteHandler = async id => {
+    try {
+      const data = await deleteApi(id);
+      setFeedbacksList(data);
+    } catch (error) {
+      console.error('Error deleting feedbackcategory:', error);
+    }
+  };
+
+  return (
+    <div className="container">
+      <table className="table">
+        <thead>
+          <tr>
+            <th scope="col">#</th>
+            <th scope="col">Title</th>
+            <th scope="col">Description</th>
+            <th scope="col">Category</th>
+            <th scope="col"></th>
+            <th scope="col"></th>
+          </tr>
+        </thead>
+        <tbody>
+          {feedbacksList.map((data, index) => (
+            <tr key={data.id}>
+              <td>{index + 1}</td>
+              <td>{data.title}</td>
+              <td>{data.body}</td>
+              <td>{data.category.name}</td>
+              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
+                Edit
+              </td>
+              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
+                Delete
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+export default FeedbackList;
diff --git a/frontend/src/features/feedbacks/FeedbackModal.jsx b/frontend/src/features/feedbacks/FeedbackModal.jsx
new file mode 100644
index 00000000..ce87d05a
--- /dev/null
+++ b/frontend/src/features/feedbacks/FeedbackModal.jsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import {Modal, Button} from 'react-bootstrap';
+
+const FeedbackModal = ({show, handleClose, handleSave, title, handleChange, allCategories, feedbackForm}) => {
+  return (
+    <Modal show={show} onHide={handleClose}>
+      <Modal.Header className="bg-info">
+        <Modal.Title>
+          {feedbackForm.id > 0 ? 'Edit ' : 'Add '}
+          {title}
+        </Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <div className="mb-3 text-start fw-bold">
+          <label htmlFor="title" className="form-label">
+            Title
+          </label>
+          <input
+            type="text"
+            className="form-control"
+            name="title"
+            value={feedbackForm.title}
+            onChange={handleChange}
+            placeholder="Enter Title"
+            required
+          />
+        </div>
+
+        <div className="mb-3 text-start fw-bold">
+          <label htmlFor="body" className="col-form-label">
+            Description
+          </label>
+          <textarea
+            type="text"
+            className="form-control"
+            name="body"
+            value={feedbackForm.body}
+            onChange={handleChange}
+            placeholder="Enter description"
+            required
+          />
+        </div>
+
+        <div className="mb-5 text-start fw-bold">
+          <label htmlFor="feedbackCategory" className="col-form-label">
+            Category
+          </label>
+          <select
+            className="form-control"
+            name="feedbackCategory"
+            onChange={handleChange}
+            value={feedbackForm.feedbackCategory}
+            required
+          >
+            <option value="">Select</option>
+            {allCategories.map(cat => (
+              <option key={cat.id} value={cat.id}>
+                {cat.name}
+              </option>
+            ))}
+          </select>
+        </div>
+      </Modal.Body>
+
+      <Modal.Footer className="bg-light">
+        <Button variant="secondary" className="flex-fill rounded" onClick={handleClose}>
+          Close
+        </Button>
+        <Button variant="primary" className="flex-fill rounded" onClick={handleSave}>
+          {feedbackForm.id > 0 ? 'Update ' : 'Add '}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+};
+
+export default FeedbackModal;
diff --git a/frontend/src/service/apiAcademicResource.js b/frontend/src/service/apiAcademicResource.js
new file mode 100644
index 00000000..b6b1b2c7
--- /dev/null
+++ b/frontend/src/service/apiAcademicResource.js
@@ -0,0 +1,82 @@
+import axios from "axios";
+
+axios.defaults.baseURL = "http://localhost:8080/api/v1";
+const token = localStorage.getItem("token");
+
+axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+
+export const getAllApi = async () => {
+  const response = await axios.get("/academic");
+  return response.data;
+};
+
+export const getAllCategoriesApi = async () => {
+  const response = await axios.get("/academicresources");
+  return response.data;
+};
+
+export const saveApi = async dataForm => {
+  const formData = new FormData();
+
+  formData.append(
+    "formdata",
+    new Blob(
+      [
+        JSON.stringify({
+          name: dataForm.name,
+          body: dataForm.body,
+          resourceId: dataForm.resourceCategory
+        })
+      ],
+      {type: "application/json"}
+    )
+  );
+
+  if (dataForm.file) {
+    formData.append("file", dataForm.file);
+  }
+
+  // Ensure no conflicting headers are set
+  const response = await axios.post("/academic", formData, {
+    headers: {
+      "Content-Type": "multipart/form-data"
+    }
+  });
+
+  return response.data;
+};
+
+export const updateApi = async dataForm => {
+  const formData = new FormData();
+  formData.append(
+    "formdata",
+    new Blob(
+      [
+        JSON.stringify({
+          id: dataForm.id,
+          name: dataForm.name,
+          body: dataForm.body,
+          resourceId: dataForm.resourceCategory
+        })
+      ],
+      {type: "application/json"}
+    )
+  );
+
+  if (dataForm.file) {
+    formData.append("file", dataForm.file);
+  }
+
+  const response = await axios.put("/academic/" + dataForm.id, formData, {
+    headers: {
+      "Content-Type": "multipart/form-data"
+    }
+  });
+
+  return response.data;
+};
+
+export const deleteApi = async id => {
+  const response = await axios.delete("/academic/" + id);
+  return response.data;
+};
diff --git a/frontend/src/service/apiAcademicResourceTypes.js b/frontend/src/service/apiAcademicResourceTypes.js
new file mode 100644
index 00000000..6a597ef5
--- /dev/null
+++ b/frontend/src/service/apiAcademicResourceTypes.js
@@ -0,0 +1,34 @@
+import axios from "axios";
+
+axios.defaults.baseURL = "http://localhost:8080/api/v1";
+const token = localStorage.getItem("token");
+
+axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+
+export const getAllApi = async () => {
+  const response = await axios.get("/academicresources");
+  return response.data;
+};
+
+export const getAllCategoriesApi = async () => {
+  const response = await axios.get("/feedbackcategories");
+  return response.data;
+};
+
+export const saveApi = async formdate => {
+  const response = await axios.post("/academicresources", formdate);
+  return response.data;
+};
+
+export const updateApi = async formdate => {
+  const response = await axios.put(
+    "/academicresources/" + formdate.id,
+    formdate
+  );
+  return response.data;
+};
+
+export const deleteApi = async id => {
+  const response = await axios.delete("/academicresources/" + id);
+  return response.data;
+};
diff --git a/frontend/src/service/apiFeedbackCategory.js b/frontend/src/service/apiFeedbackCategory.js
new file mode 100644
index 00000000..8f0cee91
--- /dev/null
+++ b/frontend/src/service/apiFeedbackCategory.js
@@ -0,0 +1,30 @@
+import axios from "axios";
+
+axios.defaults.baseURL = "http://localhost:8080/api/v1";
+const token = localStorage.getItem("token");
+
+axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+
+export const getAllApi = async () => {
+  const response = await axios.get("/feedbackcategories");
+  console.log(response);
+  return response.data;
+};
+
+export const saveApi = async formdate => {
+  const response = await axios.post("/admins/feedbackcategories", formdate);
+  return response.data;
+};
+
+export const updateApi = async formdate => {
+  const response = await axios.put(
+    "/admins/feedbackcategories/" + formdate.id,
+    formdate
+  );
+  return response.data;
+};
+
+export const deleteApi = async id => {
+  const response = await axios.delete("/admins/feedbackcategories/" + id);
+  return response.data;
+};
diff --git a/frontend/src/service/apiFeedbackService.js b/frontend/src/service/apiFeedbackService.js
new file mode 100644
index 00000000..db32c440
--- /dev/null
+++ b/frontend/src/service/apiFeedbackService.js
@@ -0,0 +1,44 @@
+import axios from "axios";
+
+axios.defaults.baseURL = "http://localhost:8080/api/v1";
+const token = localStorage.getItem("token");
+
+axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+
+export const getAllApi = async () => {
+  const response = await axios.get("/feedbacks");
+  return response.data;
+};
+
+export const getAllCategoriesApi = async () => {
+  const response = await axios.get("/feedbackcategories");
+  return response.data;
+};
+
+export const saveApi = async formdate => {
+  const postData = {
+    title: formdate.title,
+    body: formdate.body,
+    category: formdate.feedbackCategory,
+    feedbackCategory: {}
+  };
+  const response = await axios.post("/feedbacks", postData);
+  return response.data;
+};
+
+export const updateApi = async formdate => {
+  const postData = {
+    title: formdate.title,
+    body: formdate.body,
+    feedbackCategory: {
+      id: formdate.feedbackCategory
+    }
+  };
+  const response = await axios.put("/feedbacks/" + formdate.id, postData);
+  return response.data;
+};
+
+export const deleteApi = async id => {
+  const response = await axios.delete("/feedbacks/" + id);
+  return response.data;
+};
diff --git a/frontend/src/types/types.js b/frontend/src/types/types.js
new file mode 100644
index 00000000..53a5fb25
--- /dev/null
+++ b/frontend/src/types/types.js
@@ -0,0 +1,23 @@
+export const initialFeedbackCategoryForm = {
+  id: 0,
+  name: "",
+  description: ""
+};
+
+export const initialFeedbackForm = {
+  title: "",
+  body: "",
+  feedbackCategory: ""
+};
+
+export const initialAcademicResourceTypeForm = {
+  name: ""
+};
+
+export const initialAcademicForm = {
+  id: 0,
+  name: "",
+  body: "",
+  file: null,
+  resourceCategory: ""
+};

From a2b9ac41af53fa6823562b32101e02ab629bcfcc Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Mon, 15 Jul 2024 22:12:08 -0500
Subject: [PATCH 2/9] Delete confirmation message added

---
 .../AcademicResourceTypeList.jsx              | 41 +++++++++++++++----
 .../AcademicResourceList.jsx                  |  6 +--
 .../FeedbackCategoryList.jsx                  | 40 ++++++++++++++----
 .../src/features/feedbacks/FeedbackList.jsx   | 40 ++++++++++++++----
 4 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
index ea3a1589..952bfa37 100644
--- a/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
@@ -1,7 +1,11 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {deleteApi} from '../../service/apiAcademicResourceTypes';
+import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
 
 const AcademicResourceTypeList = ({resourceTypesList, setResourceTypeForm, setResourceTypesList, setShow}) => {
+  const [showDialog, setShowDialog] = useState(false);
+  const [itemToDelete, setItemToDelete] = useState(null);
+
   const editHandler = id => {
     if (id) {
       setShow(true);
@@ -14,16 +18,29 @@ const AcademicResourceTypeList = ({resourceTypesList, setResourceTypeForm, setRe
       }
     }
   };
-
-  const deleteHandler = async id => {
-    try {
-      const data = await deleteApi(id);
-      setResourceTypesList(data);
-    } catch (error) {
-      console.error('Error deleting feedbackcategory:', error);
+  const handleConfirmDelete = async () => {
+    if (itemToDelete) {
+      try {
+        const data = await deleteApi(itemToDelete);
+        setResourceTypesList(data);
+        setItemToDelete(null);
+      } catch (error) {
+        console.error('Error deleting feedbackcategory:', error);
+      }
+      setShowDialog(false);
     }
   };
 
+  const handleCloseDialog = () => {
+    setShowDialog(false);
+    setItemToDelete(null);
+  };
+
+  const deleteHandler = id => {
+    setItemToDelete(id); // Set the item to delete
+    setShowDialog(true); // Show the confirmation dialog
+  };
+
   return (
     <div className="container">
       <table className="table">
@@ -51,6 +68,14 @@ const AcademicResourceTypeList = ({resourceTypesList, setResourceTypeForm, setRe
           ))}
         </tbody>
       </table>
+
+      <ConfirmationDialog
+        show={showDialog}
+        handleClose={handleCloseDialog}
+        handleConfirm={handleConfirmDelete}
+        title="Confirm Delete"
+        body="Are you sure you want to delete this item?"
+      />
     </div>
   );
 };
diff --git a/frontend/src/features/academicResources/AcademicResourceList.jsx b/frontend/src/features/academicResources/AcademicResourceList.jsx
index 27fa8175..d900c5e2 100644
--- a/frontend/src/features/academicResources/AcademicResourceList.jsx
+++ b/frontend/src/features/academicResources/AcademicResourceList.jsx
@@ -4,7 +4,7 @@ import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog'
 
 const AcademicResourceList = ({academicResourceList, setAcademicResourceList, setAcademicResForm, setShow}) => {
   const [showDialog, setShowDialog] = useState(false);
-  const [itemToDelete, setItemToDelete] = useState(null); // State to keep track of the item to delete
+  const [itemToDelete, setItemToDelete] = useState(null);
 
   const editHandler = id => {
     if (id) {
@@ -27,11 +27,11 @@ const AcademicResourceList = ({academicResourceList, setAcademicResourceList, se
       try {
         const data = await deleteApi(itemToDelete);
         setAcademicResourceList(data);
-        setItemToDelete(null); // Reset the item to delete
+        setItemToDelete(null);
       } catch (error) {
         console.error('Error deleting feedbackcategory:', error);
       }
-      setShowDialog(false); // Close the dialog after deletion
+      setShowDialog(false);
     }
   };
 
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx b/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
index 32a93c79..72e03ce3 100644
--- a/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
+++ b/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
@@ -1,7 +1,11 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {deleteApi} from '../../service/apiFeedbackCategory';
+import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
 
 const FeedbaclCategoryList = ({feedbackCategorysList, setFeedbackCategoryForm, setFeedbackCategorysList, setShow}) => {
+  const [showDialog, setShowDialog] = useState(false);
+  const [itemToDelete, setItemToDelete] = useState(null);
+
   const editHandler = id => {
     if (id) {
       setShow(true);
@@ -16,15 +20,29 @@ const FeedbaclCategoryList = ({feedbackCategorysList, setFeedbackCategoryForm, s
     }
   };
 
-  const deleteHandler = async id => {
-    try {
-      const data = await deleteApi(id);
-      setFeedbackCategorysList(data);
-    } catch (error) {
-      console.error('Error deleting feedbackcategory:', error);
+  const handleConfirmDelete = async () => {
+    if (itemToDelete) {
+      try {
+        const data = await deleteApi(itemToDelete);
+        setFeedbackCategorysList(data);
+        setItemToDelete(null);
+      } catch (error) {
+        console.error('Error deleting feedbackcategory:', error);
+      }
+      setShowDialog(false);
     }
   };
 
+  const handleCloseDialog = () => {
+    setShowDialog(false);
+    setItemToDelete(null);
+  };
+
+  const deleteHandler = id => {
+    setItemToDelete(id); // Set the item to delete
+    setShowDialog(true); // Show the confirmation dialog
+  };
+
   return (
     <div className="container">
       <table className="table">
@@ -53,6 +71,14 @@ const FeedbaclCategoryList = ({feedbackCategorysList, setFeedbackCategoryForm, s
           ))}
         </tbody>
       </table>
+
+      <ConfirmationDialog
+        show={showDialog}
+        handleClose={handleCloseDialog}
+        handleConfirm={handleConfirmDelete}
+        title="Confirm Delete"
+        body="Are you sure you want to delete this item?"
+      />
     </div>
   );
 };
diff --git a/frontend/src/features/feedbacks/FeedbackList.jsx b/frontend/src/features/feedbacks/FeedbackList.jsx
index b383e615..f38348f4 100644
--- a/frontend/src/features/feedbacks/FeedbackList.jsx
+++ b/frontend/src/features/feedbacks/FeedbackList.jsx
@@ -1,7 +1,11 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {deleteApi} from '../../service/apiFeedbackService';
+import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
 
 const FeedbackList = ({feedbacksList, setFeedbacksList, setFeedbackForm, setShow}) => {
+  const [showDialog, setShowDialog] = useState(false);
+  const [itemToDelete, setItemToDelete] = useState(null);
+
   const editHandler = id => {
     if (id) {
       setShow(true);
@@ -17,15 +21,29 @@ const FeedbackList = ({feedbacksList, setFeedbacksList, setFeedbackForm, setShow
     }
   };
 
-  const deleteHandler = async id => {
-    try {
-      const data = await deleteApi(id);
-      setFeedbacksList(data);
-    } catch (error) {
-      console.error('Error deleting feedbackcategory:', error);
+  const handleConfirmDelete = async () => {
+    if (itemToDelete) {
+      try {
+        const data = await deleteApi(itemToDelete);
+        setFeedbacksList(data);
+        setItemToDelete(null);
+      } catch (error) {
+        console.error('Error deleting feedbackcategory:', error);
+      }
+      setShowDialog(false);
     }
   };
 
+  const handleCloseDialog = () => {
+    setShowDialog(false);
+    setItemToDelete(null);
+  };
+
+  const deleteHandler = id => {
+    setItemToDelete(id); // Set the item to delete
+    setShowDialog(true); // Show the confirmation dialog
+  };
+
   return (
     <div className="container">
       <table className="table">
@@ -56,6 +74,14 @@ const FeedbackList = ({feedbacksList, setFeedbacksList, setFeedbackForm, setShow
           ))}
         </tbody>
       </table>
+
+      <ConfirmationDialog
+        show={showDialog}
+        handleClose={handleCloseDialog}
+        handleConfirm={handleConfirmDelete}
+        title="Confirm Delete"
+        body="Are you sure you want to delete this item?"
+      />
     </div>
   );
 };

From 570b80f73cdc15be84cfa283b4d69e3b3c548d87 Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Tue, 16 Jul 2024 22:35:24 -0500
Subject: [PATCH 3/9] Updated of from validation

---
 .../academic/AcademicController.java          |  44 ++++---
 .../AcademicResourceTypeController.java       |  31 +++--
 .../discussion/DiscussionController.java      |   5 -
 .../feedback/FeedbackCategoryController.java  |  19 ++-
 .../feedback/FeedbackController.java          |  51 +++++---
 .../waa/project/dto/AcademicResourceDto.java  |  17 ---
 .../project/dto/AcademicResourceRequest.java  |  16 ---
 .../waa/project/dto/FeedbackCategoryDto.java  |   2 +-
 .../java/com/waa/project/dto/FeedbackDto.java |   9 +-
 .../waa/project/entity/FeedbackCategory.java  |   3 +
 .../DiscussionCommentsRepository.java         |  14 ---
 .../repository/DiscussionRepository.java      |   2 -
 .../repository/impl/FileRepositoryImpl.java   |   9 +-
 .../project/security/config/CorsConfig.java   |   2 +-
 .../security/config/SecurityConfig.java       |  37 +++---
 .../security/controller/AuthController.java   |  22 +++-
 .../security/filter/JwtTokenFilter.java       |  31 +++--
 .../service/impl/AuthServiceImpl.java         |  13 +--
 .../project/service/AcademicResService.java   |  16 +--
 .../service/AcademicResourceTypeService.java  |   9 +-
 .../service/DiscussionCommentsService.java    |   3 -
 .../project/service/DiscussionService.java    |   2 -
 .../service/FeedbackCategoryService.java      |   7 +-
 .../waa/project/service/FeedbackService.java  |  11 +-
 .../service/impl/AcademicResServiceImp.java   |  61 +++++-----
 .../impl/AcademicResourceTypeServiceImp.java  |  25 ++--
 .../impl/DiscussionCommentsServiceImpl.java   |  29 +----
 .../service/impl/DiscussionServiceImpl.java   |  34 ++----
 .../impl/FeebackCategoryServiceImp.java       |  28 +++--
 .../service/impl/FeebackServiceImp.java       |  88 ++++++--------
 .../service/impl/SubCommentServiceImpl.java   |  12 +-
 backend/src/main/resources/application.yml    |  12 +-
 backend/src/main/resources/data.sql           |  10 +-
 .../waa/project/ProjectApplicationTests.java  |   7 +-
 .../core/component/dialogs/input/Input.jsx    |  34 ++++++
 .../core/component/dialogs/select/Select.jsx  |  23 ++++
 .../AcademicResourceType.jsx                  |  57 +++++++--
 .../AcademicResourceTypeList.jsx              |  56 ++++-----
 .../AcademicResourceTypeModal.jsx             |  38 +++---
 .../academicResources/AcademicResource.jsx    |  46 ++++++--
 .../AcademicResourceList.jsx                  |  68 +++++------
 .../AcademicResourceModal.jsx                 | 109 +++++++++---------
 .../authentication/register/Register.jsx      |   1 +
 .../feedbackCategories/FeedbackCategory.jsx   |  51 ++++++--
 .../FeedbackCategoryList.jsx                  |  58 ++++------
 .../FeedbackCategoryModal.jsx                 |  65 ++++++-----
 frontend/src/features/feedbacks/Feedback.jsx  |  61 ++++++++--
 .../src/features/feedbacks/FeedbackList.jsx   |  61 +++++-----
 .../src/features/feedbacks/FeedbackModal.jsx  | 100 ++++++++--------
 frontend/src/service/apiAcademicResource.js   |  36 +++---
 frontend/src/service/apiFeedbackCategory.js   |  20 ++--
 frontend/src/service/apiFeedbackService.js    |  25 ++--
 frontend/src/types/types.js                   |  18 +--
 53 files changed, 896 insertions(+), 712 deletions(-)
 delete mode 100644 backend/src/main/java/com/waa/project/dto/AcademicResourceDto.java
 delete mode 100644 backend/src/main/java/com/waa/project/dto/AcademicResourceRequest.java
 create mode 100644 frontend/src/core/component/dialogs/input/Input.jsx
 create mode 100644 frontend/src/core/component/dialogs/select/Select.jsx

diff --git a/backend/src/main/java/com/waa/project/controller/academic/AcademicController.java b/backend/src/main/java/com/waa/project/controller/academic/AcademicController.java
index 33a5d00b..95466fbd 100644
--- a/backend/src/main/java/com/waa/project/controller/academic/AcademicController.java
+++ b/backend/src/main/java/com/waa/project/controller/academic/AcademicController.java
@@ -1,11 +1,15 @@
 package com.waa.project.controller.academic;
 
-import com.waa.project.dto.AcademicResourceDto;
-import com.waa.project.dto.AcademicResourceRequest;
+import com.waa.project.dto.requests.AcademicResourceRequest;
+import com.waa.project.dto.responses.AcademicResourceResponse;
 import com.waa.project.service.AcademicResService;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
+import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -20,38 +24,42 @@ public class AcademicController {
     @Autowired
     private AcademicResService academicResService;
 
-    @GetMapping({"/admins/academic", "/students/academic"})
-    public List<AcademicResourceDto> getAllResources() {
+    @Autowired
+    private ModelMapper modelMapper;
+
 
+    @GetMapping({"/academic"})//, "/students/academic"})
+    public List<AcademicResourceResponse> getAllResources() {
         return academicResService.getAllAcademicRes();
     }
 
-    @GetMapping({"/admins/academic/{Id}", "/students/academic/{Id}"})
-    public AcademicResourceDto getResource(@PathVariable Long Id) {
+    @GetMapping({"/academic/{Id}"})//, "/students/academic/{Id}"})
+    public AcademicResourceResponse getResource(@PathVariable Long Id) {
 
         return academicResService.getAcademicResource(Id);
     }
 
-    @PutMapping({"/admins/academic/{Id}", "/students/academic/{Id}"})
-    public String update(
-            @RequestBody AcademicResourceDto dto, @PathVariable Long Id
-    ) {
-        return academicResService.update(dto, Id);
+    @PutMapping({"/academic/{Id}"})//, "/students/academic/{Id}"})
+    public ResponseEntity<AcademicResourceResponse> update(
+            @Valid @RequestPart(value = "formdata") AcademicResourceRequest dto,
+            @PathVariable Long Id,
+            @RequestPart(value = "file", required = false) MultipartFile file) {
+        return new ResponseEntity<>(academicResService.update(dto, Id, file), HttpStatus.CREATED);
     }
 
-    @PostMapping(value = {"/admins/academic", "/students/academic"}, consumes = "multipart/form-data")
-    public String save(@RequestPart(value = "formdata") AcademicResourceRequest request,
-                       @RequestPart(value = "file", required = false) MultipartFile file) {
-        return academicResService.save(request, file);
+    @PostMapping(value = {"/academic"})//, "/students/academic"}, consumes = "multipart/form-data")
+    public ResponseEntity<AcademicResourceResponse> save(@Valid @RequestPart(value = "formdata") AcademicResourceRequest request,
+                                                         @RequestPart(value = "file", required = false) MultipartFile file) {
+        return new ResponseEntity<>(academicResService.save(request, file), HttpStatus.CREATED);
     }
 
     @GetMapping({"/admins/academic/search", "/students/academic/search"})
-    public List<AcademicResourceDto> search(@RequestParam String search) {
+    public List<AcademicResourceResponse> search(@RequestParam String search) {
         return academicResService.searchByResourceName(search);
     }
 
-    @DeleteMapping({"/admins/academic/{Id}", "/students/academic/{Id}"})
-    public String delete(@PathVariable Long Id) {
+    @DeleteMapping({"/academic/{Id}"})//, "/students/academic/{Id}"})
+    public List<AcademicResourceResponse> delete(@PathVariable Long Id) {
 
         return academicResService.delete(Id);
     }
diff --git a/backend/src/main/java/com/waa/project/controller/academic/AcademicResourceTypeController.java b/backend/src/main/java/com/waa/project/controller/academic/AcademicResourceTypeController.java
index 6230c842..14a020c4 100644
--- a/backend/src/main/java/com/waa/project/controller/academic/AcademicResourceTypeController.java
+++ b/backend/src/main/java/com/waa/project/controller/academic/AcademicResourceTypeController.java
@@ -1,10 +1,16 @@
 package com.waa.project.controller.academic;
 
 import com.waa.project.dto.AcademicResourceTypeDto;
+import com.waa.project.dto.requests.AcademicResourceTypeRequest;
+import com.waa.project.dto.responses.AcademicResourceTypeResponse;
+import com.waa.project.entity.AcademicResourceType;
 import com.waa.project.service.AcademicResourceTypeService;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -18,31 +24,32 @@ public class AcademicResourceTypeController {
     @Autowired
     private AcademicResourceTypeService academicResourceTypeService;
 
-    @GetMapping({"/admins/academicresources", "/students/academicresources"})
+    @GetMapping({"/academicresources"})//, "/students/academicresources"})
     public List<AcademicResourceTypeDto> getAllResourcesTypes() {
         return academicResourceTypeService.getAllCategories();
     }
 
-    @GetMapping({"/admins/academicresources/{catId}", "/students/academicresources/{catId}"})
+    @GetMapping({"/academicresources/{catId}"})//, "/students/academicresources/{catId}"})
     public AcademicResourceTypeDto getResourceType(@PathVariable Long catId) {
         return academicResourceTypeService.getAcademicResourceType(catId);
     }
 
-    @PutMapping({"/admins/academicresources/{catId}", "/students/academicresources/{catId}"})
-    public String update(
-            @RequestBody AcademicResourceTypeDto dto,
+    @PutMapping({"/academicresources/{catId}"})//, "/students/academicresources/{catId}"})
+    public ResponseEntity<AcademicResourceTypeResponse> update(
+            @Valid @RequestBody AcademicResourceTypeRequest request,
             @PathVariable Long catId
-                        ) {
-        return academicResourceTypeService.update(dto, catId);
+    ) {
+        return new ResponseEntity<>(academicResourceTypeService.update(request, catId), HttpStatus.CREATED);
     }
 
-    @PostMapping({"/admins/academicresources", "/students/academicresources"})
-    public String save(@RequestBody AcademicResourceTypeDto dto) {
-        return academicResourceTypeService.save(dto);
+    @PostMapping({"/academicresources"})//, "/students/academicresources"})
+    public ResponseEntity<AcademicResourceTypeResponse> save(
+            @Valid @RequestBody AcademicResourceTypeRequest request) {
+        return new ResponseEntity<>(academicResourceTypeService.save(request), HttpStatus.CREATED);
     }
 
-    @DeleteMapping({"/admins/academicresources/{catId}", "/students/academicresources/{catId}"})
-    public String delete(@PathVariable Long catId) {
+    @DeleteMapping({"/academicresources/{catId}"})//, "/students/academicresources/{catId}"})
+    public List<AcademicResourceType> delete(@PathVariable Long catId) {
         return academicResourceTypeService.delete(catId);
     }
 }
diff --git a/backend/src/main/java/com/waa/project/controller/discussion/DiscussionController.java b/backend/src/main/java/com/waa/project/controller/discussion/DiscussionController.java
index e116c41c..61223001 100644
--- a/backend/src/main/java/com/waa/project/controller/discussion/DiscussionController.java
+++ b/backend/src/main/java/com/waa/project/controller/discussion/DiscussionController.java
@@ -51,9 +51,4 @@ public ResponseEntity<?> deleteDiscussion(@PathVariable("id") long id, @Authenti
 
         return ResponseEntity.ok(discussionService.deleteDiscussion(id, user));
     }
-
-    @GetMapping("/students/discussion/search")
-    public ResponseEntity<?> searchDiscussion(@RequestParam String text) {
-        return ResponseEntity.ok(discussionService.searching(text));
-    }
 }
diff --git a/backend/src/main/java/com/waa/project/controller/feedback/FeedbackCategoryController.java b/backend/src/main/java/com/waa/project/controller/feedback/FeedbackCategoryController.java
index a7c4e531..15f2e9e2 100644
--- a/backend/src/main/java/com/waa/project/controller/feedback/FeedbackCategoryController.java
+++ b/backend/src/main/java/com/waa/project/controller/feedback/FeedbackCategoryController.java
@@ -1,10 +1,16 @@
 package com.waa.project.controller.feedback;
 
 import com.waa.project.dto.FeedbackCategoryDto;
+import com.waa.project.dto.requests.FeedbackCategoryRequest;
+import com.waa.project.dto.responses.FeedbackCategoryResponse;
+import com.waa.project.entity.FeedbackCategory;
 import com.waa.project.service.FeedbackCategoryService;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -29,20 +35,21 @@ public FeedbackCategoryDto getAllFeedCategory(@PathVariable Long catId) {
     }
 
     @PutMapping("/admins/feedbackcategories/{catId}")
-    public String getAllFeedCategory(
-            @RequestBody FeedbackCategoryDto feedbackCategoryDto,
+    public String update(
+            @Valid @RequestBody FeedbackCategoryDto feedbackCategoryDto,
             @PathVariable Long catId
-                                    ) {
+    ) {
         return feedbackCategoryService.update(feedbackCategoryDto, catId);
     }
 
     @PostMapping("/admins/feedbackcategories")
-    public String getAllFeedCategory(@RequestBody FeedbackCategoryDto feedbackCategoryDto) {
-        return feedbackCategoryService.save(feedbackCategoryDto);
+    public ResponseEntity<FeedbackCategoryResponse> saveFeedbackCategory(
+            @Valid @RequestBody FeedbackCategoryRequest feedbackCategory) {
+        return new ResponseEntity<>(feedbackCategoryService.save(feedbackCategory), HttpStatus.CREATED);
     }
 
     @DeleteMapping("/admins/feedbackcategories/{catId}")
-    public String delete(@PathVariable Long catId) {
+    public List<FeedbackCategory> delete(@PathVariable Long catId) {
         return feedbackCategoryService.delete(catId);
     }
 
diff --git a/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java b/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java
index c714b6de..05662971 100644
--- a/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java
+++ b/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java
@@ -1,11 +1,17 @@
 package com.waa.project.controller.feedback;
 
 import com.waa.project.dto.FeedbackDto;
+import com.waa.project.dto.requests.FeedbackRequest;
+import com.waa.project.dto.responses.FeedbackResponse;
+import com.waa.project.entity.Feedback;
 import com.waa.project.service.FeedbackService;
 import com.waa.project.service.UserService;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +34,7 @@ public class FeedbackController {
     private UserService userService;
 
     @GetMapping("/feedbacks")
-    public List<FeedbackDto> getAllFeedBack() {
+    public List<Feedback> getAllFeedBack() {
 
         return feedbackService.getAllFeedbacks();
     }
@@ -52,35 +58,54 @@ public List<FeedbackDto> findWithTitle(@PathVariable String title, @PathVariable
     public List<FeedbackDto> getFeedByCategory(@PathVariable Long Id) {
         return feedbackService.findFeedbackByCategory(Id);
     }
-
-    @PutMapping({"/admins/feedbacks/{Id}", "/students/feedbacks/{Id}"})
-    public String update(
-            @RequestBody FeedbackDto feedbackDto,
+//
+//    @PutMapping({"/feedbacks/{Id}"})//, "/students/feedbacks/{Id}"})
+//    public List<Feedback> update(
+//            @Valid @RequestBody FeedbackRequest feedbackRequest,
+//            @PathVariable Long Id,
+//            @AuthenticationPrincipal UserDetails userDetails
+//    ) {
+//        Long currentUser = null;
+//
+//        if (userDetails != null && userDetails.getUsername() != null) {
+//            currentUser = userService.findByUsername(userDetails.getUsername()).getId();
+//        }
+//
+//        return feedbackService.update(feedbackRequest, Id, currentUser);
+//    }
+
+
+    @PutMapping({"/feedbacks/{Id}"})//, "/students/feedbacks/{Id}"})
+    public ResponseEntity<FeedbackResponse> update(
+            @Valid @RequestBody FeedbackRequest feedbackRequest,
             @PathVariable Long Id,
             @AuthenticationPrincipal UserDetails userDetails
     ) {
+        System.out.println(feedbackRequest);
+        System.out.println(Id);
+
         Long currentUser = null;
 
         if (userDetails != null && userDetails.getUsername() != null) {
             currentUser = userService.findByUsername(userDetails.getUsername()).getId();
         }
+        return new ResponseEntity<>(feedbackService.update(feedbackRequest, Id, currentUser), HttpStatus.CREATED);
 
-        return feedbackService.update(feedbackDto, Id, currentUser);
     }
 
     @PostMapping("/feedbacks")
-    public String save(@RequestBody FeedbackDto feedbackDto, @AuthenticationPrincipal UserDetails userDetails) {
+    public ResponseEntity<FeedbackResponse> save(
+            @Valid @RequestBody FeedbackRequest feedbackRequest,
+            @AuthenticationPrincipal UserDetails userDetails) {
         Long currentUser = null;
-
         if (userDetails != null && userDetails.getUsername() != null) {
             currentUser = userService.findByUsername(userDetails.getUsername()).getId();
         }
-        return feedbackService.save(feedbackDto, currentUser);
+        return new ResponseEntity<>(feedbackService.save(feedbackRequest, currentUser), HttpStatus.CREATED);
     }
 
-    @DeleteMapping({"/admins/feedbacks/{Id}", "/students/feedbacks/{Id}"})
-    public String delete(@PathVariable Long Id) {
-
+    @DeleteMapping({"/feedbacks/{Id}"})// "/students/feedbacks/{Id}"})
+    public List<Feedback> delete(@PathVariable Long Id) {
         return feedbackService.delete(Id);
     }
 
@@ -97,6 +122,7 @@ public Map<String, Integer> findFeedbackByCategoryCount() {
 
     @GetMapping("/feedbacks/showMe")
     public Map<String, String> showMe(@AuthenticationPrincipal UserDetails userDetails) {
+        System.out.println("userDetails===" + userDetails);
         var result = userService.findByUsername(userDetails.getUsername());
         Map<String, String> response = new HashMap<>();
         response.put("name", result.getUsername());
@@ -104,6 +130,5 @@ public Map<String, String> showMe(@AuthenticationPrincipal UserDetails userDetai
         response.put("role", result.getUsername());
         response.put("id", result.getId().toString());
         return response;
-
     }
 }
diff --git a/backend/src/main/java/com/waa/project/dto/AcademicResourceDto.java b/backend/src/main/java/com/waa/project/dto/AcademicResourceDto.java
deleted file mode 100644
index 800f4132..00000000
--- a/backend/src/main/java/com/waa/project/dto/AcademicResourceDto.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.waa.project.dto;
-
-import com.waa.project.entity.AcademicResourceType;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AcademicResourceDto {
-
-    private Long id;
-    private String name;
-    private String file;
-    private AcademicResourceType resourceType;
-}
diff --git a/backend/src/main/java/com/waa/project/dto/AcademicResourceRequest.java b/backend/src/main/java/com/waa/project/dto/AcademicResourceRequest.java
deleted file mode 100644
index c20f5240..00000000
--- a/backend/src/main/java/com/waa/project/dto/AcademicResourceRequest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.waa.project.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.File;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AcademicResourceRequest {
-    private String name;
-    private File file;
-    private Long resourceId;
-}
diff --git a/backend/src/main/java/com/waa/project/dto/FeedbackCategoryDto.java b/backend/src/main/java/com/waa/project/dto/FeedbackCategoryDto.java
index ff793d09..bfc8e80a 100644
--- a/backend/src/main/java/com/waa/project/dto/FeedbackCategoryDto.java
+++ b/backend/src/main/java/com/waa/project/dto/FeedbackCategoryDto.java
@@ -4,7 +4,7 @@
 
 @Data
 public class FeedbackCategoryDto {
-    private Long   id;
+    private Long id;
     private String name;
     private String description;
 }
diff --git a/backend/src/main/java/com/waa/project/dto/FeedbackDto.java b/backend/src/main/java/com/waa/project/dto/FeedbackDto.java
index 88da4d02..517f4b2f 100644
--- a/backend/src/main/java/com/waa/project/dto/FeedbackDto.java
+++ b/backend/src/main/java/com/waa/project/dto/FeedbackDto.java
@@ -6,9 +6,10 @@
 
 @Data
 public class FeedbackDto {
-    private Long             id;
-    private String           title;
-    private String           body;
+    private Long id;
+    private String title;
+    private String body;
     private FeedbackCategory feedbackCategory;
-    private Student          student;
+    private Student student;
+    private Long category;
 }
diff --git a/backend/src/main/java/com/waa/project/entity/FeedbackCategory.java b/backend/src/main/java/com/waa/project/entity/FeedbackCategory.java
index 68008779..0a1e8795 100644
--- a/backend/src/main/java/com/waa/project/entity/FeedbackCategory.java
+++ b/backend/src/main/java/com/waa/project/entity/FeedbackCategory.java
@@ -1,6 +1,7 @@
 package com.waa.project.entity;
 
 import jakarta.persistence.*;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 @Entity
@@ -13,9 +14,11 @@ public class FeedbackCategory {
     private Long id;
 
     @Column(name = "name", nullable = false)
+    @Size(min = 2, max = 255, message = "Category name must be minimum of 2 characters long")
     private String name;
 
     @Column(name = "description")
+    @Size(min = 2, max = 255, message = "Description must be minimum of 2 characters long")
     private String description;
 
     @Embedded
diff --git a/backend/src/main/java/com/waa/project/repository/DiscussionCommentsRepository.java b/backend/src/main/java/com/waa/project/repository/DiscussionCommentsRepository.java
index 2af8cfed..7dcbc80c 100644
--- a/backend/src/main/java/com/waa/project/repository/DiscussionCommentsRepository.java
+++ b/backend/src/main/java/com/waa/project/repository/DiscussionCommentsRepository.java
@@ -4,12 +4,9 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.Optional;
 
 @Repository
@@ -26,15 +23,4 @@ public interface DiscussionCommentsRepository extends JpaRepository<DiscussionCo
             nativeQuery = true
     )
     Page<DiscussionComments> findByParentCommentId(Long parentCommentId, Pageable pageable);
-
-    void deleteAllByParentCommentId(DiscussionComments id);
-
-    List<DiscussionComments> findAllByDiscussionId(Long discussionId);
-
-    @Modifying
-    @Query("DELETE FROM DiscussionComments dc WHERE dc.parentCommentId.id IN :parentCommentIds")
-    void deleteAllByParentCommentIds(@Param("parentCommentIds") List<Long> parentCommentIds);
-
-    void deleteByDiscussionId(Long discussionId);
-
 }
diff --git a/backend/src/main/java/com/waa/project/repository/DiscussionRepository.java b/backend/src/main/java/com/waa/project/repository/DiscussionRepository.java
index f39087c7..c4959ee3 100644
--- a/backend/src/main/java/com/waa/project/repository/DiscussionRepository.java
+++ b/backend/src/main/java/com/waa/project/repository/DiscussionRepository.java
@@ -16,6 +16,4 @@ public interface DiscussionRepository extends JpaRepository<Discussion, Long> {
     Optional<Discussion> findByIdAndStudentId(long id, long studentId);
 
     void deleteByIdAndStudentId(long id, long studentId);
-
-    Optional<Discussion> findAllByTitleContainingIgnoreCaseOrBodyContainingIgnoreCase(String title, String body);
 }
diff --git a/backend/src/main/java/com/waa/project/repository/impl/FileRepositoryImpl.java b/backend/src/main/java/com/waa/project/repository/impl/FileRepositoryImpl.java
index 07b3b73f..475805cc 100644
--- a/backend/src/main/java/com/waa/project/repository/impl/FileRepositoryImpl.java
+++ b/backend/src/main/java/com/waa/project/repository/impl/FileRepositoryImpl.java
@@ -15,7 +15,7 @@
 @Component
 public class FileRepositoryImpl implements FileRepository {
 
-    private static final String BASE_PATH   = "uploads";
+    private static final String BASE_PATH = "uploads";
     private static final String DATE_FORMAT = "yyyyMMddhhmmssSSS";
 
     @Override
@@ -28,7 +28,6 @@ public String saveFile(File file, String saveLocation) {
         try {
             Path uploadsDirPath = Paths.get(getUploadsDirectory().toString(), saveLocation);
 
-
             System.out.println(getUploadsDirectory().toAbsolutePath());
             System.out.println(uploadsDirPath);
 
@@ -37,8 +36,8 @@ public String saveFile(File file, String saveLocation) {
             }
 
             String sanitizedFilename = sanitizeFilename(file.getName());
-            String uniqueFilename    = generateUniqueFilename(sanitizedFilename);
-            Path   filePath          = uploadsDirPath.resolve(uniqueFilename).normalize();
+            String uniqueFilename = generateUniqueFilename(sanitizedFilename);
+            Path filePath = uploadsDirPath.resolve(uniqueFilename).normalize();
             Files.copy(file.toPath(), filePath);
 
             return filePath.toString().substring(System.getProperty("user.dir").length());
@@ -74,7 +73,7 @@ private String generateUniqueFilename(String filename) {
         int extensionIndex = filename.lastIndexOf('.');
         if (extensionIndex > 0) {
             extension = filename.substring(extensionIndex);
-            filename  = filename.substring(0, extensionIndex);
+            filename = filename.substring(0, extensionIndex);
         }
 
         return filename + "_" + timestamp + extension;
diff --git a/backend/src/main/java/com/waa/project/security/config/CorsConfig.java b/backend/src/main/java/com/waa/project/security/config/CorsConfig.java
index a001ee44..1f431f5f 100644
--- a/backend/src/main/java/com/waa/project/security/config/CorsConfig.java
+++ b/backend/src/main/java/com/waa/project/security/config/CorsConfig.java
@@ -14,7 +14,7 @@ public class CorsConfig {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(Arrays.asList("http://127.0.0.1:5173", "http://localhost:5173"));
+        configuration.setAllowedOrigins(Arrays.asList("http://127.0.0.1:3000", "http://localhost:3000"));
         configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
         configuration.setAllowedHeaders(Arrays.asList("Authorization", "Cache-Control", "Content-Type"));
         configuration.setAllowCredentials(true);
diff --git a/backend/src/main/java/com/waa/project/security/config/SecurityConfig.java b/backend/src/main/java/com/waa/project/security/config/SecurityConfig.java
index 2e5f9523..23242032 100644
--- a/backend/src/main/java/com/waa/project/security/config/SecurityConfig.java
+++ b/backend/src/main/java/com/waa/project/security/config/SecurityConfig.java
@@ -31,25 +31,24 @@ public SecurityConfig(CorsConfigurationSource corsConfigurationSource) {
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http, JwtTokenFilter jwtTokenFilter) throws Exception {
         return http.csrf(AbstractHttpConfigurer::disable)
-//                   .cors(AbstractHttpConfigurer::disable)
-                   .cors(cors -> cors.configurationSource(corsConfigurationSource))
-                   .sessionManagement(
-                           sessionMgr -> sessionMgr.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-                   .authorizeHttpRequests(
-                           authorizeRequests -> authorizeRequests.requestMatchers("/api/v1/admins/**")
-                                                                 .hasRole(RoleType.ADMIN.name())
-                                                                 .requestMatchers("/api/v1/students/**")
-                                                                 .hasRole(RoleType.STUDENT.name())
-                                                                 .anyRequest()
-                                                                 .permitAll()
-                                         )
-                   .exceptionHandling(
-                           exceptionHandler -> exceptionHandler.authenticationEntryPoint(
-                                   (request, response, authException) -> response.sendError(
-                                           HttpServletResponse.SC_UNAUTHORIZED, AuthErrorMessages.invalidToken()))
-                                     )
-                   .addFilterBefore(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class)
-                   .build();
+                .cors(cors -> cors.configurationSource(corsConfigurationSource))
+                .sessionManagement(
+                        sessionMgr -> sessionMgr.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .authorizeHttpRequests(
+                        authorizeRequests -> authorizeRequests.requestMatchers("/api/v1/admins/**")
+                                .hasRole(RoleType.ADMIN.name())
+                                .requestMatchers("/api/v1/students/**")
+                                .hasRole(RoleType.STUDENT.name())
+                                .anyRequest()
+                                .permitAll()
+                )
+                .exceptionHandling(
+                        exceptionHandler -> exceptionHandler.authenticationEntryPoint(
+                                (request, response, authException) -> response.sendError(
+                                        HttpServletResponse.SC_UNAUTHORIZED, AuthErrorMessages.invalidToken()))
+                )
+                .addFilterBefore(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class)
+                .build();
     }
 
     @Bean
diff --git a/backend/src/main/java/com/waa/project/security/controller/AuthController.java b/backend/src/main/java/com/waa/project/security/controller/AuthController.java
index 44d4c115..57fed8c7 100644
--- a/backend/src/main/java/com/waa/project/security/controller/AuthController.java
+++ b/backend/src/main/java/com/waa/project/security/controller/AuthController.java
@@ -5,21 +5,21 @@
 import com.waa.project.security.contract.JwtTokenResponse;
 import com.waa.project.security.contract.RefreshTokenRequest;
 import com.waa.project.security.service.AuthService;
+import com.waa.project.service.TokenBlacklistService;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/v1/auth")
 public class AuthController {
     private final AuthService authService;
+    private final TokenBlacklistService tokenBlacklistService;
 
     public AuthController(
-            AuthService authService
-                         ) {
+            AuthService authService,
+            TokenBlacklistService tokenBlacklistService) {
         this.authService = authService;
+        this.tokenBlacklistService = tokenBlacklistService;
     }
 
     @PostMapping("/login")
@@ -31,4 +31,14 @@ public ResponseEntity<JwtTokenResponse> login(@RequestBody AuthRequest authReque
     public ResponseEntity<JwtAccessTokenResponse> refreshToken(@RequestBody RefreshTokenRequest tokenRequest) {
         return ResponseEntity.ok(authService.refreshToken(tokenRequest));
     }
+
+    @PostMapping("/logout")
+    public ResponseEntity<String> logout(@RequestHeader("Authorization") String token) {
+
+        if (token != null && token.startsWith("Bearer ")) {
+            token = token.substring(7);
+            tokenBlacklistService.addTokenToBlacklist(token);
+        }
+        return ResponseEntity.ok("Logged out successfully");
+    }
 }
diff --git a/backend/src/main/java/com/waa/project/security/filter/JwtTokenFilter.java b/backend/src/main/java/com/waa/project/security/filter/JwtTokenFilter.java
index 5c9a790f..65880811 100644
--- a/backend/src/main/java/com/waa/project/security/filter/JwtTokenFilter.java
+++ b/backend/src/main/java/com/waa/project/security/filter/JwtTokenFilter.java
@@ -2,10 +2,13 @@
 
 import com.waa.project.security.util.AuthErrorMessages;
 import com.waa.project.security.util.JwtTokenUtil;
+import com.waa.project.service.TokenBlacklistService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -20,15 +23,20 @@
 
 @Component
 public class JwtTokenFilter extends OncePerRequestFilter {
-    private final JwtTokenUtil       jwtTokenUtil;
+
+    private static final Logger logger = LoggerFactory.getLogger(JwtTokenFilter.class);
+
+    private final JwtTokenUtil jwtTokenUtil;
     private final UserDetailsService userDetailsService;
+    private final TokenBlacklistService tokenBlacklistService;
 
     public JwtTokenFilter(
             JwtTokenUtil jwtTokenUtil,
-            UserDetailsService userDetailsService
-                         ) {
-        this.jwtTokenUtil       = jwtTokenUtil;
+            UserDetailsService userDetailsService,
+            TokenBlacklistService tokenBlacklistService) {
+        this.jwtTokenUtil = jwtTokenUtil;
         this.userDetailsService = userDetailsService;
+        this.tokenBlacklistService = tokenBlacklistService;
     }
 
     @Override
@@ -36,10 +44,11 @@ protected void doFilterInternal(
             HttpServletRequest request,
             HttpServletResponse response,
             FilterChain chain
-                                   ) throws ServletException, IOException {
+    ) throws ServletException, IOException {
 
         // Get authorization header and validate
         final String header = request.getHeader(HttpHeaders.AUTHORIZATION);
+
         if (header == null || !header.startsWith("Bearer ")) {
             chain.doFilter(request, response);
             return;
@@ -47,15 +56,21 @@ protected void doFilterInternal(
 
         // get the token
         String token = header.substring(7).trim().trim();
+
         if (!jwtTokenUtil.validateToken(token)) {
-            chain.doFilter(request, response);
+            logger.warn("Invalid JWT Token");
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid JWT Token");
             return;
         }
 
-        // Get user identity and set it on the spring security context
+        if (tokenBlacklistService.isTokenBlacklisted(token)) {
+            logger.warn("Blacklisted JWT Token");
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Blacklisted JWT Token");
+            return;
+        }
 
+        // Get user identity and set it on the spring security context
         UserDetails userDetails;
-
         try {
             userDetails =
                     userDetailsService.loadUserByUsername(jwtTokenUtil.getUsernameFromToken(token));
diff --git a/backend/src/main/java/com/waa/project/security/service/impl/AuthServiceImpl.java b/backend/src/main/java/com/waa/project/security/service/impl/AuthServiceImpl.java
index d71e2f24..9bf16b81 100644
--- a/backend/src/main/java/com/waa/project/security/service/impl/AuthServiceImpl.java
+++ b/backend/src/main/java/com/waa/project/security/service/impl/AuthServiceImpl.java
@@ -19,17 +19,17 @@
 @Service
 public class AuthServiceImpl implements AuthService {
     private final AuthenticationManager authenticationManager;
-    private final UserDetailsService    userDetailsService;
-    private final JwtTokenUtil          jwtTokenUtil;
+    private final UserDetailsService userDetailsService;
+    private final JwtTokenUtil jwtTokenUtil;
 
     public AuthServiceImpl(
             AuthenticationManager authenticationManager,
             UserDetailsService userDetailsService,
             JwtTokenUtil jwtTokenUtil
-                          ) {
+    ) {
         this.authenticationManager = authenticationManager;
-        this.userDetailsService    = userDetailsService;
-        this.jwtTokenUtil          = jwtTokenUtil;
+        this.userDetailsService = userDetailsService;
+        this.jwtTokenUtil = jwtTokenUtil;
     }
 
     @Override
@@ -45,9 +45,8 @@ public JwtTokenResponse login(AuthRequest request) {
 
         final UserDetails userDetails = userDetailsService.loadUserByUsername(result.getName());
 
-        final String accessToken  = jwtTokenUtil.generateToken(userDetails);
+        final String accessToken = jwtTokenUtil.generateToken(userDetails);
         final String refreshToken = jwtTokenUtil.generateRefreshToken(request.getUsername());
-
         return new JwtTokenResponse(accessToken, refreshToken);
     }
 
diff --git a/backend/src/main/java/com/waa/project/service/AcademicResService.java b/backend/src/main/java/com/waa/project/service/AcademicResService.java
index edc9a234..40c2fda0 100644
--- a/backend/src/main/java/com/waa/project/service/AcademicResService.java
+++ b/backend/src/main/java/com/waa/project/service/AcademicResService.java
@@ -1,21 +1,21 @@
 package com.waa.project.service;
 
-import com.waa.project.dto.AcademicResourceDto;
-import com.waa.project.dto.AcademicResourceRequest;
+import com.waa.project.dto.requests.AcademicResourceRequest;
+import com.waa.project.dto.responses.AcademicResourceResponse;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
 public interface AcademicResService {
-    List<AcademicResourceDto> getAllAcademicRes();
+    List<AcademicResourceResponse> getAllAcademicRes();
 
-    AcademicResourceDto getAcademicResource(Long feedId);
+    AcademicResourceResponse getAcademicResource(Long feedId);
 
-    String save(AcademicResourceRequest dto, MultipartFile file);
+    AcademicResourceResponse save(AcademicResourceRequest request, MultipartFile file);
 
-    String update(AcademicResourceDto dto, Long fid);
+    AcademicResourceResponse update(AcademicResourceRequest request, Long fid, MultipartFile file);
 
-    String delete(Long fid);
+    List<AcademicResourceResponse> delete(Long fid);
 
-    List<AcademicResourceDto> searchByResourceName(String resname);
+    List<AcademicResourceResponse> searchByResourceName(String resname);
 }
diff --git a/backend/src/main/java/com/waa/project/service/AcademicResourceTypeService.java b/backend/src/main/java/com/waa/project/service/AcademicResourceTypeService.java
index 022324f9..b8ff1d20 100644
--- a/backend/src/main/java/com/waa/project/service/AcademicResourceTypeService.java
+++ b/backend/src/main/java/com/waa/project/service/AcademicResourceTypeService.java
@@ -1,6 +1,9 @@
 package com.waa.project.service;
 
 import com.waa.project.dto.AcademicResourceTypeDto;
+import com.waa.project.dto.requests.AcademicResourceTypeRequest;
+import com.waa.project.dto.responses.AcademicResourceTypeResponse;
+import com.waa.project.entity.AcademicResourceType;
 
 import java.util.List;
 
@@ -9,9 +12,9 @@ public interface AcademicResourceTypeService {
 
     AcademicResourceTypeDto getAcademicResourceType(Long feedId);
 
-    String save(AcademicResourceTypeDto resType);
+    AcademicResourceTypeResponse save(AcademicResourceTypeRequest request);
 
-    String update(AcademicResourceTypeDto resType, Long fid);
+    AcademicResourceTypeResponse update(AcademicResourceTypeRequest resType, Long fid);
 
-    String delete(Long fid);
+    List<AcademicResourceType> delete(Long fid);
 }
diff --git a/backend/src/main/java/com/waa/project/service/DiscussionCommentsService.java b/backend/src/main/java/com/waa/project/service/DiscussionCommentsService.java
index 31317554..667d085b 100644
--- a/backend/src/main/java/com/waa/project/service/DiscussionCommentsService.java
+++ b/backend/src/main/java/com/waa/project/service/DiscussionCommentsService.java
@@ -1,7 +1,6 @@
 package com.waa.project.service;
 
 import com.waa.project.dto.DiscussionCommentsDto;
-import com.waa.project.entity.Discussion;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.userdetails.User;
@@ -17,6 +16,4 @@ public interface DiscussionCommentsService {
     DiscussionCommentsDto updateDiscussionComments(long id, DiscussionCommentsDto commentsDto, User user);
 
     DiscussionCommentsDto deleteDiscussionComments(long id, User user);
-
-    void deleteAllCommentsByDiscussionId(Discussion discussion);
 }
diff --git a/backend/src/main/java/com/waa/project/service/DiscussionService.java b/backend/src/main/java/com/waa/project/service/DiscussionService.java
index 6f575cd0..bdcb5359 100644
--- a/backend/src/main/java/com/waa/project/service/DiscussionService.java
+++ b/backend/src/main/java/com/waa/project/service/DiscussionService.java
@@ -16,6 +16,4 @@ public interface DiscussionService {
     DiscussionDto updateDiscussion(long id, DiscussionDto discussionDto, User user);
 
     DiscussionDto deleteDiscussion(long id, User user);
-
-    DiscussionDto searching(String text);
 }
diff --git a/backend/src/main/java/com/waa/project/service/FeedbackCategoryService.java b/backend/src/main/java/com/waa/project/service/FeedbackCategoryService.java
index 76e95c15..3266be98 100644
--- a/backend/src/main/java/com/waa/project/service/FeedbackCategoryService.java
+++ b/backend/src/main/java/com/waa/project/service/FeedbackCategoryService.java
@@ -1,6 +1,9 @@
 package com.waa.project.service;
 
 import com.waa.project.dto.FeedbackCategoryDto;
+import com.waa.project.dto.requests.FeedbackCategoryRequest;
+import com.waa.project.dto.responses.FeedbackCategoryResponse;
+import com.waa.project.entity.FeedbackCategory;
 
 import java.util.List;
 
@@ -9,9 +12,9 @@ public interface FeedbackCategoryService {
 
     FeedbackCategoryDto getCategory(Long feedId);
 
-    String save(FeedbackCategoryDto category);
+    FeedbackCategoryResponse save(FeedbackCategoryRequest category);
 
     String update(FeedbackCategoryDto category, Long fid);
 
-    String delete(Long fid);
+    List<FeedbackCategory> delete(Long fid);
 }
diff --git a/backend/src/main/java/com/waa/project/service/FeedbackService.java b/backend/src/main/java/com/waa/project/service/FeedbackService.java
index c145c7c5..66898a1d 100644
--- a/backend/src/main/java/com/waa/project/service/FeedbackService.java
+++ b/backend/src/main/java/com/waa/project/service/FeedbackService.java
@@ -1,19 +1,22 @@
 package com.waa.project.service;
 
 import com.waa.project.dto.FeedbackDto;
+import com.waa.project.dto.requests.FeedbackRequest;
+import com.waa.project.dto.responses.FeedbackResponse;
+import com.waa.project.entity.Feedback;
 
 import java.util.List;
 
 public interface FeedbackService {
-    List<FeedbackDto> getAllFeedbacks();
+    List<Feedback> getAllFeedbacks();
 
     FeedbackDto getFeedback(Long feedId);
 
-    String save(FeedbackDto feedback, Long userId);
+    FeedbackResponse save(FeedbackRequest feedbackRequest, Long userId);
 
-    String update(FeedbackDto feedback, Long fid, Long userId);
+    FeedbackResponse update(FeedbackRequest feedbackRequest, Long fid, Long userId);
 
-    String delete(Long fid);
+    List<Feedback> delete(Long fid);
 
     List<FeedbackDto> findFeedbackByCategory(Long id);
 
diff --git a/backend/src/main/java/com/waa/project/service/impl/AcademicResServiceImp.java b/backend/src/main/java/com/waa/project/service/impl/AcademicResServiceImp.java
index 4094619e..92268fca 100644
--- a/backend/src/main/java/com/waa/project/service/impl/AcademicResServiceImp.java
+++ b/backend/src/main/java/com/waa/project/service/impl/AcademicResServiceImp.java
@@ -1,7 +1,7 @@
 package com.waa.project.service.impl;
 
-import com.waa.project.dto.AcademicResourceDto;
-import com.waa.project.dto.AcademicResourceRequest;
+import com.waa.project.dto.requests.AcademicResourceRequest;
+import com.waa.project.dto.responses.AcademicResourceResponse;
 import com.waa.project.entity.AcademicResource;
 import com.waa.project.entity.AcademicResourceType;
 import com.waa.project.repository.AcademicResRepository;
@@ -33,62 +33,69 @@ public class AcademicResServiceImp implements AcademicResService {
     private FileService fileService;
 
     @Override
-    public List<AcademicResourceDto> getAllAcademicRes() {
-        List<AcademicResourceDto> list = new ArrayList<>();
-        academicResRepository.findAll().forEach(feed -> list.add(modelMapper.map(feed, AcademicResourceDto.class)));
+    public List<AcademicResourceResponse> getAllAcademicRes() {
+        List<AcademicResourceResponse> list = new ArrayList<>();
+        academicResRepository.findAll().forEach(feed -> list.add(modelMapper.map(feed, AcademicResourceResponse.class)));
         return list;
+
     }
 
     @Override
-    public AcademicResourceDto getAcademicResource(Long feedId) {
+    public AcademicResourceResponse getAcademicResource(Long feedId) {
         AcademicResource res = academicResRepository.findById(feedId).get();
-        return modelMapper.map(res, AcademicResourceDto.class);
+        return modelMapper.map(res, AcademicResourceResponse.class);
     }
 
     @Override
-    public String save(AcademicResourceRequest res, MultipartFile file) {
-        AcademicResource resToSave = modelMapper.map(res, AcademicResource.class);
-
+    public AcademicResourceResponse save(AcademicResourceRequest res, MultipartFile file) {
+        AcademicResource dataToSave = modelMapper.map(res, AcademicResource.class);
         AcademicResourceType resCategory =
                 academicResTypeRepository.findById(res.getResourceId()).get();
 
         if (file != null && !file.isEmpty()) {
             String folder = resCategory.getName().replace(" ", "_");
             String filePath = fileService.saveFile(file, FileSaveLocations.academicResource(folder));
-            resToSave.setFile(filePath);
+            dataToSave.setFile(filePath);
         }
-        resToSave.setResourceType(resCategory);
-        academicResRepository.save(resToSave);
-        return "AcademicResource saved successfully.";
+        dataToSave.setResourceType(resCategory);
+        dataToSave.setName(res.getName());
+        dataToSave.setBody(res.getBody());
+
+        academicResRepository.save(dataToSave);
+
+        return modelMapper.map(dataToSave, AcademicResourceResponse.class);
     }
 
+
     @Override
-    public String update(AcademicResourceDto res, Long fid) {
-        AcademicResource feedToUpdate = academicResRepository.findById(fid).orElse(null);
+    public AcademicResourceResponse update(AcademicResourceRequest res, Long fid, MultipartFile file) {
+        AcademicResource dataToUpdate = academicResRepository.findById(fid).orElse(null);
 
         AcademicResourceType academicResourceType =
-                academicResTypeRepository.findById(res.getResourceType().getId()).get();
+                academicResTypeRepository.findById(res.getResourceId()).get();
         if (academicResourceType != null)
-            feedToUpdate.setResourceType(academicResourceType);
-
-        feedToUpdate.setName(res.getName());
+            dataToUpdate.setResourceType(academicResourceType);
 
-        academicResRepository.save(feedToUpdate);
-        return "AcademicResource is updated.";
+        dataToUpdate.setName(res.getName());
+        dataToUpdate.setBody(res.getBody());
 
+        return modelMapper.map(academicResRepository.save(dataToUpdate), AcademicResourceResponse.class);
     }
 
     @Override
-    public String delete(Long fid) {
+    public List<AcademicResourceResponse> delete(Long fid) {
         academicResRepository.deleteById(fid);
-        return "AcademicResource is deleted.";
+
+        List<AcademicResourceResponse> list = new ArrayList<>();
+        academicResRepository.findAll().forEach(feed -> list.add(modelMapper.map(feed, AcademicResourceResponse.class)));
+        return list;
     }
 
     @Override
-    public List<AcademicResourceDto> searchByResourceName(String resname) {
-        List<AcademicResourceDto> result = new ArrayList<>();
+    public List<AcademicResourceResponse> searchByResourceName(String resname) {
+        List<AcademicResourceResponse> result = new ArrayList<>();
         List<AcademicResource> res = academicResRepository.findAcademicResourceByResourceTypeName(resname);
-        res.forEach(ar -> result.add(modelMapper.map(ar, AcademicResourceDto.class)));
+        res.forEach(ar -> result.add(modelMapper.map(ar, AcademicResourceResponse.class)));
         return result;
     }
 }
diff --git a/backend/src/main/java/com/waa/project/service/impl/AcademicResourceTypeServiceImp.java b/backend/src/main/java/com/waa/project/service/impl/AcademicResourceTypeServiceImp.java
index 4f8c2af6..de1cbf1a 100644
--- a/backend/src/main/java/com/waa/project/service/impl/AcademicResourceTypeServiceImp.java
+++ b/backend/src/main/java/com/waa/project/service/impl/AcademicResourceTypeServiceImp.java
@@ -1,6 +1,8 @@
 package com.waa.project.service.impl;
 
 import com.waa.project.dto.AcademicResourceTypeDto;
+import com.waa.project.dto.requests.AcademicResourceTypeRequest;
+import com.waa.project.dto.responses.AcademicResourceTypeResponse;
 import com.waa.project.entity.AcademicResourceType;
 import com.waa.project.repository.AcademicResTypeRepository;
 import com.waa.project.service.AcademicResourceTypeService;
@@ -36,25 +38,26 @@ public AcademicResourceTypeDto getAcademicResourceType(Long id) {
     }
 
     @Override
-    public String save(AcademicResourceTypeDto dto) {
-        academicResTypeRepository.save(modelMapper.map(dto, AcademicResourceType.class));
-        return "AcademicResourceType saved successfully.";
+    public AcademicResourceTypeResponse save(AcademicResourceTypeRequest request) {
+        AcademicResourceType academicResourceType = modelMapper.map(request, AcademicResourceType.class);
+        academicResTypeRepository.save(academicResourceType);
+        return modelMapper.map(academicResourceType, AcademicResourceTypeResponse.class);
     }
 
     @Override
-    public String update(AcademicResourceTypeDto dto, Long fid) {
+    public AcademicResourceTypeResponse update(AcademicResourceTypeRequest request, Long fid) {
         AcademicResourceType dataToUpdate = academicResTypeRepository.findById(fid)
-                                                                     .orElseThrow(
-                                                                             () -> new NoSuchElementException(
-                                                                                     "No feedback was found."));
-        dataToUpdate.setName(dto.getName());
+                .orElseThrow(
+                        () -> new NoSuchElementException(
+                                "No feedback was found."));
+        dataToUpdate.setName(request.getName());
         academicResTypeRepository.save(dataToUpdate);
-        return "AcademicResourceType is updated.";
+        return modelMapper.map(academicResTypeRepository.findAll(), AcademicResourceTypeResponse.class);
     }
 
     @Override
-    public String delete(Long fid) {
+    public List<AcademicResourceType> delete(Long fid) {
         academicResTypeRepository.deleteById(fid);
-        return "AcademicResourceType is deleted.";
+        return academicResTypeRepository.findAll();
     }
 }
diff --git a/backend/src/main/java/com/waa/project/service/impl/DiscussionCommentsServiceImpl.java b/backend/src/main/java/com/waa/project/service/impl/DiscussionCommentsServiceImpl.java
index 77bf8074..0211e8b5 100644
--- a/backend/src/main/java/com/waa/project/service/impl/DiscussionCommentsServiceImpl.java
+++ b/backend/src/main/java/com/waa/project/service/impl/DiscussionCommentsServiceImpl.java
@@ -3,7 +3,6 @@
 import com.waa.project.dto.DiscussionCommentsDto;
 import com.waa.project.entity.Discussion;
 import com.waa.project.entity.DiscussionComments;
-import com.waa.project.exception.ResourceNotFoundException;
 import com.waa.project.repository.DiscussionCommentsRepository;
 import com.waa.project.repository.DiscussionRepository;
 import com.waa.project.security.contract.AuthUserResponse;
@@ -17,8 +16,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @Service
 public class DiscussionCommentsServiceImpl implements DiscussionCommentsService {
 
@@ -46,8 +43,8 @@ public DiscussionCommentsDto createDiscussionComments(DiscussionCommentsDto comm
         requestData.setStudent(getUserId(user));
 
         Discussion discussion = discusRepository.findById(commentsDto.getDiscussionId())
-                                                .orElseThrow(() -> new ResourceNotFoundException(
-                                                        "Cannot Searchable for that Discussion"));
+                                                .orElseThrow(() -> new RuntimeException(
+                                                        "Discussion ID not found"));
         requestData.setDiscussion(discussion);
 
         DiscussionComments responseData = repository.save(requestData);
@@ -60,16 +57,14 @@ public DiscussionCommentsDto updateDiscussionComments(long id, DiscussionComment
         Long userId = getUserId(user);
 
         DiscussionComments dataById = repository.findByIdAndStudentId(id, userId)
-                                                .orElseThrow(
-                                                        () -> new ResourceNotFoundException(
-                                                                "Cannot Searchable for that Discussion"));
+                                                .orElseThrow(() -> new RuntimeException("Discussion ID not found"));
         DiscussionComments requestData = mapper.map(commentsDto, DiscussionComments.class);
         requestData.setStudent(userId);
         requestData.setId(id);
 
         Discussion discussion = discusRepository.findById(commentsDto.getDiscussionId())
-                                                .orElseThrow(() -> new ResourceNotFoundException(
-                                                        "Cannot Searchable for that Discussion"));
+                                                .orElseThrow(() -> new RuntimeException(
+                                                        "Discussion ID not found"));
         requestData.setDiscussion(discussion);
 
         DiscussionComments responseData = repository.save(requestData);
@@ -83,25 +78,13 @@ public DiscussionCommentsDto deleteDiscussionComments(long id, User user) {
         Long userId = getUserId(user);
 
         DiscussionComments dataById = repository.findByIdAndStudentId(id, userId)
-                                                .orElseThrow(
-                                                        () -> new ResourceNotFoundException(
-                                                                "Cannot Searchable for that Comments"));
+                                                .orElseThrow(() -> new RuntimeException("Comment ID not found"));
 
-        repository.deleteAllByParentCommentId(dataById);
         repository.deleteByIdAndStudentId(id, userId);
 
         return mapper.map(dataById, DiscussionCommentsDto.class);
     }
 
-    @Override
-    public void deleteAllCommentsByDiscussionId(Discussion discussion) {
-
-        List<DiscussionComments> comments = repository.findAllByDiscussionId(discussion.getId());
-        List<Long>               ids      = comments.stream().map(c -> c.getId()).toList();
-        repository.deleteAllByParentCommentIds(ids);
-        repository.deleteByDiscussionId(discussion.getId());
-    }
-
     private Long getUserId(User user) {
         AuthUserResponse userData = userService.findByUsername(user.getUsername());
         return userData.getId();
diff --git a/backend/src/main/java/com/waa/project/service/impl/DiscussionServiceImpl.java b/backend/src/main/java/com/waa/project/service/impl/DiscussionServiceImpl.java
index f4503043..a7f81d54 100644
--- a/backend/src/main/java/com/waa/project/service/impl/DiscussionServiceImpl.java
+++ b/backend/src/main/java/com/waa/project/service/impl/DiscussionServiceImpl.java
@@ -3,11 +3,9 @@
 import com.waa.project.dto.DiscussionDto;
 import com.waa.project.entity.Discussion;
 import com.waa.project.entity.DiscussionCategory;
-import com.waa.project.exception.ResourceNotFoundException;
 import com.waa.project.repository.DiscussionCategoryRepository;
 import com.waa.project.repository.DiscussionRepository;
 import com.waa.project.security.contract.AuthUserResponse;
-import com.waa.project.service.DiscussionCommentsService;
 import com.waa.project.service.DiscussionService;
 import com.waa.project.service.UserService;
 import org.modelmapper.ModelMapper;
@@ -33,9 +31,6 @@ public class DiscussionServiceImpl implements DiscussionService {
     @Autowired
     private DiscussionCategoryRepository discussionCategoryRepository;
 
-    @Autowired
-    private DiscussionCommentsService commentsService;
-
 
     @Override
     public Page<DiscussionDto> getDiscussions(Pageable pageable, User user) {
@@ -48,7 +43,7 @@ public Page<DiscussionDto> getDiscussions(Pageable pageable, User user) {
     public DiscussionDto getDiscussionById(long id, User user) {
         AuthUserResponse userData = userService.findByUsername(user.getUsername());
         Discussion discussion = repository.findByIdAndStudentId(id, userData.getId())
-                                          .orElseThrow(() -> new ResourceNotFoundException(
+                                          .orElseThrow(() -> new RuntimeException(
                                                   "Discussion not found"));
 
         return mapper.map(discussion, DiscussionDto.class);
@@ -62,8 +57,8 @@ public DiscussionDto createDiscussion(DiscussionDto discussionDto, User user) {
         requestData.setStudent(userData.getId());
 
         DiscussionCategory category = discussionCategoryRepository.findById(discussionDto.getCategory_id())
-                                                                  .orElseThrow(() -> new ResourceNotFoundException(
-                                                                          "Cannot Searchable for chose Category!"));
+                                                                  .orElseThrow(() -> new RuntimeException(
+                                                                          "Category not found"));
         requestData.setCategory(category);
 
         Discussion discussion = repository.save(requestData);
@@ -75,16 +70,15 @@ public DiscussionDto updateDiscussion(long id, DiscussionDto discussionDto, User
 
         AuthUserResponse userData = userService.findByUsername(user.getUsername());
         Discussion dataById = repository.findByIdAndStudentId(id, userData.getId())
-                                        .orElseThrow(() -> new ResourceNotFoundException("Cannot Searchable for that " +
-                                                                                         "Discussion"));
+                                        .orElseThrow(() -> new RuntimeException("Discussion not found"));
 
         Discussion requestData = mapper.map(discussionDto, Discussion.class);
         requestData.setStudent(userData.getId());
         requestData.setId(id);
 
         DiscussionCategory category = discussionCategoryRepository.findById(discussionDto.getCategory_id())
-                                                                  .orElseThrow(() -> new ResourceNotFoundException(
-                                                                          "Cannot Searchable for the chose Category!"));
+                                                                  .orElseThrow(() -> new RuntimeException(
+                                                                          "Category not found"));
         requestData.setCategory(category);
 
         Discussion discussion = repository.save(requestData);
@@ -96,22 +90,10 @@ public DiscussionDto updateDiscussion(long id, DiscussionDto discussionDto, User
     public DiscussionDto deleteDiscussion(long id, User user) {
         AuthUserResponse userData = userService.findByUsername(user.getUsername());
         Discussion discussion = repository.findByIdAndStudentId(id, userData.getId())
-                                          .orElseThrow(() -> new ResourceNotFoundException(
-                                                  "Cannot Searchable for that Discussion!"));
-
-        commentsService.deleteAllCommentsByDiscussionId(discussion);
+                                          .orElseThrow(() -> new RuntimeException(
+                                                  "Discussion not found"));
         repository.deleteByIdAndStudentId(id, userData.getId());
 
         return mapper.map(discussion, DiscussionDto.class);
     }
-
-    @Override
-    public DiscussionDto searching(String text) {
-        System.out.println("Text:" + text);
-        Discussion discussion = repository.findAllByTitleContainingIgnoreCaseOrBodyContainingIgnoreCase(text, text)
-                                          .orElseThrow(() -> new ResourceNotFoundException(
-                                                  "Data Not found"));
-        System.out.println("Output:" + discussion);
-        return mapper.map(discussion, DiscussionDto.class);
-    }
 }
diff --git a/backend/src/main/java/com/waa/project/service/impl/FeebackCategoryServiceImp.java b/backend/src/main/java/com/waa/project/service/impl/FeebackCategoryServiceImp.java
index af1be3b4..959a01bc 100644
--- a/backend/src/main/java/com/waa/project/service/impl/FeebackCategoryServiceImp.java
+++ b/backend/src/main/java/com/waa/project/service/impl/FeebackCategoryServiceImp.java
@@ -1,7 +1,10 @@
 package com.waa.project.service.impl;
 
 import com.waa.project.dto.FeedbackCategoryDto;
+import com.waa.project.dto.requests.FeedbackCategoryRequest;
+import com.waa.project.dto.responses.FeedbackCategoryResponse;
 import com.waa.project.entity.FeedbackCategory;
+import com.waa.project.exception.ResourceNotFoundException;
 import com.waa.project.repository.FeedbackCategoryRepository;
 import com.waa.project.service.FeedbackCategoryService;
 import org.modelmapper.ModelMapper;
@@ -32,22 +35,26 @@ public List<FeedbackCategoryDto> getAllCategories() {
 
     @Override
     public FeedbackCategoryDto getCategory(Long feedId) {
-
+        feedbackCategoryRepository.findById(feedId).orElseThrow(
+                () -> new ResourceNotFoundException("Feedback category not found with id: " + feedId)
+        );
         return modelMapper.map(feedbackCategoryRepository.findById(feedId).get(), FeedbackCategoryDto.class);
     }
 
     @Override
-    public String save(FeedbackCategoryDto feedback) {
-        feedbackCategoryRepository.save(modelMapper.map(feedback, FeedbackCategory.class));
-        return "FeedbackCategory saved successfully.";
+    public FeedbackCategoryResponse save(FeedbackCategoryRequest category) {
+        FeedbackCategory feedbackCategory = modelMapper.map(category, FeedbackCategory.class);
+        feedbackCategoryRepository.save(feedbackCategory);
+
+        return modelMapper.map(feedbackCategory, FeedbackCategoryResponse.class);
     }
 
     @Override
     public String update(FeedbackCategoryDto feedback, Long fid) {
         FeedbackCategory feedToUpdate = feedbackCategoryRepository.findById(fid)
-                                                                  .orElseThrow(
-                                                                          () -> new NoSuchElementException(
-                                                                                  "No feedback was found."));
+                .orElseThrow(
+                        () -> new NoSuchElementException(
+                                "No feedback was found."));
         feedToUpdate.setName(feedback.getName());
         feedToUpdate.setDescription(feedback.getDescription());
         feedbackCategoryRepository.save(feedToUpdate);
@@ -55,8 +62,11 @@ public String update(FeedbackCategoryDto feedback, Long fid) {
     }
 
     @Override
-    public String delete(Long fid) {
+    public List<FeedbackCategory> delete(Long fid) {
+        feedbackCategoryRepository.findById(fid).orElseThrow(
+                () -> new ResourceNotFoundException("Feedback category not found with id: " + fid)
+        );
         feedbackCategoryRepository.deleteById(fid);
-        return "FeedbackCategory is deleted.";
+        return feedbackCategoryRepository.findAll();
     }
 }
diff --git a/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java b/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
index b977f16f..0ea13f93 100644
--- a/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
+++ b/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
@@ -1,9 +1,10 @@
 package com.waa.project.service.impl;
 
 import com.waa.project.dto.FeedbackDto;
+import com.waa.project.dto.requests.FeedbackRequest;
+import com.waa.project.dto.responses.FeedbackResponse;
 import com.waa.project.entity.Feedback;
 import com.waa.project.entity.FeedbackCategory;
-import com.waa.project.entity.Student;
 import com.waa.project.entity.User;
 import com.waa.project.repository.FeedbackCategoryRepository;
 import com.waa.project.repository.FeedbackRepository;
@@ -36,10 +37,8 @@ public class FeebackServiceImp implements FeedbackService {
     private UserRepository userRepository;
 
     @Override
-    public List<FeedbackDto> getAllFeedbacks() {
-        List<FeedbackDto> list = new ArrayList<>();
-        feedbackRepository.findAll().forEach(feed -> list.add(modelMapper.map(feed, FeedbackDto.class)));
-        return list;
+    public List<Feedback> getAllFeedbacks() {
+        return feedbackRepository.findAll();
     }
 
     @Override
@@ -49,67 +48,56 @@ public FeedbackDto getFeedback(Long feedId) {
     }
 
     @Override
-    public String save(FeedbackDto dto, Long userId) {
-        Feedback feedbackToSave = modelMapper.map(dto, Feedback.class);
-
+    public FeedbackResponse save(FeedbackRequest feedbackRequest, Long userId) {
+        Feedback feedbackToSave = modelMapper.map(feedbackRequest, Feedback.class);
         FeedbackCategory feedbackCategory =
-                feedbackCategoryRepository.findById(dto.getFeedbackCategory().getId()).get();
+                feedbackCategoryRepository.findById(feedbackRequest.getFeedbackCategory()).get();
         feedbackToSave.setCategory(feedbackCategory);
 
         if (userId != null) {
             User user = userRepository.findById(userId).get();
-            if (!user.getRoleType().equals("ADMIN")) {
-                Student student = studentRepository.findById(userId).get();
-                feedbackToSave.setStudent(student);
-            }
+//            if (!user.getRoleType().equals("ADMIN")) {
+//                Student student = studentRepository.findById(userId).get();
+//                feedbackToSave.setStudent(student);
+//            }
         }
-
         feedbackRepository.save(feedbackToSave);
-        return "Feedback saved successfully.";
+
+        return modelMapper.map(feedbackToSave, FeedbackResponse.class);
     }
 
     @Override
-    public String update(FeedbackDto feedback, Long fid, Long userId) {
+    public FeedbackResponse update(FeedbackRequest feedbackRequest, Long fid, Long userId) {
         Feedback feedToUpdate = feedbackRepository.findById(fid).orElse(null);
-        if (feedToUpdate == null) {
-            return "Feedback not found.";
-        }
 
-        if (userId != null) {
-            User user = userRepository.findById(userId).orElse(null);
-            if (user == null) {
-                return "Anonymous Feedback cannot be updated.";
-            }
-
-            var result = feedToUpdate.getStudent();
-            if (result != null) {
-                System.out.println("role ===" + user.getRoleType());
-                System.out.println("stud Id ===" + result.getId() + " ===" + userId);
-                Long studentId = result.getId();
-
-                if (userId.equals(studentId)) {
-                    Student student = studentRepository.findById(userId).orElse(null);
-                    if (student == null) {
-                        return "Student not found.";
-                    }
-
-                    feedToUpdate.setStudent(student);
-                    feedToUpdate.setTitle(feedback.getTitle());
-                    feedToUpdate.setBody(feedback.getBody());
-                    feedbackRepository.save(feedToUpdate);
-                    return "Feedback is updated.";
-                }
-            } else {
-                return "Anonymous Feedback cannot be updated.";
-            }
-        }
-        return "You cannot update other's Feedback.";
+        modelMapper.map(feedbackRequest, feedToUpdate);
+        System.out.println("feedToUpdate=" + feedToUpdate);
+//        if (userId != null) {
+//            User user = userRepository.findById(userId).orElse(null);
+//            var result = feedToUpdate.getStudent();
+//            if (result != null) {
+//                Long studentId = result.getId();
+//                if (userId.equals(studentId)) {
+//                    Student student = studentRepository.findById(userId).orElse(null);
+//                    feedToUpdate.setStudent(student);
+//                }
+//            }
+//        }
+        FeedbackCategory feedbackCategory = feedbackCategoryRepository.findById(feedbackRequest.getFeedbackCategory()).get();
+        System.out.println(feedbackCategory);
+
+        feedToUpdate.setCategory(feedbackCategory);
+        feedToUpdate.setTitle(feedbackRequest.getTitle());
+        feedToUpdate.setBody(feedbackRequest.getBody());
+        feedbackRepository.save(feedToUpdate);
+
+        return modelMapper.map(feedToUpdate, FeedbackResponse.class);
     }
 
     @Override
-    public String delete(Long fid) {
+    public List<Feedback> delete(Long fid) {
         feedbackRepository.deleteById(fid);
-        return "Feedback is deleted.";
+        return feedbackRepository.findAll();
     }
 
     @Override
diff --git a/backend/src/main/java/com/waa/project/service/impl/SubCommentServiceImpl.java b/backend/src/main/java/com/waa/project/service/impl/SubCommentServiceImpl.java
index a4514f40..c0c4b741 100644
--- a/backend/src/main/java/com/waa/project/service/impl/SubCommentServiceImpl.java
+++ b/backend/src/main/java/com/waa/project/service/impl/SubCommentServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.waa.project.dto.DiscussionCommentsDto;
 import com.waa.project.entity.DiscussionComments;
-import com.waa.project.exception.ResourceNotFoundException;
 import com.waa.project.repository.DiscussionCommentsRepository;
 import com.waa.project.repository.DiscussionRepository;
 import com.waa.project.security.contract.AuthUserResponse;
@@ -43,8 +42,8 @@ public DiscussionCommentsDto createSubDiscussionComments(DiscussionCommentsDto c
         requestData.setStudent(getUserId(user));
 
         DiscussionComments parentComment = repository.findById(commentsDto.getParentCommentIdId())
-                                                     .orElseThrow(() -> new ResourceNotFoundException(
-                                                             "Cannot Searchable for that Comment!"));
+                                                     .orElseThrow(() -> new RuntimeException(
+                                                             "Comment ID not found"));
 
         requestData.setParentCommentId(parentComment);
 
@@ -61,8 +60,8 @@ public DiscussionCommentsDto updateSubDiscussionComments(long id, DiscussionComm
         requestData.setId(id);
 
         DiscussionComments parentComment = repository.findByIdAndStudentId(id, userId)
-                                                     .orElseThrow(() -> new ResourceNotFoundException(
-                                                             "Cannot Searchable for that Comment!"));
+                                                     .orElseThrow(() -> new RuntimeException(
+                                                             "Comment ID not found"));
         requestData.setParentCommentId(parentComment.getParentCommentId());
 
         DiscussionComments responseData = repository.save(requestData);
@@ -76,8 +75,7 @@ public DiscussionCommentsDto deleteSubDiscussionComments(long id, User user) {
         Long userId = getUserId(user);
 
         DiscussionComments dataById = repository.findByIdAndStudentId(id, userId)
-                                                .orElseThrow(() -> new ResourceNotFoundException(
-                                                        "Cannot Searchable for that Comment!"));
+                                                .orElseThrow(() -> new RuntimeException("Comment ID not found"));
 
         repository.deleteByIdAndStudentId(id, userId);
 
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 762467bf..7a21ff62 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -3,11 +3,11 @@ spring:
     name: project
     jwt:
       secret: secretsecretsecretsecretsecretsss
-      expiration: 3600
-      refreshExpiration: 36000
+      expiration: 360000
+      refreshExpiration: 3600000
 
   datasource:
-    url: jdbc:mysql://localhost:3306/waa-demo
+    url: jdbc:mysql://localhost:3306/waa_student_connect
     username: root
     password: Root@123
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -16,7 +16,7 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.MySQLDialect
-        format_sql: true
+    #        format_sql: true
     hibernate:
       ddl-auto: create-drop
     show-sql: true
@@ -35,3 +35,7 @@ spring:
   web:
     resources:
       static-locations: file:${user.dir}
+
+  spring:
+    mvc:
+      static-path-pattern: /swagger-ui/**
\ No newline at end of file
diff --git a/backend/src/main/resources/data.sql b/backend/src/main/resources/data.sql
index 408fe553..d71c26f0 100644
--- a/backend/src/main/resources/data.sql
+++ b/backend/src/main/resources/data.sql
@@ -60,5 +60,11 @@ INSERT INTO courses (name, code, major_id) VALUES
 ('Taxation', 'MBA102', 2);
 
 -- temp
-insert into academic_resource_types(id, name)
-values (1, "Study Guide");
\ No newline at end of file
+insert into academic_resource_types(id, name) values
+(1, "Study Guide Book"),
+(2, "Study Materials Link"),
+(3, "Study Journal Articles"),
+(4, "Study Videos Link");
+
+
+       ;
diff --git a/backend/src/test/java/com/waa/project/ProjectApplicationTests.java b/backend/src/test/java/com/waa/project/ProjectApplicationTests.java
index 28bb549b..d92d23e7 100644
--- a/backend/src/test/java/com/waa/project/ProjectApplicationTests.java
+++ b/backend/src/test/java/com/waa/project/ProjectApplicationTests.java
@@ -6,8 +6,9 @@
 @SpringBootTest
 class ProjectApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
+    @Test
+    void contextLoads() {
 
+
+    }
 }
diff --git a/frontend/src/core/component/dialogs/input/Input.jsx b/frontend/src/core/component/dialogs/input/Input.jsx
new file mode 100644
index 00000000..d89682ee
--- /dev/null
+++ b/frontend/src/core/component/dialogs/input/Input.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import {Form} from 'react-bootstrap';
+
+const InputField = ({
+  controlId,
+  label,
+  type = 'text',
+  placeholder,
+  name,
+  value,
+  onChange,
+  isInvalid,
+  errors,
+  classStyle,
+  children // to render options for select elements
+}) => (
+  <Form.Group controlId={controlId}>
+    <Form.Label className={classStyle}>{label}</Form.Label>
+    <Form.Control
+      type={type}
+      placeholder={placeholder}
+      name={name}
+      value={value}
+      onChange={onChange}
+      isInvalid={isInvalid}
+      className={classStyle}
+    >
+      {children}
+    </Form.Control>
+    <Form.Control.Feedback type="invalid">{errors}</Form.Control.Feedback>
+  </Form.Group>
+);
+
+export default InputField;
diff --git a/frontend/src/core/component/dialogs/select/Select.jsx b/frontend/src/core/component/dialogs/select/Select.jsx
new file mode 100644
index 00000000..78899bc3
--- /dev/null
+++ b/frontend/src/core/component/dialogs/select/Select.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import {Form} from 'react-bootstrap';
+
+const SelectField = ({
+  controlId,
+  label,
+  name,
+  value,
+  onChange,
+  isInvalid,
+  errors,
+  children // to render options for select elements
+}) => (
+  <Form.Group controlId={controlId}>
+    <Form.Label>{label}</Form.Label>
+    <Form.Control as="select" name={name} value={value} onChange={onChange} isInvalid={isInvalid} errors={errors}>
+      {children}
+    </Form.Control>
+    <Form.Control.Feedback type="invalid">{errors}</Form.Control.Feedback>
+  </Form.Group>
+);
+
+export default SelectField;
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
index aaeb2828..9c79854e 100644
--- a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
@@ -4,12 +4,19 @@ import {getAllApi, saveApi, updateApi} from '../../service/apiAcademicResourceTy
 import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import AcademicResourceTypeList from './AcademicResourceTypeList';
 import AcademicResourceTypeModal from './AcademicResourceTypeModal';
+import {State} from '../../core/constants';
 
 const AcademicResourceType = () => {
   const [resourceTypeForm, setResourceTypeForm] = useState(initialForm);
   const [resourceTypesList, setResourceTypesList] = useState([]);
   const [refresh, setRefresh] = useState(false);
 
+  const [resourceTypeState, setResourceTypeState] = useState({
+    status: State.IDLE,
+    error: null,
+    errors: {}
+  });
+
   useEffect(() => {
     fetchAcademicResourceTypes();
   }, [refresh]);
@@ -35,18 +42,53 @@ const AcademicResourceType = () => {
   };
   const handleShow = () => setShow(true);
 
-  const handleSave = async event => {
-    event.preventDefault();
+  const handleSave = async () => {
     try {
-      resourceTypeForm.id > 0 ? await updateApi(resourceTypeForm) : await saveApi(resourceTypeForm);
+      setResourceTypeState({errors: {}, error: null, status: State.IDLE});
+
+      const res = resourceTypeForm.id > 0 ? await updateApi(resourceTypeForm) : await saveApi(resourceTypeForm);
       setRefresh(!refresh);
-    } catch (error) {
-      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+      resetForm();
+      setShow(false);
+      // Handle the response
+      if (res.status === 201) {
+        setResourceTypeState({...resourceTypeState, status: State.SUCCEEDED});
+      } else if (res.status === 400) {
+        setResourceTypeState({
+          status: State.FAILED,
+          error: res.data.message || 'Something went wrong. Please try again later.'
+        });
+      }
+    } catch (err) {
+      // Handle errors
+      if (err.response && err.response.status === 400) {
+        setResourceTypeState({
+          status: State.FAILED,
+          error: null,
+          errors: err.response.data
+        });
+      } else {
+        setResourceTypeState({
+          status: State.FAILED,
+          errors: {},
+          error: 'Something went wrong. Please try again later.'
+        });
+      }
     }
-    resetForm();
-    setShow(false);
   };
 
+  // const handleSave = async event => {
+  //   event.preventDefault();
+  //   try {
+  //     resourceTypeForm.id > 0 ? await updateApi(resourceTypeForm) : await saveApi(resourceTypeForm);
+  //     setRefresh(!refresh);
+  //   } catch (error) {
+  //     <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+  //   }
+  //   resetForm();
+  //   setShow(false);
+  // };
+
   const handleChange = event => {
     const {name, value} = event.target;
 
@@ -69,6 +111,7 @@ const AcademicResourceType = () => {
         title="Academic Resource Category"
         resourceTypeForm={resourceTypeForm}
         handleChange={handleChange}
+        resourceTypeState={resourceTypeState}
       />
 
       <AcademicResourceTypeList
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
index 952bfa37..fa2b1c87 100644
--- a/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceTypeList.jsx
@@ -1,6 +1,7 @@
 import React, {useState} from 'react';
 import {deleteApi} from '../../service/apiAcademicResourceTypes';
 import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
+import TableComponent from '../../core/component/dialogs/table/TableComponent';
 
 const AcademicResourceTypeList = ({resourceTypesList, setResourceTypeForm, setResourceTypesList, setShow}) => {
   const [showDialog, setShowDialog] = useState(false);
@@ -41,41 +42,32 @@ const AcademicResourceTypeList = ({resourceTypesList, setResourceTypeForm, setRe
     setShowDialog(true); // Show the confirmation dialog
   };
 
+  const headers = ['SlNo', 'Name'];
+
+  const formattedData = resourceTypesList.map((item, index) => ({
+    SlNo: index + 1,
+    Name: item.name,
+    id: item.id
+  }));
+
   return (
     <div className="container">
-      <table className="table">
-        <thead>
-          <tr>
-            <th scope="col">#</th>
-            <th scope="col">Name</th>
-            <th scope="col">Description</th>
-            <th scope="col"></th>
-            <th scope="col"></th>
-          </tr>
-        </thead>
-        <tbody>
-          {resourceTypesList.map((data, index) => (
-            <tr key={data.id}>
-              <td>{index + 1}</td>
-              <td>{data.name}</td>
-              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
-                Edit
-              </td>
-              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
-                Delete
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
+      <div>
+        <TableComponent
+          headers={headers}
+          data={formattedData}
+          editHandler={editHandler}
+          deleteHandler={deleteHandler}
+        />
 
-      <ConfirmationDialog
-        show={showDialog}
-        handleClose={handleCloseDialog}
-        handleConfirm={handleConfirmDelete}
-        title="Confirm Delete"
-        body="Are you sure you want to delete this item?"
-      />
+        <ConfirmationDialog
+          show={showDialog}
+          handleClose={handleCloseDialog}
+          handleConfirm={handleConfirmDelete}
+          title="Confirm Delete"
+          body="Are you sure you want to delete this item?"
+        />
+      </div>
     </div>
   );
 };
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx
index e6c01b12..d40511a0 100644
--- a/frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceTypeModal.jsx
@@ -1,9 +1,18 @@
 import React from 'react';
 import {Modal, Button} from 'react-bootstrap';
+import InputField from '../../core/component/dialogs/input/Input';
 
-const AcademicResourceTypeModal = ({show, handleClose, handleSave, title, handleChange, resourceTypeForm}) => {
+const AcademicResourceTypeModal = ({
+  show,
+  handleClose,
+  handleSave,
+  title,
+  handleChange,
+  resourceTypeForm,
+  resourceTypeState
+}) => {
   return (
-    <Modal show={show} onHide={handleClose}>
+    <Modal show={show} onHide={handleClose} backdrop="static">
       <Modal.Header className="bg-info">
         <Modal.Title>
           {resourceTypeForm.id > 0 ? 'Edit ' : 'Add '}
@@ -11,20 +20,17 @@ const AcademicResourceTypeModal = ({show, handleClose, handleSave, title, handle
         </Modal.Title>
       </Modal.Header>
       <Modal.Body>
-        <div className="mb-3 text-start fw-bold">
-          <label htmlFor="name" className="form-label">
-            Category Name
-          </label>
-          <input
-            type="text"
-            className="form-control"
-            name="name"
-            value={resourceTypeForm.name}
-            onChange={handleChange}
-            placeholder="Enter Category"
-            required
-          />
-        </div>
+        <InputField
+          type="text"
+          label="Category Name"
+          placeholder="Enter Category"
+          name="name"
+          value={resourceTypeForm.name}
+          onChange={handleChange}
+          isInvalid={!!resourceTypeState.errors.name}
+          errors={resourceTypeState.errors.name}
+          classStyle="mb-2"
+        />
       </Modal.Body>
 
       <Modal.Footer className="bg-light">
diff --git a/frontend/src/features/academicResources/AcademicResource.jsx b/frontend/src/features/academicResources/AcademicResource.jsx
index 83a2ef62..c5a08f09 100644
--- a/frontend/src/features/academicResources/AcademicResource.jsx
+++ b/frontend/src/features/academicResources/AcademicResource.jsx
@@ -4,6 +4,7 @@ import {getAllApi, getAllCategoriesApi, saveApi, updateApi} from '../../service/
 import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import AcademicResourceModal from './AcademicResourceModal';
 import AcademicResourceList from './AcademicResourceList';
+import {State} from '../../core/constants';
 
 const AcademicResource = () => {
   const [academicResForm, setAcademicResForm] = useState(initialForm);
@@ -11,6 +12,12 @@ const AcademicResource = () => {
   const [resCategory, setResCategory] = useState([]);
   const [refresh, setRefresh] = useState(false);
 
+  const [academicResState, setAcademicResState] = useState({
+    status: State.IDLE,
+    error: null,
+    errors: {}
+  });
+
   useEffect(() => {
     fetchAcademicResource();
     fetchAllCategories();
@@ -48,16 +55,40 @@ const AcademicResource = () => {
 
   const handleShow = () => setShow(true);
 
-  const handleSave = async event => {
-    event.preventDefault();
+  const handleSave = async () => {
+    console.log(academicResForm);
     try {
-      academicResForm.id > 0 ? await updateApi(academicResForm) : await saveApi(academicResForm);
+      setAcademicResState({errors: {}, error: null, status: State.IDLE});
+
+      const res = academicResForm.id > 0 ? await updateApi(academicResForm) : await saveApi(academicResForm);
       setRefresh(!refresh);
-    } catch (error) {
-      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+      resetForm();
+      setShow(false);
+      // Handle the response
+      if (res.status === 201) {
+        setAcademicResState({...academicResState, status: State.SUCCEEDED});
+      } else if (res.status === 400) {
+        setAcademicResState({
+          status: State.FAILED,
+          error: res.data.message || 'Something went wrong. Please try again later.'
+        });
+      }
+    } catch (err) {
+      // Handle errors
+      if (err.response && err.response.status === 400) {
+        setAcademicResState({
+          status: State.FAILED,
+          error: null,
+          errors: err.response.data
+        });
+      } else {
+        setAcademicResState({
+          status: State.FAILED,
+          errors: {},
+          error: 'Something went wrong. Please try again later.'
+        });
+      }
     }
-    resetForm();
-    setShow(false);
   };
 
   const handleChange = event => {
@@ -90,6 +121,7 @@ const AcademicResource = () => {
         academicResForm={academicResForm}
         allCategories={resCategory}
         handleChange={handleChange}
+        academicResState={academicResState}
       />
 
       <AcademicResourceList
diff --git a/frontend/src/features/academicResources/AcademicResourceList.jsx b/frontend/src/features/academicResources/AcademicResourceList.jsx
index d900c5e2..a12a184e 100644
--- a/frontend/src/features/academicResources/AcademicResourceList.jsx
+++ b/frontend/src/features/academicResources/AcademicResourceList.jsx
@@ -1,6 +1,7 @@
 import React, {useState} from 'react';
 import {deleteApi} from '../../service/apiAcademicResource';
 import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
+import TableComponent from '../../core/component/dialogs/table/TableComponent';
 
 const AcademicResourceList = ({academicResourceList, setAcademicResourceList, setAcademicResForm, setShow}) => {
   const [showDialog, setShowDialog] = useState(false);
@@ -10,12 +11,13 @@ const AcademicResourceList = ({academicResourceList, setAcademicResourceList, se
     if (id) {
       setShow(true);
       const result = academicResourceList.find(cat => cat.id === id);
+      console.log(result);
       if (result) {
         setAcademicResForm({
           id: result.id,
           name: result.name,
           body: result.body,
-          resourceCategory: result.resourceType ? result.resourceType.id : '',
+          resourceCategory: result.resourceType.id,
           file: null
         });
       }
@@ -37,7 +39,7 @@ const AcademicResourceList = ({academicResourceList, setAcademicResourceList, se
 
   const handleCloseDialog = () => {
     setShowDialog(false);
-    setItemToDelete(null); // Reset the item to delete on dialog close
+    setItemToDelete(null);
   };
 
   const deleteHandler = id => {
@@ -45,44 +47,34 @@ const AcademicResourceList = ({academicResourceList, setAcademicResourceList, se
     setShowDialog(true); // Show the confirmation dialog
   };
 
+  const headers = ['SlNo', 'Name', 'Description', 'Category'];
+
+  const formattedData = academicResourceList.map((item, index) => ({
+    SlNo: index + 1,
+    Name: item.name,
+    Description: item.body,
+    Category: item.resourceType.name,
+    id: item.id
+  }));
+
   return (
-    <div className="container">
-      <table className="table">
-        <thead>
-          <tr>
-            <th scope="col">#</th>
-            <th scope="col">Name</th>
-            <th scope="col">Description</th>
-            <th scope="col">Category</th>
-            <th scope="col"></th>
-            <th scope="col"></th>
-          </tr>
-        </thead>
-        <tbody>
-          {academicResourceList.map((data, index) => (
-            <tr key={data.id}>
-              <td>{index + 1}</td>
-              <td>{data.name}</td>
-              <td>{data.body}</td>
-              <td>{data.resourceType.name}</td>
-              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
-                Edit
-              </td>
-              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
-                Delete
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
+    <div>
+      <div className="container">
+        <TableComponent
+          headers={headers}
+          data={formattedData}
+          editHandler={editHandler}
+          deleteHandler={deleteHandler}
+        />
 
-      <ConfirmationDialog
-        show={showDialog}
-        handleClose={handleCloseDialog}
-        handleConfirm={handleConfirmDelete}
-        title="Confirm Delete"
-        body="Are you sure you want to delete this item?"
-      />
+        <ConfirmationDialog
+          show={showDialog}
+          handleClose={handleCloseDialog}
+          handleConfirm={handleConfirmDelete}
+          title="Confirm Delete"
+          body="Are you sure you want to delete this item?"
+        />
+      </div>
     </div>
   );
 };
diff --git a/frontend/src/features/academicResources/AcademicResourceModal.jsx b/frontend/src/features/academicResources/AcademicResourceModal.jsx
index 1c4c8316..0eb8630f 100644
--- a/frontend/src/features/academicResources/AcademicResourceModal.jsx
+++ b/frontend/src/features/academicResources/AcademicResourceModal.jsx
@@ -1,5 +1,8 @@
 import React from 'react';
 import {Modal, Button} from 'react-bootstrap';
+import InputField from '../../core/component/dialogs/input/Input';
+import SelectField from '../../core/component/dialogs/select/Select';
+import FileUploadField from '../../core/component/dialogs/fileupload/FileUploadField';
 
 const AcademicResourceModal = ({
   show,
@@ -8,10 +11,11 @@ const AcademicResourceModal = ({
   title,
   handleChange,
   allCategories,
-  academicResForm
+  academicResForm,
+  academicResState
 }) => {
   return (
-    <Modal show={show} onHide={handleClose}>
+    <Modal show={show} onHide={handleClose} backdrop="static">
       <Modal.Header className="bg-info">
         <Modal.Title>
           {academicResForm.id > 0 ? 'Edit ' : 'Add '}
@@ -19,63 +23,56 @@ const AcademicResourceModal = ({
         </Modal.Title>
       </Modal.Header>
       <Modal.Body>
-        <div className="mb-3 text-start fw-bold">
-          <label htmlFor="title" className="form-label">
-            Name
-          </label>
-          <input
-            type="text"
-            className="form-control"
-            name="name"
-            value={academicResForm.name}
-            onChange={handleChange}
-            placeholder="Enter Name"
-            required
-          />
-        </div>
+        <InputField
+          type="text"
+          label="Category Name"
+          placeholder="Enter Name"
+          name="name"
+          value={academicResForm.name}
+          onChange={handleChange}
+          isInvalid={!!academicResState.errors.name}
+          errors={academicResState.errors.name}
+          classStyle="mb-2"
+        />
 
-        <div className="mb-3 text-start fw-bold">
-          <label htmlFor="body" className="form-label">
-            Description
-          </label>
-          <textarea
-            type="text"
-            className="form-control"
-            name="body"
-            value={academicResForm.body}
-            onChange={handleChange}
-            placeholder="Enter Description"
-            required
-          />
-        </div>
+        <InputField
+          type="text"
+          label="Description"
+          placeholder="Enter Description"
+          name="body"
+          value={academicResForm.body}
+          onChange={handleChange}
+          isInvalid={!!academicResState.errors.body}
+          errors={academicResState.errors.body}
+          classStyle="mb-2"
+        />
 
-        <div className="mb-3 text-start fw-bold">
-          <label htmlFor="resourceCategory" className="col-form-label">
-            Resource Category
-          </label>
-          <select
-            className="form-control"
-            name="resourceCategory"
-            onChange={handleChange}
-            value={academicResForm.resourceCategory}
-            required
-          >
-            <option value="">Select</option>
-            {allCategories.map(cat => (
-              <option key={cat.id} value={cat.id}>
-                {cat.name}
-              </option>
-            ))}
-          </select>
-        </div>
+        <SelectField
+          label="Resource Category"
+          name="resourceCategory"
+          value={academicResForm.resourceCategory}
+          onChange={handleChange}
+          isInvalid={!!academicResState.errors.resourceCategory}
+          errors={academicResState.errors.resourceCategory}
+          classStyle="mb-2"
+        >
+          <option value="">Select</option>
+          {allCategories.map(cat => (
+            <option key={cat.id} value={cat.id}>
+              {cat.name}
+            </option>
+          ))}
+        </SelectField>
 
-        <div className="mb-5 text-start fw-bold">
-          <label htmlFor="file" className="form-label">
-            File
-          </label>
-
-          <input type="file" className="form-control" name="file" onChange={handleChange} />
-        </div>
+        <FileUploadField
+          label="File"
+          name="file"
+          value={academicResForm.file}
+          onChange={handleChange}
+          isInvalid={!!academicResState.errors.file}
+          errors={academicResState.errors.file}
+          classStyle="mb-2"
+        />
       </Modal.Body>
 
       <Modal.Footer className="bg-light">
diff --git a/frontend/src/features/authentication/register/Register.jsx b/frontend/src/features/authentication/register/Register.jsx
index abc99f5b..81850a5a 100644
--- a/frontend/src/features/authentication/register/Register.jsx
+++ b/frontend/src/features/authentication/register/Register.jsx
@@ -105,6 +105,7 @@ const Register = () => {
               />
               <Form.Control.Feedback type="invalid">{registerState.errors.username}</Form.Control.Feedback>
             </Form.Group>
+
             <Form.Group controlId="formPassword">
               <Form.Label>Password</Form.Label>
               <Form.Control
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
index 0575d401..e59135f2 100644
--- a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
+++ b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
@@ -4,12 +4,18 @@ import {getAllApi, saveApi, updateApi} from '../../service/apiFeedbackCategory';
 import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import FeedbaclCategoryList from './FeedbackCategoryList';
 import FeedbackCategoryModal from './FeedbackCategoryModal';
+import {State} from '../../core/constants';
+import axios from 'axios';
 
 const FeedbackCategory = () => {
   const [feedbackCategoryForm, setFeedbackCategoryForm] = useState(initialForm);
   const [feedbackCategorysList, setFeedbackCategorysList] = useState([]);
-
   const [refresh, setRefresh] = useState(false);
+  const [feedbackCategoryState, setFeedbackCategoryState] = useState({
+    status: State.IDLE,
+    error: null,
+    errors: {}
+  });
 
   useEffect(() => {
     fetchFeedbackCategorys();
@@ -26,6 +32,7 @@ const FeedbackCategory = () => {
 
   const resetForm = () => {
     setFeedbackCategoryForm(initialForm);
+    setFeedbackCategoryState({errors: {}, error: null, status: State.IDLE});
   };
 
   const [show, setShow] = useState(false);
@@ -36,17 +43,40 @@ const FeedbackCategory = () => {
   };
   const handleShow = () => setShow(true);
 
-  const handleSave = async event => {
-    console.log(feedbackCategoryForm);
-    event.preventDefault();
+  const handleSave = async () => {
     try {
-      feedbackCategoryForm.id > 0 ? await updateApi(feedbackCategoryForm) : await saveApi(feedbackCategoryForm);
-      setRefresh(!refresh);
-    } catch (error) {
-      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+      setFeedbackCategoryState({errors: {}, error: null, status: State.IDLE});
+
+      const res = await axios.post('/admins/feedbackcategories', feedbackCategoryForm);
+
+      // Handle the response
+      if (res.status === 201) {
+        setFeedbackCategoryState({...feedbackCategoryState, status: State.SUCCEEDED});
+        setRefresh(!refresh);
+        resetForm();
+        setShow(false);
+      } else if (res.status === 400) {
+        setFeedbackCategoryState({
+          status: State.FAILED,
+          error: res.data.message || 'Something went wrong. Please try again later.'
+        });
+      }
+    } catch (err) {
+      // Handle errors
+      if (err.response && err.response.status === 400) {
+        setFeedbackCategoryState({
+          status: State.FAILED,
+          error: null,
+          errors: err.response.data
+        });
+      } else {
+        setFeedbackCategoryState({
+          status: State.FAILED,
+          errors: {},
+          error: 'Something went wrong. Please try again later.'
+        });
+      }
     }
-    resetForm();
-    setShow(false);
   };
 
   const handleChange = event => {
@@ -70,6 +100,7 @@ const FeedbackCategory = () => {
         handleSave={handleSave}
         title="Feedback Category"
         feedbackCategoryForm={feedbackCategoryForm}
+        feedbackCategoryState={feedbackCategoryState}
         handleChange={handleChange}
       />
 
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx b/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
index 72e03ce3..3839ec32 100644
--- a/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
+++ b/frontend/src/features/feedbackCategories/FeedbackCategoryList.jsx
@@ -1,6 +1,7 @@
 import React, {useState} from 'react';
 import {deleteApi} from '../../service/apiFeedbackCategory';
 import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
+import TableComponent from '../../core/component/dialogs/table/TableComponent';
 
 const FeedbaclCategoryList = ({feedbackCategorysList, setFeedbackCategoryForm, setFeedbackCategorysList, setShow}) => {
   const [showDialog, setShowDialog] = useState(false);
@@ -43,42 +44,33 @@ const FeedbaclCategoryList = ({feedbackCategorysList, setFeedbackCategoryForm, s
     setShowDialog(true); // Show the confirmation dialog
   };
 
+  const headers = ['SlNo', 'Name', 'Description'];
+
+  const formattedData = feedbackCategorysList.map((item, index) => ({
+    SlNo: index + 1,
+    Name: item.name,
+    Description: item.description,
+    id: item.id
+  }));
+
   return (
     <div className="container">
-      <table className="table">
-        <thead>
-          <tr>
-            <th scope="col">#</th>
-            <th scope="col">Name</th>
-            <th scope="col">Description</th>
-            <th scope="col"></th>
-            <th scope="col"></th>
-          </tr>
-        </thead>
-        <tbody>
-          {feedbackCategorysList.map((data, index) => (
-            <tr key={data.id}>
-              <td>{index + 1}</td>
-              <td>{data.name}</td>
-              <td>{data.description}</td>
-              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
-                Edit
-              </td>
-              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
-                Delete
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
+      <div>
+        <TableComponent
+          headers={headers}
+          data={formattedData}
+          editHandler={editHandler}
+          deleteHandler={deleteHandler}
+        />
 
-      <ConfirmationDialog
-        show={showDialog}
-        handleClose={handleCloseDialog}
-        handleConfirm={handleConfirmDelete}
-        title="Confirm Delete"
-        body="Are you sure you want to delete this item?"
-      />
+        <ConfirmationDialog
+          show={showDialog}
+          handleClose={handleCloseDialog}
+          handleConfirm={handleConfirmDelete}
+          title="Confirm Delete"
+          body="Are you sure you want to delete this item?"
+        />
+      </div>
     </div>
   );
 };
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx b/frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx
index 8e26ab3b..81009576 100644
--- a/frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx
+++ b/frontend/src/features/feedbackCategories/FeedbackCategoryModal.jsx
@@ -1,9 +1,18 @@
 import React from 'react';
-import {Modal, Button} from 'react-bootstrap';
+import {Modal, Button, Form} from 'react-bootstrap';
+import InputField from '../../core/component/dialogs/input/Input';
 
-const FeedbackCategoryModal = ({show, handleClose, handleSave, title, handleChange, feedbackCategoryForm}) => {
+const FeedbackCategoryModal = ({
+  show,
+  handleClose,
+  handleSave,
+  title,
+  handleChange,
+  feedbackCategoryForm,
+  feedbackCategoryState
+}) => {
   return (
-    <Modal show={show} onHide={handleClose}>
+    <Modal show={show} onHide={handleClose} backdrop="static">
       <Modal.Header className="bg-info">
         <Modal.Title>
           {feedbackCategoryForm.id > 0 ? 'Edit ' : 'Add '}
@@ -11,35 +20,29 @@ const FeedbackCategoryModal = ({show, handleClose, handleSave, title, handleChan
         </Modal.Title>
       </Modal.Header>
       <Modal.Body>
-        <div className="mb-3 text-start fw-bold">
-          <label htmlFor="name" className="form-label">
-            Category Name
-          </label>
-          <input
-            type="text"
-            className="form-control"
-            name="name"
-            value={feedbackCategoryForm.name}
-            onChange={handleChange}
-            placeholder="Enter Category"
-            required
-          />
-        </div>
+        <InputField
+          type="text"
+          label="Category Name"
+          placeholder="Enter Category"
+          name="name"
+          value={feedbackCategoryForm.name}
+          onChange={handleChange}
+          isInvalid={!!feedbackCategoryState.errors.name}
+          errors={feedbackCategoryState.errors.name}
+          classStyle="mb-2"
+        />
 
-        <div className="mb-5 text-start fw-bold">
-          <label htmlFor="description" className="col-form-label">
-            Description
-          </label>
-          <textarea
-            type="text"
-            className="form-control"
-            name="description"
-            value={feedbackCategoryForm.description}
-            onChange={handleChange}
-            placeholder="Enter description"
-            required
-          />
-        </div>
+        <InputField
+          type="text"
+          label="Description"
+          placeholder="Enter Description"
+          name="description"
+          value={feedbackCategoryForm.description}
+          onChange={handleChange}
+          isInvalid={!!feedbackCategoryState.errors.description}
+          errors={feedbackCategoryState.errors.description}
+          classStyle="mb-2"
+        />
       </Modal.Body>
 
       <Modal.Footer className="bg-light">
diff --git a/frontend/src/features/feedbacks/Feedback.jsx b/frontend/src/features/feedbacks/Feedback.jsx
index 0871a22d..9f7c9c02 100644
--- a/frontend/src/features/feedbacks/Feedback.jsx
+++ b/frontend/src/features/feedbacks/Feedback.jsx
@@ -4,12 +4,19 @@ import {getAllApi, getAllCategoriesApi, saveApi, updateApi} from '../../service/
 import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import FeedbackModal from './FeedbackModal';
 import FeedbackList from './FeedbackList';
+import {State} from '../../core/constants';
+import axios from 'axios';
 
 const Feedback = () => {
   const [feedbackForm, setFeedbackForm] = useState(initialForm);
   const [feedbacksList, setFeedbacksList] = useState([]);
   const [feedbackCategory, setFeedbackCategory] = useState([]);
   const [refresh, setRefresh] = useState(false);
+  const [feedbackState, setFeedbackState] = useState({
+    status: State.IDLE,
+    error: null,
+    errors: {}
+  });
 
   useEffect(() => {
     fetchFeedbacks();
@@ -38,6 +45,7 @@ const Feedback = () => {
 
   const resetForm = () => {
     setFeedbackForm(initialForm);
+    setShow(false);
   };
 
   const [show, setShow] = useState(false);
@@ -49,19 +57,55 @@ const Feedback = () => {
 
   const handleShow = () => setShow(true);
 
-  const handleSave = async event => {
-    event.preventDefault();
+  const handleSave = async () => {
     try {
-      console.log(feedbackForm.id);
-      feedbackForm.id > 0 ? await updateApi(feedbackForm) : await saveApi(feedbackForm);
+      setFeedbackState({errors: {}, error: null, status: State.IDLE});
+
+      // const res = await axios.post('/feedbacks', feedbackForm);
+      const res = feedbackForm.id > 0 ? await updateApi(feedbackForm) : await saveApi(feedbackForm);
       setRefresh(!refresh);
-    } catch (error) {
-      <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+      resetForm();
+      // Handle the response
+      if (res.status === 201) {
+        setFeedbackState({...feedbackState, status: State.SUCCEEDED});
+        setShow(false);
+      } else if (res.status === 400) {
+        setFeedbackState({
+          status: State.FAILED,
+          error: res.data.message || 'Something went wrong. Please try again later.'
+        });
+      }
+    } catch (err) {
+      // Handle errors
+      if (err.response && err.response.status === 400) {
+        setFeedbackState({
+          status: State.FAILED,
+          error: null,
+          errors: err.response.data
+        });
+      } else {
+        setFeedbackState({
+          status: State.FAILED,
+          errors: {},
+          error: 'Something went wrong. Please try again later.'
+        });
+      }
     }
-    resetForm();
-    setShow(false);
   };
 
+  // const handleSave = async event => {
+  //   event.preventDefault();
+  //   try {
+  //     console.log(feedbackForm.id);
+  //     feedbackForm.id > 0 ? await updateApi(feedbackForm) : await saveApi(feedbackForm);
+  //     setRefresh(!refresh);
+  //   } catch (error) {
+  //     <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
+  //   }
+  //   resetForm();
+  //   setShow(false);
+  // };
+
   const handleChange = event => {
     const {name, value} = event.target;
 
@@ -85,6 +129,7 @@ const Feedback = () => {
         feedbackForm={feedbackForm}
         allCategories={feedbackCategory}
         handleChange={handleChange}
+        feedbackState={feedbackState}
       />
 
       <FeedbackList
diff --git a/frontend/src/features/feedbacks/FeedbackList.jsx b/frontend/src/features/feedbacks/FeedbackList.jsx
index f38348f4..fbf84d50 100644
--- a/frontend/src/features/feedbacks/FeedbackList.jsx
+++ b/frontend/src/features/feedbacks/FeedbackList.jsx
@@ -1,6 +1,7 @@
 import React, {useState} from 'react';
 import {deleteApi} from '../../service/apiFeedbackService';
 import ConfirmationDialog from '../../core/component/dialogs/ConfirmationDialog';
+import TableComponent from '../../core/component/dialogs/table/TableComponent';
 
 const FeedbackList = ({feedbacksList, setFeedbacksList, setFeedbackForm, setShow}) => {
   const [showDialog, setShowDialog] = useState(false);
@@ -44,44 +45,34 @@ const FeedbackList = ({feedbacksList, setFeedbacksList, setFeedbackForm, setShow
     setShowDialog(true); // Show the confirmation dialog
   };
 
+  const headers = ['SlNo', 'Title', 'Description', 'Category'];
+
+  const formattedData = feedbacksList.map((item, index) => ({
+    SlNo: index + 1,
+    Title: item.title,
+    Description: item.body,
+    Category: item.category.name,
+    id: item.id
+  }));
+
   return (
     <div className="container">
-      <table className="table">
-        <thead>
-          <tr>
-            <th scope="col">#</th>
-            <th scope="col">Title</th>
-            <th scope="col">Description</th>
-            <th scope="col">Category</th>
-            <th scope="col"></th>
-            <th scope="col"></th>
-          </tr>
-        </thead>
-        <tbody>
-          {feedbacksList.map((data, index) => (
-            <tr key={data.id}>
-              <td>{index + 1}</td>
-              <td>{data.title}</td>
-              <td>{data.body}</td>
-              <td>{data.category.name}</td>
-              <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(data.id)}>
-                Edit
-              </td>
-              <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(data.id)}>
-                Delete
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
+      <div>
+        <TableComponent
+          headers={headers}
+          data={formattedData}
+          editHandler={editHandler}
+          deleteHandler={deleteHandler}
+        />
 
-      <ConfirmationDialog
-        show={showDialog}
-        handleClose={handleCloseDialog}
-        handleConfirm={handleConfirmDelete}
-        title="Confirm Delete"
-        body="Are you sure you want to delete this item?"
-      />
+        <ConfirmationDialog
+          show={showDialog}
+          handleClose={handleCloseDialog}
+          handleConfirm={handleConfirmDelete}
+          title="Confirm Delete"
+          body="Are you sure you want to delete this item?"
+        />
+      </div>
     </div>
   );
 };
diff --git a/frontend/src/features/feedbacks/FeedbackModal.jsx b/frontend/src/features/feedbacks/FeedbackModal.jsx
index ce87d05a..069a6ee2 100644
--- a/frontend/src/features/feedbacks/FeedbackModal.jsx
+++ b/frontend/src/features/feedbacks/FeedbackModal.jsx
@@ -1,9 +1,20 @@
 import React from 'react';
 import {Modal, Button} from 'react-bootstrap';
+import SelectField from '../../core/component/dialogs/select/Select';
+import InputField from '../../core/component/dialogs/input/Input';
 
-const FeedbackModal = ({show, handleClose, handleSave, title, handleChange, allCategories, feedbackForm}) => {
+const FeedbackModal = ({
+  show,
+  handleClose,
+  handleSave,
+  title,
+  handleChange,
+  allCategories,
+  feedbackForm,
+  feedbackState
+}) => {
   return (
-    <Modal show={show} onHide={handleClose}>
+    <Modal show={show} onHide={handleClose} backdrop="static">
       <Modal.Header className="bg-info">
         <Modal.Title>
           {feedbackForm.id > 0 ? 'Edit ' : 'Add '}
@@ -11,55 +22,46 @@ const FeedbackModal = ({show, handleClose, handleSave, title, handleChange, allC
         </Modal.Title>
       </Modal.Header>
       <Modal.Body>
-        <div className="mb-3 text-start fw-bold">
-          <label htmlFor="title" className="form-label">
-            Title
-          </label>
-          <input
-            type="text"
-            className="form-control"
-            name="title"
-            value={feedbackForm.title}
-            onChange={handleChange}
-            placeholder="Enter Title"
-            required
-          />
-        </div>
+        <InputField
+          type="text"
+          label="Title"
+          placeholder="Enter Title"
+          name="title"
+          value={feedbackForm.title}
+          onChange={handleChange}
+          isInvalid={!!feedbackState.errors.title}
+          errors={feedbackState.errors.title}
+          classStyle="mb-2"
+        />
 
-        <div className="mb-3 text-start fw-bold">
-          <label htmlFor="body" className="col-form-label">
-            Description
-          </label>
-          <textarea
-            type="text"
-            className="form-control"
-            name="body"
-            value={feedbackForm.body}
-            onChange={handleChange}
-            placeholder="Enter description"
-            required
-          />
-        </div>
+        <InputField
+          type="text"
+          label="Description"
+          placeholder="Enter Description"
+          name="body"
+          value={feedbackForm.body}
+          onChange={handleChange}
+          isInvalid={!!feedbackState.errors.body}
+          errors={feedbackState.errors.body}
+          classStyle="mb-2"
+        />
 
-        <div className="mb-5 text-start fw-bold">
-          <label htmlFor="feedbackCategory" className="col-form-label">
-            Category
-          </label>
-          <select
-            className="form-control"
-            name="feedbackCategory"
-            onChange={handleChange}
-            value={feedbackForm.feedbackCategory}
-            required
-          >
-            <option value="">Select</option>
-            {allCategories.map(cat => (
-              <option key={cat.id} value={cat.id}>
-                {cat.name}
-              </option>
-            ))}
-          </select>
-        </div>
+        <SelectField
+          label="Feedback Category"
+          name="feedbackCategory"
+          value={feedbackForm.feedbackCategory}
+          onChange={handleChange}
+          isInvalid={!!feedbackState.errors.feedbackCategory}
+          errors={feedbackState.errors.feedbackCategory}
+          classStyle="mb-2"
+        >
+          <option value="">Select</option>
+          {allCategories.map(cat => (
+            <option key={cat.id} value={cat.id}>
+              {cat.name}
+            </option>
+          ))}
+        </SelectField>
       </Modal.Body>
 
       <Modal.Footer className="bg-light">
diff --git a/frontend/src/service/apiAcademicResource.js b/frontend/src/service/apiAcademicResource.js
index b6b1b2c7..45b51ca3 100644
--- a/frontend/src/service/apiAcademicResource.js
+++ b/frontend/src/service/apiAcademicResource.js
@@ -1,17 +1,17 @@
-import axios from "axios";
+import axios from 'axios';
 
-axios.defaults.baseURL = "http://localhost:8080/api/v1";
-const token = localStorage.getItem("token");
+axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+const token = localStorage.getItem('token');
 
-axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
-  const response = await axios.get("/academic");
+  const response = await axios.get('/academic');
   return response.data;
 };
 
 export const getAllCategoriesApi = async () => {
-  const response = await axios.get("/academicresources");
+  const response = await axios.get('/academicresources');
   return response.data;
 };
 
@@ -19,7 +19,7 @@ export const saveApi = async dataForm => {
   const formData = new FormData();
 
   formData.append(
-    "formdata",
+    'formdata',
     new Blob(
       [
         JSON.stringify({
@@ -28,18 +28,18 @@ export const saveApi = async dataForm => {
           resourceId: dataForm.resourceCategory
         })
       ],
-      {type: "application/json"}
+      {type: 'application/json'}
     )
   );
 
   if (dataForm.file) {
-    formData.append("file", dataForm.file);
+    formData.append('file', dataForm.file);
   }
 
   // Ensure no conflicting headers are set
-  const response = await axios.post("/academic", formData, {
+  const response = await axios.post('/academic', formData, {
     headers: {
-      "Content-Type": "multipart/form-data"
+      'Content-Type': 'multipart/form-data'
     }
   });
 
@@ -47,9 +47,11 @@ export const saveApi = async dataForm => {
 };
 
 export const updateApi = async dataForm => {
+  console.log(dataForm);
+
   const formData = new FormData();
   formData.append(
-    "formdata",
+    'formdata',
     new Blob(
       [
         JSON.stringify({
@@ -59,17 +61,17 @@ export const updateApi = async dataForm => {
           resourceId: dataForm.resourceCategory
         })
       ],
-      {type: "application/json"}
+      {type: 'application/json'}
     )
   );
 
   if (dataForm.file) {
-    formData.append("file", dataForm.file);
+    formData.append('file', dataForm.file);
   }
 
-  const response = await axios.put("/academic/" + dataForm.id, formData, {
+  const response = await axios.put('/academic/' + dataForm.id, formData, {
     headers: {
-      "Content-Type": "multipart/form-data"
+      'Content-Type': 'multipart/form-data'
     }
   });
 
@@ -77,6 +79,6 @@ export const updateApi = async dataForm => {
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete("/academic/" + id);
+  const response = await axios.delete('/academic/' + id);
   return response.data;
 };
diff --git a/frontend/src/service/apiFeedbackCategory.js b/frontend/src/service/apiFeedbackCategory.js
index 8f0cee91..25b57cc9 100644
--- a/frontend/src/service/apiFeedbackCategory.js
+++ b/frontend/src/service/apiFeedbackCategory.js
@@ -1,30 +1,26 @@
-import axios from "axios";
+import axios from 'axios';
 
-axios.defaults.baseURL = "http://localhost:8080/api/v1";
-const token = localStorage.getItem("token");
+axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+const token = localStorage.getItem('token');
 
-axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
-  const response = await axios.get("/feedbackcategories");
-  console.log(response);
+  const response = await axios.get('/feedbackcategories');
   return response.data;
 };
 
 export const saveApi = async formdate => {
-  const response = await axios.post("/admins/feedbackcategories", formdate);
+  const response = await axios.post('/admins/feedbackcategories', formdate);
   return response.data;
 };
 
 export const updateApi = async formdate => {
-  const response = await axios.put(
-    "/admins/feedbackcategories/" + formdate.id,
-    formdate
-  );
+  const response = await axios.put('/admins/feedbackcategories/' + formdate.id, formdate);
   return response.data;
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete("/admins/feedbackcategories/" + id);
+  const response = await axios.delete('/admins/feedbackcategories/' + id);
   return response.data;
 };
diff --git a/frontend/src/service/apiFeedbackService.js b/frontend/src/service/apiFeedbackService.js
index db32c440..caaaf6b0 100644
--- a/frontend/src/service/apiFeedbackService.js
+++ b/frontend/src/service/apiFeedbackService.js
@@ -1,17 +1,17 @@
-import axios from "axios";
+import axios from 'axios';
 
-axios.defaults.baseURL = "http://localhost:8080/api/v1";
-const token = localStorage.getItem("token");
+axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+const token = localStorage.getItem('token');
 
-axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
-  const response = await axios.get("/feedbacks");
+  const response = await axios.get('/feedbacks');
   return response.data;
 };
 
 export const getAllCategoriesApi = async () => {
-  const response = await axios.get("/feedbackcategories");
+  const response = await axios.get('/feedbackcategories');
   return response.data;
 };
 
@@ -19,10 +19,9 @@ export const saveApi = async formdate => {
   const postData = {
     title: formdate.title,
     body: formdate.body,
-    category: formdate.feedbackCategory,
-    feedbackCategory: {}
+    feedbackCategory: formdate.feedbackCategory
   };
-  const response = await axios.post("/feedbacks", postData);
+  const response = await axios.post('/feedbacks', postData);
   return response.data;
 };
 
@@ -30,15 +29,13 @@ export const updateApi = async formdate => {
   const postData = {
     title: formdate.title,
     body: formdate.body,
-    feedbackCategory: {
-      id: formdate.feedbackCategory
-    }
+    feedbackCategory: formdate.feedbackCategory
   };
-  const response = await axios.put("/feedbacks/" + formdate.id, postData);
+  const response = await axios.put('/feedbacks/' + formdate.id, postData);
   return response.data;
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete("/feedbacks/" + id);
+  const response = await axios.delete('/feedbacks/' + id);
   return response.data;
 };
diff --git a/frontend/src/types/types.js b/frontend/src/types/types.js
index 53a5fb25..ddeae72f 100644
--- a/frontend/src/types/types.js
+++ b/frontend/src/types/types.js
@@ -1,23 +1,23 @@
 export const initialFeedbackCategoryForm = {
   id: 0,
-  name: "",
-  description: ""
+  name: '',
+  description: ''
 };
 
 export const initialFeedbackForm = {
-  title: "",
-  body: "",
-  feedbackCategory: ""
+  title: '',
+  body: '',
+  feedbackCategory: ''
 };
 
 export const initialAcademicResourceTypeForm = {
-  name: ""
+  name: ''
 };
 
 export const initialAcademicForm = {
   id: 0,
-  name: "",
-  body: "",
+  name: '',
+  body: '',
   file: null,
-  resourceCategory: ""
+  resourceCategory: ''
 };

From 5d43b6b999e6f0f1e30c1c97372cc1bc479e1e29 Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Tue, 16 Jul 2024 22:37:43 -0500
Subject: [PATCH 4/9] Form Validation added

---
 .../dialogs/fileupload/FileUploadField.jsx    | 12 ++++++
 .../dialogs/table/TableComponent.jsx          | 41 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 frontend/src/core/component/dialogs/fileupload/FileUploadField.jsx
 create mode 100644 frontend/src/core/component/dialogs/table/TableComponent.jsx

diff --git a/frontend/src/core/component/dialogs/fileupload/FileUploadField.jsx b/frontend/src/core/component/dialogs/fileupload/FileUploadField.jsx
new file mode 100644
index 00000000..721de51c
--- /dev/null
+++ b/frontend/src/core/component/dialogs/fileupload/FileUploadField.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import {Form} from 'react-bootstrap';
+
+const FileUploadField = ({controlId, label, name, onChange, isInvalid, errors, classStyle}) => (
+  <Form.Group controlId={controlId}>
+    <Form.Label className={classStyle}>{label}</Form.Label>
+    <Form.Control type="file" name={name} onChange={onChange} isInvalid={isInvalid} className={classStyle} />
+    <Form.Control.Feedback type="invalid">{errors}</Form.Control.Feedback>
+  </Form.Group>
+);
+
+export default FileUploadField;
diff --git a/frontend/src/core/component/dialogs/table/TableComponent.jsx b/frontend/src/core/component/dialogs/table/TableComponent.jsx
new file mode 100644
index 00000000..025b81c4
--- /dev/null
+++ b/frontend/src/core/component/dialogs/table/TableComponent.jsx
@@ -0,0 +1,41 @@
+import React from 'react';
+
+const TableComponent = ({headers, data, editHandler, deleteHandler}) => {
+  return (
+    <div>
+      <table className="table">
+        <thead>
+          <tr>
+            {headers.map((header, index) => (
+              <th key={index} scope="col">
+                {header}
+              </th>
+            ))}
+            {(editHandler || deleteHandler) && <th scope="col" colSpan={2}></th>}
+          </tr>
+        </thead>
+        <tbody>
+          {data.map((item, rowIndex) => (
+            <tr key={item.id}>
+              {headers.map((header, colIndex) => (
+                <td key={colIndex}>{item[header]}</td>
+              ))}
+              {editHandler && (
+                <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(item.id)}>
+                  Edit
+                </td>
+              )}
+              {deleteHandler && (
+                <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(item.id)}>
+                  Delete
+                </td>
+              )}
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+export default TableComponent;

From c3628e6e8db243c449db6aa86332465188f52ac5 Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Wed, 17 Jul 2024 10:24:16 -0500
Subject: [PATCH 5/9] Updated UI and added validation

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../dto/requests/AcademicResourceRequest.java |  30 ++++++++++++++++++
 .../requests/AcademicResourceTypeRequest.java |  15 +++++++++
 .../dto/requests/FeedbackCategoryRequest.java |  19 +++++++++++
 .../project/dto/requests/FeedbackRequest.java |  22 +++++++++++++
 .../responses/AcademicResourceResponse.java   |  20 ++++++++++++
 .../AcademicResourceTypeResponse.java         |  18 +++++++++++
 .../responses/FeedbackCategoryResponse.java   |  18 +++++++++++
 .../dto/responses/FeedbackResponse.java       |  18 +++++++++++
 .../service/TokenBlacklistService.java        |   7 ++++
 .../impl/TokenBlacklistServiceImp.java        |  18 +++++++++++
 .../AcademicResourceType.jsx                  |   8 +++++
 .../feedbackCategories/FeedbackCategory.jsx   |   9 ++++++
 frontend/src/features/feedbacks/Feedback.jsx  |   1 -
 frontend/src/service/apiAcademicResource.js   |   8 ++---
 .../src/service/apiAcademicResourceTypes.js   |  23 ++++++--------
 frontend/src/service/apiFeedbackCategory.js   |   8 ++---
 frontend/src/service/apiFeedbackService.js    |   8 ++---
 src/.DS_Store                                 | Bin 6148 -> 0 bytes
 src/main/.DS_Store                            | Bin 6148 -> 0 bytes
 src/main/java/.DS_Store                       | Bin 6148 -> 0 bytes
 src/main/java/com/.DS_Store                   | Bin 6148 -> 0 bytes
 src/main/java/com/waa/.DS_Store               | Bin 6148 -> 0 bytes
 23 files changed, 220 insertions(+), 30 deletions(-)
 create mode 100644 backend/src/main/java/com/waa/project/dto/requests/AcademicResourceRequest.java
 create mode 100644 backend/src/main/java/com/waa/project/dto/requests/AcademicResourceTypeRequest.java
 create mode 100644 backend/src/main/java/com/waa/project/dto/requests/FeedbackCategoryRequest.java
 create mode 100644 backend/src/main/java/com/waa/project/dto/requests/FeedbackRequest.java
 create mode 100644 backend/src/main/java/com/waa/project/dto/responses/AcademicResourceResponse.java
 create mode 100644 backend/src/main/java/com/waa/project/dto/responses/AcademicResourceTypeResponse.java
 create mode 100644 backend/src/main/java/com/waa/project/dto/responses/FeedbackCategoryResponse.java
 create mode 100644 backend/src/main/java/com/waa/project/dto/responses/FeedbackResponse.java
 create mode 100644 backend/src/main/java/com/waa/project/service/TokenBlacklistService.java
 create mode 100644 backend/src/main/java/com/waa/project/service/impl/TokenBlacklistServiceImp.java
 delete mode 100644 src/.DS_Store
 delete mode 100644 src/main/.DS_Store
 delete mode 100644 src/main/java/.DS_Store
 delete mode 100644 src/main/java/com/.DS_Store
 delete mode 100644 src/main/java/com/waa/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index feca8613504bcd7430524202412f605a970dd548..3bd41f5f182c0bf5acbc7fb6f5d9aba7bc36f3b4 100644
GIT binary patch
delta 434
zcmZoMXfc=|#>B)qF;R?_gMop8V`8F+EEA9c0xUqx$iN`Lz>vz2$B^Qglb@WFvoUcw
zV?9WQogs-Kks+BO8(B6#2`B^9z~BhPdjG)y$ih&aR9;+=lmk}1BdH)Kv$({-;2I+n
zGYcylI|n-lH%Dx6Mt*s4Nn%N9u~TAEG>8|HpP!QiX4eBbiAiCZspatkBF_1FC5f4N
zsYPHNnJKA2H8J6tc`5njPWh#IDaByT!4L@!P7cm^0g38rV+#Wv1rt-tS{;RIOCu25
z*sQjelS5Ql-#REhJ0~|UzYFYe21Z~IfB`R*W?%@0u)2X1S}2qS7v<&T=cNN>K-xGM
z(in;u@`0gOf;E)Z1Jyu7X=CDQmdOSpEStH3z6Zw0#>DT;llesySwXR(FxgN<dUJrt
G7G?lMK5TFR

delta 110
zcmZoMXfc=|#>AjHu~68Uk%57MnW31Wh#@(pI5{UNKR*X30s%}=8l(n@1sEXmn-iIr
pv1~42W@g^Z&cV+CGzcj2oq009h$1IQX#z;wWD_3c%`qY?m;rEa6s`aO

diff --git a/backend/src/main/java/com/waa/project/dto/requests/AcademicResourceRequest.java b/backend/src/main/java/com/waa/project/dto/requests/AcademicResourceRequest.java
new file mode 100644
index 00000000..c7bcf2c5
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/requests/AcademicResourceRequest.java
@@ -0,0 +1,30 @@
+package com.waa.project.dto.requests;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.File;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcademicResourceRequest {
+    @NotNull(message = "Name cannot be null.")
+    @NotBlank(message = "Name cannot be blank.")
+    @Size(min = 2, max = 250, message = "Name must be minimum of 2 characters long.")
+    private String name;
+
+    @NotNull(message = "Description cannot be null.")
+    @NotBlank(message = "Description cannot be blank.")
+    @Size(min = 2, max = 250, message = "Description must be minimum of 2 characters long.")
+    private String body;
+
+    private File file;
+
+    @NotNull(message = "Category cannot be empty.")
+    private Long resourceId;
+}
diff --git a/backend/src/main/java/com/waa/project/dto/requests/AcademicResourceTypeRequest.java b/backend/src/main/java/com/waa/project/dto/requests/AcademicResourceTypeRequest.java
new file mode 100644
index 00000000..0a22149a
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/requests/AcademicResourceTypeRequest.java
@@ -0,0 +1,15 @@
+package com.waa.project.dto.requests;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Data
+public class AcademicResourceTypeRequest {
+    @NotNull(message = "Name cannot be null.")
+    @NotBlank(message = "Name cannot be blank.")
+    @Size(min = 2, max = 250, message = "Name must be minimum of 2 characters long.")
+    private String name;
+
+}
diff --git a/backend/src/main/java/com/waa/project/dto/requests/FeedbackCategoryRequest.java b/backend/src/main/java/com/waa/project/dto/requests/FeedbackCategoryRequest.java
new file mode 100644
index 00000000..7f85a037
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/requests/FeedbackCategoryRequest.java
@@ -0,0 +1,19 @@
+package com.waa.project.dto.requests;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Data
+public class FeedbackCategoryRequest {
+    @NotNull(message = "Category name cannot be null.")
+    @NotBlank(message = "Category name cannot be blank.")
+    @Size(min = 2, max = 250, message = "Category name must be minimum of 2 characters long.")
+    private String name;
+
+    @NotNull(message = "Description cannot be null.")
+    @NotBlank(message = "Description cannot be blank.")
+    @Size(min = 2, max = 250, message = "Description must be minimum of 2 characters long.")
+    private String description;
+}
diff --git a/backend/src/main/java/com/waa/project/dto/requests/FeedbackRequest.java b/backend/src/main/java/com/waa/project/dto/requests/FeedbackRequest.java
new file mode 100644
index 00000000..fcb18045
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/requests/FeedbackRequest.java
@@ -0,0 +1,22 @@
+package com.waa.project.dto.requests;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Data
+public class FeedbackRequest {
+    @NotNull(message = "Title cannot be null.")
+    @NotBlank(message = "Title cannot be blank.")
+    @Size(min = 2, max = 250, message = "Title must be minimum of 2 characters long.")
+    private String title;
+
+    @NotNull(message = "Description cannot be null.")
+    @NotBlank(message = "Description cannot be blank.")
+    @Size(min = 2, max = 250, message = "Description must be minimum of 2 characters long.")
+    private String body;
+
+    @NotNull(message = "Category cannot be empty.")
+    private Long feedbackCategory;
+}
diff --git a/backend/src/main/java/com/waa/project/dto/responses/AcademicResourceResponse.java b/backend/src/main/java/com/waa/project/dto/responses/AcademicResourceResponse.java
new file mode 100644
index 00000000..b70d6f99
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/responses/AcademicResourceResponse.java
@@ -0,0 +1,20 @@
+package com.waa.project.dto.responses;
+
+import com.waa.project.entity.AcademicResourceType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.File;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AcademicResourceResponse {
+
+    private Long id;
+    private String name;
+    private String body;
+    private File file;
+    private AcademicResourceType resourceType;
+}
diff --git a/backend/src/main/java/com/waa/project/dto/responses/AcademicResourceTypeResponse.java b/backend/src/main/java/com/waa/project/dto/responses/AcademicResourceTypeResponse.java
new file mode 100644
index 00000000..72fe773c
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/responses/AcademicResourceTypeResponse.java
@@ -0,0 +1,18 @@
+package com.waa.project.dto.responses;
+
+import com.waa.project.entity.AcademicResourceType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AcademicResourceTypeResponse {
+    private Long id;
+    private String name;
+    private List<AcademicResourceType> academicResourceTypeList;
+}
+
diff --git a/backend/src/main/java/com/waa/project/dto/responses/FeedbackCategoryResponse.java b/backend/src/main/java/com/waa/project/dto/responses/FeedbackCategoryResponse.java
new file mode 100644
index 00000000..5a5cbaa3
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/responses/FeedbackCategoryResponse.java
@@ -0,0 +1,18 @@
+package com.waa.project.dto.responses;
+
+import com.waa.project.entity.FeedbackCategory;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeedbackCategoryResponse {
+    private Long id;
+    private String name;
+    private String description;
+    private List<FeedbackCategory> categoryList;
+}
diff --git a/backend/src/main/java/com/waa/project/dto/responses/FeedbackResponse.java b/backend/src/main/java/com/waa/project/dto/responses/FeedbackResponse.java
new file mode 100644
index 00000000..3983f4f6
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/dto/responses/FeedbackResponse.java
@@ -0,0 +1,18 @@
+package com.waa.project.dto.responses;
+
+import com.waa.project.entity.FeedbackCategory;
+import com.waa.project.entity.Student;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FeedbackResponse {
+    private Long id;
+    private String title;
+    private String body;
+    private FeedbackCategory feedbackCategory;
+    private Student student;
+}
diff --git a/backend/src/main/java/com/waa/project/service/TokenBlacklistService.java b/backend/src/main/java/com/waa/project/service/TokenBlacklistService.java
new file mode 100644
index 00000000..930fd668
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/service/TokenBlacklistService.java
@@ -0,0 +1,7 @@
+package com.waa.project.service;
+
+public interface TokenBlacklistService {
+    void addTokenToBlacklist(String token);
+
+    boolean isTokenBlacklisted(String token);
+}
diff --git a/backend/src/main/java/com/waa/project/service/impl/TokenBlacklistServiceImp.java b/backend/src/main/java/com/waa/project/service/impl/TokenBlacklistServiceImp.java
new file mode 100644
index 00000000..a36e3c2c
--- /dev/null
+++ b/backend/src/main/java/com/waa/project/service/impl/TokenBlacklistServiceImp.java
@@ -0,0 +1,18 @@
+package com.waa.project.service.impl;
+
+import com.waa.project.service.TokenBlacklistService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TokenBlacklistServiceImp implements TokenBlacklistService {
+
+    @Override
+    public void addTokenToBlacklist(String token) {
+
+    }
+
+    @Override
+    public boolean isTokenBlacklisted(String token) {
+        return false;
+    }
+}
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
index 9c79854e..6811fe93 100644
--- a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
@@ -5,6 +5,8 @@ import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import AcademicResourceTypeList from './AcademicResourceTypeList';
 import AcademicResourceTypeModal from './AcademicResourceTypeModal';
 import {State} from '../../core/constants';
+import {useNavigate} from 'react-router';
+import getCurrentProfile from '../../core/utils/current-profile';
 
 const AcademicResourceType = () => {
   const [resourceTypeForm, setResourceTypeForm] = useState(initialForm);
@@ -17,7 +19,13 @@ const AcademicResourceType = () => {
     errors: {}
   });
 
+  const profile = getCurrentProfile();
+  const navigate = useNavigate();
+
   useEffect(() => {
+    if (profile === null || profile === undefined) {
+      navigate('/login');
+    }
     fetchAcademicResourceTypes();
   }, [refresh]);
 
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
index e59135f2..daa1baff 100644
--- a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
+++ b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
@@ -6,6 +6,8 @@ import FeedbaclCategoryList from './FeedbackCategoryList';
 import FeedbackCategoryModal from './FeedbackCategoryModal';
 import {State} from '../../core/constants';
 import axios from 'axios';
+import {useNavigate} from 'react-router';
+import getCurrentProfile from '../../core/utils/current-profile';
 
 const FeedbackCategory = () => {
   const [feedbackCategoryForm, setFeedbackCategoryForm] = useState(initialForm);
@@ -17,7 +19,14 @@ const FeedbackCategory = () => {
     errors: {}
   });
 
+  const profile = getCurrentProfile();
+  const navigate = useNavigate();
+
   useEffect(() => {
+    if (profile === null || profile === undefined) {
+      navigate('/login');
+    }
+
     fetchFeedbackCategorys();
   }, [refresh]);
 
diff --git a/frontend/src/features/feedbacks/Feedback.jsx b/frontend/src/features/feedbacks/Feedback.jsx
index 9f7c9c02..9ea986d1 100644
--- a/frontend/src/features/feedbacks/Feedback.jsx
+++ b/frontend/src/features/feedbacks/Feedback.jsx
@@ -5,7 +5,6 @@ import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import FeedbackModal from './FeedbackModal';
 import FeedbackList from './FeedbackList';
 import {State} from '../../core/constants';
-import axios from 'axios';
 
 const Feedback = () => {
   const [feedbackForm, setFeedbackForm] = useState(initialForm);
diff --git a/frontend/src/service/apiAcademicResource.js b/frontend/src/service/apiAcademicResource.js
index 45b51ca3..c7d77b81 100644
--- a/frontend/src/service/apiAcademicResource.js
+++ b/frontend/src/service/apiAcademicResource.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-
-axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-const token = localStorage.getItem('token');
-
-axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
+// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+// const token = localStorage.getItem('token');
+// axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
   const response = await axios.get('/academic');
diff --git a/frontend/src/service/apiAcademicResourceTypes.js b/frontend/src/service/apiAcademicResourceTypes.js
index 6a597ef5..e1e2b580 100644
--- a/frontend/src/service/apiAcademicResourceTypes.js
+++ b/frontend/src/service/apiAcademicResourceTypes.js
@@ -1,34 +1,29 @@
-import axios from "axios";
-
-axios.defaults.baseURL = "http://localhost:8080/api/v1";
-const token = localStorage.getItem("token");
-
-axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+import axios from 'axios';
+// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+// const token = localStorage.getItem("token");
+// axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
-  const response = await axios.get("/academicresources");
+  const response = await axios.get('/academicresources');
   return response.data;
 };
 
 export const getAllCategoriesApi = async () => {
-  const response = await axios.get("/feedbackcategories");
+  const response = await axios.get('/feedbackcategories');
   return response.data;
 };
 
 export const saveApi = async formdate => {
-  const response = await axios.post("/academicresources", formdate);
+  const response = await axios.post('/academicresources', formdate);
   return response.data;
 };
 
 export const updateApi = async formdate => {
-  const response = await axios.put(
-    "/academicresources/" + formdate.id,
-    formdate
-  );
+  const response = await axios.put('/academicresources/' + formdate.id, formdate);
   return response.data;
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete("/academicresources/" + id);
+  const response = await axios.delete('/academicresources/' + id);
   return response.data;
 };
diff --git a/frontend/src/service/apiFeedbackCategory.js b/frontend/src/service/apiFeedbackCategory.js
index 25b57cc9..319b1752 100644
--- a/frontend/src/service/apiFeedbackCategory.js
+++ b/frontend/src/service/apiFeedbackCategory.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-
-axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-const token = localStorage.getItem('token');
-
-axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
+// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+// const token = localStorage.getItem('token');
+// axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
   const response = await axios.get('/feedbackcategories');
diff --git a/frontend/src/service/apiFeedbackService.js b/frontend/src/service/apiFeedbackService.js
index caaaf6b0..9d8f98f5 100644
--- a/frontend/src/service/apiFeedbackService.js
+++ b/frontend/src/service/apiFeedbackService.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-
-axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-const token = localStorage.getItem('token');
-
-axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
+// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+// const token = localStorage.getItem('token');
+// axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
   const response = await axios.get('/feedbacks');
diff --git a/src/.DS_Store b/src/.DS_Store
deleted file mode 100644
index 7b0d36729e2ee777a660f9e8c6709dd97bc2fb68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~F>V4u3`M`g7D#EfOgRk)$PGpaPQV2S&>%r5BKkQx-ySzvsH0W%E!l7ES!;KH
zv9ktX>-*^w7y&HlPOLmk%$N_j;tOYdpMH*)!|itQBJHgMp3+B5_H$d10#ZN<NC7Dz
z1!kl`9^=dR89kF8MG8oPc_`rDheCJOWb2Gi2Sbbi<iK(m*D*_w#S3IjwoX=PmeYe}
ztHl`N^=KzcURRT?v$w-?_^`aQ`4mI5-VQ5FXjTIXQa}n!6j=0p^z(m9e>MM4T9irw
zDe%t}uwk>?toc%Twm!X{*Y{cVb)%DUIm54?049DEf6&9YUwlE<Wb0&wrXPWjK|u=q
GsR9o}DiW#y

diff --git a/src/main/.DS_Store b/src/main/.DS_Store
deleted file mode 100644
index 5ddc54c0b0a5c61f749a35677d4fec0a87b20577..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ5B>Z41I<zf@o4w&K0=9C<-Uw0)&JHMOuj{)LU^bj>hw+$ZCa@h6X)Lo@aaP
z8SN|9V*s`}A0B}<fECpdU%o8G_gxoqQxQk=GY+Ty@pT-JbgmVz9q^7FKC!#3zrzRK
zaKeZ)t-afq+t;42JTV{!#DEwO17cv#K(*=B{X8sB42S_S;BR^~s$(yl664pwB}M?^
zz;Fodm?enK1H@i9B{D*>EG1^C)retP&UmZ5UN|LYIV^7GId!wugko_!<1Nx*JyEL|
z5Cd}tZqr?R|9_(XGXKwu<cR?>@UIxKVf(z@@RO>yE<VnCZKJ+WJ?ES1LOV*hL^~!%
iJEr69_#u)quer_rUN|L2Ipa}I)MLPTk%)o6X5a^X=Nl6M

diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
deleted file mode 100644
index 35a54bf0595027f28217af82c3d32981e121b5e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mVP>H1@V-^m;4I%_5-~tF3K^+i#j?VMXLSaS~dY0@jc51bKLsN^0
z?w;4J$RHv;+$b9h6I0}!Tx68{^>MkK$MI$*w?)zl@IfZ~xlK?3DnJFO02QDDGg2TA
z@_sd=XX2w!0V*&L1?>A!;KrJ4LH~3h_y_<lQFg=HX9=)a0j$XuL<OeN3P!8?7-DsA
z2TNX8lPwtSqB(qM-dSymfoZgh79=pO4hAYf1ttn~kq>tMAK>5S|49o|DnJGPOaWc)
zkNX{7D$mxB*R%R5tF~@%&@V@L`w2i|NAVi&hW%m-uqIm&6&Qa6Tm}Xz@KXg|*oF~o

diff --git a/src/main/java/com/.DS_Store b/src/main/java/com/.DS_Store
deleted file mode 100644
index f7b5831a746ae1f6e41638fdbfad0bb42e2bf825..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~I}XA?3`A{0fkcy%avKi74OR$Fzy<h~NGTAa-J>)9Gz4lCp|NDYwKrChDYCJM
z==O2li1Z?|fE#6PVPuNDlc${IbiH40=V7>6$!(Uj0=$>eer^*~fC^9nDnJFOz=RaY
zgM6`^&@=H-r~nn1h646|C~#v<wxEAH5PSpx=P0{j?Xv_}tN_+z3!(zkXa%EHeGIX>
zw}U0GtH~COcF`O@H1Di7#lSS$MGF#`RtEzWpaLTWy2yJw|M&23^Z%%YDHWgsf2M%W
zcZb~;FO_HO$Lm@Bm{nUhIOvxny!`|qv7>kecf)?M1z3|Uhzg890xkms75J$FFG=7L
AW&i*H

diff --git a/src/main/java/com/waa/.DS_Store b/src/main/java/com/waa/.DS_Store
deleted file mode 100644
index 2e271e5bb8cd09e8c9a11ee66c847acc5a55ad81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyJ`bL3>+nf7~Hr_xxbJ<Sd8-p{(%tNO)y-@qrWQOl~2p)L5MlKGHJ{Rq}kPJ
zZrLeLCjhqk+&utG0CTz{zC29LpSw@&rZPsP^BsF^@v(c~9-fCu_34Cj@9>H@40!p=
z9}cGp%1Qw#AO)m=6p#WJDd4@AHeVzvN&zV#1%4Iq??a<I_QEkSJ{=4(0uX0RhjAUV
z1hIL7*bB!*W@wgFVp6R}3`;umt?GK=n3!}}4Ifq~TTLhyr}O<S%3(cGQ3^<bV+C$=
zyY&A5NIx_GACt6`0#e|r6tLNPvtIE^)mtZ*^IqHNPjs*Orn_++6ozQW#AwIdcsst2
cqO5Da=JQ@SCI+4PpcC~o;JV19z<(?712F0pkpKVy


From 72646c34c8977955221d81ce91a5ca02d0d9b057 Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Wed, 17 Jul 2024 19:00:09 -0500
Subject: [PATCH 6/9] Form Validation added

---
 .../project/aop/FeedbackHandlerAspect.java    |  4 +-
 .../feedback/FeedbackController.java          | 18 ----
 .../java/com/waa/project/entity/Feedback.java | 10 +++
 .../service/impl/FeebackServiceImp.java       |  9 +-
 frontend/public/index.html                    |  2 +
 frontend/src/App.css                          | 43 +++-------
 frontend/src/App.js                           | 40 ++++++---
 .../dialogs/table/TableComponent.jsx          | 29 ++++---
 frontend/src/core/setup/axios.js              |  2 +
 .../AcademicResourceType.jsx                  | 22 ++---
 frontend/src/features/dashboard/Dashboard.jsx |  3 +-
 .../features/dashboard/dashboard-student.jsx  |  4 -
 .../feedbackCategories/FeedbackCategory.jsx   | 19 +++--
 frontend/src/features/feedbacks/Feedback.jsx  | 16 +---
 .../src/features/feedbacks/FeedbackList.jsx   | 11 ++-
 frontend/src/layout/Dashboard.css             | 19 +++++
 frontend/src/layout/Dashboard.jsx             | 64 +++++++++++++++
 frontend/src/layout/Header.css                | 31 +++++++
 frontend/src/layout/Header.jsx                | 41 ++++++++++
 frontend/src/layout/Sidear.jsx                | 82 +++++++++++++++++++
 frontend/src/layout/Sidebar.css               | 48 +++++++++++
 frontend/src/service/apiAcademicResource.js   |  3 -
 .../src/service/apiAcademicResourceTypes.js   |  3 -
 frontend/src/service/apiFeedbackCategory.js   |  3 -
 frontend/src/service/apiFeedbackService.js    |  3 -
 25 files changed, 393 insertions(+), 136 deletions(-)
 create mode 100644 frontend/src/layout/Dashboard.css
 create mode 100644 frontend/src/layout/Dashboard.jsx
 create mode 100644 frontend/src/layout/Header.css
 create mode 100644 frontend/src/layout/Header.jsx
 create mode 100644 frontend/src/layout/Sidear.jsx
 create mode 100644 frontend/src/layout/Sidebar.css

diff --git a/backend/src/main/java/com/waa/project/aop/FeedbackHandlerAspect.java b/backend/src/main/java/com/waa/project/aop/FeedbackHandlerAspect.java
index 03a751f1..680aeb59 100644
--- a/backend/src/main/java/com/waa/project/aop/FeedbackHandlerAspect.java
+++ b/backend/src/main/java/com/waa/project/aop/FeedbackHandlerAspect.java
@@ -12,12 +12,12 @@ public class FeedbackHandlerAspect {
 
     @Before("execution(* com.waa.project.controller.feedback.FeedbackController.*(..))")
     public void beforeMe(JoinPoint joinPoint) {
-        System.out.println("Execution Before JoingPoint == " + joinPoint.getSignature().getName());
+        //System.out.println("Execution Before JoingPoint == " + joinPoint.getSignature().getName());
     }
 
     @After("execution(* com.waa.project.controller.feedback.FeedbackController.*(..))")
     public void afterMe(JoinPoint joinPoint) {
-        System.out.println("Execution After JoingPoint == " + joinPoint.getSignature().getName());
+       // System.out.println("Execution After JoingPoint == " + joinPoint.getSignature().getName());
     }
 
 }
diff --git a/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java b/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java
index 05662971..509d5d83 100644
--- a/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java
+++ b/backend/src/main/java/com/waa/project/controller/feedback/FeedbackController.java
@@ -58,22 +58,6 @@ public List<FeedbackDto> findWithTitle(@PathVariable String title, @PathVariable
     public List<FeedbackDto> getFeedByCategory(@PathVariable Long Id) {
         return feedbackService.findFeedbackByCategory(Id);
     }
-//
-//    @PutMapping({"/feedbacks/{Id}"})//, "/students/feedbacks/{Id}"})
-//    public List<Feedback> update(
-//            @Valid @RequestBody FeedbackRequest feedbackRequest,
-//            @PathVariable Long Id,
-//            @AuthenticationPrincipal UserDetails userDetails
-//    ) {
-//        Long currentUser = null;
-//
-//        if (userDetails != null && userDetails.getUsername() != null) {
-//            currentUser = userService.findByUsername(userDetails.getUsername()).getId();
-//        }
-//
-//        return feedbackService.update(feedbackRequest, Id, currentUser);
-//    }
-
 
     @PutMapping({"/feedbacks/{Id}"})//, "/students/feedbacks/{Id}"})
     public ResponseEntity<FeedbackResponse> update(
@@ -81,8 +65,6 @@ public ResponseEntity<FeedbackResponse> update(
             @PathVariable Long Id,
             @AuthenticationPrincipal UserDetails userDetails
     ) {
-        System.out.println(feedbackRequest);
-        System.out.println(Id);
 
         Long currentUser = null;
 
diff --git a/backend/src/main/java/com/waa/project/entity/Feedback.java b/backend/src/main/java/com/waa/project/entity/Feedback.java
index 83ca3b8d..2ede06e0 100644
--- a/backend/src/main/java/com/waa/project/entity/Feedback.java
+++ b/backend/src/main/java/com/waa/project/entity/Feedback.java
@@ -3,6 +3,8 @@
 import jakarta.persistence.*;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Entity
 @Data
 @Table(name = "feedbacks")
@@ -24,4 +26,12 @@ public class Feedback {
     @ManyToOne
     @JoinColumn(name = "student_id", nullable = true)
     private Student student;
+
+    @Column(name = "posted_date", nullable = false, updatable = false)
+    private LocalDateTime postedDate;
+
+    @PrePersist
+    protected void onCreate() {
+        postedDate = LocalDateTime.now();
+    }
 }
diff --git a/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java b/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
index 0ea13f93..7f37057a 100644
--- a/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
+++ b/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
@@ -5,6 +5,7 @@
 import com.waa.project.dto.responses.FeedbackResponse;
 import com.waa.project.entity.Feedback;
 import com.waa.project.entity.FeedbackCategory;
+import com.waa.project.entity.Student;
 import com.waa.project.entity.User;
 import com.waa.project.repository.FeedbackCategoryRepository;
 import com.waa.project.repository.FeedbackRepository;
@@ -56,10 +57,10 @@ public FeedbackResponse save(FeedbackRequest feedbackRequest, Long userId) {
 
         if (userId != null) {
             User user = userRepository.findById(userId).get();
-//            if (!user.getRoleType().equals("ADMIN")) {
-//                Student student = studentRepository.findById(userId).get();
-//                feedbackToSave.setStudent(student);
-//            }
+            if (!user.getRoleType().equals("ADMIN")) {
+                Student student = studentRepository.findById(userId).get();
+                feedbackToSave.setStudent(student);
+            }
         }
         feedbackRepository.save(feedbackToSave);
 
diff --git a/frontend/public/index.html b/frontend/public/index.html
index 524664d0..ff597c5b 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -7,6 +7,8 @@
     <meta content="#000000" name="theme-color" />
     <meta content="Web site created using create-react-app" name="description" />
     <link href="%PUBLIC_URL%/logo192.png" rel="apple-touch-icon" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
diff --git a/frontend/src/App.css b/frontend/src/App.css
index 74b5e053..212e7882 100644
--- a/frontend/src/App.css
+++ b/frontend/src/App.css
@@ -1,38 +1,21 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
 
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
+.app {
   display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
 }
 
-.App-link {
-  color: #61dafb;
+.content {
+  margin-left: 250px;
+  width: 100%;
 }
 
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
+@media (max-width: 768px) {
+  .content {
+    margin-left: 0;
   }
 }
+
+.main-content {
+  margin-top: 56px;
+  /* Height of the header */
+  padding: 20px;
+}
\ No newline at end of file
diff --git a/frontend/src/App.js b/frontend/src/App.js
index c41eb9a8..c299b3e4 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -1,6 +1,7 @@
 import './App.css';
-import Dashboard from './features/dashboard/Dashboard';
-import {Route, Routes} from 'react-router';
+// import Dashboard from './features/dashboard/Dashboard';
+
+import {Route, Router, Routes} from 'react-router';
 import Login from './features/authentication/login/Login';
 import Register from './features/authentication/register/Register';
 import Students from './features/students/Students';
@@ -8,20 +9,33 @@ import FeedbackCategory from './features/feedbackCategories/FeedbackCategory';
 import Feedback from './features/feedbacks/Feedback';
 import AcademicResourceType from './features/academicResourceTypes/AcademicResourceType';
 import AcademicResource from './features/academicResources/AcademicResource';
+import Sidebar from './layout/Sidear';
+import Dashboard from './layout/Dashboard';
+import Header from './layout/Header';
+import getCurrentProfile from './core/utils/current-profile';
 
 function App() {
-  return (
-    <Routes>
-      <Route path="/" element={<Dashboard />} />
-      <Route path="/login" element={<Login />} />
-      <Route path="/register" element={<Register />} />
-      <Route path="/students" element={<Students />} />
+  const profile = getCurrentProfile();
 
-      <Route path="/feedback-categories" element={<FeedbackCategory />} />
-      <Route path="/feedbacks" element={<Feedback />} />
-      <Route path="/academic-resouce-type" element={<AcademicResourceType />} />
-      <Route path="/academic-resouces" element={<AcademicResource />} />
-    </Routes>
+  return (
+    <div className="app">
+      <Sidebar profile={profile} />
+      <div className="content">
+        <Header profile={profile} />
+        <div className="main-content">
+          <Routes>
+            <Route path="/" element={<Dashboard />} />
+            <Route path="/login" element={<Login />} />
+            <Route path="/register" element={<Register />} />
+            <Route path="/students" element={<Students />} />
+            <Route path="/feedback-categories" element={<FeedbackCategory />} />
+            <Route path="/feedbacks" element={<Feedback />} />
+            <Route path="/academic-resouce-type" element={<AcademicResourceType />} />
+            <Route path="/academic-resouces" element={<AcademicResource />} />
+          </Routes>
+        </div>
+      </div>
+    </div>
   );
 }
 
diff --git a/frontend/src/core/component/dialogs/table/TableComponent.jsx b/frontend/src/core/component/dialogs/table/TableComponent.jsx
index 025b81c4..dadde68f 100644
--- a/frontend/src/core/component/dialogs/table/TableComponent.jsx
+++ b/frontend/src/core/component/dialogs/table/TableComponent.jsx
@@ -1,6 +1,10 @@
 import React from 'react';
+import getCurrentProfile from '../../../utils/current-profile';
+import {Roles} from '../../../constants';
 
 const TableComponent = ({headers, data, editHandler, deleteHandler}) => {
+  const profile = getCurrentProfile();
+
   return (
     <div>
       <table className="table">
@@ -11,7 +15,9 @@ const TableComponent = ({headers, data, editHandler, deleteHandler}) => {
                 {header}
               </th>
             ))}
-            {(editHandler || deleteHandler) && <th scope="col" colSpan={2}></th>}
+            {profile && profile.role === Roles.ADMIN && (
+              <>{(editHandler || deleteHandler) && <th scope="col" colSpan={2}></th>}</>
+            )}
           </tr>
         </thead>
         <tbody>
@@ -20,16 +26,17 @@ const TableComponent = ({headers, data, editHandler, deleteHandler}) => {
               {headers.map((header, colIndex) => (
                 <td key={colIndex}>{item[header]}</td>
               ))}
-              {editHandler && (
-                <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(item.id)}>
-                  Edit
-                </td>
-              )}
-              {deleteHandler && (
-                <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(item.id)}>
-                  Delete
-                </td>
-              )}
+
+              {(profile && profile.user === item.Owner) || (profile && profile.role === Roles.ADMIN) ? (
+                <>
+                  <td className="btn btn-sm btn-success m-1" onClick={() => editHandler(item.id)}>
+                    Edit
+                  </td>
+                  <td className="btn btn-sm btn-danger m-1" onClick={() => deleteHandler(item.id)}>
+                    Delete
+                  </td>
+                </>
+              ) : null}
             </tr>
           ))}
         </tbody>
diff --git a/frontend/src/core/setup/axios.js b/frontend/src/core/setup/axios.js
index 17fee1f9..5045c7ef 100644
--- a/frontend/src/core/setup/axios.js
+++ b/frontend/src/core/setup/axios.js
@@ -1,5 +1,7 @@
 import axios from 'axios';
+import {getTokens} from './token';
 
 export default function setupAxios() {
   axios.defaults.baseURL = 'http://localhost:8080/api/v1';
+  axios.defaults.headers.common['Authorization'] = `Bearer ${getTokens().accessToken}`;
 }
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
index 6811fe93..081c6a8b 100644
--- a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
@@ -4,7 +4,7 @@ import {getAllApi, saveApi, updateApi} from '../../service/apiAcademicResourceTy
 import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import AcademicResourceTypeList from './AcademicResourceTypeList';
 import AcademicResourceTypeModal from './AcademicResourceTypeModal';
-import {State} from '../../core/constants';
+import {Roles, State} from '../../core/constants';
 import {useNavigate} from 'react-router';
 import getCurrentProfile from '../../core/utils/current-profile';
 
@@ -85,18 +85,6 @@ const AcademicResourceType = () => {
     }
   };
 
-  // const handleSave = async event => {
-  //   event.preventDefault();
-  //   try {
-  //     resourceTypeForm.id > 0 ? await updateApi(resourceTypeForm) : await saveApi(resourceTypeForm);
-  //     setRefresh(!refresh);
-  //   } catch (error) {
-  //     <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
-  //   }
-  //   resetForm();
-  //   setShow(false);
-  // };
-
   const handleChange = event => {
     const {name, value} = event.target;
 
@@ -108,9 +96,11 @@ const AcademicResourceType = () => {
 
   return (
     <div className="App">
-      <button className="btn btn-primary" onClick={handleShow}>
-        Add Academic Resource Type
-      </button>
+      {profile && profile.role === Roles.ADMIN && (
+        <button className="btn btn-primary" onClick={handleShow}>
+          Add Academic Resource Type
+        </button>
+      )}
 
       <AcademicResourceTypeModal
         show={show}
diff --git a/frontend/src/features/dashboard/Dashboard.jsx b/frontend/src/features/dashboard/Dashboard.jsx
index 3749bbd0..f3744cd3 100644
--- a/frontend/src/features/dashboard/Dashboard.jsx
+++ b/frontend/src/features/dashboard/Dashboard.jsx
@@ -5,6 +5,7 @@ import getCurrentProfile from '../../core/utils/current-profile';
 import {Roles} from '../../core/constants';
 import StudentDashboard from './dashboard-student';
 import AdminDashboard from './dashboard-admin';
+import Header from '../../layout/Header';
 
 export default function Dashboard() {
   const navigate = useNavigate();
@@ -19,12 +20,12 @@ export default function Dashboard() {
 
   return (
     <>
+      <Header profile={profile} />
       {profile && profile.role === Roles.ADMIN ? <StudentDashboard /> : <AdminDashboard />}
       <p>{JSON.stringify(getCurrentProfile())}</p>
       <button
         onClick={() => {
           setTokens();
-
           navigate('/login');
         }}
       >
diff --git a/frontend/src/features/dashboard/dashboard-student.jsx b/frontend/src/features/dashboard/dashboard-student.jsx
index 33ecd8e6..ec1e8ac7 100644
--- a/frontend/src/features/dashboard/dashboard-student.jsx
+++ b/frontend/src/features/dashboard/dashboard-student.jsx
@@ -8,10 +8,6 @@ export default function StudentDashboard() {
         <li>
           <Link to="/students">Student</Link>
         </li>
-
-        <li>
-          <Link to="/myapp">MyAPp</Link>
-        </li>
       </ul>
     </>
   );
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
index daa1baff..177357ee 100644
--- a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
+++ b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
@@ -4,7 +4,7 @@ import {getAllApi, saveApi, updateApi} from '../../service/apiFeedbackCategory';
 import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import FeedbaclCategoryList from './FeedbackCategoryList';
 import FeedbackCategoryModal from './FeedbackCategoryModal';
-import {State} from '../../core/constants';
+import {Roles, State} from '../../core/constants';
 import axios from 'axios';
 import {useNavigate} from 'react-router';
 import getCurrentProfile from '../../core/utils/current-profile';
@@ -56,14 +56,15 @@ const FeedbackCategory = () => {
     try {
       setFeedbackCategoryState({errors: {}, error: null, status: State.IDLE});
 
-      const res = await axios.post('/admins/feedbackcategories', feedbackCategoryForm);
+      const res =
+        feedbackCategoryForm.id > 0 ? await updateApi(feedbackCategoryForm) : await saveApi(feedbackCategoryForm);
+      setRefresh(!refresh);
+      resetForm();
+      setShow(false);
 
       // Handle the response
       if (res.status === 201) {
         setFeedbackCategoryState({...feedbackCategoryState, status: State.SUCCEEDED});
-        setRefresh(!refresh);
-        resetForm();
-        setShow(false);
       } else if (res.status === 400) {
         setFeedbackCategoryState({
           status: State.FAILED,
@@ -99,9 +100,11 @@ const FeedbackCategory = () => {
 
   return (
     <div className="App">
-      <button className="btn btn-primary" onClick={handleShow}>
-        Add Feedback Category
-      </button>
+      {profile && profile.role === Roles.ADMIN && (
+        <button className="btn btn-primary" onClick={handleShow}>
+          Add Feedback Category
+        </button>
+      )}
 
       <FeedbackCategoryModal
         show={show}
diff --git a/frontend/src/features/feedbacks/Feedback.jsx b/frontend/src/features/feedbacks/Feedback.jsx
index 9ea986d1..773f1b71 100644
--- a/frontend/src/features/feedbacks/Feedback.jsx
+++ b/frontend/src/features/feedbacks/Feedback.jsx
@@ -25,6 +25,7 @@ const Feedback = () => {
   const fetchFeedbacks = useCallback(async () => {
     try {
       const data = await getAllApi();
+      console.log(data);
       setFeedbacksList(data);
     } catch (error) {
       <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
@@ -60,7 +61,6 @@ const Feedback = () => {
     try {
       setFeedbackState({errors: {}, error: null, status: State.IDLE});
 
-      // const res = await axios.post('/feedbacks', feedbackForm);
       const res = feedbackForm.id > 0 ? await updateApi(feedbackForm) : await saveApi(feedbackForm);
       setRefresh(!refresh);
       resetForm();
@@ -91,20 +91,6 @@ const Feedback = () => {
       }
     }
   };
-
-  // const handleSave = async event => {
-  //   event.preventDefault();
-  //   try {
-  //     console.log(feedbackForm.id);
-  //     feedbackForm.id > 0 ? await updateApi(feedbackForm) : await saveApi(feedbackForm);
-  //     setRefresh(!refresh);
-  //   } catch (error) {
-  //     <ErrorDialog show={'failed'} errorMessage={'Error'} handleClose={() => {}} />;
-  //   }
-  //   resetForm();
-  //   setShow(false);
-  // };
-
   const handleChange = event => {
     const {name, value} = event.target;
 
diff --git a/frontend/src/features/feedbacks/FeedbackList.jsx b/frontend/src/features/feedbacks/FeedbackList.jsx
index fbf84d50..8460b9f0 100644
--- a/frontend/src/features/feedbacks/FeedbackList.jsx
+++ b/frontend/src/features/feedbacks/FeedbackList.jsx
@@ -45,14 +45,21 @@ const FeedbackList = ({feedbacksList, setFeedbacksList, setFeedbackForm, setShow
     setShowDialog(true); // Show the confirmation dialog
   };
 
-  const headers = ['SlNo', 'Title', 'Description', 'Category'];
+  const headers = ['SlNo', 'Title', 'Description', 'Category', 'Owner', 'Date'];
+
+  const formatDate = date => {
+    const options = {day: '2-digit', weekday: 'short', month: 'short', year: 'numeric'};
+    return new Date(date).toLocaleDateString('en-US', options).replace(/,/g, '');
+  };
 
   const formattedData = feedbacksList.map((item, index) => ({
     SlNo: index + 1,
     Title: item.title,
     Description: item.body,
     Category: item.category.name,
-    id: item.id
+    id: item.id,
+    Owner: item.student?.id ? item.student.username : 'Anoynomous',
+    Date: item.postedDate ? formatDate(item.postedDate) : 'N/A'
   }));
 
   return (
diff --git a/frontend/src/layout/Dashboard.css b/frontend/src/layout/Dashboard.css
new file mode 100644
index 00000000..7752826f
--- /dev/null
+++ b/frontend/src/layout/Dashboard.css
@@ -0,0 +1,19 @@
+.dashboard {
+    margin-left: 260px;
+    padding: 20px;
+}
+
+.chart-placeholder {
+    height: 200px;
+    background: #f4f4f4;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #ccc;
+}
+
+@media (max-width: 768px) {
+    .dashboard {
+        margin-left: 0;
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/layout/Dashboard.jsx b/frontend/src/layout/Dashboard.jsx
new file mode 100644
index 00000000..f1d1ff20
--- /dev/null
+++ b/frontend/src/layout/Dashboard.jsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import {Card, Row, Col} from 'react-bootstrap';
+import './Dashboard.css';
+
+const Dashboard = () => {
+  return (
+    <div className="dashboard">
+      <Row>
+        <Col xs={12} md={6} lg={3}>
+          <Card bg="primary" text="white" className="mb-4">
+            <Card.Body>
+              <Card.Title>150</Card.Title>
+              <Card.Text>New Orders</Card.Text>
+            </Card.Body>
+          </Card>
+        </Col>
+        <Col xs={12} md={6} lg={3}>
+          <Card bg="success" text="white" className="mb-4">
+            <Card.Body>
+              <Card.Title>53%</Card.Title>
+              <Card.Text>Bounce Rate</Card.Text>
+            </Card.Body>
+          </Card>
+        </Col>
+        <Col xs={12} md={6} lg={3}>
+          <Card bg="warning" text="white" className="mb-4">
+            <Card.Body>
+              <Card.Title>44</Card.Title>
+              <Card.Text>User Registrations</Card.Text>
+            </Card.Body>
+          </Card>
+        </Col>
+        <Col xs={12} md={6} lg={3}>
+          <Card bg="danger" text="white" className="mb-4">
+            <Card.Body>
+              <Card.Title>65</Card.Title>
+              <Card.Text>Unique Visitors</Card.Text>
+            </Card.Body>
+          </Card>
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12} lg={8}>
+          <Card className="mb-4">
+            <Card.Header>Sales</Card.Header>
+            <Card.Body>
+              <div className="chart-placeholder">Sales Chart</div>
+            </Card.Body>
+          </Card>
+        </Col>
+        <Col xs={12} lg={4}>
+          <Card className="mb-4">
+            <Card.Header>Visitors</Card.Header>
+            <Card.Body>
+              <div className="chart-placeholder">Visitors Map</div>
+            </Card.Body>
+          </Card>
+        </Col>
+      </Row>
+    </div>
+  );
+};
+
+export default Dashboard;
diff --git a/frontend/src/layout/Header.css b/frontend/src/layout/Header.css
new file mode 100644
index 00000000..769fc2c0
--- /dev/null
+++ b/frontend/src/layout/Header.css
@@ -0,0 +1,31 @@
+.header {
+    width: 100%;
+    position: fixed;
+    top: 0;
+    z-index: 1000;
+    background: #5f5d5d;
+}
+
+@media (max-width: 768px) {
+    .header {
+        width: 100%;
+        margin-left: 0;
+    }
+}
+
+.header .navbar-nav .nav-link {
+    display: flex;
+    align-items: center;
+}
+
+.header .navbar-nav .nav-link img {
+    margin-right: 10px;
+}
+
+.header .badge {
+    margin-left: 5px;
+}
+.navbar-text {
+    margin-right: 10px;
+    margin-left:  50px;
+}
\ No newline at end of file
diff --git a/frontend/src/layout/Header.jsx b/frontend/src/layout/Header.jsx
new file mode 100644
index 00000000..2abaa7f6
--- /dev/null
+++ b/frontend/src/layout/Header.jsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import {Navbar, Nav, Form, FormControl, Button} from 'react-bootstrap';
+import './Header.css';
+import {setTokens} from '../core/setup/token';
+import {useNavigate} from 'react-router';
+
+const Header = ({profile}) => {
+  const navigate = useNavigate();
+
+  return (
+    <Navbar bg="light" expand="lg" className="header">
+      <Navbar.Brand href="#home"></Navbar.Brand>
+      <Navbar.Toggle aria-controls="basic-navbar-nav" />
+      <Navbar.Collapse id="basic-navbar-nav">
+        <Nav className="mr-auto">
+          <Nav.Link href="#home">Home</Nav.Link>
+          <Nav.Link to="/feedback-categories">Contact</Nav.Link>
+        </Nav>
+        <Nav>
+          <Form className="mr-sm-2">
+            <FormControl type="text" placeholder="Search" className="mr-sm-2" />
+            {/* <Button variant="outline-success">Search</Button> */}
+          </Form>
+        </Nav>
+        <span className="navbar-text mr-sm-2 m-10"> {profile && <> Welcome {profile.user} </>}</span>
+
+        <Button
+          variant="outline-success"
+          onClick={() => {
+            setTokens();
+            navigate('/login');
+          }}
+        >
+          {profile ? 'Logout' : 'Login'}
+        </Button>
+      </Navbar.Collapse>
+    </Navbar>
+  );
+};
+
+export default Header;
diff --git a/frontend/src/layout/Sidear.jsx b/frontend/src/layout/Sidear.jsx
new file mode 100644
index 00000000..994aa096
--- /dev/null
+++ b/frontend/src/layout/Sidear.jsx
@@ -0,0 +1,82 @@
+import React, {useState} from 'react';
+import {Link} from 'react-router-dom';
+import './Sidebar.css';
+import {Roles} from '../core/constants';
+
+const Sidebar = ({profile}) => {
+  const [open, setOpen] = useState(false);
+
+  const toggleDropdown = () => {
+    setOpen(!open);
+  };
+
+  return (
+    <div className="sidebar bg-dark text-white">
+      <div className="p-3">
+        <h5 className="mb-3">Student Connect</h5>
+        <ul className="nav flex-column">
+          <li className="nav-item">
+            <Link className="nav-link text-white" to="/dashboard">
+              Dashboard
+            </Link>
+          </li>
+
+          <li className="nav-item">
+            <div className={`dropdown ${open ? 'show' : ''}`}>
+              <button
+                className="btn bg-dark dropdown-toggle text-white w-100 text-start"
+                type="button"
+                onClick={toggleDropdown}
+                style={{border: 'none'}} // Remove default border
+              >
+                Master Data <i className={`fas fa-chevron-${open ? 'up' : 'down'}`}></i>
+              </button>
+              <ul className={`dropdown-menu w-100 ${open ? 'show' : ''}`} style={{backgroundColor: '#343a40'}}>
+                <li>
+                  <Link className="dropdown-item text-white" to="/charts/chart1">
+                    Chart 1
+                  </Link>
+                </li>
+                <li>
+                  <Link className="dropdown-item text-white" to="/charts/chart2">
+                    Chart 2
+                  </Link>
+                </li>
+              </ul>
+            </div>
+          </li>
+
+          {profile && profile.role === Roles.ADMIN && (
+            <>
+              {' '}
+              <li className="nav-item">
+                <Link className="nav-link text-white" to="/feedback-categories">
+                  Feedback Category
+                </Link>
+              </li>
+              <li className="nav-item">
+                <Link className="nav-link text-white" to="/academic-resouce-type">
+                  Academic Resouce Type
+                </Link>
+              </li>
+            </>
+          )}
+
+          <li className="nav-item">
+            <Link className="nav-link text-white" to="/feedbacks">
+              Feedbacks
+            </Link>
+          </li>
+
+          <li className="nav-item">
+            <Link className="nav-link text-white" to="/academic-resouces">
+              Academic Resouce
+            </Link>
+          </li>
+        </ul>
+      </div>
+    </div>
+  );
+};
+
+export default Sidebar;
diff --git a/frontend/src/layout/Sidebar.css b/frontend/src/layout/Sidebar.css
new file mode 100644
index 00000000..e5190c90
--- /dev/null
+++ b/frontend/src/layout/Sidebar.css
@@ -0,0 +1,48 @@
+.sidebar {
+    width: 250px;
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    background: #343a40;
+    color: white;
+    padding-top: 20px;
+    overflow-y: auto;
+}
+
+.sidebar .nav-link {
+    color: white;
+}
+
+.sidebar .nav-link:hover {
+    background: #495057;
+}
+
+.sidebar .dropdown-menu {
+    background: #495057;
+    border: none;
+}
+
+.sidebar .dropdown-menu .dropdown-item {
+    color: white;
+}
+
+.sidebar .dropdown-menu .dropdown-item:visited {
+    color: white;
+}
+
+.sidebar .dropdown-menu .dropdown-item:hover {
+    background: #6c757d;
+}
+
+.sidebar .dropdown-toggle:after {
+    display: none;
+}
+
+@media (max-width: 768px) {
+    .sidebar {
+        width: 100%;
+        height: auto;
+        position: relative;
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/service/apiAcademicResource.js b/frontend/src/service/apiAcademicResource.js
index c7d77b81..20ebecf3 100644
--- a/frontend/src/service/apiAcademicResource.js
+++ b/frontend/src/service/apiAcademicResource.js
@@ -1,7 +1,4 @@
 import axios from 'axios';
-// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-// const token = localStorage.getItem('token');
-// axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
   const response = await axios.get('/academic');
diff --git a/frontend/src/service/apiAcademicResourceTypes.js b/frontend/src/service/apiAcademicResourceTypes.js
index e1e2b580..f861caf0 100644
--- a/frontend/src/service/apiAcademicResourceTypes.js
+++ b/frontend/src/service/apiAcademicResourceTypes.js
@@ -1,7 +1,4 @@
 import axios from 'axios';
-// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-// const token = localStorage.getItem("token");
-// axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
   const response = await axios.get('/academicresources');
diff --git a/frontend/src/service/apiFeedbackCategory.js b/frontend/src/service/apiFeedbackCategory.js
index 319b1752..7c033e17 100644
--- a/frontend/src/service/apiFeedbackCategory.js
+++ b/frontend/src/service/apiFeedbackCategory.js
@@ -1,7 +1,4 @@
 import axios from 'axios';
-// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-// const token = localStorage.getItem('token');
-// axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
   const response = await axios.get('/feedbackcategories');
diff --git a/frontend/src/service/apiFeedbackService.js b/frontend/src/service/apiFeedbackService.js
index 9d8f98f5..5ec3ecf8 100644
--- a/frontend/src/service/apiFeedbackService.js
+++ b/frontend/src/service/apiFeedbackService.js
@@ -1,7 +1,4 @@
 import axios from 'axios';
-// axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-// const token = localStorage.getItem('token');
-// axios.defaults.headers.common['Authorization'] = `Bearer ${token}`;
 
 export const getAllApi = async () => {
   const response = await axios.get('/feedbacks');

From 2439ad728514f5d4552b01e17feaa76cc3d10248 Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Wed, 17 Jul 2024 20:39:33 -0500
Subject: [PATCH 7/9] updated

---
 frontend/src/App.js | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/frontend/src/App.js b/frontend/src/App.js
index f240928a..8ef57398 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -5,10 +5,14 @@ import Login from './features/authentication/login/Login';
 import Register from './features/authentication/register/Register';
 import Students from './features/students/Students';
 import Events from './features/events';
-import { ProtectedRoute } from './features/authentication/protected-route/protectedRoute';
+import {ProtectedRoute} from './features/authentication/protected-route/protectedRoute';
 import EventDetails from './core/component/events/EventDetails';
 import StudentDetail from './features/students/student-detail';
 import UpdateStudentDetail from './features/students/update-student-detail';
+import Feedback from './features/feedbacks/Feedback';
+import AcademicResource from './features/academicResources/AcademicResource';
+import AcademicResourceType from './features/academicResourceTypes/AcademicResourceType';
+import FeedbackCategory from './features/feedbackCategories/FeedbackCategory';
 
 function App() {
   return (
@@ -17,11 +21,30 @@ function App() {
       <Route path="/login" element={<Login />} />
       <Route path="/register" element={<Register />} />
       <Route path="/students" element={<Students />} />
-      <Route path="/events" element={<ProtectedRoute><Events /></ProtectedRoute>} />
-      <Route path="/events/:id" element={<ProtectedRoute><EventDetails /></ProtectedRoute>} />
+      <Route
+        path="/events"
+        element={
+          <ProtectedRoute>
+            <Events />
+          </ProtectedRoute>
+        }
+      />
+      <Route
+        path="/events/:id"
+        element={
+          <ProtectedRoute>
+            <EventDetails />
+          </ProtectedRoute>
+        }
+      />
       <Route path="/student/:username" element={<StudentDetail />} />
       <Route path="/profile/update" element={<UpdateStudentDetail />} />
       <Route path="/profile" element={<StudentDetail />} />
+      <Route path="/login" element={<Login />} />
+      <Route path="/feedbacks" element={<Feedback />} />
+      <Route path="/feedback-categories" element={<FeedbackCategory />} />
+      <Route path="/academic-resouce-type" element={<AcademicResourceType />} />
+      <Route path="/academic-resouces" element={<AcademicResource />} />
     </Routes>
   );
 }

From cb9d17b1a6fae2c3f24b09d16c8bb74e5ef8b903 Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Wed, 17 Jul 2024 21:42:00 -0500
Subject: [PATCH 8/9] Updated

---
 .../java/com/waa/project/service/impl/FeebackServiceImp.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java b/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
index 7f37057a..be6c2f4c 100644
--- a/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
+++ b/backend/src/main/java/com/waa/project/service/impl/FeebackServiceImp.java
@@ -57,7 +57,7 @@ public FeedbackResponse save(FeedbackRequest feedbackRequest, Long userId) {
 
         if (userId != null) {
             User user = userRepository.findById(userId).get();
-            if (!user.getRoleType().equals("ADMIN")) {
+            if (user.getRoleType().equals("STUDENT")) {
                 Student student = studentRepository.findById(userId).get();
                 feedbackToSave.setStudent(student);
             }

From bf3bb9f30e7df2fc212eabf8138542f040c116ce Mon Sep 17 00:00:00 2001
From: phurpawangchuk <phurpawangchuk20@gmail.com>
Date: Wed, 17 Jul 2024 21:53:50 -0500
Subject: [PATCH 9/9] Link added

---
 frontend/src/core/component/NavBar.jsx        |  8 ++
 frontend/src/core/setup/axios.js              | 81 +++++++++++++++++--
 .../AcademicResourceType.jsx                  |  4 +-
 .../academicResources/AcademicResource.jsx    |  4 +-
 frontend/src/features/dashboard/Dashboard.jsx | 17 +---
 .../features/dashboard/dashboard-admin.jsx    |  4 +-
 .../features/dashboard/dashboard-student.jsx  |  4 +-
 .../feedbackCategories/FeedbackCategory.jsx   |  4 +-
 frontend/src/features/feedbacks/Feedback.jsx  |  4 +-
 frontend/src/service/apiAcademicResource.js   | 12 +--
 .../src/service/apiAcademicResourceTypes.js   | 11 +--
 frontend/src/service/apiFeedbackCategory.js   | 10 +--
 frontend/src/service/apiFeedbackService.js    | 14 ++--
 13 files changed, 128 insertions(+), 49 deletions(-)

diff --git a/frontend/src/core/component/NavBar.jsx b/frontend/src/core/component/NavBar.jsx
index c6cb22fd..5d61b8ed 100644
--- a/frontend/src/core/component/NavBar.jsx
+++ b/frontend/src/core/component/NavBar.jsx
@@ -26,6 +26,14 @@ export default function NavBar() {
             <Nav.Link href="/resources" className="text-white">
               Resources
             </Nav.Link>
+
+            <Nav.Link href="/feedbacks" className="text-white">
+              Feedback
+            </Nav.Link>
+
+            <Nav.Link href="/academic-resouces" className="text-white">
+              Academic Resources
+            </Nav.Link>
           </Nav>
           <Nav>
             <NavDropdown title="Profile" id="profile-dropdown" align="end" className="text-white">
diff --git a/frontend/src/core/setup/axios.js b/frontend/src/core/setup/axios.js
index 5045c7ef..0be84738 100644
--- a/frontend/src/core/setup/axios.js
+++ b/frontend/src/core/setup/axios.js
@@ -1,7 +1,78 @@
 import axios from 'axios';
-import {getTokens} from './token';
+import {getTokens, setTokens} from './token';
 
-export default function setupAxios() {
-  axios.defaults.baseURL = 'http://localhost:8080/api/v1';
-  axios.defaults.headers.common['Authorization'] = `Bearer ${getTokens().accessToken}`;
-}
+// Create an Axios instance
+const apiClient = axios.create({
+  baseURL: 'http://localhost:8080/api/v1',
+  timeout: 10000,
+  headers: {
+    'Content-Type': 'application/json;charset=UTF-8'
+  }
+});
+
+// Function to get access token from local storage
+const getAccessToken = () => getTokens().accessToken;
+
+// Function to get refresh token from local storage
+const getRefreshToken = () => getTokens().refreshToken;
+
+// Function to set new access token in local storage
+const setAccessToken = accessToken => {
+  setTokens(accessToken, getRefreshToken());
+};
+
+// Request interceptor to add the access token to headers
+apiClient.interceptors.request.use(
+  config => {
+    const token = getAccessToken();
+    if (token !== '' && token != null && token.length > 0) {
+      config.headers['Authorization'] = `Bearer ${token}`;
+    } else {
+      config.headers['Authorization'] = null;
+    }
+    return config;
+  },
+  error => Promise.reject(error)
+);
+
+// Response interceptor to handle 401 errors and token refresh
+apiClient.interceptors.response.use(
+  response => response,
+  async error => {
+    const originalRequest = error.config;
+
+    const refreshToken = getRefreshToken();
+
+    if (refreshToken === '' || refreshToken === null) {
+      originalRequest._retry = true;
+    }
+
+    if (error.response.status === 401) {
+      if (!originalRequest._retry) {
+        originalRequest._retry = true;
+
+        try {
+          const response = await apiClient.post('/auth/token/refresh', {refreshToken: refreshToken});
+
+          if (response.status === 200) {
+            const newToken = response.data.accessToken;
+            setAccessToken(newToken);
+            originalRequest.headers['Authorization'] = `Bearer ${newToken}`;
+
+            return apiClient(originalRequest);
+          }
+        } catch (refreshError) {
+          setTokens();
+
+          return Promise.reject(refreshError);
+        }
+      } else {
+        setTokens();
+      }
+    }
+
+    return Promise.reject(error);
+  }
+);
+
+export default apiClient;
diff --git a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
index 081c6a8b..8076d6f5 100644
--- a/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
+++ b/frontend/src/features/academicResourceTypes/AcademicResourceType.jsx
@@ -7,6 +7,7 @@ import AcademicResourceTypeModal from './AcademicResourceTypeModal';
 import {Roles, State} from '../../core/constants';
 import {useNavigate} from 'react-router';
 import getCurrentProfile from '../../core/utils/current-profile';
+import NavBar from '../../core/component/NavBar';
 
 const AcademicResourceType = () => {
   const [resourceTypeForm, setResourceTypeForm] = useState(initialForm);
@@ -96,8 +97,9 @@ const AcademicResourceType = () => {
 
   return (
     <div className="App">
+      <NavBar />
       {profile && profile.role === Roles.ADMIN && (
-        <button className="btn btn-primary" onClick={handleShow}>
+        <button className="btn btn-primary mt-3 mx-5" onClick={handleShow}>
           Add Academic Resource Type
         </button>
       )}
diff --git a/frontend/src/features/academicResources/AcademicResource.jsx b/frontend/src/features/academicResources/AcademicResource.jsx
index c5a08f09..b2663bb0 100644
--- a/frontend/src/features/academicResources/AcademicResource.jsx
+++ b/frontend/src/features/academicResources/AcademicResource.jsx
@@ -5,6 +5,7 @@ import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import AcademicResourceModal from './AcademicResourceModal';
 import AcademicResourceList from './AcademicResourceList';
 import {State} from '../../core/constants';
+import NavBar from '../../core/component/NavBar';
 
 const AcademicResource = () => {
   const [academicResForm, setAcademicResForm] = useState(initialForm);
@@ -109,7 +110,8 @@ const AcademicResource = () => {
 
   return (
     <div className="App">
-      <button className="btn btn-primary" onClick={handleShow}>
+      <NavBar />
+      <button className="btn btn-primary mt-3 mx-5" onClick={handleShow}>
         Add Academic Resource
       </button>
 
diff --git a/frontend/src/features/dashboard/Dashboard.jsx b/frontend/src/features/dashboard/Dashboard.jsx
index f3744cd3..6b523f2b 100644
--- a/frontend/src/features/dashboard/Dashboard.jsx
+++ b/frontend/src/features/dashboard/Dashboard.jsx
@@ -5,7 +5,6 @@ import getCurrentProfile from '../../core/utils/current-profile';
 import {Roles} from '../../core/constants';
 import StudentDashboard from './dashboard-student';
 import AdminDashboard from './dashboard-admin';
-import Header from '../../layout/Header';
 
 export default function Dashboard() {
   const navigate = useNavigate();
@@ -18,19 +17,5 @@ export default function Dashboard() {
     }
   }, [profile]);
 
-  return (
-    <>
-      <Header profile={profile} />
-      {profile && profile.role === Roles.ADMIN ? <StudentDashboard /> : <AdminDashboard />}
-      <p>{JSON.stringify(getCurrentProfile())}</p>
-      <button
-        onClick={() => {
-          setTokens();
-          navigate('/login');
-        }}
-      >
-        Logout
-      </button>
-    </>
-  );
+  return <>{profile && profile.role === Roles.ADMIN ? <StudentDashboard /> : <AdminDashboard />}</>;
 }
diff --git a/frontend/src/features/dashboard/dashboard-admin.jsx b/frontend/src/features/dashboard/dashboard-admin.jsx
index 94010985..ecb42721 100644
--- a/frontend/src/features/dashboard/dashboard-admin.jsx
+++ b/frontend/src/features/dashboard/dashboard-admin.jsx
@@ -6,7 +6,9 @@ import {faCalendarAlt, faUserGraduate} from '@fortawesome/free-solid-svg-icons';
 export default function AdminDashboard() {
   const options = [
     {icon: faUserGraduate, title: 'Students', link: '/students'},
-    {icon: faCalendarAlt, title: 'Events', link: '/events'}
+    {icon: faCalendarAlt, title: 'Events', link: '/events'},
+    {icon: faUserGraduate, title: 'Academic Resource Type', link: '/academic-resouce-type'},
+    {icon: faCalendarAlt, title: 'Feedback Category', link: '/feedback-categories'}
   ];
 
   return (
diff --git a/frontend/src/features/dashboard/dashboard-student.jsx b/frontend/src/features/dashboard/dashboard-student.jsx
index 7cd642a1..2be3cc05 100644
--- a/frontend/src/features/dashboard/dashboard-student.jsx
+++ b/frontend/src/features/dashboard/dashboard-student.jsx
@@ -6,7 +6,9 @@ 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'}
+    {icon: faCalendarAlt, title: 'Events', link: '/events'},
+    {icon: faCalendarAlt, title: 'Feedback', link: '/feedbacks'},
+    {icon: faUserGraduate, title: 'Academic Resouces', link: '/academic-resouces'}
   ];
 
   return (
diff --git a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
index 177357ee..b083edc2 100644
--- a/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
+++ b/frontend/src/features/feedbackCategories/FeedbackCategory.jsx
@@ -8,6 +8,7 @@ import {Roles, State} from '../../core/constants';
 import axios from 'axios';
 import {useNavigate} from 'react-router';
 import getCurrentProfile from '../../core/utils/current-profile';
+import NavBar from '../../core/component/NavBar';
 
 const FeedbackCategory = () => {
   const [feedbackCategoryForm, setFeedbackCategoryForm] = useState(initialForm);
@@ -100,8 +101,9 @@ const FeedbackCategory = () => {
 
   return (
     <div className="App">
+      <NavBar />
       {profile && profile.role === Roles.ADMIN && (
-        <button className="btn btn-primary" onClick={handleShow}>
+        <button className="btn btn-primary mt-3 mx-5" onClick={handleShow}>
           Add Feedback Category
         </button>
       )}
diff --git a/frontend/src/features/feedbacks/Feedback.jsx b/frontend/src/features/feedbacks/Feedback.jsx
index 773f1b71..57807a8c 100644
--- a/frontend/src/features/feedbacks/Feedback.jsx
+++ b/frontend/src/features/feedbacks/Feedback.jsx
@@ -5,6 +5,7 @@ import ErrorDialog from '../../core/component/dialogs/ErrorDialog';
 import FeedbackModal from './FeedbackModal';
 import FeedbackList from './FeedbackList';
 import {State} from '../../core/constants';
+import NavBar from '../../core/component/NavBar';
 
 const Feedback = () => {
   const [feedbackForm, setFeedbackForm] = useState(initialForm);
@@ -102,7 +103,8 @@ const Feedback = () => {
 
   return (
     <div className="App">
-      <button className="btn btn-primary" onClick={handleShow}>
+      <NavBar />
+      <button className="btn btn-primary mt-3 mx-5" onClick={handleShow}>
         Add Feedback
       </button>
 
diff --git a/frontend/src/service/apiAcademicResource.js b/frontend/src/service/apiAcademicResource.js
index 20ebecf3..80182df0 100644
--- a/frontend/src/service/apiAcademicResource.js
+++ b/frontend/src/service/apiAcademicResource.js
@@ -1,12 +1,12 @@
-import axios from 'axios';
+import apiClient from '../core/setup/axios';
 
 export const getAllApi = async () => {
-  const response = await axios.get('/academic');
+  const response = await apiClient.get('/academic');
   return response.data;
 };
 
 export const getAllCategoriesApi = async () => {
-  const response = await axios.get('/academicresources');
+  const response = await apiClient.get('/academicresources');
   return response.data;
 };
 
@@ -32,7 +32,7 @@ export const saveApi = async dataForm => {
   }
 
   // Ensure no conflicting headers are set
-  const response = await axios.post('/academic', formData, {
+  const response = await apiClient.post('/academic', formData, {
     headers: {
       'Content-Type': 'multipart/form-data'
     }
@@ -64,7 +64,7 @@ export const updateApi = async dataForm => {
     formData.append('file', dataForm.file);
   }
 
-  const response = await axios.put('/academic/' + dataForm.id, formData, {
+  const response = await apiClient.put('/academic/' + dataForm.id, formData, {
     headers: {
       'Content-Type': 'multipart/form-data'
     }
@@ -74,6 +74,6 @@ export const updateApi = async dataForm => {
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete('/academic/' + id);
+  const response = await apiClient.delete('/academic/' + id);
   return response.data;
 };
diff --git a/frontend/src/service/apiAcademicResourceTypes.js b/frontend/src/service/apiAcademicResourceTypes.js
index f861caf0..e61a3d1c 100644
--- a/frontend/src/service/apiAcademicResourceTypes.js
+++ b/frontend/src/service/apiAcademicResourceTypes.js
@@ -1,26 +1,27 @@
 import axios from 'axios';
+import apiClient from '../core/setup/axios';
 
 export const getAllApi = async () => {
-  const response = await axios.get('/academicresources');
+  const response = await apiClient.get('/academicresources');
   return response.data;
 };
 
 export const getAllCategoriesApi = async () => {
-  const response = await axios.get('/feedbackcategories');
+  const response = await apiClient.get('/feedbackcategories');
   return response.data;
 };
 
 export const saveApi = async formdate => {
-  const response = await axios.post('/academicresources', formdate);
+  const response = await apiClient.post('/academicresources', formdate);
   return response.data;
 };
 
 export const updateApi = async formdate => {
-  const response = await axios.put('/academicresources/' + formdate.id, formdate);
+  const response = await apiClient.put('/academicresources/' + formdate.id, formdate);
   return response.data;
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete('/academicresources/' + id);
+  const response = await apiClient.delete('/academicresources/' + id);
   return response.data;
 };
diff --git a/frontend/src/service/apiFeedbackCategory.js b/frontend/src/service/apiFeedbackCategory.js
index 7c033e17..336df9c6 100644
--- a/frontend/src/service/apiFeedbackCategory.js
+++ b/frontend/src/service/apiFeedbackCategory.js
@@ -1,21 +1,21 @@
-import axios from 'axios';
+import apiClient from '../core/setup/axios';
 
 export const getAllApi = async () => {
-  const response = await axios.get('/feedbackcategories');
+  const response = await apiClient.get('/feedbackcategories');
   return response.data;
 };
 
 export const saveApi = async formdate => {
-  const response = await axios.post('/admins/feedbackcategories', formdate);
+  const response = await apiClient.post('/admins/feedbackcategories', formdate);
   return response.data;
 };
 
 export const updateApi = async formdate => {
-  const response = await axios.put('/admins/feedbackcategories/' + formdate.id, formdate);
+  const response = await apiClient.put('/admins/feedbackcategories/' + formdate.id, formdate);
   return response.data;
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete('/admins/feedbackcategories/' + id);
+  const response = await apiClient.delete('/admins/feedbackcategories/' + id);
   return response.data;
 };
diff --git a/frontend/src/service/apiFeedbackService.js b/frontend/src/service/apiFeedbackService.js
index 5ec3ecf8..94e6d478 100644
--- a/frontend/src/service/apiFeedbackService.js
+++ b/frontend/src/service/apiFeedbackService.js
@@ -1,22 +1,24 @@
-import axios from 'axios';
+import apiClient from '../core/setup/axios';
 
 export const getAllApi = async () => {
-  const response = await axios.get('/feedbacks');
+  const response = await apiClient.get('/feedbacks');
   return response.data;
 };
 
 export const getAllCategoriesApi = async () => {
-  const response = await axios.get('/feedbackcategories');
+  const response = await apiClient.get('/feedbackcategories');
   return response.data;
 };
 
 export const saveApi = async formdate => {
+  console.log(formdate);
+
   const postData = {
     title: formdate.title,
     body: formdate.body,
     feedbackCategory: formdate.feedbackCategory
   };
-  const response = await axios.post('/feedbacks', postData);
+  const response = await apiClient.post('/feedbacks', postData);
   return response.data;
 };
 
@@ -26,11 +28,11 @@ export const updateApi = async formdate => {
     body: formdate.body,
     feedbackCategory: formdate.feedbackCategory
   };
-  const response = await axios.put('/feedbacks/' + formdate.id, postData);
+  const response = await apiClient.put('/feedbacks/' + formdate.id, postData);
   return response.data;
 };
 
 export const deleteApi = async id => {
-  const response = await axios.delete('/feedbacks/' + id);
+  const response = await apiClient.delete('/feedbacks/' + id);
   return response.data;
 };