Merge branch 'release/1.1.8'

brdgm · Jul 1, 2023 · 042dbc9 · 042dbc9
2 parents 3297145 + 68ae000
commit 042dbc9
Show file tree

Hide file tree

Showing 22 changed files with 4,673 additions and 3,848 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -9,6 +9,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment:
+      name: Production
+      url: "https://brdgm.me/${{ vars.APP_NAME }}"
 
     steps:
     - uses: actions/checkout@v3
@@ -23,7 +26,7 @@ jobs:
     - run: npm run build
 
     - name: Copy to Site
-      uses: cpina/github-action-push-to-another-repository@v1.4.1
+      uses: cpina/github-action-push-to-another-repository@v1.7.2
       env:
         API_TOKEN_GITHUB: ${{ secrets.GH_SITE_DEPLOY_PAT }}
       with:
@@ -34,5 +37,5 @@ jobs:
         user-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
         user-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}
         target-branch: main
-        commit-message: deploy application
-        target-directory: monumental
+        commit-message: deploy ${{ vars.APP_NAME }}
+        target-directory: ${{ vars.APP_NAME }}
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Application: https://brdgm.me/monumental/
 
 This application is Open Source. You can contribute by creating issues or pull requests!
 
-If you want to provide an additional translation, provide a new JSON file in the [locales](https://github.com/brdgm/monumental-solo-helper/tree/develop/src/locales) folder.
+If you want to provide an additional translation, provide a new JSON file in the [locales](https://github.com/brdgm/monumental-solo-helper/tree/develop/src/locales) folder, see [Contribute a Translation](https://github.com/brdgm/brdgm.github.io/wiki/Contribute-a-Translation).
 
 
 ## Development

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@brdgm/monumental-solo-helper",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "private": true,
   "description": "Monumental Solo Helper",
   "scripts": {
@@ -15,10 +15,10 @@
     "@popperjs/core": "~2.11.6",
     "bootstrap": "~5.2.3",
     "brdgm-commons": "github:brdgm/brdgm-commons#1.1.0",
-    "core-js": "~3.26.1",
+    "core-js": "~3.29.1",
     "lodash": "~4.17.21",
     "register-service-worker": "~1.7.2",
-    "vue": "~3.2.45",
+    "vue": "~3.2.47",
     "vue-i18n": "~9.2.2",
     "vue-router": "~4.1.6",
     "vuex": "~4.1.0"
@@ -28,10 +28,10 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/bootstrap": "^5.2.6",
     "@types/chai": "^4.3.4",
-    "@types/lodash": "^4.14.190",
-    "@types/mocha": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.44.0",
-    "@typescript-eslint/parser": "^5.44.0",
+    "@types/lodash": "^4.14.191",
+    "@types/mocha": "^10.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
+    "@typescript-eslint/parser": "^5.56.0",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-plugin-pwa": "~5.0.8",
@@ -40,19 +40,19 @@
     "@vue/cli-plugin-unit-mocha": "~5.0.8",
     "@vue/cli-plugin-vuex": "^5.0.8",
     "@vue/cli-service": "~5.0.8",
-    "@vue/compiler-sfc": "^3.2.45",
+    "@vue/compiler-sfc": "^3.2.47",
     "@vue/eslint-config-typescript": "^11.0.2",
-    "@vue/test-utils": "^2.2.4",
+    "@vue/test-utils": "^2.3.2",
     "babel-plugin-istanbul": "^6.1.1",
     "chai": "^4.3.7",
-    "eslint": "^8.28.0",
-    "eslint-plugin-vue": "^9.8.0",
+    "eslint": "^8.36.0",
+    "eslint-plugin-vue": "^9.9.0",
     "nyc": "^15.1.0",
-    "sass": "^1.56.1",
-    "sass-loader": "^13.2.0",
+    "sass": "^1.59.3",
+    "sass-loader": "^13.2.1",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
-    "typescript": "~4.9.3",
+    "typescript": "~5.0.2",
     "vue-cli-plugin-i18n": "~2.3.1"
   }
 }
diff --git a/src/assets/kofi_button_dark.png b/src/assets/kofi_button_dark.png
diff --git a/src/components/round/BotActions.vue b/src/components/round/BotActions.vue
@@ -90,21 +90,21 @@
 </template>
 
 <script lang="ts">
-import * as _ from "lodash"
+import * as _ from 'lodash'
 import { defineComponent, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
 import { useStore } from '@/store'
 import Bot from '@/services/Bot'
-import ActionText from "./ActionText.vue"
+import ActionText from './ActionText.vue'
 import GoldInfo from './GoldInfo.vue'
 import GoldEarned from './GoldEarned.vue'
 import ModalDialog from 'brdgm-commons/src/components/structure/ModalDialog.vue'
 import CivilizationName from '@/services/enum/CivilizationName'
 import BotCardAction from '@/services/BotCardAction'
-import NavigationState from "@/util/NavigationState"
-import Action from "@/services/enum/Action"
-import CardName from "@/services/enum/CardName"
+import NavigationState from '@/util/NavigationState'
+import Action from '@/services/enum/Action'
+import CardName from '@/services/enum/CardName'
 
 export default defineComponent({
   name: 'BotActions',

diff --git a/src/components/scoring/CivilizationScoring.vue b/src/components/scoring/CivilizationScoring.vue
@@ -92,13 +92,13 @@
 </template>
 
 <script lang="ts">
-import * as _ from "lodash"
+import * as _ from 'lodash'
 import { computed, defineComponent, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useStore } from '@/store'
 import CivilizationIconName from '@/components/structure/CivilizationIconName.vue'
-import tdScore from "./ScoreCell.vue"
-import Bot from "@/services/Bot"
+import tdScore from './ScoreCell.vue'
+import Bot from '@/services/Bot'
 
 export default defineComponent({
   name: 'CivilizationScoring',

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -6,7 +6,7 @@ import RoundPlayer from '@/views/RoundPlayer.vue'
 import RoundBot from '@/views/RoundBot.vue'
 import EndGameScoring from '@/views/EndGameScoring.vue'
 import NotFound from '@/views/NotFound.vue'
-import createRouter from "brdgm-commons/src/util/router/createRouter"
+import createRouter from 'brdgm-commons/src/util/router/createRouter'
 
 const LOCALSTORAGE_KEY = process.env.VUE_APP_LOCALSTORAGE_KEY_PREFIX + "route"
 

diff --git a/src/services/ActionsHelp.ts b/src/services/ActionsHelp.ts
@@ -1,5 +1,5 @@
-import Action from "./enum/Action";
-import ActionHelp from "./enum/ActionHelp";
+import Action from './enum/Action';
+import ActionHelp from './enum/ActionHelp';
 
 const mappings = [
   { help: ActionHelp.GAIN_DEVELOPMENT_CARD, actions: [

diff --git a/src/services/Bot.ts b/src/services/Bot.ts
@@ -1,13 +1,13 @@
-import * as _ from "lodash"
-import { BotPersistence } from "@/store"
-import CardDeck from "./CardDeck"
-import Civilization from "./Civilization"
-import Civilizations from "./Civilizations"
-import CivilizationName from "./enum/CivilizationName"
-import BotCardAction from "./BotCardAction"
-import Card, { CardAction } from "./Card"
-import toCardNames from "@/util/toCardNames"
-import toCards from "@/util/toCards"
+import * as _ from 'lodash'
+import { BotPersistence } from '@/store'
+import CardDeck from './CardDeck'
+import Civilization from './Civilization'
+import Civilizations from './Civilizations'
+import CivilizationName from './enum/CivilizationName'
+import BotCardAction from './BotCardAction'
+import Card, { CardAction } from './Card'
+import toCardNames from '@/util/toCardNames'
+import toCards from '@/util/toCards'
 
 export default class Bot {
 

diff --git a/src/services/BotCardAction.ts b/src/services/BotCardAction.ts
@@ -1,10 +1,10 @@
-import { BotCardActionPersistence } from "@/store"
-import ActionsHelp from "./ActionsHelp"
-import Bot from "./Bot"
-import Card from "./Card"
-import Action from "./enum/Action"
-import ActionHelp from "./enum/ActionHelp"
-import CivilizationType from "./enum/CivilizationType"
+import { BotCardActionPersistence } from '@/store'
+import ActionsHelp from './ActionsHelp'
+import Bot from './Bot'
+import Card from './Card'
+import Action from './enum/Action'
+import ActionHelp from './enum/ActionHelp'
+import CivilizationType from './enum/CivilizationType'
 
 export default class BotCardAction {
 

diff --git a/src/services/Card.ts b/src/services/Card.ts
@@ -1,7 +1,7 @@
-import Action from "./enum/Action"
-import CardName from "./enum/CardName"
-import CivilizationType from "./enum/CivilizationType"
-import CivilizationName from "./enum/CivilizationName"
+import Action from './enum/Action'
+import CardName from './enum/CardName'
+import CivilizationType from './enum/CivilizationType'
+import CivilizationName from './enum/CivilizationName'
 
 export default interface Card {
   name: CardName

diff --git a/src/services/CardDeck.ts b/src/services/CardDeck.ts
@@ -1,10 +1,10 @@
-import * as _ from "lodash"
-import Card from "./Card"
-import Cards from "./Cards"
-import CivilizationName from "./enum/CivilizationName"
-import { CardDeckPersistence } from "@/store"
-import toCardNames from "@/util/toCardNames"
-import toCards from "@/util/toCards"
+import * as _ from 'lodash'
+import Card from './Card'
+import Cards from './Cards'
+import CivilizationName from './enum/CivilizationName'
+import { CardDeckPersistence } from '@/store'
+import toCardNames from '@/util/toCardNames'
+import toCards from '@/util/toCards'
 
 export default class CardDeck {
 

diff --git a/src/services/Cards.ts b/src/services/Cards.ts
@@ -1,9 +1,9 @@
-import CardName from "./enum/CardName";
-import Card from "./Card";
-import CivilizationType from "./enum/CivilizationType";
-import Action from "./enum/Action";
-import CivilizationName from "./enum/CivilizationName";
-import findMandatory from "brdgm-commons/src/util/map/findMandatory"
+import CardName from './enum/CardName';
+import Card from './Card';
+import CivilizationType from './enum/CivilizationType';
+import Action from './enum/Action';
+import CivilizationName from './enum/CivilizationName';
+import findMandatory from 'brdgm-commons/src/util/map/findMandatory'
 
 const cards = [
   /* Standard Action Cards */

diff --git a/src/services/Civilization.ts b/src/services/Civilization.ts
@@ -1,6 +1,6 @@
-import CivilizationName from "./enum/CivilizationName";
-import CivilizationType from "./enum/CivilizationType";
-import Expansion from "./enum/Expansion";
+import CivilizationName from './enum/CivilizationName';
+import CivilizationType from './enum/CivilizationType';
+import Expansion from './enum/Expansion';
 
 export default interface Civilization {
   name: CivilizationName

diff --git a/src/services/Civilizations.ts b/src/services/Civilizations.ts
@@ -1,8 +1,8 @@
-import Civilization from "./Civilization"
-import CivilizationName from "./enum/CivilizationName";
-import CivilizationType from "./enum/CivilizationType";
-import Expansion from "./enum/Expansion"
-import findMandatory from "brdgm-commons/src/util/map/findMandatory"
+import Civilization from './Civilization'
+import CivilizationName from './enum/CivilizationName';
+import CivilizationType from './enum/CivilizationType';
+import Expansion from './enum/Expansion'
+import findMandatory from 'brdgm-commons/src/util/map/findMandatory'
 
 const civilizations = [
   // core box

diff --git a/src/store/index.ts b/src/store/index.ts
@@ -1,4 +1,4 @@
-import * as _ from "lodash"
+import * as _ from 'lodash'
 import { InjectionKey } from 'vue'
 import { createStore, useStore as baseUseStore, Store } from 'vuex'
 import DifficultyLevel from '@/services/enum/DifficultyLevel'

diff --git a/src/util/NavigationState.ts b/src/util/NavigationState.ts
@@ -1,6 +1,6 @@
-import CivilizationName from "@/services/enum/CivilizationName";
-import { State } from "@/store";
-import { RouteLocation } from "vue-router";
+import CivilizationName from '@/services/enum/CivilizationName';
+import { State } from '@/store';
+import { RouteLocation } from 'vue-router';
 
 export default class NavigationState {
 

diff --git a/src/util/toCardNames.ts b/src/util/toCardNames.ts
@@ -1,5 +1,5 @@
-import Card from "@/services/Card";
-import CardName from "@/services/enum/CardName";
+import Card from '@/services/Card';
+import CardName from '@/services/enum/CardName';
 
 /**
  * Converts list of card instances to card names.

diff --git a/src/util/toCards.ts b/src/util/toCards.ts
@@ -1,6 +1,6 @@
-import Card from "@/services/Card";
-import Cards from "@/services/Cards";
-import CardName from "@/services/enum/CardName";
+import Card from '@/services/Card';
+import Cards from '@/services/Cards';
+import CardName from '@/services/enum/CardName';
 
 /**
  * Converts list of card names to card instances.

diff --git a/src/views/AppHome.vue b/src/views/AppHome.vue
@@ -24,6 +24,7 @@
     This is not an official Funforge product and has no affiliation with <a href="https://funforge.fr/" target="_blank" rel="noopener">Funforge</a>.
     All art in this app is from <a href="https://funforge.fr/game/en/monumental" target="_blank" rel="noopener">Monumental</a>.
     See <a href="#" data-bs-toggle="modal" data-bs-target="#creditsModal">{{t('footer.credits')}}</a>.
+    <a href="https://ko-fi.com/brdgm_me" target="_blank"><img class="kofi-button" src="@/assets/kofi_button_dark.png"/></a>
   </p>
 
 </template>
@@ -47,4 +48,7 @@ export default defineComponent({
   margin-top: 4rem;
   font-size: smaller;
 }
-</style>
+.kofi-button {
+  height: 1.4rem;
+}
+</style>
diff --git a/src/views/EndGameScoring.vue b/src/views/EndGameScoring.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import * as _ from "lodash"
+import * as _ from 'lodash'
 import { defineComponent } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useStore } from '@/store'