Skip to content

Commit

Permalink
Merge branch 'master' into 187-share-datatypes-across-server-and-client
Browse files Browse the repository at this point in the history
  • Loading branch information
ConorMurphy21 committed Jan 24, 2024
2 parents 4222849 + 1e2eded commit e0013a1
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 0 deletions.
1 change: 1 addition & 0 deletions client/src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export default {
roomNamePlaceholder: 'room name',
joinGame: 'Join Game',
createGame: 'Create Game',
homeButton: 'Home',
coffeeLink: 'Buy me a tea',
coffeeAlt: 'Buy me a coffee',

Expand Down
19 changes: 19 additions & 0 deletions client/src/views/About.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,24 @@
<a v-t="'about.coffee'" href="https://www.buymeacoffee.com/ConorMurphy/" />
</template>
</i18n-t>
<router-link to="/" @click="onClick">
<button v-t="'homeButton'" type="button" class="btn btn-burgundy mt-3 w-25" />
</router-link>
</div>
</template>

<script lang="ts">
import ClickMp3 from '@/assets/audio/click1.mp3';
import { AudioWrap } from '@/mixins/audiowrap';
import { defineComponent } from 'vue';
const click = new AudioWrap(ClickMp3);
export default defineComponent({
methods: {
onClick() {
click.play();
}
}
});
</script>
12 changes: 12 additions & 0 deletions client/src/views/HowToPlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
:alt="child.alt" />
</div>
</div>
<router-link to="/" @click="onClick()">
<button v-t="'homeButton'" type="button" class="btn btn-burgundy mt-5 w-25" />
</router-link>
</div>
</template>

Expand All @@ -31,7 +34,11 @@ import Strike from '@/assets/images/howToPlay/strike.png';
import Sike from '@/assets/images/howToPlay/sike.png';
import Choice from '@/assets/images/howToPlay/choice.png';
import Matching from '@/assets/images/howToPlay/matching.png';
import ClickMp3 from '@/assets/audio/click1.mp3';
import { AudioWrap } from '@/mixins/audiowrap';
import { defineComponent } from 'vue';
const click = new AudioWrap(ClickMp3);
export default defineComponent({
data() {
return {
Expand All @@ -43,6 +50,11 @@ export default defineComponent({
matching: Matching
}
};
},
methods: {
onClick() {
click.play();
}
}
});
</script>

0 comments on commit e0013a1

Please sign in to comment.