Merge branch 'release/0.22.0'

Kruptein · Aug 26, 2020 · b6e926f · b6e926f
2 parents 1bac021 + b9e76fa
commit b6e926f
Show file tree

Hide file tree

Showing 164 changed files with 9,137 additions and 4,833 deletions.
diff --git a/.env b/.env
@@ -1 +1,2 @@
-PYTHONPATH=./server/
+PYTHONPATH=./server
+MYPYPATH=./server
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,38 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [dev, ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [dev]
+  schedule:
+    - cron: '0 7 * * 3'
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: typescript, python
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 server/env/**
 server/**/__pycache__/**
 server/venv
+server/oldsaves
 .mypy**
 .venv
 venv/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,61 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## [0.22.0] - 2020-08-26
+
+### Added
+
+-   localization updates
+    -   Danish
+    -   Spanish
+    -   Chinese
+-   Rotation in Select tool with build mode
+-   Floor UI updates
+    -   visibility toggle
+        -   "Hidden" floors are not selectable by players, BUT will still render in between other selectable layers
+    -   rename floor option
+    -   reorder floors by dragging them
+-   Shape lock/unlock toggle
+    -   Show lock/unlock icon on the selection_info component for quick edit
+    -   Only players with edit access can toggle
+
+### Changed
+
+-   Floors are now loaded separately on startup this greatly impacts startup time
+    -   The floor the user was last active on is loaded first if possible
+    -   Next all floors under the active floor in descending order are loaded
+    -   Lastly the floors above in ascending order are loaded
+-   Other performance improvements
+    -   Delay drawloop start until first floor data arrives
+    -   Better handling of multi group moves
+    -   Shape movement now sends less data to server
+    -   Pan now only updates the visible floors on move and full recalculate on release
+-   Grid pixel size is now a client setting instead of a DM setting
+-   Show floor selector in the more logical order from upper to lower floors
+-   Improve ruler distance text readability
+
+### Fixed
+
+-   Aura not displaying when token is outside the visible canvas
+-   Firefox location scrollbar when left menu is open
+-   Some significant performance bottlenecks
+-   Server now quits, referring to docs/tutorial, if client was not built before start
+-   Initial state adding unnecessary fog on lower floors
+-   Prefer snapped points over grid snapping
+-   Remove white icon in topleft menu UI
+-   Moving polygons with keyboard would only move origin point
+-   Degenerate cases in triangulation
+    -   Triangulation code could hit a degenerate case when dealing with slight number differences in the order of 1e-15
+    -   Now the triangulation code will only take the first 10 digits after the dot into consideration to prevent numerical instability.
+-   Mouseleave events where not triggered in some cases (e.g. alt tab), this could cause some shapes (e.g. rulers) to remain on the screen
+-   Map tool resize does not replicate
+-   Center calculation polygons with repeated points
+-   Location moved shape now properly disappears on the old location
+-   Asset drops on the game board that are not images located in /static are no longer accepted
+    -   This fixes the possible spam of "could not load image /game/..." in your console for future cases
+    -   A script has been added in the server/scripts folder to remove existing assets
+-   Missing case in vision calculation script
+
 ## [0.21.0] - 2020-06-13
 
 ### Added

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "planarally-client",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "A companion tool for when you travel into the planes.",
     "scripts": {
         "serve": "vue-cli-service serve",
@@ -13,52 +13,57 @@
         "test:coverage": "vue-cli-service test:unit --coverage"
     },
     "dependencies": {
-        "core-js": "^3.3.2",
-        "socket.io-client": "^2.2.0",
+        "core-js": "^3.6.5",
+        "socket.io-client": "^2.3.0",
         "tinycolor2": "^1.4.1",
-        "vue": "^2.6.10",
-        "vue-class-component": "^7.0.2",
-        "vue-color": "^2.7.0",
-        "vue-i18n": "^8.18.1",
-        "vue-loading-overlay": "^3.3.0",
+        "vue": "^2.6.11",
+        "vue-class-component": "^7.2.3",
+        "vue-color": "^2.7.1",
+        "vue-i18n": "^8.18.2",
+        "vue-loading-overlay": "^3.3.2",
         "vue-markdown": "^2.2.4",
-        "vue-property-decorator": "^8.3.0",
-        "vue-router": "^3.1.3",
-        "vue-slider-component": "^3.0.42",
+        "vue-property-decorator": "^8.5.0",
+        "vue-router": "^3.3.4",
+        "vue-slider-component": "^3.1.5",
         "vuedraggable": "^2.23.2",
-        "vuex": "^3.0.1",
-        "vuex-module-decorators": "^0.11.0"
+        "vuex": "^3.4.0",
+        "vuex-module-decorators": "^0.17.0"
     },
     "devDependencies": {
+        "@fortawesome/fontawesome-svg-core": "^1.2.28",
+        "@fortawesome/free-brands-svg-icons": "^5.13.0",
+        "@fortawesome/free-regular-svg-icons": "^5.13.0",
+        "@fortawesome/free-solid-svg-icons": "^5.13.0",
+        "@fortawesome/vue-fontawesome": "^0.1.10",
         "@intlify/vue-i18n-loader": "^1.0.0",
-        "@types/jest": "^24.0.22",
-        "@types/lodash": "^4.14.146",
-        "@types/socket.io-client": "^1.4.32",
+        "@types/jest": "^24.9.1",
+        "@types/lodash": "^4.14.155",
+        "@types/socket.io-client": "^1.4.33",
         "@types/tinycolor2": "^1.4.2",
         "@types/vue-color": "^2.4.2",
         "@types/vue-markdown": "^2.2.1",
         "@types/webpack": "^4.4.0",
-        "@typescript-eslint/eslint-plugin": "^2.15.0",
-        "@typescript-eslint/parser": "^2.15.0",
-        "@vue/cli-plugin-babel": "~4.2.2",
-        "@vue/cli-plugin-eslint": "~4.2.2",
-        "@vue/cli-plugin-typescript": "^4.3.0",
-        "@vue/cli-plugin-unit-jest": "~4.2.2",
-        "@vue/cli-service": "~4.2.2",
-        "@vue/eslint-config-prettier": "^5.0.0",
+        "@typescript-eslint/eslint-plugin": "^2.34.0",
+        "@typescript-eslint/parser": "^2.34.0",
+        "@vue/cli-plugin-babel": "^4.4.4",
+        "@vue/cli-plugin-eslint": "^4.4.4",
+        "@vue/cli-plugin-typescript": "^4.4.4",
+        "@vue/cli-plugin-unit-jest": "^4.4.4",
+        "@vue/cli-service": "^4.4.4",
+        "@vue/eslint-config-prettier": "^5.1.0",
         "@vue/eslint-config-typescript": "^4.0.0",
-        "@vue/test-utils": "^1.0.0-beta.29",
+        "@vue/test-utils": "^1.0.3",
         "babel-core": "7.0.0-bridge.0",
-        "babel-eslint": "^10.0.1",
+        "babel-eslint": "^10.1.0",
         "eslint": "^6.8.0",
-        "eslint-plugin-prettier": "^3.1.2",
-        "eslint-plugin-vue": "^6.1.2",
+        "eslint-plugin-prettier": "^3.1.4",
+        "eslint-plugin-vue": "^6.2.2",
         "prettier": "^1.19.1",
-        "rimraf": "^3.0.0",
-        "ts-jest": "^24.1.0",
-        "typescript": "~3.9.3",
+        "rimraf": "^3.0.2",
+        "ts-jest": "^24.3.0",
+        "typescript": "^3.9.5",
         "vue-cli-plugin-i18n": "~1.0.1",
-        "vue-template-compiler": "^2.6.10"
+        "vue-template-compiler": "^2.6.11"
     },
     "bugs": {
         "url": "https://github.com/Kruptein/PlanarAlly/issues"

diff --git a/client/planar.sqlite b/client/planar.sqlite
diff --git a/client/public/index.html b/client/public/index.html
@@ -3,11 +3,6 @@
     <head>
         <meta charset="utf-8" />
         <title>PlanarAlly - The companion tool for your planar travels.</title>
-        <script
-            defer
-            src="/static/extern/js/fontawesome-5.6.3.js"
-            integrity="sha384-EIHISlAOj4zgYieurP0SdoiBYfGJKkgWedPHH4jCzpCXLmzVsw1ouK59MuUtP4a1"
-        ></script>
         <link rel="stylesheet" type="text/css" href="/static/extern/css/directory.css" />
         <link rel="shortcut icon" type="image/png" href="/static/favicon.png" />
     </head>

diff --git a/client/src/App.vue b/client/src/App.vue
@@ -24,7 +24,6 @@ export default class App extends Vue {
 </template>
 
 <style>
-@import url("https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css");
 @import url("https://fonts.googleapis.com/css?family=Open+Sans");
 
 body {

diff --git a/client/src/assetManager/manager.vue b/client/src/assetManager/manager.vue
@@ -185,10 +185,10 @@ export default class AssetManager extends Vue {
             <div id="actionbar">
                 <input id="files" type="file" multiple hidden @change="upload()" />
                 <div @click="createDirectory" :title="$t('assetManager.manager.create_folder')">
-                    <i aria-hidden="true" class="fas fa-plus-square"></i>
+                    <font-awesome-icon icon="plus-square" />
                 </div>
                 <div @click="prepareUpload" :title="$t('assetManager.manager.upload_files')">
-                    <i aria-hidden="true" class="fas fa-upload"></i>
+                    <font-awesome-icon icon="upload" />
                 </div>
             </div>
             <div id="explorer">
@@ -200,7 +200,7 @@ export default class AssetManager extends Vue {
                     @dragleave.prevent="leaveDrag"
                     @drop.prevent.stop="stopDrag($event, parentFolder)"
                 >
-                    <i aria-hidden="true" class="fas fa-folder" style="font-size: 50px;"></i>
+                    <font-awesome-icon icon="folder" style="font-size: 50px;" />
                     <div class="title">..</div>
                 </div>
                 <div
@@ -217,7 +217,7 @@ export default class AssetManager extends Vue {
                     @dragleave.prevent="leaveDrag"
                     @drop.prevent.stop="stopDrag($event, key)"
                 >
-                    <i aria-hidden="true" class="fas fa-folder" style="font-size: 50px;"></i>
+                    <font-awesome-icon icon="folder" style="font-size: 50px;" />
                     <div class="title">{{ idMap.get(key).name }}</div>
                 </div>
                 <div

diff --git a/client/src/auth/login.vue b/client/src/auth/login.vue
@@ -87,7 +87,7 @@ export default class Login extends Vue {
                         autofocus
                     />
                     <span>
-                        <i aria-hidden="true" class="fas fa-user-circle"></i>
+                        <font-awesome-icon icon="user-circle" />
                     </span>
                 </div>
 
@@ -102,7 +102,7 @@ export default class Login extends Vue {
                         required
                     />
                     <span>
-                        <i aria-hidden="true" class="fas fa-lock"></i>
+                        <font-awesome-icon icon="lock" />
                     </span>
                 </div>
 
@@ -120,10 +120,10 @@ export default class Login extends Vue {
                         :title="$t('auth.login.register')"
                         @click="register"
                     >
-                        <i aria-hidden="true" class="fas fa-plus"></i>
+                        <font-awesome-icon icon="plus" />
                     </button>
                     <button type="submit" name="login" class="submit" :title="$t('auth.login.login')">
-                        <i aria-hidden="true" class="fas fa-arrow-right"></i>
+                        <font-awesome-icon icon="arrow-right" />
                     </button>
                 </div>
             </fieldset>

diff --git a/client/src/core/components/inputCopy.vue b/client/src/core/components/inputCopy.vue
@@ -30,7 +30,7 @@ export default class InputCopyElement extends Vue {
         <input type="text" disabled="disabled" :value="value" id="input-element" />
         <div v-show="showPopup" id="show-popup">{{ popupString }}</div>
         <div id="copy-button" @click="copy" :title="$t('core.components.inputCopy.copy')">
-            <i aria-hidden="true" class="far fa-copy"></i>
+            <font-awesome-icon :icon="['far', 'copy']" />
         </div>
     </div>
 </template>

diff --git a/client/src/core/components/languageDropdown.vue b/client/src/core/components/languageDropdown.vue
@@ -4,7 +4,7 @@ import Component from "vue-class-component";
 
 @Component
 export default class LanguageDropdown extends Vue {
-    locales = ["en", "zh", "de", "ru"];
+    locales = ["en", "zh", "de", "ru", "dk", "es"];
 
     changeLocale(event: { target: HTMLSelectElement }): void {
         const value = event.target.value;

diff --git a/client/src/core/components/modals/MarkdownModal.vue b/client/src/core/components/modals/MarkdownModal.vue
@@ -35,7 +35,7 @@ export default class MarkdownModal extends Vue {
         >
             <div>{{ title }}</div>
             <div class="header-close" @click="close" :title="$t('common.close')">
-                <i aria-hidden="true" class="far fa-window-close"></i>
+                <font-awesome-icon :icon="['far', 'window-close']" />
             </div>
         </div>
         <div class="modal-body">

diff --git a/client/src/core/components/modals/PanelModal.vue b/client/src/core/components/modals/PanelModal.vue
@@ -42,7 +42,7 @@ export default class PanelModal extends Vue {
         >
             <div><slot name="title"></slot></div>
             <div class="header-close" @click="hideModal" :title="$t('common.close')">
-                <i aria-hidden="true" class="far fa-window-close"></i>
+                <font-awesome-icon :icon="['far', 'window-close']" />
             </div>
         </div>
         <div class="modal-body" @click="handleClick">

diff --git a/client/src/core/components/modals/confirm.vue b/client/src/core/components/modals/confirm.vue
@@ -105,6 +105,7 @@ export default class ConfirmDialog extends Vue {
 
 .buttons {
     align-self: flex-end;
+    margin-top: 15px;
 }
 
 button:first-of-type {

diff --git a/client/src/dashboard/main.vue b/client/src/dashboard/main.vue
@@ -101,11 +101,11 @@ export default class Dashboard extends Vue {
                             :placeholder="$t('dashboard.main.session_name')"
                         />
                         <span>
-                            <i aria-hidden="true" class="fab fa-d-and-d"></i>
+                            <font-awesome-icon :icon="['fab', 'd-and-d']" />
                         </span>
                     </div>
                     <button type="submit" class="submit" :title="$t('common.create')">
-                        <i aria-hidden="true" class="fas fa-arrow-right"></i>
+                        <font-awesome-icon icon="arrow-right" />
                     </button>
                 </fieldset>
             </form>
@@ -117,12 +117,12 @@ export default class Dashboard extends Vue {
                         :title="$t('dashboard.main.account_settings')"
                         to="/settings"
                     >
-                        <i aria-hidden="true" class="fas fa-cog"></i>
+                        <font-awesome-icon icon="cog" />
                     </router-link>
                 </form>
                 <form @submit.prevent>
                     <router-link tag="button" class="submit" :title="$t('dashboard.main.logout')" to="/auth/logout">
-                        <i aria-hidden="true" class="fas fa-sign-out-alt"></i>
+                        <font-awesome-icon icon="sign-out-alt" />
                     </router-link>
                 </form>
             </div>