Feature/barret - #3

Open

Barret0720 wants to merge 161 commits into

panduola666:mainfrom

RayChen1996:feature/barret

Commits on Jan 21, 2024

fix: router error
panduola666
committed
d499d03

Commits on Jan 22, 2024

feat: 拆分原本 user 頁面
 panduola666
committed
88375dc

Commits on Jan 24, 2024

Commits on Jan 28, 2024

feat: 歷史訂單串接
 panduola666
committed
0a73d39

Commits on Jan 29, 2024

feat: 即將到來的行程
 panduola666
committed
ab5192e
feat: 【首頁】切版(桌機)
hangineer
committed
ea354de

Commits on Jan 30, 2024

+預定房型路由頁面製作中
 RayChen1996
committed
c495b2e
預定房型頁面第一版
 RayChen1996
committed
3cd0cc4
預定成功頁面+添加路由
 RayChen1996
committed
2e98431
微調
 RayChen1996
committed
81e4473
Update BookingResult.vue
RayChen1996
committed
b3bd272
Merge pull request #5 from RayChen1996/feature/oo
panduola666
authored
2fffea1
Merge remote-tracking branch 'origin/main' into feature/hannah
hangineer
committed
90f63b3
feat: 共用部分 & 圖片
 hangineer
committed
b4fe8a5
feat: 新增 slide store (TS待補)
hangineer
committed
82bcdac
Update BookingResult.vue
RayChen1996
committed
158cfa2

Commits on Jan 31, 2024

barret test commit
Barret0720
committed
ada557e
Merge branch 'feature/barret' of https://github.com/RayChen1996/RoomsOrder into feature/barret
Barret0720
committed
c0d5196
room Detail
Barret0720
committed
c317ef1
fix: 調整首頁跑版和修正部分 RWD 跑版
 hangineer
committed
207721b
fix: 刪除名稱為小寫開頭的圖片
 hangineer
committed
3d389cc
feat: 將圖片以大寫開頭命名並加回
 hangineer
committed
d039dcd
feat: fix nav
panduola666
committed
5ab3062
Merge branch 'main' into feature/oo
panduola666
committed
2a97ecc
Merge remote-tracking branch 'origin/main' into feature/hannah
hangineer
committed
13a28b2
feat: 客房旅宿頁面切版，swiper 箭頭邏輯待修
 hangineer
committed
64c8165
完成左邊切版
 Barret0720
committed
1236906
Resolve merge
Barret0720
committed
b2b38d4
Merge pull request #6 from RayChen1996/feature/barret
Barret0720
authored
3325fda
Merge remote-tracking branch 'origin/main' into feature/hannah
hangineer
committed
487f45d
添加modal組件中
 RayChen1996
committed
6bf8c6a

Commits on Feb 1, 2024

Merge branch 'feature/raychen'
RayChen1996
committed
8cec6cd
待補api
RayChen1996
committed
3ee5503
Merge remote-tracking branch 'origin/main' into feature/hannah
hangineer
committed
6ccaf66
env config
Barret0720
committed
901a5d2
Merge pull request #8 from RayChen1996/feature/hannah
hangineer
authored
ee615b4
feat: 建立首頁-美味佳餚/最新消息 & 客房旅宿-房型 store, interface
hangineer
committed
718d126
Merge remote-tracking branch 'origin/feature/hannah' into feature/oo
panduola666
committed
e204e95
Merge pull request #9 from RayChen1996/feature/hannah
hangineer
authored
1ec80f5
feat: add return in state
hangineer
committed
32a208a
fix: 首頁 banner RWD 切版
 panduola666
committed
60b2321
Merge branch 'feature/oo'
panduola666
committed
c3ea8b6
feat: banner 跳轉 router 設置
 panduola666
committed
20fedd1
detail fix
Barret0720
committed
c788409
feat: 首頁串接 API
panduola666
committed
ee971ac
Merge pull request #10 from panduola666/feature/oo
panduola666
committed
0c07d8f
fix: 修正部分 TS 報錯
 panduola666
committed
d68f8bf
fix: 忽略報錯, 建置完成 (感天動地)
panduola666
committed
77fb258

