changed all v-layout and v-flex to v-row and v-col respectively, lot's of messed up grids now :(

This commit is contained in:
2019-10-31 19:57:06 +00:00
parent b3be49ddaf
commit 482f228407
17 changed files with 117 additions and 121 deletions

View File

@@ -88,16 +88,16 @@
</v-app-bar> </v-app-bar>
<v-content> <v-content>
<v-container container--fluid fill-height> <v-container container--fluid fill-height>
<v-layout justify-center> <v-row justify-center>
<transition name="fade" mode="out-in" @after-leave="afterLeave"> <transition name="fade" mode="out-in" @after-leave="afterLeave">
<router-view class="view"></router-view> <router-view class="view"></router-view>
</transition> </transition>
</v-layout> </v-row>
</v-container> </v-container>
</v-content> </v-content>
<v-footer v-if="!isAuthenticated"> <v-footer v-if="!isAuthenticated">
<v-layout> <v-row>
<v-flex primary py-2 text-center white--text xs12> <v-col primary py-2 text-center white--text xs12>
<div> <div>
<a href="https://ayanova.com" target="_blank"> <a href="https://ayanova.com" target="_blank">
<span class="white--text caption" <span class="white--text caption"
@@ -105,8 +105,8 @@
> >
</a> </a>
</div> </div>
</v-flex> </v-col>
</v-layout> </v-row>
</v-footer> </v-footer>
</v-app> </v-app>
</template> </template>

View File

@@ -1,20 +1,20 @@
<template> <template>
<v-container> <v-container>
<v-layout text-center wrap> <v-row text-center wrap>
<v-flex xs12> <v-col xs12>
<v-img <v-img
:src="require('../assets/logo.svg')" :src="require('../assets/logo.svg')"
class="my-4" class="my-4"
contain contain
height="200" height="200"
></v-img> ></v-img>
</v-flex> </v-col>
<v-flex mb-6 v-if="this.formReady"> <v-col mb-6 v-if="this.formReady">
<h1 class="display-2 font-weight-bold mb-4"> <h1 class="display-2 font-weight-bold mb-4">
{{ lt("Welcome") }} {{ lt("Welcome") }}
</h1> </h1>
</v-flex> </v-col>
</v-layout> </v-row>
</v-container> </v-container>
</template> </template>

View File

@@ -14,9 +14,9 @@
<hr /> --> <hr /> -->
<div> <div>
<v-layout align-center justify-left row wrap> <v-row align-center justify-left row wrap>
<template v-for="item in this.$store.state.formCustomTemplate[formKey]"> <template v-for="item in this.$store.state.formCustomTemplate[formKey]">
<v-flex v-if="item.type" :key="item.fld" xs12 sm6 lg4 xl3 px-2> <v-col v-if="item.type" :key="item.fld" xs12 sm6 lg4 xl3 px-2>
<div v-if="item.type === 'currency'"> <div v-if="item.type === 'currency'">
CURRENCY CONTROL HERE CURRENCY CONTROL HERE
</div> </div>
@@ -48,9 +48,9 @@
>UNKNOWN CUSTOM CONTROL TYPE: {{ item.type }}</span >UNKNOWN CUSTOM CONTROL TYPE: {{ item.type }}</span
> >
</div> </div>
</v-flex> </v-col>
</template> </template>
</v-layout> </v-row>
</div> </div>
</div> </div>
</template> </template>

View File

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<v-layout row wrap v-if="!readonly"> <v-row row wrap v-if="!readonly">
<v-flex xs6> <v-col xs6>
<v-dialog v-model="dlgdate" persistent lazy full-width width="290px"> <v-dialog v-model="dlgdate" persistent lazy full-width width="290px">
<template v-slot:activator="{ on }"> <template v-slot:activator="{ on }">
<v-text-field <v-text-field
@@ -20,8 +20,8 @@
<v-btn flat color="primary" @click="dlgdate = false">Close</v-btn> <v-btn flat color="primary" @click="dlgdate = false">Close</v-btn>
</v-date-picker> </v-date-picker>
</v-dialog> </v-dialog>
</v-flex> </v-col>
<v-flex xs6> <v-col xs6>
<v-dialog v-model="dlgtime" persistent lazy full-width width="290px"> <v-dialog v-model="dlgtime" persistent lazy full-width width="290px">
<template v-slot:activator="{ on }"> <template v-slot:activator="{ on }">
<v-text-field <v-text-field
@@ -39,8 +39,8 @@
<v-btn flat color="primary" @click="dlgtime = false">OK</v-btn> <v-btn flat color="primary" @click="dlgtime = false">OK</v-btn>
</v-time-picker> </v-time-picker>
</v-dialog> </v-dialog>
</v-flex> </v-col>
</v-layout> </v-row>
<v-text-field <v-text-field
v-if="readonly" v-if="readonly"
v-model="formatDateTime" v-model="formatDateTime"

