Code

全端開發robert-ou組#389

Code

Open

tingul4 wants to merge 248 commits intoALPHACamp:masterALPHACamp/twitter-fullstack-2020:masterfrom tingul4:mastertingul4/twitter-fullstack-2023:masterCopy head branch name to clipboard

+6,088-3,565

Commits

Commits on Aug 22, 2023

• feature: create model

  RobertOu0213

  committed
  2acdfb1

• Merge pull request #1 from tingul4/feature/model

  Show description for 976a168
  tingul4

  authored
  976a168

• feat: eslint files

  tingul4

  committed
  644ce14

• Merge pull request #3 from tingul4/develop

  Show description for 6560fd3
  tingul4

  authored
  6560fd3

• add reply, tweet model

  pupss91090

  committed
  7ec0941

• feat: add account and cover in Users column

  tingul4

  committed
  f5b93e3

• Merge branch with develop

  Show description for c720963
  pupss91090

  committed
  c720963

• Merge branch 'develop' into modelcreate_tweet_reply

  tingul4

  authored
  9aa764e

• Merge pull request #4 from tingul4/modelcreate_tweet_reply

  Show description for aeed75b
  tingul4

  authored
  aeed75b

• Merge branch 'develop'

  pupss91090

  committed
  871b2c1

Commits on Aug 23, 2023

• feat: add admin seed file

  Show description for 65b24cb
  tingul4

  committed
  65b24cb

• feat: add user seed file

  tingul4

  committed
  843969b

• refactor: notation

  RobertOu0213

  committed
  5746469

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into develop

  RobertOu0213

  committed
  8365e4e

• feat: add tweet seed file

  tingul4

  committed
  3fc5f18

• feat: add reply seed file

  tingul4

  committed
  3a0952a

• init: routes&controllers

  pupss91090

  committed
  6dadd59

• Merge pull request #6 from tingul4/init_routes/controllers

  Show description for 439772e
  tingul4

  authored
  439772e

• Merge pull request #5 from tingul4/feat/createSeeds

  Show description for 3899abc
  tingul4

  authored
  3899abc

• Merge branch 'feat/createSeeds' of https://github.com/tingul4/twitter-fullstack-2023 into develop

  RobertOu0213

  committed
  b02433e

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into develop

  RobertOu0213

  committed
  5b9ba4d

• setting_app.js

  RobertOu0213

  committed
  56f356a

• Merge pull request #7 from tingul4/develop

  tingul4

  authored
  98daf02

• feature: finish hbs setting

  RobertOu0213

  committed
  d532831

• Merge pull request #8 from tingul4/feature/handlebars_setting

  Show description for 9062d6b
  tingul4

  authored
  9062d6b

• feat: add auth middleware and helper and add passport

  tingul4

  committed
  6832746

• feat: complete login MVC and add error handler

  tingul4

  committed
  782c3cc

• feat: add check condition when signup

  tingul4

  committed
  78a0a47

• feat: finish tweet_view & side column button

  RobertOu0213

  committed
  7f3ab67

• refactor: add css & icon

  RobertOu0213

  committed
  98bc397

• Merge pull request #10 from tingul4/feature/tweets_view

  Show description for cb847eb
  tingul4

  authored
  cb847eb

• fix: change parameter name to pass test

  tingul4

  committed
  c3b1dd2

Commits on Aug 24, 2023

• Merge branch 'develop' into feat/userLogin

  tingul4

  authored
  6917945

• Merge pull request #9 from tingul4/feat/userLogin

  Show description for 36c5bbe
  tingul4

  authored
  36c5bbe

• feat: complete edit page and edit data successfully but still not pass test

  tingul4

  committed
  0294001

• Merge branch 'feat/editInfo' of https://github.com/tingul4/twitter-fullstack-2023 into feat/editInfo

  tingul4

  committed
  14a2d4d

• feat: change some condition when edit info but still not pass test

  tingul4

  committed
  2f58007

• feat: complete admin login and pass test

  tingul4

  committed
  b825ca7

• feat:finish reply tweet modal

  RobertOu0213

  committed
  6613c4a

• Merge pull request #11 from tingul4/feature/reply_modal

  Show description for f51c4d0
  tingul4

  authored
  f51c4d0

• refactor: use async await style

  tingul4

  committed
  2ac0357

• refactor: make code shorter

  tingul4

  committed
  f2a623c

• Merge pull request #12 from tingul4/develop

  Show description for 37f5dfc
  tingul4

  authored
  37f5dfc

