Skip to content

Commit

Permalink
added font family
Browse files Browse the repository at this point in the history
  • Loading branch information
Nacnus committed Jan 18, 2024
1 parent 48aaf5b commit 24a86c4
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 13 deletions.
7 changes: 7 additions & 0 deletions assets/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.v-application {
[class*='text-'] {
color: #36405a;
font-family: -apple-system,system-ui, sans-serif !important;
}
font-family: -apple-system,system-ui, sans-serif !important;
}
26 changes: 17 additions & 9 deletions layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
dense
>
<v-bottom-navigation
value="1"
class="nav-bar elevation-0 justify-space-between"
>
<span class="mt-1 d-flex">
Expand All @@ -33,10 +32,9 @@
<span>
<v-tabs
v-model="tab"
centered
icons-and-text
height="50"
color="black"
height="52"
>
<v-tabs-slider />
<v-tab
Expand All @@ -46,8 +44,22 @@
:disabled="item.disableButton"
>
{{ item.text }}
<v-icon>{{ item.icon }}</v-icon>
<v-icon
size="25"
class="mt-1"
>
{{ item.icon }}
</v-icon>
</v-tab>
<v-btn>
Ben
<v-avatar
class="mt-2"
size="24"
>
<v-img :src="$store.state.usersData.profile_photo" />
</v-avatar>
</v-btn>
</v-tabs>
</span>
</v-bottom-navigation>
Expand Down Expand Up @@ -98,10 +110,7 @@ export default {
},
methods: {
getData () {
this.$axios.$get()
.then((res) => {
this.users = res
})
this.$store.dispatch('getData')
}
}
}
Expand All @@ -117,7 +126,6 @@ export default {
flex-shrink: 0;
}
.bar-text {
font-family: sans-serif;
font-size: 13px;
font-style: normal;
font-weight: 400;
Expand Down
1 change: 1 addition & 0 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default {

// Global CSS: https://go.nuxtjs.dev/config-css
css: [
'~/assets/main.scss'
],
auth: {
store: true,
Expand Down
5 changes: 1 addition & 4 deletions pages/auth/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,8 @@ export default {
.then(() => {
this.$router.push('/')
})
// Kullanıcı girişi başarılı ise yönlendirme vb. işlemleri burada yapabilirsiniz
} catch (error) {
} catch (error) { // çalıştıramadım kontrol edilecek burası
if (error.response && error.response.status === 401) {
// Kullanıcı adı veya şifre yanlış olduğu durumda bir uyarı göster
alert('Kullanıcı adı veya şifre yanlış.')
} else {
alert('Giriş işlemi sırasında bir hata oluştu.')
Expand Down

0 comments on commit 24a86c4

Please sign in to comment.