View File

@@ -1,5 +1,5 @@
<template> <template>
<v-flex xs12 md4> <v-col xs12 md4>
<v-card class="elevation-5 transparent"> <v-card class="elevation-5 transparent">
<v-card-text class="text-center"> <v-card-text class="text-center">
<v-icon x-large color="secondary">fa-heart</v-icon> <v-icon x-large color="secondary">fa-heart</v-icon>
@@ -14,7 +14,7 @@
est vitae tellus bibendum tincidunt. Suspendisse potenti. est vitae tellus bibendum tincidunt. Suspendisse potenti.
</v-card-text> </v-card-text>
</v-card> </v-card>
</v-flex> </v-col>
</template> </template>
<script> <script>

View File

@@ -1,5 +1,5 @@
<template> <template>
<v-flex xs12 md4> <v-col xs12 md4>
<v-card class="elevation-5 transparent"> <v-card class="elevation-5 transparent">
<v-card-text class="text-center"> <v-card-text class="text-center">
<v-icon x-large color="secondary">fa-cannabis</v-icon> <v-icon x-large color="secondary">fa-cannabis</v-icon>
@@ -14,7 +14,7 @@
est vitae tellus bibendum tincidunt. Suspendisse potenti. est vitae tellus bibendum tincidunt. Suspendisse potenti.
</v-card-text> </v-card-text>
</v-card> </v-card>
</v-flex> </v-col>
</template> </template>
<script> <script>

View File

@@ -1,5 +1,5 @@
<template> <template>
<v-flex xs12 md4> <v-col xs12 md4>
<v-card class="elevation-5 transparent"> <v-card class="elevation-5 transparent">
<v-card-text class="text-center"> <v-card-text class="text-center">
<v-icon x-large color="secondary">fa-crow</v-icon> <v-icon x-large color="secondary">fa-crow</v-icon>
@@ -14,7 +14,7 @@
est vitae tellus bibendum tincidunt. Suspendisse potenti. est vitae tellus bibendum tincidunt. Suspendisse potenti.
</v-card-text> </v-card-text>
</v-card> </v-card>
</v-flex> </v-col>
</template> </template>
<script> <script>

View File

@@ -1,5 +1,5 @@
<template> <template>
<v-flex xs12 md4> <v-col xs12 md4>
<v-card class="elevation-5 transparent"> <v-card class="elevation-5 transparent">
<v-card-text class="text-center"> <v-card-text class="text-center">
<v-icon x-large color="secondary">fa-heart </v-icon> <v-icon x-large color="secondary">fa-heart </v-icon>
@@ -14,7 +14,7 @@
est vitae tellus bibendum tincidunt. Suspendisse potenti. est vitae tellus bibendum tincidunt. Suspendisse potenti.
</v-card-text> </v-card-text>
</v-card> </v-card>
</v-flex> </v-col>
</template> </template>
<script> <script>

View File

@@ -1,6 +1,6 @@
<template> <template>
<v-layout column wrap class="my-12" align-center v-if="this.formState.ready"> <v-row column wrap class="my-12" align-center v-if="this.formState.ready">
<v-flex xs12 mt-1 mb-2 v-if="formState.errorBoxMessage"> <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
<v-alert <v-alert
ref="errorbox" ref="errorbox"
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
@@ -12,8 +12,8 @@
outline outline
>{{ formState.errorBoxMessage }}</v-alert >{{ formState.errorBoxMessage }}</v-alert
> >
</v-flex> </v-col>
<v-flex xs12 md12> <v-col xs12 md12>
<div v-if="this.formState.ready"> <div v-if="this.formState.ready">
<v-toolbar flat> <v-toolbar flat>
<v-toolbar-title> <v-toolbar-title>
@@ -83,8 +83,8 @@
</template> </template>
</v-data-table> </v-data-table>
</div> </div>
</v-flex> </v-col>
</v-layout> </v-row>
</template> </template>
<script> <script>

View File

