Code

前後分離組(Mika/Jeremy/Winston/芋頭)#898

Code

Open

realyutou wants to merge 167 commits intoALPHACamp:masterALPHACamp/twitter-api-2020:masterfrom realyutou:masterrealyutou/twitter-api-2020:masterCopy head branch name to clipboard

+4,732-3,393

Commits

Commits on Aug 22, 2023

• feat: database and model setting

  realyutou

  committed
  7af6edc

  Copy full SHA for 7af6edc

• Update user.js

  WinstonAdams

  authored
  75e42e4

  Copy full SHA for 75e42e4

• Merge pull request #1 from realyutou/feature/model-setting

  Show description for 76773de
  WinstonAdams

  authored
  76773de

  Copy full SHA for 76773de

• feat: add users seed

  WinstonAdams

  committed
  eb33240

  Copy full SHA for eb33240

• feat: add user signup function

  realyutou

  committed
  7bbfeb8

  Copy full SHA for 7bbfeb8

• feat: add tweets seed

  WinstonAdams

  committed
  c3578fd

  Copy full SHA for c3578fd

• feat: add replies seed

  WinstonAdams

  committed
  b0f12bf

  Copy full SHA for b0f12bf

• Merge pull request #2 from realyutou/feature/create-seeds

  Show description for a767c4a
  realyutou

  authored
  a767c4a

  Copy full SHA for a767c4a

• feat: add seeds

  WinstonAdams

  committed
  08fbcf7

  Copy full SHA for 08fbcf7

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  51623a4

  Copy full SHA for 51623a4

• feat: add user signin function

  realyutou

  committed
  10045ee

  Copy full SHA for 10045ee

Commits on Aug 23, 2023

• feat: modify config.json for heroku

  WinstonAdams

  committed
  9be7c57

  Copy full SHA for 9be7c57

• feat: add auth middleware

  realyutou

  committed
  d52b25d

  Copy full SHA for d52b25d

• feat: modify config.json for heroku

  WinstonAdams

  committed
  807e2e7

  Copy full SHA for 807e2e7

• feat: add admin signin function

  realyutou

  committed
  e83d1c0

  Copy full SHA for e83d1c0

• Merge pull request #3 from realyutou/feature/deploy-heroku

  Show description for 3784fb7
  realyutou

  authored
  3784fb7

  Copy full SHA for 3784fb7

• Update passport.js

  WinstonAdams

  authored
  b6bcc6d

  Copy full SHA for b6bcc6d

• Merge branch 'master' into feature/signup-and-signin

  WinstonAdams

  authored
  d685976

  Copy full SHA for d685976

• Merge pull request #4 from realyutou/feature/signup-and-signin

  Show description for 605c4ba
  WinstonAdams

  authored
  605c4ba

  Copy full SHA for 605c4ba

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  8d99317

  Copy full SHA for 8d99317

• feat: add heroku config

  WinstonAdams

  committed
  b891d24

  Copy full SHA for b891d24

• feat: add signup and signin

  realyutou

  committed
  9969ff6

  Copy full SHA for 9969ff6

• fix merge conflicts

  realyutou

  committed
  bd0ab48

  Copy full SHA for bd0ab48

• feat: add cors

  WinstonAdams

  committed
  4fc2d20

  Copy full SHA for 4fc2d20

• Merge pull request #5 from realyutou/add-cors

  Show description for 09979d7
  realyutou

  authored
  09979d7

  Copy full SHA for 09979d7

• feat: add cors

  WinstonAdams

  committed
  81c3760

  Copy full SHA for 81c3760

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  03ed4e0

  Copy full SHA for 03ed4e0

• feat: add admin getTweets function

  WinstonAdams

  committed
  e9977e2

  Copy full SHA for e9977e2

• feat: modify auth.js and add getTweet

  realyutou

  committed
  26a8aa4

  Copy full SHA for 26a8aa4

• feat: add admin deleteTweet function

  WinstonAdams

  committed
  5014211

  Copy full SHA for 5014211

• feat: add getTweets

  realyutou

  committed
  0e5c358

  Copy full SHA for 0e5c358

• feat: add postTweet

  realyutou

  committed
  34f7fd6

  Copy full SHA for 34f7fd6

• feat: add getTweetReplies

  realyutou

  committed
  b53ee46

  Copy full SHA for b53ee46

• feat: add postTweetReply

  realyutou

  committed
  d59cd97

  Copy full SHA for d59cd97

