Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Centralize Type Definitions #70

Merged
merged 2 commits into from
Nov 29, 2024
Merged

Centralize Type Definitions #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314cbd0
feat: add types folder
PedroCo3lho Nov 25, 2024
9b28391
feat: centralize types
PedroCo3lho Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions apps/web/src/app/user-profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,13 @@ import { useState } from "react";
import { ProfileCard } from "~/app/_components/features/ProfileCard";
import { ProfileOptions } from "~/app/_components/features/ProfileOptions";
import Main from "~/app/_components/layout/Main";

type Badge = "Lover" | "Contributor" | "Producer";

type UserProfile = {
name: string;
country: string;
memberSince: number;
thumbnailUrl: string;
badges: Badge[];
};
import type { UserProfileType } from "~/types";

export default function UserProfile() {
const { address } = useAccount();
const { disconnect } = useDisconnect();

const [user] = useState<UserProfile>({
const [user] = useState<UserProfileType>({
name: "John Doe",
country: "United States",
memberSince: 2020,
Expand Down
9 changes: 1 addition & 8 deletions apps/web/src/app/user/edit-profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@ import { ChevronRightIcon } from "@heroicons/react/24/outline";
import Image from "next/image";
import Link from "next/link";
import { ProfileOptionLayout } from "~/app/_components/features/ProfileOptionLayout";

type EditProfileOption = {
imgUrl: string;
label: string;
href: string;
customClass?: string;
iconColor?: string;
};
import type { EditProfileOption } from "~/types";

const editProfileOptions: EditProfileOption[] = [
{
Expand Down
16 changes: 3 additions & 13 deletions apps/web/src/app/user/my-claims/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,12 @@ import { useParams } from "next/navigation";
import React, { useEffect, useState } from "react";
import ProductStatusDetails from "~/app/_components/features/ProductStatusDetails";
import { ProfileOptionLayout } from "~/app/_components/features/ProfileOptionLayout";

type SaleDetails = {
productName: string;
status: string;
roast: string;
type: string;
quantity: string;
delivery: string;
totalPrice: string;
address?: string;
};
import type { SaleDetailsType } from "~/types";

export default function MySaleDetails() {
const { id: saleId } = useParams();

const [saleDetails, setSaleDetails] = useState<SaleDetails | null>(null);
const [saleDetails, setSaleDetails] = useState<SaleDetailsType | null>(null);
// TODO: Fetch user role based on user id or from session/context/token
const [isProducer, setIsProducer] = useState<boolean>(false);

Expand All @@ -41,7 +31,7 @@ export default function MySaleDetails() {
setIsProducer(true);
}, [saleId]);

const updateSaleDetails = (productDetails: SaleDetails) => {
const updateSaleDetails = (productDetails: SaleDetailsType) => {
// TODO: Implement logic to update sale details
setSaleDetails(productDetails);
};
Expand Down
34 changes: 9 additions & 25 deletions apps/web/src/app/user/my-claims/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,7 @@ import { useEffect, useState } from "react";
import OrderListItem from "~/app/_components/features/OrderListItem";
import OrderListPriceItem from "~/app/_components/features/OrderListPriceItem";
import { ProfileOptionLayout } from "~/app/_components/features/ProfileOptionLayout";

const SalesStatusEnum = {
Paid: "Paid",
Prepared: "Prepared",
Shipped: "Shipped",
Delivered: "Delivered",
} as const;

type SalesStatus = (typeof SalesStatusEnum)[keyof typeof SalesStatusEnum];

const DeliveryMethodEnum = {
Address: "Address",
Meetup: "Meetup",
} as const;

type DeliveryMethod =
(typeof DeliveryMethodEnum)[keyof typeof DeliveryMethodEnum];
import { DeliveryMethod, SalesStatusType } from "~/types";

const mockedOrders = [
{
Expand All @@ -37,17 +21,17 @@ const mockedOrders = [
id: "1",
productName: "productName",
buyerName: "buyer1_fullname",
status: SalesStatusEnum.Delivered as SalesStatus,
delivery: DeliveryMethodEnum.Address as DeliveryMethod,
status: SalesStatusType.Delivered,
delivery: DeliveryMethod.Address,
price: 30,
claimed: false,
},
{
id: "2",
productName: "productName2",
buyerName: "buyer2_fullname",
status: SalesStatusEnum.Delivered as SalesStatus,
delivery: DeliveryMethodEnum.Meetup as DeliveryMethod,
status: SalesStatusType.Delivered,
delivery: DeliveryMethod.Meetup,
price: 30,
claimed: false,
},
Expand All @@ -60,17 +44,17 @@ const mockedOrders = [
id: "3",
productName: "productName3",
buyerName: "buyer1_fullname",
status: SalesStatusEnum.Delivered as SalesStatus,
delivery: DeliveryMethodEnum.Address as DeliveryMethod,
status: SalesStatusType.Delivered,
delivery: DeliveryMethod.Address,
price: 30,
claimed: true,
},
{
id: "4",
productName: "productName4",
buyerName: "buyer2_fullname",
status: SalesStatusEnum.Delivered as SalesStatus,
delivery: DeliveryMethodEnum.Meetup as DeliveryMethod,
status: SalesStatusType.Delivered,
delivery: DeliveryMethod.Meetup,
price: 30,
claimed: true,
},
Expand Down
18 changes: 5 additions & 13 deletions apps/web/src/app/user/my-orders/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,14 @@ import { useParams } from "next/navigation";
import React, { useEffect, useState } from "react";
import ProductStatusDetails from "~/app/_components/features/ProductStatusDetails";
import { ProfileOptionLayout } from "~/app/_components/features/ProfileOptionLayout";

type OrderDetails = {
productName: string;
status: string;
roast: string;
type: string;
quantity: string;
delivery: string;
totalPrice: string;
address?: string;
};
import type { OrderDetailsType } from "~/types";

export default function OrderDetails() {
const { id: orderId } = useParams();

const [orderDetails, setOrderDetails] = useState<OrderDetails | null>(null);
const [orderDetails, setOrderDetails] = useState<OrderDetailsType | null>(
null,
);
// TODO: Fetch user role based on user id or from session/context/token
const [isProducer, setIsProducer] = useState<boolean>(false);

Expand All @@ -42,7 +34,7 @@ export default function OrderDetails() {
setIsProducer(true);
}, [orderId]);

const updateProductDetails = (productDetails: OrderDetails) => {
const updateProductDetails = (productDetails: OrderDetailsType) => {
// TODO: Implement logic to update order details
setOrderDetails(productDetails);
};
Expand Down
52 changes: 17 additions & 35 deletions apps/web/src/app/user/my-orders/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,10 @@ import CheckBox from "@repo/ui/form/checkBox";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { z } from "zod";
import OrderListItem from "~/app/_components/features/OrderListItem";
import { ProfileOptionLayout } from "~/app/_components/features/ProfileOptionLayout";
import BottomModal from "~/app/_components/ui/BottomModal";

const SalesStatusEnum = {
Paid: "Paid",
Prepared: "Prepared",
Shipped: "Shipped",
Delivered: "Delivered",
} as const;

type SalesStatus = (typeof SalesStatusEnum)[keyof typeof SalesStatusEnum];

const filtersSchema = z.object({
statusPaid: z.boolean().optional(),
statusPrepared: z.boolean().optional(),
statusShipped: z.boolean().optional(),
statusDelivered: z.boolean().optional(),
});

type FormValues = z.infer<typeof filtersSchema>;
import { type FormValues, SalesStatusType, filtersSchema } from "~/types";

const mockedOrders = [
{
Expand All @@ -38,13 +20,13 @@ const mockedOrders = [
id: "1",
productName: "Edit profile",
sellerName: "seller1_fullname",
status: SalesStatusEnum.Paid as SalesStatus,
status: SalesStatusType.Paid,
},
{
id: "2",
productName: "My Orders",
sellerName: "seller2_fullname",
status: SalesStatusEnum.Paid as SalesStatus,
status: SalesStatusType.Paid,
},
],
},
Expand All @@ -55,13 +37,13 @@ const mockedOrders = [
id: "3",
productName: "productName",
sellerName: "seller1_fullname",
status: SalesStatusEnum.Delivered as SalesStatus,
status: SalesStatusType.Delivered,
},
{
id: "4",
productName: "productName",
sellerName: "seller2_fullname",
status: SalesStatusEnum.Delivered as SalesStatus,
status: SalesStatusType.Delivered,
},
],
},
Expand Down Expand Up @@ -120,13 +102,13 @@ export default function MyOrders() {

const matchesStatus = activeStatusFilters.some(Boolean)
? (activeFilters.statusPaid &&
item.status === SalesStatusEnum.Paid) ??
item.status === SalesStatusType.Paid) ??
(activeFilters.statusPrepared &&
item.status === SalesStatusEnum.Prepared) ??
item.status === SalesStatusType.Prepared) ??
(activeFilters.statusShipped &&
item.status === SalesStatusEnum.Shipped) ??
item.status === SalesStatusType.Shipped) ??
(activeFilters.statusDelivered &&
item.status === SalesStatusEnum.Delivered)
item.status === SalesStatusType.Delivered)
: true;

return matchesSearch && matchesStatus;
Expand Down Expand Up @@ -197,26 +179,26 @@ export default function MyOrders() {
<div className="flex flex-col gap-2">
<>
<CheckBox
name={`status${SalesStatusEnum.Paid}`}
label={SalesStatusEnum.Paid}
name={`status${SalesStatusType.Paid}`}
label={SalesStatusType.Paid}
control={control}
/>
<hr className="my-2 border-surface-primary-soft" />
<CheckBox
name={`status${SalesStatusEnum.Prepared}`}
label={SalesStatusEnum.Prepared}
name={`status${SalesStatusType.Prepared}`}
label={SalesStatusType.Prepared}
control={control}
/>
<hr className="my-2 border-surface-primary-soft" />
<CheckBox
name={`status${SalesStatusEnum.Shipped}`}
label={SalesStatusEnum.Shipped}
name={`status${SalesStatusType.Shipped}`}
label={SalesStatusType.Shipped}
control={control}
/>
<hr className="my-2 border-surface-primary-soft" />
<CheckBox
name={`status${SalesStatusEnum.Delivered}`}
label={SalesStatusEnum.Delivered}
name={`status${SalesStatusType.Delivered}`}
label={SalesStatusType.Delivered}
control={control}
/>
</>
Expand Down
16 changes: 3 additions & 13 deletions apps/web/src/app/user/my-sales/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,12 @@ import { useParams } from "next/navigation";
import React, { useEffect, useState } from "react";
import ProductStatusDetails from "~/app/_components/features/ProductStatusDetails";
import { ProfileOptionLayout } from "~/app/_components/features/ProfileOptionLayout";

type SaleDetails = {
productName: string;
status: string;
roast: string;
type: string;
quantity: string;
delivery: string;
totalPrice: string;
address?: string;
};
import type { SaleDetailsType } from "~/types";

export default function SaleDetails() {
const { id: saleId } = useParams();

const [saleDetails, setSaleDetails] = useState<SaleDetails | null>(null);
const [saleDetails, setSaleDetails] = useState<SaleDetailsType | null>(null);
// TODO: Fetch user role based on user id or from session/context/token
const [isProducer, setIsProducer] = useState<boolean>(false);

Expand All @@ -41,7 +31,7 @@ export default function SaleDetails() {
setIsProducer(true);
}, [saleId]);

const updateSaleDetails = (productDetails: SaleDetails) => {
const updateSaleDetails = (productDetails: SaleDetailsType) => {
// TODO: Implement logic to update sale details
setSaleDetails(productDetails);
};
Expand Down
Loading
Loading