Code

Leaves - Natalie Tapias#42

Code

Open

NatalieTapias wants to merge 89 commits intoAda-C12:masterAda-C12/media-ranker:masterfrom NatalieTapias:masterNatalieTapias/media-ranker:masterCopy head branch name to clipboard

+2,813-25

Commits

Commits on Oct 14, 2019

• New Rails app.

  NatalieTapias

  committed
  ba5249b

  Copy full SHA for ba5249b

• Created HomepagesController, updated route.

  NatalieTapias

  committed
  12411d6

  Copy full SHA for 12411d6

• Added controllers for Users and Works.

  NatalieTapias

  committed
  329b3a5

  Copy full SHA for 329b3a5

Commits on Oct 15, 2019

• Resources routes for Users and Works controllers

  NatalieTapias

  committed
  a6197c8

  Copy full SHA for a6197c8

• Generated User model

  NatalieTapias

  committed
  445d420

  Copy full SHA for 445d420

• Seeded media database. Added users db, model, and updated schema to include name.

  NatalieTapias

  committed
  a352a17

  Copy full SHA for a352a17

• Works model generated, works schema established, migration for works complete.

  NatalieTapias

  committed
  8ca4cf8

  Copy full SHA for 8ca4cf8

• created view files for works

  NatalieTapias

  committed
  fd9362e

  Copy full SHA for fd9362e

• successful db seed

  NatalieTapias

  committed
  8c4bdc1

  Copy full SHA for 8c4bdc1

• Index.html.erb displays work details

  NatalieTapias

  committed
  56ce51d

  Copy full SHA for 56ce51d

• added description and creator fields to the seeds.rb file

  NatalieTapias

  committed
  c734432

  Copy full SHA for c734432

• Refine Homepages view

  NatalieTapias

  committed
  e347f9b

  Copy full SHA for e347f9b

• Nav added to layouts/application"

  NatalieTapias

  committed
  1f59b7e

  Copy full SHA for 1f59b7e

• adding some bootstrap styling to Application.html.erb

  NatalieTapias

  committed
  93dfd1b

  Copy full SHA for 93dfd1b

• Modified name -> username for users chema. Added routes for custom UsersController actions. Updated views to confirm that session are displaying.

  NatalieTapias

  committed
  1307cdf

  Copy full SHA for 1307cdf

• Updated UsersController#show

  NatalieTapias

  committed
  9f1d229

  Copy full SHA for 9f1d229

• Logic for login/logout based on session status

  NatalieTapias

  committed
  75a8038

  Copy full SHA for 75a8038

• Updating header to include primary buttons

  NatalieTapias

  committed
  b7c638c

  Copy full SHA for b7c638c

• Adding styling to header

  NatalieTapias

  committed
  bcd6863

  Copy full SHA for bcd6863

• Users Index show page

  NatalieTapias

  committed
  2a7e58b

  Copy full SHA for 2a7e58b

Commits on Oct 16, 2019

• New Works WorksController action adn view

  NatalieTapias

  committed
  ba4fb05

  Copy full SHA for ba4fb05

• Work Model method to randomly select top 10 works.

  NatalieTapias

  committed
  8604e1d

  Copy full SHA for 8604e1d

• Listing albums, movies, and books by category on index view for HomepagesController

  NatalieTapias

  committed
  0c7ab6a

  Copy full SHA for 0c7ab6a

• Updated new works form.

  NatalieTapias

  committed
  b562c6e

  Copy full SHA for b562c6e

• Show page for each work complete.

  NatalieTapias

  committed
  99d38b8

  Copy full SHA for 99d38b8

• Works#Edit and Edit pages are finished

  NatalieTapias

  committed
  3cc76c0

  Copy full SHA for 3cc76c0

• Added delete action

  NatalieTapias

  committed
  0609739

  Copy full SHA for 0609739

• Model test for Work set up

  NatalieTapias

  committed
  37c8e67

  Copy full SHA for 37c8e67

