Skip to content

Commit

Permalink
Merge pull request #96 from traP-jp/kitsne_イベント型に表示色の情報を含める
Browse files Browse the repository at this point in the history
必要そうな部分全てを変更
  • Loading branch information
kitsne241 authored Jan 25, 2025
2 parents 092ad71 + e13fb57 commit a734089
Show file tree
Hide file tree
Showing 6 changed files with 1,456 additions and 1,451 deletions.
2 changes: 2 additions & 0 deletions backend/handler/api.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/model/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ type Event struct {
Name string
Description string
Location string
DisplayColor string
TimeStart time.Time
TimeEnd time.Time
CampID uint
OrganizerTraqID string
ByStaff bool
DisplayColor string
}
2 changes: 2 additions & 0 deletions frontend/env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ type EventParams = {
time_end: string
camp_id: number
create_as_staff: boolean
display_color: string
}

type Event = {
Expand All @@ -20,6 +21,7 @@ type Event = {
camp_id: number
organizer_traq_id: string
by_staff: true
display_color: string
}

type OptionParams = {
Expand Down
Loading

0 comments on commit a734089

Please sign in to comment.