Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detail Screen Style Alignment + Revisit Generated Seed Button + Permalink Always On #938

Merged
merged 11 commits into from
Jul 30, 2021
4 changes: 2 additions & 2 deletions resources/js/components/VTRomInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
v-if="rom.weapons"
>{{ $t('rom.info.weapons') }}: {{ $t(`randomizer.weapons.options.${rom.weapons}`) }}</div>
<div v-if="rom.goal">{{ $t('rom.info.goal') }}: {{ $t(`randomizer.goal.options.${rom.goal}`) }}</div>
<div v-if="!noLink && rom.hash">
<div v-if="rom.hash">
{{ $t('rom.info.permalink') }}:
<a :href="permalink">{{ permalink }}</a>
</div>
Expand All @@ -43,7 +43,7 @@

<script>
export default {
props: ["rom", "noLink"],
props: ["rom"],
computed: {
permalink: vm => {
return (
Expand Down
6 changes: 1 addition & 5 deletions resources/js/views/HashLoader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div class="card-body">
<div class="row">
<div class="col-md mb-3">
<vt-rom-info :no-link="noLink" :rom="rom"></vt-rom-info>
<vt-rom-info :rom="rom"></vt-rom-info>
</div>
<div class="col-md mb-3">
<div class="row">
Expand Down Expand Up @@ -94,10 +94,6 @@ export default {
hash: {
type: String,
required: true
},
noLink: {
type: Boolean,
default: true
}
},
data() {
Expand Down
32 changes: 19 additions & 13 deletions resources/js/views/Randomizer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,19 @@
<span class="message">{{ this.error }}</span>
</div>
<rom-loader v-if="!romLoaded" @update="updateRom" @error="onError"></rom-loader>
<div v-if="romLoaded && !gameLoaded && !generating" class="card border-success my-1">
<div v-if="romLoaded && !gameLoaded && !generating" class="card border-success">
<div class="card-header bg-success card-heading-btn">
<h3 class="card-title text-white">{{ $t('randomizer.title') }}</h3>
<h3 class="card-title text-white float-left">{{ $t('randomizer.title') }}</h3>
<div class="btn-toolbar float-right" v-if="gameGenerated">
<a
class="btn btn-light text-dark border-secondary"
role="button"
@click="gameLoaded = true"
>
{{ $t('randomizer.generate.forward') }}
<img class="icon" src="/i/svg/arrow-right.svg" alt />
</a>
</div>
</div>
<div class="card-body">
<div class="card border-info my-1">
Expand Down Expand Up @@ -278,7 +288,7 @@

<div
id="seed-details"
class="card border-info mt-3"
class="card border-success"
v-if="gameLoaded && romLoaded && !generating"
>
<div class="card-header bg-success text-white card-heading-btn">
Expand All @@ -305,20 +315,20 @@
</div>
<div class="card-body">
<div class="row">
<div class="col-md my-1">
<div class="col-md mb-3">
<vt-rom-info :rom="rom"></vt-rom-info>
</div>
<div class="col-md my-1">
<div class="col-md mb-3">
<div class="row">
<div class="col-md-6 my-1">
<div class="col-md-6 mb-3">
<div class="btn-group btn-flex" role="group" v-if="this.rom">
<button
class="btn btn-light border-secondary text-center"
@click="saveSpoiler"
>{{ $t('randomizer.details.save_spoiler') }}</button>
</div>
</div>
<div class="col-md-6 my-1">
<div class="col-md-6 mb-3">
<div class="btn-group btn-flex" role="group" v-if="this.rom">
<button
class="btn btn-success text-center"
Expand Down Expand Up @@ -365,6 +375,7 @@ export default {
romLoaded: false,
current_rom_hash: "",
gameLoaded: false,
gameGenerated: false,
show_spoiler: false,
tournament: false,
disableSaveRomButton: false,
Expand Down Expand Up @@ -503,6 +514,7 @@ export default {
this.rom.allowQuickSwap = true;
}
this.gameLoaded = true;
this.gameGenerated = true;
EventBus.$emit("gameLoaded", this.rom);
resolve({ rom: this.rom, patch: response.data.patch });
}.bind(this)
Expand Down Expand Up @@ -615,9 +627,3 @@ export default {
}
};
</script>

<style scoped>
.card-body {
padding: 0.5rem;
}
</style>
1 change: 1 addition & 0 deletions resources/lang/de/randomizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
'spoiler_race' => 'ROM für Spoiler Rennen',
'casual' => 'Generiere ROM',
'back' => 'Ändere Einstellung',
'forward' => 'Generiertes Spiel anzeigen',
'regenerate' => 'Erneut erstellen',
'regenerate_tooltip' => 'Erstellt ein neues Spiel mit den gleichen Einstellungen',
'generating' => 'Am erstellen...',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/randomizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@
'spoiler_race' => 'Generate Normal ROM',
'casual' => 'Generate ROM',
'back' => 'Change Settings',
'forward' => 'View Generated Game',
'regenerate' => 'Generate Again',
'regenerate_tooltip' => 'Generate new game with same settings',
'generating' => 'Generating...',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/es/randomizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
'spoiler_race' => 'Generar ROM para carreras (con spoilers)',
'casual' => 'Generar ROM',
'back' => 'Cambiar ajustes',
'forward' => 'Ver juego generado',
'regenerate' => 'Generar otra vez',
'regenerate_tooltip' => 'Generar otra partida con las mismas opciones',
'generating' => 'Generando...',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/fr/randomizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
'spoiler_race' => 'Générer une ROM avec Spoiler',
'casual' => 'Générer une ROM',
'back' => 'Changer les Paramètres',
'forward' => 'Voir le jeu généré',
'regenerate' => 'Générer à nouveau',
'regenerate_tooltip' => 'Générer à nouveau avec les mêmes paramètres',
'generating' => 'Génération...',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/daily.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
@endforeach
</div>

<Hashloader :no-link="false" current_rom_hash="{{ $md5 }}" override-base-bps="{{ $bpsLocation }}" hash="{{ $hash }}"></Hashloader>
<Hashloader current_rom_hash="{{ $md5 }}" override-base-bps="{{ $bpsLocation }}" hash="{{ $hash }}"></Hashloader>
@overwrite