fix bug design
This commit is contained in:
+8
-4
@@ -67,7 +67,7 @@ if (!self.define) {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
define(['./workbox-706c6701'], (function (workbox) { 'use strict';
|
define(['./workbox-e7681877'], (function (workbox) { 'use strict';
|
||||||
|
|
||||||
self.skipWaiting();
|
self.skipWaiting();
|
||||||
workbox.clientsClaim();
|
workbox.clientsClaim();
|
||||||
@@ -82,15 +82,19 @@ define(['./workbox-706c6701'], (function (workbox) { 'use strict';
|
|||||||
"revision": "3ca0b8505b4bec776b69afdba2768812"
|
"revision": "3ca0b8505b4bec776b69afdba2768812"
|
||||||
}, {
|
}, {
|
||||||
"url": "index.html",
|
"url": "index.html",
|
||||||
"revision": "0.fjjapfr8ogo"
|
"revision": "0.2fod7b7jhdg"
|
||||||
}], {});
|
}], {});
|
||||||
workbox.cleanupOutdatedCaches();
|
workbox.cleanupOutdatedCaches();
|
||||||
workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
|
workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
|
||||||
allowlist: [/^\/$/]
|
allowlist: [/^\/$/]
|
||||||
}));
|
}));
|
||||||
workbox.registerRoute(/^https:\/\/api\.example\.com\//, new workbox.NetworkFirst({
|
workbox.registerRoute(/^https:\/\/console\.danakcorp\.com\//, new workbox.NetworkFirst({
|
||||||
"cacheName": "api-cache",
|
"cacheName": "api-cache",
|
||||||
plugins: []
|
"networkTimeoutSeconds": 10,
|
||||||
|
plugins: [new workbox.ExpirationPlugin({
|
||||||
|
maxEntries: 50,
|
||||||
|
maxAgeSeconds: 86400
|
||||||
|
})]
|
||||||
}), 'GET');
|
}), 'GET');
|
||||||
|
|
||||||
}));
|
}));
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -28,7 +28,7 @@ const ServiceItem: FC<Props> = (props: Props) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className='mt-4 text-xs'>
|
<div className='mt-4 text-xs'>
|
||||||
<div className='font-extralight'>{item.description} </div>
|
<div className='font-extralight'>{item.title} </div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className='mt-4 flex-1 flex items-end'>
|
<div className='mt-4 flex-1 flex items-end'>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ type Props = {
|
|||||||
const ServiceSection: FC<Props> = (props: Props) => {
|
const ServiceSection: FC<Props> = (props: Props) => {
|
||||||
const { item } = props
|
const { item } = props
|
||||||
return (
|
return (
|
||||||
<div className='flex gap-4'>
|
<div className='flex flex-col items-center text-center gap-4'>
|
||||||
<div className='size-10 min-w-10 rounded-xl'>
|
<div className='size-10 min-w-10 rounded-xl'>
|
||||||
<img src={item.icon} alt={item.name} className='w-full h-full' />
|
<img src={item.icon} alt={item.name} className='w-full h-full' />
|
||||||
</div>
|
</div>
|
||||||
@@ -16,7 +16,7 @@ const ServiceSection: FC<Props> = (props: Props) => {
|
|||||||
<div className='text-sm'>
|
<div className='text-sm'>
|
||||||
{item.name}
|
{item.name}
|
||||||
</div>
|
</div>
|
||||||
<div className='text-xs text-description'>
|
<div className='text-xs mt-1 leading-5 text-description'>
|
||||||
{item.title}
|
{item.title}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -113,10 +113,10 @@ const BoxNewAccessbility: FC = () => {
|
|||||||
getMyservices.data?.data?.subscriptions?.map((item: MyServicesItem) => {
|
getMyservices.data?.data?.subscriptions?.map((item: MyServicesItem) => {
|
||||||
const active = getQuikAccess.data?.data?.quickAccesses?.find((o: any) => o.userSubscription?.id === item?.id) ? true : false
|
const active = getQuikAccess.data?.data?.quickAccesses?.find((o: any) => o.userSubscription?.id === item?.id) ? true : false
|
||||||
return (
|
return (
|
||||||
<div key={item.id} className='flex-1 xl:min-w-[40%] min-w-full flex justify-between items-center border-b border-[#8C90A3] border-opacity-30 py-2'>
|
<div key={item.id} className='flex-1 gap-2 xl:min-w-[40%] min-w-full flex justify-between items-center border-b border-[#8C90A3] border-opacity-30 py-2'>
|
||||||
<div className='flex gap-4'>
|
<div className='flex gap-4'>
|
||||||
<div className='size-10 rounded-xl overflow-hidden'>
|
<div className='size-10 rounded-xl overflow-hidden'>
|
||||||
<img src={item.plan?.service?.icon} className='size-full' />
|
<img src={item.plan?.service?.icon} className='size-full min-w-10' />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div className='text-sm'>
|
<div className='text-sm'>
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ import { useTranslation } from 'react-i18next'
|
|||||||
import Input from '../../components/Input'
|
import Input from '../../components/Input'
|
||||||
import ServiceSection from '../../components/ServiceSection'
|
import ServiceSection from '../../components/ServiceSection'
|
||||||
import StatusCircle from '../../components/StatusCircle'
|
import StatusCircle from '../../components/StatusCircle'
|
||||||
import { Link } from 'react-router-dom'
|
|
||||||
import { Pages } from '../../config/Pages'
|
|
||||||
import { useGetMyServices } from './hooks/useServiceData'
|
import { useGetMyServices } from './hooks/useServiceData'
|
||||||
import { MyServicesItem } from './types/ServiecTypes'
|
import { MyServicesItem } from './types/ServiecTypes'
|
||||||
import { useGetAds } from '../ads/hooks/useAdsData'
|
import { useGetAds } from '../ads/hooks/useAdsData'
|
||||||
@@ -61,30 +59,32 @@ const MyServices: FC = () => {
|
|||||||
:
|
:
|
||||||
getServices.data?.data?.subscriptions?.map((item: MyServicesItem) => {
|
getServices.data?.data?.subscriptions?.map((item: MyServicesItem) => {
|
||||||
return (
|
return (
|
||||||
<Link key={item.id} to={item.status === 'ACTIVE' ? Pages.services.detail + item.id : ''} className={clx(
|
<a target='_blank' key={item.id} href={item.status === 'ACTIVE' ? item.plan.service.link + item.id : '#'} className={clx(
|
||||||
'flex-1 min-w-[40%] xl:min-w-[20%] bg-white rounded-3xl p-6',
|
'flex-1 min-w-[40%] xl:min-w-[20%] bg-white rounded-3xl p-6 flex flex-col items-center self-stretch',
|
||||||
item.status === 'INACTIVE' && 'opacity-50'
|
item.status === 'INACTIVE' && 'opacity-50'
|
||||||
)}>
|
)}>
|
||||||
<ServiceSection
|
<div className="flex-grow">
|
||||||
item={{
|
<ServiceSection
|
||||||
author: item.plan.service.author,
|
item={{
|
||||||
createDate: item.plan?.service?.createDate,
|
author: item.plan.service.author,
|
||||||
createdAt: item.createdAt,
|
createDate: item.plan?.service?.createDate,
|
||||||
description: item.plan?.service?.title,
|
createdAt: item.createdAt,
|
||||||
icon: item.plan?.service.icon,
|
description: item.plan?.service?.title,
|
||||||
id: item.plan.service.id,
|
icon: item.plan?.service.icon,
|
||||||
isActive: item.plan.isActive,
|
id: item.plan.service.id,
|
||||||
isDanakSuggest: item.plan.service.isDanakSuggest,
|
isActive: item.plan.isActive,
|
||||||
link: item.plan.service.link,
|
isDanakSuggest: item.plan.service.isDanakSuggest,
|
||||||
metaDescription: item.plan.service.metaDescription,
|
link: item.plan.service.link,
|
||||||
name: item.plan.service.name,
|
metaDescription: item.plan.service.metaDescription,
|
||||||
serviceLanguage: item.plan.service.serviceLanguage,
|
name: item.plan.service.name,
|
||||||
softwareLanguage: item.plan.service.softwareLanguage,
|
serviceLanguage: item.plan.service.serviceLanguage,
|
||||||
updatedAt: item.plan.service.updatedAt,
|
softwareLanguage: item.plan.service.softwareLanguage,
|
||||||
userCount: item.plan.service?.userCount,
|
updatedAt: item.plan.service.updatedAt,
|
||||||
title: item.plan.service.title,
|
userCount: item.plan.service?.userCount,
|
||||||
}}
|
title: item.plan.service.title,
|
||||||
/>
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<div className='mt-6 flex gap-1 items-center'>
|
<div className='mt-6 flex gap-1 items-center'>
|
||||||
<StatusCircle
|
<StatusCircle
|
||||||
color={item.status === 'ACTIVE' ? '#00BA4B' : '#FF0000'}
|
color={item.status === 'ACTIVE' ? '#00BA4B' : '#FF0000'}
|
||||||
@@ -98,13 +98,13 @@ const MyServices: FC = () => {
|
|||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</a>
|
||||||
</Link>
|
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
<div className='flex-1 min-w-[40%] xl:min-w-[20%] px-6'></div>
|
||||||
|
<div className='flex-1 min-w-[40%] xl:min-w-[20%] px-6'></div>
|
||||||
|
<div className='flex-1 min-w-[40%] xl:min-w-[20%] px-6'></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user