• docs: add Procfile

  tingul4

  committed
  d323db3

• feat: modify config for heroku

  tingul4

  committed
  d075c7e

• fix: add authenticate in tweet route

  tingul4

  committed
  e044de5

Commits on Aug 25, 2023

• fix

  pupss91090

  committed
  f615a5d

• feat: update view of admin signin page

  tingul4

  committed
  6ba6d8c

• Merge pull request #13 from tingul4/feat/adminLogin

  Show description for fd68c1c
  RobertOu0213

  authored
  fd68c1c

• feat: update signin and signup views

  tingul4

  committed
  7ae9296

• Merge branch 'develop'

  Show description for 2acecf7
  pupss91090

  committed
  2acecf7

• Merge pull request #14 from tingul4/feat/loginView

  Show description for 9a20e07
  RobertOu0213

  authored
  9a20e07

• Merge pull request #15 from tingul4/develop

  Show description for c00331a
  tingul4

  authored
  c00331a

• Merge branch 'master' of https://github.com/tingul4/twitter-fullstack-2023

  tingul4

  committed
  119f194

• tweets.hbs align

  pupss91090

  committed
  363451e

• add users/tweets.hbs

  pupss91090

  committed
  b328736

• feat: init admin page

  tingul4

  committed
  798b0ec

• Merge branch 'view/frontpage' of https://github.com/tingul4/twitter-fullstack-2023 into view/frontpage

  tingul4

  committed
  5695f3a

• Merge pull request #16 from tingul4/view/frontpage

  Show description for 399a2b6
  tingul4

  authored
  399a2b6

• feat: display and delete tweets controller

  tingul4

  committed
  22c6ec1

• Merge pull request #17 from tingul4/master

  Show description for 97b6fd2
  tingul4

  authored
  97b6fd2

• import userController into routes/index.js

  pupss91090

  committed
  7e21236

• merge

  pupss91090

  committed
  a4864d0

• feat: complete edit page and edit data successfully but still not pass test

  tingul4

  committed
  1575396

• add handlebarhelper, add user tweet page tabs

  pupss91090

  committed
  4415f60

• Merge branch 'view/frontpage'

  Show description for c2b17f0
  pupss91090

  committed
  c2b17f0

• fix signin/signup page view

  pupss91090

  committed
  2725119

• fix: fix migration, model and seed file

  tingul4

  committed
  31d3af7

• Merge pull request #18 from tingul4/view/frontpage

  Show description for 92073b2
  tingul4

  authored
  92073b2

Commits on Aug 26, 2023

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into feat/adminPages

  tingul4

  committed
  8cf9237

• feat: complete admin tweets page

  tingul4

  committed
  8e8ff52

• userpage_tweet/reply/like

  pupss91090

  committed
  a22e09d

• add addFollowing/removeFollowing function

  pupss91090

  committed
  beb345a

• Merge pull request #19 from tingul4/view/frontpage

  Show description for c19d2d4
  tingul4

  authored
  c19d2d4

• refactor: change way to check if same user

  tingul4

  committed
  a73faa8

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into feat/editInfo

  tingul4

  committed
  ff41bf8

• docs: add handlebars-helper

  tingul4

  committed
  a50a7c3

• Merge branch 'feat/adminPages' of https://github.com/tingul4/twitter-fullstack-2023 into feat/editInfo

  tingul4

  committed
  fbf6b2b

• Merge pull request #20 from tingul4/feat/adminPages

  Show description for eda8fe8
  pupss91090

  authored
  eda8fe8

• routes adjust

  pupss91090

  committed
  aaf0d52

• merge

  pupss91090

  committed
  144f915

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  Show description for 4809e82
  pupss91090

  committed
  4809e82

• feat: update edit view

  tingul4

  committed
  0ca93c3

• Merge branch 'develop' into feat/editInfo

  tingul4

  authored
  bddeda3

• Merge pull request #21 from tingul4/feat/editInfo

  Show description for e901398
  pupss91090

  authored
  e901398

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  pupss91090

  committed
  8a29e91

• adjust icon with status

  pupss91090

  committed
  1237565

• feat: tweet_reply controller

  RobertOu0213

  committed
  87594ed

• feat: admin users

  tingul4

  committed
  52daf1c

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into feat/controller

  tingul4

  committed
  cf359a2

• Merge pull request #23 from tingul4/feat/controller

  Show description for 6f3f5ff
  tingul4

  authored
  6f3f5ff

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into edit/navigation

  tingul4

  committed
  8d5867c

