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

Nkiru - Pipes- MediaRanker #30

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
ad25bc4
Initial Rails setup
nkiruka Oct 11, 2017
7f93890
Created users, votes and works controllers
nkiruka Oct 11, 2017
60c1fbc
Created index view and index method
nkiruka Oct 11, 2017
9dcdd92
Created models
nkiruka Oct 11, 2017
ccfcf2e
Added models and migration
nkiruka Oct 11, 2017
7a2df7c
Updated seed file
nkiruka Oct 11, 2017
95e812d
Added restful routes for each controller
nkiruka Oct 11, 2017
3e131b4
Added list of works to the index action and view
nkiruka Oct 11, 2017
595a09a
Link to works show page from index page
nkiruka Oct 11, 2017
e17242c
Added form-for to new view and create action
nkiruka Oct 11, 2017
557defd
Created edit view and added edit method to works controller
nkiruka Oct 11, 2017
aae6068
Added update method to works controller
nkiruka Oct 11, 2017
ab6506f
Added delete method
nkiruka Oct 11, 2017
3e3bdf2
Added testing for user model
nkiruka Oct 12, 2017
ab6be21
Add home page, custom route and home index
nkiruka Oct 12, 2017
8aac8b0
moved pry to development and test
nkiruka Oct 12, 2017
1435937
Added tests for user model
nkiruka Oct 13, 2017
a71db50
added tests for vote model
nkiruka Oct 13, 2017
6d04bf8
Edited vote model tests
nkiruka Oct 13, 2017
5343062
Added data to user fixture yml
nkiruka Oct 13, 2017
9b34336
Added data to user yml
nkiruka Oct 13, 2017
9726d3e
Added test to check vote count for user
nkiruka Oct 13, 2017
dbb4e2f
Tested belongs_to relationship
nkiruka Oct 13, 2017
dad562c
Added tests for validation and relationships for work model
nkiruka Oct 13, 2017
71b0b63
Added tests for create action and modified create method for works co…
nkiruka Oct 14, 2017
b70c65d
Added tests for show action and updated show method
nkiruka Oct 14, 2017
a3b157c
Added tests for edit action and modified edit method
nkiruka Oct 14, 2017
6220951
Added controller filter for show and edit method
nkiruka Oct 14, 2017
37c2a1d
Added description to form_for
nkiruka Oct 14, 2017
adabfad
Test to check if work is destroyed
nkiruka Oct 14, 2017
44c5f5c
Added test for delete method to return a status for invalid work ID
nkiruka Oct 14, 2017
38d5a3d
Test if work ID can be updated
nkiruka Oct 14, 2017
7479358
Test to ensure invalid work ID is not updated
nkiruka Oct 14, 2017
d9c15db
Test to return bad request
nkiruka Oct 14, 2017
1f7e5e4
Added flash to create method
nkiruka Oct 14, 2017
bee96ca
Created new file for user login
nkiruka Oct 14, 2017
2fe7577
Added custom routes for user login
nkiruka Oct 14, 2017
4f5b081
Added index view for users
nkiruka Oct 14, 2017
7e81e72
Added form_tag for login
nkiruka Oct 14, 2017
6827f85
Added index method for login
nkiruka Oct 14, 2017
daf8704
Added user login feature
nkiruka Oct 14, 2017
29406cc
Fixed bug, home page now visible
nkiruka Oct 15, 2017
f9e420e
login not working
nkiruka Oct 15, 2017
cf1dbe7
Added methods for user login and logout
nkiruka Oct 15, 2017
3077862
Created show page for user
nkiruka Oct 15, 2017
763bb30
Put data in table format
nkiruka Oct 15, 2017
25c3e00
Modified tables for user show and index pages
nkiruka Oct 15, 2017
01844f4
Added custom routes to create a vote
nkiruka Oct 16, 2017
085a832
Added show method
nkiruka Oct 16, 2017
7edd24c
Added a create method
nkiruka Oct 16, 2017
ebfdb4c
created user show view
nkiruka Oct 16, 2017
0d456e9
Added upvote button
nkiruka Oct 16, 2017
70aa479
Add link to view users
nkiruka Oct 16, 2017
8e8e9f0
commented out categories
nkiruka Oct 16, 2017
e8101d1
Added button for upvote and link for vote count
nkiruka Oct 16, 2017
210d010
Add link for voted on
nkiruka Oct 16, 2017
dace45d
Add link for when userjoins
nkiruka Oct 16, 2017
f84e4f8
Added foundation to stylesheets
nkiruka Oct 16, 2017
2cf985a
Removed custom routes for work
nkiruka Oct 16, 2017
a9bb0c8
Styled nav bar
nkiruka Oct 16, 2017
7c18fc3
Styled header and nav
nkiruka Oct 16, 2017
63aa218
Added a table to home index
nkiruka Oct 16, 2017
3cf353d
Styled sections
nkiruka Oct 16, 2017
31881a1
Created method to find top media
nkiruka Oct 16, 2017
d2e1f6b
call method to calculate top media
nkiruka Oct 16, 2017
79dcabf
Created method to find top for each work category
nkiruka Oct 16, 2017
abd93dc
Updated view with method calls
nkiruka Oct 16, 2017
280cbe1
Edit code
nkiruka Oct 16, 2017
50c780e
Adjusted media spotlight method to only return 1 work
nkiruka Oct 16, 2017
04fccf0
call work model methods
nkiruka Oct 16, 2017
6e3eb1b
added horizontal linesfor headings
nkiruka Oct 16, 2017
64830ee
Added vote count to top media
nkiruka Oct 16, 2017
1b5bbed
Added instance variables for each work category to index
nkiruka Oct 16, 2017
a36983d
Call .each method on each work category to show list
nkiruka Oct 16, 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
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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

/node_modules
/yarn-error.log

.byebug_history
66 changes: 66 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
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.1.4'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# 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', platforms: [:mri, :mingw, :x64_mingw]
gem 'pry-rails'
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
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', '< 3.2'
# 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]

gem 'jquery-turbolinks'
group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
222 changes: 222 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.4)
actionpack (= 5.1.4)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.4)
actionview (= 5.1.4)
activesupport (= 5.1.4)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.4)
activesupport (= 5.1.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4)
activesupport (= 5.1.4)
globalid (>= 0.3.6)
activemodel (5.1.4)
activesupport (= 5.1.4)
activerecord (5.1.4)
activemodel (= 5.1.4)
activesupport (= 5.1.4)
arel (~> 8.0)
activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (8.0.0)
better_errors (2.3.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (9.1.0)
capybara (2.15.4)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.2)
debug_inspector (0.0.3)
erubi (1.7.0)
execjs (2.7.0)
ffi (1.9.18)
globalid (0.4.0)
activesupport (>= 4.2.0)
i18n (0.8.6)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.1.18)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.2)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
pg (0.21.0)
pry (0.11.1)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.0)
puma (3.10.0)
rack (2.0.3)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
actioncable (= 5.1.4)
actionmailer (= 5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
activemodel (= 5.1.4)
activerecord (= 5.1.4)
activesupport (= 5.1.4)
bundler (>= 1.3.0)
railties (= 5.1.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.1.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.5.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
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)
selenium-webdriver (3.6.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
spring (2.0.2)
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.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
web-console (3.5.1)
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)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
jbuilder (~> 2.5)
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (~> 0.18)
pry-rails
puma (~> 3.7)
rails (~> 5.1.4)
sass-rails (~> 5.0)
selenium-webdriver
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

BUNDLED WITH
1.15.4
Loading