+
+
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/src/components/NavButton.vue b/src/components/NavButton.vue
new file mode 100644
index 0000000..da85748
--- /dev/null
+++ b/src/components/NavButton.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Register.vue b/src/components/Register.vue
index ea38eb5..a06ae6e 100644
--- a/src/components/Register.vue
+++ b/src/components/Register.vue
@@ -1,11 +1,76 @@
- + Login to your Account +
+
+
+ Register Instead
+
+
+
+ Submit
+
+
+ ) => {
return tokens.filter(token => {
try {
- jwt.verify(token, process.env.SERVER_SECRET);
+ jsonwebtoken.verify(token, process.env.SERVER_SECRET);
return true;
} catch (error) {
return false;
@@ -56,3 +53,16 @@ export const login = async (user, res, connection) => {
connection.close();
return res.status(200).send(user);
}
+
+export const register = async (user, res, connection) => {
+ let token = generateToken({
+ id: user._id,
+ }, "24h");
+
+ user.addToken(token);
+ await user.save();
+
+ res.setHeader('Set-Cookie', [`proactive-token=${token}; SameSite=Strict`]);
+ connection.close();
+ return res.status(200).send(user);
+}
diff --git a/utils/db.ts b/utils/db.ts
new file mode 100644
index 0000000..831b326
--- /dev/null
+++ b/utils/db.ts
@@ -0,0 +1,13 @@
+import { connect } from 'mongoose';
+
+const {
+ MONGO_USER,
+ MONGO_PASSWORD,
+} = process.env;
+
+export const connectDB = () => {
+ connect(`mongodb+srv://${MONGO_USER}:${MONGO_PASSWORD}@cluster0.oj6kf.mongodb.net/proactive?retryWrites=true&w=majority`, {
+ useNewUrlParser: true,
+ useUnifiedTopology: true,
+ });
+};
+
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 6b9c034..a62e523 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,14 +1,16 @@
-import Vue from 'vue'
-import App from './App.vue'
-import router from './router'
-import store from './store'
+import Vue from 'vue';
+
+import router from './router';
+import store from './store';
import vuetify from './plugins/vuetify';
-Vue.config.productionTip = false
+import App from './App.vue';
+
+Vue.config.productionTip = false;
new Vue({
router,
store,
vuetify,
render: h => h(App)
-}).$mount('#app')
+}).$mount('#app');
diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
index ec46adb..bc411ef 100644
--- a/src/plugins/vuetify.js
+++ b/src/plugins/vuetify.js
@@ -4,4 +4,21 @@ import Vuetify from 'vuetify/lib';
Vue.use(Vuetify);
export default new Vuetify({
+ theme: {
+ dark: false,
+ themes: {
+ light: {
+ primary: '#186FC0',
+ secondary: '#b0bec5',
+ accent: '#8c9eff',
+ error: '#b71c1c',
+ },
+ dark: {
+ primary: '#186FC0',
+ secondary: '#b0bec5',
+ accent: '#8c9eff',
+ error: '#b71c1c',
+ },
+ },
+ },
});
diff --git a/src/store/modules/items.js b/src/store/modules/items.js
index 4e49f0d..246f607 100644
--- a/src/store/modules/items.js
+++ b/src/store/modules/items.js
@@ -1,23 +1,25 @@
const state = {
items: [],
- item: null,
- deleted: false,
+ id: null,
};
const getters = {
-
+ item: (state) => {
+ for (let i = 0; i < state.items.length; i += 1) {
+ if (state.items[i]._id === state.id) {
+ return state.items[i];
+ }
+ }
+ return null;
+ }
};
const mutations = {
setItems(state, items) {
- for (var i = 0; i < items.length; i++)
- {
- items[i].menu = false;
- }
state.items = items;
},
- setItem(state, item) {
- state.item = item;
+ setID(state, id) {
+ state.id = id;
},
setDeleted(state, deleted) {
state.deleted = deleted;
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a2462c2..21de53f 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,25 +1,38 @@
+import api from '@/api';
+
const state = {
user: null,
- loginRegister: -1,
};
const getters = {
-
+ user: (state) => state.user,
};
const mutations = {
setUser(state, user) {
state.user = user;
},
- setLoginOrRegister(state) {
- if (state.loginRegister == -1) {state.loginRegister = 1;}
- else if (state.loginRegister == 1) {state.loginRegister = 0;}
- else {state.loginRegister = 1;}
- },
};
const actions = {
+ async getUser() {
+
+ },
+ async login({ commit }, payload) {
+ let user = await api.auth.login(payload);
+ if (user) {
+ commit('setUser', user);
+ }
+ },
+ async register({ commit }, payload) {
+ let user = await api.auth.register(payload);
+ if (user) {
+ commit('setUser', user);
+ }
+ },
+ async logout() {
+ },
};
const module = {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 8814fa7..f1ffff4 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,33 +1,31 @@
+ Register for an Account +
+
+
+ Login Instead
+
+
+
+ Submit
+
+
-
\ No newline at end of file
diff --git a/utils/auth.ts b/utils/auth.ts
index ddd27c1..d590f8a 100644
--- a/utils/auth.ts
+++ b/utils/auth.ts
@@ -1,14 +1,11 @@
import { NowRequest } from '@vercel/node';
-import * as jwt from 'jsonwebtoken';
+import * as jsonwebtoken from 'jsonwebtoken';
-import * as models from '../models/index.js';
+import { User } from '../models';
-const User = models.default.User.default;
-
-// Generate a token
export const generateToken = (data: object, expires: any) => {
- return jwt.sign(data, process.env.SERVER_SECRET, {
- expiresIn: expires
+ return jsonwebtoken.sign(data, process.env.SERVER_SECRET, {
+ expiresIn: expires,
});
};
@@ -18,7 +15,7 @@ export const verifyToken = async (req: NowRequest) => {
return null;
}
try {
- const decoded = jwt.verify(token, process.env.SERVER_SECRET);
+ const decoded = jsonwebtoken.verify(token, process.env.SERVER_SECRET);
if ('id' in decoded) {
let existingUser = await User.findOne({
_id: decoded.id,
@@ -35,7 +32,7 @@ export const verifyToken = async (req: NowRequest) => {
export const removeOldTokens = (tokens: Array
-
-
+