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

Stacks - Jackie - Media Ranker #39

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9612b9a
initial rails setup
jackiewatanabe Apr 11, 2017
d8641a1
imported csv into seeds file
jackiewatanabe Apr 11, 2017
9e879a4
works index page shows all media by category
jackiewatanabe Apr 11, 2017
ee510ad
made work titles clickable links that go to broken pages
jackiewatanabe Apr 11, 2017
67e53f2
created one model test
jackiewatanabe Apr 11, 2017
595e280
added show controller action and view
jackiewatanabe Apr 11, 2017
98f994a
created albums, books, movies controllers and index views. also added…
jackiewatanabe Apr 11, 2017
96598ed
added links back to respective index pages for each work
jackiewatanabe Apr 11, 2017
1ed7bb1
added header to app
jackiewatanabe Apr 12, 2017
001b411
created new work method, route, view
jackiewatanabe Apr 12, 2017
e46085c
added link to add new work on album list, movie list, and book list v…
jackiewatanabe Apr 12, 2017
7d78795
updated books view, forms, route and controller to add new books
jackiewatanabe Apr 12, 2017
59a8617
adjusted forms and routes so new books, albums, movies are categorize…
jackiewatanabe Apr 12, 2017
eee8bfc
made header text clickable and set path to root
jackiewatanabe Apr 12, 2017
ab09d7a
fixed edit functionality, routes, forms, and controller method. Also …
jackiewatanabe Apr 12, 2017
ee7f023
changed views to show table of works
jackiewatanabe Apr 12, 2017
c902e67
added delete functionality
jackiewatanabe Apr 13, 2017
54ebbc4
updated delete so that it redirects to list of respective media type
jackiewatanabe Apr 13, 2017
4d85c23
created user model, controller, view
jackiewatanabe Apr 13, 2017
0ab5569
added login and logout functionality....entering new name adds new us…
jackiewatanabe Apr 13, 2017
44a4664
added section to application layout so flash messages actually appear
jackiewatanabe Apr 13, 2017
37331cb
created show view for users and added links back to all users and bac…
jackiewatanabe Apr 13, 2017
0661176
minor tweaks
jackiewatanabe Apr 13, 2017
1638017
added works model tests
jackiewatanabe Apr 13, 2017
8e2a745
added tests to user model
jackiewatanabe Apr 13, 2017
4dbfd51
added some fixtures
jackiewatanabe Apr 13, 2017
f51c80d
added some controller tests...WIP
jackiewatanabe Apr 13, 2017
6aa7fb4
fixed works index page to show only top ten and in order. also fixed …
jackiewatanabe Apr 13, 2017
d630bb5
fixed views for indexes so votes would disply in table
jackiewatanabe Apr 13, 2017
6d139ef
added flash message when adding new work
jackiewatanabe Apr 13, 2017
720b979
added flash message when deleting works
jackiewatanabe Apr 13, 2017
dcf7757
created initial votes controller, vote model, votes table and columns
jackiewatanabe Apr 13, 2017
777bd20
added upvote route, controller method, changed works table to include…
jackiewatanabe Apr 13, 2017
7c14861
created upvote controller method and made sure that you can't upvote …
jackiewatanabe Apr 13, 2017
eace6fd
changed upvote controller method to make sure you can't vote for the …
jackiewatanabe Apr 14, 2017
77bebf4
adjusted main index to show vote count and fixed ordering so it shows…
jackiewatanabe Apr 14, 2017
db9cb43
changed login logout to nav in application.html.erb
jackiewatanabe Apr 14, 2017
85af8be
user can now vote from books list, movies list, albums list
jackiewatanabe Apr 14, 2017
92d350f
changed formate of how dates are displayed.
jackiewatanabe Apr 14, 2017
c759511
adjusted root route in routes.rb
jackiewatanabe Apr 14, 2017
452023a
adjusted syntax for root route
jackiewatanabe Apr 14, 2017
6da58b7
added foundation to rails app
jackiewatanabe Apr 14, 2017
dacd2bc
basic styling for main page and show pages.
jackiewatanabe Apr 14, 2017
c8bf773
adjusted section header sizing
jackiewatanabe Apr 14, 2017
c1cfd43
added different temporary logo
jackiewatanabe Apr 14, 2017
93b7d94
tried to clean up unnecessary controllers, controller methods, views,…
jackiewatanabe Apr 14, 2017
8d5e3d3
added flash errors for when a work is invalid and doesn't create and …
jackiewatanabe Apr 14, 2017
dfd0f27
updated flash error and success messages for destroy action
jackiewatanabe Apr 14, 2017
f4385fe
used rails destroy controller to get rid of votes controller instead …
jackiewatanabe Apr 14, 2017
858400b
got rid of new view in works because I wasn't using it anywhere
jackiewatanabe Apr 14, 2017
1f47dff
made it so when you upvote, it redirects back to the same page you we…
jackiewatanabe Apr 14, 2017
3d1bac9
changed error message for when user has already voted
jackiewatanabe Apr 14, 2017
c875a98
attempted to show username of logged in user... only shows user id fo…
jackiewatanabe Apr 14, 2017
86db9a1
added user vote count feature by utilizing users.votes.count in user …
jackiewatanabe Apr 14, 2017
aa08aac
changed other places where I was using vote_counts column instead of …
jackiewatanabe Apr 14, 2017
8c2ed50
fixed it so it displays name of user who is logged in. Also fixed ind…
jackiewatanabe Apr 14, 2017
3884bd3
fixed index pages to actually show respective media categories
jackiewatanabe Apr 14, 2017
d2c2095
added css styling
jackiewatanabe Apr 14, 2017
7efc9de
adjusted main padding css
jackiewatanabe Apr 14, 2017
dd98f29
tweaked css
jackiewatanabe Apr 14, 2017
9240988
fixed spacing on main page
jackiewatanabe Apr 14, 2017
a83aaac
Doing debug for Heroku
jackiewatanabe Apr 14, 2017
b12426f
working on new update method
jackiewatanabe Apr 14, 2017
9d9cfe7
created unique index to validate for uniqueness of two columns. also …
jackiewatanabe Apr 17, 2017
2aa70db
fixed css so that errors would show up in red
jackiewatanabe Apr 17, 2017
16f57dd
created controller tests for books, movies, albums, users. updated wo…
jackiewatanabe 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
Next Next commit
initial rails setup
jackiewatanabe committed Apr 11, 2017
commit 9612b9acf0bb72ab3e6326f6c0502a9ca0789034
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore Byebug command history file.
.byebug_history
64 changes: 64 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.2'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

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

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :development do
gem 'better_errors'
gem 'pry-rails'
end

