Merge branch 'release/0.25.0'

Author: Kruptein

.gitattributes

@@ -0,0 +1,3 @@
+* text=lf
+
+*.png binary

CHANGELOG.md

@@ -8,9 +8,37 @@ These usually have no immediately visible impact on regular users
 
 ## Unreleased
 
+## [0.25.0] - 2021-02-07
+
+### Added
+
+-   Is public toggle for annotations
+-   Undo/Redo (50 action memory)
+    -   shape movement
+    -   shape rotation
+    -   shape resize
+    -   floor change
+    -   layer change
+    -   shape creation/removal
+-   New aura options
+    -   enable/disable toggle
+    -   border
+    -   viewing angle (width + direction)
+-   Location (un)archiving
+-   Spell measuring system
+
+### Fixed
+
+-   Shape name not immediately syncing on visibility toggle
+-   Vision tool disabled tokens private auras no longer being visible
+-   Tokens giving minimal vision on other floors
+-   Floor creation not triangulating
+    -   This fixes newly created floors being broken in regards to vision until a refresh
+-   Update location bar user position when moving shape
+
 ## [0.24.1] - 2021-01-17
 
-### Fixes
+### Fixed
 
 -   minimal token vision being broken
 -   pasting polygons would change the angle on the first segment

client/.eslintrc.js

