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

Queues - Marisol Lopez - Media Ranker #45

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6d3ba15
Initial Rails setup
marisol-lopez Apr 10, 2017
3b35834
created new folder for csv file, wrote code to seed csv file into db
marisol-lopez Apr 10, 2017
c1a3da0
added works resources route
marisol-lopez Apr 11, 2017
9b2ea8a
created show html to show individual works pages
marisol-lopez Apr 11, 2017
0ffa4a1
created category method with loop in welcome index
marisol-lopez Apr 12, 2017
c1dbdb8
added css for root page to display three columns of works
marisol-lopez Apr 12, 2017
2448a65
created route for index page for /books /movies /albums
marisol-lopez Apr 13, 2017
11b8941
wrote code to loop through worksindex.html.erb page by category based…
marisol-lopez Apr 13, 2017
895e1f9
added table to show html page and add css to style
marisol-lopez Apr 13, 2017
cbf938f
tried styling works index page using foundation
marisol-lopez Apr 13, 2017
76b3878
created controller model and relationships for user and vote
marisol-lopez Apr 13, 2017
17082a9
added login and logout feature
marisol-lopez Apr 14, 2017
01fc468
added message for when login and log out
marisol-lopez Apr 14, 2017
448a903
used foundation to make three columns uniform on index root page
marisol-lopez Apr 14, 2017
1a74a67
css heroku trouble
marisol-lopez Apr 14, 2017
61cb511
added log in message to each page
marisol-lopez Apr 14, 2017
95ffa3f
refactored and reordered routes, removed check from controller
marisol-lopez Apr 14, 2017
e7bdd02
added votes column to works index page, welcome index page, works sho…
marisol-lopez Apr 14, 2017
74dd66b
added buttons and matched wording to show and works index page to dan…
marisol-lopez Apr 14, 2017
9584a26
added show and index
marisol-lopez Apr 14, 2017
b8625e5
added users individual and all pages, controller, routes
marisol-lopez Apr 14, 2017
464446a
added edit functionality and button for editting works
marisol-lopez Apr 15, 2017
3b747c0
tried to add table to individual media page, but unsuccessful
marisol-lopez 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 show and index
marisol-lopez committed Apr 14, 2017

Verified

This commit was signed with the committer’s verified signature. The key has expired.
commit 9584a2615a98491063b278a02d6b78e0056336f8
2 changes: 1 addition & 1 deletion app/views/works/index.html.erb
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
<td><%= link_to "#{work.title}", work_path(work.id) %></td>
<td><%= "#{work.creator}" %></td>
<td><%= "#{work.publication_year}" %></td>
<td> <%= button_to "Vote", vote_work_path(work.id), :class => "button", method: :post %> </td>
<td> <%= link_to "Vote", vote_work_path(work.id), :class => "button", method: :post %> </td>
</tr>
<% end %>
</table>
4 changes: 3 additions & 1 deletion app/views/works/show.html.erb
Original file line number Diff line number Diff line change
@@ -3,7 +3,9 @@
Published: <%= @work[:publication_year] %> <br>
Description: <%= @work[:description] %> <br>
Votes: <%= @work.votes.count %>
<%= button_to "Vote", vote_work_path, :class => "button", method: :post %>
<%= link_to "Vote", vote_work_path, :class => "button", method: :post %>
<%= link_to "Back to list", root_path, :class => "button" %>
</h4>


<br>