gem 'awesome_print'
group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
202 changes: 202 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.2)
actionpack (= 5.0.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.2)
actionpack (= 5.0.2)
actionview (= 5.0.2)
activejob (= 5.0.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.2)
actionview (= 5.0.2)
activesupport (= 5.0.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.2)
activesupport (= 5.0.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.2)
activesupport (= 5.0.2)
globalid (>= 0.3.6)
activemodel (5.0.2)
activesupport (= 5.0.2)
activerecord (5.0.2)
activemodel (= 5.0.2)
activesupport (= 5.0.2)
arel (~> 7.0)
activesupport (5.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (7.1.4)
awesome_print (1.7.0)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
bindex (0.5.0)
builder (3.2.3)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.18)
globalid (0.3.7)
activesupport (>= 4.1.0)
i18n (0.8.1)
jbuilder (2.6.3)
activesupport (>= 3.0.0, < 5.2)
multi_json (~> 1.2)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.1.14)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.1)
nio4r (2.0.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
pg (0.20.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.6)
pry (>= 0.10.4)
puma (3.8.2)
rack (2.0.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.2)
actioncable (= 5.0.2)
actionmailer (= 5.0.2)
actionpack (= 5.0.2)
actionview (= 5.0.2)
activejob (= 5.0.2)
activemodel (= 5.0.2)
activerecord (= 5.0.2)
activesupport (= 5.0.2)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.0.2)
actionpack (= 5.0.2)
activesupport (= 5.0.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
ruby-progressbar (1.8.1)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
slop (3.6.0)
spring (2.0.1)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
web-console (3.5.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
ruby

DEPENDENCIES
awesome_print
better_errors
byebug
coffee-rails (~> 4.2)
jbuilder (~> 2.5)
jquery-rails
listen (~> 3.0.5)
minitest-rails
minitest-reporters
pg (~> 0.18)
pry-rails
puma (~> 3.0)
rails (~> 5.0.2)
sass-rails (~> 5.0)
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

BUNDLED WITH
1.14.6
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require_relative 'config/application'

Rails.application.load_tasks
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Empty file added app/assets/images/.keep
Empty file.
16 changes: 16 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
// compiled file. JavaScript code in this file should be added after the last require_* statement.
//
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require_tree .
13 changes: 13 additions & 0 deletions app/assets/javascripts/cable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Action Cable provides the framework to deal with WebSockets in Rails.
// You can generate new channels where WebSocket features live using the rails generate channel command.
//
//= require action_cable
//= require_self
//= require_tree ./channels

(function() {
this.App || (this.App = {});

App.cable = ActionCable.createConsumer();

}).call(this);
Empty file.
15 changes: 15 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
* files in this directory. Styles in this file should be added after the last require_* statement.
* It is generally better to create a new file per style scope.
*
*= require_tree .
*= require_self
*/
4 changes: 4 additions & 0 deletions app/channels/application_cable/channel.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module ApplicationCable
class Channel < ActionCable::Channel::Base
end
end
4 changes: 4 additions & 0 deletions app/channels/application_cable/connection.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module ApplicationCable
class Connection < ActionCable::Connection::Base
end
end
3 changes: 3 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class ApplicationController < ActionController::Base
protect_from_forgery with: :exception
end
Empty file added app/controllers/concerns/.keep
Empty file.
2 changes: 2 additions & 0 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module ApplicationHelper
end
2 changes: 2 additions & 0 deletions app/jobs/application_job.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class ApplicationJob < ActiveJob::Base
end
4 changes: 4 additions & 0 deletions app/mailers/application_mailer.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class ApplicationMailer < ActionMailer::Base
default from: '[email protected]'
layout 'mailer'
end
3 changes: 3 additions & 0 deletions app/models/application_record.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class ApplicationRecord < ActiveRecord::Base
self.abstract_class = true
end
Empty file added app/models/concerns/.keep
Empty file.
14 changes: 14 additions & 0 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<title>MediaRanker</title>
<%= csrf_meta_tags %>

<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>

<body>
<%= yield %>
</body>
</html>
Loading