Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Jul 1, 2023
2 parents 080f901 + 26c1ead commit 6614be4
Show file tree
Hide file tree
Showing 16 changed files with 3,355 additions and 3,309 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: autobahn
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/autobahn/

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/autobahn-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/autobahn-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
6,585 changes: 3,312 additions & 3,273 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brdgm/autobahn-solo-helper",
"version": "1.0.1",
"version": "1.0.2",
"private": true,
"description": "Autobahn Solo Helper",
"scripts": {
Expand Down
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 @@ -8,7 +8,7 @@ import TurnBotMoveTrucks from '@/views/TurnBotMoveTrucks.vue'
import TurnPlayer from '@/views/TurnPlayer.vue'
import EndOfEra from '@/views/EndOfEra.vue'
import EndOfGame from '@/views/EndOfGame.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/ColorCard.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import AutobahnColor from "./enum/AutobahnColor"
import AutobahnColor from './enum/AutobahnColor'

export default interface ColorCard {
colors: AutobahnColor[]
Expand Down
8 changes: 4 additions & 4 deletions src/services/ColorCardDeck.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ColorCardDeckPersistence } from "@/store"
import * as _ from "lodash"
import ColorCard from "./ColorCard"
import AutobahnColor from "./enum/AutobahnColor"
import { ColorCardDeckPersistence } from '@/store'
import * as _ from 'lodash'
import ColorCard from './ColorCard'
import AutobahnColor from './enum/AutobahnColor'

export default class ColorCardDeck {

Expand Down
4 changes: 2 additions & 2 deletions src/services/Difficulty.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import DifficultyLevel from "./enum/DifficultyLevel";
import SoloBoard from "./enum/SoloBoard";
import DifficultyLevel from './enum/DifficultyLevel';
import SoloBoard from './enum/SoloBoard';

export default class Difficulty {

Expand Down
6 changes: 3 additions & 3 deletions src/services/TaskCard.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Action from "./enum/Action"
import BonusAction from "./enum/BonusAction"
import TaskCardLevel from "./enum/TaskCardLevel"
import Action from './enum/Action'
import BonusAction from './enum/BonusAction'
import TaskCardLevel from './enum/TaskCardLevel'

export default interface TaskCard {
id: string
Expand Down
10 changes: 5 additions & 5 deletions src/services/TaskCardDeck.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { TaskCardDeckPersistence } from "@/store"
import * as _ from "lodash"
import TaskCardLevel from "./enum/TaskCardLevel"
import TaskCard from "./TaskCard"
import TaskCards from "./TaskCards"
import { TaskCardDeckPersistence } from '@/store'
import * as _ from 'lodash'
import TaskCardLevel from './enum/TaskCardLevel'
import TaskCard from './TaskCard'
import TaskCards from './TaskCards'

export default class TaskCardDeck {

Expand Down
10 changes: 5 additions & 5 deletions src/services/TaskCards.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import findMandatory from "brdgm-commons/src/util/map/findMandatory";
import Action from "./enum/Action";
import BonusAction from "./enum/BonusAction";
import TaskCardLevel from "./enum/TaskCardLevel";
import Card from "./TaskCard";
import findMandatory from 'brdgm-commons/src/util/map/findMandatory';
import Action from './enum/Action';
import BonusAction from './enum/BonusAction';
import TaskCardLevel from './enum/TaskCardLevel';
import Card from './TaskCard';

const cards = [
{
Expand Down
2 changes: 1 addition & 1 deletion src/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import DifficultyLevel from '@/services/enum/DifficultyLevel'
import Expansion from '@/services/enum/Expansion'
import { InjectionKey } from 'vue'
import { createStore, useStore as baseUseStore, Store } from 'vuex'
import toggleArrayItem from "brdgm-commons/src/util/array/toggleArrayItem"
import toggleArrayItem from 'brdgm-commons/src/util/array/toggleArrayItem'
import ColorCard from '@/services/ColorCard'
import Player from '@/services/enum/Player'
import Era from '@/services/enum/Era'
Expand Down
14 changes: 7 additions & 7 deletions src/util/NavigationState.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import ColorCardDeck from "@/services/ColorCardDeck"
import Difficulty from "@/services/Difficulty"
import Era from "@/services/enum/Era"
import Player from "@/services/enum/Player"
import TaskCardDeck from "@/services/TaskCardDeck"
import { State } from "@/store"
import { RouteLocation } from "vue-router"
import ColorCardDeck from '@/services/ColorCardDeck'
import Difficulty from '@/services/Difficulty'
import Era from '@/services/enum/Era'
import Player from '@/services/enum/Player'
import TaskCardDeck from '@/services/TaskCardDeck'
import { State } from '@/store'
import { RouteLocation } from 'vue-router'

export default class NavigationState {

Expand Down
2 changes: 1 addition & 1 deletion src/util/enableTabLinksInContent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Tab } from "bootstrap";
import { Tab } from 'bootstrap';

/**
* Enables the links inside tab panes to be able to switch to different tabs.
Expand Down
6 changes: 5 additions & 1 deletion src/views/AppHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
This is not an official Alley Cat Games product and has no affiliation with <a href="https://www.alleycatgames.com/" target="_blank" rel="noopener">Alley Cat Games</a>.
All art in this app is from <a href="https://www.alleycatgames.com/autobahn" target="_blank" rel="noopener">Autobahn</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 @@ -46,4 +47,7 @@ export default defineComponent({
margin-top: 4rem;
font-size: smaller;
}
</style>
.kofi-button {
height: 1.4rem;
}
</style>

0 comments on commit 6614be4

Please sign in to comment.