Code

前後端分離組：eva, 橘皮, Ailsa, Lynn#914

Code

Open

EvvvaHsu wants to merge 225 commits intoALPHACamp:masterALPHACamp/twitter-api-2020:masterfrom seangotjuice:masterseangotjuice/twitter-api-2020:masterCopy head branch name to clipboard

+2,800-6,328

Commits

Commits on Aug 20, 2023

• chore: add folders and files

  seangotjuice

  committed
  f0f172f

• add hi

  seangotjuice

  committed
  23210be

• feat: add user, tweet, reply, like, followship models

  EvvvaHsu

  committed
  9ae4b06

• fix: uppercase for models

  EvvvaHsu

  committed
  a9f1d70

• Co-authored-by: Eva <[email protected]>

  seangotjuice

  committed
  47c0678

• feat: add associations between models

  EvvvaHsu

  committed
  6a0cd9a

• Merge branch 'master' of github.com:seangotjuice/twitter-api-2020

  seangotjuice

  committed
  1405009

• Merge branch 'master' of github.com:seangotjuice/twitter-api-2020

  seangotjuice

  committed
  a189a83

Commits on Aug 21, 2023

• chore: add user, tweet, reply seeder file

  seangotjuice

  committed
  c3bbe6f

• feat: adminController add 3 routes

  seangotjuice

  committed
  c8531cc

• feat: add error-handler

  EvvvaHsu

  committed
  0c4baea

• add getTweets and getTweet routes

  EvvvaHsu

  committed
  3277bd6

• feat: add getTweets and getTweet routes

  EvvvaHsu

  committed
  20051c3

• Merge branch 'master' of github.com:seangotjuice/twitter-api-2020

  seangotjuice

  committed
  2c0f400

• test2

  seangotjuice

  committed
  84bf59c

• Merge pull request #1 from seangotjuice/test2

  Show description for d2a44c8
  seangotjuice

  authored
  d2a44c8

• Merge branch 'master' into feature/adminController

  seangotjuice

  authored
  55fcf47

• Merge pull request #2 from seangotjuice/feature/adminController

  Show description for 25bc889
  seangotjuice

  authored
  25bc889

• fix: conflicts

  EvvvaHsu

  committed
  cc11e66

• refactor: made a lot of changes

  EvvvaHsu

  committed
  1294a61

• Merge pull request #3 from seangotjuice/refactor

  Show description for dea8219
  seangotjuice

  authored
  dea8219

Commits on Aug 22, 2023

• chore: add 50 seed user

  seangotjuice

  committed
  a4f8f95

• fix: getTweets

  seangotjuice

  committed
  64ba901

• fix: bugs

  seangotjuice

  committed
  8d670a1

• Merge pull request #4 from seangotjuice/feature/adminController-login

  Show description for b81be12
  seangotjuice

  authored
  b81be12

• chore: tweet table add replyCount, likeCount

  seangotjuice

  committed
  52e4871

• feat: add Procfile

  EvvvaHsu

  committed
  b487ff7

• feat: admin login

  seangotjuice

  committed
  8a0f868

• bug: add cors, heroku and bug on dotenv

  EvvvaHsu

  committed
  28b2164

• final test

  EvvvaHsu

  committed
  0e58529

• Merge pull request #5 from seangotjuice/passport

  Show description for 2d2612e
  seangotjuice

  authored
  2d2612e

Commits on Aug 23, 2023

• feat: modify config for heroku

  seangotjuice

  committed
  c4886d6

• fix: modify app.js require dotenv

  seangotjuice

  committed
  e106661

• fix: modify index.js

  seangotjuice

  committed
  b26920f

• fix: add engines to package.json

  seangotjuice

  committed
  4a70173

• feat: add jwt to admin login

  seangotjuice

  committed
  3cf76d4

• Merge pull request #6 from seangotjuice/jwt

  Show description for 7bd2a45
  seangotjuice

  authored
  7bd2a45

• feat: add getUser

  EvvvaHsu

  committed
  c5b2a40

