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

Carets - Guillermina #23

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
9873973
created rails app
murog Oct 10, 2017
e0936e4
created models, model relationships and controllers
murog Oct 10, 2017
6f85116
wrote seed file and seeded database
murog Oct 10, 2017
f34225e
created main page controller with index view
murog Oct 10, 2017
8bdb090
updated routes to include resources and defined rooth path
murog Oct 10, 2017
0ef381e
updated layout to include header and nav
murog Oct 10, 2017
faa1a33
updated main page index to include spotlight and top lists
murog Oct 10, 2017
b590c59
loops through all works and displays them on main page
murog Oct 13, 2017
beeb6f0
spotlight and all_works_by_title method
murog Oct 13, 2017
ba462b0
updated work model tests
murog Oct 13, 2017
70f030b
added user and work fixtures
murog Oct 13, 2017
5871a08
update private main page controller methods to DRY up index
murog Oct 15, 2017
1176795
update works controller to include private mthods, index includes table
murog Oct 15, 2017
e2b8c8a
updated work controller tests
murog Oct 15, 2017
4f53e83
passing create tests
murog Oct 15, 2017
974dc4b
failing edit work test
murog Oct 15, 2017
694f02d
passing edit work test
murog Oct 15, 2017
8c72787
failing show page test
murog Oct 15, 2017
6ed3cd5
passing show work test
murog Oct 15, 2017
675a5c4
failing book not found show test
murog Oct 15, 2017
8a69e6c
failing delete work test
murog Oct 15, 2017
3061679
failing 404 delete nonexistant work test
murog Oct 15, 2017
05f161d
passing destroy tests
murog Oct 15, 2017
b56cd86
updated show work html
murog Oct 15, 2017
8b678db
updated layout to include flash messages
murog Oct 15, 2017
72e8ca6
updated form
murog Oct 15, 2017
d615936
render form on edit page
murog Oct 15, 2017
368b105
failing work validation tests
murog Oct 16, 2017
9a416e0
passing work validation tests
murog Oct 16, 2017
ec56f5c
failing user validation tests
murog Oct 16, 2017
000a719
passing user validation tests
murog Oct 16, 2017
9a653ed
passing vote validation tests
murog Oct 16, 2017
0abafbc
login and submission route
murog Oct 16, 2017
eb4bdeb
created sessions controller
murog Oct 16, 2017
ca8d751
removed uniqueness validation from user
murog Oct 16, 2017
9829f15
included strong params in sessions controller
murog Oct 16, 2017
107b02f
create log in form
murog Oct 16, 2017
e1f13ec
failing create user on login test
murog Oct 16, 2017
ce13181
wrote failing test for logging in as existing user
murog Oct 16, 2017
e6f1647
passing should not create user if name not given, removed strong params
murog Oct 16, 2017
1d722a9
updated log in link to login_path
murog Oct 16, 2017
22230cf
added controller filter to check if a user is currently logged in
murog Oct 16, 2017
7a844f9
updated layout to include logged in as user button and log out button…
murog Oct 16, 2017
b4beaf8
failing logout test
murog Oct 16, 2017
326cfd9
passing logout test
murog Oct 16, 2017
5ecf503
updated logout link on layout
murog Oct 16, 2017
9f3c3cc
added route for upvote, failing upvote test, fixed destroy work action
murog Oct 16, 2017
d8deb8e
failing upvote test
murog Oct 16, 2017
bc5edc0
passing upvote test
murog Oct 16, 2017
334ca4d
passing shouldnt create new vote if user has already upvoted it test
murog Oct 16, 2017
22a49bc
added link to user page on media show page
murog Oct 16, 2017
78dc587
updated user show page to include votes
murog Oct 16, 2017
7dc840b
added date format helper method
murog Oct 16, 2017
b3add09
updated works index page
murog Oct 16, 2017
24b0729
update works show page
murog Oct 16, 2017
2f1e0a1
updated new work page
murog Oct 16, 2017
eed37f4
updated edit work page
murog Oct 16, 2017
8310f46
updated layout html
murog Oct 16, 2017
e790078
updated user index
murog Oct 16, 2017
019f901
updated main page styling
murog Oct 16, 2017
9d18da2
updated users controller to include users in index
murog Oct 16, 2017
253c0dd
updated main page html and css
murog Oct 16, 2017
bd1371b
edited css
murog Oct 16, 2017
d443ce9
removed @media from css
murog Oct 16, 2017
30a7752
fixed css
murog Oct 16, 2017
792f1e7
removed link from css
murog Oct 16, 2017
9f76b9b
removed favicon
murog Oct 16, 2017
683380f
put favicon back
murog Oct 16, 2017
782b3bb
updated work tests
murog Oct 16, 2017
f5966dc
fixed link color
murog Oct 16, 2017
5f8c83b
updated routes to fix heroku error
murog Oct 16, 2017
bc9faad
removed require pry
murog Oct 16, 2017
544cee7
fixed status section on layout
murog Oct 16, 2017
4d3f34e
removed default line from works show
murog Oct 16, 2017
f726bcc
updated styling
murog Oct 16, 2017
aa2c8cd
updated gemfile with oauth
murog Oct 16, 2017
c53d161
added env
murog Oct 16, 2017
809ec36
added omniauth.rb
murog Oct 16, 2017
9871161
added create action to sessions controller
murog Oct 16, 2017
09d50c0
update user model migration
murog Oct 16, 2017
3169567
updated login button to create user based on oauth
murog Oct 16, 2017
ed62ab2
added logged_in before filter, skips it main_page
murog Oct 16, 2017
2d66396
added skip before action to sessions create
murog Oct 16, 2017
07d9eba
added user id to books, users have many works, works belong to user
murog Oct 16, 2017
f2fec69
added require owner method
murog Oct 16, 2017
2646061
can only edit, update and delete works that user owns
murog Oct 16, 2017
e80c1f8
works are created with logged in user as owner
murog Oct 16, 2017
1bb1978
added work's user to show page
murog Oct 16, 2017
0f5f974
moved dotenv into production
murog Oct 16, 2017
9ad5ddf
oauth uid convert to integer
murog Oct 17, 2017
fb936af
updated assign user method in works controller
murog Oct 18, 2017
2771c8e
updated sessions, routes and tests to handle oauth
murog Oct 31, 2017
bc9c6ed
updated tests to take oauth into consideration, 2 errors currently
murog Oct 31, 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
Binary file added .DS_Store
Binary file not shown.
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# 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'
.env.development
.env.production
# Ignore bundler config.
/.bundle

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

/node_modules
/yarn-error.log

.byebug_history
74 changes: 74 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
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
gem 'awesome_print'
gem "omniauth"
gem "omniauth-github"

# 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'
gem 'pry'
gem 'dotenv-rails'
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 'pry-rails'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

group :production do
gem 'dotenv-rails'
end
253 changes: 253 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
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)
awesome_print (1.8.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)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
erubi (1.7.0)
execjs (2.7.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
globalid (0.4.0)
activesupport (>= 4.2.0)
hashie (3.5.6)
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
jwt (1.5.6)
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)
multi_xml (0.6.0)
multipart-post (2.0.0)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.7.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-github (1.3.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
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
awesome_print
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
jbuilder (~> 2.5)
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
omniauth
omniauth-github
pg (~> 0.18)
pry
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.16.0.pre.2
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
Binary file added app/.DS_Store
Binary file not shown.
Binary file added app/assets/.DS_Store
Binary file not shown.
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/main_page.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/sessions.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.
Loading