remodeling

api/package-lock.json

@@ -1,15 +1,15 @@
 {
-  "name": "server",
+  "name": "shiftsync-website-api",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "server",
+      "name": "shiftsync-website-api",
-      "version": "1.0.0",
+      "version": "1.0.1",
-      "license": "ISC",
       "dependencies": {
         "cors": "^2.8.5",
+        "dotenv": "^16.5.0",
         "express": "^5.1.0"
       },
       "devDependencies": {
@@ -255,6 +255,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/dotenv": {
+      "version": "16.5.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
+      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",

api/package.json

@@ -1,14 +1,16 @@
 {
   "name": "shiftsync-website-api",
   "version": "1.0.1",
-  "main": "server.js",
+  "private": true,
+  "type": "module",
   "scripts": {
-    "start": "node server",
+    "start": "node server.js",
-    "dev": "nodemon server",
+    "dev": "nodemon server.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
     "cors": "^2.8.5",
+    "dotenv": "^16.5.0",
     "express": "^5.1.0"
   },
   "devDependencies": {

api/server.js

@@ -1,5 +1,8 @@
-const express = require("express");
+import express from 'express';
-const cors = require("cors");
+import cors from 'cors';
+import dotenv from 'dotenv';
+dotenv.config();
+import { postgresServices } from './services/postgres/postgresServices.js';
 
 const app = express();
 

api/services/postgres/postgresServices.js

@@ -0,0 +1,8 @@
+export const postgresServices = {
+  getUsers: async (args) => {
+
+  },
+  getDepartments: async (args) => {
+
+  }
+};

package-lock.json

@@ -1,13 +1,12 @@
 {
   "name": "shiftsync-website",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shiftsync-website",
-      "version": "1.0.0",
+      "version": "1.0.1",
-      "license": "ISC",
       "dependencies": {
         "cors": "^2.8.5",
         "express": "^5.1.0"

package.json

@@ -4,7 +4,7 @@
   "version": "1.0.1",
   "main": "index.js",
   "scripts": {
-    "api": "nodemon --quiet api",
+    "api": "npm run dev --prefix api",
     "web": "npm run dev --prefix web",
     "dev": "concurrently \"npm run api\" \"npm run web\"",
     "test": "echo \"Error: no test specified\" && exit 1"

web/package-lock.json

@@ -1,12 +1,12 @@
 {
-  "name": "my-app",
+  "name": "shiftsync-website-web",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "my-app",
+      "name": "shiftsync-website-web",
-      "version": "0.0.0",
+      "version": "0.0.1",
       "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.0",

web/src/router/AppRouter.jsx

@@ -59,13 +59,17 @@ const users = [
 const AppRouter = () => {
   const { user, setUser, setDepartment } = useLocalStore();
   const [userChanged, setUserChanged] = useState(false);
+  const isDev = true; // change for it.
 
   const fetchAPI = async () => {
-    const response = await axios.get("http://localhost:5172/api");
+    const location = window.location;
+    const uri = `${location?.protocol}//${location?.hostname}${isDev ? ':5172' : ''}/api`;
+    const response = await axios.get(uri);
     console.log(response.data.fruits);
-  }
+  };
 
   useEffect(() => {
+    
     fetchAPI();
     // await call for getting the count of employees and any other calls to db.
     const employee_count = 1;