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.

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

chacha-FE-lecture1,2,3 #1

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a49ed0c
feat: add ItemNumberInput.tsx
ChaeyeonAhn Jul 21, 2024
d61fa1b
feat: start off TextInput.tsx
ChaeyeonAhn Jul 21, 2024
b377b14
feat: add test methods
ChaeyeonAhn Jul 21, 2024
f187ebd
feat: work on disabled and default
ChaeyeonAhn Jul 21, 2024
3e8e558
feat: impl disabled case TextInput.tsx
ChaeyeonAhn Jul 22, 2024
fee8fe2
feat: finish TextInput.tsx
ChaeyeonAhn Jul 22, 2024
917e0b8
feat: impl TextInput.tsx done
ChaeyeonAhn Jul 22, 2024
31d5118
feat: start ItemNumberInput.tsx
ChaeyeonAhn Jul 22, 2024
217e4ee
feat: finish TextInput.tsx
ChaeyeonAhn Jul 22, 2024
64b6c01
feat: work on examples
ChaeyeonAhn Jul 22, 2024
8ce2443
feat: ItemNumberInput not erased other works well
ChaeyeonAhn Jul 22, 2024
411fd61
feat: set up my/page.tsx
ChaeyeonAhn Jul 24, 2024
fa0a56c
feat: infoFrame set up
ChaeyeonAhn Jul 25, 2024
be92054
feat: infoFrame quite done?
ChaeyeonAhn Jul 25, 2024
4042682
feat: work on club frame
ChaeyeonAhn Jul 25, 2024
317723e
feat: add clubCardList
ChaeyeonAhn Jul 27, 2024
45256f6
feat: delete main frame and add /my/clubs
ChaeyeonAhn Jul 27, 2024
4d1dab8
feat: add service frame and toggle
ChaeyeonAhn Jul 27, 2024
4ae0a64
feat: add toggle handler and add /chacha/my/clubs and service frame
ChaeyeonAhn Jul 27, 2024
59e97b8
feat: delete MainFrame
ChaeyeonAhn Jul 27, 2024
8a1f407
feat: fix color in error case and flexwrapper
ChaeyeonAhn Jul 29, 2024
598aeb2
feat: add chachaMockMyClub.ts
ChaeyeonAhn Aug 2, 2024
4c49460
feat: add acfmockup
ChaeyeonAhn Aug 2, 2024
284db54
feat: add cmsmockup
ChaeyeonAhn Aug 2, 2024
c98a073
feat: add mock my club
ChaeyeonAhn Aug 2, 2024
fd40f6d
feat: add import
ChaeyeonAhn Aug 2, 2024
8ddfd14
feat: add phone mock up and import
ChaeyeonAhn Aug 2, 2024
5550ef5
feat: add - inside phone number and add handle change
ChaeyeonAhn Aug 2, 2024
cb55fbf
feat: delete comments
ChaeyeonAhn Aug 2, 2024
2a42cf3
feat: add all variations
ChaeyeonAhn Aug 2, 2024
484b275
feat: resolve review comments
ChaeyeonAhn Aug 10, 2024
2e30823
feat: fix foldable feature using ClubsSectionFrame
ChaeyeonAhn Aug 10, 2024
a508a35
feat: fix on club detail title
ChaeyeonAhn Aug 10, 2024
e49d5df
feat: add useGetMyRental.ts
ChaeyeonAhn Aug 11, 2024
0dad88d
feat: add useGetMyAcf.ts
ChaeyeonAhn Aug 11, 2024
15a3c7c
feat: add useGetMyPrt.ts
ChaeyeonAhn Aug 11, 2024
3b92a5d
feat: add useGetMyCms and fix zod error
ChaeyeonAhn Aug 11, 2024
e7ab301
feat: add useGetMyUser.ts
ChaeyeonAhn Aug 11, 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
2 changes: 1 addition & 1 deletion 2024-summer-FE-seminar/.docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3"
services:
db:
image: mysql:8.0
container_name: sparcs-clubs-dev-db
container_name: sparcs-clubs-seminar-db
ports:
- "${DB_PORT:?err}:3306"
environment:
Expand Down
2 changes: 1 addition & 1 deletion 2024-summer-FE-seminar/packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"scripts": {
"dev": "pnpm db up -d && pnpm start:dev",
"prod": "pnpm migrate:prod && pnpm start:prod",
"db": "docker compose -f ../../.docker/docker-compose.dev.yml -p ar-002-clubs",
"db": "docker compose -f ../../.docker/docker-compose.dev.yml -p ar-002-clubs-seminar",
"env": "echo $NODE_ENV",
"clean": "rm -rf dist",
"generate": "pnpm db up --wait && pnpm drizzle-kit push:mysql --config ./src/drizzle/drizzle.config.ts",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,86 @@ import {
import { Club } from "./club.schema";
import { Student } from "./user.schema";

/**
* # HW1
* DB 설계에 맞추어 drizzle schema를 구현해 봅시다.
* 진행 중 아무리 검색하고 고민해 보아도 해결되지 않는 점이 있다면,
* `promotional-printing.schema copy.ts` 파일을 참고하세요.
*/

export const PromotionalPrintingOrderStatusEnum = mysqlTable(
"promotional_printing_order_status_enum",
{

id: int("id").autoincrement().primaryKey(),
statusName: varchar("status_name", { length: 30 }),
createdAt: timestamp("created_at").defaultNow().notNull(),
updatedAt: timestamp("updated_at").defaultNow().onUpdateNow(),
deletedAt: timestamp("deleted_at"),
},
);

export const PromotionalPrintingSizeEnum = mysqlTable(
"promotional_printing_size_enum",
{

id: int("id").autoincrement().primaryKey(),
statusName: varchar("printing_size", { length: 30 }),
createdAt: timestamp("created_at").defaultNow().notNull(),
updatedAt: timestamp("updated_at").defaultNow().onUpdateNow(),
deletedAt: timestamp("deleted_at"),
},
);

// PromotionalPrintingOrder 테이블 정의
export const PromotionalPrintingOrder = mysqlTable(
"promotional_printing_order",
{

id: int("id").autoincrement().primaryKey(),
clubId: int("club_id")
.notNull()
.references(() => Club.id),
studentId: int("student_id")
.notNull()
.references(() => Student.id),
studentPhoneNumber: varchar("student_phone_number", { length: 30 }),
promotionalPrintingOrderStatusEnum: int(
"promotional_printing_order_status_enum",
).notNull(),
// .references(() => PromotionalPrintingOrderStatusEnum.id),
documentFileLink: text("document_file_link"),
isColorPrint: boolean("is_color_print").default(true).notNull(),
fitPrintSizeToPaper: boolean("fit_print_size_to_paper")
.default(true)
.notNull(),
requireMarginChopping: boolean("require_margin_chopping")
.default(false)
.notNull(),
desiredPickUpTime: datetime("desired_pick_up_time").notNull(),
pickUpAt: datetime("pick_up_at"),
createdAt: timestamp("created_at").defaultNow().notNull(),
updatedAt: timestamp("updated_at").defaultNow().onUpdateNow(),
deletedAt: timestamp("deleted_at"),
},
table => ({

promotionalPrintingOrderStatusEnumIdFk: index(
"pp_order_pp_order_status_enum_id_fk",
).on(table.promotionalPrintingOrderStatusEnum),
}),
);

export const PromotionalPrintingOrderSize = mysqlTable(
"promotional_printing_order_size",
{

id: int("id").autoincrement().primaryKey(),
promotionalPrintingOrderId: int("promotional_printing_order_id").notNull(),
// .references(() => PromotionalPrintingOrder.id),
promotionalPrintingSizeEnumId: int(
"promotional_printing_size_enum_id",
).notNull(),
// .references(() => PromotionalPrintingSizeEnum.id),
numberOfPrints: int("number_of_prints").notNull(),
createdAt: timestamp("created_at").defaultNow().notNull(),
updatedAt: timestamp("updated_at").defaultNow().onUpdateNow(),
deletedAt: timestamp("deleted_at"),
},
table => ({

promotionalPrintingOrderIdFk: index("pp_order_size_pp_order_id_fk").on(
table.promotionalPrintingOrderId,
),
promotionalPrintingSizeEnumIdFk: index(
"pp_order_size_pp_size_enum_id_fk",
).on(table.promotionalPrintingSizeEnumId),
}),
);
Loading