Fix

firtanaelif · Dec 13, 2020 · faae632 · faae632
1 parent ad5a217
commit faae632
Show file tree

Hide file tree

Showing 30 changed files with 1,628 additions and 1,119 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/backend/config.js b/backend/config.js
@@ -3,6 +3,7 @@ import dotenv from 'dotenv';
 dotenv.config();
 
 export default {
+    PORT: process.env.PORT || 5000,
     MONGODB_URL: process.env.MONGODB_URL,
     JWT_SECRET: process.env.JWT_SECRET
 };
diff --git a/backend/models/userModel.js b/backend/models/userModel.js
@@ -11,7 +11,5 @@ const userSchema = new mongoose.Schema({
     password: { type: String, required: true },
     isAdmin: { type: Boolean, required: true, default: false },
 });
-
 const User = mongoose.model('User', userSchema);
-
 export default User;
diff --git a/backend/routers/userRouter.js b/backend/routers/userRouter.js
@@ -10,9 +10,9 @@ userRouter.get(
     expressAsyncHandler(async (req, res) => {
         try {
             const user = new User({
-                name: 'elif',
-                email: 'firtana.elif@gmail.com',
-                password: 'elif12345',
+                name: 'admin',
+                email: 'admin@example.com',
+                password: '123456',
                 isAdmin: true,
             });
             const createdUser = await user.save();
@@ -45,4 +45,3 @@ userRouter.post(
     })
 );
 export default userRouter;
-
diff --git a/backend/server.js b/backend/server.js
@@ -2,9 +2,9 @@ import express from 'express';
 import cors from 'cors';
 import mongoose from 'mongoose';
 import bodyParser from 'body-parser';
-import data from './data';
 import config from './config';
 import userRouter from './routers/userRouter';
+import data from './data';
 mongoose
     .connect(config.MONGODB_URL, {
         useNewUrlParser: true,
@@ -36,6 +36,6 @@ app.use((err, req, res, next) => {
     const status = err.name && err.name === 'ValidationError' ? 400 : 500;
     res.status(status).send({ message: err.message });
 });
-app.listen(5000, () => {
+app.listen(config.PORT, () => {
     console.log('serve at http://localhost:5000');
 });
diff --git a/frontend/index.html b/frontend/index.html
@@ -1,27 +1,27 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
-    <meta charset="UTF-8">
-    <meta content="width=device-width, initial-scale=1.0" name="viewport">
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link
             rel="stylesheet"
             href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
     />
-    <link href="style.css" rel="stylesheet">
-    <title>/// QR-MENU</title>
-    <script src="src/index.js" type="module"></script>
+    <link
+            rel="stylesheet"
+            href="https://cdn.jsdelivr.net/chartist.js/latest/chartist.min.css"
+    />
+    <link rel="stylesheet" href="style.css" />
+    <title>QR CODE</title>
 </head>
-
 <body>
 <div class="grid-container">
     <header id="header-container"></header>
     <main id="main-container"></main>
     <footer>
-        All right reserved by @firtanaelif
+        All rights reserved @firtanaelif
     </footer>
 </div>
-<script src="main.js" type="module"></script>
+<script src="main.js"></script>
 </body>
-
 </html>
diff --git a/frontend/node_modules/.yarn-integrity b/frontend/node_modules/.yarn-integrity
diff --git a/frontend/node_modules/express-async-handler/.travis.yml b/frontend/node_modules/express-async-handler/.travis.yml
diff --git a/frontend/node_modules/express-async-handler/README.md b/frontend/node_modules/express-async-handler/README.md
diff --git a/frontend/node_modules/express-async-handler/index.d.ts b/frontend/node_modules/express-async-handler/index.d.ts
diff --git a/frontend/node_modules/express-async-handler/index.js b/frontend/node_modules/express-async-handler/index.js
diff --git a/frontend/node_modules/express-async-handler/package.json b/frontend/node_modules/express-async-handler/package.json
diff --git a/frontend/node_modules/express-async-handler/test.js b/frontend/node_modules/express-async-handler/test.js