Compare commits

..

4 Commits

Author SHA1 Message Date
b2d181975c add dark mode toggle in installation step 2023-08-21 13:14:20 +05:30
a03d4138fd fix sidebar and table data link in dark mode color 2023-08-18 12:47:21 +05:30
f4bc78ce98 Dark mode fix issue (#1211)
* fix dark mode in item row and switch issue

* change class for create items title issue

* fix indentation and remove console log

---------

Co-authored-by: yogesh-gohil <yogeshgohil1611@gmail.com>
2023-03-31 17:44:18 +05:30
ba769864d4 fix view sidebar and customer dropdown dark issue (#1210)
* fix view sidebar and customer dropdown dark issue

* fix update app settings dark mode

---------

Co-authored-by: yogesh-gohil <yogeshgohil1611@gmail.com>
2023-03-31 17:34:58 +05:30
21 changed files with 48 additions and 38 deletions

View File

@ -40,6 +40,7 @@
px-4 px-4
md:px-8 md:px-8
py-1.5 py-1.5
dark:text-gray-200
" "
> >
{{ $tc('settings.roles.permission', 2) }} {{ $tc('settings.roles.permission', 2) }}

View File

@ -93,7 +93,7 @@
:name="item.icon" :name="item.icon"
:class="[ :class="[
hasActiveUrl(item.link) hasActiveUrl(item.link)
? 'text-primary-500 ' ? 'text-primary-500 dark:text-primary-400'
: 'text-gray-400', : 'text-gray-400',
'mr-4 shrink-0 h-5 w-5', 'mr-4 shrink-0 h-5 w-5',
]" ]"
@ -149,7 +149,7 @@
:name="item.icon" :name="item.icon"
:class="[ :class="[
hasActiveUrl(item.link) hasActiveUrl(item.link)
? 'text-primary-500 group-hover:text-primary-500 dark:text-primary-400 dark:group-hover:text-primary-500 ' ? 'text-primary-500 dark:text-primary-400'
: 'text-gray-400 group-hover:text-black dark:text-gray-400 dark:group-hover:text-white', : 'text-gray-400 group-hover:text-black dark:text-gray-400 dark:group-hover:text-white',
'mr-4 shrink-0 h-5 w-5 ', 'mr-4 shrink-0 h-5 w-5 ',
]" ]"

View File

@ -154,7 +154,7 @@
:text="row.data.name" :text="row.data.name"
:length="30" :length="30"
tag="span" tag="span"
class="font-medium text-primary-500 flex flex-col" class="font-medium text-primary-500 flex flex-col dark:text-primary-400"
/> />
<BaseText <BaseText
:text="row.data.contact_name ? row.data.contact_name : ''" :text="row.data.contact_name ? row.data.contact_name : ''"

View File

@ -34,8 +34,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_ESTIMATE)" v-if="userStore.hasAbilities(abilities.CREATE_ESTIMATE)"
:to="`/admin/estimates/create?customer=${$route.params.id}`" :to="`/admin/estimates/create?customer=${$route.params.id}`"
> >
<BaseDropdownItem class=""> <BaseDropdownItem v-slot="slotProps">
<BaseIcon name="DocumentIcon" class="mr-3 text-gray-600" /> <BaseIcon name="DocumentIcon" :class="slotProps.class" />
{{ $t('estimates.new_estimate') }} {{ $t('estimates.new_estimate') }}
</BaseDropdownItem> </BaseDropdownItem>
</router-link> </router-link>
@ -44,8 +44,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)" v-if="userStore.hasAbilities(abilities.CREATE_INVOICE)"
:to="`/admin/invoices/create?customer=${$route.params.id}`" :to="`/admin/invoices/create?customer=${$route.params.id}`"
> >
<BaseDropdownItem> <BaseDropdownItem v-slot="slotProps">
<BaseIcon name="DocumentTextIcon" class="mr-3 text-gray-600" /> <BaseIcon name="DocumentTextIcon" :class="slotProps.class" />
{{ $t('invoices.new_invoice') }} {{ $t('invoices.new_invoice') }}
</BaseDropdownItem> </BaseDropdownItem>
</router-link> </router-link>
@ -54,8 +54,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_PAYMENT)" v-if="userStore.hasAbilities(abilities.CREATE_PAYMENT)"
:to="`/admin/payments/create?customer=${$route.params.id}`" :to="`/admin/payments/create?customer=${$route.params.id}`"
> >
<BaseDropdownItem> <BaseDropdownItem v-slot="slotProps">
<BaseIcon name="CreditCardIcon" class="mr-3 text-gray-600" /> <BaseIcon name="CreditCardIcon" :class="slotProps.class" />
{{ $t('payments.new_payment') }} {{ $t('payments.new_payment') }}
</BaseDropdownItem> </BaseDropdownItem>
</router-link> </router-link>
@ -64,8 +64,8 @@
v-if="userStore.hasAbilities(abilities.CREATE_EXPENSE)" v-if="userStore.hasAbilities(abilities.CREATE_EXPENSE)"
:to="`/admin/expenses/create?customer=${$route.params.id}`" :to="`/admin/expenses/create?customer=${$route.params.id}`"
> >
<BaseDropdownItem> <BaseDropdownItem v-slot="slotProps">
<BaseIcon name="CalculatorIcon" class="mr-3 text-gray-600" /> <BaseIcon name="CalculatorIcon" :class="slotProps.class" />
{{ $t('expenses.new_expense') }} {{ $t('expenses.new_expense') }}
</BaseDropdownItem> </BaseDropdownItem>
</router-link> </router-link>

