全端組：呂龍驤、黃翊倫、Eunice Chiang - #356

Open

LongXiangL wants to merge 146 commits into

ALPHACamp:masterfrom

eunicebibi:master

Commits on Jun 5, 2023

add test
LongXiangL
committed
ae0caa4

Commits on Jun 6, 2023

feat: add handlebars
LongXiangL
committed
3bb4be0
feat: add index page
LongXiangL
committed
5ba9384
feat: add admin index page
LongXiangL
committed
1c1e1fd
設定並串接 Sequelize
LongXiangL
committed
3aa0c20
add tweet model
LongXiangL
committed
5cdc742
flash msg
LongXiangL
committed
ec4d01b
model關聯屬性
 LongXiangL
committed
7366884

Commits on Jun 7, 2023

branch develop init
HuangYiLun
committed
8281e6d
add partials&postmodal&replymodal
LongXiangL
committed
037c17d
clone develop
LongXiangL
committed
ff8fd70
feat: add views/partials/follow.hbs messages.hbs nav.hbs
eunicebibi
committed
418c5aa
3個modal彈出視窗
 LongXiangL
committed
1794ab8
feat: update tweets.hbs
eunicebibi
committed
14ef892
修改測試路由避免上傳衝突
 LongXiangL
committed
eef6533
Merge pull request #1 from eunicebibi/eunice/tweets
LongXiangL
authored
4813aa2

Commits on Jun 8, 2023

feat add views/signin/admin signin/signup.hbs
HuangYiLun
committed
0d167e6
Merge remote-tracking branch 'origin/develop' into add-view-frontend-register
HuangYiLun
committed
358c3bf
feat:add setting/admin tweets.hbs
HuangYiLun
committed
cbabbb8
3個modal彈出視窗 (+8 squashed commits)
LongXiangL
committed
b97c9fd
修改測試路由避免上傳衝突
 LongXiangL
committed
215b11f
users個人中間頁面
 LongXiangL
committed
9c92e01
微調畫面
 LongXiangL
committed
a207875
解决合并冲突
 LongXiangL
committed
022c5e5
Merge branch 'develop' into alone
LongXiangL
authored
bf923b1
Merge pull request #2 from eunicebibi/alone
HuangYiLun
authored
5ef21b4

Commits on Jun 9, 2023

feat: add admin tweets and users hbs
HuangYiLun
committed
08bf07a
git fecth and merge origin/develop
HuangYiLun
committed
262bfea
fix git merge conflict
HuangYiLun
committed
10312ed
feat: apart tweets.hbs html and css
eunicebibi
committed
9db2db9
Merge pull request #3 from eunicebibi/add-view-frontend-register
eunicebibi
authored
c092e79
feat: add twwet route and controller
eunicebibi
committed
71e4d7f
feat: copy alone's post-modal to test tweet function
eunicebibi
committed
327aeb0
feat: combine post-modal and tweets.hbs
eunicebibi
committed
1fe77c9
feat: combine reply-modal and tweet.hbs
eunicebibi
committed
6ad4292

Commits on Jun 10, 2023

feat: add mysql seed
HuangYiLun
committed
9adc9f7
Merge pull request #4 from eunicebibi/add-seeder
eunicebibi
authored
c916f9c
feat: add passport.js
HuangYiLun
committed
c5a48aa
feat: add login/admin login/logout feature
HuangYiLun
committed
aa09ba4
gitnore暫時不更新暫時不更新pack.json
LongXiangL
committed
74f6ceb
feat: add register feature
HuangYiLun
committed
2b3cc8b
Merge remote-tracking branch 'origin/develop' into add-register-feature
HuangYiLun
committed
66eca80
Merge pull request #5 from eunicebibi/add-register-feature
LongXiangL
authored
97e5bef
git fetch最新
 LongXiangL
committed
33dc3d5
更新資料庫ＳＱＬ
 LongXiangL
committed
fcfb11a
add imgur API
LongXiangL
committed
9a831ee
add user 關聯
 LongXiangL
