This commit is contained in:
2019-11-08 20:50:41 +00:00
parent 3da9ab8049
commit 4bc52914f4
3 changed files with 46 additions and 12 deletions

View File

@@ -52,8 +52,9 @@ http://localhost:8080/login
CURRENT WORK: CURRENT WORK:
- Mini login screen layout fucked
- Replace dialog, confirm etc with my own implementations as stock as possible - Replace dialog, confirm etc with my own implementations as stock as possible
- Get edit form existing features completely working
================================================= =================================================

View File

@@ -1,7 +1,7 @@
<template> <template>
<v-app> <v-app>
<gznotify ref="gznotify"></gznotify> <gznotify ref="gznotify"></gznotify>
<!-- <gzconfirm ref="gzconfirm"></gzconfirm> --> <gzconfirm ref="gzconfirm"></gzconfirm>
<!-- <gztest ref="gztest"></gztest> --> <!-- <gztest ref="gztest"></gztest> -->
<v-navigation-drawer v-if="isAuthenticated" v-model="drawer" app> <v-navigation-drawer v-if="isAuthenticated" v-model="drawer" app>
<v-list dense> <v-list dense>
@@ -117,15 +117,14 @@
<script> <script>
/* xeslint-disable */ /* xeslint-disable */
import aboutInfo from "./api/aboutinfo"; import aboutInfo from "./api/aboutinfo";
//import gzconfirm from "./components/gzconfirm"; import gzconfirm from "./components/gzconfirm";
import gznotify from "./components/gznotify"; import gznotify from "./components/gznotify";
//import gztest from "./components/gztest"; //import gztest from "./components/gztest";
export default { export default {
components: { components: {
//gztest //gztest
//gzconfirm gzconfirm,
// ,
gznotify gznotify
}, },
data() { data() {
@@ -155,7 +154,7 @@ export default {
window.$gz.eventBus.$off(); window.$gz.eventBus.$off();
}, },
mounted() { mounted() {
//this.$root.$gzconfirm = this.$refs.gzconfirm.open; this.$root.$gzconfirm = this.$refs.gzconfirm.open;
this.$root.$gznotify = this.$refs.gznotify.addNotification; this.$root.$gznotify = this.$refs.gznotify.addNotification;
//redirect to login if not authenticated //redirect to login if not authenticated

View File

@@ -1,6 +1,7 @@
<!--
<template> <template>
<v-dialog <v-dialog
v-model="dialog" v-model="isVisible"
:max-width="options.width" :max-width="options.width"
:style="{ zIndex: options.zIndex }" :style="{ zIndex: options.zIndex }"
@keydown.esc="cancel" @keydown.esc="cancel"
@@ -18,7 +19,40 @@
</v-card> </v-card>
</v-dialog> </v-dialog>
</template> </template>
-->
<template>
<div class="text-center">
<v-dialog
persistent
v-model="isVisible"
:max-width="options.width"
@keydown.esc="cancel"
>
<v-card>
<v-card-title
class="headline lighten-2"
v-bind:class="options.type"
primary-title
>
{{ title }}
</v-card-title>
<v-card-text>
{{ message }}
</v-card-text>
<v-divider></v-divider>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="primary" text @click="isVisible = false">
I accept
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</div>
</template>
<script> <script>
/** /**
* Vuetify Confirm Dialog component * Vuetify Confirm Dialog component
@@ -50,20 +84,20 @@
*/ */
export default { export default {
data: () => ({ data: () => ({
dialog: false, isVisible: false,
resolve: null, resolve: null,
reject: null, reject: null,
message: null, message: null,
title: null, title: null,
options: { options: {
color: "primary", type: "warning", //one of success, info, warning, and error, see v-alert docs for more info
width: 290, width: 290,
zIndex: 200 zIndex: 200
} }
}), }),
methods: { methods: {
open(title, message, options) { open(title, message, options) {
this.dialog = true; this.isVisible = true;
this.title = title; this.title = title;
this.message = message; this.message = message;
this.options = Object.assign(this.options, options); this.options = Object.assign(this.options, options);
@@ -74,11 +108,11 @@ export default {
}, },
agree() { agree() {
this.resolve(true); this.resolve(true);
this.dialog = false; this.isVisible = false;
}, },
cancel() { cancel() {
this.resolve(false); this.resolve(false);
this.dialog = false; this.isVisible = false;
} }
} }
}; };