Merge branch 'release/1.1.7'

brdgm · Dec 17, 2022 · 3297145 · 3297145
2 parents 6203021 + 59b1415
commit 3297145
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 147 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,6 +14,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
 
     steps:
     - uses: actions/checkout@v3
@@ -22,13 +24,14 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
-        cache: 'npm'
+        node-version: 18
+        cache: npm
 
     - run: npm install
     - run: npm run test:coverage
     - run: npm run build
     - uses: SonarSource/sonarcloud-github-action@master
+      if: env.SONARCLOUD_TOKEN != null
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+        SONAR_TOKEN: ${{ env.SONARCLOUD_TOKEN }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -15,8 +15,8 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
-        cache: 'npm'
+        node-version: 18
+        cache: npm
 
     - run: npm install
     - run: npm run test:unit

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.6",
+  "version": "1.1.7",
   "private": true,
   "description": "Monumental Solo Helper",
   "scripts": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@popperjs/core": "~2.11.6",
     "bootstrap": "~5.2.3",
-    "brdgm-commons": "github:brdgm/brdgm-commons#1.0.5",
+    "brdgm-commons": "github:brdgm/brdgm-commons#1.1.0",
     "core-js": "~3.26.1",
     "lodash": "~4.17.21",
     "register-service-worker": "~1.7.2",

diff --git a/src/App.vue b/src/App.vue
@@ -7,55 +7,44 @@
 
   <AppFooter :build-number="buildNumber" :credits-label="t('footer.credits')" credits-modal-id="creditsModal" zoom-enabled @zoomFontSize="zoomFontSize"/>
 
-  <div class="modal" tabindex="-1" id="errorMessage">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="t('action.close')"></button>
-        </div>
-        <div class="modal-body">
-          <div class="alert alert-danger" role="alert">{{errorMessage}}</div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{t('action.close')}}</button>
-        </div>
-      </div>
-    </div>
-  </div>
+  <ModalDialog id="errorMessage">
+    <template #body>
+      <div class="alert alert-danger" role="alert">{{errorMessage}}</div>
+    </template>
+  </ModalDialog>
 
-  <div class="modal" id="creditsModal" tabindex="-1" aria-hidden="true">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title">{{t('footer.credits')}}</h5>
-          <button class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-        </div>
-        <div class="modal-body">
-          <h4><a href="https://boardgamegeek.com/boardgame/248125/monumental" target="_blank" rel="noopener">{{t('gameTitle')}}</a></h4>
-          <dl>
-            <dt>Game design</dt>
-            <dd>Matthew Dunstan</dd>
-            <dt>Graphic design</dt>
-            <dd>Funforge studio</dd>
-            <dt>Publisher</dt>
-            <dd><a href="https://funforge.fr/" target="_blank" rel="noopener">Funforge</a></dd>
-          </dl>
-          <h4 class="border-top pt-3">{{appTitle}}</h4>
-          <dl>
-            <dt>Application Development</dt>
-            <dd>Stefan Seifert</dd>
-            <dt>Version</dt>
-            <dd>{{buildNumber}}</dd>
-            <dt>Source Code (Apache-2.0 License)</dt>
-            <dd><a href="https://github.com/brdgm/monumental-solo-helper" target="_blank" rel="noopener">https://github.com/brdgm/monumental-solo-helper</a></dd>
-          </dl>
-        </div>
-        <div class="modal-footer">
-          <button class="btn btn-secondary" data-bs-dismiss="modal">{{t('action.close')}}</button>
-        </div>
-      </div>
-    </div>
-  </div>
+  <ModalDialog id="serviceWorkerUpdatedRefresh" :title="t('serviceWorkerUpdatedRefresh.title')">
+    <template #body>
+      <p v-html="t('serviceWorkerUpdatedRefresh.notice')"></p>
+    </template>
+    <template #footer>
+      <button class="btn btn-primary" data-bs-dismiss="modal" @click="$router.go(0)">{{t('serviceWorkerUpdatedRefresh.title')}}</button>
+      <button class="btn btn-secondary" data-bs-dismiss="modal">{{t('action.close')}}</button>
+    </template>
+  </ModalDialog>
+
+  <ModalDialog id="creditsModal" :title="t('footer.credits')">
+    <template #body>
+      <h4><a href="https://boardgamegeek.com/boardgame/248125/monumental" target="_blank" rel="noopener">{{t('gameTitle')}}</a></h4>
+      <dl>
+        <dt>Game design</dt>
+        <dd>Matthew Dunstan</dd>
+        <dt>Graphic design</dt>
+        <dd>Funforge studio</dd>
+        <dt>Publisher</dt>
+        <dd><a href="https://funforge.fr/" target="_blank" rel="noopener">Funforge</a></dd>
+      </dl>
+      <h4 class="border-top pt-3">{{appTitle}}</h4>
+      <dl>
+        <dt>Application Development</dt>
+        <dd>Stefan Seifert</dd>
+        <dt>Version</dt>
+        <dd>{{buildNumber}}</dd>
+        <dt>Source Code (Apache-2.0 License)</dt>
+        <dd><a href="https://github.com/brdgm/monumental-solo-helper" target="_blank" rel="noopener">https://github.com/brdgm/monumental-solo-helper</a></dd>
+      </dl>
+    </template>
+  </ModalDialog>
 
 </template>
 