@@ -3,7 +3,13 @@ module.exports = {
     env: {
         node: true,
     },
-    extends: ["plugin:@typescript-eslint/recommended", "plugin:vue/essential", "@vue/typescript", "@vue/prettier"],
+    extends: [
+        "plugin:@typescript-eslint/recommended",
+        "plugin:vue/essential",
+        "@vue/typescript",
+        "@vue/prettier",
+        "plugin:import/typescript",
+    ],
     rules: {
         "@typescript-eslint/consistent-type-assertions": [2, { assertionStyle: "as" }],
         "@typescript-eslint/explicit-function-return-type": [2, { allowExpressions: true }],
@@ -17,6 +23,15 @@ module.exports = {
             { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
         ],
         "@typescript-eslint/no-use-before-define": 0,
+        "import/no-unused-modules": [process.env.GITHUB_ACTION === undefined ? 1 : 2, { unusedExports: true }],
+        "import/order": [
+            "error",
+            {
+                alphabetize: { order: "asc", caseInsensitive: true },
+                "newlines-between": "always",
+                pathGroups: [{ pattern: "@/**", group: "parent", position: "before" }],
+            },
+        ],
         // "no-console": process.env.NODE_ENV === "production" ? "error" : "off",
         "no-console": "off",
         "no-constant-condition": "off",
@@ -33,4 +48,13 @@ module.exports = {
             jsx: false,
         },
     },
+    plugins: ["import"],
+    settings: {
+        "import/resolver": {
+            typescript: {
+                extensions: [".js", ".ts", ".d.ts", ".vue"],
+            },
+        },
+        "import/extensions": [".ts", ".vue"],
+    },
 };

client/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "planarally-client",
-    "version": "0.24.1",
+    "version": "0.25.0",
     "description": "A companion tool for when you travel into the planes.",
     "scripts": {
         "serve": "vue-cli-service serve",
@@ -13,15 +13,15 @@
         "test:coverage": "vue-cli-service test:unit --coverage"
     },
     "dependencies": {
-        "core-js": "^3.8.1",
-        "socket.io-client": "^3.0.4",
+        "core-js": "^3.8.3",
+        "socket.io-client": "^3.1.0",
         "swiper": "^5.4.5",
         "tinycolor2": "^1.4.2",
         "vue": "^2.6.12",
         "vue-awesome-swiper": "^4.1.1",
         "vue-class-component": "^7.2.6",
-        "vue-color": "^2.7.1",
-        "vue-i18n": "^8.22.2",
+        "vue-color": "^2.8.1",
+        "vue-i18n": "^8.22.4",
         "vue-loading-overlay": "^3.4.2",
         "vue-markdown": "^2.2.4",
         "vue-property-decorator": "^8.5.1",
@@ -33,38 +33,40 @@
         "vuex-module-decorators": "^0.17.0"
     },
     "devDependencies": {
-        "@fortawesome/fontawesome-svg-core": "^1.2.32",
-        "@fortawesome/free-brands-svg-icons": "^5.15.1",
-        "@fortawesome/free-regular-svg-icons": "^5.15.1",
-        "@fortawesome/free-solid-svg-icons": "^5.15.1",
-        "@fortawesome/vue-fontawesome": "^2.0.0",
+        "@fortawesome/fontawesome-svg-core": "^1.2.34",
+        "@fortawesome/free-brands-svg-icons": "^5.15.2",
+        "@fortawesome/free-regular-svg-icons": "^5.15.2",
+        "@fortawesome/free-solid-svg-icons": "^5.15.2",
+        "@fortawesome/vue-fontawesome": "^2.0.2",
         "@intlify/vue-i18n-loader": "^1.0.0",
         "@types/jest": "^24.9.1",
-        "@types/lodash": "^4.14.165",
+        "@types/lodash": "^4.14.168",
         "@types/swiper": "^5.4.1",
         "@types/tinycolor2": "^1.4.2",
         "@types/vue-color": "^2.4.3",
         "@types/vue-markdown": "^2.2.1",
-        "@types/webpack": "^4.41.25",
-        "@typescript-eslint/eslint-plugin": "^4.9.1",
-        "@typescript-eslint/parser": "^4.9.1",
-        "@vue/cli-plugin-babel": "^4.5.9",
-        "@vue/cli-plugin-eslint": "^4.5.9",
-        "@vue/cli-plugin-typescript": "^4.5.9",
-        "@vue/cli-plugin-unit-jest": "^4.5.9",
-        "@vue/cli-service": "^4.5.9",
-        "@vue/eslint-config-prettier": "^5.1.0",
-        "@vue/eslint-config-typescript": "^4.0.0",
-        "@vue/test-utils": "^1.1.1",
+        "@types/webpack": "^4.41.26",
+        "@typescript-eslint/eslint-plugin": "^4.14.0",
+        "@typescript-eslint/parser": "^4.14.0",
+        "@vue/cli-plugin-babel": "^4.5.10",
+        "@vue/cli-plugin-eslint": "^4.5.10",
+        "@vue/cli-plugin-typescript": "^4.5.10",
+        "@vue/cli-plugin-unit-jest": "^4.5.10",
+        "@vue/cli-service": "^4.5.10",
+        "@vue/eslint-config-prettier": "^6.0.0",
+        "@vue/eslint-config-typescript": "^7.0.0",
+        "@vue/test-utils": "^1.1.2",
         "babel-core": "7.0.0-bridge.0",
         "babel-eslint": "^10.1.0",
-        "eslint": "^6.8.0",
-        "eslint-plugin-prettier": "^3.2.0",
-        "eslint-plugin-vue": "^6.2.2",
-        "prettier": "^1.19.1",
+        "eslint": "^7.4.1",
+        "eslint-import-resolver-typescript": "^2.3.0",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-prettier": "^3.3.1",
+        "eslint-plugin-vue": "7.4.1",
+        "prettier": "^2.2.1",
         "rimraf": "^3.0.2",
-        "sass": "^1.30.0",
-        "sass-loader": "^10.1.0",
+        "sass": "^1.32.5",
+        "sass-loader": "^10.1.1",
         "ts-jest": "^24.3.0",
         "typescript": "^4.1.3",
         "vue-cli-plugin-i18n": "~1.0.1",

client/package.json

@@ -1,8 +1,10 @@
 <script lang="ts">
-import { Component, Vue } from "vue-property-decorator";
 import Loading from "vue-loading-overlay";
+import { Component, Vue } from "vue-property-decorator";
+
 import "vue-loading-overlay/dist/vue-loading.css";
 import { coreStore } from "@/core/store";
+
 import { BASE_PATH } from "./utils";
 
 @Component({

client/src/App.vue

@@ -1,15 +1,14 @@
 <script lang="ts">
 import Vue from "vue";
-
 import Component from "vue-class-component";
 
+import { socket } from "@/assetManager/socket";
+import { assetStore } from "@/assetManager/store";
 import ContextMenu from "@/core/components/contextmenu.vue";
 import ConfirmDialog from "@/core/components/modals/confirm.vue";
 import Prompt from "@/core/components/modals/prompt.vue";
-import AssetManager from "./manager.vue";
 
-import { socket } from "@/assetManager/socket";
-import { assetStore } from "@/assetManager/store";
+import AssetManager from "./manager.vue";
 
 @Component({
     components: {

client/src/assetManager/contextMenu.vue

@@ -1,16 +1,14 @@
 <script lang="ts">
 import Vue from "vue";
 import Component from "vue-class-component";
-
 import { Route, NavigationGuard } from "vue-router";
 import { mapGetters } from "vuex";
 
 import AssetContextMenu from "@/assetManager/contextMenu.vue";
-import Prompt from "@/core/components/modals/prompt.vue";
-
 import { socket } from "@/assetManager/socket";
 import { assetStore } from "@/assetManager/store";
 import { Asset } from "@/core/comm/types";
+import Prompt from "@/core/components/modals/prompt.vue";
 import { baseAdjust, uuidv4 } from "@/core/utils";
 
 Component.registerHooks(["beforeRouteEnter"]);
@@ -153,7 +151,7 @@ export default class AssetManager extends Vue {
                         slice * CHUNK_SIZE + Math.min(CHUNK_SIZE, file.size - slice * CHUNK_SIZE),
                     ),
                 );
-                fr.onload = _e => {
+                fr.onload = (_e) => {
                     socket.emit("Asset.Upload", {
                         name: file.name,
                         directory: target,

client/src/assetManager/manager.vue

@@ -1,6 +1,8 @@
 import { Asset } from "@/core/comm/types";
+
 import { socketManager } from "../core/socket";
 import { baseAdjust } from "../core/utils";
+
 import { assetStore } from "./store";
 
 export const socket = socketManager.socket("/pa_assetmgmt");

client/src/assetManager/socket.ts

@@ -3,6 +3,7 @@ import { getModule, Module, Mutation, VuexModule } from "vuex-module-decorators"
 
 import { Asset } from "@/core/comm/types";
 import { rootStore } from "@/store";
+
 import { router } from "../router";
 
 export interface AssetState {
@@ -55,17 +56,14 @@ class AssetStore extends VuexModule {
     @Mutation
     setPath(path: number[]): void {
         this.folderPath = path;
-        for (const [index, part] of router.currentRoute.path
-            .slice("/assets/".length)
-            .split("/")
-            .entries()) {
+        for (const [index, part] of router.currentRoute.path.slice("/assets/".length).split("/").entries()) {
             this._idMap.set(path[index], { id: path[index], name: part });
         }
     }
 
     @Mutation
     resolveUpload(file: string): void {
-        const idx = this._pendingUploads.findIndex(f => f === file);
+        const idx = this._pendingUploads.findIndex((f) => f === file);
         if (idx >= 0) {
             this._pendingUploads.splice(idx, 1);
             this._resolvedUploads++;
@@ -86,10 +84,10 @@ class AssetStore extends VuexModule {
         target.push(asset.id);
 
         const sorted_target = target
-            .map(i => this._idMap.get(i))
-            .filter(a => a !== undefined)
+            .map((i) => this._idMap.get(i))
+            .filter((a) => a !== undefined)
             .sort((a, b) => a!.name.localeCompare(b!.name))
-            .map(a => a!.id);
+            .map((a) => a!.id);
         if (asset.file_hash) {
             this._files = sorted_target;
         } else {