Browse Source

feat(gui-v2): add form validation rules & update styles

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
pull/2716/head
Braks 2 years ago committed by Pranav C
parent
commit
ffd6cfd9c0
  1. 56
      packages/nc-gui-v2/pages/signin.vue
  2. 37
      packages/nc-gui-v2/windi.config.ts

56
packages/nc-gui-v2/pages/signin.vue

@ -7,7 +7,8 @@ import { isEmail } from '~/utils/validation'
import MdiLogin from '~icons/mdi/login' import MdiLogin from '~icons/mdi/login'
import MaterialSymbolsWarning from '~icons/material-symbols/warning' import MaterialSymbolsWarning from '~icons/material-symbols/warning'
const { $api, $state } = useNuxtApp() const { $api, $state } = $(useNuxtApp())
const { t } = useI18n() const { t } = useI18n()
useHead({ useHead({
@ -21,10 +22,12 @@ useHead({
], ],
}) })
const error = ref() let error = $ref<string | null>(null)
const valid = ref() const valid = ref()
const formValidator = ref()
const form = reactive({ const form = reactive({
email: '', email: '',
password: '', password: '',
@ -44,17 +47,24 @@ const formRules = {
} }
const signIn = async () => { const signIn = async () => {
error.value = null error = null
try { try {
const { token } = await $api.auth.signin(form) const { token } = await $api.auth.signin(form)
$state.value.token = token
$state.value.user = { email: form.email } $state.token = token
$state.user = { email: form.email }
await navigateTo('/projects') await navigateTo('/projects')
} catch (e: any) { } catch (e: any) {
// todo: errors should not expose what was wrong (i.e. do not show "Password is wrong" messages) // todo: errors should not expose what was wrong (i.e. do not show "Password is wrong" messages)
error.value = await extractSdkResponseErrorMsg(e) error = await extractSdkResponseErrorMsg(e)
} }
} }
const resetError = () => {
formValidator.value.reset()
error = null
}
</script> </script>
<template> <template>
@ -71,7 +81,7 @@ const signIn = async () => {
> >
<div <div
style="left: -moz-calc(50% - 45px); left: -webkit-calc(50% - 45px); left: calc(50% - 45px)" style="left: -moz-calc(50% - 45px); left: -webkit-calc(50% - 45px); left: calc(50% - 45px)"
class="absolute top-24 md:top-[-65px] rounded-lg bg-primary" class="absolute top-12 md:top-[-65px] rounded-lg bg-primary"
> >
<img width="90" height="90" src="~/assets/img/icons/512x512-trans.png" /> <img width="90" height="90" src="~/assets/img/icons/512x512-trans.png" />
</div> </div>
@ -80,11 +90,20 @@ const signIn = async () => {
<v-divider class="mb-4" /> <v-divider class="mb-4" />
<div v-if="error" class="self-center mb-4 bg-red-500 text-white rounded-lg w-3/4 p-1"> <Transition name="layout">
<div class="flex items-center gap-2 justify-center"><MaterialSymbolsWarning /> {{ error }}</div> <div v-if="error" class="self-center mb-4 bg-red-500 text-white rounded-lg w-3/4 p-1">
</div> <div class="flex items-center gap-2 justify-center"><MaterialSymbolsWarning /> {{ error }}</div>
</div>
</Transition>
<v-text-field id="email" v-model="form.email" :rules="formRules.email" :label="$t('labels.email')" type="text" /> <v-text-field
id="email"
v-model="form.email"
:rules="formRules.email"
:label="$t('labels.email')"
type="text"
@focus="resetError"
/>
<v-text-field <v-text-field
id="password" id="password"
@ -92,16 +111,25 @@ const signIn = async () => {
:rules="formRules.password" :rules="formRules.password"
:label="$t('labels.password')" :label="$t('labels.password')"
type="password" type="password"
@focus="resetError"
/> />
<div class="self-center flex items-center gap-8"> <div class="self-end">
<nuxt-link class="prose-sm text-primary underline" to="/forgot-password">
{{ $t('msg.info.signUp.forgotPassword') }}
</nuxt-link>
</div>
<div class="self-center flex items-center justify-between w-100">
<button <button
class="border-1 border-solid border-gray-300 transition-color duration-100 ease-in rounded-lg shadow-md p-4 bg-gray-100/50 hover:(text-primary bg-primary/25)" :disabled="!valid"
:class="[!valid ? '!opacity-50 !cursor-default' : 'shadow-md hover:(text-primary bg-primary/25)']"
class="ml-1 border-1 border-solid border-gray-300 transition-color duration-100 ease-in rounded-lg p-4 bg-gray-100/50"
type="submit" type="submit"
> >
<span class="flex items-center gap-2"><MdiLogin /> {{ $t('general.signIn') }}</span> <span class="flex items-center gap-2"><MdiLogin /> {{ $t('general.signIn') }}</span>
</button> </button>
<div> <div class="text-end prose-sm">
{{ $t('msg.info.signUp.dontHaveAccount') }} {{ $t('msg.info.signUp.dontHaveAccount') }}
<nuxt-link class="text-primary underline hover:opacity-75" to="/signup">{{ $t('general.signUp') }}</nuxt-link> <nuxt-link class="text-primary underline hover:opacity-75" to="/signup">{{ $t('general.signUp') }}</nuxt-link>
</div> </div>

37
packages/nc-gui-v2/windi.config.ts

@ -23,7 +23,24 @@ export default defineConfig({
darkMode: 'class', darkMode: 'class',
plugins: [scrollbar, animations, questionMark, formsPlugin, typographyPlugin, aspectRatioPlugin, lineClampPlugin], plugins: [
scrollbar,
animations,
questionMark,
formsPlugin,
typographyPlugin({
dark: true,
}),
aspectRatioPlugin,
lineClampPlugin,
],
preflight: {
alias: {
'nuxt-link': 'a',
'nuxt-img': 'img',
},
},
shortcuts: { shortcuts: {
'scrollbar-thin-primary': 'scrollbar scrollbar-thin scrollbar-thumb-rounded scrollbar-thumb-primary scrollbar-track-white', 'scrollbar-thin-primary': 'scrollbar scrollbar-thin scrollbar-thumb-rounded scrollbar-thumb-primary scrollbar-track-white',
@ -36,6 +53,24 @@ export default defineConfig({
mono: ['Roboto', 'mono'], mono: ['Roboto', 'mono'],
}, },
extend: { extend: {
typography: {
DEFAULT: {
css: {
'a': {
'color': '#1348ba',
'&:hover': {
color: 'rgba(19,72,186,0.75)',
},
},
'nuxt-link': {
'color': '#1348ba',
'&:hover': {
color: 'rgba(19,72,186,0.75)',
},
},
},
},
},
colors: { colors: {
...windiColors, ...windiColors,
...themeColors, ...themeColors,

Loading…
Cancel
Save