Code

全端開發-tom-組#339

Code

Open

awei1127 wants to merge 200 commits intoALPHACamp:masterALPHACamp/twitter-fullstack-2020:masterfrom awei1127:masterawei1127/twitter-fullstack-2020:masterCopy head branch name to clipboard

+8,560-4,040

Commits

Commits on Jun 5, 2023

• project init

  awei1127

  committed
  f316a2e

• create models and associations

  awei1127

  committed
  85982c6

• add passport bcryptjs dotenv

  awei1127

  committed
  7cf10a5

• sequelize-cli upgrate to 6.2.0. reset models and migrations.

  awei1127

  committed
  e77470f

Commits on Jun 6, 2023

• Merge pull request #1 from awei1127/feature/a

  Show description for 1854dd4
  goodjobhot401

  authored
  1854dd4

• doc: add README.md

  rr37

  committed
  6594e4e

• feat: add users/tweets/replies seed files

  goodjobhot401

  committed
  fe838a2

• feat: add main view

  rr37

  committed
  c984977

• Merge pull request #3 from awei1127/feature/Tom

  Show description for 1267c8e
  rr37

  authored
  1267c8e

• Merge remote-tracking branch 'origin/master'

  rr37

  committed
  ce2be4d

• Merge branch 'master' into Dong

  awei1127

  authored
  930ae29

• Merge pull request #2 from awei1127/Dong

  Show description for c676d07
  awei1127

  authored
  c676d07

• adjust package-locked.json

  goodjobhot401

  committed
  9ac29fd

• feat: adjust package-lock.json

  goodjobhot401

  committed
  a8b2c72

• Merge pull request #5 from awei1127/Tom

  Show description for f115398
  rr37

  authored
  f115398

Commits on Jun 7, 2023

• Merge remote-tracking branch 'origin/master'

  rr37

  committed
  2a2fd1f

• Merge remote-tracking branch 'origin/master'

  rr37

  committed
  799af80

• feat: add handlebars helper & combine custom helper

  rr37

  committed
  465d824

• feat: add show all tweets page

  rr37

  committed
  20d3cb1

• feat: add admin-tweets-page & admin-users-page

  goodjobhot401

  committed
  e3cf8f5

• feat: adjust adminController getUsers

  goodjobhot401

  committed
  820802a

• feat: adjust users-seed-file

  goodjobhot401

  committed
  b8474fc

• style: use esLint to restyle code

  rr37

  committed
  42ca8ca

• bug: adjust style as AC course's demo

  rr37

  committed
  4c4edd7

• bug: fix modal display issue

  rr37

  committed
  ba3cc8b

• bug: change user seeder's cover link

  rr37

  committed
  01c9667

• add regist & login & logout feature

  awei1127

  committed
  19c9ade

• Merge branch 'feature/viewTweets'

  rr37

  committed
  f55b0e1

• rename login to signin, regist to signup. add 3 routes into routes/modules

  awei1127

  committed
  7155938

• feat: add authenticatedAdmin. adjust admin routes

  awei1127

  committed
  38ca822

Commits on Jun 8, 2023

• feat: add admin-deleteTweet function

  goodjobhot401

  committed
  4e581b8

• Merge branch 'master' into feature/viewTweets

  rr37

  authored
  8034274

• Merge pull request #6 from awei1127/feature/viewTweets

  Show description for 0d2f229
  rr37

  authored
  0d2f229

• Merge pull request #7 from awei1127/wei　水啦！

  Show description for 530eb11
  goodjobhot401

  authored
  530eb11

• modify admin-getUsers

  goodjobhot401

  committed
  21501d1

• run npm install to update package-lock.json

  awei1127

  committed
  b2eb7d4

• Merge remote-tracking branch 'origin/master'

  rr37

  committed
  238e5ce

• Merge branch 'master' into Tom

  goodjobhot401

  committed
  f0bfc91

• adjust app.js

  goodjobhot401

  committed
  2af8794

• feat: add admin-tweets/users/signin routes

  goodjobhot401

  committed
  080c6e2

• feat: add admin-sigin page & pass admin-login test

  goodjobhot401

  committed
  4aa3350

Commits on Jun 9, 2023

• Merge pull request #8 from awei1127/Tom

  Show description for 83e2c6e
  rr37

  authored
  83e2c6e

• Merge remote-tracking branch 'origin/master'

  rr37

  committed
  c9d126f

• feat: add postTweets function

  rr37

  committed
  6d1ccdb

• build: adjust _helpers.js position

  rr37

  committed
  668afa6

• feat: add UI due to signIn function added

  rr37

  committed
  25866a3