• Merge pull request #22 from tingul4/edit/navigation

  Show description for 480b8f9
  tingul4

  authored
  480b8f9

• fix: conflict bug

  tingul4

  committed
  c7e171c

• Merge pull request #24 from tingul4/develop

  Show description for 685fcfd
  tingul4

  authored
  685fcfd

• Merge branch 'master' of https://github.com/tingul4/twitter-fullstack-2023

  tingul4

  committed
  de7e7a4

Commits on Aug 27, 2023

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into feat/adminUsers

  tingul4

  committed
  7378453

• feat: complete admin users view page

  tingul4

  committed
  7e05a12

• feat: complete admin users but not pass test

  tingul4

  committed
  b4f6f0d

• feat: order by tweetCount and fix delete bug

  tingul4

  committed
  bb09029

• feat: complete personal-modal view page

  tingul4

  committed
  7c84c3d

• feat: can upload cover and avatar

  tingul4

  committed
  e9f195a

• user/followerpage&user/followingpage function

  pupss91090

  committed
  761b86f

• userpage/partials adjust

  pupss91090

  committed
  739b477

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  Show description for 630b1cc
  pupss91090

  committed
  630b1cc

• Merge branch 'develop' into userpage/followingship

  pupss91090

  authored
  3db47ea

• Merge pull request #26 from tingul4/userpage/followingship

  Show description for 2cc9d27
  tingul4

  authored
  2cc9d27

• Merge pull request #25 from tingul4/feat/adminUsers

  Show description for 726b23b
  RobertOu0213

  authored
  726b23b

• feat: refactor modal

  RobertOu0213

  committed
  b29c46e

• feat: display user avatar

  tingul4

  committed
  428769e

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into feat/uploadImage

  tingul4

  committed
  47e0ccd

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  Show description for 5bdf672
  pupss91090

  committed
  5bdf672

• likepage controller

  pupss91090

  committed
  c34a08f

• Merge pull request #27 from tingul4/refactor/modal

  Show description for f7dd7b8
  tingul4

  authored
  f7dd7b8

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into feat/uploadImage

  tingul4

  committed
  884fc56

Commits on Aug 28, 2023

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  pupss91090

  committed
  bd8784d

• Merge branch 'master' into user/getlikepage

  pupss91090

  committed
  d0f5742

• feat: complete avatar display without background

  tingul4

  committed
  9dd4d73

• adjust user tweets page with like function

  pupss91090

  committed
  c802766

• Merge pull request #28 from tingul4/feat/uploadImage

  Show description for 1baea78
  RobertOu0213

  authored
  1baea78

• refactor: count func

  RobertOu0213

  committed
  b462a3d

• fix like logic @user tweet page

  pupss91090

  committed
  d5c41ef

• fix like logic @user like page

  pupss91090

  committed
  8cd240c

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  pupss91090

  committed
  fafdd2e

• remove find like model in user reply page

  pupss91090

  committed
  50bc7a4

• feat: add logo on title and link google font

  tingul4

  committed
  1e1cfe5

• adjust logic in user following/follower page

  pupss91090

  committed
  49d1f49

• adjust view in user following/follower page

  pupss91090

  committed
  5f0cd7b

• add reply modal in user pages

  pupss91090

  committed
  bd8bb75

• add navigation & top10user side columns

  pupss91090

  committed
  562fd6e

• const reqUser in everypage for navigation

  pupss91090

  committed
  2fe1ccc

• feat: adjust admin pages' view

  tingul4

  committed
  4ea1686

• feat: modal error message

  RobertOu0213

  committed
  baa7eea

• make tweet-card partial

  pupss91090

  committed
  bf00d83

• add direct back on header icon

  pupss91090

  committed
  cedb04b

• add tweet-card partial

  pupss91090

  committed
  80be8a2

• adjust user-page-tabs with status

  pupss91090

  committed
  c33fd6d

• adjust user-followpage-tabs with status

  pupss91090

  committed
  6b55a97

• make user-followpage-tweet-card.hbs

  pupss91090

  committed
  81c3082

• feat: adjust admin user card details

  tingul4

  committed
  cfd0ecf

• Merge pull request #30 from tingul4/user/getlikepage

  Show description for dae81c4
  tingul4

  authored
  dae81c4

• Merge pull request #31 from tingul4/feat/viewDetails

  Show description for 3e5093a
  RobertOu0213

  authored
  3e5093a

• tweet card view adjust

  pupss91090

  committed
  52bef94

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  pupss91090

  committed
  526b5c5

