latest

Author: Dasaineee

.rest

@@ -0,0 +1,27 @@
+### Create Award Notice
+POST http://localhost:5058/api/v1/awards
+Content-Type: application/json
+
+{
+  "title": "Supply of Office Equipment",
+  "amount": 1500000.00,
+  "date": "2025-01-15",
+  "details": "Procurement of various office equipment including printers, computers, and furniture.",
+  "vendorId": "67df0d270e569b4642aa7e1b",
+  "poId": "67df10d0c20892aff7d34020"
+}
+
+### Get All Award Notices
+GET http://localhost:5000/api/v1/awards
+
+
+###
+GET https://backend-log1.axleshift.com/api/v1/warehouseLoc/locations
+Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI2N2UyZGI2MDJlMjg2MTI1YzU1MDJmMGEiLCJyb2xlIjoic3VwZXIgYWRtaW4iLCJlbWFpbCI6IkpvaG5sYXlkYTkyQGdtYWlsLmNvbSIsImlhdCI6MTc0MjkyMTA3NSwiZXhwIjoxNzQyOTI0Njc1fQ.Mj5O1RnMPyxwh1jemOaCcjlJYW-jWY8CSZXZpLi-wAw
+x-api-key: 0ad3f5c013c42d2d0537672a260978c71dcd5a7d508019d748f991deee3d65665a477e3523c6bbc83fd6a51a71dd5003
+
+
+
+###
+GET http://localhost:5058/api/v1/notifications
+Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI2N2RmMGIwOTBlNTY5YjQ2NDJhYTdkZmYiLCJyb2xlIjoic3VwZXIgYWRtaW4iLCJlbWFpbCI6IkNoeXNldjQ3NUBnbWFpbC5jb20iLCJpYXQiOjE3NDMxOTgxMTQsImV4cCI6MTc0MzIwMTcxNH0.s8PmAMKFtuP13nvUANaPUoueYNvoUQpt59XT0EBIoWI

client/.env.example

@@ -16,8 +16,8 @@
     "build": "env-cmd -f ./.env vite build",
     "lint": "eslint \"src/**/*.js\"",
     "lint-fix": "eslint . --fix",
-    "serve": "vite preview",
-    "start": "vite"
+    "serve": "vite preview --port 3000",
+    "start": "vite --port 3000"
   },
   "dependencies": {
     "@coreui/chartjs": "^4.0.0",
@@ -67,6 +67,6 @@
     "postcss": "^8.4.38",
     "prettier": "3.3.2",
     "sass": "^1.77.5",
-    "vite": "^6.2.0"
+    "vite": "^6.2.3"
   }
 }

client/package.json

@@ -46,6 +46,13 @@ const _nav = [
     role_exclude: ['vendor', 'user', 'staff'],
     icon: <FontAwesomeIcon icon={faUsers} className="nav-icon" />,
   },
