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

Compare commits

base: legalgonews:8aeb7a3197d5d20ee5bc7816efb39345c83ed4a6
Branches Tags
legalgonews:master
legalgonews:dev
...
compare: legalgonews:1758b7837ed37acab832f1137680fdff630d23c5
Branches Tags
legalgonews:dev
legalgonews:master

3 Commits
8aeb7a3197 ... 1758b7837e

Author SHA1 Message Date
Ardeman
1758b7837e fix: update variable names in Combobox component for clarity 2025-03-04 12:03:02 +08:00
Ardeman
dc794a29d3 feat: enhance layout and button functionality in subscriptions page 2025-03-04 09:53:13 +08:00
Ardeman
6d8e352ffc feat: refactor login handling to use staff-login page and update related imports 2025-03-04 09:44:09 +08:00
7 changed files with 131 additions and 103 deletions
Show Stats Expand all files Collapse all files

2
app/apis/admin/login-staff.ts
View File

@ -1,7 +1,7 @@
import { z } from 'zod' import { z } from 'zod'
import { HttpServer } from '~/libs/http-server' import { HttpServer } from '~/libs/http-server'
import type { TLoginSchema } from '~/pages/admin-login' import type { TLoginSchema } from '~/pages/staff-login'
const loginResponseSchema = z.object({ const loginResponseSchema = z.object({
data: z.object({ data: z.object({

8
app/components/ui/combobox.tsx
View File

@ -96,14 +96,14 @@ export const Combobox = <TFormValues extends Record<string, unknown>>(
'bg-white transition duration-100 ease-in data-[leave]:data-[closed]:opacity-0', 'bg-white transition duration-100 ease-in data-[leave]:data-[closed]:opacity-0',
)} )}
> >
{filteredOptions?.map((person) => ( {filteredOptions?.map((option) => (
<ComboboxOption <ComboboxOption
key={person.id} key={option.id}
value={person} value={option}
className="group flex cursor-default items-center gap-2 rounded-lg px-3 py-1.5 select-none data-[focus]:bg-white/10" className="group flex cursor-default items-center gap-2 rounded-lg px-3 py-1.5 select-none data-[focus]:bg-white/10"
> >
<CheckIcon className="invisible size-4 group-data-[selected]:visible" /> <CheckIcon className="invisible size-4 group-data-[selected]:visible" />
<div className="text-sm/6">{person.name}</div> <div className="text-sm/6">{option.name}</div>
</ComboboxOption> </ComboboxOption>
))} ))}
</ComboboxOptions> </ComboboxOptions>

61
app/pages/dashboard-contents/index.tsx
View File

@ -1,6 +1,7 @@
import { Field, Input, Label, Select } from '@headlessui/react' import { Field, Input, Label, Select } from '@headlessui/react'
import DT from 'datatables.net-dt' import DT from 'datatables.net-dt'
import DataTable from 'datatables.net-react' import DataTable from 'datatables.net-react'
import { Link } from 'react-router'
import { SearchIcon } from '~/components/icons/search' import { SearchIcon } from '~/components/icons/search'
import { Button } from '~/components/ui/button' import { Button } from '~/components/ui/button'
@ -57,33 +58,45 @@ export const ContentsPage = () => {
return ( return (
<div className="relative"> <div className="relative">
<TitleDashboard title="Konten" /> <TitleDashboard title="Konten" />
<div className="mb-8 flex items-center gap-5 rounded-lg bg-gray-50 text-[#363636]"> <div className="mb-8 flex items-end justify-between">
<div className="w-[400px]"> <div className="flex items-center gap-5 rounded-lg bg-gray-50 text-[#363636]">
<Field> <div className="w-[400px]">
<Label className="mb-2 block text-sm font-medium">Cari User</Label> <Field>
<div className="relative"> <Label className="mb-2 block text-sm font-medium">
<Input Cari User
type="text" </Label>
placeholder="Cari Nama" <div className="relative">
className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none" <Input
/> type="text"
<div className="absolute inset-y-0 right-0 flex items-center pr-3"> placeholder="Cari Nama"
<SearchIcon className="h-5 w-5" /> className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none"
/>
<div className="absolute inset-y-0 right-0 flex items-center pr-3">
<SearchIcon className="h-5 w-5" />
</div>
</div> </div>
</div> </Field>
</Field> </div>
</div>
<div className="w-[235px]"> <div className="w-[235px]">
<Field> <Field>
<Label className="mb-2 block text-sm font-medium">Status</Label> <Label className="mb-2 block text-sm font-medium">Status</Label>
<Select className="w-full rounded-lg bg-white p-2 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none"> <Select className="w-full rounded-lg bg-white p-2 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none">
<option>Pilih Status</option> <option>Pilih Status</option>
<option>Aktif</option> <option>Aktif</option>
<option>Nonaktif</option> <option>Nonaktif</option>
</Select> </Select>
</Field> </Field>
</div>
</div> </div>
<Button
as={Link}
to="/lg-admin/contents/create"
className="text-md rounded-md"
size="lg"
>
Create New
</Button>
</div> </div>
<UiTable <UiTable

159
app/pages/dashboard-subscriptions/index.tsx
View File

@ -52,44 +52,50 @@ export const SubscriptionsPage = () => {
return ( return (
<div className="relative"> <div className="relative">
<TitleDashboard title="Subscription" /> <TitleDashboard title="Subscription" />
<Button
className="float-right mt-7 h-10 w-[160px] rounded-md"
onClick={switchView}
>
{SubscribtionOpen ? 'Subscriptions' : 'Save'}
</Button>
{SubscribtionOpen && ( {SubscribtionOpen && (
<> <>
<div className="mb-8 flex items-center gap-5 rounded-lg bg-gray-50 text-[#363636]"> <div className="mb-8 flex items-end justify-between">
<div className="w-[400px]"> <div className="flex items-center gap-5 rounded-lg bg-gray-50 text-[#363636]">
<Field> <div className="w-[400px]">
<Label className="mb-2 block text-sm font-medium"> <Field>
Cari User <Label className="mb-2 block text-sm font-medium">
</Label> Cari User
<div className="relative"> </Label>
<Input <div className="relative">
type="text" <Input
placeholder="Cari Nama" type="text"
className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none" placeholder="Cari Nama"
/> className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none"
<div className="absolute inset-y-0 right-0 flex items-center pr-3"> />
<SearchIcon className="h-5 w-5" /> <div className="absolute inset-y-0 right-0 flex items-center pr-3">
<SearchIcon className="h-5 w-5" />
</div>
</div> </div>
</div> </Field>
</Field> </div>
<div className="w-[235px]">
<Field>
<Label className="mb-2 block text-sm font-medium">
Status
</Label>
<Select className="w-full rounded-lg bg-white p-2 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none">
<option>Pilih Status</option>
<option>Aktif</option>
<option>Nonaktif</option>
</Select>
</Field>
</div>
</div> </div>
<div className="w-[235px]"> <Button
<Field> className="rounded-md"
<Label className="mb-2 block text-sm font-medium">Status</Label> size="lg"
<Select className="w-full rounded-lg bg-white p-2 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none"> onClick={switchView}
<option>Pilih Status</option> >
<option>Aktif</option> Subscription Settings
<option>Nonaktif</option> </Button>
</Select>
</Field>
</div>
</div> </div>
<UiTable <UiTable
@ -108,48 +114,57 @@ export const SubscriptionsPage = () => {
{!SubscribtionOpen && ( {!SubscribtionOpen && (
<> <>
<div className="mb-8 flex items-end gap-5 rounded-lg bg-gray-50 text-[#363636]"> <div className="mb-8 flex items-end justify-between">
<div className="w-[300px]"> <div className="flex items-end gap-5 rounded-lg bg-gray-50 text-[#363636]">
<Field> <div className="w-[300px]">
<Label className="mb-2 block text-sm font-medium"> <Field>
Subscription Name <Label className="mb-2 block text-sm font-medium">
</Label> Subscription Name
<div className="relative"> </Label>
<Input <div className="relative">
type="text" <Input
placeholder="Subscription Name" type="text"
className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none" placeholder="Subscription Name"
/> className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none"
</div> />
</Field> </div>
</div> </Field>
<div className="w-[300px]"> </div>
<Field> <div className="w-[300px]">
<Label className="mb-2 block text-sm font-medium"> <Field>
Subscription Price <Label className="mb-2 block text-sm font-medium">
</Label> Subscription Price
<div className="relative"> </Label>
<Input <div className="relative">
type="text" <Input
placeholder="Subscription Price" type="text"
className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none" placeholder="Subscription Price"
/> className="w-full rounded-lg bg-white p-2 pr-10 pl-4 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none"
</div> />
</Field> </div>
</div> </Field>
</div>
<div className="w-[300px]"> <div className="w-[300px]">
<Field> <Field>
<Label className="mb-2 block text-sm font-medium"> <Label className="mb-2 block text-sm font-medium">
Subscription Length (Days) Subscription Length (Days)
</Label> </Label>
<Input <Input
type="text" type="text"
placeholder="Subscription Length (Days)" placeholder="Subscription Length (Days)"
className="w-full rounded-lg bg-white p-2 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none" className="w-full rounded-lg bg-white p-2 shadow focus:ring-1 focus:ring-[#2E2F7C] focus:outline-none"
></Input> ></Input>
</Field> </Field>
</div>
</div> </div>
<Button
className="rounded-md"
size="lg"
onClick={switchView}
>
Save
</Button>
</div> </div>
<UiTable <UiTable

0
app/pages/admin-login/index.tsx → app/pages/staff-login/index.tsx
View File

2
app/routes/_admin.lg-admin._auth.login.tsx
View File

@ -1,4 +1,4 @@
import { AdminLoginPage } from '~/pages/admin-login' import { AdminLoginPage } from '~/pages/staff-login'
const AuthLayout = () => <AdminLoginPage /> const AuthLayout = () => <AdminLoginPage />
export default AuthLayout export default AuthLayout

2
app/routes/actions.admin.login.ts
View File

@ -5,7 +5,7 @@ import { XiorError } from 'xior'
import { getStaff } from '~/apis/admin/get-staff' import { getStaff } from '~/apis/admin/get-staff'
import { staffLoginRequest } from '~/apis/admin/login-staff' import { staffLoginRequest } from '~/apis/admin/login-staff'
import { loginSchema, type TLoginSchema } from '~/pages/admin-login' import { loginSchema, type TLoginSchema } from '~/pages/staff-login'
import { generateStaffTokenCookie } from '~/utils/token' import { generateStaffTokenCookie } from '~/utils/token'
import type { Route } from './+types/actions.login' import type { Route } from './+types/actions.login'