Code

Up and running.#204

Code

Open

Zach-Deladev wants to merge 82 commits intomakersacademy:mainmakersacademy/acebook-java-template:mainfrom Hakim-Kay:profile-pageHakim-Kay/acebook-pengPatrol:profile-pageCopy head branch name to clipboard

Commits

Commits on Jun 10, 2024

• added Trelloboard link to README.md file

  paulineldb

  committed
  324bdf8

  Copy full SHA for 324bdf8

• created header and footer html files + added header and footer to posts/index.html

  paulineldb

  committed
  dfb572a

  Copy full SHA for dfb572a

Commits on Jun 11, 2024

• added username to posts

  EthanDunwiddie

  committed
  31d5e83

  Copy full SHA for 31d5e83

• Merge pull request #1 from Hakim-Kay/username-to-post

  Show description for da5c50b
  emilyhardy98

  authored
  da5c50b

  Copy full SHA for da5c50b

• removed bug from user model

  EthanDunwiddie

  committed
  73a71c8

  Copy full SHA for 73a71c8

• Merge pull request #2 from Hakim-Kay/username-to-post

  Show description for 18d0be1
  EthanDunwiddie

  authored
  18d0be1

  Copy full SHA for 18d0be1

• Added imageurl field to post model and added image_url field to post table.

  Zach-Deladev

  committed
  389dca1

  Copy full SHA for 389dca1

• User can add profile picture on signup

  EthanDunwiddie

  committed
  c599ee1

  Copy full SHA for c599ee1

• Deleted test profile picture folder

  EthanDunwiddie

  committed
  8e30382

  Copy full SHA for 8e30382