@@ -14,16 +14,16 @@
> >
<template slot="no-data" v-if="tagSearchEntry"> <template slot="no-data" v-if="tagSearchEntry">
<v-container> <v-container>
<v-layout row> <v-row row>
<v-layout justify-center> <v-row justify-center>
<v-chip color="primary" text-color="white" class="display-1"> <v-chip color="primary" text-color="white" class="display-1">
{{ this.normalizeTag(tagSearchEntry) }}</v-chip {{ this.normalizeTag(tagSearchEntry) }}</v-chip
> >
<v-btn large icon @click="addTag()"> <v-btn large icon @click="addTag()">
<v-icon large color="success">fa-plus-circle</v-icon> <v-icon large color="success">fa-plus-circle</v-icon>
</v-btn> </v-btn>
</v-layout> </v-row>
</v-layout> </v-row>
</v-container> </v-container>
</template> </template>
</v-autocomplete> </v-autocomplete>

View File

@@ -1,9 +1,9 @@
<template> <template>
<v-container> <v-container>
<v-layout> <v-row>
<v-flex xs12> <v-col xs12>
<v-img :src="require('../assets/underconstruction.svg')"></v-img> <v-img :src="require('../assets/underconstruction.svg')"></v-img>
</v-flex> </v-col>
</v-layout> </v-row>
</v-container> </v-container>
</template> </template>

View File

@@ -1,6 +1,6 @@
<template> <template>
<v-layout row v-if="this.formState.ready"> <v-row row v-if="this.formState.ready">
<v-flex xs12 mt-1 mb-2 v-if="formState.errorBoxMessage"> <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
<v-alert <v-alert
ref="errorbox" ref="errorbox"
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
@@ -12,8 +12,8 @@
outline outline
>{{ formState.errorBoxMessage }}</v-alert >{{ formState.errorBoxMessage }}</v-alert
> >
</v-flex> </v-col>
<v-flex> <v-col>
<v-card id="aboutinfocard"> <v-card id="aboutinfocard">
<v-subheader>{{ lt("ClientApp") }}</v-subheader> <v-subheader>{{ lt("ClientApp") }}</v-subheader>
<div> <div>
@@ -129,8 +129,8 @@
<v-divider class="mt-6"></v-divider> <v-divider class="mt-6"></v-divider>
</v-card> </v-card>
</v-flex> </v-col>
</v-layout> </v-row>
</template> </template>
<script> <script>

View File

