code clear up and minor changes

viviannnl · Sep 17, 2023 · 9522fc9 · 9522fc9
1 parent 0c419e2
commit 9522fc9
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 117 deletions.
diff --git a/CarAIbou_full.egg-info/PKG-INFO b/CarAIbou_full.egg-info/PKG-INFO
diff --git a/CarAIbou_full.egg-info/SOURCES.txt b/CarAIbou_full.egg-info/SOURCES.txt
diff --git a/CarAIbou_full.egg-info/dependency_links.txt b/CarAIbou_full.egg-info/dependency_links.txt
diff --git a/CarAIbou_full.egg-info/requires.txt b/CarAIbou_full.egg-info/requires.txt
diff --git a/CarAIbou_full.egg-info/top_level.txt b/CarAIbou_full.egg-info/top_level.txt
diff --git a/backend/server.js b/backend/server.js
@@ -4,22 +4,24 @@ const express = require('express')
 const dotenv = require('dotenv').config()
 const port = process.env.PORT || 5000
 const connectDB = require('./config/db')
+const cors = require("cors");
 
 connectDB()
 
 const app = express()
 
 app.use(express.json())
-app.use(express.urlencoded({extended: false}));
+app.use(express.urlencoded({extended: false}))
+
+app.use(
+    cors({
+      origin: ["http://localhost:3000", "https://CarAIbou-demo.onrender.com"],
+    })
+)
+
 app.use('/api/users', require('./routes/userRoutes'))
 app.use('/api/habits', require('./routes/habitsRoutes'))
 app.use('/api/goals', require('./routes/goalsRoutes'))
 
-// Serve frontend
-if (process.env.NODE_ENV === 'production') {
-    app.use(express.static(path.join(__dirname, '../frontend/build')))
-
-    app.get('*', (req, res) => res.sendFile(path.resolve(__dirname, '../', 'frontend', 'build', 'index.html')))
-}
 
 app.listen(port, () => console.log(`Server started on port ${port}`))
diff --git a/logs/09_09_2023_22_51_37.log/09_09_2023_22_51_37.log b/logs/09_09_2023_22_51_37.log/09_09_2023_22_51_37.log
diff --git a/logs/09_09_2023_22_59_58.log/09_09_2023_22_59_58.log b/logs/09_09_2023_22_59_58.log/09_09_2023_22_59_58.log
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,4 @@
 {
-  "homepage": "https://viviannnl.github.io/CarAIbou_full",
   "name": "caraibou_web_full",
   "version": "1.0.0",
   "description": "A full stack web for the project CarAIbou.",
@@ -9,14 +8,13 @@
     "start": "node backend/server.js",
     "server": "nodemon backend/server.js",
     "client": "npm start --prefix frontend",
-    "dev": "concurrently \"npm run server\" \"npm run client\"",
-    "predeploy": "npm run build",
-    "deploy": "gh-pages -d build"
+    "dev": "concurrently \"npm run server\" \"npm run client\""
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
     "bcryptjs": "^2.4.3",
+    "cors": "^2.8.5",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "express-async-handler": "^1.2.0",

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
diff --git a/src/__init__.py b/src/__init__.py
diff --git a/src/components/__init__.py b/src/components/__init__.py
diff --git a/src/components/data_ingestion.py b/src/components/data_ingestion.py
diff --git a/src/components/data_transformation.py b/src/components/data_transformation.py
diff --git a/src/components/model_trainer.py b/src/components/model_trainer.py
diff --git a/src/exception.py b/src/exception.py
diff --git a/src/logger.py b/src/logger.py
diff --git a/src/pipeline/__init__.py b/src/pipeline/__init__.py
diff --git a/src/pipeline/predict_pipeline.py b/src/pipeline/predict_pipeline.py
diff --git a/src/pipeline/train_pipeline.py b/src/pipeline/train_pipeline.py
diff --git a/src/utils.py b/src/utils.py