Commits on Feb 2, 2024

Merge remote-tracking branch 'origin/feature/hannah'
Judy
committed
6509345
Merge remote-tracking branch 'origin/feature/barret'
Judy
committed
58c9c9a
feat: 整合分支, 統一訊息
Judy
committed
a792579
fix: store 報錯
Judy
committed
4ad8506
fix: redolved conflicts
hangineer
committed
eed4887
feat: create vendors folder
hangineer
committed
8228336
fix: remove console.log
hangineer
committed
3175698
Merge pull request #10 from RayChen1996/feature/hannah
hangineer
authored
8c7fce1
Update RoomReserved.vue
RayChen1996
committed
4f808b8
Update RoomReserved.vue
RayChen1996
committed
ccfe06a
Merge branch 'main' into feature/oo
panduola666
committed
31da7ae
feat: 客房旅宿頁
 hangineer
committed
87adb66
Merge pull request #11 from RayChen1996/feature/hannah
hangineer
authored
26aef87
feat: add facilityInfo badge
hangineer
committed
9107e22
feat: 調整模板
 panduola666
committed
d5843a9
Merge branch 'feature/oo'
panduola666
committed
1f26169
feat: 使用元件
 panduola666
committed
b4182d8
Merge pull request #12 from RayChen1996/main
Barret0720
authored
3819b01
add icon
Barret0720
committed
59ba2b5
add v-calendar
Barret0720
committed
e400ef5

Commits on Feb 3, 2024

Merge branch 'main' into feature/raychen
RayChen1996
committed
7292b06
fix: adjust Home Page layout
hangineer
committed
41d6da7
fix: adjust room banner layout & use swiper
hangineer
committed
4dcf802
Merge pull request #13 from RayChen1996/feature/hannah
hangineer
authored
2d58b8c
Merge pull request #14 from RayChen1996/main
Barret0720
authored
b6f2772
feat: set the path alias in tsconfig.json
hangineer
committed
3c5567c
fix: adjust Home page background color
hangineer
committed
0d6863b
feat: add roomType mockData
hangineer
committed
a9ab8e8
Merge branch 'main' into feature/raychen
RayChen1996
committed
29ed85f
feat: add pagination component & adjust router
hangineer
committed
762bb30
Merge pull request #15 from RayChen1996/feature/hannah
hangineer
authored
e12913f
接 /rooms/id api
RayChen1996
committed
b5efaff
Merge branch 'main' into feature/raychen
RayChen1996
committed
cda7b80
跳轉頁
 RayChen1996
committed
3b88ad7
+圖片欄位
 RayChen1996
committed
994caef
fix: 修正 build 會報的錯誤
 hangineer
committed
b3b2b9d
+ layoutInfo
RayChen1996
committed
f0a1328
拆分元件、RWD尚未完成
 Barret0720
committed
68dcb0f
Merge branch 'feature/barret' of https://github.com/RayChen1996/RoomsOrder into feature/barret
Barret0720
committed
1cffa09
Merge pull request #16 from RayChen1996/feature/barret
Barret0720
authored
80d58a6
fix: resolved conflicts
hangineer
committed
497aa02
Merge pull request #17 from RayChen1996/feature/hannah
hangineer
authored
e3f80cc
+欄位調整
 RayChen1996
committed
146eb5b
Merge branch 'main' into feature/raychen
RayChen1996
committed
0b8a3ad
拿網址參數 roomId
RayChen1996
committed
e315212
Update RoomReserved.vue
RayChen1996
committed
a162621
ts 編譯報錯 fix
RayChen1996
committed
c86232a
Update BookingResult.vue
RayChen1996
committed
a9d436f
Update BookingResult.vue
RayChen1996
committed
806ff47
Update BookingResult.vue
RayChen1996
committed
3eaa35c
Update RoomReserved.vue
RayChen1996
committed
59f8628

Commits on Feb 4, 2024

fix: adjust Room mockData
hangineer
committed
610a86b
fix: /api/v1/rooms/ API's response merged mockData
hangineer
committed
b14bd88
fix: fix build error
hangineer
committed
5a4d4d0
fix: 調整首頁 RoomSwiper 「查看更多」按鈕
 hangineer
