Better handle focus perks

backend/Pipfile.lock

@@ -50,11 +50,11 @@
         },
         "markdown": {
             "hashes": [
-                "sha256:c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa",
+                "sha256:fc4a6f69a656b8d858d7503bda633f4dd63c2d70cf80abdc6eafa64c4ae8c250",
-                "sha256:d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"
+                "sha256:fe463ff51e679377e3624984c829022e2cfb3be5518726b06f608a07a3aad680"
             ],
             "index": "pypi",
-            "version": "==3.0.1"
+            "version": "==3.1"
         },
         "psycopg2-binary": {
             "hashes": [

backend/perks/admin.py

@@ -1,7 +1,8 @@
 from django.contrib import admin
 
-from .models import Tree, Perk
+from .models import Tree, Perk, User
 
 admin.site.register(Tree)
 admin.site.register(Perk)
+admin.site.register(User)
 

backend/perks/models.py

@@ -16,6 +16,9 @@ class Tree(models.Model):
 	def __str__(self):
 		return self.name
 
+	def __repr__(self):
+		return f'<Tree: {str(self)}>'
+
 	class Meta:
 		ordering = ('name',)
 
@@ -29,7 +32,10 @@ class Perk(models.Model):
 	trees = models.ManyToManyField('Tree', related_name='perks', symmetrical=False)
 
 	def __str__(self):
-		return f'{self.name}'
+		return f'{self.name} [{self.level}]'
+
+	def __repr__(self):
+		return f'<Perk: {str(self)}>'
 
 	class Meta:
 		ordering = ('name',)
@@ -39,3 +45,9 @@ class User(models.Model):
 	base_user = models.OneToOneField(AuthUser, on_delete=models.CASCADE)
 	perks = models.ManyToManyField(Perk, related_name='users', symmetrical=False)
 
+	def __str__(self):
+		return f'{self.base_user.username} ({self.id})'
+
+	def __repr__(self):
+		return f'<User: {str(self)}>'
+

backend/perks/parser.py

@@ -8,6 +8,7 @@
 
 import csv
 import re
+
 from .models import Tree, Perk
 
 requirement_pattern = re.compile(r'([\w\s]+) \(([\w\s]+)\)')
@@ -94,11 +95,19 @@ class PerkParser():
 					elif 'Skill Focus' in req_name or 'Ability Focus' in req_name:
 						req_match = re.match(requirement_pattern, req_name)
 						req_tree = Tree.objects.get(name=req_match.group(2))
-
 						req_base_name = req_match.group(1)
 						base_req = Perk.objects.get(name=req_base_name)
-
 						req = self.create_perk(name=req_name, effect=base_req.effect, level=base_req.level, perk_type=base_req.type, trees=[req_tree])
+						if 'Greater' in req_base_name:
+							greater_req_name = req_name[8:]
+							try:
+								greater_req = Perk.objects.get(name=greater_req_name)
+							except Perk.DoesNotExist:
+								greater_req_base_name = req_base_name[8:]
+								greater_base_req = Perk.objects.get(name=greater_req_base_name)
+								greater_req = self.create_perk(name=greater_req_name, effect=greater_base_req.effect, level=greater_base_req.level, perk_type=greater_base_req.type, trees=[req_tree])
+
+							req.parents.add(greater_req)
 					else:
 						req = self.create_perk(name=req_name, level=0, perk_type=4)
 				perk.parents.add(req)

frontend/src/apis/auth.api.js

@@ -23,10 +23,6 @@ export default class AuthApi {
 		return Axios.post(ENDPOINTS.LOGIN, data);
 	}
 
-	static signup(data) {
-		return Axios.post(ENDPOINTS.USER, data);
-	}
-
 	static changePassword(data) {
 		return Axios.patch(ENDPOINTS.USER, data);
 	}

frontend/src/apis/user.api.js

@@ -16,6 +16,10 @@ export default class AuthApi {
 		return Axios.get(ENDPOINTS.USER);
 	}
 
+	static createUser(data) {
+		return Axios.post(ENDPOINTS.USER, data);
+	}
+
 	static updatePerks(data) {
 		return Axios.patch(ENDPOINTS.USER, data);
 	}

frontend/src/components/app.vue

@@ -44,7 +44,10 @@ export default {
 					{ icon: 'fas fa-code-branch', text: 'Perk trees', to: { name: 'trees' } },
 					{ icon: 'fas fa-sign-out-alt', text: 'Logout', to: { name: 'logout' } },
 				],
-				false: [{ icon: 'fas fa-sign-in-alt', text: 'Login', to: { name: 'login' } }],
+				false: [
+					{ icon: 'fas fa-sign-in-alt', text: 'Login', to: { name: 'login' } },
+					{ icon: 'fas fa-user-plus ', text: 'Sign up', to: { name: 'signup' } },
+				],
 			},
 		};
 	},