• feat: add admin getUsers function

  WinstonAdams

  committed
  242d7c9

  Copy full SHA for 242d7c9

• modify admin getUsers function

  WinstonAdams

  committed
  d063638

  Copy full SHA for d063638

Commits on Aug 24, 2023

• modify admin getUsers function

  WinstonAdams

  committed
  4cf7f87

  Copy full SHA for 4cf7f87

• Merge branch 'master' into feature/tweets

  WinstonAdams

  authored
  75f3e2f

  Copy full SHA for 75f3e2f

• Merge pull request #6 from realyutou/feature/tweets

  Show description for 3bf266e
  WinstonAdams

  authored
  3bf266e

  Copy full SHA for 3bf266e

• Merge branch 'master' into feature/admin-api

  realyutou

  authored
  19d86b5

  Copy full SHA for 19d86b5

• Merge pull request #7 from realyutou/feature/admin-api

  Show description for 3e677d5
  realyutou

  authored
  3e677d5

  Copy full SHA for 3e677d5

• feat: add admin api function

  WinstonAdams

  committed
  5824ecf

  Copy full SHA for 5824ecf

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  7554cce

  Copy full SHA for 7554cce

• modify JWTSecret setting

  realyutou

  committed
  5a88afd

  Copy full SHA for 5a88afd

• Merge pull request #8 from realyutou/feature/like

  Show description for 53bac34
  WinstonAdams

  authored
  53bac34

  Copy full SHA for 53bac34

• modify routes/index.js

  WinstonAdams

  committed
  2f7e823

  Copy full SHA for 2f7e823

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  b0db135

  Copy full SHA for b0db135

• add likeTweet function

  realyutou

  committed
  9a38876

  Copy full SHA for 9a38876

• feat: add unlikeTweet function

  realyutou

  committed
  d02016c

  Copy full SHA for d02016c

• Merge pull request #9 from realyutou/feature/like

  Show description for 6b7b190
  WinstonAdams

  authored
  6b7b190

  Copy full SHA for 6b7b190

• feat: add followUser function

  WinstonAdams

  committed
  56b1ba4

  Copy full SHA for 56b1ba4

• feat: add unfollowUser function

  WinstonAdams

  committed
  4cab0ef

  Copy full SHA for 4cab0ef

• feat: add followship function

  WinstonAdams

  committed
  5476b00

  Copy full SHA for 5476b00

• Merge pull request #10 from realyutou/feature/followship-api

  Show description for a18b72a
  realyutou

  authored
  a18b72a

  Copy full SHA for a18b72a

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  35c7d4f

  Copy full SHA for 35c7d4f

• feat: add getUser function

  WinstonAdams

  committed
  9364967

  Copy full SHA for 9364967

• feat: add putUser function

  realyutou

  committed
  ed930dd

  Copy full SHA for ed930dd

• feat: add getUserTweets function

  WinstonAdams

  committed
  6a743da

  Copy full SHA for 6a743da

• feat: add getUserReplies function

  WinstonAdams

  committed
  007a3de

  Copy full SHA for 007a3de

• modify getUserTweets function

  WinstonAdams

  committed
  296dc20

  Copy full SHA for 296dc20

Commits on Aug 25, 2023

• feat: add getFollowings function

  realyutou

  committed
  f9ea69c

  Copy full SHA for f9ea69c

• add getFollowers function

  realyutou

  committed
  fbd4471

  Copy full SHA for fbd4471

• feat: add getTopUser function

  realyutou

  committed
  66089c8

  Copy full SHA for 66089c8

• Merge remote-tracking branch 'origin/master'

  realyutou

  committed
  16d6619

  Copy full SHA for 16d6619

• feat: add getUserLikes function

  WinstonAdams

  committed
  6048136

  Copy full SHA for 6048136

• feat: add order to getUserTweets、getUserReplies and getUserLikes function

  WinstonAdams

  committed
  2fbf104

  Copy full SHA for 2fbf104

• Merge pull request #11 from realyutou/feature/users-1

  Show description for 2752f83
  WinstonAdams

  authored
  2752f83

  Copy full SHA for 2752f83

Commits on Aug 26, 2023

• modify getUserLikes function

  WinstonAdams

  committed
  1e0bb66

  Copy full SHA for 1e0bb66

• Merge branch 'master' into feature/user-api

  realyutou

  authored
  74c7e47

  Copy full SHA for 74c7e47