View File

@ -13,6 +13,7 @@
xl:ml-64 xl:ml-64
w-88 w-88
xl:block xl:block
dark:bg-gray-800
" "
> >
<div <div
@ -25,6 +26,7 @@
pb-2 pb-2
border border-gray-200 border-solid border border-gray-200 border-solid
height-full height-full
dark:border-gray-600
" "
> >
<BaseInput <BaseInput
@ -59,6 +61,7 @@
mb-2 mb-2
text-sm text-sm
border-b border-gray-200 border-solid border-b border-gray-200 border-solid
dark:border-gray-600
" "
> >
{{ $t('general.sort_by') }} {{ $t('general.sort_by') }}
@ -114,6 +117,7 @@
border-l border-gray-200 border-solid border-l border-gray-200 border-solid
sidebar sidebar
base-scroll base-scroll
dark:border-gray-600
" "
> >
<div v-for="(customer, index) in customerList" :key="index"> <div v-for="(customer, index) in customerList" :key="index">
@ -122,9 +126,9 @@
:id="'customer-' + customer.id" :id="'customer-' + customer.id"
:to="`/admin/customers/${customer.id}/view`" :to="`/admin/customers/${customer.id}/view`"
:class="[ :class="[
'flex justify-between p-4 items-center cursor-pointer hover:bg-gray-100 border-l-4 border-transparent', 'flex justify-between p-4 items-center cursor-pointer hover:bg-gray-100 border-l-4 border-transparent dark:hover:bg-gray-700',
{ {
'bg-gray-100 border-l-4 border-primary-500 border-solid': 'bg-gray-100 border-l-4 border-primary-500 border-solid dark:border-primary-400 dark:bg-gray-700':
hasActiveUrl(customer.id), hasActiveUrl(customer.id),
}, },
]" ]"
@ -143,6 +147,7 @@
text-black text-black
capitalize capitalize
truncate truncate
dark:text-white
" "
/> />
@ -157,6 +162,7 @@
font-medium font-medium
leading-5 leading-5
text-gray-600 text-gray-600
dark:text-gray-400
" "
/> />
</div> </div>
@ -175,7 +181,7 @@
</div> </div>
<p <p
v-if="!customerList?.length && !isFetching" v-if="!customerList?.length && !isFetching"
class="flex justify-center px-4 mt-5 text-sm text-gray-600" class="flex justify-center px-4 mt-5 text-sm text-gray-600 dark:text-gray-300"
> >
{{ $t('customers.no_matching_customers') }} {{ $t('customers.no_matching_customers') }}
</p> </p>

View File

@ -28,7 +28,7 @@
<template #cell-user="{ row }"> <template #cell-user="{ row }">
<router-link <router-link
:to="{ path: `invoices/${row.data.id}/view` }" :to="{ path: `invoices/${row.data.id}/view` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.customer.name }} {{ row.data.customer.name }}
</router-link> </router-link>
@ -78,7 +78,7 @@
<template #cell-user="{ row }"> <template #cell-user="{ row }">
<router-link <router-link
:to="{ path: `estimates/${row.data.id}/view` }" :to="{ path: `estimates/${row.data.id}/view` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.customer.name }} {{ row.data.customer.name }}
</router-link> </router-link>

View File

@ -205,7 +205,7 @@
<template #cell-estimate_number="{ row }"> <template #cell-estimate_number="{ row }">
<router-link <router-link
:to="{ path: `estimates/${row.data.id}/view` }" :to="{ path: `estimates/${row.data.id}/view` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.estimate_number }} {{ row.data.estimate_number }}
</router-link> </router-link>

View File

