Skip to content

Commit

Permalink
Merge branch 'release/1.1.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Jul 1, 2023
2 parents 1baa9a8 + 789c450 commit dc018c1
Show file tree
Hide file tree
Showing 10 changed files with 4,610 additions and 3,785 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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: blitzkrieg
commit-message: deploy ${{ vars.APP_NAME }}
target-directory: ${{ vars.APP_NAME }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Application: https://brdgm.me/blitzkrieg/

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/blitzkrieg-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/blitzkrieg-solo-helper/tree/develop/src/locales) folder, see [Contribute a Translation](https://github.com/brdgm/brdgm.github.io/wiki/Contribute-a-Translation).


## Development
Expand Down
8,334 changes: 4,576 additions & 3,758 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brdgm/blitzkrieg-solo-helper",
"version": "1.1.9",
"version": "1.1.10",
"private": true,
"description": "Blitzkrieg! Solo Helper",
"scripts": {
Expand All @@ -15,9 +15,9 @@
"@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",
"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"
Expand All @@ -27,9 +27,9 @@
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@types/bootstrap": "^5.2.6",
"@types/chai": "^4.3.4",
"@types/mocha": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^5.44.0",
"@typescript-eslint/parser": "^5.44.0",
"@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",
Expand All @@ -38,19 +38,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"
}
}
Binary file added src/assets/kofi_button_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import AppHome from '@/views/AppHome.vue'
import SetupGame from '@/views/SetupGame.vue'
import RoundTurn from '@/views/RoundTurn.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"

Expand Down
2 changes: 1 addition & 1 deletion src/services/RegionSteps.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Region from "./enum/Region";
import Region from './enum/Region';

export default class RegionSteps {
readonly region: Region
Expand Down
6 changes: 3 additions & 3 deletions src/services/nextStratagem.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Stratagem from "./enum/Stratagem";
import randomEnum from "brdgm-commons/src/util/random/randomEnum";
import { Round } from "@/store";
import Stratagem from './enum/Stratagem';
import randomEnum from 'brdgm-commons/src/util/random/randomEnum';
import { Round } from '@/store';

/**
* Picks a new stratagem for the next round.
Expand Down
8 changes: 4 additions & 4 deletions src/services/setupRegions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import DifficultyLevel from "./enum/DifficultyLevel";
import Region from "./enum/Region";
import RegionSteps from "./RegionSteps";
import randomEnum from "brdgm-commons/src/util/random/randomEnum";
import DifficultyLevel from './enum/DifficultyLevel';
import Region from './enum/Region';
import RegionSteps from './RegionSteps';
import randomEnum from 'brdgm-commons/src/util/random/randomEnum';

/**
* Randomly picks a number of regions and advances the marker steps
Expand Down
6 changes: 5 additions & 1 deletion src/views/AppHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
This is not an official PSC Games product and has no affiliation with <a href="https://www.pscgames.co.uk/" target="_blank" rel="noopener">PSC Games</a>.
All art in this app is from <a href="https://www.pscgames.co.uk/games/blitzkrieg" target="_blank" rel="noopener">Blitzkrieg!</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>
Expand All @@ -49,4 +50,7 @@ export default defineComponent({
margin-top: 4rem;
font-size: smaller;
}
</style>
.kofi-button {
height: 1.4rem;
}
</style>

0 comments on commit dc018c1

Please sign in to comment.