Compare commits

..

2 Commits

Author SHA1 Message Date
PayalDholakiya
68018cc726 step navigation dark mode issue fixed 2023-03-30 17:13:25 +05:30
PayalDholakiya
ab13823b83 add dark mode in wizard steps 2023-03-30 16:48:33 +05:30
19 changed files with 46 additions and 60 deletions

View File

@@ -1,8 +1,8 @@
<template> <template>
<div class="h-screen overflow-y-auto text-base"> <div class="h-screen overflow-y-auto text-base dark:bg-gray-800/80 dark:text-white">
<NotificationRoot /> <NotificationRoot />
<div class="container mx-auto px-4"> <div class="container px-4 mx-auto">
<router-view /> <router-view />
</div> </div>
</div> </div>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="grid h-screen grid-cols-12 overflow-y-hidden bg-gray-100 dark:bg-gray-900"> <div class="grid h-screen grid-cols-12 overflow-y-hidden bg-gray-100">
<NotificationRoot /> <NotificationRoot />
<div <div

View File

@@ -32,7 +32,7 @@
<div class="mt-4 mb-4 text-sm"> <div class="mt-4 mb-4 text-sm">
<router-link <router-link
to="/login" to="/login"
class="text-sm text-primary-400 hover:text-gray-700 dark:hover:text-primary-500" class="text-sm text-primary-400 hover:text-gray-700"
> >
{{ $t('general.back_to_login') }} {{ $t('general.back_to_login') }}
</router-link> </router-link>

View File

@@ -49,7 +49,7 @@
<div class="mb-4"> <div class="mb-4">
<router-link <router-link
to="forgot-password" to="forgot-password"
class="text-sm text-primary-400 hover:text-gray-700 dark:hover:text-primary-500" class="text-sm text-primary-400 hover:text-gray-700"
> >
{{ $t('login.forgot_password') }} {{ $t('login.forgot_password') }}
</router-link> </router-link>

View File