• refactor: move modal to partials and rename Modal for better recognize

  rr37

  committed
  0eed9a0

• Revert "build: adjust _helpers.js position"

  Show description for 476d360
  rr37

  committed
  476d360

• feat: adjust helpers's require way and model's variable to pass test

  rr37

  committed
  a8e5db6

• feat: add view user's page function

  rr37

  committed
  282f7aa

• feat: get specific tweet and its replies

  rr37

  committed
  fce2bce

• bug: fix modal display issue due to advanced merge

  rr37

  committed
  eb14d41

• Merge pull request #9 from awei1127/feature/addTweets

  Show description for e270066
  awei1127

  authored
  e270066

• fix signin process for user and adminUser

  awei1127

  committed
  e5b1b67

• admin cannot use non-admin routes

  awei1127

  committed
  ba4f1f8

Commits on Jun 10, 2023

• change User model's cover defaultValue to correctly show image

  awei1127

  committed
  e24c6a7

• feat: add API for get userData when edit

  awei1127

  committed
  000609d

• feat: add edit profile feature

  awei1127

  committed
  b6290f4

• heroku init

  awei1127

  committed
  79fb389

• modify config for heroku

  awei1127

  committed
  351a6d5

• modify config for Heroku

  awei1127

  committed
  ccf16d3

Commits on Jun 11, 2023

• Merge pull request #10 from awei1127/wei

  rr37

  authored
  2942642

• bug: fix tweet order in user Profile page

  rr37

  committed
  4d9b16c

• bug: fix follow user display function in user profile page

  rr37

  committed
  fb16f38

• feat: add addFollow/removeFollow function

  goodjobhot401

  committed
  f5eee0f

• bug: fix Modal display issue

  rr37

  committed
  6e69fa2

• add user's default avatar

  awei1127

  committed
  d0ceffe

• feat: add postLike & postUnlike & addFollow & removeFollow function

  goodjobhot401

  committed
  ab418d4

• add edit setting feature

  awei1127

  committed
  0d6bc2f

• modify edit setting feature

  awei1127

  committed
  20818a0

• feat: add post Reply function

  rr37

  committed
  a883c54

• feat: add admin-getTweets function

  goodjobhot401

  committed
  cda2d6c

• feat: adjust admin-getTweets function

  goodjobhot401

  committed
  7097adf

• Merge pull request #12 from awei1127/Tom

  awei1127

  authored
  6d570ab

• Merge branch 'master' into wei

  awei1127

  committed
  de8ac94

• Merge pull request #11 from awei1127/wei

  rr37

  authored
  043ce80

• Merge branch 'master' into addReplies

  goodjobhot401

  authored
  0b6a7f7

• Merge pull request #13 from awei1127/addReplies

  goodjobhot401

  authored
  a3acd28

• modify typo error

  awei1127

  committed
  f1540fd

• modify typo error

  awei1127

  committed
  132cd29

Commits on Jun 12, 2023

• feat: adjust tweets page

  goodjobhot401

  committed
  63e3257

• feat: like/unlike function can render successfully

  goodjobhot401

  committed
  d6e8f30

• feat: add getUserFollowers function

  goodjobhot401

  committed
  bd587c8

• feat: add getUserFollowings function

  goodjobhot401

  committed
  1942aaf

• feat: adjust getUserPage function and user.hbs

  goodjobhot401

  committed
  1443b6a

• add role column to user model and modify relevant part

  awei1127

  committed
  2e956c1

• add role in user model. change confirmPassword to checkPassword.

  awei1127

  committed
  ddc61f9

• remove isAdmin column from user model

  awei1127

  committed
  ad9ded7

• modify seed file, change isAdmin to role

  awei1127

  committed
  9a4952f

• modify config/passport

  awei1127

  committed
  c56d154

Commits on Jun 13, 2023

• feat: adjust user-page-followers/followings-route

  goodjobhot401

  committed
  c23a225

• feat: getUserFollowings and getUserFollowers can sort by desc

  goodjobhot401

  committed
  e6f34ec

• Merge pull request #14 from awei1127/passTest

  rr37

  authored
  6c112e2

• feat: adjust getUserFollowers function

  goodjobhot401

  committed
  1c60c51

• Merge branch 'master' of https://github.com/awei1127/twitter-fullstack-2020

  goodjobhot401

  committed
  aff11f1

• Merge branch 'master' into Tom

  goodjobhot401

  committed
  48287d6

• modify passport local strategy config

  awei1127

  committed
  5474d94

• Merge pull request #15 from awei1127/passTest

  rr37

  authored
  fffbbcd

