This commit is contained in:
@@ -53,7 +53,7 @@ http://localhost:8080/login
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
Implemented all changes to bring up to 2.x AFAIK, now need to fixup layout then get into edit form and grid again.
|
Grid not taking 25, 99 etc, stuck at 5 initial value for rows per page and that's what fetches off the server as well
|
||||||
|
|
||||||
|
|
||||||
Vuetify dialog changes - https://github.com/yariksav/vuetify-dialog/issues/46
|
Vuetify dialog changes - https://github.com/yariksav/vuetify-dialog/issues/46
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* Xeslint-disable */
|
/* eslint-disable */
|
||||||
|
|
||||||
var devModeShowErrors = false;
|
var devModeShowErrors = false;
|
||||||
|
|
||||||
@@ -7,6 +7,7 @@ var devModeShowErrors = false;
|
|||||||
// Localize, Log and optionally display errors
|
// Localize, Log and optionally display errors
|
||||||
// return localized message in case caller needs it
|
// return localized message in case caller needs it
|
||||||
function dealWithError(msg, vm) {
|
function dealWithError(msg, vm) {
|
||||||
|
debugger;
|
||||||
msg = window.$gz.locale.translateString(msg);
|
msg = window.$gz.locale.translateString(msg);
|
||||||
//In some cases the error may not be localizable, if this is not a debug run then it should show without the ?? that localizing puts in keys not found
|
//In some cases the error may not be localizable, if this is not a debug run then it should show without the ?? that localizing puts in keys not found
|
||||||
//so it's not as wierd looking to the user
|
//so it's not as wierd looking to the user
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* xeslint-disable */
|
/* Xeslint-disable */
|
||||||
|
|
||||||
function addNavItem(title, icon, route) {
|
function addNavItem(title, icon, route) {
|
||||||
window.$gz.store.commit("addNavItem", {
|
window.$gz.store.commit("addNavItem", {
|
||||||
@@ -144,7 +144,7 @@ export default function initialize() {
|
|||||||
if (res.data.timeZoneOffset != localOffset) {
|
if (res.data.timeZoneOffset != localOffset) {
|
||||||
//TODO: localize message and also actually have a fix for it here
|
//TODO: localize message and also actually have a fix for it here
|
||||||
//so this should be a confirm prompt but for now will just show it
|
//so this should be a confirm prompt but for now will just show it
|
||||||
|
|
||||||
//for now just show the message
|
//for now just show the message
|
||||||
window.$gz.eventBus.$emit(
|
window.$gz.eventBus.$emit(
|
||||||
"notify-info",
|
"notify-info",
|
||||||
|
|||||||
@@ -143,13 +143,13 @@ Actual in inspector browser code:
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
//set default values for form settings if they are not present yet
|
//set default values for form settings if they are not present yet
|
||||||
if (!formSettings.saved || !formSettings.saved.rowsPerPage) {
|
if (!formSettings.saved || !formSettings.saved.itemsPerPage) {
|
||||||
that.localFormSettings = {
|
that.localFormSettings = {
|
||||||
pagination: {}
|
pagination: {}
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
that.localFormSettings.pagination = {
|
that.localFormSettings.pagination = {
|
||||||
rowsPerPage: formSettings.saved.rowsPerPage,
|
itemsPerPage: formSettings.saved.itemsPerPage,
|
||||||
sortBy: [formSettings.saved.sortBy],
|
sortBy: [formSettings.saved.sortBy],
|
||||||
descending: formSettings.saved.descending
|
descending: formSettings.saved.descending
|
||||||
};
|
};
|
||||||
@@ -232,6 +232,7 @@ Actual in inspector browser code:
|
|||||||
//console.log(this.selected);
|
//console.log(this.selected);
|
||||||
},
|
},
|
||||||
getDataFromApi() {
|
getDataFromApi() {
|
||||||
|
//debugger;
|
||||||
var that = this;
|
var that = this;
|
||||||
var listOptions = {
|
var listOptions = {
|
||||||
offset: 0,
|
offset: 0,
|
||||||
@@ -241,13 +242,13 @@ Actual in inspector browser code:
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (
|
if (
|
||||||
this.localFormSettings.pagination.rowsPerPage &&
|
this.localFormSettings.pagination.itemsPerPage &&
|
||||||
this.localFormSettings.pagination.rowsPerPage > 0
|
this.localFormSettings.pagination.itemsPerPage > 0
|
||||||
) {
|
) {
|
||||||
listOptions.offset =
|
listOptions.offset =
|
||||||
(this.localFormSettings.pagination.page - 1) *
|
(this.localFormSettings.pagination.page - 1) *
|
||||||
this.localFormSettings.pagination.rowsPerPage;
|
this.localFormSettings.pagination.itemsPerPage;
|
||||||
listOptions.limit = this.localFormSettings.pagination.rowsPerPage;
|
listOptions.limit = this.localFormSettings.pagination.itemsPerPage;
|
||||||
}
|
}
|
||||||
listOptions.sort = this.localFormSettings.pagination.sortBy;
|
listOptions.sort = this.localFormSettings.pagination.sortBy;
|
||||||
listOptions.asc = !this.localFormSettings.pagination.descending;
|
listOptions.asc = !this.localFormSettings.pagination.descending;
|
||||||
@@ -256,12 +257,12 @@ Actual in inspector browser code:
|
|||||||
if (
|
if (
|
||||||
that.localFormSettings &&
|
that.localFormSettings &&
|
||||||
that.localFormSettings.pagination &&
|
that.localFormSettings.pagination &&
|
||||||
that.localFormSettings.pagination.rowsPerPage
|
that.localFormSettings.pagination.itemsPerPage
|
||||||
) {
|
) {
|
||||||
window.$gz.form.setFormSettings(FORM_KEY, {
|
window.$gz.form.setFormSettings(FORM_KEY, {
|
||||||
temp: { page: that.localFormSettings.pagination.page },
|
temp: { page: that.localFormSettings.pagination.page },
|
||||||
saved: {
|
saved: {
|
||||||
rowsPerPage: that.localFormSettings.pagination.rowsPerPage,
|
itemsPerPage: that.localFormSettings.pagination.itemsPerPage,
|
||||||
sortBy: that.localFormSettings.pagination.sortBy,
|
sortBy: that.localFormSettings.pagination.sortBy,
|
||||||
descending: that.localFormSettings.pagination.descending
|
descending: that.localFormSettings.pagination.descending
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* XXXeslint-disable */
|
/* eslint-disable */
|
||||||
import "@babel/polyfill";
|
import "@babel/polyfill";
|
||||||
import "@fortawesome/fontawesome-free/css/all.css";
|
import "@fortawesome/fontawesome-free/css/all.css";
|
||||||
import "typeface-roboto/index.css";
|
import "typeface-roboto/index.css";
|
||||||
@@ -167,6 +167,7 @@ Vue.component("gz-date-time-picker", dateTimeControl);
|
|||||||
Vue.component("gz-tag-picker", tagPicker);
|
Vue.component("gz-tag-picker", tagPicker);
|
||||||
Vue.component("gz-custom-fields", customFieldsControl);
|
Vue.component("gz-custom-fields", customFieldsControl);
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
//3rd party ui components
|
//3rd party ui components
|
||||||
//
|
//
|
||||||
@@ -189,7 +190,7 @@ Vue.directive("focus", {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// console.log(Vue);
|
// console.log(Vue);
|
||||||
// console.log(Vuetify);
|
// console.log(Vuetify.lang);
|
||||||
// debugger;
|
// debugger;
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
@@ -1,38 +1,13 @@
|
|||||||
/* Xeslint-disable */
|
/* xeslint-disable */
|
||||||
|
|
||||||
// import Vue from "vue";
|
|
||||||
// import Vuetify from "vuetify";
|
|
||||||
// import "vuetify/dist/vuetify.min.css";
|
|
||||||
|
|
||||||
// Vue.use(Vuetify, {
|
|
||||||
// iconfont: "fa",
|
|
||||||
// theme: {
|
|
||||||
// primary: "#00205B", //Canucks dark blue
|
|
||||||
// secondary: "#00843D", //canucks green
|
|
||||||
|
|
||||||
// accent: "#db7022", //lighter orangey red, more friendly looking though not as much clarity it seems
|
|
||||||
// //error: "#b71c1c", //dark red, easy to read but not error-y enough possibly
|
|
||||||
|
|
||||||
// //accent: "#BD491A", //dark orangey red, more clarity, less friendly looking
|
|
||||||
// error: "#ff5252", //lighter red, have to see if it's good for all screens and sizes as it's a bit light but it stands out as an error condition better
|
|
||||||
|
|
||||||
// disabled: "#e0e0e0"
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
|
|
||||||
// v2.0
|
|
||||||
// src/plugins/vuetify.js
|
|
||||||
|
|
||||||
import Vue from "vue";
|
import Vue from "vue";
|
||||||
import Vuetify from "vuetify/lib";
|
import Vuetify from "vuetify/lib";
|
||||||
|
import myLang from "../api/en";
|
||||||
// console.log(Vue);
|
|
||||||
// console.log(Vuetify);
|
|
||||||
// debugger;
|
|
||||||
|
|
||||||
Vue.use(Vuetify);
|
Vue.use(Vuetify);
|
||||||
|
|
||||||
export default new Vuetify({
|
export default new Vuetify({
|
||||||
|
lang: { locales: { myLang }, current: "myLang" },
|
||||||
theme: {
|
theme: {
|
||||||
themes: {
|
themes: {
|
||||||
light: {
|
light: {
|
||||||
@@ -54,17 +29,9 @@ export default new Vuetify({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
// export default new Vuetify({
|
||||||
*
|
// lang: {
|
||||||
export default new Vuetify({
|
// locales: { zhHans, pl, sv },
|
||||||
theme: {
|
// current: 'zhHans',
|
||||||
themes: {
|
// },
|
||||||
light: {
|
// })
|
||||||
primary: colors.red.darken1, // #E53935
|
|
||||||
secondary: colors.red.lighten4, // #FFCDD2
|
|
||||||
accent: colors.indigo.base, // #3F51B5
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
*/
|
|
||||||
|
|||||||
@@ -91,6 +91,8 @@ export default {
|
|||||||
if (this.input.username != "" && this.input.password != "") {
|
if (this.input.username != "" && this.input.password != "") {
|
||||||
this.errorBadCreds = false;
|
this.errorBadCreds = false;
|
||||||
var vm = this;
|
var vm = this;
|
||||||
|
// eslint-disable-next-line no-debugger
|
||||||
|
debugger;
|
||||||
auth
|
auth
|
||||||
.authenticate(this.input.username, this.input.password)
|
.authenticate(this.input.username, this.input.password)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user