• Merge pull request #32 from tingul4/feat_add_count_func

  Show description for e4746a0
  pupss91090

  authored
  e4746a0

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  Show description for 5bdb9c4
  pupss91090

  committed
  5bdb9c4

• top10 user add role user limit

  pupss91090

  committed
  cba08e1

• Merge pull request #33 from tingul4/align/frontpage_userpage

  Show description for 1d70595
  tingul4

  authored
  1d70595

Commits on Aug 29, 2023

• feat: side column for tweet& reply page

  RobertOu0213

  committed
  8d8adf0

• feat: add CSS in error message

  tingul4

  committed
  aed7b5b

• feat: click avatar to another page

  RobertOu0213

  committed
  b0f6dc0

• feat: add error message in auth and fix edit user bugs

  tingul4

  committed
  3881484

• align three-column layout & border

  pupss91090

  committed
  92615dd

• modify partial icons folder

  pupss91090

  committed
  4343fef

• modify partial contentcards&navs folder

  pupss91090

  committed
  25d0ea8

• modify partial header

  pupss91090

  committed
  6b31363

• modify admin page layout

  pupss91090

  committed
  1ed85df

• modify column icon

  pupss91090

  committed
  3d0b675

• modify follow function on userpage-info with status, modify controller getUserRepliesPage with async await

  pupss91090

  committed
  462ce27

• refactor: change req.user to helpers way

  tingul4

  committed
  5e8445a

• feat: try

  RobertOu0213

  committed
  30dd35c

• align avatar/cover defalut

  pupss91090

  committed
  4d3c5b6

• Merge branch 'align/frontpage_userpage'

  pupss91090

  committed
  e337460

• Merge pull request #34 from tingul4/align/frontpage_userpage

  Show description for 5084994
  tingul4

  authored
  5084994

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into feat/errorMessage

  tingul4

  committed
  94cd6c4

• refactor: modal

  RobertOu0213

  committed
  a881e7b

• feat: align all views

  tingul4

  committed
  499ab10

• fix: revise parameter number

  tingul4

  committed
  b21bb05

• Merge pull request #35 from tingul4/feat/errorMessage

  Show description for 9c44840
  pupss91090

  authored
  9c44840

• adjust tweet-card

  pupss91090

  committed
  49985de

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  Show description for d3b1d18
  pupss91090

  committed
  d3b1d18

• homepage layout

  pupss91090

  committed
  4f5383f

• partial reply icon

  pupss91090

  committed
  19859cd

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  tingul4

  committed
  c530d05

• reply card align

  pupss91090

  committed
  741ebcc

• feat: avatar image

  RobertOu0213

  committed
  425c5b3

• refactor: avatar

  RobertOu0213

  committed
  4971e55

• Merge branch 'develop' into feat/tweet_controller

  tingul4

  authored
  b04dcfa

• Merge pull request #38 from tingul4/feat/tweet_controller

  Show description for 430bffa
  tingul4

  authored
  430bffa

• fix: recover tweet.hbs

  tingul4

  committed
  8b8ecf9

• homepage layout

  pupss91090

  committed
  d24fbf4

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  Show description for c0b6471
  pupss91090

  committed
  c0b6471

• align tweets&replies

  pupss91090

  committed
  7307c81

• check all page have certain modals

  pupss91090

  committed
  b6d99a0

Commits on Aug 30, 2023

• Merge pull request #39 from tingul4/align/frontpage_userpage

  Show description for ad2a396
  tingul4

  authored
  ad2a396

• fix: error messgaes and authentication

  tingul4

  committed
  a02770b

• fix: login authentication

  tingul4

  committed
  1504d26

• fix: calculate liked number correctly

  tingul4

  committed
  649a5e0

• finish modal error

  RobertOu0213

  committed
  aac99f3

• feat: 404 error page

  RobertOu0213

  committed
  6b9adc8

• refactor: pass test

  RobertOu0213

  committed
  923f2d5

• Merge pull request #40 from tingul4/refactor/modal_user

  Show description for 2c3e01c
  tingul4

  authored
  2c3e01c

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into fix/details

  tingul4

  committed
  818f42e

• refactor: follower only 10 people

  RobertOu0213

  committed
  0a71c3d

• refactor:top-user-bar

  RobertOu0213

  committed
  1fe79d3

• feat: comment&reply success_msg

  RobertOu0213

  committed
  207d548

• feat: add form validation

  tingul4

  committed
  ee13bbf