• Merge branch 'master' of https://github.com/awei1127/twitter-fullstack-2020

  goodjobhot401

  committed
  e144eef

• Merge branch 'master' into Tom

  goodjobhot401

  committed
  90a873e

• feat: add reply function at user page

  rr37

  committed
  80f597e

• bug: change userId name at reply model to pass test

  rr37

  committed
  772ae4e

• doc: update all test commend in README.md

  rr37

  committed
  8b82789

• bug: fix order issue in tweet page

  rr37

  committed
  48cccd5

• feat: add follow other user function

  rr37

  committed
  7c5ce93

• feat: add like tweet function

  rr37

  committed
  4e9a71a

• bug: fix avatar display issue in tweet page

  rr37

  committed
  0164f38

• feat: add "display all user's replies " function

  rr37

  committed
  f907e1d

• feat: add "display liked tweets in user page" function

  rr37

  committed
  5f18984

• feat: add "click image can go to userPage" function

  rr37

  committed
  a6c7ff0

• feat: add "switch mainPage tabs" function

  rr37

  committed
  b5b08f6

• bug: fix click profile button redirect to home page issue

  rr37

  committed
  c8c1195

• bug: fix topUsers partials display issue at setting page

  rr37

  committed
  a2cf284

• feat: add replyCount

  rr37

  committed
  bd6ab9e

• bug: fix "edit user data Modal display issue"

  rr37

  committed
  bb0beae

• bug: fix admin:0 to role

  rr37

  committed
  7c2fc2b

• Merge pull request #17 from awei1127/topUsers

  goodjobhot401

  authored
  45ae681

• feat: adjust user-controller.js

  goodjobhot401

  committed
  4a4de32

• Merge branch 'master' of https://github.com/awei1127/twitter-fullstack-2020

  Show description for 281bd6b
  goodjobhot401

  committed
  281bd6b

• feat: merge master

  goodjobhot401

  committed
  2b17e85

• feat: adjust views: tweet, tweets, userPage-tweets controller: user-controller routes:index.js

  goodjobhot401

  committed
  1f9e836

• Merge pull request #18 from awei1127/Tom

  rr37

  authored
  4e140ff

• feat: add buttun switch function at user page

  rr37

  committed
  4e6accd

Commits on Jun 14, 2023

• bug: fix user intro issue to pass test

  rr37

  committed
  625eaa5

• Merge pull request #19 from awei1127/topUsers

  goodjobhot401

  authored
  cc33df1

• add avatar and cover to edit page

  awei1127

  committed
  25692e7

• add icon and fillter to avatar and cover

  awei1127

  committed
  d06a1cc

• can preview avatar before submit

  awei1127

  committed
  f5a3c0f

• can update cover and avatar

  awei1127

  committed
  f122faa

• modify user-controller to pass test

  awei1127

  committed
  056e44f

• fix bug: when user cancle selected avatar/cover, will show previous image correctly

  awei1127

  committed
  439eb85

• change behavior when user save the editing profile. now just refrash profile page.

  awei1127

  committed
  28f41a6

• feat: add reset cover feature

  awei1127

  committed
  0ac02a9

• fix bug: now can show setting page correctly and edit setting correctly

  awei1127

  committed
  7cc66ff

• modify the data of API return. now do not return password.

  awei1127

  committed
  dc4b4d1

• add default of secret to pass test

  awei1127

  committed
  c816e57

• Merge pull request #20 from awei1127/editPhoto

  rr37

  authored
  6a7501e

• bug: fix userPage-tweets can't show isFollowed function

  rr37

  committed
  9d8276a

• feat: add tweet modal frontEnd error handleler

  rr37

  committed
  38e50fe

• feat: add reply modal frondEnd err handleler

  rr37

  committed
  c0d80a3

• feat: add frontEnd error handleler at main page

  rr37

  committed
  3654694

• feat: add admin-getUsers function

  goodjobhot401

  committed
  096e727

• bug: fix edit profile page display issue due to frontEnd error handler

  rr37

  committed
  c1bf6cc

Commits on Jun 15, 2023

• Merge branch 'master' into Tom

  goodjobhot401

  committed
  53efd70

• feat: adjust admin-getUsers controller

  goodjobhot401

  committed
  c576346

• feat: admin-mainPage can switch color

  goodjobhot401

  committed
  7447697

• Merge pull request #22 from awei1127/UxApprove

  goodjobhot401

  authored
  34031a0

• feat: add admin-deleteTweet modal

  goodjobhot401

  committed
  273b325