• Merge pull request #12 from realyutou/feature/user-api

  Show description for dd7b768
  realyutou

  authored
  dd7b768

  Copy full SHA for dd7b768

• Merge remote-tracking branch 'origin/master'

  realyutou

  committed
  4306ecc

  Copy full SHA for 4306ecc

• feat: add user function

  WinstonAdams

  committed
  098c626

  Copy full SHA for 098c626

• feat: set user account and password length range

  realyutou

  committed
  1a61875

  Copy full SHA for 1a61875

• Update user-controller.js putUser function

  WinstonAdams

  authored
  03f8313

  Copy full SHA for 03f8313

• Merge pull request #13 from realyutou/feature/users-1

  Show description for ca6d047
  WinstonAdams

  authored
  ca6d047

  Copy full SHA for ca6d047

• feat: add user function from Github

  WinstonAdams

  committed
  c491b0f

  Copy full SHA for c491b0f

Commits on Aug 27, 2023

• feat: add token-test function

  realyutou

  committed
  9bad055

  Copy full SHA for 9bad055

• Merge pull request #14 from realyutou/feature/auth-route

  Show description for e95a5a8
  WinstonAdams

  authored
  e95a5a8

  Copy full SHA for e95a5a8

• modify getTopUser function

  WinstonAdams

  authored
  8cf3873

  Copy full SHA for 8cf3873

• Merge pull request #15 from realyutou/WinstonAdams-patch-1

  Show description for b1a7e2f
  realyutou

  authored
  b1a7e2f

  Copy full SHA for b1a7e2f

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  cf04362

  Copy full SHA for cf04362

• Create README.md

  WinstonAdams

  authored
  d799df3

  Copy full SHA for d799df3

• Merge pull request #16 from realyutou/WinstonAdams-patch-2

  Show description for db6c553
  realyutou

  authored
  db6c553

  Copy full SHA for db6c553

Commits on Aug 28, 2023

• modify getUser function(add tweetsCount)

  WinstonAdams

  committed
  05c2622

  Copy full SHA for 05c2622

• modify getTopUser function(exclude following users)

  WinstonAdams

  committed
  2fd64b8

  Copy full SHA for 2fd64b8

• feat: merge master

  realyutou

  committed
  32ef35d

  Copy full SHA for 32ef35d

• Merge pull request #17 from realyutou/feature/user-api

  Show description for f94a412
  realyutou

  authored
  f94a412

  Copy full SHA for f94a412

• modify getUser and getTopUser function

  WinstonAdams

  committed
  f93cf6d

  Copy full SHA for f93cf6d

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  9029a0b

  Copy full SHA for 9029a0b

• modify deleteTweet function(一併將 tweet 相關的 replies 和 likes 刪除)

  WinstonAdams

  committed
  c25b6c5

  Copy full SHA for c25b6c5

• Merge pull request #18 from realyutou/feature/user-api

  Show description for c9b9038
  realyutou

  authored
  c9b9038

  Copy full SHA for c9b9038

• modify deleteTweet function(一併將 tweet 相關的 replies 和 likes 刪除)

  WinstonAdams

  committed
  c4a9baa

  Copy full SHA for c4a9baa

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  bda43d7

  Copy full SHA for bda43d7

Commits on Aug 29, 2023

• refactor getTweets function

  WinstonAdams

  committed
  1ba0180

  Copy full SHA for 1ba0180

• refactor deleteTweet function

  WinstonAdams

  committed
  57fccbe

  Copy full SHA for 57fccbe

• refactor: modify user-controller getFollowings function

  realyutou

  committed
  0d45624

  Copy full SHA for 0d45624

• refactor: modify user-controller getFollowers function

  realyutou

  committed
  c364cb6

  Copy full SHA for c364cb6

• Merge branch 'master' into feature/users-1

  realyutou

  committed
  23fba31

  Copy full SHA for 23fba31

• feat: update user-controller putUser function

  realyutou

  committed
  3946e8c

  Copy full SHA for 3946e8c

• Merge branch 'master' into refactor-user-controller

  realyutou

  committed
  f0fb5e8

  Copy full SHA for f0fb5e8

• refactor: modify user-controler putUser function

  realyutou

  committed
  96615a0

  Copy full SHA for 96615a0

• feat: update signin function

  realyutou

  committed
  1f0be0a

  Copy full SHA for 1f0be0a

• Update user-controller.js

  WinstonAdams

  authored
  14facef

  Copy full SHA for 14facef