committed
dbfcb2b
修正尚未登入錯誤
 raychen19960102
committed
39a7b3c
createOrder
raychen19960102
committed
6c2d245
前往我的訂單跳轉個人頁
 raychen19960102
committed
451ca81
RWD 調整
 Barret0720
committed
f9b0e6f
Merge pull request #18 from RayChen1996/feature/hannah
hangineer
authored
6e0181a
RWD Fix
Barret0720
committed
7f93962
Merge branch 'feature/barret' of https://github.com/RayChen1996/RoomsOrder into feature/barret
Barret0720
committed
925d86f
與 roomdetail協調接query string參數
 raychen19960102
committed
7b93028
merge
Barret0720
committed
9009b16
Merge branch 'main' of https://github.com/RayChen1996/RoomsOrder
raychen19960102
committed
1ff9769
Merge branch 'feature/raychen'
raychen19960102
committed
c021cfc
Merge branch 'main' into feature/barret
Barret0720
authored
a0f0abe
Merge pull request #20 from RayChen1996/feature/barret
Barret0720
authored
fa582fa
Merge pull request #21 from RayChen1996/main
Barret0720
authored
2b8faa5
fix: adjust Home, Room layout
hangineer
committed
3d6f6de
+訂房驗證
 raychen19960102
committed
88b5b16
修正 BookingResult
raychen19960102
committed
8da4306
Merge pull request #22 from RayChen1996/feature/hannah
hangineer
authored
11495e0
Update README.md
Barret0720
authored
23414cd
Update README.md
Barret0720
authored
fd5081a
Update README.md
Barret0720
authored
ee6c3a7
Merge remote-tracking branch 'origin/feature/raychen' into feature/oo
panduola666
committed
655ae3a
RWD fixed
Barret0720
committed
fe83773
Merge pull request #23 from RayChen1996/feature/barret
Barret0720
authored
2e0e4c8
Merge pull request #24 from RayChen1996/main
Barret0720
authored
6f1c232
Merge remote-tracking branch 'origin/main' into feature/oo
panduola666
committed
e509ba3
fix rwd
Barret0720
committed
3ae4cef
Merge pull request #25 from RayChen1996/feature/barret
Barret0720
authored
7cc62ab
Merge pull request #26 from RayChen1996/feature/raychen
Barret0720
authored
9084fd5
Merge pull request #27 from RayChen1996/main
Barret0720
authored
d168532
修正未登入會跳轉/login
raychen19960102
committed
21ec580
Merge branch 'feature/raychen'
raychen19960102
committed
59bb0f5

Commits on Feb 5, 2024

Merge branch 'main' into feature/oo
panduola666
committed
67e535b
feat: 重構 RoomReserved
panduola666
committed
e7df3e8
fix: BookingResult
panduola666
committed
2bd5765
feat: 編輯日期
 panduola666
committed
b12a458
fix: ts ignore
panduola666
committed
f059b0f

Commits on Feb 6, 2024

fix: adjust VCalender date css
hangineer
committed
70d5398
feat: 訂房驗證
 panduola666
committed
671ec86
Merge pull request #28 from RayChen1996/main
Barret0720
authored
a8af7f0

Commits on Feb 8, 2024

fix: 調整日期彈窗樣式（電腦版）
hangineer
committed
6993625
Merge pull request #29 from RayChen1996/feature/hannah
hangineer
authored
eec198e
Merge remote-tracking branch 'origin/main' into feature/hannah
hangineer
committed
cf2bc12
fix: 修正房型詳細頁右半部跑版
 hangineer
committed
b1492e2
fix: 刪掉多餘檔案 & 補上註解
 hangineer
committed
4f1cb43
fix: 調整房間預訂的人數和房型編輯
 hangineer
committed
1b0553d

Commits on Feb 9, 2024

Commits on Feb 11, 2024

Merge pull request #31 from RayChen1996/main
Barret0720
authored
7aacd97

Commits on Feb 15, 2024

壓縮圖檔與RWD 調整
 Barret0720
committed
0b2ff92