Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Carets- Julia Meier #37

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Carets- Julia Meier #37

wants to merge 33 commits into from

Commits on Oct 10, 2017

  1. Initial rails setup

    @julmeier
    julmeier committed Oct 10, 2017
    Configuration menu
    Copy the full SHA
    0a840c8 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2017

  1. created Users, Votes and Works models and foreign keys

    @julmeier
    julmeier committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    a0ffd90 View commit details
    Browse the repository at this point in the history

  2. fixed foreign key issue in the Works table

    @julmeier
    julmeier committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    2a3f091 View commit details
    Browse the repository at this point in the history

  3. fixed models, seeded database

    @julmeier
    julmeier committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    70d3d07 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2017

  1. outlined basics of works#index and works#show in controllers and views

    @julmeier
    julmeier committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    ccfad57 View commit details
    Browse the repository at this point in the history

  2. created total_votes method in Works model and applied to work#show page

    @julmeier
    julmeier committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    bf84053 View commit details
    Browse the repository at this point in the history

  3. added new and create methods and associated views. can successfully a… 

    …dd a new piece of media and it shows it on the works#index page
    @julmeier
    julmeier committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    7115740 View commit details
    Browse the repository at this point in the history

  4. minor changes

    @julmeier
    julmeier committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    a2c8f00 View commit details
    Browse the repository at this point in the history

  5. created works#edit controller method and view, and created link to ed… 

    …it and new page in the works#show page. Successfully edited a work and it saved to the main list
    @julmeier
    julmeier committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    205fae0 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2017

  1. tested Works model. need to add tests for the total_votes method and … 

    …controller
    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    d00380b View commit details
    Browse the repository at this point in the history

  2. saving again. may not have saved a file in most recent branch

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    90d4b7d View commit details
    Browse the repository at this point in the history

  3. set up yml files for testing

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    0084ad1 View commit details
    Browse the repository at this point in the history

  4. continued development of vote_test

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    b2eab7a View commit details
    Browse the repository at this point in the history

  5. minor changes

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    de4cd16 View commit details
    Browse the repository at this point in the history

  6. developed testing for vote model

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    4e7ecbb View commit details
    Browse the repository at this point in the history

  7. minor changes

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    ead966f View commit details
    Browse the repository at this point in the history

  8. tested total_votes custom method in the work model

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    fda175a View commit details
    Browse the repository at this point in the history

  9. created home route, view and controller action

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    064f39c View commit details
    Browse the repository at this point in the history

  10. completed home method in works controller and associated view. correc… 

    …tly shows top 10 media by category and votes
    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    52fcd26 View commit details
    Browse the repository at this point in the history

  11. started developing index and show methods and views for User model

    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    ec49caf View commit details
    Browse the repository at this point in the history

  12. started setup of show page. did not manage to complete show method or… 

    … testing, nor create table. will need to go back to this
    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    c01a8f4 View commit details
    Browse the repository at this point in the history

  13. removed table contents from the users#show page, as it was causing er… 

    …rors
    @julmeier
    julmeier committed Oct 13, 2017
    Configuration menu
    Copy the full SHA
    7112476 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2017

  1. deployed to heroku. created user#index table, without votes

    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    cc66c07 View commit details
    Browse the repository at this point in the history

  2. Made a big mess in the works#index and work model to DRY up code on c… 

    …alculating top media
    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    53157e7 View commit details
    Browse the repository at this point in the history

  3. created flash and sessions functionality. created sessions_controller… 

    … and methods, and views. manually tested and was able to login and have new user name saved to User model
    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    d558039 View commit details
    Browse the repository at this point in the history

  4. formatted works#show page, restarted works_controller testing

    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    44a0b1f View commit details
    Browse the repository at this point in the history

  5. continued testing works_controller

    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    704f194 View commit details
    Browse the repository at this point in the history

  6. tried migration, but caused more errors. rolled back migration, and i… 

    …nstead added a clause to the work model validation called dependent which fided issue and passed WorksController::show test 3
    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    e96219c View commit details
    Browse the repository at this point in the history

  7. found mistake in my routes file regarding works#destroy. created disp… 

    …lay for votes#index to review all votes. tried to find a way to display the work titles in addition to it's id
    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    693c7cf View commit details
    Browse the repository at this point in the history

  8. removed unneeded view files and controller methods. continued work on… 

    … user views
    @julmeier
    julmeier committed Oct 14, 2017
    Configuration menu
    Copy the full SHA
    0d90d3d View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2017

  1. created table of votes on user page, and table of votes on the work#s… 

    …how page. started to try to develop the upvote feature
    @julmeier
    julmeier committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    4763b3d View commit details
    Browse the repository at this point in the history

  2. changed user#show method and view to more rails-convention way of design

    @julmeier
    julmeier committed Oct 15, 2017
    Configuration menu
    Copy the full SHA
    91ef141 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2017

  1. leftover changes

    @julmeier
    julmeier committed Oct 16, 2017
    Configuration menu
    Copy the full SHA
    c7119be View commit details
    Browse the repository at this point in the history