• feat: merge

  EvvvaHsu

  committed
  5109b8e

• feat: api-auth

  EvvvaHsu

  committed
  a4bbced

• Merge pull request #7 from seangotjuice/feature/getUser

  Show description for 37b022c
  seangotjuice

  authored
  37b022c

• feat: add user signin and signup

  EvvvaHsu

  committed
  d6af68c

• Merge branch 'master' of https://github.com/seangotjuice/twitter-api-2020 into feature/getUser

  EvvvaHsu

  committed
  8d962d4

Commits on Aug 24, 2023

• fix: seeder tweets

  seangotjuice

  committed
  0d708da

• Merge pull request #8 from seangotjuice/feature/getUser

  Show description for ce07bf9
  seangotjuice

  authored
  ce07bf9

• feat: add getUserReplies

  EvvvaHsu

  committed
  40e26b3

• feat: getUerReplies

  EvvvaHsu

  committed
  1b827da

• Merge pull request #10 from seangotjuice/feature/getUserReplies

  Show description for 331ee8d
  seangotjuice

  authored
  331ee8d

• fix: bugs

  seangotjuice

  committed
  2ee5f28

• fix: merge conflicts

  seangotjuice

  committed
  9577b9c

• fix: bugs tweet seeder

  seangotjuice

  committed
  e09dd2f

• fix: modify app.js

  seangotjuice

  committed
  8fa4ee3

• fix: add require dotenv

  seangotjuice

  committed
  38f1489

• fix: modify package.json

  seangotjuice

  committed
  4ad7667

• feat: jwt

  seangotjuice

  committed
  5dd43b9

• Merge branch 'master' into jwt

  seangotjuice

  authored
  44f9858

• Merge pull request #11 from seangotjuice/jwt

  Show description for 058279b
  seangotjuice

  authored
  058279b

• bug: still cannot pass test

  EvvvaHsu

  committed
  6263c17

• fix: eslint

  EvvvaHsu

  committed
  2dac519

• feat: merge master

  EvvvaHsu

  committed
  3fe583e

• Merge pull request #12 from seangotjuice/getUserReplies

  Show description for 39cf330
  seangotjuice

  authored
  39cf330

• Merge branch 'master' of https://github.com/seangotjuice/twitter-api-2020

  EvvvaHsu

  committed
  ab5acdb

• fix: pass getUser feature

  EvvvaHsu

  committed
  4dfd40e

• fix: getUserReplies

  EvvvaHsu

  committed
  8934b2d

• fix: admin/getUsers

  EvvvaHsu

  committed
  e963592

• refactor: getTweets and getTweet controller

  EvvvaHsu

  committed
  73e5f2e

• feat: add likeTweet

  EvvvaHsu

  committed
  ea80823

• feat: add like seeder

  EvvvaHsu

  committed
  4f50bf4

• feat: add likeTweet

  EvvvaHsu

  committed
  3dd0b51

• feat: add unlike

  EvvvaHsu

  committed
  d2b1095

• fix: to pass test

  EvvvaHsu

  committed
  95f8825

• Merge pull request #13 from seangotjuice/test1

  Show description for 89d5dfd
  seangotjuice

  authored
  89d5dfd

Commits on Aug 25, 2023

• feat: add tweetcontroller

  seangotjuice

  committed
  0746bde

• feat: 取得某一則貼文所有留言

  seangotjuice

  committed
  8fcf6a5

• feat: 新增一筆留言

  seangotjuice

  committed
  774e9ee

• feat: 查看一則貼文所有按讚

  seangotjuice

  committed
  8e86f35

• fix: pass test

  seangotjuice

  committed
  26c8392

• fix: bugs

  seangotjuice

  committed
  d717e28

• fix: es lint

  seangotjuice

  committed
  1eb267c

• Merge pull request #14 from seangotjuice/feature/getTweets

  Show description for 8813ee9
  seangotjuice

  authored
  8813ee9

• style: formatting

  EvvvaHsu

  committed
  01f4611

