Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -11,6 +11,7 @@ Mevcut şifrenizi girerek yeni şifre belirleyin
|
|||||||
|
|
||||||
<q-separator />
|
<q-separator />
|
||||||
|
|
||||||
|
<q-form @submit.prevent="submit">
|
||||||
<q-card-section>
|
<q-card-section>
|
||||||
<q-input
|
<q-input
|
||||||
v-model="current"
|
v-model="current"
|
||||||
@@ -46,13 +47,14 @@ class="bg-red-1 text-red q-mt-md"
|
|||||||
<q-card-actions align="right">
|
<q-card-actions align="right">
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="canUpdateSystem"
|
v-if="canUpdateSystem"
|
||||||
|
type="submit"
|
||||||
label="GÜNCELLE"
|
label="GÜNCELLE"
|
||||||
color="primary"
|
color="primary"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:disable="!canSubmit"
|
:disable="!canSubmit"
|
||||||
@click="submit"
|
|
||||||
/>
|
/>
|
||||||
</q-card-actions>
|
</q-card-actions>
|
||||||
|
</q-form>
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
||||||
</q-page>
|
</q-page>
|
||||||
|
|||||||
@@ -8,48 +8,50 @@
|
|||||||
</div>
|
</div>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|
||||||
<q-card-section class="q-gutter-md">
|
<q-form @submit.prevent="submit">
|
||||||
<q-input
|
<q-card-section class="q-gutter-md">
|
||||||
v-model="currentPassword"
|
<q-input
|
||||||
type="password"
|
v-model="currentPassword"
|
||||||
label="Mevcut Şifre"
|
type="password"
|
||||||
outlined
|
label="Mevcut Şifre"
|
||||||
dense
|
outlined
|
||||||
/>
|
dense
|
||||||
|
/>
|
||||||
|
|
||||||
<q-input
|
<q-input
|
||||||
v-model="newPassword"
|
v-model="newPassword"
|
||||||
type="password"
|
type="password"
|
||||||
label="Yeni Şifre"
|
label="Yeni Şifre"
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<q-input
|
<q-input
|
||||||
v-model="newPassword2"
|
v-model="newPassword2"
|
||||||
type="password"
|
type="password"
|
||||||
label="Yeni Şifre (Tekrar)"
|
label="Yeni Şifre (Tekrar)"
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<q-banner
|
<q-banner
|
||||||
v-if="error"
|
v-if="error"
|
||||||
class="bg-red-1 text-red q-mt-sm"
|
class="bg-red-1 text-red q-mt-sm"
|
||||||
rounded
|
rounded
|
||||||
>
|
>
|
||||||
{{ error }}
|
{{ error }}
|
||||||
</q-banner>
|
</q-banner>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|
||||||
<q-card-actions align="right">
|
<q-card-actions align="right">
|
||||||
<q-btn
|
<q-btn
|
||||||
label="Kaydet"
|
type="submit"
|
||||||
color="primary"
|
label="Kaydet"
|
||||||
:loading="loading"
|
color="primary"
|
||||||
@click="submit"
|
:loading="loading"
|
||||||
/>
|
/>
|
||||||
</q-card-actions>
|
</q-card-actions>
|
||||||
|
</q-form>
|
||||||
</q-card>
|
</q-card>
|
||||||
</q-page>
|
</q-page>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -10,66 +10,68 @@
|
|||||||
<div class="login-title q-mt-sm">Kullanıcı Girişi</div>
|
<div class="login-title q-mt-sm">Kullanıcı Girişi</div>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|
||||||
<!-- FORM -->
|
<q-form @submit.prevent="login">
|
||||||
<q-card-section>
|
<!-- FORM -->
|
||||||
<q-input
|
<q-card-section>
|
||||||
v-model="username"
|
<q-input
|
||||||
label="Kullanıcı Adı"
|
v-model="username"
|
||||||
dense
|
label="Kullanıcı Adı"
|
||||||
standout="bg-white"
|
dense
|
||||||
class="q-mb-md custom-input"
|
standout="bg-white"
|
||||||
autocomplete="username"
|
class="q-mb-md custom-input"
|
||||||
/>
|
autocomplete="username"
|
||||||
|
/>
|
||||||
|
|
||||||
<q-input
|
<q-input
|
||||||
v-model="password"
|
v-model="password"
|
||||||
type="password"
|
type="password"
|
||||||
label="Şifre"
|
label="Şifre"
|
||||||
dense
|
dense
|
||||||
standout="bg-white"
|
standout="bg-white"
|
||||||
class="custom-input"
|
class="custom-input"
|
||||||
autocomplete="current-password"
|
autocomplete="current-password"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="q-mt-md row items-center justify-between">
|
<div class="q-mt-md row items-center justify-between">
|
||||||
<div>
|
<div>
|
||||||
<q-checkbox
|
<q-checkbox
|
||||||
v-model="rememberUser"
|
v-model="rememberUser"
|
||||||
label="Kullanıcıyı hatırla"
|
label="Kullanıcıyı hatırla"
|
||||||
color="secondary"
|
color="secondary"
|
||||||
dense
|
dense
|
||||||
/>
|
/>
|
||||||
<q-checkbox
|
<q-checkbox
|
||||||
v-model="rememberPass"
|
v-model="rememberPass"
|
||||||
label="Parolayı kaydet"
|
label="Parolayı kaydet"
|
||||||
color="secondary"
|
color="secondary"
|
||||||
|
dense
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<q-btn
|
||||||
|
flat
|
||||||
dense
|
dense
|
||||||
|
color="primary"
|
||||||
|
label="Şifremi Unuttum"
|
||||||
|
@click="forgotOpen = true"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
</q-card-section>
|
||||||
|
|
||||||
|
<!-- ACTION -->
|
||||||
|
<q-card-actions align="center">
|
||||||
<q-btn
|
<q-btn
|
||||||
flat
|
type="submit"
|
||||||
dense
|
label="Giriş Yap"
|
||||||
color="primary"
|
color="primary"
|
||||||
label="Şifremi Unuttum"
|
glossy
|
||||||
@click="forgotOpen = true"
|
unelevated
|
||||||
|
icon="login"
|
||||||
|
class="full-width"
|
||||||
|
:loading="loading"
|
||||||
/>
|
/>
|
||||||
</div>
|
</q-card-actions>
|
||||||
</q-card-section>
|
</q-form>
|
||||||
|
|
||||||
<!-- ACTION -->
|
|
||||||
<q-card-actions align="center">
|
|
||||||
<q-btn
|
|
||||||
label="Giriş Yap"
|
|
||||||
color="primary"
|
|
||||||
glossy
|
|
||||||
unelevated
|
|
||||||
icon="login"
|
|
||||||
class="full-width"
|
|
||||||
:loading="loading"
|
|
||||||
@click="login"
|
|
||||||
/>
|
|
||||||
</q-card-actions>
|
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
||||||
<!-- 🔐 FORGOT PASSWORD -->
|
<!-- 🔐 FORGOT PASSWORD -->
|
||||||
|
|||||||
@@ -11,46 +11,48 @@
|
|||||||
|
|
||||||
<q-separator />
|
<q-separator />
|
||||||
|
|
||||||
<q-card-section class="q-gutter-sm">
|
<q-form @submit.prevent="submit">
|
||||||
<q-input
|
<q-card-section class="q-gutter-sm">
|
||||||
v-model="current"
|
<q-input
|
||||||
type="password"
|
v-model="current"
|
||||||
label="Mevcut Şifre"
|
type="password"
|
||||||
dense filled
|
label="Mevcut Şifre"
|
||||||
/>
|
dense filled
|
||||||
|
/>
|
||||||
|
|
||||||
<q-input
|
<q-input
|
||||||
v-model="password"
|
v-model="password"
|
||||||
type="password"
|
type="password"
|
||||||
label="Yeni Şifre"
|
label="Yeni Şifre"
|
||||||
dense filled
|
dense filled
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<q-input
|
<q-input
|
||||||
v-model="password2"
|
v-model="password2"
|
||||||
type="password"
|
type="password"
|
||||||
label="Yeni Şifre (Tekrar)"
|
label="Yeni Şifre (Tekrar)"
|
||||||
dense filled
|
dense filled
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<q-banner
|
<q-banner
|
||||||
v-if="error"
|
v-if="error"
|
||||||
class="bg-red-1 text-red q-mt-sm"
|
class="bg-red-1 text-red q-mt-sm"
|
||||||
rounded
|
rounded
|
||||||
>
|
>
|
||||||
{{ error }}
|
{{ error }}
|
||||||
</q-banner>
|
</q-banner>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|
||||||
<q-card-actions align="right">
|
<q-card-actions align="right">
|
||||||
<q-btn
|
<q-btn
|
||||||
label="GÜNCELLE"
|
type="submit"
|
||||||
color="primary"
|
label="GÜNCELLE"
|
||||||
:loading="loading"
|
color="primary"
|
||||||
:disable="!canSubmit"
|
:loading="loading"
|
||||||
@click="submit"
|
:disable="!canSubmit"
|
||||||
/>
|
/>
|
||||||
</q-card-actions>
|
</q-card-actions>
|
||||||
|
</q-form>
|
||||||
|
|
||||||
</q-card>
|
</q-card>
|
||||||
</q-page>
|
</q-page>
|
||||||
|
|||||||
@@ -21,76 +21,78 @@
|
|||||||
|
|
||||||
<q-separator />
|
<q-separator />
|
||||||
|
|
||||||
<q-card-section>
|
<q-form @submit.prevent="submit">
|
||||||
<!-- NEW PASSWORD -->
|
<q-card-section>
|
||||||
<q-input
|
<!-- NEW PASSWORD -->
|
||||||
v-model="password"
|
<q-input
|
||||||
:type="showPassword ? 'text' : 'password'"
|
v-model="password"
|
||||||
label="Yeni Parola"
|
:type="showPassword ? 'text' : 'password'"
|
||||||
dense
|
label="Yeni Parola"
|
||||||
filled
|
dense
|
||||||
:rules="[passwordRule]"
|
filled
|
||||||
>
|
:rules="[passwordRule]"
|
||||||
<template #append>
|
>
|
||||||
<q-icon
|
<template #append>
|
||||||
:name="showPassword ? 'visibility_off' : 'visibility'"
|
<q-icon
|
||||||
class="cursor-pointer"
|
:name="showPassword ? 'visibility_off' : 'visibility'"
|
||||||
@click="showPassword = !showPassword"
|
class="cursor-pointer"
|
||||||
/>
|
@click="showPassword = !showPassword"
|
||||||
</template>
|
/>
|
||||||
</q-input>
|
</template>
|
||||||
|
</q-input>
|
||||||
|
|
||||||
<!-- STRENGTH -->
|
<!-- STRENGTH -->
|
||||||
<div class="q-mt-xs">
|
<div class="q-mt-xs">
|
||||||
<q-linear-progress
|
<q-linear-progress
|
||||||
:value="passwordStrength.value"
|
:value="passwordStrength.value"
|
||||||
:color="passwordStrength.color"
|
:color="passwordStrength.color"
|
||||||
rounded
|
rounded
|
||||||
size="6px"
|
size="6px"
|
||||||
/>
|
/>
|
||||||
<div class="text-caption q-mt-xs" :class="passwordStrength.textColor">
|
<div class="text-caption q-mt-xs" :class="passwordStrength.textColor">
|
||||||
{{ passwordStrength.label }}
|
{{ passwordStrength.label }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- CONFIRM -->
|
<!-- CONFIRM -->
|
||||||
<q-input
|
<q-input
|
||||||
v-model="password2"
|
v-model="password2"
|
||||||
:type="showPassword2 ? 'text' : 'password'"
|
:type="showPassword2 ? 'text' : 'password'"
|
||||||
label="Parola Tekrar"
|
label="Parola Tekrar"
|
||||||
dense
|
dense
|
||||||
filled
|
filled
|
||||||
class="q-mt-sm"
|
class="q-mt-sm"
|
||||||
:rules="[confirmRule]"
|
:rules="[confirmRule]"
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<q-icon
|
<q-icon
|
||||||
:name="showPassword2 ? 'visibility_off' : 'visibility'"
|
:name="showPassword2 ? 'visibility_off' : 'visibility'"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="showPassword2 = !showPassword2"
|
@click="showPassword2 = !showPassword2"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</q-input>
|
</q-input>
|
||||||
|
|
||||||
<!-- ERROR -->
|
<!-- ERROR -->
|
||||||
<q-banner
|
<q-banner
|
||||||
v-if="error"
|
v-if="error"
|
||||||
class="bg-red-1 text-red q-mt-md"
|
class="bg-red-1 text-red q-mt-md"
|
||||||
rounded
|
rounded
|
||||||
>
|
>
|
||||||
{{ error }}
|
{{ error }}
|
||||||
</q-banner>
|
</q-banner>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|
||||||
<q-card-actions align="right">
|
<q-card-actions align="right">
|
||||||
<q-btn
|
<q-btn
|
||||||
label="PAROLAYI GÜNCELLE"
|
type="submit"
|
||||||
color="primary"
|
label="PAROLAYI GÜNCELLE"
|
||||||
:loading="loading"
|
color="primary"
|
||||||
:disable="!canSubmit"
|
:loading="loading"
|
||||||
@click="submit"
|
:disable="!canSubmit"
|
||||||
/>
|
/>
|
||||||
</q-card-actions>
|
</q-card-actions>
|
||||||
|
</q-form>
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
||||||
<!-- ❌ TOKEN INVALID -->
|
<!-- ❌ TOKEN INVALID -->
|
||||||
|
|||||||
@@ -3335,6 +3335,11 @@ export function normalizeBedenLabel(v) {
|
|||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Backward-compatible alias kept for older call sites/bundles.
|
||||||
|
export function normalizeBeden(v) {
|
||||||
|
return normalizeBedenLabel(v)
|
||||||
|
}
|
||||||
|
|
||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
Size Group Detection
|
Size Group Detection
|
||||||
- Core logic aligned with backend detectBedenGroupGo
|
- Core logic aligned with backend detectBedenGroupGo
|
||||||
|
|||||||
Reference in New Issue
Block a user