@ -171,7 +171,7 @@
<template #cell-name="{ row }"> <template #cell-name="{ row }">
<router-link <router-link
:to="{ path: `expenses/${row.data.id}/edit` }" :to="{ path: `expenses/${row.data.id}/edit` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.expense_category.name }} {{ row.data.expense_category.name }}
</router-link> </router-link>

View File

@ -1,5 +1,6 @@
<template> <template>
<div class="flex flex-col items-center justify-between w-full pt-10"> <div class="flex flex-col items-center justify-between w-full pt-10">
<LightDarkButton class="absolute z-10 top-2 right-2"/>
<img <img
id="logo-crater" id="logo-crater"
src="/img/crater-logo.png" src="/img/crater-logo.png"
@ -29,6 +30,7 @@ import Step7CompanyInfo from './Step7CompanyInfo.vue'
import Step8CompanyPreferences from './Step8CompanyPreferences.vue' import Step8CompanyPreferences from './Step8CompanyPreferences.vue'
import { useInstallationStore } from '@/scripts/admin/stores/installation' import { useInstallationStore } from '@/scripts/admin/stores/installation'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import LightDarkButton from '@/scripts/components/LightDarkButton.vue'
export default { export default {
components: { components: {
@ -40,6 +42,7 @@ export default {
step_6: Step6AccountSettings, step_6: Step6AccountSettings,
step_7: Step7CompanyInfo, step_7: Step7CompanyInfo,
step_8: Step8CompanyPreferences, step_8: Step8CompanyPreferences,
LightDarkButton
}, },
setup() { setup() {

View File

@ -220,7 +220,7 @@
<template #cell-invoice_number="{ row }"> <template #cell-invoice_number="{ row }">
<router-link <router-link
:to="{ path: `invoices/${row.data.id}/view` }" :to="{ path: `invoices/${row.data.id}/view` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.invoice_number }} {{ row.data.invoice_number }}
</router-link> </router-link>

View File

@ -153,7 +153,7 @@
<template #cell-name="{ row }"> <template #cell-name="{ row }">
<router-link <router-link
:to="{ path: `items/${row.data.id}/edit` }" :to="{ path: `items/${row.data.id}/edit` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.name }} {{ row.data.name }}
</router-link> </router-link>

View File

@ -158,7 +158,7 @@
<template #cell-payment_number="{ row }"> <template #cell-payment_number="{ row }">
<router-link <router-link
:to="{ path: `payments/${row.data.id}/view` }" :to="{ path: `payments/${row.data.id}/view` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.payment_number }} {{ row.data.payment_number }}
</router-link> </router-link>

View File

@ -204,7 +204,7 @@
:text="row.data.customer.name" :text="row.data.customer.name"
:length="30" :length="30"
tag="span" tag="span"
class="font-medium text-primary-500 flex flex-col" class="font-medium text-primary-500 flex flex-col dark:text-primary-400"
/> />
<BaseText <BaseText

View File

@ -92,7 +92,7 @@
<tr <tr
v-for="(ext, i) in requiredExtentions" v-for="(ext, i) in requiredExtentions"
:key="i" :key="i"
class="p-2 border-2 border-gray-200" class="p-2 border-2 border-gray-200 dark:border-gray-600"
> >
<td width="70%" class="p-2 text-sm truncate"> <td width="70%" class="p-2 text-sm truncate">
{{ i }} {{ i }}
@ -121,7 +121,7 @@
{{ $t('settings.update_app.update_progress') }} {{ $t('settings.update_app.update_progress') }}
</h6> </h6>
<p <p
class="mb-8 text-sm leading-snug text-gray-500" class="mb-8 text-sm leading-snug text-gray-500 dark:text-gray-400"
style="max-width: 480px" style="max-width: 480px"
> >
{{ $t('settings.update_app.progress_text') }} {{ $t('settings.update_app.progress_text') }}
@ -135,11 +135,11 @@
<li <li
v-for="step in updateSteps" v-for="step in updateSteps"
:key="step.stepUrl" :key="step.stepUrl"
class="flex justify-between w-full py-3 border-b border-gray-200 border-solid last:border-b-0" class="flex justify-between w-full py-3 border-b border-gray-200 dark:border-gray-600 border-solid last:border-b-0"
> >
<p class="m-0 text-sm leading-8">{{ $t(step.translationKey) }}</p> <p class="m-0 text-sm dark:text-gray-300 leading-8">{{ $t(step.translationKey) }}</p>
<div class="flex flex-row items-center"> <div class="flex flex-row items-center">
<span v-if="step.time" class="mr-3 text-xs text-gray-500"> <span v-if="step.time" class="mr-3 text-xs text-gray-500 dark:text-gray-300">
{{ step.time }} {{ step.time }}
</span> </span>
<span <span
@ -275,7 +275,7 @@ function statusClass(step) {
case 'running': case 'running':
return 'text-blue-400 bg-blue-100' return 'text-blue-400 bg-blue-100'
case 'error': case 'error':
return 'text-danger bg-red-200' return 'text-red-400 bg-red-200'
default: default:
return '' return ''
} }

View File

@ -158,7 +158,7 @@
<template #cell-name="{ row }"> <template #cell-name="{ row }">
<router-link <router-link
:to="{ path: `users/${row.data.id}/edit` }" :to="{ path: `users/${row.data.id}/edit` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.name }} {{ row.data.name }}
</router-link> </router-link>

View File

@ -14,7 +14,7 @@
" "
@click="onChange" @click="onChange"
> >
<BaseIcon v-if="!globalStore.isDarkModeOn" class="h-5 w-5 text-black" name="SunIcon" /> <BaseIcon v-if="!globalStore.isDarkModeOn" class="h-5 w-5 text-yellow-500" name="SunIcon" />
<BaseIcon v-else class="h-5 w-5 text-white" name="MoonIcon" /> <BaseIcon v-else class="h-5 w-5 text-white" name="MoonIcon" />
</button> </button>
</template> </template>

View File

@ -45,7 +45,7 @@
</div> </div>
<div class="hidden sm:ml-6 sm:flex sm:items-center"> <div class="hidden sm:ml-6 sm:flex sm:items-center">
<!-- Dark mode Toggle --> <!-- Dark mode Toggle -->
<CustomerLightDarkButton/> <LightDarkButton/>
<!-- Profile dropdown --> <!-- Profile dropdown -->
@ -151,7 +151,7 @@
</div> </div>
</div> </div>
<!-- Dark mode Toggle --> <!-- Dark mode Toggle -->
<CustomerLightDarkButton/> <LightDarkButton/>
</div> </div>
<div class="mt-3 space-y-1"> <div class="mt-3 space-y-1">
<router-link <router-link
@ -178,7 +178,7 @@ import { useRoute, useRouter } from 'vue-router'
import { ref, watch, computed } from 'vue' import { ref, watch, computed } from 'vue'
import { useGlobalStore } from '@/scripts/customer/stores/global' import { useGlobalStore } from '@/scripts/customer/stores/global'
import MainLogo from '@/scripts/components/icons/MainLogo.vue' import MainLogo from '@/scripts/components/icons/MainLogo.vue'
import CustomerLightDarkButton from '@/scripts/components/CustomerLightDarkButton.vue' import LightDarkButton from '@/scripts/components/LightDarkButton.vue'
import { import {
Disclosure, Disclosure,
DisclosureButton, DisclosureButton,

View File

@ -26,7 +26,7 @@
:to="{ :to="{
path: `/${globalStore.companySlug}/customer/invoices/${row.data.id}/view`, path: `/${globalStore.companySlug}/customer/invoices/${row.data.id}/view`,
}" }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.invoice_number }} {{ row.data.invoice_number }}
</router-link> </router-link>
@ -73,7 +73,7 @@
:to="{ :to="{
path: `/${globalStore.companySlug}/customer/estimates/${row.data.id}/view`, path: `/${globalStore.companySlug}/customer/estimates/${row.data.id}/view`,
}" }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.estimate_number }} {{ row.data.estimate_number }}
</router-link> </router-link>

View File

@ -100,7 +100,7 @@
<template #cell-estimate_number="{ row }"> <template #cell-estimate_number="{ row }">
<router-link <router-link
:to="{ path: `estimates/${row.data.id}/view` }" :to="{ path: `estimates/${row.data.id}/view` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.estimate_number }} {{ row.data.estimate_number }}
</router-link> </router-link>

View File

@ -95,7 +95,7 @@
<template #cell-invoice_number="{ row }"> <template #cell-invoice_number="{ row }">
<router-link <router-link
:to="{ path: `invoices/${row.data.id}/view` }" :to="{ path: `invoices/${row.data.id}/view` }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.invoice_number }} {{ row.data.invoice_number }}
</router-link> </router-link>

View File

@ -78,7 +78,7 @@
:to="{ :to="{
path: `payments/${row.data.id}/view`, path: `payments/${row.data.id}/view`,
}" }"
class="font-medium text-primary-500" class="font-medium text-primary-500 dark:text-primary-400"
> >
{{ row.data.payment_number }} {{ row.data.payment_number }}
</router-link> </router-link>