• Merge pull request #19 from realyutou/feature/users-1

  Show description for 65252da
  WinstonAdams

  authored
  65252da

  Copy full SHA for 65252da

• refactor getUsers function

  WinstonAdams

  committed
  1d8fb27

  Copy full SHA for 1d8fb27

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  77aa281

  Copy full SHA for 77aa281

• refactor: modify tweet-controller postTweet function

  realyutou

  committed
  0de0ee7

  Copy full SHA for 0de0ee7

• refactor: modify tweet-controller getTweetReplies function

  realyutou

  committed
  042243e

  Copy full SHA for 042243e

• refactor: modify tweet-controller postTweetReply

  realyutou

  committed
  1a530c4

  Copy full SHA for 1a530c4

Commits on Aug 30, 2023

• modify signUp and putUser function(改成帳號已重複註冊！)

  WinstonAdams

  committed
  1a6ce94

  Copy full SHA for 1a6ce94

• modify getTopUser function

  WinstonAdams

  committed
  74d1f27

  Copy full SHA for 74d1f27

• Merge pull request #21 from realyutou/feature/user-api

  realyutou

  authored
  15f5b20

  Copy full SHA for 15f5b20

• modify getTopUser、putUser and signUp

  WinstonAdams

  committed
  e2008af

  Copy full SHA for e2008af

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  71d2fc4

  Copy full SHA for 71d2fc4

• refactor: modify user-controller getTopUsers function

  realyutou

  committed
  2264be5

  Copy full SHA for 2264be5

• refactor: modify user-controller putUser function with Sequelize literal

  realyutou

  committed
  8191daf

  Copy full SHA for 8191daf

• refactor tweet-controller getTweet function

  realyutou

  committed
  e28f9f4

  Copy full SHA for e28f9f4

• refactor tweet-controller getTweets function

  realyutou

  committed
  8da27fb

  Copy full SHA for 8da27fb

• refactor: tweet-controller likeTweet function

  realyutou

  committed
  1cd2c29

  Copy full SHA for 1cd2c29

• refactor: tweet-controller unlikeTweet function

  realyutou

  committed
  94a8f9c

  Copy full SHA for 94a8f9c

Commits on Aug 31, 2023

• refactor followUser function

  WinstonAdams

  committed
  f6c56c4

  Copy full SHA for f6c56c4

• refactor unfollowUser function

  WinstonAdams

  committed
  af46569

  Copy full SHA for af46569

• refactor getTopUser、getFollowers、getFollowings and putUser function

  WinstonAdams

  committed
  06d61e3

  Copy full SHA for 06d61e3

• refactor getUser function

  WinstonAdams

  committed
  081fca4

  Copy full SHA for 081fca4

• refactor: passport-local-strategy

  realyutou

  committed
  985e422

  Copy full SHA for 985e422

• refactor getUserTweets function

  WinstonAdams

  committed
  b850ae0

  Copy full SHA for b850ae0

• refactor getUserReplies function

  WinstonAdams

  committed
  ac909dd

  Copy full SHA for ac909dd

• refactor: passport JWTStrategy

  realyutou

  committed
  3098173

  Copy full SHA for 3098173

• refactor getUserLikes function

  WinstonAdams

  committed
  0c339de

  Copy full SHA for 0c339de

• modify getUserTweets and getUserLikes function

  WinstonAdams

  committed
  70a03d2

  Copy full SHA for 70a03d2

• refactor: modify admin-controller getTweets function

  realyutou

  authored
  4364ea0

  Copy full SHA for 4364ea0

• Merge pull request #20 from realyutou/refactor-admin-controller

  Show description for 181e4bf
  realyutou

  authored
  181e4bf

  Copy full SHA for 181e4bf

• refactor: modify getFollowers and getFollowings function

  WinstonAdams

  authored
  bb11e18

  Copy full SHA for bb11e18

• Merge branch 'master' into refactor-user-controller

  WinstonAdams

  authored
  b872e17

  Copy full SHA for b872e17

• Merge pull request #22 from realyutou/refactor-user-controller

  Show description for faded70
  WinstonAdams

  authored
  faded70

  Copy full SHA for faded70

• Merge pull request #24 from realyutou/refactor-followship-controller

  Show description for 25d98c5
  realyutou

  authored
  25d98c5

  Copy full SHA for 25d98c5

• Refactor: modify user-controller getUser function

  realyutou

  authored
  f5fc4ec

  Copy full SHA for f5fc4ec

