Code

Water - Kayla Johnson#40

Code

Open

Kaylaj89 wants to merge 63 commits intoAda-C14:masterAda-C14/media-ranker:masterfrom Kaylaj89:masterKaylaj89/media-ranker:masterCopy head branch name to clipboard

+10,681

Commits

Commits on Nov 10, 2020

• Initial Rails setup

  Kaylaj89

  committed
  b172a10

  Copy full SHA for b172a10

Commits on Nov 11, 2020

• Added models (User, Work, Vote) as well as updated seeds.rb file

  Kaylaj89

  committed
  7dbd1a7

  Copy full SHA for 7dbd1a7

• Ran first rails migration--schema updated

  Kaylaj89

  committed
  cbb8a29

  Copy full SHA for cbb8a29

• Added relationships between models (has_many and belongs_to and has_many through)

  Kaylaj89

  committed
  5f8640e

  Copy full SHA for 5f8640e

• Seeded database

  Kaylaj89

  committed
  2e33988

  Copy full SHA for 2e33988

• Added Works Controller

  Kaylaj89

  committed
  256d7fe

  Copy full SHA for 256d7fe

• added homepage controller and works routes

  Kaylaj89

  committed
  948a7cf

  Copy full SHA for 948a7cf

• Fully implemented CRUD for work controller

  Kaylaj89

  committed
  b705f48

  Copy full SHA for b705f48

• Added view pages to works (index,show,edit,new,form) and added index view to homepage

  Kaylaj89

  committed
  343c16f

  Copy full SHA for 343c16f

• Added basic html to homepage and application layouts

  Kaylaj89

  committed
  09f811d

  Copy full SHA for 09f811d

Commits on Nov 12, 2020

• Had to reseed database because I accidentally created wrong row in work.description in seeds.rb

  Kaylaj89

  committed
  83095cb

  Copy full SHA for 83095cb

• Added favicon. Still figuring out category separation

  Kaylaj89

  committed
  ec433e8

  Copy full SHA for ec433e8

• Added styling to header and have first set of top ten logic on homepage

  Kaylaj89

  committed
  43a8b7f

  Copy full SHA for 43a8b7f

Commits on Nov 13, 2020

• Front-end stuff and set up view all media

  Kaylaj89

  committed
  a76e4c3

  Copy full SHA for a76e4c3

• Added votes and users controller

  Kaylaj89

  committed
  806ab99

  Copy full SHA for 806ab99

• Added form to new work page

  Kaylaj89

  committed
  c143b7a

  Copy full SHA for c143b7a

• Added a create work form--can now add to the db from the website

  Kaylaj89

  committed
  10299fe

  Copy full SHA for 10299fe

• Added buttons to work show page

  Kaylaj89

  committed
  0801ca1

  Copy full SHA for 0801ca1

• Added upvote button to 'view all media'

  Kaylaj89

  committed
  2c8ce1c

  Copy full SHA for 2c8ce1c

• Began working on user pages and functions

  Kaylaj89

  committed
  bc653d0

  Copy full SHA for bc653d0

• Created yaml file and started testing work model

  Kaylaj89

  committed
  8dbe1a9

  Copy full SHA for 8dbe1a9

• Added validation to work title

  Kaylaj89

  committed
  366c421

  Copy full SHA for 366c421

• Styled flash messages

  Kaylaj89

  committed
  7f8447a

  Copy full SHA for 7f8447a

• More styling to homepage

  Kaylaj89

  committed
  53478b0

  Copy full SHA for 53478b0

• Changed column name in the user table from 'name' to 'username'

  Kaylaj89

  committed
  b4ed8d5

  Copy full SHA for b4ed8d5

• Created new user routes and began testing user controller

  Kaylaj89

  committed
  902117a

  Copy full SHA for 902117a

• Created login form and restyled homepage login button and added new login_path

  Kaylaj89

  committed
  2a57307

  Copy full SHA for 2a57307

• Updated login controller for user and can now log into website

  Kaylaj89

  committed
  24cd002

  Copy full SHA for 24cd002

Commits on Nov 14, 2020

• created test method for logout, created logout method, wrote login/logout method in application.thml

  Kaylaj89

  committed
  2ccc7c1

  Copy full SHA for 2ccc7c1

