'bakcend

api/check-user.ts

@@ -1,21 +1,15 @@
 import { NowRequest, NowResponse } from '@vercel/node';
-import { connect, connection } from 'mongoose';
+import { connection } from 'mongoose';
 
-import { verifyToken } from '../utils/auth';
-
-const {
-  MONGO_USER,
-  MONGO_PASSWORD,
-} = process.env;
+import { connectDB } from '../utils/db';
+connectDB();
 
-connect(`mongodb+srv://${MONGO_USER}:${MONGO_PASSWORD}@cluster0.oj6kf.mongodb.net/proactive?retryWrites=true&w=majority`, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true,
-});
+import { verifyToken } from '../utils/auth';
 
 export default async function (req: NowRequest, res: NowResponse) {
   try {
     let user = await verifyToken(req);
+
     connection.close();
     return res.send(user);
   } catch (error) {

api/get-items.ts

@@ -1,16 +1,19 @@
 import { NowRequest, NowResponse } from '@vercel/node';
-import { connect } from 'mongoose';
+import { connection } from 'mongoose';
 
-const {
-  MONGO_USER,
-  MONGO_PASSWORD,
-} = process.env;
+import { connectDB } from '../utils/db';
+connectDB();
 
-connect(`mongodb+srv://${MONGO_USER}:${MONGO_PASSWORD}@cluster0.oj6kf.mongodb.net/proactive?retryWrites=true&w=majority`, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true,
-});
+import { Item } from '../models';
+import { verifyToken } from '../utils/auth';
 
 export default async function (req: NowRequest, res: NowResponse) {
-  return res.status(200).send('Hello');
+  let user = await verifyToken(req);
+
+  let items = await Item.find({
+    user,
+  });
+
+  connection.close();
+  return res.status(200).send(items);
 }

api/login.ts

@@ -1,25 +1,16 @@
 import { NowRequest, NowResponse } from '@vercel/node';
-import { connect, connection } from 'mongoose';
+import { connection } from 'mongoose';
 
-import * as models from '../models/index.js';
-import { login } from '../utils/auth.js';
+import { connectDB } from '../utils/db';
+connectDB();
 
-const User = models.default.User.default;
-
-const {
-  MONGO_USER,
-  MONGO_PASSWORD,
-} = process.env;
-
-connect(`mongodb+srv://${MONGO_USER}:${MONGO_PASSWORD}@cluster0.oj6kf.mongodb.net/proactive?retryWrites=true&w=majority`, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true,
-});
+import { User } from '../models';
+import { login } from '../utils/auth';
 
 export default async function (req: NowRequest, res: NowResponse) {
   try {
     const existingUser = await User.findOne({
-      username: req.body.username
+      username: req.body.username,
     });
 
     if (!existingUser || !await existingUser.comparePassword(req.body.password)) {

api/register.ts

@@ -0,0 +1,32 @@
+import { NowRequest, NowResponse } from '@vercel/node';
+import { connection } from 'mongoose';
+
+import { connectDB } from '../utils/db';
+connectDB();
+
+import { User } from '../models';
+import { register } from '../utils/auth';
+
+export default async function (req: NowRequest, res: NowResponse) {
+  try {
+    const existingUser = await User.findOne({
+      username: req.body.username
+    });
+
+    if (existingUser) {
+      return res.status(400).send('Username taken');
+    }
+
+    let user = new User({
+      username: req.body.username,
+      password: req.body.password,
+    });
+
+    await user.save();
+
+    return await register(user, res, connection);
+  } catch (error) {
+    connection.close();
+    return res.status(502).send(error);
+  }
+}

models/Item.js

@@ -46,5 +46,4 @@ const schema = new mongoose.Schema({
   },
 });
 
-const Item = mongoose.model('Item', schema);
-export default Item;
+export const Item = mongoose.model('Item', schema);

models/User.js

@@ -4,7 +4,7 @@ const bcrypt = require('bcrypt');
 const { removeOldTokens } = require('../utils/auth');
 
 const {
-  SERVER_SECRET
+  SALT_ROUNDS,
 } = process.env;
 
 const schema = new mongoose.Schema({
@@ -16,10 +16,6 @@ const schema = new mongoose.Schema({
     type: String,
     required: true,
   },
-  name: {
-    type: String,
-    required: true,
-  },
   tokens: [],
 });
 
@@ -29,8 +25,7 @@ schema.pre('save', async function(next) {
   }
 
   try {
-    const salt = await bcrypt.genSalt(SERVER_SECRET);
-    const hash = await bcrypt.hash(this.password, salt);
+    const hash = await bcrypt.hashSync(this.password, parseInt(SALT_ROUNDS));
 
     this.password = hash;
     next();
@@ -68,21 +63,4 @@ schema.methods.removeOldTokens = function() {
   this.tokens = removeOldTokens(this.tokens);
 }
 
-// // middleware to validate user account
-// schema.statics.verify = async function(req, res, next) {
-//   // look up user account
-//   const user = await User.findOne({
-//     _id: req.user_id
-//   });
-//   if (!user || !user.tokens.includes(req.token))
-//     return res.clearCookie('token').status(403).send({
-//       error: "Invalid user account."
-//     });
-
-//   req.user = user;
-
-//   next();
-// }
-
-const User = mongoose.model('User', schema);
-export default User;
+export const User = mongoose.model('User', schema);

models/index.ts

@@ -0,0 +1,2 @@
+export { User } from './User';
+export { Item } from './Item';

public/index.html

@@ -5,13 +5,13 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>Proactive</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but Proactive doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

src/App.vue

@@ -1,21 +1,26 @@
 <template>
   <div class="content">
     <div class="nav-container">
+      <nav-button image="home" />
+
       <h1>
         PROACTIVE
       </h1>
+
+      <nav-button image="settings" />
     </div>
 
     <router-view />
   </div>
 </template>
 
 <script>
+import NavButton from '@/components/NavButton.vue';
 
 export default {
   name: 'App',
   components: {
-
+    NavButton,
   },
   data: () => ({
 
@@ -35,7 +40,7 @@ html {
   border-radius: 5px;
   color: #384b5f;
   font-family: 'Roboto Slab', serif;
-  max-width: 1248px;
+  max-width: 1246px;
   margin: 0 auto;
   margin-top: 10px;
   min-height: calc(100vh - 20px);
@@ -57,7 +62,7 @@ html {
   color: #516477;
   font-weight: lighter;
   margin-top: 15px;
-  opacity: .1;
+  opacity: .3;
   text-shadow: 0px 0px 0px rgba(0, 0, 0, 0.61);
   transition: all .2s ease;
 }

src/api/auth/index.js

@@ -0,0 +1,20 @@
+import axios from 'axios';
+
+export default {
+  async getUser() {
+    let response = await axios.get('/api/check-user');
+    return response.data;
+  },
+  async login(payload) {
+    let response = await axios.put('/api/login', payload);
+    return response.data;
+  },
+  async register(payload) {
+    let response = await axios.put('/api/register', payload);
+    return response.data;
+  },
+  async logout() {
+    let response = await axios.put('/api/logout');
+    return response.data;
+  },
+};

src/api/index.js

@@ -0,0 +1,7 @@
+import auth from './auth';
+import items from './items';
+
+export default {
+  auth,
+  items,
+};

src/api/items/index.js

@@ -0,0 +1,14 @@
+export default {
+  getItems() {
+    return [];
+  },
+  getItem() {
+    return 0;
+  },
+  editItem() {
+    return 0;
+  },
+  deleteItem() {
+    return 0;
+  },
+};