committed
5542493
add tweet關聯
 LongXiangL
committed
2d8b4e9
暫存檢察官連
 LongXiangL
committed
e06acfc
修改取得個人資料頁面
 LongXiangL
committed
bc969af
feat: add tweet.hbs
eunicebibi
committed
16d3ab2
feat: modify routes
eunicebibi
committed
fd8cab1
feat: merge origin/develop
eunicebibi
committed
0615667

Commits on Jun 11, 2023

feat: add admin tweets feature & fix register
HuangYiLun
committed
3180467

Commits on Jun 12, 2023

add putg上傳照片
 LongXiangL
committed
f49a1ad
跟隨者與跟隨中的清單頁面
 LongXiangL
committed
9af0f01
調整follow.hbs畫面
 LongXiangL
committed
5e6dd65
add 追蹤功能
 LongXiangL
committed
309190e
add delete following
LongXiangL
committed
93bbf7a
feat: add tweets function : modify tweet-controlloer.js, tweets.hbs. index.js app,js add tweet.hbs. merge develop:combine style.css, follow.hbs change name to followship.hbs
eunicebibi
committed
9902554
feat: tweet function: modify tweet.hbs, modify handlebars-helpers.js
eunicebibi
committed
83bfb84

Commits on Jun 13, 2023

feat: add admin users & modify user-seed
HuangYiLun
committed
cd8ff29
modify nav-admin-btn.hbs
HuangYiLun
committed
e3b3ec4
modify signup hbs and signup feature
HuangYiLun
committed
0688c39
微調follow功能
 LongXiangL
committed
8293bee
feat: add replies function:modify reply-modal, add routes and reply-controller
eunicebibi
committed
4cdff70
add APIroute
LongXiangL
committed
594f366
modify login error message& admin tweets delete
HuangYiLun
committed
e457313
feat: add like function
eunicebibi
committed
8d2f631
likemodel測試通過
 LongXiangL
committed
1955d6e
feat: change admin boolean(is_Admin) to string(role)
eunicebibi
committed
2b27766
Merge pull request #7 from eunicebibi/eunice/tweetsfunction
HuangYiLun
authored
4bfcd0a
..
LongXiangL
committed
940c4e7
合併衝突
 LongXiangL
committed
781b269
微調畫面
 LongXiangL
committed
cbaf159
fix tweets.hbs
HuangYiLun
authored
c672f49
Merge pull request #8 from eunicebibi/users
HuangYiLun
authored
562a052
modify models user user-seed
HuangYiLun
committed
172ac1a
merge origin/develop
HuangYiLun
committed
a0548ca

Commits on Jun 14, 2023

調整調整migrations輸入順序
 LongXiangL
committed
5e3d033
getuser引入的資料庫名稱大小寫修改
 LongXiangL
committed
a9833fa
Merge pull request #9 from eunicebibi/users
HuangYiLun
authored
639e203
modify models migration
HuangYiLun
committed
41cf0cf
merge origin/develop models
HuangYiLun
committed
807f4f3
feat: add user setting
HuangYiLun
committed
fee9c79
remove sav.hbs
HuangYiLun
committed
06f5218
modify user seeder
HuangYiLun
committed
87fdf9e
Merge pull request #10 from eunicebibi/add-admin-tweets
eunicebibi
authored
f08f738
modify signup feature
HuangYiLun
committed
2633fc0
feat: add like,repli.hbs, modify tweets.hbs nav.hbs
eunicebibi
committed
0a87c36
Merge pull request #11 from eunicebibi/eunice/tweetsfunction
LongXiangL
authored
b45cda2
Update reply-controller.js
eunicebibi
authored
2ad1b09
Update user-controller.js
eunicebibi
authored
95b048f
Merge pull request #12 from eunicebibi/develop
LongXiangL
authored
0225469
Update follower.hbs
eunicebibi
authored
22da9ec
Update following.hbs
eunicebibi
authored
885e658
Update index.js
eunicebibi
authored
61458c5

Commits on Jun 15, 2023

