legalgonews/legalgo-FE-reactrouter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: legalgonews:cfc864cb4307597e3c0816e35e4caed8db9f35f3
Branches Tags
legalgonews:master
legalgonews:dev
..
compare: legalgonews:e76b89277c7ef9b11c37147f9bff68ac171459c8
Branches Tags
legalgonews:dev
legalgonews:master

No commits in common. "cfc864cb4307597e3c0816e35e4caed8db9f35f3" and "e76b89277c7ef9b11c37147f9bff68ac171459c8" have entirely different histories.
cfc864cb43 ... e76b89277c

3 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
app/apis/news/register.ts
View File

@ -11,10 +11,10 @@ const loginResponseSchema = z.object({
export const newsRegisterRequest = async (payload: TRegisterSchema) => { export const newsRegisterRequest = async (payload: TRegisterSchema) => {
try { try {
const { subscribe_plan, ...restPayload } = payload const { subscription, ...restPayload } = payload
const transformedPayload = { const transformedPayload = {
...restPayload, ...restPayload,
subscribe_plan_id: subscribe_plan, subscribe_plan_id: subscription,
} }
const { data } = await HttpServer().post( const { data } = await HttpServer().post(
'/api/user/register', '/api/user/register',

2
app/layouts/news/form-login.tsx
View File

@ -45,7 +45,7 @@ export const FormLogin = () => {
setError(undefined) setError(undefined)
setIsLoginOpen(false) setIsLoginOpen(false)
if (fetcher.data?.user.subscribe_plan_code === 'basic') { if (fetcher.data?.user.subscribe_status === 'inactive') {
setIsInitSubscribeOpen(true) setIsInitSubscribeOpen(true)
} }
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps

6
app/layouts/news/form-register.tsx
View File

@ -16,7 +16,7 @@ export const registerSchema = z
password: z.string().min(6, 'Kata sandi minimal 6 karakter'), password: z.string().min(6, 'Kata sandi minimal 6 karakter'),
rePassword: z.string().min(6, 'Kata sandi minimal 6 karakter'), rePassword: z.string().min(6, 'Kata sandi minimal 6 karakter'),
phone: z.string().min(10, 'No telepon tidak valid'), phone: z.string().min(10, 'No telepon tidak valid'),
subscribe_plan: z.string().min(1, 'Pilih salah satu subscription'), subscription: z.string().min(1, 'Pilih salah satu subscription'),
}) })
.refine((field) => field.password === field.rePassword, { .refine((field) => field.password === field.rePassword, {
message: 'Kata sandi tidak sama', message: 'Kata sandi tidak sama',
@ -94,8 +94,8 @@ export const FormRegister = () => {
/> />
<Select <Select
id="subscribe_plan" id="subscription"
name="subscribe_plan" name="subscription"
label="Subscription" label="Subscription"
placeholder="Pilih Subscription" placeholder="Pilih Subscription"
options={loaderData?.subscriptionsData} options={loaderData?.subscriptionsData}