MesbahiOR
/
Mesbahi-Admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: update site URL in environment config, adjust routing for shop visits, and modify shop validation schema

master
sina_sajjadi 2 weeks ago
parent
1bfb7fe9aa
commit
92f12436bf
7 changed files with 216 additions and 215 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env
  2. 5
      src/components/shop/shop-form.tsx
  3. 4
      src/components/shop/shop-validation-schema.ts
  4. 2
      src/config/routes.ts
  5. 3
      src/data/client/curd-factory.ts
  6. 5
      src/pages/shop/index.tsx
  7. 354
      src/settings/site.settings.ts

2
.env
View File

@ -4,7 +4,7 @@ NEXT_PUBLIC_AVAILABLE_LANGUAGES=en
NEXT_PUBLIC_ENABLE_MULTI_LANG=true NEXT_PUBLIC_ENABLE_MULTI_LANG=true
NODE_ENV=production NODE_ENV=production
NEXT_PUBLIC_REST_API_ENDPOINT=https://mesbahi.nwhco.ir/api NEXT_PUBLIC_REST_API_ENDPOINT=https://mesbahi.nwhco.ir/api
NEXT_PUBLIC_SITE_URL=https://mesbahi.nwhco.ir:3000/
NEXT_PUBLIC_SITE_URL=https://mesbahi.nwhco.ir/
# NEXT_PUBLIC_BASE_PATH: '/dashboard' # NEXT_PUBLIC_BASE_PATH: '/dashboard'
NEXT_PUBLIC_AUTH_TOKEN_KEY=AUTH_CRED NEXT_PUBLIC_AUTH_TOKEN_KEY=AUTH_CRED

5
src/components/shop/shop-form.tsx
View File

