Mercurial > gemma

changeset 2947:a6eea3002e6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: cleanup import paths
author Fadi Abbud <fadi.abbud@intevation.de>
date Fri, 05 Apr 2019 12:47:35 +0200
parents 4141a06961bb
children f6cd4ebd8562
files client/src/components/Pdftool.vue client/src/lib/errors.js client/src/store/fairway.js client/src/store/map.js client/src/store/user.js client/src/store/usermanagement.js
diffstat 6 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/Pdftool.vue	Fri Apr 05 11:27:21 2019 +0200
+++ b/client/src/components/Pdftool.vue	Fri Apr 05 12:47:35 2019 +0200
@@ -98,7 +98,7 @@
 import "@/lib/font-linbiolinum.js";
 import { getPointResolution } from "ol/proj.js";
 import locale2 from "locale2";
-import { HTTP } from "../lib/http";
+import { HTTP } from "@/lib/http";
 import { displayError } from "@/lib/errors.js";
 import { LAYERS } from "@/store/map.js";
 
--- a/client/src/lib/errors.js	Fri Apr 05 11:27:21 2019 +0200
+++ b/client/src/lib/errors.js	Fri Apr 05 12:47:35 2019 +0200
@@ -12,7 +12,7 @@
  * Thomas Junk <thomas.junk@intevation.de>
  */
 
-import app from "../main";
+import app from "@/main";
 
 let displayOptions = {
   timeout: 2500,
--- a/client/src/store/fairway.js	Fri Apr 05 11:27:21 2019 +0200
+++ b/client/src/store/fairway.js	Fri Apr 05 12:47:35 2019 +0200
@@ -13,13 +13,13 @@
  * Markus Kottländer <markuks.kottlaender@intevation.de>
  */
 import Vue from "vue";
-import { HTTP } from "../lib/http";
-import { prepareProfile } from "../lib/geo";
+import { HTTP } from "@/lib/http";
+import { prepareProfile } from "@/lib/geo";
 import LineString from "ol/geom/LineString.js";
-import { generateFeatureRequest } from "../lib/geo.js";
+import { generateFeatureRequest } from "@/lib/geo.js";
 import { getLength } from "ol/sphere.js";
-import { displayError } from "../lib/errors.js";
-import { featureToFairwayCoordinates } from "../lib/geo.js";
+import { displayError } from "@/lib/errors.js";
+import { featureToFairwayCoordinates } from "@/lib/geo.js";
 import { LAYERS } from "@/store/map.js";
 
 // initial state
--- a/client/src/store/map.js	Fri Apr 05 11:27:21 2019 +0200
+++ b/client/src/store/map.js	Fri Apr 05 12:47:35 2019 +0200
@@ -24,14 +24,14 @@
 import VectorSource from "ol/source/Vector.js";
 import Point from "ol/geom/Point.js";
 import { bbox as bboxStrategy } from "ol/loadingstrategy";
-import { HTTP } from "../lib/http";
+import { HTTP } from "@/lib/http";
 import { fromLonLat } from "ol/proj";
 import { getLength, getArea } from "ol/sphere.js";
 import { unByKey } from "ol/Observable";
 import { getCenter } from "ol/extent";
 import { transformExtent } from "ol/proj.js";
 import bbox from "@turf/bbox";
-import app from "../main";
+import app from "@/main";
 
 const LAYERS = {
   OPENSTREETMAP: "Open Streetmap",
@@ -373,7 +373,7 @@
                 new Style({
                   geometry: new Point(bnCenter),
                   image: new Icon({
-                    src: require("../assets/marker-bottleneck-critical.png"),
+                    src: require("@/assets/marker-bottleneck-critical.png"),
                     anchor: [0.5, 0.5],
                     scale: isLegend ? 0.5 : 1
                   })
@@ -452,7 +452,7 @@
             return [
               new Style({
                 image: new Icon({
-                  src: require("../assets/marker-gauge.png"),
+                  src: require("@/assets/marker-gauge.png"),
                   anchor: [0.5, isLegend ? 0.5 : 1],
                   scale: isLegend ? 0.5 : 1
                 }),
@@ -511,7 +511,7 @@
                     geometry: new Point(end),
                     image: new Icon({
                       // we need to make sure the image is loaded by Vue Loader
-                      src: require("../assets/linestring_arrow.png"),
+                      src: require("@/assets/linestring_arrow.png"),
                       // fiddling with the anchor's y value does not help to
                       // position the image more centered on the line ending, as the
                       // default line style seems to be slightly uncentered in the
@@ -559,7 +559,7 @@
                     geometry: new Point(end),
                     image: new Icon({
                       // we need to make sure the image is loaded by Vue Loader
-                      src: require("../assets/linestring_arrow_grey.png"),
+                      src: require("@/assets/linestring_arrow_grey.png"),
                       // fiddling with the anchor's y value does not help to
                       // position the image more centered on the line ending, as the
                       // default line style seems to be slightly uncentered in the
--- a/client/src/store/user.js	Fri Apr 05 11:27:21 2019 +0200
+++ b/client/src/store/user.js	Fri Apr 05 12:47:35 2019 +0200
@@ -13,8 +13,8 @@
  * Markus Kottländer <markus@intevation.de>
  */
 
-import { HTTP } from "../lib/http";
-import { toMillisFromString } from "../lib/session";
+import { HTTP } from "@/lib/http";
+import { toMillisFromString } from "@/lib/session";
 
 const init = () => {
   return {
--- a/client/src/store/usermanagement.js	Fri Apr 05 11:27:21 2019 +0200
+++ b/client/src/store/usermanagement.js	Fri Apr 05 12:47:35 2019 +0200
@@ -13,7 +13,7 @@
  * Markus Kottländer <markus@intevation.de>
  */
 
-import { HTTP } from "../lib/http";
+import { HTTP } from "@/lib/http";
 
 // initial state
 const init = () => {