Form Newsletter and others fix

This commit is contained in:
Paolo Arena
2019-07-12 14:09:44 +02:00
parent 7f5076d8f2
commit b11dd46f9f
33 changed files with 119 additions and 47 deletions

View File

@@ -3,6 +3,7 @@ import { Component, Watch } from 'vue-property-decorator'
import { ICategory } from '../../../model/index'
import { tools } from '../../../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
@Component({
})

View File

@@ -4,6 +4,7 @@ import { Component, Watch } from 'vue-property-decorator'
import { SingleCat } from '../SingleCat/index'
import { ICategory } from '../../../model/index'
import { tools } from '../../../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
@Component({

View File

@@ -64,6 +64,7 @@
import { UserStore } from "../../store/Modules";
import { IUserState } from "../../model";
import { tools } from "../../store/Modules/tools";
import { toolsext } from '@src/store/Modules/toolsext'
export default class RequestResetPwd extends Vue{
emailsent = false
form: IUserState = {

View File

@@ -3,6 +3,7 @@ import Vue from 'vue'
import { Component, Prop, Watch } from 'vue-property-decorator'
import { serv_constants } from '../../../store/Modules/serv_constants'
import { tools } from '../../../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
import { ISigninOptions, IUserState } from 'model'
import { TSignin, validations } from './signin-validate'
@@ -161,14 +162,14 @@ export default class Signin extends Vue {
}
return riscode
}).then((riscode) => {
if (UserStore.state.lang !== '') {
this.$i18n.locale = UserStore.state.lang
if (toolsext.getLocale() !== '') {
this.$i18n.locale = toolsext.getLocale()
} // Set Lang
else {
UserStore.mutations.setlang(this.$i18n.locale)
} // Set Lang
// console.log('LANG ORA=', UserStore.state.lang)
// console.log('LANG ORA=', toolsext.getLocale())
globalroutines(this, 'loadapp', '')
return riscode

View File

@@ -2,6 +2,7 @@ import Vue from 'vue'
import { Component, Prop, Watch } from 'vue-property-decorator'
import { UserStore } from '@store'
import { tools } from '../../../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
import { ISignupOptions, IUserState } from 'model'
import { validations, TSignup } from './signup-validate'

View File

@@ -76,6 +76,7 @@
import { UserStore } from "../../store/Modules";
import { IUserState } from "../../model";
import { tools } from "../../store/Modules/tools";
import { toolsext } from '@src/store/Modules/toolsext'
export default class UpdatePassword extends Vue {
emailsent = false

View File

@@ -6,6 +6,7 @@ import { SingleProject } from '../../../components/projects/SingleProject/index'
import { CTodo } from '../../../components/todos/CTodo'
import { tools } from '../../../store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
import { lists } from '../../../store/Modules/lists'
import * as ApiTables from '../../../store/Modules/ApiTables'
@@ -56,9 +57,9 @@ export default class ProjList extends Vue {
public percProgress: string = 'percProgress'
public readonly: boolean = false
public selectStatus: [] = tools.selectStatus[UserStore.state.lang]
public selectPhase: [] = tools.selectPhase[UserStore.state.lang]
public selectPrivacy: [] = tools.selectPrivacy[UserStore.state.lang]
public selectStatus: [] = tools.selectStatus[toolsext.getLocale()]
public selectPhase: [] = tools.selectPhase[toolsext.getLocale()]
public selectPrivacy: [] = tools.selectPrivacy[toolsext.getLocale()]
public $refs: {
singleproject: SingleProject[],
@@ -203,9 +204,9 @@ export default class ProjList extends Vue {
get menuPopupConfigProject() {
let mymenu = null
if (this.isMainProject)
mymenu = tools.menuPopupConfigMAINProject[UserStore.state.lang]
mymenu = tools.menuPopupConfigMAINProject[toolsext.getLocale()]
else
mymenu = tools.menuPopupConfigProject[UserStore.state.lang]
mymenu = tools.menuPopupConfigProject[toolsext.getLocale()]
if (mymenu.length > 0)
mymenu[0].disable = !(GlobalStore.state.lastaction.type === lists.MenuAction.CUT)
@@ -214,7 +215,7 @@ export default class ProjList extends Vue {
}
get listOptionShowTask() {
return tools.listOptionShowTask[UserStore.state.lang]
return tools.listOptionShowTask[toolsext.getLocale()]
}
get descrProject() {

View File

@@ -2,6 +2,7 @@ import Vue from 'vue'
import { Component, Watch } from 'vue-property-decorator'
import { CTodo } from '@src/components/todos/CTodo'
import { tools } from '@src/store/Modules/tools'
import { toolsext } from '@src/store/Modules/toolsext'
@Component({
components: { CTodo },