Skip to content

Commit

Permalink
Use Bootstrap to give modal showing logic
Browse files Browse the repository at this point in the history
  • Loading branch information
jengu288 committed Feb 26, 2024
1 parent c6d9777 commit ba33039
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 18 deletions.
2 changes: 1 addition & 1 deletion client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ function onLogoClick() {
@click="onLogoClick" />
<router-view class="mt-2 mb-5" />
<portal-target name="banner" class="mb-2" />
<portal-target name="modal" class="m-0" />
</div>
</div>
<portal-target name="modal" />
</template>

<style lang="scss">
Expand Down
48 changes: 31 additions & 17 deletions client/src/components/lobby/Lobby.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
<script setup lang="ts">
import PlayerList from '@/components/lobby/PlayerList.vue';
import Options from '@/components/lobby/Options.vue';
import { computed } from 'vue';
import { computed, onUnmounted } from 'vue';
import socket from '@/socket/socket.js';
import { AudioWrap } from '@/mixins/audiowrap.js';
import ClickMp3 from '@/assets/audio/click2.mp3';
import { useRoomStore } from '@/stores/room.js';
import { useI18n } from 'vue-i18n';
import { Portal, PortalTarget } from 'portal-vue';
import { Modal } from 'bootstrap';
const click = new AudioWrap(ClickMp3);
const roomStore = useRoomStore();
onUnmounted(() => {
Modal.getInstance(document.getElementById('recPlayersModal') as HTMLElement)?.dispose();
});
const leader = computed<boolean>(() => {
return !!roomStore.self && roomStore.self.leader;
});
const canStart = computed<boolean>(() => {
return leader.value && roomStore.players.length >= 3;
});
function startGameRequest() {
if (roomStore.players.length <= 3) {
//canStart is already checked so min players has been reached
startGame();
} else {
//we have more than the recommended amount of players per room
Modal.getOrCreateInstance(document.getElementById('recPlayersModal') as HTMLElement).show();
}
}
function startGame() {
Modal.getInstance(document.getElementById('recPlayersModal') as HTMLElement)?.hide();
click.play();
socket.emit('startGame');
}
Expand All @@ -29,24 +45,22 @@ const { t } = useI18n();
<div class="w-100 d-flex flex-column justify-content-between align-items-center gap-3 pt-1 pb-4">
<h1 v-t="'players'" class="font-fancy text-dark display-3" />
<player-list />
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal">
Launch demo modal
</button>

<div id="exampleModal" class="modal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 id="exampleModalLabel" class="modal-title">Modal title</h5>
</div>
<div class="modal-body">here is a asd</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
<portal to="modal">
<div id="recPlayersModal" class="modal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 id="exampleModalLabel" class="modal-title">Modal title</h5>

Check warning on line 53 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (18.x)

raw text 'Modal title' is used

Check warning on line 53 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (20.x)

raw text 'Modal title' is used
</div>
<div class="modal-body">here is a asd</div>

Check warning on line 55 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (18.x)

raw text 'here is a asd' is used

Check warning on line 55 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (20.x)

raw text 'here is a asd' is used
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>

Check warning on line 57 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (18.x)

raw text 'Close' is used

Check warning on line 57 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (20.x)

raw text 'Close' is used
<button type="button" class="btn btn-primary" @click="startGame">Start Game</button>

Check warning on line 58 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (18.x)

raw text 'Start Game' is used

Check warning on line 58 in client/src/components/lobby/Lobby.vue

View workflow job for this annotation

GitHub Actions / build (20.x)

raw text 'Start Game' is used
</div>
</div>
</div>
</div>
</div>
</portal>

<div class="w-100 d-flex flex-column justify-content-start align-items-center gap-3">
<options :disabled="!leader" />
Expand All @@ -56,7 +70,7 @@ const { t } = useI18n();
class="btn btn-blue fs-4 w-100"
:class="{ 'd-none': !leader, disabled: !canStart }"
:disabled="!canStart"
@click="startGame" />
@click="startGameRequest" />
</span>
</div>
</div>
Expand Down

0 comments on commit ba33039

Please sign in to comment.