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

Katricia - Edges - MediaRanker #34

Open
wants to merge 106 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
2d9f04e
Initial Rails setup
krsmith7 Oct 8, 2018
76c2dfe
Generate controllers for Works, Users, and Votes
krsmith7 Oct 8, 2018
7b75673
Add restful route resources for works, users, votes
krsmith7 Oct 8, 2018
685655c
Add Works controller create and read actions
krsmith7 Oct 8, 2018
cdd1723
Create database. Generate work model
krsmith7 Oct 8, 2018
b7fb91b
Migrate database
krsmith7 Oct 8, 2018
b6f0002
Add strong params to Work controller
krsmith7 Oct 8, 2018
5c5f13f
Add work relationship to votes in work model
krsmith7 Oct 8, 2018
9cf2816
Add user model and migrate
krsmith7 Oct 8, 2018
5d510f9
Add vote model with entity relationship to user. Add migrations with …
krsmith7 Oct 9, 2018
e762b7c
Refactor routes to one line of resources
krsmith7 Oct 9, 2018
e6fcf50
Add work#index view. Add header and nav bar to application layout view
krsmith7 Oct 9, 2018
2721538
Add application layout styling for header and nav
krsmith7 Oct 9, 2018
5850d2d
Edit application layout heading spacing
krsmith7 Oct 9, 2018
8631f3a
Add outline for works#index view
krsmith7 Oct 9, 2018
ac3e0dc
Add belongs_to work relationship to vote model
krsmith7 Oct 9, 2018
d821608
Seed database with media_seeds.csv
krsmith7 Oct 10, 2018
7f5077c
Edit header text styling
krsmith7 Oct 10, 2018
fa9b6f0
Add loop to find all albums for work list
krsmith7 Oct 10, 2018
47007e6
Add validations for title and category to work model
krsmith7 Oct 10, 2018
9f666de
Add work yml fixtures
krsmith7 Oct 10, 2018
a717e49
Add yml fixtures for users
krsmith7 Oct 10, 2018
0cc9293
Correct validation syntax in work.rb
krsmith7 Oct 10, 2018
fee18e8
Correct vote model relationship syntax - move to two lines
krsmith7 Oct 10, 2018
2eb9415
Delete extra indent in work yml. Add work with only title and categor…
krsmith7 Oct 10, 2018
936635c
Add tests for work model validations
krsmith7 Oct 10, 2018
5766127
Add in space between require lines to fix error
krsmith7 Oct 10, 2018
769ded5
Add validation for category names to work model. Add validation to ti…
krsmith7 Oct 10, 2018
e048d90
Add tests for work model validations
krsmith7 Oct 10, 2018
708e733
List style none for application unordered lists
krsmith7 Oct 10, 2018
bfceb5b
Add book and movie lists to index
krsmith7 Oct 10, 2018
02171f2
Add links to nav menu for view all media, add new work, view all users
krsmith7 Oct 10, 2018
732be01
Add form partial and form for work#new view and work#edit view
krsmith7 Oct 10, 2018
1fe60e5
Refactor work index view to use WORK_CATEGORIES constant assigned in …
krsmith7 Oct 10, 2018
49464dd
Add bootstrap table to all media page
krsmith7 Oct 10, 2018
41bc942
Add section elements with class names to work forms
krsmith7 Oct 10, 2018
4235e83
Add work#show view and link_to in work#index
krsmith7 Oct 11, 2018
147c2d6
Add work#edit to work controller
krsmith7 Oct 11, 2018
ea83c90
Add work#update action to work controller
krsmith7 Oct 11, 2018
b481c41
Correct missing end tag from work form
krsmith7 Oct 11, 2018
fbf5139
Add styling for bootstrap buttons to app scss
krsmith7 Oct 11, 2018
77842e8
Add link paths for edit and delete to works#show
krsmith7 Oct 11, 2018
20a4a65
Add destroy action to works controller
krsmith7 Oct 11, 2018
d2374c3
Add topmedia page, route, and link_to in works#show and header
krsmith7 Oct 11, 2018
e29e692
Add media lists to top works page
krsmith7 Oct 12, 2018
6abc885
Add styling for toplists
krsmith7 Oct 12, 2018
14cb22b
Add work votes count to works#index
krsmith7 Oct 12, 2018
5b67ab8
Add main link teal color styling to app scss
krsmith7 Oct 12, 2018
8573267
Correct deleted end tag in new work form
krsmith7 Oct 12, 2018
052abc4
Add controller filter to Works Controller to find_work. DRY up methods
krsmith7 Oct 12, 2018
9cc2b2f
Add bootstrap form control classes and div elements to Work form partial
krsmith7 Oct 12, 2018
8c6ab90
Add flash messages to work controller actions
krsmith7 Oct 12, 2018
fd3eea0
Add flash messages to update action in Works Controller
krsmith7 Oct 12, 2018
227bacc
Add flashmessage elements
krsmith7 Oct 12, 2018
37ca19e
Edit flash css in app scss for bootstrap class
krsmith7 Oct 12, 2018
91b9709
Edit works controller flash messages
krsmith7 Oct 12, 2018
c558130
Add logic to app view for flash alert messages
krsmith7 Oct 12, 2018
003ee3e
make upvote path a link
krsmith7 Oct 12, 2018
e836358
Add Users controller index, new, create, and show actions
krsmith7 Oct 13, 2018
f8d7803
Add users index view with table and link to top media page
krsmith7 Oct 13, 2018
417da21
Generate Sessions controller
krsmith7 Oct 13, 2018
35d6ddc
Add Sessions#login and Sessions#logout actions to Sessions Controller
krsmith7 Oct 13, 2018
4e6edea
Add before_action private method find_logged_in_user to Application C…
krsmith7 Oct 13, 2018
d544fb9
Add logic to Sessions methods new and login
krsmith7 Oct 13, 2018
df71514
Comment out flash logic already in User controller
krsmith7 Oct 13, 2018
e607445
Add routes for sessions
krsmith7 Oct 13, 2018
d10f204
Add logic for if user does not exist in Sessions controller
krsmith7 Oct 14, 2018
77e6605
Add Votes#create
krsmith7 Oct 14, 2018
6685d1c
Add User.find_by to Users#show method in Users controller
krsmith7 Oct 14, 2018
916b07f
Add login logout section to application view
krsmith7 Oct 14, 2018
ef9d099
Add upvote method to Vote.rb
krsmith7 Oct 14, 2018
d7cb9c9
Change sessions login route to post
krsmith7 Oct 14, 2018
424ac88
Add in table body closing tag
krsmith7 Oct 14, 2018
aa956ae
Add sessions views
krsmith7 Oct 14, 2018
cc9bdad
Add users#show view with table for votes
krsmith7 Oct 14, 2018
b55c33a
Add action_view file to config initializers to fix form_with issue
krsmith7 Oct 14, 2018
149fd04
Fix User.new attribute in sessions controller for unknown user
krsmith7 Oct 14, 2018
469554b
Fix session id saving problem by changing order of lines in sessions#…
krsmith7 Oct 14, 2018
ab04cdc
Edit styling for login logout button links and header
krsmith7 Oct 14, 2018
5acbf1c
Add redirect to root_path to sessions#logout
krsmith7 Oct 14, 2018
347b2f8
Add login logout buttons into site nav bar
krsmith7 Oct 14, 2018
02398fd
Add logic to votescontroller for if user logged in and if vote saves
krsmith7 Oct 15, 2018
7baa601
Add path to nested vote route in work#index view
krsmith7 Oct 15, 2018
30decb2
Move votes resources to nested route under works resources with only …
krsmith7 Oct 15, 2018
e75fb4c
Change vote yml attributes from ids to named fixture elements
krsmith7 Oct 15, 2018
4e92309
Fix typos and spacing in controllers
krsmith7 Oct 15, 2018
16a4fee
Add vote handling methods and html
krsmith7 Oct 15, 2018
ff325a5
Add votes_count method to work model as helper method for vote sorting
krsmith7 Oct 15, 2018
222f0fb
Move sorting functions around in work model methods
krsmith7 Oct 15, 2018
a4b1356
Delete old function call commented out
krsmith7 Oct 15, 2018
2ba9fb0
Change Work.where to Work.get_category_media in works index view
krsmith7 Oct 15, 2018
0dfd830
Add validation for work_id uniqueness to vote model
krsmith7 Oct 15, 2018
fd8e887
Add table of user votes to works#show view
krsmith7 Oct 15, 2018
77c4a2c
Add tests for user validation
krsmith7 Oct 15, 2018
c1b2b1f
Add duplicate users and works to votes yml
krsmith7 Oct 15, 2018
eb30d8d
Add vote model validation tests
krsmith7 Oct 15, 2018
9c93c33
Edit vote uniqueness validation
krsmith7 Oct 15, 2018
b380ec2
Add destroy_dependent to user and work model for votes
krsmith7 Oct 15, 2018
982ff0d
Link work titles on User show page to work show pages
krsmith7 Oct 15, 2018
ab7802d
Add model relations test
krsmith7 Oct 15, 2018
db23e25
Add bottom border to media spotlight elements. Change headings text c…
krsmith7 Oct 15, 2018
920d2f7
Add more vote fixtures for method tests
krsmith7 Oct 15, 2018
aa85465
Add tests for work model sorting methods
krsmith7 Oct 15, 2018
4d6b254
Edit user model test vote count assertion
krsmith7 Oct 15, 2018
4ec0845
Add test for work model method get_top_list
krsmith7 Oct 15, 2018
f69002a
Pseudocode start for get_top test in work model
krsmith7 Oct 15, 2018
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
27 changes: 27 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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 uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
81 changes: 81 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# 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 'mini_racer', 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', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

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

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

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]
end

group :development do
# Access an interactive console on exception pages or by calling '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

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

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

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
277 changes: 277 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.1)
actionpack (= 5.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
autoprefixer-rails (9.1.4)
execjs
better_errors (2.5.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap (4.1.3)
autoprefixer-rails (>= 6.0.3)
popper_js (>= 1.12.9, < 2)
sass (>= 3.5.2)
builder (3.2.3)
byebug (10.0.2)
capybara (3.9.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.25)
formatador (0.2.5)
globalid (0.4.1)
activesupport (>= 4.2.0)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
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.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.3.5)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
msgpack (1.2.4)
multi_json (1.13.1)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pg (1.1.3)
popper_js (1.14.3)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.6.0)
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.7)
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.14.1)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
shellany (0.0.1)
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.2)
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.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.19)
execjs (>= 0.3.0, < 3)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
bootsnap (>= 1.1.0)
bootstrap (~> 4.1.3)
byebug
capybara (>= 2.15)
chromedriver-helper
guard
guard-minitest
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.11)
rails (~> 5.2.1)
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)

RUBY VERSION
ruby 2.5.1p57

BUNDLED WITH
1.16.4
Loading