@@ -1,9 +1,9 @@
<template> <template>
<v-layout v-if="this.formState.ready"> <v-row v-if="this.formState.ready">
<v-flex> <v-col>
<v-form ref="form"> <v-form ref="form">
<v-layout align-center justify-left row wrap> <v-row align-center justify-left row wrap>
<v-flex xs12 mt-1 mb-2> <v-col xs12 mt-1 mb-2>
<v-alert <v-alert
ref="errorbox" ref="errorbox"
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
@@ -15,8 +15,8 @@
outline outline
>{{ formState.errorBoxMessage }}</v-alert >{{ formState.errorBoxMessage }}</v-alert
> >
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<v-text-field <v-text-field
v-model="obj.name" v-model="obj.name"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
@@ -32,8 +32,8 @@
ref="name" ref="name"
@change="onChange('name')" @change="onChange('name')"
></v-text-field> ></v-text-field>
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<v-text-field <v-text-field
v-model="obj.serial" v-model="obj.serial"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
@@ -46,8 +46,8 @@
ref="serial" ref="serial"
@change="onChange('serial')" @change="onChange('serial')"
></v-text-field> ></v-text-field>
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<v-text-field <v-text-field
v-model="obj.count" v-model="obj.count"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
@@ -65,9 +65,9 @@
@change="onChange('count')" @change="onChange('count')"
type="number" type="number"
></v-text-field> ></v-text-field>
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<v-text-field <v-text-field
v-model="obj.dollarAmount" v-model="obj.dollarAmount"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
@@ -83,9 +83,9 @@
@change="onChange('dollarAmount')" @change="onChange('dollarAmount')"
type="number" type="number"
></v-text-field> ></v-text-field>
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<gz-date-time-picker <gz-date-time-picker
:label="lt('WidgetStartDate')" :label="lt('WidgetStartDate')"
v-model="obj.startDate" v-model="obj.startDate"
@@ -94,9 +94,9 @@
:error-messages="form().serverErrors(this, 'startDate')" :error-messages="form().serverErrors(this, 'startDate')"
@change="onChange('startDate')" @change="onChange('startDate')"
></gz-date-time-picker> ></gz-date-time-picker>
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<gz-date-time-picker <gz-date-time-picker
:label="lt('WidgetEndDate')" :label="lt('WidgetEndDate')"
:rules="[form().datePrecedence(this, 'startDate', 'endDate')]" :rules="[form().datePrecedence(this, 'startDate', 'endDate')]"
@@ -106,8 +106,8 @@
ref="endDate" ref="endDate"
@change="onChange('endDate')" @change="onChange('endDate')"
></gz-date-time-picker> ></gz-date-time-picker>
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<v-checkbox <v-checkbox
v-model="obj.active" v-model="obj.active"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
@@ -117,8 +117,8 @@
required required
@change="onChange('active')" @change="onChange('active')"
></v-checkbox> ></v-checkbox>
</v-flex> </v-col>
<v-flex xs12 sm6 lg4 xl3 px-2> <v-col xs12 sm6 lg4 xl3 px-2>
<v-select <v-select
v-model="obj.roles" v-model="obj.roles"
:items="pickLists.roles" :items="pickLists.roles"
@@ -135,9 +135,9 @@
required required
@change="onChange('roles')" @change="onChange('roles')"
></v-select> ></v-select>
</v-flex> </v-col>
<v-flex xs12 px-2> <v-col xs12 px-2>
<v-textarea <v-textarea
v-model="obj.notes" v-model="obj.notes"
:readonly="this.formState.readOnly" :readonly="this.formState.readOnly"
@@ -147,9 +147,9 @@
@change="onChange('notes')" @change="onChange('notes')"
auto-grow auto-grow
></v-textarea> ></v-textarea>
</v-flex> </v-col>
<v-flex xs12 px-2> <v-col xs12 px-2>
<gz-tag-picker <gz-tag-picker
:label="lt('Tags')" :label="lt('Tags')"
v-model="obj.tags" v-model="obj.tags"
@@ -158,9 +158,9 @@
:error-messages="form().serverErrors(this, 'tags')" :error-messages="form().serverErrors(this, 'tags')"
@change="onChange('tags')" @change="onChange('tags')"
></gz-tag-picker> ></gz-tag-picker>
</v-flex> </v-col>
<v-flex xs12 px-2> <v-col xs12 px-2>
<gz-custom-fields <gz-custom-fields
:formKey="formCustomTemplateKey" :formKey="formCustomTemplateKey"
v-bind:value.sync="obj.customFields" v-bind:value.sync="obj.customFields"
@@ -170,13 +170,13 @@
@change="onChange('customFields')" @change="onChange('customFields')"
></gz-custom-fields> ></gz-custom-fields>
<!-- v-model="obj.customFields" --> <!-- v-model="obj.customFields" -->
</v-flex> </v-col>
</v-layout> </v-row>
<!-- <v-layout align-left justify-center row wrap mt-12> <!-- <v-layout align-left justify-center row wrap mt-12>
<v-flex xs6 sm4> FORMtags: {{ obj.tags }} </v-flex> <v-col xs6 sm4> FORMtags: {{ obj.tags }} </v-col>
</v-layout> --> </v-row> -->
<!-- <v-layout align-left justify-center row wrap mt-12> <!-- <v-layout align-left justify-center row wrap mt-12>
<v-flex xs6 sm4> <v-col xs6 sm4>
READY: {{ formState.ready }} READY: {{ formState.ready }}
<br /> <br />
LOADING: {{ formState.loading }} LOADING: {{ formState.loading }}
@@ -187,11 +187,11 @@
<br /> <br />
READONLY: {{ formState.readOnly }} READONLY: {{ formState.readOnly }}
<br /> <br />
</v-flex> </v-col>
</v-layout>--> </v-row>-->
</v-form> </v-form>
</v-flex> </v-col>
</v-layout> </v-row>
</template> </template>
<script> <script>

View File

@@ -1,8 +1,6 @@
<template> <template>
<!-- <v-flex xs12> <v-row row wrap align-top v-if="this.formState.ready">
<v-container grid-list-xl>--> <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
<v-layout row wrap align-top v-if="this.formState.ready">
<v-flex xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
<v-alert <v-alert
ref="errorbox" ref="errorbox"
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
@@ -14,13 +12,13 @@
outline outline
>{{ formState.errorBoxMessage }}</v-alert >{{ formState.errorBoxMessage }}</v-alert
> >
</v-flex> </v-col>
<WidgetList /> <WidgetList />
<WarehouseTop /> <WarehouseTop />
<POTop /> <POTop />
<PartTop /> <PartTop />
<PartAssemblyTop /> <PartAssemblyTop />
<v-flex xs12 md4> <v-col xs12 md4>
<v-card class="elevation-0 transparent"> <v-card class="elevation-0 transparent">
<v-card-text class="text-center"> <v-card-text class="text-center">
<v-icon x-large color="accent">fa-lightbulb</v-icon> <v-icon x-large color="accent">fa-lightbulb</v-icon>
@@ -35,10 +33,8 @@
Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti.
</v-card-text> </v-card-text>
</v-card> </v-card>
</v-flex> </v-col>
</v-layout> </v-row>
<!-- </v-container>
</v-flex>-->
</template> </template>
<script> <script>