• Added list_works partial to HomepagesController index view.

  NatalieTapias

  committed
  f590ae4

  Copy full SHA for f590ae4

• WorksController added controller filters to DRY up the WorksController.

  NatalieTapias

  committed
  0e5385a

  Copy full SHA for 0e5385a

• Added link to individual work on WorksController Index page. Redirects to Works show page for that instance of work.

  NatalieTapias

  committed
  79877c8

  Copy full SHA for 79877c8

• Added links on bottoms of Works Index view, and Users Index view to redirect to add new work, and redirect to root_path to more cloesly mirror the example application.

  NatalieTapias

  committed
  9b5000c

  Copy full SHA for 9b5000c

• tweaking scss

  NatalieTapias

  committed
  95609b6

  Copy full SHA for 95609b6

• Updated WorksController#create to include flash[:success], and updated the application.html.erb to print any works.

  NatalieTapias

  committed
  c13ebb9

  Copy full SHA for c13ebb9

• Added flash[:success] messages that will confirm that a work has been destroyed or edited.

  NatalieTapias

  committed
  07c31da

  Copy full SHA for 07c31da

• Homepages layout

  NatalieTapias

  committed
  1a35415

  Copy full SHA for 1a35415

• Happily organized columns of media on homepages index view

  NatalieTapias

  committed
  a5cf4a7

  Copy full SHA for a5cf4a7

• Setting up relationships in Models.

  NatalieTapias

  committed
  d861f7c

  Copy full SHA for d861f7c

Commits on Oct 17, 2019

• Add vote to user and add votes to works.

  NatalieTapias

  committed
  35250ed

  Copy full SHA for 35250ed

• Added hyperlink to homepages index on list of works (on work title).

  NatalieTapias

  committed
  306064b

  Copy full SHA for 306064b

• Styling pause.

  NatalieTapias

  committed
  50a107a

  Copy full SHA for 50a107a

• stylesheet update

  NatalieTapias

  committed
  fffb311

  Copy full SHA for fffb311

• added button classes to bottom of show and index page for users.

  NatalieTapias

  committed
  962c926

  Copy full SHA for 962c926

• Added resources for VotesController actions

  NatalieTapias

  committed
  c70d9b3

  Copy full SHA for c70d9b3

• custom css for btn-primary and btn-danger.

  NatalieTapias

  committed
  453a359

  Copy full SHA for 453a359

• Getting the user#show view ready for voting.

  NatalieTapias

  committed
  9895c49

  Copy full SHA for 9895c49

• Formatting tables

  NatalieTapias

  committed
  218751e

  Copy full SHA for 218751e

• Refactor to use partials on Works#show

  NatalieTapias

  committed
  236d115

  Copy full SHA for 236d115

• fix file name

  NatalieTapias

  committed
  0cdd4a5

  Copy full SHA for 0cdd4a5

• Added private method to pull current user data. I've added @current_user to Homepages_controller index

  Show description for 44f3bb6
  NatalieTapias

  committed
  44f3bb6

  Copy full SHA for 44f3bb6

• Added private method to return @current_user based on which user is stored in session.

  NatalieTapias

  committed
  44f053f

  Copy full SHA for 44f053f

• Updated WorksController and UsersControlelr to understand @current_user

  NatalieTapias

  committed
  79e3032

  Copy full SHA for 79e3032

• saving work before another migration.

  NatalieTapias

  committed
  37284c8

  Copy full SHA for 37284c8

• added changes

  NatalieTapias

  committed
  2dff3c1

  Copy full SHA for 2dff3c1

Commits on Oct 18, 2019

• Renders / when session[:id] doesn't correspond with a user in the db.

  NatalieTapias

  committed
  0dee98c

  Copy full SHA for 0dee98c

• VotesController#create action works.

  NatalieTapias

  committed
  fb53f2f

  Copy full SHA for fb53f2f

• updating the vote path in works/_table

  NatalieTapias

  committed
  f1f8006

  Copy full SHA for f1f8006

