Mercurial > gemma
changeset 2985:1b8bb4f89227
client: removed .js and .vue extention from imports
line wrap: on
line diff
--- a/client/src/components/Contextbox.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Contextbox.vue Tue Apr 09 18:38:15 2019 +0200 @@ -32,11 +32,9 @@ name: "contextbox", components: { Bottlenecks: () => import("@/components/Bottlenecks"), - Stretches: () => import("@/components/ImportStretches.vue"), - ImportOverview: () => - import("@/components/importoverview/ImportOverview.vue"), - ImportConfiguration: () => - import("@/components/importconfiguration/Import.vue") + Stretches: () => import("@/components/ImportStretches"), + ImportOverview: () => import("@/components/importoverview/ImportOverview"), + ImportConfiguration: () => import("@/components/importconfiguration/Import") }, computed: { ...mapState("application", [
--- a/client/src/components/Login.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Login.vue Tue Apr 09 18:38:15 2019 +0200 @@ -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"; +import { displayError } from "@/lib/errors"; const UNAUTHORIZED = 401;
--- a/client/src/components/Logs.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Logs.vue Tue Apr 09 18:38:15 2019 +0200 @@ -120,11 +120,11 @@ * Thomas Junk <thomas.junk@intevation.de> */ import { mapState } from "vuex"; -import { HTTP } from "@/lib/http.js"; +import { HTTP } from "@/lib/http"; import "../../node_modules/highlight.js/styles/paraiso-dark.css"; import Vue from "vue"; import VueHighlightJS from "vue-highlightjs"; -import { displayError } from "@/lib/errors.js"; +import { displayError } from "@/lib/errors"; Vue.use(VueHighlightJS); const ACCESSLOG = "accesslog";
--- a/client/src/components/Maplayer.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Maplayer.vue Tue Apr 09 18:38:15 2019 +0200 @@ -42,10 +42,10 @@ import { mapState } from "vuex"; import uuid from "uuid"; import { Map, View } from "ol"; -import { WFS, GeoJSON } from "ol/format.js"; -import { equalTo } from "ol/format/filter.js"; -import { Stroke, Style, Fill } from "ol/style.js"; -import { displayError } from "@/lib/errors.js"; +import { WFS, GeoJSON } from "ol/format"; +import { equalTo } from "ol/format/filter"; +import { Stroke, Style, Fill } from "ol/style"; +import { displayError } from "@/lib/errors"; import "ol/ol.css"; /* for the sake of debugging */
--- a/client/src/components/Pdftool.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Pdftool.vue Tue Apr 09 18:38:15 2019 +0200 @@ -95,11 +95,11 @@ */ import { mapState } from "vuex"; import jsPDF from "jspdf"; -import "@/lib/font-linbiolinum.js"; -import { getPointResolution } from "ol/proj.js"; +import "@/lib/font-linbiolinum"; +import { getPointResolution } from "ol/proj"; import locale2 from "locale2"; import { HTTP } from "@/lib/http"; -import { displayError } from "@/lib/errors.js"; +import { displayError } from "@/lib/errors"; var paperSizes = { // in millimeter, landscape [width, height]
--- a/client/src/components/Search.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Search.vue Tue Apr 09 18:38:15 2019 +0200 @@ -158,7 +158,7 @@ import debounce from "lodash.debounce"; import { mapState, mapGetters } from "vuex"; -import { displayError } from "@/lib/errors.js"; +import { displayError } from "@/lib/errors"; import { HTTP } from "@/lib/http"; import { format } from "date-fns";
--- a/client/src/components/Sidebar.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Sidebar.vue Tue Apr 09 18:38:15 2019 +0200 @@ -100,7 +100,7 @@ * Markus Kottländer <markus.kottlaender@intevation.de> */ import { mapGetters, mapState } from "vuex"; -import { logOff } from "@/lib/session.js"; +import { logOff } from "@/lib/session"; import { displayError } from "@/lib/errors"; import { HTTP } from "@/lib/http";
--- a/client/src/components/Zoom.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/Zoom.vue Tue Apr 09 18:38:15 2019 +0200 @@ -56,7 +56,7 @@ * Thomas Junk <thomas.junk@intevation.de> */ import { mapState } from "vuex"; -import { Vector as VectorLayer } from "ol/layer.js"; +import { Vector as VectorLayer } from "ol/layer"; export default { name: "zoom",
--- a/client/src/components/fairway/Profiles.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/fairway/Profiles.vue Tue Apr 09 18:38:15 2019 +0200 @@ -250,7 +250,7 @@ import { mapState } from "vuex"; import Feature from "ol/Feature"; import LineString from "ol/geom/LineString"; -import { displayError, displayInfo } from "@/lib/errors.js"; +import { displayError, displayInfo } from "@/lib/errors"; import { HTTP } from "@/lib/http"; export default {
--- a/client/src/components/gauge/Gauges.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/gauge/Gauges.vue Tue Apr 09 18:38:15 2019 +0200 @@ -104,7 +104,7 @@ * Markus Kottländer <markus.kottlaender@intevation.de> */ import { mapState, mapGetters } from "vuex"; -import { displayError } from "@/lib/errors.js"; +import { displayError } from "@/lib/errors"; export default { data() {
--- a/client/src/components/importconfiguration/Import.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importconfiguration/Import.vue Tue Apr 09 18:38:15 2019 +0200 @@ -100,7 +100,7 @@ export default { components: { - ImportDetails: () => import("./ImportDetails.vue") + ImportDetails: () => import("./ImportDetails") }, data() { return {
--- a/client/src/components/importconfiguration/ImportDetails.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importconfiguration/ImportDetails.vue Tue Apr 09 18:38:15 2019 +0200 @@ -90,11 +90,10 @@ import { mapState } from "vuex"; export default { components: { - ApprovedGaugeMeasurement: () => - import("./types/ApprovedGaugeMeasurement.vue"), + ApprovedGaugeMeasurement: () => import("./types/ApprovedGaugeMeasurement"), WaterwayProfiles: () => import("./types/WaterwayProfiles"), - SoundingResults: () => import("./types/Soundingresults.vue"), - ScheduledImports: () => import("./types/ScheduledImports.vue") + SoundingResults: () => import("./types/Soundingresults"), + ScheduledImports: () => import("./types/ScheduledImports") }, data() { return {};
--- a/client/src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importconfiguration/types/ApprovedGaugeMeasurement.vue Tue Apr 09 18:38:15 2019 +0200 @@ -64,7 +64,7 @@ */ import { HTTP } from "@/lib/http"; -import { displayError, displayInfo } from "@/lib/errors.js"; +import { displayError, displayInfo } from "@/lib/errors"; import app from "@/main"; export default {
--- a/client/src/components/importconfiguration/types/ScheduledImports.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importconfiguration/types/ScheduledImports.vue Tue Apr 09 18:38:15 2019 +0200 @@ -387,8 +387,8 @@ initializeCurrentSchedule } from "@/store/importschedule"; import { mapState } from "vuex"; -import { displayInfo, displayError } from "@/lib/errors.js"; -import app from "@/main.js"; +import { displayInfo, displayError } from "@/lib/errors"; +import app from "@/main"; import { HTTP } from "@/lib/http"; export default {
--- a/client/src/components/importconfiguration/types/Soundingresults.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importconfiguration/types/Soundingresults.vue Tue Apr 09 18:38:15 2019 +0200 @@ -152,7 +152,7 @@ * Markus Kottländer <markus.kottlaender@intevation.de> */ import { HTTP } from "@/lib/http"; -import { displayError, displayInfo } from "@/lib/errors.js"; +import { displayError, displayInfo } from "@/lib/errors"; import { mapState } from "vuex"; const IMPORTSTATE = { UPLOAD: "UPLOAD", EDIT: "EDIT" };
--- a/client/src/components/importconfiguration/types/WaterwayProfiles.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importconfiguration/types/WaterwayProfiles.vue Tue Apr 09 18:38:15 2019 +0200 @@ -100,7 +100,7 @@ * Thomas Junk <thomas.junk@intevation.de> */ -import { displayError, displayInfo } from "@/lib/errors.js"; +import { displayError, displayInfo } from "@/lib/errors"; import { HTTP } from "@/lib/http"; export default {
--- a/client/src/components/importoverview/BottleneckDetail.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importoverview/BottleneckDetail.vue Tue Apr 09 18:38:15 2019 +0200 @@ -84,9 +84,9 @@ */ import { HTTP } from "@/lib/http"; -import { WFS } from "ol/format.js"; -import { or as orFilter, equalTo as equalToFilter } from "ol/format/filter.js"; -import { displayError } from "@/lib/errors.js"; +import { WFS } from "ol/format"; +import { or as orFilter, equalTo as equalToFilter } from "ol/format/filter"; +import { displayError } from "@/lib/errors"; import { mapState } from "vuex"; export default {
--- a/client/src/components/importoverview/ImportOverview.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importoverview/ImportOverview.vue Tue Apr 09 18:38:15 2019 +0200 @@ -120,7 +120,7 @@ import { displayError, displayInfo } from "@/lib/errors"; import { STATES } from "@/store/imports"; import { sortTable } from "@/lib/mixins"; -import { HTTP } from "@/lib/http.js"; +import { HTTP } from "@/lib/http"; import { startOfDay, startOfHour, @@ -133,9 +133,9 @@ export default { components: { - Filters: () => import("./Filters.vue"), - LogEntry: () => import("./LogEntry.vue"), - LogDetail: () => import("./LogDetail.vue") + Filters: () => import("./Filters"), + LogEntry: () => import("./LogEntry"), + LogDetail: () => import("./LogDetail") }, mixins: [sortTable], LAST_HOUR: "lasthour",
--- a/client/src/components/importoverview/LogDetail.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importoverview/LogDetail.vue Tue Apr 09 18:38:15 2019 +0200 @@ -70,13 +70,13 @@ export default { components: { - SoundingResultDetail: () => import("./SoundingResultDetail.vue"), - StretchDetail: () => import("./StretchDetails.vue"), - FairwayDimensionDetail: () => import("./FairwayDimensionDetail.vue"), + SoundingResultDetail: () => import("./SoundingResultDetail"), + StretchDetail: () => import("./StretchDetails"), + FairwayDimensionDetail: () => import("./FairwayDimensionDetail"), ApprovedGaugeMeasurementDetail: () => - import("./ApprovedGaugeMeasurementDetail.vue"), - BottleneckDetail: () => import("./BottleneckDetail.vue"), - AdditionalLog: () => import("./AdditionalLog.vue") + import("./ApprovedGaugeMeasurementDetail"), + BottleneckDetail: () => import("./BottleneckDetail"), + AdditionalLog: () => import("./AdditionalLog") }, props: ["entry"], computed: {
--- a/client/src/components/importoverview/LogEntry.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importoverview/LogEntry.vue Tue Apr 09 18:38:15 2019 +0200 @@ -96,9 +96,9 @@ * Thomas Junk <thomas.junk@intevation.de> */ import { mapState } from "vuex"; -import { STATES } from "@/store/imports.js"; -import { displayError } from "@/lib/errors.js"; -import { HTTP } from "@/lib/http.js"; +import { STATES } from "@/store/imports"; +import { displayError } from "@/lib/errors"; +import { HTTP } from "@/lib/http"; export default { STATES,
--- a/client/src/components/importoverview/StretchDetails.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/importoverview/StretchDetails.vue Tue Apr 09 18:38:15 2019 +0200 @@ -20,7 +20,7 @@ * Author(s): * Thomas Junk <thomas.junk@intevation.de> */ -import { displayError } from "@/lib/errors.js"; +import { displayError } from "@/lib/errors"; import { mapState } from "vuex"; export default {
--- a/client/src/components/layers/LegendElement.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/layers/LegendElement.vue Tue Apr 09 18:38:15 2019 +0200 @@ -20,9 +20,9 @@ import { Map, View } from "ol"; import Feature from "ol/Feature"; -import { Vector as VectorLayer } from "ol/layer.js"; -import { Vector as VectorSource } from "ol/source.js"; -import LineString from "ol/geom/LineString.js"; +import { Vector as VectorLayer } from "ol/layer"; +import { Vector as VectorSource } from "ol/source"; +import LineString from "ol/geom/LineString"; import Point from "ol/geom/Point"; export default {
--- a/client/src/components/systemconfiguration/ColorSettings.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/systemconfiguration/ColorSettings.vue Tue Apr 09 18:38:15 2019 +0200 @@ -45,7 +45,7 @@ */ import { Chrome, Compact } from "vue-color"; import { HTTP } from "@/lib/http"; -import { displayError } from "@/lib/errors.js"; +import { displayError } from "@/lib/errors"; export default { name: "colorsettings",
--- a/client/src/components/toolbar/Toolbar.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/toolbar/Toolbar.vue Tue Apr 09 18:38:15 2019 +0200 @@ -116,13 +116,13 @@ export default { name: "toolbar", components: { - Identify: () => import("./Identify.vue"), - Layers: () => import("./Layers.vue"), - Linetool: () => import("./Linetool.vue"), - Polygontool: () => import("./Polygontool.vue"), - Profiles: () => import("./Profiles.vue"), - Gauges: () => import("./Gauges.vue"), - Pdftool: () => import("./Pdftool.vue") + Identify: () => import("./Identify"), + Layers: () => import("./Layers"), + Linetool: () => import("./Linetool"), + Polygontool: () => import("./Polygontool"), + Profiles: () => import("./Profiles"), + Gauges: () => import("./Gauges"), + Pdftool: () => import("./Pdftool") }, computed: { ...mapState("map", ["layers", "lineTool", "polygonTool", "cutTool"]),
--- a/client/src/components/usermanagement/Userdetail.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/usermanagement/Userdetail.vue Tue Apr 09 18:38:15 2019 +0200 @@ -165,7 +165,7 @@ * Author(s): * Thomas Junk <thomas.junk@intevation.de> */ -import { displayError } from "@/lib/errors.js"; +import { displayError } from "@/lib/errors"; import { mapState } from "vuex"; const emptyErrormessages = () => {
--- a/client/src/components/usermanagement/Usermanagement.vue Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/components/usermanagement/Usermanagement.vue Tue Apr 09 18:38:15 2019 +0200 @@ -130,7 +130,7 @@ */ import store from "@/store"; import { mapGetters, mapState } from "vuex"; -import { displayError, displayInfo } from "@/lib/errors.js"; +import { displayError, displayInfo } from "@/lib/errors"; import { HTTP } from "@/lib/http"; import { sortTable } from "@/lib/mixins";
--- a/client/src/lib/geo.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/lib/geo.js Tue Apr 09 18:38:15 2019 +0200 @@ -20,7 +20,7 @@ * */ -import { GeoJSON } from "ol/format.js"; +import { GeoJSON } from "ol/format"; import Feature from "ol/Feature"; import distance from "@turf/distance"; import {
--- a/client/src/lib/http.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/lib/http.js Tue Apr 09 18:38:15 2019 +0200 @@ -12,7 +12,7 @@ * Thomas Junk <thomas.junk@intevation.de> */ -import { logOff } from "@/lib/session.js"; +import { logOff } from "@/lib/session"; import axios from "axios";
--- a/client/src/main.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/main.js Tue Apr 09 18:38:15 2019 +0200 @@ -28,8 +28,8 @@ import store from "@/store"; import translations from "@/locale/translations.json"; import filters from "@/lib/filters"; -import { supportedLanguages, defaultLanguage } from "./locale/languages.js"; -import App from "@/components/App.vue"; +import { supportedLanguages, defaultLanguage } from "./locale/languages"; +import App from "@/components/App"; import UIBoxHeader from "@/components/ui/UIBoxHeader"; import UITableHeader from "@/components/ui/UITableHeader"; import UITableBody from "@/components/ui/UITableBody";
--- a/client/src/router.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/router.js Tue Apr 09 18:38:15 2019 +0200 @@ -19,8 +19,8 @@ import { sessionStillActive, toMillisFromString } from "./lib/session"; /* facilitate codesplitting */ -const Login = () => import("./components/Login.vue"); -const Main = () => import("./components/Main.vue"); +const Login = () => import("./components/Login"); +const Main = () => import("./components/Main"); Vue.use(Router); @@ -34,7 +34,7 @@ { path: "/usermanagement", name: "usermanagement", - component: () => import("./components/usermanagement/Usermanagement.vue"), + component: () => import("./components/usermanagement/Usermanagement"), meta: { requiresAuth: true }, @@ -50,7 +50,7 @@ { path: "/logs", name: "logs", - component: () => import("./components/Logs.vue"), + component: () => import("./components/Logs"), meta: { requiresAuth: true }, @@ -67,7 +67,7 @@ path: "/systemconfiguration", name: "systemconfiguration", component: () => - import("./components/systemconfiguration/Systemconfiguration.vue"), + import("./components/systemconfiguration/Systemconfiguration"), meta: { requiresAuth: true }, @@ -171,7 +171,7 @@ }, { path: "*", - component: () => import("./components/PageNotFound.vue") + component: () => import("./components/PageNotFound") } ] });
--- a/client/src/store/bottlenecks.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/store/bottlenecks.js Tue Apr 09 18:38:15 2019 +0200 @@ -13,8 +13,8 @@ * Thomas Junk <thomas.junk@intevation.de> */ import { HTTP } from "@/lib/http"; -import { WFS } from "ol/format.js"; -import { displayError } from "@/lib/errors.js"; +import { WFS } from "ol/format"; +import { displayError } from "@/lib/errors"; // initial state const init = () => {
--- a/client/src/store/fairway.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/store/fairway.js Tue Apr 09 18:38:15 2019 +0200 @@ -15,11 +15,11 @@ import Vue from "vue"; import { HTTP } from "@/lib/http"; import { prepareProfile } from "@/lib/geo"; -import LineString from "ol/geom/LineString.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 LineString from "ol/geom/LineString"; +import { generateFeatureRequest } from "@/lib/geo"; +import { getLength } from "ol/sphere"; +import { displayError } from "@/lib/errors"; +import { featureToFairwayCoordinates } from "@/lib/geo"; // initial state const init = () => {
--- a/client/src/store/gauges.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/store/gauges.js Tue Apr 09 18:38:15 2019 +0200 @@ -12,7 +12,7 @@ * Markus Kottländer <markus@intevation.de> */ import { HTTP } from "@/lib/http"; -import { WFS } from "ol/format.js"; +import { WFS } from "ol/format"; import { isPast } from "date-fns"; let dateFrom = new Date();
--- a/client/src/store/imports.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/store/imports.js Tue Apr 09 18:38:15 2019 +0200 @@ -13,8 +13,8 @@ */ import { HTTP } from "@/lib/http"; -import { WFS } from "ol/format.js"; -import { equalTo as equalToFilter } from "ol/format/filter.js"; +import { WFS } from "ol/format"; +import { equalTo as equalToFilter } from "ol/format/filter"; import { startOfHour, endOfHour } from "date-fns"; const STATES = {
--- a/client/src/store/map.js Tue Apr 09 18:23:07 2019 +0200 +++ b/client/src/store/map.js Tue Apr 09 18:38:15 2019 +0200 @@ -16,20 +16,20 @@ //import { HTTP } from "../lib/http"; -import TileWMS from "ol/source/TileWMS.js"; -import { Tile as TileLayer, Vector as VectorLayer } from "ol/layer.js"; +import TileWMS from "ol/source/TileWMS"; +import { Tile as TileLayer, Vector as VectorLayer } from "ol/layer"; import OSM from "ol/source/OSM"; -import Draw from "ol/interaction/Draw.js"; -import { Icon, Stroke, Style, Fill, Text, Circle } from "ol/style.js"; -import VectorSource from "ol/source/Vector.js"; -import Point from "ol/geom/Point.js"; +import Draw from "ol/interaction/Draw"; +import { Icon, Stroke, Style, Fill, Text, Circle } from "ol/style"; +import VectorSource from "ol/source/Vector"; +import Point from "ol/geom/Point"; import { bbox as bboxStrategy } from "ol/loadingstrategy"; import { HTTP } from "@/lib/http"; import { fromLonLat } from "ol/proj"; -import { getLength, getArea } from "ol/sphere.js"; +import { getLength, getArea } from "ol/sphere"; import { unByKey } from "ol/Observable"; import { getCenter } from "ol/extent"; -import { transformExtent } from "ol/proj.js"; +import { transformExtent } from "ol/proj"; import bbox from "@turf/bbox"; import app from "@/main";