• CSS files modified. Header and Footer applied to posts/index.html & users/new.html. AuthService and AuthController created (check if user is authenticated to adapt log in/ log out link in header.

  paulineldb

  committed
  d8dfe6e

  Copy full SHA for d8dfe6e

• Created pipeline and setup docker

  Hakim-Kay

  committed
  20bf01d

  Copy full SHA for 20bf01d

• Merge pull request #3 from Hakim-Kay/deployment-pipeline

  Show description for 521b4e6
  Hakim-Kay

  authored
  521b4e6

  Copy full SHA for 521b4e6

• Fixes to deployment errors in Dockerfile & yml

  Hakim-Kay

  committed
  bb957b1

  Copy full SHA for bb957b1

• Fixes to deployment bugs

  Hakim-Kay

  committed
  9629a27

  Copy full SHA for 9629a27

• Merge pull request #4 from Hakim-Kay/header-implementation

  Show description for c552b91
  emilyhardy98

  authored
  c552b91

  Copy full SHA for c552b91

• Revert CI/CD setup to allow collaborators to push changes comfortably

  Hakim-Kay

  committed
  917f48f

  Copy full SHA for 917f48f

• Set up CI/CD pipeline in deployment-pipeline branch

  Hakim-Kay

  committed
  7ef6c8f

  Copy full SHA for 7ef6c8f

• made changes to the main body of posts to match the style of the header

  emilyhardy98

  committed
  cc5a583

  Copy full SHA for cc5a583

• Added chromedriver to the CI env

  Hakim-Kay

  committed
  38b011d

  Copy full SHA for 38b011d

• Merge pull request #6 from Hakim-Kay/body-css-changes

  Show description for 6144678
  paulineldb

  authored
  6144678

  Copy full SHA for 6144678

• Added upload button to HTML, added Amazon S3 storage to controller for images uploads, removed .env file.

  Zach-Deladev

  committed
  cd28e53

  Copy full SHA for cd28e53

• Fixed issue with env variables.

  Zach-Deladev

  committed
  0ca2c4b

  Copy full SHA for 0ca2c4b

• Updated brancg with main and resolved conflicts.

  Zach-Deladev

  committed
  29a3fac

  Copy full SHA for 29a3fac

• Deployment - Deleted old CI/CD.yml file (#8)

  Show description for 7de494b
  Hakim-Kay

  authored
  7de494b

  Copy full SHA for 7de494b

Commits on Jun 12, 2024

• Merge pull request #7 from Hakim-Kay/post-with-images

  Show description for b7c3186
  Zach-Deladev

  authored
  b7c3186

  Copy full SHA for b7c3186

• User can add profile picture on signup

  EthanDunwiddie

  committed
  4d35d70

  Copy full SHA for 4d35d70

• Deleted V4__create_comments_table.sql migration file

  emilyhardy98

  committed
  9fc298d

  Copy full SHA for 9fc298d

• Deleted test profile picture folder

  EthanDunwiddie

  committed
  c2a1bf0

  Copy full SHA for c2a1bf0

• Fix 1: Resolve conflicts

  Hakim-Kay

  committed
  0bf6037

  Copy full SHA for 0bf6037

• Add V7__create_comments_table.sql for creating comments table

  emilyhardy98

  committed
  cb0cc8d

  Copy full SHA for cb0cc8d

• Resolved Conflicts

  Hakim-Kay

  committed
  b9a838c

  Copy full SHA for b9a838c

• Merge pull request #5 from Hakim-Kay/deployment-pipeline

  Show description for 30c1508
  Zach-Deladev

  authored
  30c1508

  Copy full SHA for 30c1508

• fixed lyway migration

  EthanDunwiddie

  committed
  c0e1de7

  Copy full SHA for c0e1de7

• "resolved merge conflicts"

  EthanDunwiddie

  committed
  b264464

  Copy full SHA for b264464

• "resolved things"Merge remote-tracking branch 'origin/main' into profile-picture-on-signup

  EthanDunwiddie

  committed
  5f2ec47

  Copy full SHA for 5f2ec47

• db updates

  EthanDunwiddie

  committed
  a8b7954

  Copy full SHA for a8b7954

• Completed adding profile picture to s3

  EthanDunwiddie

  committed
  7e506a9

  Copy full SHA for 7e506a9

• Merge pull request #10 from Hakim-Kay/profile-picture-on-signup

  Show description for 63c3add
  Zach-Deladev

  authored
  63c3add

  Copy full SHA for 63c3add

Commits on Jun 13, 2024

• added timestamp to be saved to the database when a post is created

  paulineldb

  committed
  d4cff3f

  Copy full SHA for d4cff3f

• Comments working in most simplistic form

  emilyhardy98

  committed
  943c0a6

  Copy full SHA for 943c0a6

• added 'Newest post appears first' functionality

  paulineldb

  committed
  6df3acf

  Copy full SHA for 6df3acf

• Likes working in most simplistic form

  emilyhardy98

  committed
  907ec8b

  Copy full SHA for 907ec8b

• Merge pull request #11 from Hakim-Kay/newest-post-appears-first

  Show description for f4dded5
  Zach-Deladev

  authored
  f4dded5

  Copy full SHA for f4dded5

• Updated db migration

  emilyhardy98

  committed
  c767725

  Copy full SHA for c767725

• Merge branch 'main' into comments-and-likes

  paulineldb

  authored
  bd6157c

  Copy full SHA for bd6157c

• Merge pull request #13 from Hakim-Kay/comments-and-likes

  Show description for 6988bc6
  paulineldb

  authored
  6988bc6

  Copy full SHA for 6988bc6

• Added user posts to profile.

  Zach-Deladev

  committed
  5d4ac15

  Copy full SHA for 5d4ac15

• Added user posts to profile.

  Zach-Deladev

  committed
  b7b1ed9

  Copy full SHA for b7b1ed9

• fixed issues with sign up form appearing twice

  paulineldb

  committed
  674282c

  Copy full SHA for 674282c

• Merge pull request #14 from Hakim-Kay/comments-and-likes

  Show description for 68e784e
  emilyhardy98

  authored
  68e784e

  Copy full SHA for 68e784e

• Fixed migration issues.

  Zach-Deladev

  committed
  6a289d2

  Copy full SHA for 6a289d2

• Resolved merge conflicts

  Zach-Deladev

  committed
  cd3c7df

  Copy full SHA for cd3c7df

• Complete merge

  Zach-Deladev

  committed
  40215f0

  Copy full SHA for 40215f0

• modified 'new post' form styling to be more user-friendly + minor changes to styling of the rest of the page

  paulineldb

  committed
  e635c6c

  Copy full SHA for e635c6c

Commits on Jun 14, 2024

• Added styling to profile page.

  Zach-Deladev

  committed
  b90d0b7

  Copy full SHA for b90d0b7

• Changes to like button

  emilyhardy98

  committed
  e7ae983

  Copy full SHA for e7ae983

• Styled posts section on profile page.

  Zach-Deladev

  committed
  734af1a

  Copy full SHA for 734af1a

• Merge pull request #16 from Hakim-Kay/profile-page

  Show description for 7cef70e
  EthanDunwiddie

  authored
  7cef70e

  Copy full SHA for 7cef70e

• added login page to app

  EthanDunwiddie

  committed
  446eaf3

  Copy full SHA for 446eaf3

• fixed posts

  EthanDunwiddie

  committed
  c83c6d6

  Copy full SHA for c83c6d6

• Tests added for comments and like button

  emilyhardy98

  committed
  177d1d5

  Copy full SHA for 177d1d5

• fixed profile posts

  EthanDunwiddie

  committed
  902dd8a

  Copy full SHA for 902dd8a

• Merge pull request #17 from Hakim-Kay/login-page

  Show description for 957bfe1
  Zach-Deladev

  authored
  957bfe1

  Copy full SHA for 957bfe1

• modified main.css to make 'posts' page more readable

  paulineldb

  committed
  d4fa893

  Copy full SHA for d4fa893

• conflicts resolved + minor changes to profile.css & main.css

  paulineldb

  committed
  4d97749

  Copy full SHA for 4d97749

• Merge pull request #20 from Hakim-Kay/body-css-changes

  Show description for 790f3e0
  Zach-Deladev

  authored
  790f3e0

  Copy full SHA for 790f3e0

• like changes

  emilyhardy98

  committed
  2f209df

  Copy full SHA for 2f209df

• added bio logic to profile page

  EthanDunwiddie

  committed
  dc92188

  Copy full SHA for dc92188

• fixed css with comments and likes

  emilyhardy98

  committed
  8811f48

  Copy full SHA for 8811f48

• Merge pull request #21 from Hakim-Kay/comments-and-likes

  Show description for 52b3f2a
  Zach-Deladev

  authored
  52b3f2a

  Copy full SHA for 52b3f2a

• Changes.

  Zach-Deladev

  committed
  fda4c6c

  Copy full SHA for fda4c6c

• "Merge with mina."Merge remote-tracking branch 'origin/main' into profile-page

  Zach-Deladev

  committed
  79e5c2b

  Copy full SHA for 79e5c2b

• message

  EthanDunwiddie

  committed
  5a4207a

  Copy full SHA for 5a4207a

• update css

  EthanDunwiddie

  committed
  857d34e

  Copy full SHA for 857d34e

• Merge pull request #22 from Hakim-Kay/add-bio

  Show description for 9059d29
  Zach-Deladev

  authored
  9059d29

  Copy full SHA for 9059d29

• "Merge to main."Merge remote-tracking branch 'origin/main' into profile-page

  Zach-Deladev

  committed
  fe65880

  Copy full SHA for fe65880

• Added on error messages to profile pictures.

  Zach-Deladev

  committed
  e3dd0ee

  Copy full SHA for e3dd0ee

• Configured for render.

  Zach-Deladev

  committed
  ed204fb

  Copy full SHA for ed204fb

• Fixed variables.

  Zach-Deladev

  committed
  94a5392

  Copy full SHA for 94a5392

• Still tinkering.

  Zach-Deladev

  committed
  c108857

  Copy full SHA for c108857

• tinkering.

  Zach-Deladev

  committed
  fe1370d

  Copy full SHA for fe1370d

• Fix database connection environment variables

  Zach-Deladev

  committed
  c597fd3

  Copy full SHA for c597fd3