• minitest reporters

  NatalieTapias

  committed
  69bc52e

  Copy full SHA for 69bc52e

• Got upvote working again

  NatalieTapias

  committed
  e5dead0

  Copy full SHA for e5dead0

• Model validations

  NatalieTapias

  committed
  ff596df

  Copy full SHA for ff596df

• Form Styling

  NatalieTapias

  committed
  0e32663

  Copy full SHA for 0e32663

• Button sizing in nav bar.

  NatalieTapias

  committed
  9e4b9a9

  Copy full SHA for 9e4b9a9

• Still can't get the drop-down menu to behave as I'd like

  NatalieTapias

  committed
  ebf9ae5

  Copy full SHA for ebf9ae5

• yml files for users and votes

  NatalieTapias

  committed
  7d548a9

  Copy full SHA for 7d548a9

Commits on Oct 21, 2019

• Modified schema to have votes hold the work_id and user_id.

  NatalieTapias

  committed
  ede49fb

  Copy full SHA for ede49fb

• Displays nuber of votes on works#index viwe.

  NatalieTapias

  committed
  e11f8d6

  Copy full SHA for e11f8d6

• Added partial for displaying users who vote for works.

  NatalieTapias

  committed
  bce29d1

  Copy full SHA for bce29d1

• defined a method that tallies number of votes per user.

  NatalieTapias

  committed
  50f4729

  Copy full SHA for 50f4729

• added a readable date helper method

  NatalieTapias

  committed
  dd81f47

  Copy full SHA for dd81f47

• Updating view to accurately display number of votes per user. Updating validation in vote model to allow a user to vote more than once.

  NatalieTapias

  committed
  8e25a1e

  Copy full SHA for 8e25a1e

• Vote model test

  NatalieTapias

  committed
  b273750

  Copy full SHA for b273750

• Media Spotlight method

  NatalieTapias

  committed
  54ccebe

  Copy full SHA for 54ccebe

• moving faker to production

  NatalieTapias

  committed
  449be50

  Copy full SHA for 449be50

• Updating gemfile

  NatalieTapias

  committed
  90edb24

  Copy full SHA for 90edb24

• Fixing my migrations

  NatalieTapias

  committed
  d5e814f

  Copy full SHA for d5e814f

• vote model testing.

  NatalieTapias

  committed
  cdcc3cd

  Copy full SHA for cdcc3cd

• vote_test

  NatalieTapias

  committed
  11a5182

  Copy full SHA for 11a5182

Commits on Oct 23, 2019

• model logic

  NatalieTapias

  committed
  3994454

  Copy full SHA for 3994454

• top ten ordering.

  NatalieTapias

  committed
  e820841

  Copy full SHA for e820841

• media-spotlight model method.

  NatalieTapias

  committed
  c7303f5

  Copy full SHA for c7303f5

• fixing fixtures

  NatalieTapias

  committed
  f01f1a9

  Copy full SHA for f01f1a9

• work model test return empty array if no works.

  NatalieTapias

  committed
  a7e1036

  Copy full SHA for a7e1036

• votes controller test allowing users to vote for multiple works etc

  NatalieTapias

  committed
  03353dd

  Copy full SHA for 03353dd

• votes controller test

  NatalieTapias

  committed
  788bac8

  Copy full SHA for 788bac8

• added user otes index page

  NatalieTapias

  committed
  163983a

  Copy full SHA for 163983a

• fixing users#show action and view

  NatalieTapias

  committed
  4997436

  Copy full SHA for 4997436

Commits on Nov 6, 2019

• .travis.yml

  NatalieTapias

  committed
  68f99a7

  Copy full SHA for 68f99a7

• change

  NatalieTapias

  committed
  801d3d8

  Copy full SHA for 801d3d8

• Merge pull request #2 from NatalieTapias/travis

  Show description for d9d4a5e
  NatalieTapias

  authored
  d9d4a5e

  Copy full SHA for d9d4a5e