@@ -7,7 +7,7 @@
<div class="mb-6"> <div class="mb-6">
<div <div
v-if="phpSupportInfo" v-if="phpSupportInfo"
class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 lg:gap-24 sm:gap-4" class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 lg:gap-24 sm:gap-4 dark:border-white/10"
> >
<div class="col-span-2 text-sm"> <div class="col-span-2 text-sm">
{{ {{
@@ -32,7 +32,7 @@
<div <div
v-for="(requirement, index) in requirements" v-for="(requirement, index) in requirements"
:key="index" :key="index"
class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 lg:gap-24 sm:gap-4" class="grid grid-flow-row grid-cols-3 p-3 border border-gray-200 dark:border-gray-600 lg:gap-24 sm:gap-4"
> >
<div class="col-span-2 text-sm"> <div class="col-span-2 text-sm">
{{ index }} {{ index }}

View File

@@ -8,12 +8,7 @@
<div <div
v-for="(permission, index) in 3" v-for="(permission, index) in 3"
:key="index" :key="index"
class=" class="grid grid-flow-row grid-cols-3 border border-gray-200 lg:gap-24 sm:gap-4 dark:border-gray-600"
grid grid-flow-row grid-cols-3
lg:gap-24
sm:gap-4
border border-gray-200
"
> >
<BaseContentPlaceholdersText :lines="1" class="col-span-4 p-3" /> <BaseContentPlaceholdersText :lines="1" class="col-span-4 p-3" />
</div> </div>
@@ -29,7 +24,7 @@
<div <div
v-for="(permission, index) in permissions" v-for="(permission, index) in permissions"
:key="index" :key="index"
class="border border-gray-200" class="border border-gray-200 dark:border-gray-600"
> >
<div class="grid grid-flow-row grid-cols-3 lg:gap-24 sm:gap-4"> <div class="grid grid-flow-row grid-cols-3 lg:gap-24 sm:gap-4">
<div class="col-span-2 p-3"> <div class="col-span-2 p-3">
@@ -38,11 +33,11 @@
<div class="p-3 text-right"> <div class="p-3 text-right">
<span <span
v-if="permission.isSet" v-if="permission.isSet"
class="inline-block w-4 h-4 ml-3 mr-2 rounded-full bg-green-500" class="inline-block w-4 h-4 ml-3 mr-2 bg-green-500 rounded-full"
/> />
<span <span
v-else v-else
class="inline-block w-4 h-4 ml-3 mr-2 rounded-full bg-red-500" class="inline-block w-4 h-4 ml-3 mr-2 bg-red-500 rounded-full"
/> />
<span>{{ permission.permission }}</span> <span>{{ permission.permission }}</span>
</div> </div>

View File

@@ -2,7 +2,6 @@
<BaseWizardStep <BaseWizardStep
:title="$t('wizard.database.database')" :title="$t('wizard.database.database')"
:description="$t('wizard.database.desc')" :description="$t('wizard.database.desc')"
step-container="w-full p-8 mb-8 bg-white border border-gray-200 border-solid rounded md:w-full"
> >
<component <component
:is="databaseData.database_connection" :is="databaseData.database_connection"

View File

@@ -18,18 +18,18 @@
</BaseInputGroup> </BaseInputGroup>
</div> </div>
<p class="mt-4 mb-0 text-sm text-gray-600">Notes:</p> <p class="mt-4 mb-0 text-sm text-gray-600 dark:text-white">Notes:</p>
<ul class="w-full text-gray-600 list-disc list-inside"> <ul class="w-full text-gray-600 list-disc list-inside dark:text-gray-300">
<li class="text-sm leading-8"> <li class="text-sm leading-8">
App domain should not contain App domain should not contain
<b class="inline-block px-1 bg-gray-100 rounded-sm">https://</b> or <b class="inline-block px-1 bg-gray-100 rounded-md dark:bg-gray-400 dark:text-gray-600">https://</b> or
<b class="inline-block px-1 bg-gray-100 rounded-sm">http</b> in front of <b class="inline-block px-1 bg-gray-100 rounded-md dark:bg-gray-400 dark:text-gray-600">http</b> in front of
the domain. the domain.
</li> </li>
<li class="text-sm leading-8"> <li class="text-sm leading-8">
If you're accessing the website on a different port, please mention the If you're accessing the website on a different port, please mention the
port. For example: port. For example:
<b class="inline-block px-1 bg-gray-100">localhost:8080</b> <b class="inline-block px-1 bg-gray-100 rounded-md dark:bg-gray-400 dark:text-gray-600">localhost:8080</b>
</li> </li>
</ul> </ul>

View File

@@ -2,7 +2,6 @@
<BaseWizardStep <BaseWizardStep
:title="$t('wizard.company_info')" :title="$t('wizard.company_info')"
:description="$t('wizard.company_info_desc')" :description="$t('wizard.company_info_desc')"
step-container="bg-white border border-gray-200 border-solid mb-8 md:w-full p-8 rounded w-full"
> >
<form action="" @submit.prevent="next"> <form action="" @submit.prevent="next">
<div class="grid grid-cols-1 mb-4 md:grid-cols-2 md:mb-6"> <div class="grid grid-cols-1 mb-4 md:grid-cols-2 md:mb-6">

View File

@@ -2,7 +2,6 @@
<BaseWizardStep <BaseWizardStep
:title="$t('wizard.preferences')" :title="$t('wizard.preferences')"
:description="$t('wizard.preferences_desc')" :description="$t('wizard.preferences_desc')"
step-container="bg-white border border-gray-200 border-solid mb-8 md:w-full p-8 rounded w-full"
> >
<form action="" @submit.prevent="next"> <form action="" @submit.prevent="next">
<div> <div>

View File

@@ -28,7 +28,6 @@
:attributes="attrs" :attributes="attrs"
:model-config="config" :model-config="config"
:masks="masks" :masks="masks"
:is-dark="isDarkModeOn"
:locale="global.locale" :locale="global.locale"
> >
<template <template
@@ -73,7 +72,7 @@
<template v-if="showExtraOptions" #footer> <template v-if="showExtraOptions" #footer>
<div <div
class="bg-gray-100 dark:bg-gray-800 grid grid-cols-3 gap-2 p-2 border-t dark:border-gray-500 rounded-b-lg" class="bg-gray-100 grid grid-cols-3 gap-2 p-2 border-t rounded-b-lg"
> >
<button type="button" class="extra-button" @click="moveToDate(sourceDate)"> <button type="button" class="extra-button" @click="moveToDate(sourceDate)">
{{ global.t('date_picker.same_day') }} {{ global.t('date_picker.same_day') }}
@@ -147,7 +146,7 @@ const props = defineProps({
defaultInputClass: { defaultInputClass: {
type: String, type: String,
default: default:
'border-2 dark:bg-gray-700 dark:border-gray-600 dark:text-white font-base pl-8 py-2 outline-none focus:ring-primary-400 focus:outline-none focus:border-primary-400 block w-full sm:text-sm border-gray-200 rounded-md text-black', 'border-2 font-base pl-8 py-2 outline-none focus:ring-primary-400 focus:outline-none focus:border-primary-400 block w-full sm:text-sm border-gray-200 rounded-md text-black',
}, },
time24hr: { time24hr: {
type: Boolean, type: Boolean,
@@ -164,7 +163,7 @@ const props = defineProps({
sourceDate: { sourceDate: {
type: [String, Date], type: [String, Date],
default: () => new Date(), default: () => new Date(),
}, }
}) })
const emit = defineEmits(['update:modelValue']) const emit = defineEmits(['update:modelValue'])
@@ -176,9 +175,6 @@ const vCalendar = ref(null)
const hasIconSlot = computed(() => { const hasIconSlot = computed(() => {
return !!slots.icon return !!slots.icon
}) })
const isDarkModeOn = computed(() =>
document.documentElement.classList.contains('dark')
)
const computedContainerClass = computed(() => { const computedContainerClass = computed(() => {
let containerClass = `${props.containerClass} ` let containerClass = `${props.containerClass} `

View File

@@ -1,16 +1,7 @@
<template> <template>
<div <div
:class="containerClass" :class="containerClass"
class=" class="relative after:bg-gray-200 dark:after:bg-gray-700 after:absolute after:transform after:top-1/2 after:-translate-y-1/2 after:h-2 after:w-full"
relative
after:bg-gray-200
after:absolute
after:transform
after:top-1/2
after:-translate-y-1/2
after:h-2
after:w-full
"
> >
<a <a
v-for="(number, index) in steps" v-for="(number, index) in steps"
@@ -58,21 +49,21 @@ export default {
}, },
currentStepClass: { currentStepClass: {
type: String, type: String,
default: 'bg-white border-primary-500', default: 'bg-white border-primary-500 dark:bg-gray-600 dark:border-gray-500 dark:border-primary-600',
}, },
nextStepClass: { nextStepClass: {
type: String, type: String,
default: 'border-gray-200 bg-white', default: 'border-gray-200 bg-white dark:bg-gray-600 dark:border-gray-500',
}, },
previousStepClass: { previousStepClass: {
type: String, type: String,
default: default:
'bg-primary-500 border-primary-500 flex justify-center items-center', 'bg-primary-500 dark:bg-primary-600 border-primary-500 flex justify-center items-center dark:border-primary-600',
}, },
iconClass: { iconClass: {
type: String, type: String,
default: default:
'flex items-center justify-center w-full h-full text-sm font-black text-center text-white', 'flex items-center justify-center w-full h-full text-sm font-black text-center text-white dark:text-gray-400',
}, },
}, },

View File

@@ -9,6 +9,7 @@
</p> </p>
</div> </div>
<slot /> <slot />
<BaseDarkHighlight class="z-[-1]"/>
</div> </div>
</template> </template>
@@ -25,16 +26,16 @@ const props = defineProps({
stepContainerClass: { stepContainerClass: {
type: String, type: String,
default: default:
'w-full p-8 mb-8 bg-white border border-gray-200 border-solid rounded', 'w-full p-8 mb-8 bg-white border border-gray-200 border-solid rounded dark:from-gray-700/70 dark:to-gray-800/70 dark:bg-transparent dark:backdrop-blur-xl dark:shadow-glass dark:border dark:border-white/10',
}, },
stepTitleClass: { stepTitleClass: {
type: String, type: String,
default: 'text-2xl not-italic font-semibold leading-7 text-black', default: 'text-2xl not-italic font-semibold leading-7 text-black dark:text-white',
}, },
stepDescriptionClass: { stepDescriptionClass: {
type: String, type: String,
default: default:
'w-full mt-2.5 mb-8 text-sm not-italic leading-snug text-gray-500 lg:w-7/12 md:w-7/12 sm:w-7/12', 'w-full mt-2.5 mb-8 text-sm not-italic leading-snug text-gray-500 dark:text-gray-300 lg:w-7/12 md:w-7/12 sm:w-7/12',
}, },
}) })
</script> </script>

View File

@@ -3,7 +3,6 @@
<path <path
d="M690 4.08004C518 -9.91998 231 4.08004 -6 176.361L231 197.08L1170 219.08C1113.33 175.747 909.275 21.928 690 4.08004Z" d="M690 4.08004C518 -9.91998 231 4.08004 -6 176.361L231 197.08L1170 219.08C1113.33 175.747 909.275 21.928 690 4.08004Z"
fill="white" fill="white"
class="dark:fill-gray-900"
fill-opacity="0.1" fill-opacity="0.1"
/> />
</svg> </svg>

View File

@@ -6,7 +6,7 @@
<!-- <SiteSidebar /> --> <!-- <SiteSidebar /> -->
<main class="h-screen min-h-0 pb-16 mt-16 overflow-y-auto"> <main class="mt-16 pb-16 h-screen overflow-y-auto min-h-0">
<router-view /> <router-view />
</main> </main>
</div> </div>

View File

@@ -1,24 +1,31 @@
<template> <template>
<div <div
class="flex flex-col justify-center h-full min-h-screen py-12 overflow-hidden bg-gray-100 sm:px-6 lg:px-8 dark:bg-gray-800/80 dark:text-white font-base " class="
min-h-screen
bg-gray-200
flex flex-col
justify-center
py-12
sm:px-6
lg:px-8
"
> >
<NotificationRoot /> <NotificationRoot />
<div class="px-4 sm:mx-auto sm:w-full sm:max-w-md sm:px-0"> <div class="sm:mx-auto sm:w-full sm:max-w-md px-4 sm:px-0">
<MainLogo <MainLogo
v-if="!customerLogo" v-if="!customerLogo"
class="block w-48 h-auto max-w-full mx-auto text-primary-400" class="block w-48 h-auto max-w-full text-primary-400 mx-auto"
/> />
<img <img
v-else v-else
:src="customerLogo" :src="customerLogo"
class="block w-48 h-auto max-w-full mx-auto text-primary-400" class="block w-48 h-auto max-w-full text-primary-400 mx-auto"
/> />
</div> </div>
<div class="px-4 mt-8 sm:mx-auto sm:w-full sm:max-w-md sm:px-0"> <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-md px-4 sm:px-0">
<div class="px-4 py-8 bg-white rounded-lg shadow sm:px-10 dark:from-gray-700/70 dark:to-gray-800/70 dark:bg-transparent dark:backdrop-blur-xl dark:shadow-glass dark:border dark:border-white/10"> <div class="bg-white py-8 px-4 shadow rounded-lg sm:px-10">
<BaseDarkHighlight/>
<router-view /> <router-view />
</div> </div>
</div> </div>

View File

@@ -34,7 +34,7 @@
:to="`/${globalStore.companySlug}${item.link}`" :to="`/${globalStore.companySlug}${item.link}`"
:class="[ :class="[
hasActiveUrl(item.link) hasActiveUrl(item.link)
? 'text-primary-600 border-primary-600 dark:border-primary-400 dark:text-primary-400' ? 'border-primary-500 text-primary-600 dark:text-primary-400'
: 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-200', : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300 dark:text-gray-200',
'inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium', 'inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium',
]" ]"

View File

@@ -31,7 +31,7 @@
<div class="mt-4 mb-4 text-sm"> <div class="mt-4 mb-4 text-sm">
<router-link <router-link
to="login" to="login"
class="text-sm text-primary-400 hover:text-gray-700 dark:hover:text-primary-500" class="text-sm text-primary-400 hover:text-gray-700"
> >
{{ $t('general.back_to_login') }} {{ $t('general.back_to_login') }}
</router-link> </router-link>

View File

@@ -55,7 +55,7 @@
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<router-link <router-link
:to="{ name: 'customer.forgot-password' }" :to="{ name: 'customer.forgot-password' }"
class="text-sm text-primary-400 hover:text-gray-500 dark:hover:text-primary-500" class="text-sm text-primary-600 hover:text-gray-500"
> >
{{ $t('login.forgot_password') }} {{ $t('login.forgot_password') }}
</router-link> </router-link>