Merge pull request #6750 from ylavoie/relocate-vue

Relocate vue
ledgersmb · Sep 3, 2022 · 8243090 · 8243090
2 parents 54f40e6 + 8e36dab
commit 8243090
Show file tree

Hide file tree

Showing 29 changed files with 15,331 additions and 1,061 deletions.
diff --git a/UI/src/components/ConfigTable.vue b/UI/src/components/ConfigTable.vue
@@ -6,8 +6,8 @@ import { storeToRefs } from "pinia";
 import { contextRef } from "@/robot-vue";
 import { useSessionUserStore } from "@/store/sessionUser";
 
-import { createTableMachine } from "./ConfigTable.machines.js";
-import ConfigTableRow from "./ConfigTableRow.vue";
+import { createTableMachine } from "@/components/ConfigTable.machines.js";
+import ConfigTableRow from "@/components/ConfigTableRow.vue";
 
 const props = defineProps([
     "columns",

diff --git a/UI/src/components/ConfigTableRow.vue b/UI/src/components/ConfigTableRow.vue
@@ -34,7 +34,7 @@
 
 <script setup>
 
-import { createRowMachine } from "./ConfigTable.machines.js";
+import { createRowMachine } from "@/components/ConfigTable.machines.js";
 import { computed, inject, watch } from "vue";
 import { contextRef } from "@/robot-vue";
 import { useI18n } from "vue-i18n";

diff --git a/UI/src/components/Toast.vue b/UI/src/components/Toast.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { createToastMachine } from "./Toaster.machines";
+import { createToastMachine } from "@/components/Toaster.machines";
 
 const props = defineProps({"data": { }, "type": { default: "success" }});
 const emit = defineEmits(["remove"]);

diff --git a/UI/src/components/Toaster.vue b/UI/src/components/Toaster.vue
@@ -4,8 +4,8 @@ import { computed, inject } from "vue";
 import { contextRef } from "@/robot-vue";
 import { useSessionUserStore } from "@/store/sessionUser";
 
-import { createToasterMachine } from "./Toaster.machines";
-import Toast from "./Toast.vue";
+import { createToasterMachine } from "@/components/Toaster.machines";
+import Toast from "@/components/Toast.vue";
 
 const user = useSessionUserStore();
 const wantToaster = computed(() => !user.preferences.__disableToaster);

diff --git a/UI/src/elements/lsmb-base-input.js b/UI/src/elements/lsmb-base-input.js
@@ -1,7 +1,7 @@
 /** @format */
 /* eslint-disable class-methods-use-this */
 
-import { LsmbDijit } from "./lsmb-dijit";
+import { LsmbDijit } from "@/elements/lsmb-dijit";
 
 const registry = require("dijit/registry");
 

diff --git a/UI/src/elements/lsmb-button.js b/UI/src/elements/lsmb-button.js
@@ -1,7 +1,7 @@
 /** @format */
 /* eslint-disable class-methods-use-this */
 
-import { LsmbDijit } from "./lsmb-dijit";
+import { LsmbDijit } from "@/elements/lsmb-dijit";
 
 const Button = require("dijit/form/Button");
 const registry = require("dijit/registry");

diff --git a/UI/src/elements/lsmb-date.js b/UI/src/elements/lsmb-date.js
@@ -1,7 +1,7 @@
 /** @format */
 /* eslint-disable class-methods-use-this, max-classes-per-file */
 
-import { LsmbBaseInput } from "./lsmb-base-input";
+import { LsmbBaseInput } from "@/elements/lsmb-base-input";
 
 const dojoDateBox = require("lsmb/DateTextBox");
 

diff --git a/UI/src/elements/lsmb-password.js b/UI/src/elements/lsmb-password.js
@@ -1,7 +1,7 @@
 /** @format */
 /* eslint-disable class-methods-use-this */
 
-import { LsmbText } from "./lsmb-text";
+import { LsmbText } from "@/elements/lsmb-text";
 
 export class LsmbPassword extends LsmbText {
     _stdProps() {

diff --git a/UI/src/elements/lsmb-text.js b/UI/src/elements/lsmb-text.js
@@ -1,7 +1,7 @@
 /** @format */
 /* eslint-disable class-methods-use-this, max-classes-per-file */
 
-import { LsmbBaseInput } from "./lsmb-base-input";
+import { LsmbBaseInput } from "@/elements/lsmb-base-input";
 
 const dojoTextBox = require("dijit/form/ValidationTextBox");
 

diff --git a/UI/src/main-vue.js b/UI/src/main-vue.js
@@ -2,13 +2,13 @@
 /* eslint-disable no-console, import/no-unresolved, vue/multi-word-component-names */
 
 import { createApp } from "vue";
-import router from "./router";
+import router from "@/router";
 import i18n, { setI18nLanguage } from "@/i18n";
 import { useI18n } from "vue-i18n";
-import LoginPage from "./components/LoginPage";
-import Toaster from "./components/Toaster";
-import { createToasterMachine } from "./components/Toaster.machines";
-import { useSessionUserStore } from "./store/sessionUser";
+import LoginPage from "@/views/LoginPage";
+import Toaster from "@/components/Toaster";
+import { createToasterMachine } from "@/components/Toaster.machines";
+import { useSessionUserStore } from "@/store/sessionUser";
 
 import { createPinia } from "pinia";
 

diff --git a/UI/src/router.js b/UI/src/router.js
@@ -3,21 +3,21 @@
 /* eslint-disable-next-line import/no-unresolved */
 import { createRouter, createWebHashHistory } from "vue-router";
 
-import Home from "./components/Home";
-import ServerUI from "./components/ServerUI";
-import ImportCsvAaBatch from "./components/ImportCSV-AA-Batch";
-import ImportCsvCoA from "./components/ImportCSV-CoA";
-import ImportCsvGl from "./components/ImportCSV-GL";
-import ImportCsvGlBatch from "./components/ImportCSV-GL-Batch";
-import ImportCsvGSO from "./components/ImportCSV-GSO";
-import ImportCsvInventory from "./components/ImportCSV-Inventory";
-import ImportCsvTimecard from "./components/ImportCSV-Timecard";
-import Warehouses from "./components/Warehouses.vue";
-import Pricegroups from "./components/Pricegroups.vue";
-import Languages from "./components/Languages.vue";
-import SIC from "./components/SIC.vue";
-import BusinessTypes from "./components/BusinessTypes.vue";
-import GIFI from "./components/GIFI.vue";
+import Home from "@/views/Home";
+import ServerUI from "@/components/ServerUI";
+import ImportCsvAaBatch from "@/views/ImportCSV-AA-Batch";
+import ImportCsvCoA from "@/views/ImportCSV-CoA";
+import ImportCsvGl from "@/views/ImportCSV-GL";
+import ImportCsvGlBatch from "@/views/ImportCSV-GL-Batch";
+import ImportCsvGSO from "@/views/ImportCSV-GSO";
+import ImportCsvInventory from "@/views/ImportCSV-Inventory";
+import ImportCsvTimecard from "@/views/ImportCSV-Timecard";
+import Warehouses from "@/views/Warehouses.vue";
+import Pricegroups from "@/views/Pricegroups.vue";
+import Languages from "@/views/Languages.vue";
+import SIC from "@/views/SIC.vue";
+import BusinessTypes from "@/views/BusinessTypes.vue";
+import GIFI from "@/views/GIFI.vue";
 
 const routes = [
     { name: "home", path: "/", component: Home },

diff --git a/UI/src/components/BusinessTypes.vue → UI/src/views/BusinessTypes.vue b/UI/src/components/BusinessTypes.vue → UI/src/views/BusinessTypes.vue
@@ -2,7 +2,7 @@
 
 import { useBusinessTypesStore } from "@/store/business-types";
 import { useI18n } from "vue-i18n";
-import ConfigTable from "./ConfigTable.vue";
+import ConfigTable from "@/components/ConfigTable.vue";
 
 const { t } = useI18n();
 const COLUMNS = [

diff --git a/UI/src/components/GIFI.vue → UI/src/views/GIFI.vue b/UI/src/components/GIFI.vue → UI/src/views/GIFI.vue
@@ -2,9 +2,9 @@
 
 import { useGIFIsStore } from "@/store/gifis";
 import { useI18n } from "vue-i18n";
-import ConfigTable from "./ConfigTable.vue";
+import ConfigTable from "@/components/ConfigTable.vue";
 
-import ImportCsvGifi from "@/components/ImportCSV-GIFI";
+import ImportCsvGifi from "@/views/ImportCSV-GIFI";
 
 const { t } = useI18n();
 const COLUMNS = [

diff --git a/UI/src/components/Home.vue → UI/src/views/Home.vue b/UI/src/components/Home.vue → UI/src/views/Home.vue
diff --git a/UI/src/components/ImportCSV-AA-Batch.vue → UI/src/views/ImportCSV-AA-Batch.vue b/UI/src/components/ImportCSV-AA-Batch.vue → UI/src/views/ImportCSV-AA-Batch.vue
@@ -49,7 +49,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-CoA.vue → UI/src/views/ImportCSV-CoA.vue b/UI/src/components/ImportCSV-CoA.vue → UI/src/views/ImportCSV-CoA.vue
@@ -47,7 +47,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-GIFI.vue → UI/src/views/ImportCSV-GIFI.vue b/UI/src/components/ImportCSV-GIFI.vue → UI/src/views/ImportCSV-GIFI.vue
@@ -36,7 +36,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-GL-Batch.vue → UI/src/views/ImportCSV-GL-Batch.vue b/UI/src/components/ImportCSV-GL-Batch.vue → UI/src/views/ImportCSV-GL-Batch.vue
@@ -51,7 +51,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-GL.vue → UI/src/views/ImportCSV-GL.vue b/UI/src/components/ImportCSV-GL.vue → UI/src/views/ImportCSV-GL.vue
@@ -63,7 +63,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-GSO.vue → UI/src/views/ImportCSV-GSO.vue b/UI/src/components/ImportCSV-GSO.vue → UI/src/views/ImportCSV-GSO.vue
@@ -91,7 +91,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-Inventory.vue → UI/src/views/ImportCSV-Inventory.vue b/UI/src/components/ImportCSV-Inventory.vue → UI/src/views/ImportCSV-Inventory.vue
@@ -38,7 +38,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-SIC.vue → UI/src/views/ImportCSV-SIC.vue b/UI/src/components/ImportCSV-SIC.vue → UI/src/views/ImportCSV-SIC.vue
@@ -37,7 +37,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/ImportCSV-Timecard.vue → UI/src/views/ImportCSV-Timecard.vue b/UI/src/components/ImportCSV-Timecard.vue → UI/src/views/ImportCSV-Timecard.vue
@@ -52,7 +52,7 @@ dl > dd {
 
 <script>
 
-import ImportCSVBase from "./ImportCSV-Base";
+import ImportCSVBase from "@/components/ImportCSV-Base";
 
 
 export default {

diff --git a/UI/src/components/Languages.vue → UI/src/views/Languages.vue b/UI/src/components/Languages.vue → UI/src/views/Languages.vue
@@ -2,7 +2,7 @@
 
 import { useLanguagesStore } from "@/store/languages";
 import { useI18n } from "vue-i18n";
-import ConfigTable from "./ConfigTable.vue";
+import ConfigTable from "@/components/ConfigTable.vue";
 
 const { t } = useI18n();
 const COLUMNS = [

diff --git a/UI/src/components/LoginPage.vue → UI/src/views/LoginPage.vue b/UI/src/components/LoginPage.vue → UI/src/views/LoginPage.vue
@@ -37,13 +37,13 @@
                              :value="company"
                              v-update:company="" />
                 </div>
-                <lsmb-button tabindex="4" id="login" @click="login">{{ $t('Login') }}</lsmb-button>
+                <lsmb-button tabindex="4" id="login" @click="login" :disabled="loginDisabled">{{ $t('Login') }}</lsmb-button>
               </div>
             </div>
           </div>
-          <div v-show="inProgress">
-             {{ $t("Logging in... Please wait.") }}
-          </div>
+          <transition>
+             <div v-if="inProgress">{{ $t("Logging in... Please wait.") }}</div>
+          </transition>
         </div>
       </div>
     </form>
@@ -71,6 +71,11 @@ export default defineComponent({
          inProgress: false
       };
    },
+   computed: {
+      loginDisabled() {
+         return !this.username || !this.password || !this.company
+      }
+   },
    methods: {
       async login() {
           this.inProgress = true;

diff --git a/UI/src/components/Pricegroups.vue → UI/src/views/Pricegroups.vue b/UI/src/components/Pricegroups.vue → UI/src/views/Pricegroups.vue
@@ -2,7 +2,7 @@
 
 import { usePricegroupsStore } from "@/store/pricegroups";
 import { useI18n } from "vue-i18n";
-import ConfigTable from "./ConfigTable.vue";
+import ConfigTable from "@/components/ConfigTable.vue";
 
 const { t } = useI18n();
 const COLUMNS = [

diff --git a/UI/src/components/SIC.vue → UI/src/views/SIC.vue b/UI/src/components/SIC.vue → UI/src/views/SIC.vue
@@ -2,9 +2,9 @@
 
 import { useSICsStore } from "@/store/sics";
 import { useI18n } from "vue-i18n";
-import ConfigTable from "./ConfigTable.vue";
+import ConfigTable from "@/components/ConfigTable.vue";
 
-import ImportCsvSic from "@/components/ImportCSV-SIC";
+import ImportCsvSic from "@/views/ImportCSV-SIC";
 
 const { t } = useI18n();
 const COLUMNS = [

diff --git a/UI/src/components/Warehouses.vue → UI/src/views/Warehouses.vue b/UI/src/components/Warehouses.vue → UI/src/views/Warehouses.vue
@@ -2,7 +2,7 @@
 
 import { useWarehousesStore } from "@/store/warehouses";
 import { useI18n } from "vue-i18n";
-import ConfigTable from "./ConfigTable.vue";
+import ConfigTable from "@/components/ConfigTable.vue";
 
 const { t } = useI18n();
 const COLUMNS = [