• bug: putUser is still in the process

  EvvvaHsu

  committed
  e19a2f8

Commits on Aug 26, 2023

• feat: add draft putUser

  EvvvaHsu

  committed
  7fff7e2

• Merge pull request #16 from seangotjuice/morefeature

  Show description for c7c4227
  seangotjuice

  authored
  c7c4227

• feat: add controller

  seangotjuice

  committed
  0ea4812

• feat: follerUser

  seangotjuice

  committed
  1d62598

• feat: follow and unfollow

  seangotjuice

  committed
  6571ffa

• Merge pull request #17 from seangotjuice/feature/followship

  Show description for c362d40
  seangotjuice

  authored
  c362d40

• bug: cannot pass test

  EvvvaHsu

  committed
  ebe6607

• feat: getUserLikes

  EvvvaHsu

  committed
  66bebca

• feat: getUserTweets

  EvvvaHsu

  committed
  33c43f6

• feat: add followship seeder

  EvvvaHsu

  committed
  9b3d79d

• add getUserFollowers

  EvvvaHsu

  committed
  b20adf2

• fix: to pass getUserFollowers test

  EvvvaHsu

  committed
  b223210

• feat: modify cors env

  EvvvaHsu

  committed
  31a46ea

• feat: add getUserFollowing

  EvvvaHsu

  committed
  176945d

• fix: pass some test

  EvvvaHsu

  committed
  97aaab8

• fix: pass all of the test

  EvvvaHsu

  committed
  54cd3e1

Commits on Aug 27, 2023

• Merge pull request #18 from seangotjuice/putUser

  Show description for e6fa7d2
  seangotjuice

  authored
  e6fa7d2

• feat: top10 user

  seangotjuice

  committed
  e18f3cd

• fix: corsOptions

  seangotjuice

  committed
  5031cb2

• feat: create README.md

  EvvvaHsu

  authored
  b561b13

• feat: CORS-header

  seangotjuice

  committed
  26c5dbf

• fix: es lint

  seangotjuice

  committed
  edc77be

• fix: response 200

  seangotjuice

  committed
  bace556

• feat: modify

  EvvvaHsu

  committed
  496b816

• fix: response 200

  seangotjuice

  committed
  bd5e363

• fix: bugs

  seangotjuice

  committed
  691811f

• Merge pull request #19 from seangotjuice/readme

  Show description for 867cb33
  seangotjuice

  authored
  867cb33

• fix: fix small bug and delete unnecessary code

  EvvvaHsu

  committed
  d1d1206

• Merge branch 'master' into fix

  seangotjuice

  authored
  99d8bdf

• Merge pull request #20 from seangotjuice/fix

  Show description for 7efc952
  seangotjuice

  authored
  7efc952

• fix: bugs

  seangotjuice

  committed
  ffc35c3

• Merge branch 'master'

  seangotjuice

  committed
  ba8bba5

• fix: bugs

  seangotjuice

  committed
  49dae7c

• fix: bugs

  seangotjuice

  committed
  cd6f82e

• fix: likes seed

  seangotjuice

  committed
  1f161af

Commits on Aug 28, 2023

• fix : bugs

  seangotjuice

  committed
  38e6aed

• feat: modify getTweeets

  seangotjuice

  committed
  4503dce

• fix: modify admin

  seangotjuice

  committed
  0ba530f

• fix: getUser modify response

  seangotjuice

  committed
  6e99618

• feat: modify seeder amount

  seangotjuice

  committed
  cec76d6

• fix: admin controller get tweets

  seangotjuice

  committed
  4077a51

• feat: modify admin/users response data

  seangotjuice

  committed
  cdb738f

• fix: modify getUser order by createdat

  seangotjuice

  committed
  fa147c6

• fix: add createdAt to getTweets reponse

  seangotjuice

  committed
  695a1b5

• feat: merge remote

  EvvvaHsu

  committed
  21ae3c1

• fix : modify getTweet:id

  seangotjuice

  committed
  f2fb1da

