Skip to content

Commit

Permalink
deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
matmon12 committed Jan 6, 2025
1 parent 5833e7b commit 4e2d85b
Show file tree
Hide file tree
Showing 78 changed files with 3,558 additions and 941 deletions.
43 changes: 43 additions & 0 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
"concurrently": "^9.0.1",
"express": "^4.19.2",
"firebase": "^10.12.2",
"i18n-iso-countries": "^7.13.0",
"lodash.debounce": "^4.0.8",
"pinia": "^2.1.7",
"primelocale": "^1.2.2",
"primevue": "^4.0.4",
"quill": "^2.0.2",
"quill-better-table": "^1.2.10",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Breadcrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@click="$router.go(-1)"
class="breadcrumb-back"
><i-ic:round-arrow-back-ios-new />
Back
{{ $t("buttons.back") }}
</Button>

<ul class="breadcrumb__list">
Expand Down
11 changes: 6 additions & 5 deletions src/components/Panel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
</g>
</svg>
</p>
<p class="panel-name-login">Login</p>
<p class="panel-name-login">{{ $t("buttons.login") }}</p>
</router-link>
</template>

<script setup>
import { ref, markRaw, onMounted } from "vue";
import { ref, markRaw, onMounted, inject, computed } from "vue";
import TeenyiconsUserCircleSolid from "~icons/teenyicons/user-circle-solid";
import BitcoinIconsExitFilled from "~icons/bitcoin-icons/exit-filled";
import { getImageUrl, getUsername } from "@/utils/index";
Expand All @@ -100,19 +100,20 @@ import { vOnClickOutside } from "@vueuse/components";
const authStore = useAuthStore();
const { can } = useAbility();
const t = inject("t");
const isOpen = ref(false);
const items = markRaw([
const items = computed(() => [
{
label: "Profile",
label: t("panel.profile"),
icon: TeenyiconsUserCircleSolid,
action: () => {
router.push({ name: "ProfileUser" });
},
},
{
label: "Exit",
label: t("panel.exit"),
icon: BitcoinIconsExitFilled,
action: authStore.logoutUser,
},
Expand Down
9 changes: 5 additions & 4 deletions src/components/PanelMini.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
outlined
>
<i-line-md:logout />
Logout</Button
{{ $t("buttons.logout") }}</Button
>
</div>
</template>
Expand Down Expand Up @@ -129,7 +129,7 @@
</template>

<script setup>
import { ref, shallowRef } from "vue";
import { ref, shallowRef, inject, computed } from "vue";
import TeenyiconsUserCircleSolid from "~icons/teenyicons/user-circle-solid";
import BitcoinIconsExitFilled from "~icons/bitcoin-icons/exit-filled";
import { getImageUrl, getUsername } from "@/utils/index";
Expand All @@ -141,12 +141,13 @@ import Drawer from "primevue/drawer";
const authStore = useAuthStore();
const { can } = useAbility();
const t = inject("t");
const isOpen = ref(false);
const menu = shallowRef([
const menu = computed(() => [
{
label: "Profile",
label: t("panel.profile"),
icon: TeenyiconsUserCircleSolid,
action: () => {
router.push({ name: "ProfileUser" });
Expand Down
8 changes: 6 additions & 2 deletions src/components/Search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class="search-input"
type="text"
v-model="search"
placeholder="Search City"
:placeholder="$t('placeholders.search')"
unstyled
autofocus
@keyup.enter="!searchStore.loading ? onSubmit() : undefined"
Expand All @@ -45,7 +45,11 @@
</InputGroup>
<transition name="fade">
<small class="error search-error" v-if="errors.search && focusInput">
{{ errors.search }}
{{
$t(`validation.${errors.search?.key || errors.search}`, {
...errors.search?.values,
})
}}
</small>
</transition>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/SearchMini.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
:pt="getClasses('search').drawer"
>
<template #header>
<p class="search-drawer-header-text">Enter name city:</p>
<p class="search-drawer-header-text">{{ $t("search.header") }}</p>
</template>
<Search @submit="hideDrawer()" />
</Drawer>
Expand Down Expand Up @@ -63,7 +63,7 @@ const hideDrawer = () => {
}
.p-drawer-close-button {
color: var(--grey-light);
&:hover{
&:hover {
background-color: var(--hover-grey);
}
}
Expand All @@ -76,7 +76,7 @@ const hideDrawer = () => {
width: 100%;
}
&-mask{
&-mask {
z-index: 1500 !important;
}
}
Expand Down
18 changes: 11 additions & 7 deletions src/components/UI/Error.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
<div class="error-page">
<i-bxs:error />
<p class="error-page-text">{{ message }}</p>
<div class="error-page-btns" >
<button @click="$emit('toBack')" class="error-page-btn">Back</button>
<button v-if="retry" @click="$emit('retry')" class="error-page-btn">Retry</button>
<div class="error-page-btns">
<button @click="$emit('toBack')" class="error-page-btn">
{{ $t("buttons.back") }}
</button>
<button v-if="retry" @click="$emit('retry')" class="error-page-btn">
{{ $t("buttons.retry") }}
</button>
</div>
</div>
</template>
Expand All @@ -16,8 +20,8 @@ const props = defineProps({
message: String,
retry: {
type: Boolean,
default: false
}
default: false,
},
});
</script>

Expand Down Expand Up @@ -58,7 +62,7 @@ const props = defineProps({
border-radius: 8px;
margin-top: 40px;
font-size: 16px;
transition: background-color 0.3s, filter .3s, font-weight .3s;
transition: background-color 0.3s, filter 0.3s, font-weight 0.3s;
&:nth-child(1) {
border: 1px solid var(--blue-630);
background-color: var(--transparent-6);
Expand All @@ -75,7 +79,7 @@ const props = defineProps({
font-weight: 500;
color: var(--black-3);
background-color: var(--blue-160);
&:hover{
&:hover {
filter: brightness(1.2);
}
}
Expand Down
Loading

0 comments on commit 4e2d85b

Please sign in to comment.