• Worked on a 'logged in as ..' button. Not displaying username yet

  Kaylaj89

  committed
  c26e1f5

  Copy full SHA for c26e1f5

• Added controller filter to works controller

  Kaylaj89

  committed
  60deda8

  Copy full SHA for 60deda8

• Added before-action to votes controller

  Kaylaj89

  committed
  549a370

  Copy full SHA for 549a370

• added and deleted some tests from works_controller

  Kaylaj89

  committed
  a931f42

  Copy full SHA for a931f42

• change to test branches

  Kaylaj89

  committed
  70ff54e

  Copy full SHA for 70ff54e

• Validation added to user model

  Kaylaj89

  committed
  9092f8f

  Copy full SHA for 9092f8f

• Added instance variables to hompeages controller so that I can use them everywhere

  Kaylaj89

  committed
  509d004

  Copy full SHA for 509d004

Commits on Nov 15, 2020

• Nested Route: Added vote path for posting votes to works

  Kaylaj89

  committed
  03bec69

  Copy full SHA for 03bec69

• table of votes for work now showing with correct date format

  Kaylaj89

  committed
  fc7b3f5

  Copy full SHA for fc7b3f5

• User Show page is showing votes

  Kaylaj89

  committed
  b608a65

  Copy full SHA for b608a65

Commits on Nov 16, 2020

• RESOLVED BUG--when item deleted from repository, user show page didn't work if they voted for item.Added delete_all function to work and vote model

  Kaylaj89

  committed
  f3927a2

  Copy full SHA for f3927a2

• Username displaying on 'logged in' button

  Kaylaj89

  committed
  9892358

  Copy full SHA for 9892358

• Spotlight Method added to homepages controller. Bootstrap styling added to homepage

  Kaylaj89

  committed
  2e14821

  Copy full SHA for 2e14821

• Homepage top ten method completed in homepages controller

  Kaylaj89

  committed
  fd5d242

  Copy full SHA for fd5d242

• Works Index page sorting by top votes method complete. Added instance variables to works index

  Kaylaj89

  committed
  11d1c0d

  Copy full SHA for 11d1c0d

• Homepage styling css complete

  Kaylaj89

  committed
  e29758a

  Copy full SHA for e29758a

• Added some more small css changes

  Kaylaj89

  committed
  1617717

  Copy full SHA for 1617717

• Redirect path changed for voting w/out logging in

  Kaylaj89

  committed
  4185cf2

  Copy full SHA for 4185cf2

• css added to homepage and show page

  Kaylaj89

  committed
  4077d1d

  Copy full SHA for 4077d1d

• Added last-minute changes and procfile for heroku

  Kaylaj89

  committed
  4eccf0b

  Copy full SHA for 4eccf0b

• init

  Kaylaj89

  committed
  4ee1022

  Copy full SHA for 4ee1022

• code

  Kaylaj89

  committed
  d20cdf2

  Copy full SHA for d20cdf2

• heroku

  Kaylaj89

  committed
  a6bef9a

  Copy full SHA for a6bef9a

• procfile

  Kaylaj89

  committed
  34433fd

  Copy full SHA for 34433fd

• added logic to spotlight method

  Kaylaj89

  committed
  d6f01f2

  Copy full SHA for d6f01f2

• heroku deletion>

  Kaylaj89

  committed
  ef551ca

  Copy full SHA for ef551ca

• Deleted some issues with bootstrap

  Kaylaj89

  committed
  ba95bf2

  Copy full SHA for ba95bf2

• More heroku cleanup

  Kaylaj89

  committed
  13d42df

  Copy full SHA for 13d42df

• Deleted procfile

  Kaylaj89

  committed
  a6277f6

  Copy full SHA for a6277f6

• Added functionality in case no works

  Kaylaj89

  committed
  174f542

  Copy full SHA for 174f542

• init

  Kaylaj89

  committed
  3b79aaf

  Copy full SHA for 3b79aaf

• Removed favicon and homepages resources

  Kaylaj89

  committed
  4bbbac9

  Copy full SHA for 4bbbac9

• Still working on heroku

  Kaylaj89

  committed
  e9ed886

  Copy full SHA for e9ed886

Commits on Nov 17, 2020

• Adding spotlight and top ten to model controller--late entry

  Kaylaj89

  committed
  f40bf08

  Copy full SHA for f40bf08