• Merge pull request #23 from realyutou/refactor-tweet-controller

  Show description for d016bbe
  WinstonAdams

  authored
  d016bbe

  Copy full SHA for d016bbe

• Update package.json

  realyutou

  authored
  cdcf127

  Copy full SHA for cdcf127

• Merge branch 'master' into refactor-user-controller-2

  realyutou

  authored
  f98fa7d

  Copy full SHA for f98fa7d

• Merge pull request #26 from realyutou/refactor-user-controller-2

  Show description for 02324d0
  realyutou

  authored
  02324d0

  Copy full SHA for 02324d0

• Merge pull request #25 from realyutou/refactor-passport.js

  Show description for fb64549
  WinstonAdams

  authored
  fb64549

  Copy full SHA for fb64549

• modify getUser function

  WinstonAdams

  committed
  2277c9b

  Copy full SHA for 2277c9b

• Merge pull request #27 from realyutou/refactor

  Show description for 14ddff4
  realyutou

  authored
  14ddff4

  Copy full SHA for 14ddff4

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  5b124a2

  Copy full SHA for 5b124a2

Commits on Sep 1, 2023

• refactor deleteTweet function

  WinstonAdams

  committed
  a1df517

  Copy full SHA for a1df517

• Merge remote-tracking branch 'origin/master' into refactor-admin-controller

  WinstonAdams

  committed
  4c9221b

  Copy full SHA for 4c9221b

• refactor followUser function

  WinstonAdams

  committed
  c270c03

  Copy full SHA for c270c03

• refactor unfollowUser function

  WinstonAdams

  committed
  566b44a

  Copy full SHA for 566b44a

• refactor: modify like and unlike function

  realyutou

  committed
  ad1e0fb

  Copy full SHA for ad1e0fb

• refactor: modify getFollowers function

  realyutou

  committed
  984e9d1

  Copy full SHA for 984e9d1

• refactor: modify getFollowings function

  realyutou

  committed
  85b4b34

  Copy full SHA for 85b4b34

• Merge pull request #30 from realyutou/refactor-1

  Show description for ca88f6f
  WinstonAdams

  authored
  ca88f6f

  Copy full SHA for ca88f6f

• refactor getUserTweets function

  WinstonAdams

  committed
  66e0529

  Copy full SHA for 66e0529

• refactor getUserReplies function

  WinstonAdams

  committed
  5d824ef

  Copy full SHA for 5d824ef

• refactor getUserLikes function

  WinstonAdams

  committed
  fe0d0c9

  Copy full SHA for fe0d0c9

• Merge pull request #28 from realyutou/refactor-admin-controller

  Show description for e6fcd5d
  realyutou

  authored
  e6fcd5d

  Copy full SHA for e6fcd5d

• Merge pull request #29 from realyutou/refactor-followship-controller

  Show description for ad13b76
  realyutou

  authored
  ad13b76

  Copy full SHA for ad13b76

• Merge pull request #31 from realyutou/refactor-user-controller-2

  Show description for 4a36f1c
  realyutou

  authored
  4a36f1c

  Copy full SHA for 4a36f1c

• Merge remote-tracking branch 'origin/master'

  WinstonAdams

  committed
  485d2f2

  Copy full SHA for 485d2f2

• modify getTopUser function

  WinstonAdams

  committed
  b7deba9

  Copy full SHA for b7deba9

• feat: add email validator

  WinstonAdams

  committed
  cedf137

  Copy full SHA for cedf137

• Merge pull request #32 from realyutou/add-is.js

  Show description for b55fd8e
  realyutou

  authored
  b55fd8e

  Copy full SHA for b55fd8e

Commits on Sep 3, 2023

• Update README.md (新增測試帳號)

  WinstonAdams

  authored
  2115334

  Copy full SHA for 2115334

• Merge pull request #33 from realyutou/WinstonAdams-patch-3

  Show description for 9fbb8e5
  realyutou

  authored
  9fbb8e5

  Copy full SHA for 9fbb8e5

Commits on Sep 23, 2023

• fix: password.length could be 0

  realyutou

  committed
  5d44cfc

  Copy full SHA for 5d44cfc

Commits on Sep 26, 2023

• Merge pull request #34 from realyutou/fix-bug

  Show description for d4d2bfa
  WinstonAdams

  authored
  d4d2bfa

  Copy full SHA for d4d2bfa