LL-250 (#91)

.gitignore

@@ -13,6 +13,7 @@
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local

docker-compose.yaml

@@ -1,27 +1,34 @@
-version: "3.8"
-
-services:
-  account:
-    build: "src/account/"
-    command: "npm run account"
-    ports: 
-      - "5000:5000" 
-    env_file: "src/account/.env"
-    dns:
-      - "8.8.8.8"
-  routes:
-    build: "src/routes/"
-    command: "npx ts-node github.ts"
-    ports:
-      - "4000:4000"
-      - "8080:8080"
-    env_file: "src/routes/.env"
-#   client:
-#     build: "client/"
-#     command: "npm start"
-#     ports:
-#       - "3000:3000"
-#     env_file: ".env"
-# # Requires server services to run before running client servers
-#     depends_on:
-#       - "server"
+
+version: "3.8"
+
+services:
+  # account:
+  #   build: "src/account/"
+  #   command: "npm run account"
+  #   ports: 
+  #     - "5000:5000" 
+  #   env_file: "src/account/.env"
+  #   dns:
+  #     - "8.8.8.8"
+  models:
+    build: "src/models/"
+    command: "echo Models Container Working"
+  routes:
+    build: "src/routes/"
+    command: "npx ts-node github.ts"
+    ports:
+      - "4000:4000"
+      - "8080:8080"
+    env_file: "src/routes/.env"
+    depends_on:
+      - "models"
+  client:
+    build: "client/"
+    command: "npm start"
+    ports:
+      - "3000:3000"
+    env_file: "src/routes/.env"
+# Requires server services to run before running client servers
+    depends_on:
+      # - "account"
+      - "routes"

package.json

@@ -26,4 +26,4 @@
     "@types/mongoose": "^5.11.97",
     "@types/node": "^20.10.0"
   }
-}
+}

src/models/Dockerfile

@@ -0,0 +1,9 @@
+FROM node:latest
+
+WORKDIR /models
+
+# Copies files from the models directory
+COPY ["DeviceSchema.ts", "/models"]
+COPY ["UserSchema.ts", "/models"]
+
+RUN ["/bin/bash", "-c", "echo Models Image Built!"]

src/routes/github.ts

@@ -66,8 +66,7 @@ router.get("/github/callback", async (req: any, res: any) => {
 
   const user = await getUser({ code });
 
-  console.log(user);
-  res.redirect("http://localhost:3000")
+  res.send(user);
 })
 
 export {};

src/routes/routes.ts

@@ -1,41 +1,41 @@
 const express = require("express");
-const User = require("../models/UserSchema")
+// const User = require("../models/UserSchema");
 
 export const router = express.Router()
 
 // Register method
-router.post('/register', (req: any, res: any) => {
-    const user = new User({
-        email:req.body.email,
-        name:req.body.name
-    })
-    user.save(function (err: any, res: any) {
-        if (err) {
-            console.log(err)
-        }
-        else {
-            console.log(res)
-        }
-    })
-})
+// router.post('/register', (req: any, res: any) => {
+//     const user = new User({
+//         email:req.body.email,
+//         name:req.body.name
+//     })
+//     user.save(function (err: any, res: any) {
+//         if (err) {
+//             console.log(err)
+//         }
+//         else {
+//             console.log(res)
+//         }
+//     })
+// })
 
 // Get all method
 
 // Get one method
-router.post('/account', async (req: any, res: any) => {
-    User.find({}, function(err: any, users: any) {
-        let loginIn = false
+// router.post('/account', async (req: any, res: any) => {
+//     User.find({}, function(err: any, users: any) {
+//         let loginIn = false
 
-        // Check if one of the users in the db is already present
-        // If so set that equal to flag, if not then indicate the user isn't registered
-        users.forEach(function(user: any) {
-          if (req.body.email === user.email)
-            loginIn = true
-        });
+//         // Check if one of the users in the db is already present
+//         // If so set that equal to flag, if not then indicate the user isn't registered
+//         users.forEach(function(user: any) {
+//           if (req.body.email === user.email)
+//             loginIn = true
+//         });
 
-        res.send({'success' : loginIn});
-    });
-})
+//         res.send({'success' : loginIn});
+//     });
+// })
 
 // Update one
 

yarn.lock

@@ -10591,4 +10591,4 @@ [email protected]:
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==