• Merge branch 'master' into Tom

  goodjobhot401

  committed
  99cc3b9

• feat: adjust admin-deleteTweet modal & deleteTweet function

  goodjobhot401

  committed
  02d8210

• feat: add followerCount and followingCount in userPage-likes & userPage-replies

  goodjobhot401

  committed
  962f319

• Merge pull request #23 from awei1127/Tom

  awei1127

  authored
  f22fa06

• refactor: rebuild notification messages to fit AC's design

  rr37

  committed
  d4f7cf1

• feat: add reply function when click tweet page's reply icon

  rr37

  committed
  aaf5ec2

• feat: tweets will order by it's like created time from new to old at userLikedPage

  rr37

  committed
  92ae63e

• bug: fix backEnd postTweets & postReply error handleler

  rr37

  committed
  2981d40

• refactor: modify time display style to zh-tw

  rr37

  committed
  91ab6a5

• bug: remove user avatar link in admin-user page

  rr37

  committed
  160450c

• refactor: adjust messages partial's position

  rr37

  committed
  269998c

• Merge pull request #24 from awei1127/UiApprove

  goodjobhot401

  authored
  428d24e

• fix bug: add event delegation to check button if clicked

  awei1127

  committed
  5de6721

• fix bug: now can get correct link of button to profile/setting page when go setting page

  awei1127

  committed
  d86aceb

• modify form UI

  awei1127

  committed
  d315ef9

• modify form UI

  awei1127

  committed
  725545a

• add condition to edit-profile page

  awei1127

  committed
  fda7b54

• modify form ui

  awei1127

  committed
  0603d85

• add name/intro limit at backend

  awei1127

  committed
  8e9e7c2

• modify noti location in signin/signup pages

  awei1127

  committed
  574ee01

• modify user controller

  awei1127

  committed
  87f8154

• modify user controller

  awei1127

  committed
  fb4370f

• use imgur to replace local file handler

  awei1127

  committed
  142fede

Commits on Jun 16, 2023

• feat: adjust followship page

  goodjobhot401

  committed
  16c903e

• feat: add topUsers in followship page

  goodjobhot401

  committed
  7cb6930

• Merge pull request #25 from awei1127/formUI

  rr37

  authored
  7d56b2e

• Merge branch 'master' into Tom

  goodjobhot401

  committed
  1b94c96

• fix bug: now admin can delete tweet correctly

  awei1127

  committed
  a9dcc16

• feat: adjust followers/followings page ui

  goodjobhot401

  committed
  61e1218

• feat: when login user saw itself in other user's following/follower page, hide follow/unfollow button

  goodjobhot401

  committed
  c7bb771

• Merge pull request #26 from awei1127/fixModal

  rr37

  authored
  5f55a02

• Merge branch 'master' into Tom

  goodjobhot401

  committed
  9028d96

• Merge pull request #27 from awei1127/Tom

  awei1127

  authored
  0d39fc2

• bug: fix display profile btn issue when get other user's page

  rr37

  committed
  72ce7b6

• doc: update README

  rr37

  committed
  e79ab31

• bug: fix replyModal display wrong fromNow error

  rr37

  committed
  b3a65fe

• doc: update README

  rr37

  committed
  c1ef320

• Merge pull request #28 from awei1127/ReadmeUpdate

  goodjobhot401

  authored
  0494d8e

• bug: fix deleteTweetModal display issue

  rr37

  committed
  b807721

• refactor: adjust admin-tweets page to fit AC's design

  rr37

  committed
  07a439c

• Merge pull request #29 from awei1127/ReadmeUpdate

  goodjobhot401

  authored
  c52c1d5

Commits on Jun 18, 2023

• bug: remove herf on description

  rr37

  committed
  61b5a5b

• bug: order issue in userLikesPage

  rr37

  committed
  2d3c586

• bug: tweet liked count issue at adminUser page

  rr37

  committed
  5bc27fa

• Merge pull request #30 from awei1127/LastDance

  goodjobhot401

  authored
  30743d7

• doc: remove useless folder

  rr37

  committed
  e65af6b

• Merge pull request #31 from awei1127/LastDance

  goodjobhot401

  authored
  de4212b

• doc: adjust error hint messages

  rr37

  committed
  ad25419

• Merge pull request #32 from awei1127/LastDance

  goodjobhot401

  authored
  7e720d9

• change error messages at setting page and signup page

  awei1127

  committed
  b7ada98

• add focus styles to all forms

  awei1127

  committed
  c0f9f37

Commits on Jun 19, 2023

• Merge pull request #33 from awei1127/additional

  rr37

  authored
  2bcb573