@ -250,6 +250,7 @@ const ShopForm = ({ initialValues }: { initialValues?: Shop }) => {
return true; return true;
}; };
console.log(errors);
return ( return (
<> <>
@ -506,14 +507,14 @@ const ShopForm = ({ initialValues }: { initialValues?: Shop }) => {
control={control} control={control}
error={t(errors.phone_number?.message!)} error={t(errors.phone_number?.message!)}
/> />
<Input
{/* <Input
label={t('form:input-label-website')} label={t('form:input-label-website')}
{...register('website')} {...register('website')}
variant="outline" variant="outline"
className="mb-5" className="mb-5"
error={t(errors.website?.message!)} error={t(errors.website?.message!)}
required required
/>
/> */}
</Card> </Card>
</div> </div>

4
src/components/shop/shop-validation-schema.ts
View File

@ -31,10 +31,6 @@ export const shopValidationSchema = yup.object().shape({
.string() .string()
.required('form:error-contact-number-required') .required('form:error-contact-number-required')
.matches(phoneRegExp, 'form:error-contact-number-valid-required'), .matches(phoneRegExp, 'form:error-contact-number-valid-required'),
website: yup
.string()
.required('form:error-website-required')
.matches(URLRegExp, 'form:error-url-valid-required'),
shopMaintenance: yup shopMaintenance: yup
.object() .object()
.when('isShopUnderMaintenance', { .when('isShopUnderMaintenance', {

2
src/config/routes.ts
View File

@ -156,7 +156,7 @@ export const Routes = {
: `/${language}/products/${slug}/translate`; : `/${language}/products/${slug}/translate`;
}, },
}, },
visitStore: (slug: string) => `${process.env.NEXT_PUBLIC_SHOP_URL}/shops/${slug}`,
visitStore: (slug: string) => `${process.env.NEXT_PUBLIC_SITE_URL}/shops/${slug}`,
vendorRequestForFlashSale: { vendorRequestForFlashSale: {
...routesFactory('/flash-sale/vendor-request'), ...routesFactory('/flash-sale/vendor-request'),
}, },

3
src/data/client/curd-factory.ts
View File

@ -20,7 +20,10 @@ export function crudFactory<Type, QueryParams extends LanguageParam, InputType>(
return HttpClient.get<Type>(`${endpoint}/${slug}`, { language }); return HttpClient.get<Type>(`${endpoint}/${slug}`, { language });
}, },
create(data: InputType) { create(data: InputType) {
console.log(endpoint , "out if");
if (endpoint === API_ENDPOINTS.SHOPS) { if (endpoint === API_ENDPOINTS.SHOPS) {
console.log(endpoint , "in if");
return HttpClient.post<Type>(API_ENDPOINTS.SHOPS, data); return HttpClient.post<Type>(API_ENDPOINTS.SHOPS, data);
} }

5
src/pages/shop/index.tsx
View File

@ -1,7 +1,8 @@
import { EditFillIcon } from '@/components/icons/edit'; import { EditFillIcon } from '@/components/icons/edit';
import { MapPinIconWithPlatform } from '@/components/icons/map-pin'; import { MapPinIconWithPlatform } from '@/components/icons/map-pin';
import { PhoneIconNew } from '@/components/icons/phone'; import { PhoneIconNew } from '@/components/icons/phone';
import ShopLayout from '@/components/layouts/shop';
import Layout from '@/components/layouts/admin';
import ErrorMessage from '@/components/ui/error-message'; import ErrorMessage from '@/components/ui/error-message';
import Loader from '@/components/ui/loader/loader'; import Loader from '@/components/ui/loader/loader';
import { Routes } from '@/config/routes'; import { Routes } from '@/config/routes';
@ -294,7 +295,7 @@ export default function ShopPage() {
</div> </div>
); );
} }
ShopPage.Layout = ShopLayout;
ShopPage.Layout = Layout;
// ShopPage.authenticate = { // ShopPage.authenticate = {
// permissions: adminOwnerAndStaffOnly, // permissions: adminOwnerAndStaffOnly,
// }; // };

354
src/settings/site.settings.ts
View File

@ -180,26 +180,26 @@ export const siteSettings = {
label: 'text-inventory', label: 'text-inventory',
icon: 'InventoryIcon', icon: 'InventoryIcon',
}, },
{
href: Routes.type.list,
label: 'text-groups',
icon: 'HomeIcon',
},
// {
// href: Routes.type.list,
// label: 'text-groups',
// icon: 'HomeIcon',
// },
{ {
href: Routes.category.list, href: Routes.category.list,
label: 'sidebar-nav-item-categories', label: 'sidebar-nav-item-categories',
icon: 'CategoriesIcon', icon: 'CategoriesIcon',
}, },
{
href: Routes.tag.list,
label: 'sidebar-nav-item-tags',
icon: 'TagIcon',
},
{
href: Routes.attribute.list,
label: 'sidebar-nav-item-attributes',
icon: 'AttributeIcon',
},
// {
// href: Routes.tag.list,
// label: 'sidebar-nav-item-tags',
// icon: 'TagIcon',
// },
// {
// href: Routes.attribute.list,
// label: 'sidebar-nav-item-attributes',
// icon: 'AttributeIcon',
// },
// { // {
// href: Routes.manufacturer.list, // href: Routes.manufacturer.list,
// label: 'sidebar-nav-item-manufacturers', // label: 'sidebar-nav-item-manufacturers',
@ -223,21 +223,21 @@ export const siteSettings = {
label: 'sidebar-subscription', label: 'sidebar-subscription',
icon: 'TaxesIcon', icon: 'TaxesIcon',
}, },
{
href: Routes.tax.list,
label: 'sidebar-nav-item-taxes',
icon: 'TaxesIcon',
},
// {
// href: Routes.tax.list,
// label: 'sidebar-nav-item-taxes',
// icon: 'TaxesIcon',
// },
{ {
href: Routes.shipping.list, href: Routes.shipping.list,
label: 'sidebar-nav-item-shippings', label: 'sidebar-nav-item-shippings',
icon: 'ShippingsIcon', icon: 'ShippingsIcon',
}, },
{
href: Routes.withdraw.list,
label: 'sidebar-nav-item-withdraws',
icon: 'WithdrawIcon',
},
// {
// href: Routes.withdraw.list,
// label: 'sidebar-nav-item-withdraws',
// icon: 'WithdrawIcon',
// },
// { // {
// href: '', // href: '',
// label: 'sidebar-nav-item-refunds', // label: 'sidebar-nav-item-refunds',
@ -283,11 +283,11 @@ export const siteSettings = {
label: 'sidebar-nav-item-orders', label: 'sidebar-nav-item-orders',
icon: 'OrdersIcon', icon: 'OrdersIcon',
}, },
{
href: Routes.order.create,
label: 'sidebar-nav-item-create-order',
icon: 'CreateOrderIcon',
},
// {
// href: Routes.order.create,
// label: 'sidebar-nav-item-create-order',
// icon: 'CreateOrderIcon',
// },
{ {
href: Routes.transaction, href: Routes.transaction,
label: 'text-transactions', label: 'text-transactions',
@ -311,60 +311,60 @@ export const siteSettings = {
], ],
}, },
layout: {
href: '',
label: 'text-page-control',
icon: 'SettingsIcon',
childMenu: [
{
href: '',
label: 'text-faqs',
icon: 'FaqIcon',
childMenu: [
{
href: Routes.faqs.list,
label: 'text-all-faqs',
icon: 'FaqIcon',
},
{
href: Routes.faqs.create,
label: 'text-new-faq',
icon: 'TypesIcon',
},
],
},
{
href: '',
label: 'text-terms-conditions',
icon: 'TermsIcon',
childMenu: [
{
href: Routes.termsAndCondition.list,
label: 'text-all-terms',
icon: 'TermsIcon',
},
{
href: Routes.termsAndCondition.create,
label: 'text-new-terms',
icon: 'TermsIcon',
},
],
},
{
href: Routes.becomeSeller,
label: 'Become a seller Page',
icon: 'TermsIcon',
},
// layout: {
// href: '',
// label: 'text-page-control',
// icon: 'SettingsIcon',
// childMenu: [
// {
// href: '',
// label: 'text-faqs',
// icon: 'FaqIcon',
// childMenu: [
// {
// href: Routes.faqs.list,
// label: 'text-all-faqs',
// icon: 'FaqIcon',
// },
// {
// href: Routes.faqs.create,
// label: 'text-new-faq',
// icon: 'TypesIcon',
// },
// ],
// },
// {
// href: '',
// label: 'text-terms-conditions',
// icon: 'TermsIcon',
// childMenu: [
// {
// href: Routes.termsAndCondition.list,
// label: 'text-all-terms',
// icon: 'TermsIcon',
// },
// {
// href: Routes.termsAndCondition.create,
// label: 'text-new-terms',
// icon: 'TermsIcon',
// },
// ],
// },
// {
// href: Routes.becomeSeller,
// label: 'Become a seller Page',
// icon: 'TermsIcon',
// },
// { // {
// href: Routes.order.create, // href: Routes.order.create,
// label: 'sidebar-nav-item-create-order', // label: 'sidebar-nav-item-create-order',
// icon: 'CreateOrderIcon', // icon: 'CreateOrderIcon',
// }, // },
{
href: Routes.transaction,
label: 'text-transactions',
icon: 'TransactionsIcon',
},
// {
// href: Routes.transaction,
// label: 'text-transactions',
// icon: 'TransactionsIcon',
// },
// { // {
// href: '', // href: '',
// label: 'Order tracking', // label: 'Order tracking',
@ -380,65 +380,65 @@ export const siteSettings = {
// label: 'Cancelation policies', // label: 'Cancelation policies',
// icon: 'CancelationIcon', // icon: 'CancelationIcon',
// }, // },
],
},
// ],
// },
user: {
href: '',
label: 'text-user-control',
icon: 'SettingsIcon',
childMenu: [
{
href: Routes.user.list,
label: 'text-all-users',
icon: 'UsersIcon',
},
{
href: Routes.adminList,
label: 'text-admin-list',
icon: 'AdminListIcon',
},
{
href: '',
label: 'text-vendors',
icon: 'VendorsIcon',
childMenu: [
{
href: Routes.vendorList,
label: 'text-all-vendors',
icon: 'UsersIcon',
},
{
href: Routes.pendingVendorList,
label: 'text-pending-vendors',
icon: 'UsersIcon',
},
],
},
{
href: '',
label: 'sidebar-nav-item-staffs',
icon: 'StaffIcon',
childMenu: [
{
href: Routes.myStaffs,
label: 'sidebar-nav-item-my-staffs',
icon: 'UsersIcon',
},
{
href: Routes.vendorStaffs,
label: 'sidebar-nav-item-vendor-staffs',
icon: 'UsersIcon',
},
],
},
{
href: Routes.customerList,
label: 'text-customers',
icon: 'CustomersIcon',
},
],
},
// user: {
// href: '',
// label: 'text-user-control',
// icon: 'SettingsIcon',
// childMenu: [
// {
// href: Routes.user.list,
// label: 'text-all-users',
// icon: 'UsersIcon',
// },
// {
// href: Routes.adminList,
// label: 'text-admin-list',
// icon: 'AdminListIcon',
// },
// {
// href: '',
// label: 'text-vendors',
// icon: 'VendorsIcon',
// childMenu: [
// {
// href: Routes.vendorList,
// label: 'text-all-vendors',
// icon: 'UsersIcon',
// },
// {
// href: Routes.pendingVendorList,
// label: 'text-pending-vendors',
// icon: 'UsersIcon',
// },
// ],
// },
// {
// href: '',
// label: 'sidebar-nav-item-staffs',
// icon: 'StaffIcon',
// childMenu: [
// {
// href: Routes.myStaffs,
// label: 'sidebar-nav-item-my-staffs',
// icon: 'UsersIcon',
// },
// {
// href: Routes.vendorStaffs,
// label: 'sidebar-nav-item-vendor-staffs',
// icon: 'UsersIcon',
// },
// ],
// },
// {
// href: Routes.customerList,
// label: 'text-customers',
// icon: 'CustomersIcon',
// },
// ],
// },
// feedback: { // feedback: {
// href: '', // href: '',
@ -458,57 +458,57 @@ export const siteSettings = {
// ], // ],
// }, // },
promotional: {
href: '',
label: 'text-promotional-management',
icon: 'SettingsIcon',
childMenu: [
{
href: '',
label: 'sidebar-nav-item-coupons',
icon: 'CouponsIcon',
childMenu: [
{
href: Routes.coupon.list,
label: 'text-all-coupons',
icon: 'CouponsIcon',
},
{
href: Routes.coupon.create,
label: 'text-new-coupon',
icon: 'CouponsIcon',
},
],
},
// {
// promotional: {
// href: '', // href: '',
// label: 'text-flash-sale',
// icon: 'FlashDealsIcon',
// label: 'text-promotional-management',
// icon: 'SettingsIcon',
// childMenu: [ // childMenu: [
// { // {
// href: Routes.flashSale.list,
// label: 'text-all-campaigns',
// icon: 'FlashDealsIcon',
// },
// href: '',
// label: 'sidebar-nav-item-coupons',
// icon: 'CouponsIcon',
// childMenu: [
// { // {
// href: Routes.flashSale.create,
// label: 'text-new-campaigns',
// icon: 'FlashDealsIcon',
// href: Routes.coupon.list,
// label: 'text-all-coupons',
// icon: 'CouponsIcon',
// }, // },
// { // {
// href: Routes.vendorRequestForFlashSale.list,
// label: 'Vendor requests',
// href: Routes.coupon.create,
// label: 'text-new-coupon',
// icon: 'CouponsIcon', // icon: 'CouponsIcon',
// }, // },
// ], // ],
// }, // },
// {
// href: '',
// label: 'Newsletter emails',
// icon: 'CouponsIcon',
// // {
// // href: '',
// // label: 'text-flash-sale',
// // icon: 'FlashDealsIcon',
// // childMenu: [
// // {
// // href: Routes.flashSale.list,
// // label: 'text-all-campaigns',
// // icon: 'FlashDealsIcon',
// // },
// // {
// // href: Routes.flashSale.create,
// // label: 'text-new-campaigns',
// // icon: 'FlashDealsIcon',
// // },
// // {
// // href: Routes.vendorRequestForFlashSale.list,
// // label: 'Vendor requests',
// // icon: 'CouponsIcon',
// // },
// // ],
// // },
// // {
// // href: '',
// // label: 'Newsletter emails',
// // icon: 'CouponsIcon',
// // },
// ],
// }, // },
],
},
// feature: { // feature: {
// href: '', // href: '',

Write Preview
Loading…
Cancel
Save