-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/v2.0.0-beta.9'
- Loading branch information
Showing
18 changed files
with
323 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
client/dist/js/chunk-vendors.31f54077.js → client/dist/js/chunk-vendors.2f51b49a.js
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <script> | ||
| import SettingsBox from '@/components/SettingsBox' | ||
| /** | ||
| * This components display the inputs to load a game from a url | ||
| */ | ||
| export default { | ||
| methods: { | ||
| /** | ||
| * Displays the settings modal | ||
| */ | ||
| openSettingsModal () { | ||
| this.$modal.open({ | ||
| parent: this, | ||
| component: SettingsBox, | ||
| hasModalCard: true | ||
| }) | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <template> | ||
| <div class="navbar-item"> | ||
| <div class="field is-grouped"> | ||
| <div class="control"> | ||
| <button | ||
| class="button is-primary" | ||
| @click="openSettingsModal()" | ||
| > | ||
| Paramètres | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| <script> | ||
| import GameSettingsBox from '@/components/game/GameSettingsBox' | ||
| import { mapState } from 'vuex' | ||
| /** | ||
| * This components display the inputs to load a game from a url | ||
| */ | ||
| export default { | ||
| computed: { | ||
| ...mapState({ | ||
| loading: state => state.game.loading | ||
| }) | ||
| }, | ||
| methods: { | ||
| /** | ||
| * Launch the game loading procedure | ||
| */ | ||
| async reload () { | ||
| try { | ||
| await this.$store.dispatch('load') | ||
| this.$snackbar.open({ | ||
| message: 'Game reloaded, ready !', | ||
| type: 'is-success', | ||
| position: 'is-top', | ||
| actionText: 'OK', | ||
| duration: 3000 | ||
| }) | ||
| } catch { | ||
| this.$snackbar.open({ | ||
| message: 'Error during game loading, see console for details', | ||
| type: 'is-danger', | ||
| position: 'is-top', | ||
| actionText: 'OK', | ||
| duration: 4500 | ||
| }) | ||
| } | ||
| }, | ||
| /** | ||
| * Displays the settings modal | ||
| */ | ||
| openGameSettingsModal () { | ||
| this.$modal.open({ | ||
| parent: this, | ||
| component: GameSettingsBox, | ||
| hasModalCard: true | ||
| }) | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <template> | ||
| <div class="navbar-item"> | ||
| <div class="field is-grouped"> | ||
| <div class="control"> | ||
| <button | ||
| class="button is-warning" | ||
| @click="reload()" | ||
| > | ||
| <span class="icon is-left"> | ||
| <i class="fas fa-redo-alt" /> | ||
| </span> | ||
| </button> | ||
| </div> | ||
| <div class="control"> | ||
| <button | ||
| class="button is-primary" | ||
| @click="openGameSettingsModal()" | ||
| > | ||
| Jeux | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </template> |
Oops, something went wrong.