frontend/src/components/auth/signup.component.vue

@@ -68,7 +68,7 @@
 					email: this.email,
 					password: this.password,
 				};
-				AuthController.register(data).then(() => {
+				AuthController.signup(data).then(() => {
 					this.$router.push({ name: 'index' });
 				}).catch((error) => {
 					if (error.response) {
@@ -83,8 +83,9 @@
 <style lang="stylus">
 .signup-form-card
 	padding 2rem
+	margin-top 5rem
 
-.login-errors
+.signup-errors
 	color red
 </style>
 

frontend/src/components/perks.component.vue

@@ -1,7 +1,7 @@
 <template>
 	<v-container class="perktree">
 		<v-layout row wrap>
-			<v-flex xl8 offset-xl2 sm12>
+			<v-flex xl10 offset-xl1 sm12>
 				<v-card>
 					<div id="perktree"></div>
 				</v-card>
@@ -129,10 +129,8 @@ export default {
 					const clickedNode = _.find(nodes, (n) => {
 						return n.name === node.name;
 					});
-					if (clickedNode.effect) {
+					this.selectedPerk = clickedNode;
-						this.selectedPerk = clickedNode;
+					this.dialog = true;
-						this.dialog = true;
-					}
 				})
 				.draw(graphData);
 		},

frontend/src/controllers/auth.controller.js

@@ -5,6 +5,8 @@
  * Distributed under terms of the BSD-3-Clause license.
  */
 
+import * as _ from 'lodash';
+
 import AuthApi from '../apis/auth.api';
 import router from '../router';
 import store from '../store';
@@ -38,24 +40,22 @@ export default class AuthController {
 	}
 
 	static setupToken() {
-		const access = this.getLocalStorageToken().access;
+		const access = AuthController.getLocalStorageToken().access;
-		AuthApi.setAuthHeader(access);
+		if (access) {
-		store.commit('login');
+			AuthApi.setAuthHeader(access);
+			store.commit('login');
+		}
 	}
 
 	static login(data) {
 		return AuthApi.login(data).then((response) => {
-			this.setLocalStorageToken(response.data);
+			AuthController.setLocalStorageToken(response.data);
-			this.setupToken(response.data);
+			AuthController.setupToken(response.data);
 		});
 	}
 
-	static signup(data) {
-		return AuthApi.signup(data);
-	}
-
 	static logout() {
-		this.clearLocalStorageToken();
+		AuthController.clearLocalStorageToken();
 		store.commit('logout');
 		AuthApi.setAuthHeader('');
 	}
@@ -65,7 +65,7 @@ export default class AuthController {
 	}
 
 	static verifyToken() {
-		const token = this.getLocalStorageToken().access;
+		const token = AuthController.getLocalStorageToken().access;
 		if (token === null) {
 			router.push('login');
 		}
@@ -73,22 +73,24 @@ export default class AuthController {
 	}
 
 	static refreshToken() {
-		if (!this.getLocalStorageRefresh()) {
+		if (!AuthController.getLocalStorageRefresh()) {
 			return Promise.reject(new Error('No token'));
 		}
 
 		const refresh = {
-			refresh: this.getLocalStorageToken().refresh,
+			refresh: AuthController.getLocalStorageToken().refresh,
 		};
 
+		_.delay(AuthController.refreshToken, 240000);
+
 		return AuthApi.refreshToken(refresh).then((response) => {
-			this.setLocalStorageToken(response.data);
+			AuthController.setLocalStorageToken(response.data);
-			this.setupToken();
+			AuthController.setupToken();
 		});
 	}
 
 	static getAuthStatus() {
-		const token = this.getLocalStorageToken().access;
+		const token = AuthController.getLocalStorageToken().access;
 		return Boolean(token);
 	}
 }

frontend/src/controllers/user.controller.js

@@ -12,6 +12,10 @@ export default class AuthController {
 		return UserApi.getUser();
 	}
 
+	static signup(data) {
+		return UserApi.signup(data);
+	}
+
 	static updatePerks(perks) {
 		const data = {
 			perks,

frontend/src/main.js

@@ -9,7 +9,7 @@ import './plugins/vuetify';
 import App from './components/app.vue';
 import { config } from './config';
 import router from './router';
-import store from './store';
+import store from './store/';
 import AuthController from './controllers/auth.controller';
 
 import 'roboto-fontface/css/roboto/roboto-fontface.css';
@@ -27,9 +27,7 @@ const configureHttp = () => {
 		},
 		(error) => {
 			if (error.response && error.response.status === 401) {
-				AuthController.refreshToken().then(() => {
+				AuthController.refreshToken().catch(() => {
-					router.push({ path: router.currentRoute.path });
-				}).catch(() => {
 					router.push({
 						name: 'logout',
 					});
@@ -42,12 +40,10 @@ const configureHttp = () => {
 };
 
 const configureRaven = () => {
-	if (config.getEnv() !== 'dev') {
+	Raven
-		Raven
+		.config('https://2b1b0eea285244289175e53d65421fac@sentry.theedgeofrage.com/3')
-			.config('https://2b1b0eea285244289175e53d65421fac@sentry.theedgeofrage.com/3')
+		.addPlugin(RavenVue, Vue)
-			.addPlugin(RavenVue, Vue)
+		.install();
-			.install();
-	}
 };
 
 configureHttp();

frontend/src/router.js

@@ -37,7 +37,7 @@ const router = new Router({
 		},
 		{
 			path: '/signup',
-			name: 'signpu',
+			name: 'signup',
 			component: Signup,
 			meta: {
 				guest: true,

frontend/src/store/auth.js

@@ -1,17 +1,12 @@
 /*
- * store.js
+ * auth.js
  * Copyright (C) 2019 pavle <pavle.portic@tilda.center>
  *
  * Distributed under terms of the BSD-3-Clause license.
  */
 
-import Vue from 'vue';
-import Vuex from 'vuex';
-
-Vue.use(Vuex);
-
 const state = {
-	authStatus: null,
+	authStatus: false,
 };
 
 const getters = {
@@ -27,9 +22,9 @@ const mutations = {
 	},
 };
 
-export default new Vuex.Store({
+export default {
 	state,
 	getters,
 	mutations,
-});
+};
 

frontend/src/store/index.js

@@ -0,0 +1,25 @@
+/*
+ * index.js
+ * Copyright (C) 2019 pavle <pavle.portic@tilda.center>
+ *
+ * Distributed under terms of the BSD-3-Clause license.
+ */
+
+import Vue from 'vue';
+import Vuex from 'vuex';
+
+import perks from './perks';
+import auth from './auth';
+
+Vue.use(Vuex);
+
+const storeData = {
+  modules: {
+    perks,
+    auth,
+  },
+};
+
+export default new Vuex.Store(storeData);
+
+

frontend/src/store/perks.js

@@ -0,0 +1,27 @@
+/*
+ * perks.js
+ * Copyright (C) 2019 pavle <pavle.portic@tilda.center>
+ *
+ * Distributed under terms of the BSD-3-Clause license.
+ */
+
+const state = {
+	perks: [],
+};
+
+const getters = {
+	perks: (state) => state.perks,
+};
+
+const mutations = {
+	setPerks(perks) {
+		state.perks = perks;
+	},
+};
+
+export default {
+	state,
+	getters,
+	mutations,
+};
+

frontend/vue.config.js

@@ -6,8 +6,8 @@
  */
 
 module.exports = {
-  devServer: {
+	devServer: {
-    disableHostCheck: true,
+		disableHostCheck: true,
-    public: 'perktree.localhost',
+		public: 'perktree.localhost',
-  },
+	},
 };