+  {
+    component: CNavItem,
+    name: 'Award Management',
+    to: '/award',
+    role_exclude: ['vendor', 'user', 'staff'],
+    icon: <FontAwesomeIcon icon={faBullhorn} className="nav-icon" />,
+  },
   {
     component: CNavTitle,
     name: 'Procurement',
@@ -54,24 +61,38 @@ const _nav = [
   {
     component: CNavItem,
     name: 'Procurement request',
-    to: '/procurement',
+    to: '/procurement/procurement',
     role_exclude: ['vendor', 'staff'],
     icon: <FontAwesomeIcon icon={faBox} className="nav-icon" />,
   },
   {
     component: CNavItem,
-    name: 'RFQ Management',
+    name: 'PR & RFQ List',
     to: '/procurement/rfq-management',
     role_exclude: ['vendor', 'staff'],
     icon: <FontAwesomeIcon icon={faFileText} className="nav-icon" />,
   },
+  {
+    component: CNavItem,
+    name: 'Vendor Quotes',
+    to: '/procurement/submit-quote',
+    role_exclude: ['vendor', 'staff'],
+    icon: <FontAwesomeIcon icon={faBox} className="nav-icon" />,
+  },
   {
     component: CNavItem,
     name: 'Purchase Order & Payment Tracking',
     to: '/procurement/po-payments',
     role_exclude: ['vendor', 'user', 'staff'],
     icon: <FontAwesomeIcon icon={faFileInvoiceDollar} className="nav-icon" />,
   },
+  {
+    component: CNavItem,
+    name: 'Shipment & Delivery Tracking',
+    to: '/procurement/shipments',
+    role_exclude: ['vendor', 'user', 'staff'],
+    icon: <FontAwesomeIcon icon={faTruck} className="nav-icon" />,
+  },
   {
     component: CNavItem,
     name: 'Product Catalog',
@@ -82,7 +103,7 @@ const _nav = [
   {
     component: CNavItem,
     name: 'Reports & Dashboard',
-    to: '/analytics',
+    to: '/procurement/analytics',
     role_exclude: ['vendor', 'user', 'staff'],
     icon: <FontAwesomeIcon icon={faChartBar} className="nav-icon" />,
   },
@@ -93,25 +114,32 @@ const _nav = [
   },
   {
     component: CNavItem,
-    name: 'RFQ Bidding',
+    name: 'RFQ Announcements & Bidding',
     to: '/vendor/rfqs',
     role_exclude: ['user', 'staff'],
     icon: <FontAwesomeIcon icon={faBullhorn} className="nav-icon" />,
   },
   {
     component: CNavItem,
-    name: 'Shipment & Delivery',
-    to: '/vendor/shipments',
+    name: 'Quotes Requests',
+    to: '/vendor/quotes',
     role_exclude: ['user', 'staff'],
-    icon: <FontAwesomeIcon icon={faShippingFast} className="nav-icon" />,
+    icon: <FontAwesomeIcon icon={faBullhorn} className="nav-icon" />,
   },
   {
     component: CNavItem,
-    name: 'Order & Invoice',
+    name: 'Order & Payment',
     to: '/vendor/order-payment',
     role_exclude: ['user', 'staff'],
     icon: <FontAwesomeIcon icon={faReceipt} className="nav-icon" />,
   },
+  {
+    component: CNavItem,
+    name: 'Shipment & Delivery',
+    to: '/vendor/shipments',
+    role_exclude: ['user', 'staff'],
+    icon: <FontAwesomeIcon icon={faShippingFast} className="nav-icon" />,
+  },
   {
     component: CNavItem,
     name: 'Communication Support',
@@ -127,7 +155,7 @@ const _nav = [
   {
     component: CNavItem,
     name: 'Logistics Dashboard',
-    to: '/logistics',
+    to: '/logistics/dashboard',
     role_exclude: ['vendor', 'user', 'staff'],
     icon: <FontAwesomeIcon icon={faTruckLoading} className="nav-icon" />,
   },
@@ -144,21 +172,21 @@ const _nav = [
     icon: <FontAwesomeIcon icon={faBoxes} className="nav-icon" />,
   },
   {
-    component: CNavItem,
-    name: 'Audit management',
-    to: '/Audit',
+    component: CNavTitle,
+    name: 'ANALYTICS',
     role_exclude: ['vendor', 'user', 'staff'],
-    icon: <FontAwesomeIcon icon={faReceipt} className="nav-icon" />,
   },
   {
-    component: CNavTitle,
+    component: CNavItem,
     name: 'Settings',
+    to: '/settings',
     role_exclude: ['vendor', 'user', 'staff'],
+    icon: <FontAwesomeIcon icon={faCog} className="nav-icon" />,
   },
   {
     component: CNavItem,
-    name: 'Settings',
-    to: '/settings',
+    name: 'General Settings',
+    to: '/settings/general',
     role_exclude: ['vendor', 'user', 'staff'],
     icon: <FontAwesomeIcon icon={faCog} className="nav-icon" />,
   },

client/src/_nav.js

@@ -4,7 +4,49 @@ const API_URL = import.meta.env.VITE_API_URL
 
 const api = axios.create({
   baseURL: API_URL,
-  withCredentials: true,
+  withCredentials: true, // Automatically send cookies with requests
 })
 
+// Request Interceptor
+api.interceptors.request.use(
+  (config) => {
+    if (config.data instanceof FormData) {
+      config.headers['Content-Type'] = 'multipart/form-data'
+    } else {
+      config.headers['Content-Type'] = 'application/json'
+    }
+    return config
+  },
+  (error) => Promise.reject(error),
+)
+
+// Response Interceptor (Handle 401 Unauthorized)
+api.interceptors.response.use(
+  (response) => response,
+  async (error) => {
+    console.error('API Error:', error.response?.data?.message || error.message)
+
+    if (error.response?.status === 401) {
+      try {
+        // Attempt to refresh token automatically
+        await api.post('/auth/refresh-token')
+        return api(error.config) // Retry the failed request
+      } catch (refreshError) {
+        console.error('Session expired, redirecting to login...')
+        window.location.href = '/login' // Redirect to login page
+      }
+    }
+
+    return Promise.reject(error)
+  },
+)
+
+// Reusable API functions
+export const apiService = {
+  get: (url, params, headers = {}) => api.get(url, { params, headers }),
+  post: (url, data) => api.post(url, data),
+  put: (url, data) => api.put(url, data),
+  delete: (url) => api.delete(url),
+}
+
 export default api