Merge remote-tracking branch 'origin/develop' into add-admin-tweets
HuangYiLun
committed
65094c2
modify admin users sort by tweetsCount
HuangYiLun
committed
1da04b8
remove admin users sequelize require
HuangYiLun
committed
9ded5ac
modify nav setting button
HuangYiLun
committed
0711dcc
微調畫面
 LongXiangL
committed
4d11f88
Merge pull request #13 from eunicebibi/modify-admin-users
LongXiangL
authored
94aad40
Merge remote-tracking branch 'origin/develop'
LongXiangL
committed
939ce15
passport補上補上like關聯
 LongXiangL
committed
24033b8
Merge pull request #14 from eunicebibi/users
HuangYiLun
authored
78048f1
feat: add passport liketweets
HuangYiLun
committed
614cfd5
feat: modify user.hbs
HuangYiLun
committed
2c2b29f
merge origin/develop
HuangYiLun
committed
2c8e570
modify follower/following.hbs
HuangYiLun
committed
86c4672
Merge pull request #15 from eunicebibi/fix-like-feature
LongXiangL
authored
20b02f8
微調畫面
 LongXiangL
committed
ba55024
微調微調follow登出按鈕
 LongXiangL
committed
9c4952c
Merge pull request #16 from eunicebibi/users
HuangYiLun
authored
5c8a11f
Merge pull request #17 from eunicebibi/develop
LongXiangL
authored
0ef8f39
feat: change helps: timezone
eunicebibi
committed
9b03488
feat: merge new develop
eunicebibi
committed
51d6169
feat: merge new develop
eunicebibi
committed
8075484
Merge pull request #18 from eunicebibi/eunice/tweetsfunction
HuangYiLun
authored
6ada627
fix test error
HuangYiLun
committed
296f2f8
Merge pull request #19 from eunicebibi/fix-test-error
LongXiangL
authored
558ca9b
Merge pull request #20 from eunicebibi/develop
HuangYiLun
authored
ba23d79
feat: modify config for heroku
HuangYiLun
committed
26acfb1
modify timezone in handlebars-helpers.js
eunicebibi
authored
17f4249

Commits on Jun 16, 2023

Merge pull request #21 from eunicebibi/heroku
LongXiangL
authored
c60f4ba
add Readme
LongXiangL
committed
7a3db54
Merge pull request #22 from eunicebibi/readme
HuangYiLun
authored
898b255

Commits on Jun 17, 2023

Merge pull request #23 from eunicebibi/develop
HuangYiLun
authored
91c7602
Update app.js
HuangYiLun
authored
d8d2890
Merge pull request #24 from eunicebibi/HuangYiLun-patch-2
LongXiangL
authored
251d661
Update app.js
HuangYiLun
authored
31bd2fa
Merge pull request #25 from eunicebibi/HuangYiLun-patch-3
LongXiangL
authored
c2f78cf
Update package.json
LongXiangL
authored
5ce396d
Merge pull request #26 from eunicebibi/LongXiangL-patch-2
HuangYiLun
authored
6c8215c
Merge pull request #27 from eunicebibi/develop
HuangYiLun
authored
6d176b1

Commits on Jun 18, 2023

fix-message.hbs
HuangYiLun
committed
74bf982
feat: add signup valid message
HuangYiLun
committed
24f1809
feat: add setting valid message
HuangYiLun
committed
2b3ca53
fix package.json script test
HuangYiLun
committed
490de8d
merge develop
HuangYiLun
committed
8eeb068
fix packag.json script dev
HuangYiLun
committed
2873ab5
modify setting hbs
HuangYiLun
committed
8e88612
Merge pull request #28 from eunicebibi/fix-messages
eunicebibi
authored
c2b8a43

Commits on Jun 19, 2023

Merge pull request #29 from eunicebibi/develop
eunicebibi
authored
e8ecb99
Update user-controller.js
HuangYiLun
authored
093cd19
Merge pull request #30 from eunicebibi/HuangYiLun-patch-4
LongXiangL
authored
135f053