diff --git a/juggl-vue/package.json b/juggl-vue/package.json index bbc1528..ce99b45 100644 --- a/juggl-vue/package.json +++ b/juggl-vue/package.json @@ -12,7 +12,7 @@ "bootstrap": "^4.5.3", "bootstrap-vue": "^2.21.1", "core-js": "^3.6.5", - "vue": "^2.6.11", + "vue": "^2.6.12", "vue-router": "^3.2.0", "vuex": "^3.4.0" }, diff --git a/juggl-vue/src/components/base/BaseLogo.vue b/juggl-vue/src/components/base/BaseLogo.vue index c6f5f7a..901a3ef 100644 --- a/juggl-vue/src/components/base/BaseLogo.vue +++ b/juggl-vue/src/components/base/BaseLogo.vue @@ -4,7 +4,7 @@ @@ -25,13 +25,13 @@ export default { } }, computed: { - heightSize: function() { + widthSize: function() { let sizes = { mini: "35px", - normal: "64px", tiny: "80px", smaller: "110px", small: "150px", + normal: "175px", medium: "300px", large: "450px", big: "600px", diff --git a/juggl-vue/src/components/base/BaseUserDropdown.vue b/juggl-vue/src/components/base/BaseUserDropdown.vue new file mode 100644 index 0000000..e40e9cb --- /dev/null +++ b/juggl-vue/src/components/base/BaseUserDropdown.vue @@ -0,0 +1,22 @@ + + + Log out + + + + + + \ No newline at end of file diff --git a/juggl-vue/src/components/forms/FormLogin.vue b/juggl-vue/src/components/forms/FormLogin.vue index 35065e2..8c6c6f4 100644 --- a/juggl-vue/src/components/forms/FormLogin.vue +++ b/juggl-vue/src/components/forms/FormLogin.vue @@ -1,10 +1,9 @@ - + Password or email invalid. - + + Log in @@ -41,7 +41,8 @@ export default { user_id: null, api_key: null }, - failed: false + failed: false, + working: false }; }, methods: { @@ -50,14 +51,16 @@ export default { */ submitForm: function(e) { e.preventDefault(); + this.failed = false; + this.working = true; // Try to login - store.dispatch("login") - .login(this.form.user_id, this.form.api_key) + store.dispatch("login", { userId: this.form.user_id, apiKey: this.form.api_key}) .then(r => { if (r !== true) { this.failed = true; - return; + this.working = false; + return false; } // On success redirect to target or dashboard @@ -68,6 +71,7 @@ export default { .catch(e => { console.log(e); this.failed = true; + this.working = false; }); return false; diff --git a/juggl-vue/src/components/juggl/JugglProjectsPanel.vue b/juggl-vue/src/components/juggl/JugglProjectsPanel.vue new file mode 100644 index 0000000..663ec3d --- /dev/null +++ b/juggl-vue/src/components/juggl/JugglProjectsPanel.vue @@ -0,0 +1,74 @@ + + + startProject(project.project_id)"> + {{project.name}} + {{getDurationTimestamp(project)}} + {{project.record_count}} records + + + + + + + \ No newline at end of file diff --git a/juggl-vue/src/components/juggl/JugglRecordsList.vue b/juggl-vue/src/components/juggl/JugglRecordsList.vue new file mode 100644 index 0000000..a7fb268 --- /dev/null +++ b/juggl-vue/src/components/juggl/JugglRecordsList.vue @@ -0,0 +1,97 @@ + + + + + + + + + + + {{ getProject(data.item.project_id).name }} + + + + {{ data.item.start_time }} + + + + {{ data.item.duration }} + + + + + + + + + + abortRecord(data.item.record_id)" variant="outline-danger"> + + + + + + + + + \ No newline at end of file diff --git a/juggl-vue/src/views/Login.vue b/juggl-vue/src/views/Login.vue index aee528e..0ac492f 100644 --- a/juggl-vue/src/views/Login.vue +++ b/juggl-vue/src/views/Login.vue @@ -1,7 +1,6 @@ - Go to home
{{getDurationTimestamp(project)}}
{{project.record_count}} records