View File

@@ -1,6 +1,6 @@
<template> <template>
<v-layout row v-if="this.formState.ready"> <v-row row v-if="this.formState.ready">
<v-flex xs12 mt-1 mb-2 v-if="formState.errorBoxMessage"> <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
<v-alert <v-alert
ref="errorbox" ref="errorbox"
v-show="formState.errorBoxMessage" v-show="formState.errorBoxMessage"
@@ -12,11 +12,11 @@
outline outline
>{{ formState.errorBoxMessage }}</v-alert >{{ formState.errorBoxMessage }}</v-alert
> >
</v-flex> </v-col>
<v-flex> <v-col>
<v-textarea v-model="logText" full-width readonly auto-grow></v-textarea> <v-textarea v-model="logText" full-width readonly auto-grow></v-textarea>
</v-flex> </v-col>
</v-layout> </v-row>
</template> </template>
<script> <script>

View File

@@ -1,21 +1,21 @@
<template> <template>
<v-container container--fluid> <v-container container--fluid>
<v-layout row wrap> <v-row row wrap>
<v-flex xs12 class="hidden-sm-and-down text-center" mt-12 ml-12 pl-12> <v-col xs12 class="hidden-sm-and-down text-center" mt-12 ml-12 pl-12>
<v-img <v-img
:src="require('../assets/logo.svg')" :src="require('../assets/logo.svg')"
class="my-4" class="my-4"
contain contain
height="200" height="200"
></v-img> ></v-img>
</v-flex> </v-col>
<v-flex xs12 class="hidden-md-and-up text-center"> <v-col xs12 class="hidden-md-and-up text-center">
<v-img :src="require('../assets/logo.svg')" contain height="64"></v-img> <v-img :src="require('../assets/logo.svg')" contain height="64"></v-img>
</v-flex> </v-col>
<v-flex xs12 sm6 offset-sm3 mt-4> <v-col xs12 sm6 offset-sm3 mt-4>
<form> <form>
<v-layout column> <v-row column>
<v-flex> <v-col>
<v-text-field <v-text-field
name="username" name="username"
v-model="input.username" v-model="input.username"
@@ -32,8 +32,8 @@
v-focus v-focus
v-on:keyup.enter="onEnterUserName" v-on:keyup.enter="onEnterUserName"
></v-text-field> ></v-text-field>
</v-flex> </v-col>
<v-flex> <v-col>
<v-text-field <v-text-field
name="password" name="password"
v-model="input.password" v-model="input.password"
@@ -45,16 +45,16 @@
:error="errorBadCreds" :error="errorBadCreds"
v-on:keyup.enter="login" v-on:keyup.enter="login"
></v-text-field> ></v-text-field>
</v-flex> </v-col>
<v-flex class="text-center" mt-1> <v-col class="text-center" mt-1>
<v-btn color="primary" v-on:click="login()"> <v-btn color="primary" v-on:click="login()">
<v-icon>fa-sign-in-alt</v-icon> <v-icon>fa-sign-in-alt</v-icon>
</v-btn> </v-btn>
</v-flex> </v-col>
</v-layout> </v-row>
</form> </form>
</v-flex> </v-col>
</v-layout> </v-row>
</v-container> </v-container>
</template> </template>

View File

@@ -1,15 +1,15 @@
<template> <template>
<v-container> <v-container>
<v-layout justify-center> <v-row justify-center>
<v-flex xs12> <v-col xs12>
<div class="text-center"> <div class="text-center">
<v-icon color="red" size="100">fa-dragon</v-icon> <v-icon color="red" size="100">fa-dragon</v-icon>
<div class="headline"> <div class="headline">
{{ "404 - " + window.$gz.locale.get("ErrorAPI2010") }} {{ "404 - " + window.$gz.locale.get("ErrorAPI2010") }}
</div> </div>
</div> </div>
</v-flex> </v-col>
</v-layout> </v-row>
</v-container> </v-container>
</template> </template>