Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
3170b29
Initial Rails setup
SRBusiness Oct 10, 2017
1164a57
Generate and Migrate user and work models
SRBusiness Oct 10, 2017
c7cb194
Generate and migrate vote model
SRBusiness Oct 10, 2017
b14cf85
add 3 description blocks to each model test file
SRBusiness Oct 10, 2017
43bbc89
add test and relationship for users votes
SRBusiness Oct 10, 2017
40672dd
add work validation and test for category and reltaionship to votes
SRBusiness Oct 11, 2017
422999d
Adds fixture data to votes, works, users
SRBusiness Oct 11, 2017
8682fb3
Adds votes tests for validations and relationships
SRBusiness Oct 11, 2017
650689a
Adds votes fixtures
SRBusiness Oct 11, 2017
a42efcf
moved media_seed file and wrote seed code
SRBusiness Oct 11, 2017
369aa8f
Generates works controller
SRBusiness Oct 11, 2017
d1f011e
Adds home controller
SRBusiness Oct 11, 2017
ec0bdd9
Adds a home and works index view and makes home index view root view
SRBusiness Oct 11, 2017
b960479
adds a users seeds file with data that is read in by seeds
SRBusiness Oct 11, 2017
8d2aa92
home index view to shows a list of ten various media types, not sorte…
SRBusiness Oct 11, 2017
420c42d
works index show a table of all books, movies, albums
SRBusiness Oct 11, 2017
ec9e7c9
Adds work controller actions
SRBusiness Oct 11, 2017
f8e06f7
creates show view for works and cleans up index tables
SRBusiness Oct 11, 2017
d1188ee
Adds table of user votes and dates to works show view
SRBusiness Oct 11, 2017
da4158c
adds a new view as well as a partial for errors and form
SRBusiness Oct 11, 2017
89da2cd
Adds a view for edit
SRBusiness Oct 11, 2017
bcf5efc
Adds a nav ul of links to applications layout
SRBusiness Oct 11, 2017
41946fb
Adds links to work show page and functioning delete link
SRBusiness Oct 11, 2017
8ded75b
Sort works in home and works controller by vote count
SRBusiness Oct 11, 2017
8f64488
adds popular_works method to work model
SRBusiness Oct 11, 2017
28c190b
add fountation css file and followed along with Dans nav bar example
SRBusiness Oct 12, 2017
733ddcd
Update foundation css file per dan's instructions
SRBusiness Oct 12, 2017
dbaea65
played with works model methods
SRBusiness Oct 12, 2017
a3f8a70
works controller test for new action
SRBusiness Oct 12, 2017
1290cfc
update show edit update controller work tests
SRBusiness Oct 12, 2017
6b41a55
Finished works controller action tests
SRBusiness Oct 13, 2017
dbfb990
Adds users controller, index, and show view
SRBusiness Oct 13, 2017
f8f5c2e
DRY up some work controller test code
SRBusiness Oct 13, 2017
22b2260
adds a user new view and many tests and actions to users controller
SRBusiness Oct 13, 2017
cee8549
Updates users routes so that they don't have edit or update actions
SRBusiness Oct 13, 2017
35dae19
Update routes to remove user destroy action route
SRBusiness Oct 13, 2017
7e8531d
Built user show and index views and added buttons with foundations class
SRBusiness Oct 13, 2017
316a013
Adds a bunch of style work, bottons,making sure stuff has the same fu…
SRBusiness Oct 13, 2017
8bb9248
q
SRBusiness Oct 13, 2017
b78adc8
Removed create from users controller, test file, and resources
SRBusiness Oct 13, 2017
38f6392
adds a partial for the home index and cleans up code on that view
SRBusiness Oct 13, 2017
b866385
made a catagories partial to show different works tables on work inde…
SRBusiness Oct 13, 2017
4a1ef34
adds login and out routes and messes with partials
SRBusiness Oct 13, 2017
0daa0e1
followed along with Dan and added helper method to apps controller fo…
SRBusiness Oct 13, 2017
b96e554
added flash section to applications layout so it will display message…
SRBusiness Oct 13, 2017
a23577a
renames user new view to login_form and adds a form tag for user login
SRBusiness Oct 13, 2017
1e51b52
fixed error in users controller and updates save and flash helper met…
SRBusiness Oct 13, 2017
2786ae3
make it better heroku
SRBusiness Oct 13, 2017
bf5ecf7
WOOF figured out strange bug with spotlight, when no data, that was b…
SRBusiness Oct 13, 2017
2105639
replaces form tag with form field tags in login view so that users mu…
SRBusiness Oct 13, 2017
2382239
Adds functioning user login controller action
SRBusiness Oct 14, 2017
38a18f4
adds function logout action
SRBusiness Oct 14, 2017
ed40972
adds user login tests 2 of 3 cases
SRBusiness Oct 14, 2017
3379a87
Changes logout route from get to post and adds logout user test
SRBusiness Oct 14, 2017
c871e63
had to change application layout to session where logged in user isn'…
SRBusiness Oct 14, 2017
281f3fd
Clean up user controller test file, deletes old work
SRBusiness Oct 14, 2017
f1077d1
Generates controller for votes
SRBusiness Oct 15, 2017
2b8283d
Adds username uniqueness validation to user model and reciprocal mode…
SRBusiness Oct 15, 2017
cdec6d8
deleted vote fixtures and added vote uniqueness valitions with scope …
SRBusiness Oct 15, 2017
9233ba6
Adds vote function but flash isn't triggering css response
SRBusiness Oct 16, 2017
ebdd77b
adds user controller tests
SRBusiness Oct 16, 2017
c48bbf3
refactor work models
SRBusiness Oct 17, 2017
609a634
Adds more fixtures so I can test custom methods in works model, in ad…
SRBusiness Oct 17, 2017
4efe89e
Cleaning up old hashed out code and white space from controllers
SRBusiness Oct 17, 2017
5139f77
added css to header from inspec elements, plus favicon link tag
SRBusiness Oct 17, 2017
f0c06ed
final styling touches on css that I could pull using inspect. Close e…
SRBusiness Oct 17, 2017
857da35
last run through to delete old comments and white space
SRBusiness Oct 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
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# 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

/srb_notes
69 changes: 69 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
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]
# 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 :development, :test do
gem 'pry-rails'
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
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.
15 changes: 15 additions & 0 deletions app/assets/javascripts/application.js
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.js, which will include all the files
// listed below.
//
// Any JavaScript/Coffee file within this directory, lib/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 rails-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.
2 changes: 2 additions & 0 deletions app/assets/javascripts/home.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
2 changes: 2 additions & 0 deletions app/assets/javascripts/users.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
2 changes: 2 additions & 0 deletions app/assets/javascripts/votes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
2 changes: 2 additions & 0 deletions app/assets/javascripts/works.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
Loading