forked from AdaGold/media-ranker
-
Notifications
You must be signed in to change notification settings - Fork 52
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
Water - Mackenzie #31
Open
mvlofthus
wants to merge
30
commits into
Ada-C14:master
Choose a base branch
from
mvlofthus: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.
+10,695
−0
Open
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
b7bc37a
Initial Rails setup
mvlofthus 5e963e2
database seeded, beginning Work model and controller setup
mvlofthus b01fdf1
Work index - basic with ul and brute forced organization by category
mvlofthus 7f9c83e
made homepage controller, started other roots
mvlofthus 1bbd726
shifted homepage to custom method under works, homepage displays samp…
mvlofthus 4476c9d
correcting seeds.rb file, mislabeled one column, and publication year…
mvlofthus 8dcb6cb
work show page created, links on index and home page, starting to mak…
mvlofthus ee4025d
work new, partial form, create, validate uniqueness of title (but not…
mvlofthus 6cdd24b
work: edit and update, destroy, started some button CSS
mvlofthus 44c77d0
work_test passes: can be instantiated, will have required fields, val…
mvlofthus 44ac06a
work_test: unique title test passes
mvlofthus 6c74b58
added flash messages for success and failure
mvlofthus 56223da
added 2 controller tests for custom homepage method. Will update tes…
mvlofthus adcaf9c
set up user and votes, relationships, user CRUD and views. Something…
mvlofthus b6b8cc3
custom routes and methods for user. login and log out buttons work
mvlofthus c2355ec
votes displaying on all show pages and indexes, need to convert to ta…
mvlofthus 0509994
worked through db seeding, calling custom methods in controller
mvlofthus 4422d07
spotlight work custom helper method and on homepage
mvlofthus 4c3ef88
forgot to make new branch, adding changes to prevent any issues
mvlofthus 48ec98e
corrected upvote to be consistent as a nested route (under votes cont…
mvlofthus 17ea2dc
upvote functionality works, unique user requirement works
mvlofthus f64351c
sort works by rating on index
mvlofthus 1b5f4fb
user model tests pass, issues with user controller tests. will come …
mvlofthus a034266
got yml objects to talk to eachother, had to assign IDs to each
mvlofthus f38565e
all model tests work, all validations tested
mvlofthus 4799b2a
added in testing for relations between models
mvlofthus 5614ca8
missed category uniquness for works, added in and added testing
mvlofthus 03e0bbe
starting bootstrap class names
mvlofthus 2e66c90
added table to index page, updated to use bootstrap: buttons, header,…
mvlofthus 17ed3bc
corrected old test, no longer works with yml file
mvlofthus 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
work: edit and update, destroy, started some button CSS
commit 6cdd24b1efb237806c6f4fc8b1069e716e2089d9
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,3 +16,8 @@ | |
@import "bootstrap"; | ||
|
||
@import "**/*"; | ||
|
||
.delete_button { | ||
background-color: red; | ||
border-radius: 6px; | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<h2>Edit this <%= @work.category.titleize %></h2> | ||
|
||
<% if @work.errors.any? %> | ||
<ul class="errors"> | ||
<% @work.errors.each do |column, message| %> | ||
<li><strong><%= column %></strong> <%= message %></li> | ||
<% end %> | ||
</ul> | ||
<% end %> | ||
|
||
<%= render partial: "form", locals: { action_name: "Edit" } %> |
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.
titleize
!