Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6e57104
Rails generated controllers for album, book, and movie
nurlywhirly Oct 11, 2016
651b522
Rails generated models for book, album, and movie
nurlywhirly Oct 11, 2016
33bdc9d
Changed column name from rank to rank_points for clarity, and ssketch…
nurlywhirly Oct 11, 2016
e0fafee
Added better_errors gem
nurlywhirly Oct 11, 2016
b26acd6
Succesfully migrated databases and seeded data
nurlywhirly Oct 11, 2016
2ec3ab5
Generated basic routes for all three models
nurlywhirly Oct 11, 2016
1b63166
Added basic methods to controller by straight up pasting from FarMar …
nurlywhirly Oct 11, 2016
04adc1b
Added index views with headers
nurlywhirly Oct 11, 2016
7664814
Added sorting mixin, have no idea if it works yet
nurlywhirly Oct 11, 2016
a994f72
Turns out I had wrong pluralizations on controllers and view folders.
nurlywhirly Oct 11, 2016
b3af391
Fixed the index method in all controllers because it was pulling in d…
nurlywhirly Oct 11, 2016
d9092ed
Named my view folders all wrong. Added simple list to index page for …
nurlywhirly Oct 11, 2016
de297da
Got all basic views for Albums functioning. Adding new album works an…
nurlywhirly Oct 11, 2016
54e9590
Changing default value of rank_points when creating a new album to 1 …
nurlywhirly Oct 11, 2016
bcb151a
Book views completed with basic functionality and fanciness
nurlywhirly Oct 11, 2016
0d5680e
Added 'create new book' option with a default single upvote
nurlywhirly Oct 11, 2016
31324a7
Did all the basic views for movies.
nurlywhirly Oct 11, 2016
4d5cc2e
Configured homepage to display top 5 in all categories
nurlywhirly Oct 11, 2016
8692a3e
Decided to just do a times loop to pull first five, versus .find-ing …
nurlywhirly Oct 11, 2016
3cee875
Added vote mixin (not sure if it should be a mixin or not), added upv…
nurlywhirly Oct 12, 2016
4215b41
Added upvote buttons and logic to books and movies
nurlywhirly Oct 12, 2016
7343544
Added Foundation CSS styling file
nurlywhirly Oct 13, 2016
08cd589
Moved 'add new...' buttons on homepage.
nurlywhirly Oct 13, 2016
2c6054c
FINALLY GOT DOWNVOTE TO WORK for albums anyways
nurlywhirly Oct 13, 2016
440ef45
Downvotes work for books and movies.
nurlywhirly Oct 13, 2016
9290835
Added Minitest Reporters gem
nurlywhirly Oct 13, 2016
17e772d
And added minitest reporters to test_helper.rb
nurlywhirly Oct 13, 2016
334c2bd
Added upvotes/downvotes to show pages
nurlywhirly Oct 13, 2016
99df0b7
Added YAML data for tests
nurlywhirly Oct 13, 2016
b4fe4f7
Added bangs to create methods, added a single validation and test to …
nurlywhirly Oct 13, 2016
3c6a39d
Four passing tests for Album data validation
nurlywhirly Oct 14, 2016
9cca87c
Added data validation tests for book and movie models
nurlywhirly Oct 14, 2016
d9a6d9b
Finished album_controller index method tests
nurlywhirly Oct 14, 2016
fcc828f
Added some more model controller methods
nurlywhirly Oct 15, 2016
9cd651a
Changed the table on the front page to be three tables for Foundation…
nurlywhirly Oct 15, 2016
d0ce63e
Added delete links on model index pages
nurlywhirly Oct 15, 2016
f9a6ee0
Actually decided to undo delete opens on model index pages, added roo…
nurlywhirly Oct 15, 2016
1ed2c38
Added back buttons to show pages for all models
nurlywhirly Oct 15, 2016
24e91f7
Fixed fixtures so they're all correctly validated. Changed model test…
nurlywhirly Oct 16, 2016
8a429bb
Continuing to add complexity to books_controller tests.
nurlywhirly Oct 16, 2016
cf9f9c3
Moved save into vote.rb and out of model controller. Pasted all contr…
nurlywhirly Oct 16, 2016
f41aad5
Added a few tests for the Vote By Rank mixin
nurlywhirly Oct 16, 2016
d434641
Tried to figure out how to test vote.rb and got nowhere.
nurlywhirly Oct 16, 2016
fdf6cc9
Figured out vote.rb test (i had to include and require vote.rb before…
nurlywhirly Oct 16, 2016
4b377df
Moving tests for mixins elsewhere bc Dan told me to in Slack
nurlywhirly Oct 17, 2016
bb9c0cb
added buttons to form partial to go back either to model index or hom…
nurlywhirly Oct 17, 2016
9ec6fa0
Changed some colors to show I didn't just completely let foundation c…
nurlywhirly Oct 17, 2016
85781c3
Making the submit button one partial form look less awkward
nurlywhirly Oct 17, 2016
5593bd0
Doing all the gem nonsense for Heroku deployment
nurlywhirly Oct 17, 2016
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
13 changes: 10 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -34,14 +32,23 @@ gem 'sdoc', '~> 0.4.0', group: :doc

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'sqlite3'
gem 'byebug'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'better_errors'
end

group :test do
gem 'minitest-reporters'
end

group :production do
gem 'pg'
gem 'rails_12factor'
end
22 changes: 22 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,17 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (6.0.3)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
Expand Down Expand Up @@ -72,9 +78,15 @@ GEM
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest-reporters (1.1.11)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pg (0.19.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -97,6 +109,11 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
Expand All @@ -105,6 +122,7 @@ GEM
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
ruby-progressbar (1.8.1)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
Expand Down Expand Up @@ -145,11 +163,15 @@ PLATFORMS
ruby

DEPENDENCIES
better_errors
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
minitest-reporters
pg
rails (= 4.2.7)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
Expand Down
Binary file added app/assets/images/up_arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/javascripts/album.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/book.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/movie.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/album.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the album controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
40 changes: 40 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,43 @@
*= require_tree .
*= require_self
*/
/*@import url('foundation.css')*/

h1, h2, h3, h4, h5, h6 {
font-family: 'Changa One', sans-serif;
text-align: center;
}

p, td {
font-family: 'Varela', sans-serif;
}

table h6 {
text-align: center;
}

table tr:nth-last-of-type(odd) {
background-color: #cde6f1;
}
table tr:nth-last-of-type(even) {
background-color: #e1eaed;
}

.button {
border: solid black 1px;
border-radius: 1em;
}

table * {
border-color: #b1e6fc;
}
.form-div {
background-color: #b1e6fc;
}
#submit {
background-color: #b1e6fc;
}

body {
background-color: #b1e6fc;
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/book.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the book controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
Loading