• Merge pull request #41 from tingul4/refactor_robert

  Show description for e88a058
  tingul4

  authored
  e88a058

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into fix/details

  tingul4

  committed
  0205018

• Merge pull request #42 from tingul4/fix/details

  Show description for e6cac79
  RobertOu0213

  authored
  e6cac79

• modify follower/following page controller& hbs

  pupss91090

  committed
  ea1eca9

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  pupss91090

  committed
  0fd8fb7

• Merge branch 'develop'

  tingul4

  committed
  76e53e5

• modify likes page view

  pupss91090

  committed
  83a012d

• modify followships page logic

  pupss91090

  committed
  b0ac4d8

• remove extra tweet modal

  pupss91090

  committed
  005a7ff

Commits on Aug 31, 2023

• modify for test file

  pupss91090

  committed
  70a45fd

• Merge pull request #43 from tingul4/modify/followshippage

  Show description for 51e4c09
  RobertOu0213

  authored
  51e4c09

• Merge branch 'modify/followshippage'

  pupss91090

  committed
  209deed

• Merge pull request #44 from tingul4/modify/followshippage

  Show description for 54d86f8
  tingul4

  authored
  54d86f8

• refactor modal form outline

  RobertOu0213

  committed
  49c47c9

• feat: add previewImage and rename error-msg

  tingul4

  committed
  ac3a19e

• refactor: dynamic display input length

  tingul4

  committed
  37ca5b0

• fix: error auth and messages

  tingul4

  committed
  571866f

• fix: unnecessary auth

  tingul4

  committed
  5642b56

• Merge pull request #45 from tingul4/fix/details

  Show description for 7ecd6bf
  RobertOu0213

  authored
  7ecd6bf

• fix: add:text-break & error_msg_js

  RobertOu0213

  committed
  cdc2ee2

• fix: addFollowing route

  tingul4

  committed
  aa75c4d

• fix: modal

  RobertOu0213

  committed
  eb5099f

• fix: modal

  RobertOu0213

  committed
  70772f8

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into refactor/test

  tingul4

  committed
  9f596eb

• fix: rename error reply

  tingul4

  committed
  51e3cde

• Merge pull request #46 from tingul4/refactor/test

  Show description for 961c54b
  tingul4

  authored
  961c54b

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023 into fix/details

  tingul4

  committed
  ef218b2

• fix: followships order

  tingul4

  committed
  95e1b9e

• fix: add status code

  tingul4

  committed
  88ae746

• fix: login auth way

  tingul4

  committed
  c105234

• fix: followships order

  tingul4

  committed
  e07c4e2

• fix: hint messages

  tingul4

  committed
  af6b6e2

Commits on Sep 1, 2023

• Merge pull request #47 from tingul4/fix/details

  Show description for 3a13a18
  RobertOu0213

  authored
  3a13a18

• Merge branch 'develop' of https://github.com/tingul4/twitter-fullstack-2023

  tingul4

  committed
  f17765f

• fix: edit user

  tingul4

  committed
  4c91535

• fix: add following

  tingul4

  committed
  2523d19

• Merge pull request #48 from tingul4/fix/route

  Show description for ac25119
  RobertOu0213

  authored
  ac25119

• fix: session secret

  tingul4

  committed
  20384a5

• fix: modal

  RobertOu0213

  committed
  c350563

• Merge pull request #49 from tingul4/fix/modal

  Show description for 6b94104
  tingul4

  authored
  6b94104

Commits on Sep 2, 2023

• add readme.md

  pupss91090

  committed
  b4454e7

• compress screenshot files

  pupss91090

  committed
  88b56cb

• compress

  pupss91090

  committed
  dae53d7

• Merge pull request #50 from tingul4/feat/readme

  Show description for d33e91e
  tingul4

  authored
  d33e91e

• docs: add .env.example

  tingul4

  committed
  c9e2749

• Merge pull request #51 from tingul4/docs

  Show description for db6965b
  RobertOu0213

  authored
  db6965b

Commits on Sep 3, 2023

• fix: topuser_add slice(0, 10)

  RobertOu0213

  committed
  89fa426

• fix: users_likes.hbs & user-controller_getUserLikesPage

  RobertOu0213

  committed
  d2eeab1

• Merge pull request #53 from tingul4/fix/topuser

  Show description for 66bc3a5
  tingul4

  authored
  66bc3a5

• Merge pull request #54 from tingul4/fix/getUserLikesPage

  Show description for 1f71526
  tingul4

  authored
  1f71526

Commits on Nov 8, 2023

• Update README.md

  pupss91090

  authored
  dc8b915