Skip to content

Commit

Permalink
Patch build
Browse files Browse the repository at this point in the history
  • Loading branch information
@zelytra
zelytra committed Mar 5, 2024
1 parent 8d77197 commit 9368296
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 65 deletions.
88 changes: 51 additions & 37 deletions frontend/src/components/Config.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@
<div class="content-wrapper">
<div class="side-content">
<InputText
v-model:input-value="username"
:placeholder="t('config.name.placeholder')"
:label="t('config.name.label')"
v-model:input-value="username"
:placeholder="t('config.name.placeholder')"
:label="t('config.name.label')"
/>
<div class="dev-mode-wrapper">
<input type="checkbox"
v-model="devMode"
/>
<p>{{ t('config.devmode') }}</p>
<input type="checkbox" v-model="devMode" />
<p>{{ t("config.devmode") }}</p>
</div>
<InputText
v-model:input-value="UserStore.player.serverHostName"
:placeholder="t('config.server.placeholder')"
:label="t('config.server.label')"
:lock="!devMode"
v-model:input-value="UserStore.player.serverHostName"
:placeholder="t('config.server.placeholder')"
:label="t('config.server.label')"
:lock="!devMode"
/>
</div>
<div class="side-content">
<SingleSelect :label="t('config.lang.label')" v-model:data="langOptions"/>
<SingleSelect
:label="t('config.lang.label')"
v-model:data="langOptions"
/>
</div>
</div>
</div>
Expand All @@ -51,10 +52,10 @@
<div class="social-wrapper">
<p>{{ t("credits.socials") }}</p>
<a href="https://discord.gg/sHPp5CPxf2" target="_blank"
><img src="@/assets/icons/discord.svg"
><img src="@/assets/icons/discord.svg"
/></a>
<a href="https://github.com/zelytra/BetterFleet" target="_blank"
><img src="@/assets/icons/github.svg"
><img src="@/assets/icons/github.svg"
/></a>
</div>
<p class="light">
Expand All @@ -67,53 +68,59 @@

<script setup lang="ts">
import BannerTemplate from "@/vue/templates/BannerTemplate.vue";
import {useI18n} from "vue-i18n";
import { useI18n } from "vue-i18n";
import InputText from "@/vue/form/InputText.vue";
import SingleSelect from "@/vue/form/SingleSelect.vue";
import {SingleSelectInterface} from "@/vue/form/Inputs.ts";
import {onMounted, ref, watch} from "vue";
import { SingleSelectInterface } from "@/vue/form/Inputs.ts";
import { onMounted, ref, watch } from "vue";
import fr from "@/assets/icons/locales/fr.svg"
import en from "@/assets/icons/locales/en.svg"
import {UserStore} from "@/objects/stores/UserStore.ts";
import {onBeforeRouteLeave} from "vue-router";
import fr from "@/assets/icons/locales/fr.svg";
import en from "@/assets/icons/locales/en.svg";
import { UserStore } from "@/objects/stores/UserStore.ts";
import { onBeforeRouteLeave } from "vue-router";
const {t, availableLocales} = useI18n();
const langOptions = ref<SingleSelectInterface>({data: []});
const devMode = ref<boolean>(false)
const username = ref<string>(UserStore.player.username)
const { t, availableLocales } = useI18n();
const langOptions = ref<SingleSelectInterface>({ data: [] });
const devMode = ref<boolean>(false);
const username = ref<string>(UserStore.player.username);
onMounted(() => {
for (const locale of availableLocales) {
langOptions.value.data.push({display: t('locales.' + locale), id: locale, image: getImgUrl(locale)})
langOptions.value.data.push({
display: t("locales." + locale),
id: locale,
image: getImgUrl(locale),
});
}
if (UserStore.player.lang) {
langOptions.value.selectedValue = langOptions.value.data.filter(x => x.id == UserStore.player.lang)[0]
langOptions.value.selectedValue = langOptions.value.data.filter(
(x) => x.id == UserStore.player.lang,
)[0];
} else {
langOptions.value.selectedValue = langOptions.value.data[0]
langOptions.value.selectedValue = langOptions.value.data[0];
}
});
watch(langOptions.value, () => {
UserStore.setLang(langOptions.value.selectedValue!.id)
})
UserStore.setLang(langOptions.value.selectedValue!.id);
});
onBeforeRouteLeave((to, from, next) => {
onBeforeRouteLeave((_to, _from, next) => {
if (username.value.length == 0) {
next(false)
next(false);
} else {
UserStore.player.username = username.value;
next()
next();
}
})
});
function getImgUrl(iconName: string): string {
switch (iconName) {
case "fr":
return fr;
default:
return en
return en;
}
}
</script>
Expand Down Expand Up @@ -195,12 +202,19 @@ function getImgUrl(iconName: string): string {
justify-content: center;
&:before {
content: '';
content: "";
width: 10px;
transform: scale(0);
height: 10px;
background: var(--primary-text);
clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);
clip-path: polygon(
14% 44%,
0 65%,
50% 100%,
100% 16%,
80% 0%,
43% 62%
);
transform-origin: bottom left;
}
Expand Down
56 changes: 28 additions & 28 deletions frontend/src/objects/stores/UserStore.ts
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
import {reactive} from "vue";
import LocalStore, {LocalKey} from "@/objects/stores/LocalStore.ts";
import {i18n} from "@/main.ts";
import type {Player} from "@/objects/Fleet.ts";

import { reactive } from "vue";
import LocalStore, { LocalKey } from "@/objects/stores/LocalStore.ts";
import { i18n } from "@/main.ts";
import type { Player } from "@/objects/Fleet.ts";

export const UserStore = reactive({
player: {} as Player,
init(defaultPlayerValue: Player) {
const userStoreKey = LocalStore(LocalKey.USER_STORE, {});
const browserLang = navigator.language.substring(0, 2);
const readedPlayer = userStoreKey.value as Player;
this.player = defaultPlayerValue;
this.player.username = readedPlayer.username;
this.player.lang = readedPlayer.lang;
this.player.serverHostName = readedPlayer.serverHostName;
player: {} as Player,
init(defaultPlayerValue: Player) {
const userStoreKey = LocalStore(LocalKey.USER_STORE, {});
const browserLang = navigator.language.substring(0, 2);
const readedPlayer = userStoreKey.value as Player;
this.player = defaultPlayerValue;
this.player.username = readedPlayer.username;
this.player.lang = readedPlayer.lang;
this.player.serverHostName = readedPlayer.serverHostName;

if (!this.player.lang) this.player.lang = browserLang;
if (!this.player.username) this.player.username = "";
if (!this.player.serverHostName) this.player.serverHostName = import.meta.env.VITE_SOCKET_HOST;
if (!this.player.lang) this.player.lang = browserLang;
if (!this.player.username) this.player.username = "";
if (!this.player.serverHostName)
this.player.serverHostName = import.meta.env.VITE_SOCKET_HOST;

//@ts-ignore I18N typescript implementation
i18n.global.locale.value = this.player.lang;
},
//@ts-ignore I18N typescript implementation
i18n.global.locale.value = this.player.lang;
},

setUser(user: Player) {
this.player = user;
},
setUser(user: Player) {
this.player = user;
},

setLang(lang: string) {
//@ts-ignore I18N typescript implementation
this.player.lang = lang;
i18n.global.locale.value = this.player.lang;
}
setLang(lang: string) {
//@ts-ignore I18N typescript implementation
this.player.lang = lang;
i18n.global.locale.value = (this.player.lang as "fr") || "en";
},
});

0 comments on commit 9368296

Please sign in to comment.