Mercurial > gemma

changeset 1613:f2d24dceecc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refac: cleanup import paths
author Thomas Junk <thomas.junk@intevation.de>
date Tue, 18 Dec 2018 12:38:58 +0100
parents b5061deb9ab9
children efc409e330a6
files client/src/components/Bottlenecks.vue client/src/components/ImportSoundingresults.vue client/src/components/ImportStretches.vue client/src/components/Login.vue client/src/components/Logs.vue client/src/components/Maplayer.vue client/src/components/Pdftool.vue client/src/components/Search.vue client/src/components/Sidebar.vue client/src/components/Systemconfiguration.vue client/src/components/fairway/Profiles.vue client/src/components/importqueue/Importqueue.vue client/src/components/importqueue/Importqueuedetail.vue client/src/components/importschedule/Importschedule.vue client/src/components/importschedule/Importscheduledetail.vue client/src/components/layers/Layerselect.vue client/src/components/usermanagement/Userdetail.vue client/src/components/usermanagement/Usermanagement.vue
diffstat 18 files changed, 34 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Bottlenecks.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Bottlenecks.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -133,9 +133,9 @@
  * Markus Kottländer <markus.kottlaender@intevation.de>
  */
 import { mapState } from "vuex";
-import { HTTP } from "../lib/http";
-import { displayError } from "../lib/errors.js";
-import { formatSurveyDate } from "../lib/date.js";
+import { HTTP } from "@/lib/http";
+import { displayError } from "@/lib/errors.js";
+import { formatSurveyDate } from "@/lib/date.js";
 
 export default {
   name: "bottlenecks",
--- a/client/src/components/ImportSoundingresults.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/ImportSoundingresults.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -156,8 +156,8 @@
  * Thomas Junk <thomas.junk@intevation.de>
  * Markus Kottländer <markus.kottlaender@intevation.de>
  */
-import { HTTP } from "../lib/http";
-import { displayError, displayInfo } from "../lib/errors.js";
+import { HTTP } from "@/lib/http";
+import { displayError, displayInfo } from "@/lib/errors.js";
 import { mapState } from "vuex";
 import Spacer from "./Spacer";
 
--- a/client/src/components/ImportStretches.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/ImportStretches.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -58,7 +58,7 @@
  */
 
 import Spacer from "./Spacer";
-import { displayInfo } from "../lib/errors.js";
+import { displayInfo } from "@/lib/errors.js";
 
 export default {
   name: "importstretches",
--- a/client/src/components/Login.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Login.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -3,7 +3,7 @@
     <div class="m-5">
       <!-- logo section -->
       <div class="d-flex flex-row justify-content-center mb-3">
-        <div class="logo mr-3"><img src="../assets/logo.png" /></div>
+        <div class="logo mr-3"><img src="@/assets/logo.png" /></div>
         <div class="title">
           <h1>{{ appTitle }}</h1>
         </div>
@@ -127,8 +127,8 @@
  * Markus Kottländer <markus@intevation.de >
  */
 import { mapState } from "vuex";
-import { HTTP } from "../lib/http.js";
-import { displayError } from "../lib/errors.js";
+import { HTTP } from "@/lib/http.js";
+import { displayError } from "@/lib/errors.js";
 
 const UNAUTHORIZED = 401;
 
--- a/client/src/components/Logs.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Logs.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -118,7 +118,7 @@
  * Thomas Junk <thomas.junk@intevation.de>
  */
 import { mapState } from "vuex";
-import { HTTP } from "../lib/http.js";
+import { HTTP } from "@/lib/http.js";
 import "../../node_modules/highlight.js/styles/paraiso-dark.css";
 import Spacer from "./Spacer";
 import Vue from "vue";
--- a/client/src/components/Maplayer.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Maplayer.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -50,7 +50,7 @@
  * * Thomas Junk <thomas.junk@intevation.de>
  * * Bernhard E. Reiter <bernhard.reiter@intevation.de>
  */
-import { HTTP } from "../lib/http";
+import { HTTP } from "@/lib/http";
 import { mapGetters, mapState } from "vuex";
 import "ol/ol.css";
 import { Map, View } from "ol";
--- a/client/src/components/Pdftool.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Pdftool.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -69,7 +69,6 @@
  * Markus Kottländer <markus.kottlaender@intevation.de>
  */
 import { mapState } from "vuex";
-//import { HTTP } from "../application/lib/http";
 
 export default {
   name: "pdftool",
--- a/client/src/components/Search.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Search.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -151,8 +151,8 @@
 import debounce from "lodash.debounce";
 import { mapState } from "vuex";
 
-import { displayError } from "../lib/errors.js";
-import { HTTP } from "../lib/http";
+import { displayError } from "@/lib/errors.js";
+import { HTTP } from "@/lib/http";
 
 const setFocus = () => document.querySelector("#search").focus();
 
--- a/client/src/components/Sidebar.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Sidebar.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -136,7 +136,7 @@
  * Markus Kottländer <markus.kottlaender@intevation.de>
  */
 import { mapGetters, mapState } from "vuex";
-import app from "../main";
+import app from "@/main";
 
 export default {
   name: "sidebar",
--- a/client/src/components/Systemconfiguration.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/Systemconfiguration.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -77,8 +77,8 @@
 import { Chrome } from "vue-color";
 import { Compact } from "vue-color";
 
-import { HTTP } from "../lib/http";
-import { displayError } from "../lib/errors.js";
+import { HTTP } from "@/lib/http";
+import { displayError } from "@/lib/errors.js";
 import { mapState } from "vuex";
 import Spacer from "./Spacer";
 
--- a/client/src/components/fairway/Profiles.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/fairway/Profiles.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -249,8 +249,8 @@
 import { mapState, mapGetters } from "vuex";
 import Feature from "ol/Feature";
 import LineString from "ol/geom/LineString";
-import { displayError, displayInfo } from "../../lib/errors.js";
-import { formatSurveyDate } from "../../lib/date.js";
+import { displayError, displayInfo } from "@/lib/errors.js";
+import { formatSurveyDate } from "@/lib/date.js";
 
 export default {
   name: "profiles",
--- a/client/src/components/importqueue/Importqueue.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/importqueue/Importqueue.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -106,11 +106,11 @@
  * Author(s):
  * Markus Kottländer <markus@intevation.de>
  */
-import { displayError } from "../../lib/errors.js";
+import { displayError } from "@/lib/errors.js";
 import { mapState } from "vuex";
-import { HTTP } from "../../lib/http.js";
+import { HTTP } from "@/lib/http.js";
 import Importqueuedetail from "./Importqueuedetail";
-import Spacer from "../Spacer";
+import Spacer from "@/components/Spacer";
 
 export default {
   name: "importqueue",
--- a/client/src/components/importqueue/Importqueuedetail.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/importqueue/Importqueuedetail.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -98,8 +98,8 @@
  * Thomas Junk <thomas.junk@intevation.de>
  */
 
-import { HTTP } from "../../lib/http.js";
-import { displayError } from "../../lib/errors.js";
+import { HTTP } from "@/lib/http.js";
+import { displayError } from "@/lib/errors.js";
 import locale2 from "locale2";
 
 export default {
--- a/client/src/components/importschedule/Importschedule.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/importschedule/Importschedule.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -97,8 +97,7 @@
 
 import { mapState } from "vuex";
 import Importscheduledetail from "./Importscheduledetail";
-import Spacer from "../Spacer";
-//import { SCHEDULES } from "../../store/imports.js";
+import Spacer from "@/components/Spacer";
 
 export default {
   name: "importschedule",
--- a/client/src/components/importschedule/Importscheduledetail.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/importschedule/Importscheduledetail.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -286,9 +286,9 @@
 
 <script>
 import { mapState } from "vuex";
-import { displayInfo, displayError } from "../../lib/errors.js";
-import app from "../../main.js";
-import { HTTP } from "../../lib/http.js";
+import { displayInfo, displayError } from "@/lib/errors.js";
+import app from "@/main.js";
+import { HTTP } from "@/lib/http.js";
 
 export default {
   name: "importscheduledetail",
--- a/client/src/components/layers/Layerselect.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/layers/Layerselect.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -45,7 +45,7 @@
  * Author(s):
  * Thomas Junk <thomas.junk@intevation.de>
  */
-import { HTTP } from "../../lib/http";
+import { HTTP } from "@/lib/http";
 import LegendElement from "./LegendElement.vue";
 export default {
   props: ["layername", "layerindex", "isVisible"],
--- a/client/src/components/usermanagement/Userdetail.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/usermanagement/Userdetail.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -188,8 +188,8 @@
  * Author(s):
  * Thomas Junk <thomas.junk@intevation.de>
  */
-import { HTTP } from "../../lib/http";
-import { displayError } from "../../lib/errors.js";
+import { HTTP } from "@/lib/http";
+import { displayError } from "@/lib/errors.js";
 import { mapState } from "vuex";
 import PasswordField from "./Passwordfield";
 
--- a/client/src/components/usermanagement/Usermanagement.vue	Tue Dec 18 12:29:48 2018 +0100
+++ b/client/src/components/usermanagement/Usermanagement.vue	Tue Dec 18 12:38:58 2018 +0100
@@ -116,7 +116,7 @@
 </template>
 
 <style scoped lang="scss">
-@import "../../assets/tooltip.scss";
+@import "@/assets/tooltip.scss";
 
 .addbutton {
   position: absolute;
@@ -195,10 +195,10 @@
  * Thomas Junk <thomas.junk@intevation.de>
  */
 import Userdetail from "./Userdetail";
-import store from "../../store";
+import store from "@/store";
 import { mapGetters, mapState } from "vuex";
-import { displayError } from "../../lib/errors.js";
-import Spacer from "../Spacer";
+import { displayError } from "@/lib/errors.js";
+import Spacer from "@/components/Spacer";
 
 export default {
   name: "userview",