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 - Cynthia Cobb - Media Ranker #33

Open
wants to merge 100 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
d6a8a8b
generated a new rails app for MediaRanker
cynthiacd Apr 10, 2017
14297bc
generated work model and works table - wrote test for work validation…
cynthiacd Apr 10, 2017
53fccbe
generated the works controller
cynthiacd Apr 10, 2017
bd41b5e
Wrote work controller methods
cynthiacd Apr 10, 2017
6367ab4
have individual work's show page view created and working
cynthiacd Apr 11, 2017
c3aa41a
have new page for work started - you can enter new works into db - TH…
cynthiacd Apr 11, 2017
4212ef4
created an edit page for a media entry
cynthiacd Apr 11, 2017
b9001bd
generated a homepage controller
cynthiacd Apr 11, 2017
71fe719
created and rooted homepage index
cynthiacd Apr 11, 2017
6410363
Added specs for work model method find_movies
cynthiacd Apr 11, 2017
3905ca0
Added specfixtures to test work model
cynthiacd Apr 11, 2017
f39706c
homepage is showing list of all items saved in db that have category set
cynthiacd Apr 11, 2017
99817a9
added links to see all movies, books, albumns
cynthiacd Apr 11, 2017
5083648
added routes and views for movies, books, pages - links from homepage…
cynthiacd Apr 11, 2017
5bb14a1
fixed an typo on submit button for new entry
cynthiacd Apr 11, 2017
5899b84
fixed spelling error
cynthiacd Apr 11, 2017
e73ec06
seeded given works from csv file
cynthiacd Apr 11, 2017
050eb50
moved show pages for each type of media to the works views
cynthiacd Apr 11, 2017
9f61d46
redid routes for gettnerating new work form
cynthiacd Apr 11, 2017
818f6bc
have movie page showing list and link to add new
cynthiacd Apr 11, 2017
9222023
movie new page working and setting category
cynthiacd Apr 11, 2017
e394070
have books and albums new feature working
cynthiacd Apr 11, 2017
1f4262e
cleaned up routes
cynthiacd Apr 11, 2017
fd256fb
added works controller specs for index, show, and create
cynthiacd Apr 11, 2017
1dffc6a
made list of all title links and added link to header
cynthiacd Apr 11, 2017
3f95210
added error messages to partial view form
cynthiacd Apr 11, 2017
6473d20
have edit link and function working
cynthiacd Apr 11, 2017
0b615e6
have back links working inin edit view
cynthiacd Apr 12, 2017
0b636bd
added delete link and ability to who page
cynthiacd Apr 12, 2017
88d0951
added link to all media from list pages
cynthiacd Apr 12, 2017
70486ee
added link to vote to show page
cynthiacd Apr 12, 2017
5c754cc
turned links to buttons
cynthiacd Apr 12, 2017
f90d355
drying up works controller code
cynthiacd Apr 12, 2017
ea6a3f0
working on more works controller r specs
cynthiacd Apr 12, 2017
c33a6cf
added test for work edit method
cynthiacd Apr 12, 2017
2db6f8d
moved header into application.html.erb
cynthiacd Apr 12, 2017
70f57c8
added links to movies list
cynthiacd Apr 12, 2017
5eb0ef0
refractoring works controller tests
cynthiacd Apr 12, 2017
83daa73
addeadded flash messages when add new works
cynthiacd Apr 12, 2017
1912a77
edited flash messages
cynthiacd Apr 12, 2017
43b565c
added flash message for destorying works
cynthiacd Apr 12, 2017
7e6c838
added more works controller tests
cynthiacd Apr 13, 2017
6b27fed
generated user model and controller
cynthiacd Apr 13, 2017
616a8a5
tests passing for users validations
cynthiacd Apr 13, 2017
778f19e
set routes for user using resources
cynthiacd Apr 13, 2017
bff07ad
wrote tests for users controller index
cynthiacd Apr 13, 2017
85eb8db
users index passing tests
cynthiacd Apr 13, 2017
9187a20
added user show test
cynthiacd Apr 13, 2017
9f05445
Merge branch 'master' into users_features
cynthiacd Apr 13, 2017
5af06d2
passing user show tests
cynthiacd Apr 13, 2017
7c34a21
added some content for user index and show pages
cynthiacd Apr 13, 2017
33b01fa
generated sessions controller
cynthiacd Apr 13, 2017
4807b6a
have sessions methods: new, create, destory and routes set
cynthiacd Apr 13, 2017
156c750
working on log in function working for established users
cynthiacd Apr 13, 2017
2aabad5
have login feature working
cynthiacd Apr 13, 2017
6338274
have login flash messages working
cynthiacd Apr 13, 2017
e3e2d91
fixed bug with login feature
cynthiacd Apr 13, 2017
aa87ac8
have link to all media in users pages
cynthiacd Apr 13, 2017
df13945
cleaned up user routes
cynthiacd Apr 13, 2017
88e120b
refractoring user create method and tests
cynthiacd Apr 13, 2017
528791a
tests for suessions and users
cynthiacd Apr 13, 2017
1fd191f
works list pages now use tables
cynthiacd Apr 13, 2017
dd354e5
more sessions controller tests
cynthiacd Apr 13, 2017
04887fc
added links to works in master links
cynthiacd Apr 13, 2017
45deac7
added slogan to header
cynthiacd Apr 13, 2017
2380224
generated model vote and migrated db
cynthiacd Apr 13, 2017
070fc71
relationships for votes set
cynthiacd Apr 14, 2017
3eca34e
merged master, resolved merge conflict
cynthiacd Apr 14, 2017
eea1891
fixed merge conflict with the schema
cynthiacd Apr 14, 2017
b68f021
voting feature working from show page
cynthiacd Apr 14, 2017
899868e
votes counts showing on index pages
cynthiacd Apr 14, 2017
3a2bf78
after vote redircting to works page
cynthiacd Apr 14, 2017
ed6c882
vote validations set
cynthiacd Apr 14, 2017
a9505b4
added tests for votes validations
cynthiacd Apr 14, 2017
796ef5d
working on work controller test for vote
cynthiacd Apr 14, 2017
9d8c2dd
works show page showing table of votes
cynthiacd Apr 14, 2017
fc7762d
working on works controller tests
cynthiacd Apr 14, 2017
2a41e9b
works controller vote test working
cynthiacd Apr 14, 2017
8078702
all voting tests passing
cynthiacd Apr 14, 2017
f80aa3b
more controller tests
cynthiacd Apr 14, 2017
1362a3f
fixed bug with works vote method
cynthiacd Apr 14, 2017
3eebc59
homepage showing 3-columns
cynthiacd Apr 14, 2017
b2292ba
trying to dry up view for works index
cynthiacd Apr 14, 2017
2db6f2a
have index working when there are no works
cynthiacd Apr 14, 2017
fb8b514
media spotlight working
cynthiacd Apr 14, 2017
b5ba3c5
cleaned up homepage
cynthiacd Apr 16, 2017
58ad26f
working on layouts of pages
cynthiacd Apr 16, 2017
9a3f15f
have list and show pages styled
cynthiacd Apr 16, 2017
ee98a31
have users show page styled
cynthiacd Apr 16, 2017
61d5435
styled users index page
cynthiacd Apr 16, 2017
32f750b
added owl img to header
cynthiacd Apr 16, 2017
2ce8665
trying to get owl to work with heroku
cynthiacd Apr 16, 2017
13ca3c7
styled flash messages
cynthiacd Apr 16, 2017
e8cbc1c
working on more works model tests
cynthiacd Apr 16, 2017
77fa009
working on more styling
cynthiacd Apr 16, 2017
f71637c
works controller tests for new
cynthiacd Apr 16, 2017
5966405
fixed text on button
cynthiacd Apr 16, 2017
e4ca432
more model testing for Work
cynthiacd Apr 17, 2017
742b465
added user controller tests
cynthiacd Apr 17, 2017
7bd650a
more tests and styling
cynthiacd Apr 18, 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
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
62 changes: 62 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
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

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
200 changes: 200 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
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)
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
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.
3 changes: 3 additions & 0 deletions app/assets/javascripts/homepage.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/sessions.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/users.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/works.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