• fix: getTweets like count and reply count

  seangotjuice

  committed
  944216c

• fix: typo

  seangotjuice

  committed
  6809151

• fix: admin signIn

  seangotjuice

  committed
  209b46c

• fix: test modify routes index.js

  seangotjuice

  committed
  faed602

• merge

  EvvvaHsu

  committed
  022497e

Commits on Aug 29, 2023

• fix: get specific tweet bugs

  seangotjuice

  committed
  f176983

• fix: creatOneReply

  seangotjuice

  committed
  04e39f2

• fix: bugs

  seangotjuice

  committed
  684c6ac

• merge

  EvvvaHsu

  committed
  1ffc320

• Merge branch 'master' of https://github.com/seangotjuice/twitter-api-2020

  EvvvaHsu

  committed
  f62c049

• fix: cors use package

  seangotjuice

  committed
  6ffeff5

• fix: authenticated admin

  seangotjuice

  committed
  9608276

• fix: bugs

  seangotjuice

  committed
  425837b

• merge

  EvvvaHsu

  committed
  cfda9c7

• fix : bugs

  seangotjuice

  committed
  772bfaa

• merge

  EvvvaHsu

  committed
  03e7816

• fix : bugs

  seangotjuice

  committed
  6e835ab

• Merge branch 'master' of https://github.com/seangotjuice/twitter-api-2020

  EvvvaHsu

  committed
  4094e15

• fix: delete corsOptions

  seangotjuice

  committed
  d186462

• fix: corsOptions OPTIONS

  seangotjuice

  committed
  305f6a1

• fix: cors

  EvvvaHsu

  committed
  6a82e51

• fix: admin login can get data now

  EvvvaHsu

  committed
  159cd4d

• style: do some modification

  EvvvaHsu

  committed
  cd949f4

Commits on Aug 30, 2023

• Merge branch 'master' into fixcors

  seangotjuice

  authored
  b2520a2

• Merge pull request #21 from seangotjuice/fixcors

  Show description for d2ff523
  seangotjuice

  authored
  d2ff523

• fix: isfollowed

  seangotjuice

  committed
  fbc8d2d

• fix: isFollowing boolean

  seangotjuice

  committed
  a37fe7e

• fix: isFollowed

  seangotjuice

  committed
  aeab7a2

• fix : reply count and like count

  seangotjuice

  committed
  ebe1cef

• fix: signup error handler should send response to frontend

  seangotjuice

  committed
  324ea38

• fix: get user liked tweets

  seangotjuice

  committed
  62eeb7b

• fix: getTweets and getTweet

  EvvvaHsu

  committed
  58335ce

• fix: remove name required option

  EvvvaHsu

  committed
  509fdf6

• Merge pull request #22 from seangotjuice/test2

  Show description for 40c6539
  seangotjuice

  authored
  40c6539

• fix: follow user 500 err

  seangotjuice

  committed
  20e9e0a

Commits on Aug 31, 2023

• fix: followship/unfollow

  seangotjuice

  committed
  d468eb2

• fix: top 10

  seangotjuice

  committed
  ac17538

• fix: bugs

  seangotjuice

  committed
  bc82b6a

• fix: bugs

  seangotjuice

  committed
  7fa472c

• fix:top 10 bugs

  seangotjuice

  committed
  29b319a

• fix : created at timezone

  seangotjuice

  committed
  b31019b

• fix: seeder reply text

  seangotjuice

  committed
  b9c3e0e

• fix: like count and reply count

  seangotjuice

  committed
  c221cf5

• fix: reply count like count

  seangotjuice

  committed
  83789d0

• fix: bugs

  seangotjuice

  committed
  5a56ac3

• fix: bugs

  seangotjuice

  committed
  4973ca5

• fix: bugs

  seangotjuice

  committed
  ce3c17f

• fix: getFollowers and getFollowings and isFollowed

  EvvvaHsu

  committed
  f292f60

• merge

  EvvvaHsu

  committed
  b2b70f0

