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.

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
wants to merge 91 commits into
base: master
Choose a base branch
from
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 Apr 10, 2017
9dd7444
generated model and controller for Users, generated model for Votes
Spatterjaaay Apr 10, 2017
37d9d69
migrated columns for works model
Spatterjaaay Apr 11, 2017
487b694
wrote logic for reading data from csv, wrote validations
Spatterjaaay Apr 11, 2017
650050b
added fixtures for works
Spatterjaaay Apr 11, 2017
2abee2e
added tests for work model
Spatterjaaay Apr 12, 2017
401f85e
Merge pull request #1 from Spatterjaaay/am/testing-model
Spatterjaaay Apr 12, 2017
ff9cafc
added actions to the works controller
Spatterjaaay Apr 12, 2017
254a690
WIP works controller actions
Spatterjaaay Apr 12, 2017
a2a467b
removed commented out parts
Spatterjaaay Apr 12, 2017
0992881
Merge pull request #2 from Spatterjaaay/am/work-contoroller-actions
Spatterjaaay Apr 12, 2017
1aa11f9
create and index action for book controller
Spatterjaaay Apr 12, 2017
1a6b931
created show view for work
Spatterjaaay Apr 12, 2017
2645743
added resources to routes, fixed work controler index action, and boo…
Spatterjaaay Apr 12, 2017
52a5763
seeding the database
Spatterjaaay Apr 12, 2017
e21079d
tweaked code to reflect csv file location
Spatterjaaay Apr 12, 2017
7c9857e
Merge pull request #3 from Spatterjaaay/am/seeds
Spatterjaaay Apr 12, 2017
7d7533a
added route resources for works
Spatterjaaay Apr 12, 2017
3d39993
fixed works show page, works controller and added routes for works
Spatterjaaay Apr 12, 2017
406a440
Merge pull request #4 from Spatterjaaay/am/views-works
Spatterjaaay Apr 12, 2017
6ae6084
added code to display list of all books, added conditionals so that t…
Spatterjaaay Apr 13, 2017
0ec2e8b
created albums controller and wrote index and create method for album…
Spatterjaaay Apr 13, 2017
ef08a95
accidentally commited on master branch, resolved conflicts
Spatterjaaay Apr 13, 2017
0db5515
Merge pull request #5 from Spatterjaaay/am/book-album-movie-controller
Spatterjaaay Apr 13, 2017
414753a
added index pages for movies and albums
Spatterjaaay Apr 13, 2017
dd6253a
fixed typo in albums controller, added routes for albums and movies
Spatterjaaay Apr 13, 2017
6c154b3
individual views are now tables, yay
Spatterjaaay Apr 13, 2017
79b85a5
adjusted show page to look more like the original page, delted an ext…
Spatterjaaay Apr 13, 2017
0379b47
added basic layout to the works index page
Spatterjaaay Apr 13, 2017
b46af4f
Merge pull request #6 from Spatterjaaay/am/index_pages
Spatterjaaay Apr 13, 2017
af1ee91
created controller, routes and form for sessions
Spatterjaaay Apr 13, 2017
fe6abdd
added login button for the entire application
Spatterjaaay Apr 13, 2017
f5ed34d
added fileds to the votes and users model
Spatterjaaay Apr 13, 2017
5ab6fd6
created relationships between users, votes and works
Spatterjaaay Apr 13, 2017
3bf86a6
adjusted flasg message to include user id, fixed finding existing use…
Spatterjaaay Apr 13, 2017
e0b500e
Merge pull request #7 from Spatterjaaay/am/session
Spatterjaaay Apr 13, 2017
30361aa
created upvote method that creates new Vote, only upvotes if there is…
Spatterjaaay Apr 14, 2017
edc8396
fixed redirect and flash message if user not logged in and tries to u…
Spatterjaaay Apr 14, 2017
3c27c77
added uniqueness index to votes
Spatterjaaay Apr 14, 2017
d96a30c
added validation for uniqueness in votes model, error message display…
Spatterjaaay Apr 14, 2017
4387c5f
changed redirect in upvote action
Spatterjaaay Apr 14, 2017
6d75388
Merge pull request #8 from Spatterjaaay/am/votes
Spatterjaaay Apr 14, 2017
d82f0a0
added create new work action, fixed update work action, adn added a v…
Spatterjaaay Apr 14, 2017
ef0c924
added redirects for update and create actions epending of which meadi…
Spatterjaaay Apr 14, 2017
5e2e94c
fixed flash to be responsive to category, fixed a typo, included prop…
Spatterjaaay Apr 14, 2017
5d5420a
Merge pull request #9 from Spatterjaaay/am/forms
Spatterjaaay Apr 14, 2017
836c9e1
added a column to to works model to track the number of votes, wrote …
Spatterjaaay Apr 14, 2017
dea631f
added spotlight method to works model, added spotlight section to vie…
Spatterjaaay Apr 14, 2017
509b382
added links to album titles
Spatterjaaay Apr 14, 2017
9b8bc64
aded link to upvote
Spatterjaaay Apr 15, 2017
0a7f862
Merge pull request #10 from Spatterjaaay/am/vote-count
Spatterjaaay Apr 15, 2017
97972bb
added 3 tests for works controller
Spatterjaaay Apr 15, 2017
3753691
added tests for books controller
Spatterjaaay Apr 15, 2017
d3a5258
added tests for movies controller
Spatterjaaay Apr 15, 2017
bed1841
added tests for albums controller
Spatterjaaay Apr 15, 2017
dd63254
added some more tests to books, albums, movies and works controller
Spatterjaaay Apr 15, 2017
92772c9
added comments
Spatterjaaay Apr 15, 2017
3b9c41d
Merge pull request #11 from Spatterjaaay/am/controller-testing
Spatterjaaay Apr 15, 2017
ad7a9a3
added conditional to the index view page to display content only if t…
Spatterjaaay Apr 15, 2017
eeb469f
fixed destroy work, now destroys associated votes as well
Spatterjaaay Apr 15, 2017
f5f7ca2
index pages of albums, books and movies are now ordered by number of …
Spatterjaaay Apr 15, 2017
ee11ef8
added links to upvote on albums and movie index pages
Spatterjaaay Apr 15, 2017
a110418
prepared table for votes in show page, WIP
Spatterjaaay Apr 15, 2017
7c9fc96
added vuser name and date to the votes table in show page
Spatterjaaay Apr 15, 2017
ebcc74e
list of votes is now ordered by newest first, added link to user name
Spatterjaaay Apr 15, 2017
15dcc99
fixed the link on user name, added routes for users, created show act…
Spatterjaaay Apr 15, 2017
9792066
added key :user_name to sessions hash, so now I have access to userna…
Spatterjaaay Apr 15, 2017
670707a
added index method to the Users controller, created index view for Users
Spatterjaaay Apr 15, 2017
fe931d0
created table listing all users and link to home page
Spatterjaaay Apr 15, 2017
efac658
added links to all users and back to home pafe on show page of a user
Spatterjaaay Apr 15, 2017
e41712b
added redirect to root path to sessions controller and deleted some c…
Spatterjaaay Apr 15, 2017
97fc645
added root_path to various wviews linking to home page
Spatterjaaay Apr 15, 2017
fba7090
Merge pull request #12 from Spatterjaaay/am/view
Spatterjaaay Apr 15, 2017
8582d25
added tests for user controller
Spatterjaaay Apr 16, 2017
a0366ea
added users to fixtures, wrapped tests testing validation in works mo…
Spatterjaaay Apr 16, 2017
b8d9c6b
added votes to fixtures, renamed users in fixtures and added validati…
Spatterjaaay Apr 16, 2017
b6293b9
added tests for votes that test validation, realtionships and uniqueness
Spatterjaaay Apr 16, 2017
010e6ad
added votes count and more works to works fixture, wrote tests for to…
Spatterjaaay Apr 16, 2017
7e9129e
limite droutes ot only those I am using, added test for spotlight act…
Spatterjaaay Apr 16, 2017
943fdc7
aded rended 404 to edit action for work and tested it, added test for…
Spatterjaaay Apr 16, 2017
3b278ec
fixed edit test descriptions
Spatterjaaay Apr 16, 2017
b27ac84
Merge pull request #13 from Spatterjaaay/am/more-tests
Spatterjaaay Apr 16, 2017
52dc89c
added foundation.css and added link to it in applications.css
Spatterjaaay Apr 15, 2017
e1dd399
added styling to header
Spatterjaaay Apr 15, 2017
fb5dc0a
changed class for flash in application
Spatterjaaay Apr 16, 2017
9661ebb
added block grid and semantic html to home page
Spatterjaaay Apr 16, 2017
5dd55bf
added block grid and semantic html, fixed links and category display …
Spatterjaaay Apr 16, 2017
063b8be
added semantic html, block grid and some css
Spatterjaaay Apr 17, 2017
27a8c2a
deleted h2 tag
Spatterjaaay Apr 17, 2017
973a1a0
Merge pull request #14 from Spatterjaaay/am/foundation
Spatterjaaay Apr 17, 2017
172f758
trying to make foundation show up
Spatterjaaay Apr 17, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added key :user_name to sessions hash, so now I have access to userna…
…me as well suring a session, added header and log in/out to the application.html
Spatterjaaay committed Apr 15, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 9792066b6b6e34fb0b8489b39f709f3a6f780cad
3 changes: 2 additions & 1 deletion app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
@@ -7,16 +7,17 @@ def login
if user
# already exists
session[:user_id] = user.id
session[:user_name] = user.name
flash[:success] = "Successfully logged in as existing #{ user.name }"
# redirect_to root_path
redirect_to works_path
else
# create new user
user = User.new
user.name = params[:name]
user.join_date = Time.now
user.save
session[:user_id] = user.id
session[:user_name] = user.name
flash[:success] = "Successfully created new user #{ user.name } with ID #{ user.id }"
redirect_to works_path
end
25 changes: 16 additions & 9 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -9,15 +9,22 @@
</head>

<body>
<nav>
<p>
<% if session[:user_id] %>
<%= link_to "Logout", logout_path, method: :delete %>
<% else %>
<%= link_to "Login", login_path %>
<% end %>
</p>
</nav>
<header>
<h2>
<%= link_to "Media Ranker", root_path %>
<small>Ranking the Best of Everything</small>
</h2>
<div>
<% if session[:user_id] %>
<p>Logged in as <%= link_to session[:user_name], user_path(session[:user_id]) %></p>
<%= link_to "Logout", logout_path, method: :delete %>
<% else %>
<p>Not logged in</p>
<%= link_to "Login", login_path %>
<% end %>
</div>
</header>

<section class="flash">
<% flash.each do |name, message| %>
<div class="<%= name %>"><%= message %></div>