Skip to content

Commit

Permalink
Merge pull request #56 from EliasSchaut/dev
Browse files Browse the repository at this point in the history
Release v.1.0.0-alpha.9
  • Loading branch information
EliasSchaut committed Mar 5, 2023
2 parents 2273345 + 8b1a9e9 commit 760ef5e
Show file tree
Hide file tree
Showing 90 changed files with 1,679 additions and 1,099 deletions.
2 changes: 1 addition & 1 deletion .env.tmp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PORT="3000"
DATABASE_URL="file:./dev.db"
JWT_SECRET="secret"
JWT_EXPIRATION="2h"
OMDB_API_KEY="XXXXXXXX"
IMDB_API_KEY="k_XXXXXXXX"
MAX_VOTES="20"
MAX_PROPOSEABLE_MOVIES="5"

Expand Down
141 changes: 103 additions & 38 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "movie-monday-client",
"name": "watch-vote-client",
"version": "1.0.0-alpha.8",
"scripts": {
"dev": "vite",
Expand All @@ -14,7 +14,8 @@
"js-cookie": "^3.0.1",
"movie-monday-manager": "file:..",
"vue": "^3.2.37",
"vue-router": "^4.1.6"
"vue-router": "^4.1.6",
"watchvote": "file:.."
},
"devDependencies": {
"@types/bootstrap": "^5.2.6",
Expand Down
2 changes: 1 addition & 1 deletion client/src/assets/svg/box-arrow-up-right.svg
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 client/src/assets/svg/info-circle-fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions client/src/assets/svg/rotten_tomatoes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions client/src/components/CardComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
</template>

<script lang="ts">
export default {
import { defineComponent } from "vue";
export default defineComponent({
name: "CardComponent",
props: {
header: {
Expand All @@ -30,7 +32,7 @@ export default {
default: false
}
}
};
});
</script>

<style scoped>
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/ModalComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
</template>

<script lang="ts">
export default {
import { defineComponent } from "vue";
export default defineComponent({
name: "CardComponent",
props: {
title: {
Expand All @@ -32,7 +34,7 @@ export default {
default: false
}
},
};
});
</script>

<style scoped>
Expand Down
11 changes: 7 additions & 4 deletions client/src/components/NavbarComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,10 @@
</nav>
</template>

<script lang="ts" setup>
import { store } from '@/util/store'
</script>

<script lang="ts">
import { ref, defineComponent } from "vue";
import { set_cookie } from "@/util/cookie";
import { store } from "@/util/store";
export default defineComponent({
name: "NavbarComponent",
Expand All @@ -76,9 +73,15 @@ export default defineComponent({
lang: ref(this.$i18next.language || "en"),
}
},
setup() {
return {
store,
}
},
methods: {
change_lang: function (event: any) {
const new_lang = event.target.value as "en" | "de"
this.store.hide_alert()
this.$i18next.changeLanguage(new_lang)
set_cookie("lang", new_lang, 365)
}
Expand Down
Loading

0 comments on commit 760ef5e

Please sign in to comment.