• Merge pull request #24 from seangotjuice/test3

  Show description for 4397115
  seangotjuice

  authored
  4397115

• merge

  EvvvaHsu

  committed
  fcf2254

• fix: user cover img

  seangotjuice

  committed
  c3f0f55

• fix: revise data structure

  EvvvaHsu

  committed
  35639d5

• fix : bugs

  seangotjuice

  committed
  760f3ca

• Merge pull request #25 from seangotjuice/test4

  Show description for 553cb59
  seangotjuice

  authored
  553cb59

• fix: merge

  seangotjuice

  committed
  9a59fa1

Commits on Sep 1, 2023

• fix: getUser liked tweets

  seangotjuice

  committed
  9b88b19

• fix: bugs

  seangotjuice

  committed
  d91390f

• fix : is liked boolean

  seangotjuice

  committed
  ebc55a6

• fix: getUserREPLIEDTWEETS

  seangotjuice

  committed
  5fe46f8

• fix: bugs

  seangotjuice

  committed
  55d15ae

• fix: top 10 repeated data

  seangotjuice

  committed
  274898c

• fix: new account avatar

  seangotjuice

  committed
  9adc3a2

• fix: bugs

  seangotjuice

  committed
  d021439

• style: error

  EvvvaHsu

  committed
  39e11c8

• Merge pull request #27 from seangotjuice/fixerror

  Show description for a9aa406
  seangotjuice

  authored
  a9aa406

• fix: test database points to test

  seangotjuice

  committed
  5c8f815

• fix :merge

  seangotjuice

  committed
  8bb375e

Commits on Sep 2, 2023

• fix: bugs

  seangotjuice

  committed
  5bf112d

• fix: update putUser

  EvvvaHsu

  committed
  d63f072

• Merge pull request #28 from seangotjuice/updateuser

  Show description for 8aa1c06
  seangotjuice

  authored
  8aa1c06

• fix : merge

  seangotjuice

  committed
  269eacc

Commits on Sep 3, 2023

• fix: to meet dod

  EvvvaHsu

  committed
  b84b0bb

• fix: to meet dod

  EvvvaHsu

  committed
  4e4ba59

• Merge pull request #29 from seangotjuice/userstory

  Show description for 0e7d359
  seangotjuice

  authored
  0e7d359

• fix: followingId error

  seangotjuice

  committed
  3108e93

• fix : bugs

  seangotjuice

  committed
  2a3c4ee

• fix :typo

  seangotjuice

  committed
  43d041f

• fix: to meet userstory

  EvvvaHsu

  committed
  d52ed05

• Merge pull request #30 from seangotjuice/test5

  Show description for 922f798
  seangotjuice

  authored
  922f798

Commits on Sep 4, 2023

• fix: follow order

  seangotjuice

  committed
  2e6c136

• fix: order

  seangotjuice

  committed
  0d60f72

• fix:bugs

  seangotjuice

  committed
  bd00c20

• fix :Bugs

  seangotjuice

  committed
  180dbad

• fix: bugs

  seangotjuice

  committed
  e378d8c

• fix: delete package lock

  seangotjuice

  committed
  6ca7ce3

• fix :jwt sectet

  seangotjuice

  committed
  a44fee4

• Merge branch 'master' of https://github.com/seangotjuice/twitter-api-2020

  EvvvaHsu

  committed
  e57882d

• fix: conflict

  EvvvaHsu

  committed
  7c8f781

• fix: error

  EvvvaHsu

  committed
  a3f10e1

• fix: package

  EvvvaHsu

  committed
  cb088e2

Commits on Nov 3, 2023

• fix: production database

  seangotjuice

  committed
  0d1ed2f

• merge:

  seangotjuice

  committed
  632afee

• fix env

  seangotjuice

  committed
  381a4d0

• config add dialect

  seangotjuice

  committed
  010373f

• database = railway

  seangotjuice

  committed
  2e42820

Commits on Nov 15, 2023

• fix: admin signin

  seangotjuice

  committed
  c7d2fd0