Skip to content

Commit

Permalink
Update some server landingpage dependencies
Browse files Browse the repository at this point in the history 
Use @babel/eslint-parser instead of babel-eslint which is deprecated:
https://www.npmjs.com/package/babel-eslint

Includes some adjustments related to the deps update.
  • Loading branch information
@pathmapper @nyalldawson
pathmapper authored and nyalldawson committed Dec 8, 2022
1 parent 9e5cd1f commit b27ab6e
Show file tree
Hide file tree
Showing 9 changed files with 2,506 additions and 2,907 deletions.
36 changes: 18 additions & 18 deletions resources/server/src/landingpage/package.json
View file
Expand Up @@ -8,28 +8,28 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"leaflet": "^1.7.1",
"leaflet": "^1.9.3",
"leaflet.wms": "^0.2.0",
"reproject": "^1.2.6",
"reproject": "^1.2.7",
"vue": "^2.6.14",
"vue-router": "^3.5.3",
"vue-router": "^3.6.5",
"vue2-leaflet": "^2.7.1",
"vuetify": "^2.6.10",
"vuetify": "^2.6.12",
"vuex": "^3.6.2"
},
"devDependencies": {
"@vue/cli": "~5.0.0-rc.1",
"@vue/cli-plugin-babel": "~5.0.0-rc.1",
"@vue/cli-plugin-eslint": "~5.0.0-rc.1",
"@vue/cli-service": "~5.0.0-rc.1",
"babel-eslint": "^10.1.0",
"eslint": "^7.6.0",
"eslint-plugin-vue": "^6.2.2",
"sass": "~1.32.6",
"sass-loader": "^9.0.3",
"vue-cli-plugin-vuetify": "~2.4.5",
"vue-template-compiler": "^2.6.14",
"vuetify-loader": "^1.7.3",
"@vue/cli": "^5.0.8",
"@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-plugin-eslint": "^5.0.8",
"@vue/cli-service": "^5.0.8",
"@babel/eslint-parser": "^7.19.1",
"eslint": "^8.29.0",
"eslint-plugin-vue": "^9.8.0",
"sass": "~1.56.1",
"sass-loader": "^13.2.0",
"vue-cli-plugin-vuetify": "~2.5.8",
"vue-template-compiler": "^2.7.14",
"vuetify-loader": "^1.9.2",
"webpack-license-plugin": "^4.2.2"
},
"eslintConfig": {
Expand All @@ -42,9 +42,9 @@
"eslint:recommended"
],
"parserOptions": {
"parser": "babel-eslint"
"parser": "@babel/eslint-parser"
},
"rules": {}
"rules": {"vue/no-mutating-props": "off"}
},
"browserslist": [
"> 1%",
Expand Down
2 changes: 1 addition & 1 deletion resources/server/src/landingpage/src/components/AttributeTable.vue
View file
Expand Up @@ -58,7 +58,7 @@
itemsPerPageText: ''
}"
>
<template v-slot:item.zoomToFeature="{ item }">
<template v-slot:[`item.zoomToFeature`]="{ item }">
<v-icon @click="zoomToFeature(item.feature)">mdi-magnify</v-icon>
</template>
</v-data-table>
Expand Down
3 changes: 2 additions & 1 deletion resources/server/src/landingpage/src/components/LayerTreeNode.vue
View file
Expand Up @@ -163,7 +163,8 @@
@click="onContextMenuOptionClicked(item.name, node.typename)"
>
<v-list-item-icon>
<v-icon v-text="item.icon"></v-icon>
<div v-text="item.icon"></div>
<v-icon>{{item.icon}}</v-icon>
</v-list-item-icon>
<v-list-item-title>{{ item.title }}</v-list-item-title>
</v-list-item>
Expand Down
0 .../src/landingpage/src/components/Error.vue → ...rc/landingpage/src/components/MyError.vue
View file
File renamed without changes.
0 ...c/landingpage/src/components/Metadata.vue → ...ngpage/src/components/ProjectMetadata.vue
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/server/src/landingpage/src/main.js
View file
Expand Up @@ -27,7 +27,7 @@ const routes = [
{
path: "/",
name: "catalog",
component: () => import("@/views/Catalog.vue"),
component: () => import("@/views/ServerCatalog.vue"),
meta: {
title: "QGIS Server Catalog - Home Page",
metaTags: [
Expand Down
16 changes: 8 additions & 8 deletions ...ver/src/landingpage/src/views/Catalog.vue → ...c/landingpage/src/views/ServerCatalog.vue
View file
Expand Up @@ -15,7 +15,7 @@
<v-container id="catalog" class="fill-height" fluid v-if="catalog">
<v-row align="center" v-if="error.length > 0 || status == `empty`">
<v-col cols="12">
<Error v-if="error.length > 0" :error="error" />
<MyError v-if="error.length > 0" :error="error" />
<v-alert type="warning" v-if="status == `empty`">
<h2>This QGIS Server catalog does not contain any project.</h2>
<p>
Expand Down Expand Up @@ -90,14 +90,14 @@
>
<template v-slot:activator="{ on }">
<v-btn color="orange" text v-on="on">
<v-icon>mdi-information</v-icon>Metadata
<v-icon>mdi-information</v-icon>ProjectMetadata
</v-btn>
</template>
<v-card>
<v-card-title>{{ project.title }}</v-card-title>
<v-divider></v-divider>
<v-card-text style="height: 300px">
<Metadata :project="project" />
<ProjectMetadata :project="project" />
</v-card-text>
<v-divider></v-divider>
<v-card-actions>
Expand Down Expand Up @@ -134,18 +134,18 @@ import { LMap, LControlAttribution, LTileLayer } from "vue2-leaflet";
import "leaflet/dist/leaflet.css";
import { latLng, Polygon } from "leaflet";
import WMS from "leaflet.wms/dist/leaflet.wms.js";
import Metadata from "@/components/Metadata.vue";
import Error from "@/components/Error.vue";
import ProjectMetadata from "@/components/ProjectMetadata.vue";
import MyError from "@/components/MyError.vue";
import Utils from "@/js/Utils.js";
export default {
name: "Catalog",
name: "ServerCatalog",
components: {
LMap,
LControlAttribution,
LTileLayer,
Metadata,
Error,
ProjectMetadata,
MyError,
},
computed: {
status() {
Expand Down
6 changes: 3 additions & 3 deletions resources/server/src/landingpage/src/views/WebGis.vue
View file
Expand Up @@ -7,7 +7,7 @@
size="64"
></v-progress-circular>
</v-overlay>
<Error v-if="error.length > 0" :error="error" />
<MyError v-if="error.length > 0" :error="error" />
<template v-else>
<v-app-bar app dense collapse-on-scroll clipped-left color="green" dark>
<v-app-bar-nav-icon
Expand Down Expand Up @@ -83,7 +83,7 @@ import MapToolbar from "@/components/MapToolbar.vue";
import MapFooter from "@/components/MapFooter.vue";
import LeftSidebar from "@/components/LeftSidebar.vue";
import AttributeTable from "@/components/AttributeTable.vue";
import Error from "@/components/Error.vue";
import MyError from "@/components/MyError.vue";
import { LMap, LControlAttribution, LTileLayer } from "vue2-leaflet";
import WmsSource from "@/js/WmsSource.js";
import "leaflet/dist/leaflet.css";
Expand Down Expand Up @@ -114,7 +114,7 @@ export default {
LTileLayer,
MapToolbar,
MapFooter,
Error,
MyError,
LeftSidebar,
AttributeTable,
},
Expand Down

0 comments on commit b27ab6e

Please sign in to comment.