@@ -65,14 +54,16 @@ import { useI18n } from 'vue-i18n'
 import { useStore } from '@/store'
 import AppHeader from 'brdgm-commons/src/components/structure/AppHeader.vue'
 import AppFooter from 'brdgm-commons/src/components/structure/AppFooter.vue'
-import { Modal } from 'bootstrap'
+import ModalDialog from 'brdgm-commons/src/components/structure/ModalDialog.vue'
 import getErrorMessage from 'brdgm-commons/src/util/error/getErrorMessage'
+import showModal from 'brdgm-commons/src/util/modal/showModal'
 
 export default defineComponent({
   name: 'App',
   components: {
     AppHeader,
-    AppFooter
+    AppFooter,
+    ModalDialog
   },
   setup() {
     const { t, locale } = useI18n({
@@ -107,8 +98,7 @@ export default defineComponent({
   },
   errorCaptured(err : unknown) {
     this.errorMessage = getErrorMessage(err, translErr => this.t(translErr.key, translErr.named, translErr.plural))
-    const modal = new Modal(document.getElementById('errorMessage') as Element)
-    modal.show()
+    showModal('errorMessage')
   }
 })
 </script>

diff --git a/src/components/round/ActionText.vue b/src/components/round/ActionText.vue
@@ -3,31 +3,26 @@
   <span v-else v-html="t(actionTextKey)"></span>
   <span v-if="action.goldCost">{{' ' + t('roundBot.goldCost', {number: action.goldCost})}}</span>
 
-  <div v-if="showActionHelp" class="modal" :id="actionHelpId" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title">{{t(actionHelpTitleKey)}}</h5>
-          <button class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-        </div>
-        <div class="modal-body">
-          <div v-html="t(actionHelpTextKey)"></div>
-        </div>
-        <div class="modal-footer">
-          <button class="btn btn-secondary" data-bs-dismiss="modal">{{t('action.close')}}</button>
-        </div>
-      </div>
-    </div>
-  </div>
+  <ModalDialog v-if="showActionHelp" :id="actionHelpId" :title="t(actionHelpTitleKey)"
+      :size-lg="true" :scrollable="true">
+    <template #body>
+      <div v-html="t(actionHelpTextKey)"></div>
+    </template>
+  </ModalDialog>
+
 </template>
 
 <script lang="ts">
 import BotCardAction from '@/services/BotCardAction'
 import { defineComponent } from 'vue'
 import { useI18n } from 'vue-i18n'
+import ModalDialog from 'brdgm-commons/src/components/structure/ModalDialog.vue'
 
 export default defineComponent({
   name: 'ActionText',
+  components: {
+    ModalDialog
+  },
   setup() {
     const { t } = useI18n()
     return { t }

diff --git a/src/components/round/BotActions.vue b/src/components/round/BotActions.vue
@@ -61,35 +61,31 @@
     </div>
   </div>
 
-  <div class="modal" id="chooseActionModal" tabindex="-1" v-if="nextAction">
-    <div class="modal-dialog modal-xl">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title"><span v-html="t('cardAction.choose-action')"></span></h5>
-          <button class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-        </div>
-        <div class="modal-body">
-          <div class="container">
-            <div class="action row" v-for="(action,index) in nextAction.actionOptions" :key="index">
-              <div class="col-8">
-                <i><span v-html="t('chooseAction.' + currentCardName + '.' + (index+1))"></span></i><br/>
-                <span v-html="t('cardAction.' + action)"></span>
-              </div>
-              <div class="col-2">
-                <GoldEarned v-if="nextAction.mayEarnGold(action)" v-model="currentActionGoldEarned"/>
-              </div>
-              <div class="col-2">
-                <button type="button" class="btn btn-success" data-bs-dismiss="modal" @click="complete(nextAction!, action)">{{t('roundBot.action.choose')}}</button>
-              </div>
-            </div>
+  <ModalDialog v-if="nextAction" id="chooseActionModal" :size-xl="true">
+    <template #header>
+      <h5 class="modal-title"><span v-html="t('cardAction.choose-action')"></span></h5>
+      <button class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+    </template>
+    <template #body>
+      <div class="container">
+        <div class="action row" v-for="(action,index) in nextAction.actionOptions" :key="index">
+          <div class="col-8">
+            <i><span v-html="t('chooseAction.' + currentCardName + '.' + (index+1))"></span></i><br/>
+            <span v-html="t('cardAction.' + action)"></span>
+          </div>
+          <div class="col-2">
+            <GoldEarned v-if="nextAction.mayEarnGold(action)" v-model="currentActionGoldEarned"/>
+          </div>
+          <div class="col-2">
+            <button type="button" class="btn btn-success" data-bs-dismiss="modal" @click="complete(nextAction!, action)">{{t('roundBot.action.choose')}}</button>
           </div>
-        </div>
-        <div class="modal-footer">
-          <button class="btn btn-secondary" data-bs-dismiss="modal">{{t('action.cancel')}}</button>
         </div>
       </div>
-    </div>
-  </div>
+    </template>
+    <template #footer>
+      <button class="btn btn-secondary" data-bs-dismiss="modal">{{t('action.cancel')}}</button>
+    </template>
+  </ModalDialog>
 
 </template>
 
@@ -103,6 +99,7 @@ import Bot from '@/services/Bot'
 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"
@@ -114,7 +111,8 @@ export default defineComponent({
   components: {
     ActionText,
     GoldInfo,
-    GoldEarned
+    GoldEarned,
+    ModalDialog
   },
   setup() {
     const { t } = useI18n()