Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
86493d5
not sure exactly what this one does, but committing it - probably som…
allisonhoke Oct 12, 2016
9492c2e
added routes for root, movies, books, and albums
allisonhoke Oct 12, 2016
b8aad0f
fixed root route Controller#Action
allisonhoke Oct 12, 2016
fea3e78
generated controllers for welcome, movies, books, and albums
allisonhoke Oct 12, 2016
c11f5a7
generated models for movie, book, and album
allisonhoke Oct 12, 2016
b151ba5
migrated databases for movie, book, album
allisonhoke Oct 12, 2016
9ade53b
added activerecord validations for each model
allisonhoke Oct 12, 2016
653c214
created index action and index view for movies
allisonhoke Oct 13, 2016
58d72a1
created new and create actions and new view page for movies
allisonhoke Oct 13, 2016
6c8990d
created show action and show view page for movie. fixed render path i…
allisonhoke Oct 13, 2016
8b2bd17
added edit and update actions for movie and edit view page
allisonhoke Oct 13, 2016
590148d
created destroy action for movie
allisonhoke Oct 13, 2016
c1d306e
copied movies controller actions and adjusted for books
allisonhoke Oct 13, 2016
bc8e9d4
created index view page for books
allisonhoke Oct 13, 2016
7f44051
created view page for new book
allisonhoke Oct 13, 2016
8ee695c
added view page for book show
allisonhoke Oct 13, 2016
621db52
created edit view page for book
allisonhoke Oct 13, 2016
a4ce84e
copied movies controller actions and adjusted for albums
allisonhoke Oct 13, 2016
e455ece
created view page for albums index
allisonhoke Oct 13, 2016
41c46e0
created view page for new album
allisonhoke Oct 13, 2016
b368ddd
created view for edit album
allisonhoke Oct 13, 2016
2e1eba6
created show view for album and adjusted logic in controller for destroy
allisonhoke Oct 13, 2016
59d8497
created index action and index view page for welcome
allisonhoke Oct 13, 2016
d1c5821
added upvote route for movie, book, album. added upvote button on sho…
allisonhoke Oct 13, 2016
4ac3911
added book model method for upvote. added book controller action for …
allisonhoke Oct 13, 2016
26a637b
added model method for album upvote. added album controller action fo…
allisonhoke Oct 13, 2016
a471b47
implemented upvote button on index pages of movies, books, albums
allisonhoke Oct 13, 2016
728a349
added owl image. created header for all pages
allisonhoke Oct 13, 2016
43fff07
added minitest-reporters
allisonhoke Oct 14, 2016
04a4c92
removed default junk from these files
allisonhoke Oct 15, 2016
bec05c7
added entry details in YAML file for movies and wrote tests for model…
allisonhoke Oct 15, 2016
d8ac2f2
added book data to the YAML file and wrote tests for the book model
allisonhoke Oct 15, 2016
fea4fa1
added album data to YAML file and wrote tests for album model
allisonhoke Oct 15, 2016
d21a98a
wrote test for book controller action index
allisonhoke Oct 15, 2016
8555b11
created controller test for book action new
allisonhoke Oct 15, 2016
c66fe33
wrote pos & neg test for the album create action
allisonhoke Oct 15, 2016
e2acf34
positive test for show action working in books controller
allisonhoke Oct 15, 2016
c34ae0a
wrote positive test for book edit action
allisonhoke Oct 15, 2016
76a1650
wrote test for book controller action destroy
allisonhoke Oct 15, 2016
32ea438
wrote test for book controller action upvote
allisonhoke Oct 15, 2016
ad7f54f
copied tests from books controller to albums controller and adjusted …
allisonhoke Oct 15, 2016
db0ec0a
copied tests from books controller to movies controller and adjusted …
allisonhoke Oct 15, 2016
f5f33f1
added foundation for styling
allisonhoke Oct 15, 2016
4749060
updated HTML on index pages to be semantic
allisonhoke Oct 15, 2016
e50daea
more HTML styling on index page
allisonhoke Oct 15, 2016
7279dc6
changed section tag to nav to be more semantic
allisonhoke Oct 15, 2016
7eb9116
added semantic html and some styling to all new views
allisonhoke Oct 15, 2016
154036f
changed class on main sections
allisonhoke Oct 15, 2016
68fa654
fixed tests for show and edit
allisonhoke Oct 15, 2016
fd6bdd4
updated html to be more semantic for show views and created a 404 page
allisonhoke Oct 15, 2016
2c9d153
updated 404 error page with semantic html
allisonhoke Oct 15, 2016
b0e68b3
added borders to index page
allisonhoke Oct 16, 2016
11b692e
made welcom index view with better semantic html
allisonhoke Oct 16, 2016
5eda0e3
removed unnecessary class
allisonhoke Oct 16, 2016
c4110ce
fixed tests for show actions
allisonhoke Oct 16, 2016
f67606c
created ordered_descending and top_ten methods in all models and adju…
allisonhoke Oct 16, 2016
c8a0b2c
changed views to say votes instead of rank - makes more sense to me
allisonhoke Oct 16, 2016
94b73b4
added production gems
allisonhoke Oct 16, 2016
def6019
added errors to views on all new and edit pages
allisonhoke Oct 16, 2016
4b7e662
added tests for order-descending and top_ten methods in all models
allisonhoke Oct 16, 2016
a23c0b3
changed buttons to link buttons using foundations built in button stuff
allisonhoke Oct 16, 2016
fb858dd
more buttons to foundation link buttons
allisonhoke Oct 16, 2016
2d73c0f
styling of root index page and size of show page text
allisonhoke Oct 16, 2016
95f9d95
added foundation specifications for different screen sizes
allisonhoke Oct 16, 2016
700504e
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
ca19051
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
b6bdcd2
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
0d24068
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
ac0ca44
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
1375b8c
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
3dd11d1
removed gem
allisonhoke Oct 17, 2016
1b3bed6
trying something else that worked for another classmate to get founda…
allisonhoke Oct 17, 2016
3907c97
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
b4c001c
bravely testing out git Merge branch 'b/amh/master' of https://github…
allisonhoke Oct 17, 2016
49206e2
trying to get heroku to pick up foundation.css file
allisonhoke Oct 17, 2016
14c19d9
this is getting old
allisonhoke 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
Binary file added .DS_Store
Binary file not shown.
14 changes: 12 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'


gem 'foundation-rails'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# gem 'sqlite3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -35,6 +35,7 @@ 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 'byebug'
gem 'sqlite3'
end

group :development do
Expand All @@ -47,3 +48,12 @@ group :development do
gem "better_errors"
gem "binding_of_caller"
end

group :test do
gem 'minitest-reporters'
end

group :production do
gem 'pg'
gem 'rails_12factor'
end
36 changes: 36 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,21 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (6.0.3)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
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 All @@ -52,6 +62,10 @@ GEM
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.7.0)
foundation-rails (6.2.3.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
i18n (0.7.0)
Expand All @@ -72,9 +86,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 +117,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 +130,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 All @@ -120,6 +146,10 @@ GEM
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
Expand All @@ -145,11 +175,17 @@ PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
foundation-rails
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/.DS_Store
Binary file not shown.
Binary file added app/assets/.DS_Store
Binary file not shown.
Binary file added app/assets/images/.DS_Store
Binary file not shown.
Binary file added app/assets/images/owl.jpg
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/albums.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/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@
//
//= require jquery
//= require jquery_ujs
//= require foundation
//= require turbolinks
//= require_tree .

$(function(){ $(document).foundation(); });
3 changes: 3 additions & 0 deletions app/assets/javascripts/books.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/movies.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/welcome.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/
Loading