forked from AdaGold/media-ranker
-
Notifications
You must be signed in to change notification settings - Fork 38
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.
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
Alena's MediaRanker #26
Open
Spatterjaaay
wants to merge
91
commits into
Ada-C7:master
Choose a base branch
from
Spatterjaaay:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit
Hold shift + click to select a range
7500c9f
created MediaRanker rails app and generated model and controller for …
Spatterjaaay 9dd7444
generated model and controller for Users, generated model for Votes
Spatterjaaay 37d9d69
migrated columns for works model
Spatterjaaay 487b694
wrote logic for reading data from csv, wrote validations
Spatterjaaay 650050b
added fixtures for works
Spatterjaaay 2abee2e
added tests for work model
Spatterjaaay 401f85e
Merge pull request #1 from Spatterjaaay/am/testing-model
Spatterjaaay ff9cafc
added actions to the works controller
Spatterjaaay 254a690
WIP works controller actions
Spatterjaaay a2a467b
removed commented out parts
Spatterjaaay 0992881
Merge pull request #2 from Spatterjaaay/am/work-contoroller-actions
Spatterjaaay 1aa11f9
create and index action for book controller
Spatterjaaay 1a6b931
created show view for work
Spatterjaaay 2645743
added resources to routes, fixed work controler index action, and boo…
Spatterjaaay 52a5763
seeding the database
Spatterjaaay e21079d
tweaked code to reflect csv file location
Spatterjaaay 7c9857e
Merge pull request #3 from Spatterjaaay/am/seeds
Spatterjaaay 7d7533a
added route resources for works
Spatterjaaay 3d39993
fixed works show page, works controller and added routes for works
Spatterjaaay 406a440
Merge pull request #4 from Spatterjaaay/am/views-works
Spatterjaaay 6ae6084
added code to display list of all books, added conditionals so that t…
Spatterjaaay 0ec2e8b
created albums controller and wrote index and create method for album…
Spatterjaaay ef08a95
accidentally commited on master branch, resolved conflicts
Spatterjaaay 0db5515
Merge pull request #5 from Spatterjaaay/am/book-album-movie-controller
Spatterjaaay 414753a
added index pages for movies and albums
Spatterjaaay dd6253a
fixed typo in albums controller, added routes for albums and movies
Spatterjaaay 6c154b3
individual views are now tables, yay
Spatterjaaay 79b85a5
adjusted show page to look more like the original page, delted an ext…
Spatterjaaay 0379b47
added basic layout to the works index page
Spatterjaaay b46af4f
Merge pull request #6 from Spatterjaaay/am/index_pages
Spatterjaaay af1ee91
created controller, routes and form for sessions
Spatterjaaay fe6abdd
added login button for the entire application
Spatterjaaay f5ed34d
added fileds to the votes and users model
Spatterjaaay 5ab6fd6
created relationships between users, votes and works
Spatterjaaay 3bf86a6
adjusted flasg message to include user id, fixed finding existing use…
Spatterjaaay e0b500e
Merge pull request #7 from Spatterjaaay/am/session
Spatterjaaay 30361aa
created upvote method that creates new Vote, only upvotes if there is…
Spatterjaaay edc8396
fixed redirect and flash message if user not logged in and tries to u…
Spatterjaaay 3c27c77
added uniqueness index to votes
Spatterjaaay d96a30c
added validation for uniqueness in votes model, error message display…
Spatterjaaay 4387c5f
changed redirect in upvote action
Spatterjaaay 6d75388
Merge pull request #8 from Spatterjaaay/am/votes
Spatterjaaay d82f0a0
added create new work action, fixed update work action, adn added a v…
Spatterjaaay ef0c924
added redirects for update and create actions epending of which meadi…
Spatterjaaay 5e2e94c
fixed flash to be responsive to category, fixed a typo, included prop…
Spatterjaaay 5d5420a
Merge pull request #9 from Spatterjaaay/am/forms
Spatterjaaay 836c9e1
added a column to to works model to track the number of votes, wrote …
Spatterjaaay dea631f
added spotlight method to works model, added spotlight section to vie…
Spatterjaaay 509b382
added links to album titles
Spatterjaaay 9b8bc64
aded link to upvote
Spatterjaaay 0a7f862
Merge pull request #10 from Spatterjaaay/am/vote-count
Spatterjaaay 97972bb
added 3 tests for works controller
Spatterjaaay 3753691
added tests for books controller
Spatterjaaay d3a5258
added tests for movies controller
Spatterjaaay bed1841
added tests for albums controller
Spatterjaaay dd63254
added some more tests to books, albums, movies and works controller
Spatterjaaay 92772c9
added comments
Spatterjaaay 3b9c41d
Merge pull request #11 from Spatterjaaay/am/controller-testing
Spatterjaaay ad7a9a3
added conditional to the index view page to display content only if t…
Spatterjaaay eeb469f
fixed destroy work, now destroys associated votes as well
Spatterjaaay f5f7ca2
index pages of albums, books and movies are now ordered by number of …
Spatterjaaay ee11ef8
added links to upvote on albums and movie index pages
Spatterjaaay a110418
prepared table for votes in show page, WIP
Spatterjaaay 7c9fc96
added vuser name and date to the votes table in show page
Spatterjaaay ebcc74e
list of votes is now ordered by newest first, added link to user name
Spatterjaaay 15dcc99
fixed the link on user name, added routes for users, created show act…
Spatterjaaay 9792066
added key :user_name to sessions hash, so now I have access to userna…
Spatterjaaay 670707a
added index method to the Users controller, created index view for Users
Spatterjaaay fe931d0
created table listing all users and link to home page
Spatterjaaay efac658
added links to all users and back to home pafe on show page of a user
Spatterjaaay e41712b
added redirect to root path to sessions controller and deleted some c…
Spatterjaaay 97fc645
added root_path to various wviews linking to home page
Spatterjaaay fba7090
Merge pull request #12 from Spatterjaaay/am/view
Spatterjaaay 8582d25
added tests for user controller
Spatterjaaay a0366ea
added users to fixtures, wrapped tests testing validation in works mo…
Spatterjaaay b8d9c6b
added votes to fixtures, renamed users in fixtures and added validati…
Spatterjaaay b6293b9
added tests for votes that test validation, realtionships and uniqueness
Spatterjaaay 010e6ad
added votes count and more works to works fixture, wrote tests for to…
Spatterjaaay 7e9129e
limite droutes ot only those I am using, added test for spotlight act…
Spatterjaaay 943fdc7
aded rended 404 to edit action for work and tested it, added test for…
Spatterjaaay 3b278ec
fixed edit test descriptions
Spatterjaaay b27ac84
Merge pull request #13 from Spatterjaaay/am/more-tests
Spatterjaaay 52dc89c
added foundation.css and added link to it in applications.css
Spatterjaaay e1dd399
added styling to header
Spatterjaaay fb5dc0a
changed class for flash in application
Spatterjaaay 9661ebb
added block grid and semantic html to home page
Spatterjaaay 5dd55bf
added block grid and semantic html, fixed links and category display …
Spatterjaaay 063b8be
added semantic html, block grid and some css
Spatterjaaay 27a8c2a
deleted h2 tag
Spatterjaaay 973a1a0
Merge pull request #14 from Spatterjaaay/am/foundation
Spatterjaaay 172f758
trying to make foundation show up
Spatterjaaay File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
aded rended 404 to edit action for work and tested it, added test for…
… new in respestice controllers, and tested upvoting
- Loading branch information
commit 943fdc7186df7edf5f0426e47e2624c29b01da9a
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would also test the redirect & flash message here!