Skip to content

Oauth repair #82

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

Open
wants to merge 103 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
b5902c4
first commit
RedSquirrelious Sep 28, 2016
4d67abd
added tasks controller with index, new, show, update, edit, destroy f…
RedSquirrelious Sep 28, 2016
0eca362
redid controller, adding create functionality (index new create show …
RedSquirrelious Sep 28, 2016
093ce60
added index, show, create, methods, added alltasks method for Wave 1 …
RedSquirrelious Sep 28, 2016
b543be1
added index view
RedSquirrelious Sep 28, 2016
c3e65cd
added show view
RedSquirrelious Sep 28, 2016
ba439f0
added private user_params method
RedSquirrelious Sep 28, 2016
e0a9aa3
added index view
RedSquirrelious Sep 28, 2016
58b8834
added show view with ruby logic
RedSquirrelious Sep 28, 2016
9dfe1e1
added index as root to view, added show and create routes, deleted ex…
RedSquirrelious Sep 28, 2016
2a67fd1
mystery additions, unclear as to what happened
RedSquirrelious Sep 28, 2016
db95d0d
added delete task button
RedSquirrelious Sep 28, 2016
fccbd96
added task destroy route
RedSquirrelious Sep 28, 2016
a5b01f6
running record of 'the process of learning' (per Chris), aka mistakes
RedSquirrelious Sep 28, 2016
28ff3ba
added create form
RedSquirrelious Sep 28, 2016
d640428
added delete buttons for each item, added button to create form
RedSquirrelious Sep 28, 2016
3b5295b
what's been going on
RedSquirrelious Sep 28, 2016
f5ff8d5
typo
RedSquirrelious Sep 28, 2016
26181b7
added task model
RedSquirrelious Sep 28, 2016
3dd7c15
working add form button stuff
RedSquirrelious Sep 29, 2016
17d224e
added delete method
RedSquirrelious Sep 30, 2016
77269f0
deleted blank records
RedSquirrelious Sep 30, 2016
e546976
added debugging tools better_errors and binding_of_caller
RedSquirrelious Sep 30, 2016
b4ca9c0
did bundle intall and db:migrate
RedSquirrelious Sep 30, 2016
148d718
working on edit and update methods
RedSquirrelious Sep 30, 2016
c72c715
working on edit form
RedSquirrelious Sep 30, 2016
79364e3
added an update button
RedSquirrelious Sep 30, 2016
cac6a15
added update route
RedSquirrelious Sep 30, 2016
51c230c
working on update form, not sure if go with edit or update
RedSquirrelious Sep 30, 2016
00a1d46
changed some records
RedSquirrelious Sep 30, 2016
23fcb1e
fixed update, edit, destroy
RedSquirrelious Oct 3, 2016
f6af9f9
added form with checkbox and ruby logic
RedSquirrelious Oct 3, 2016
11b4710
added labels before values 'Title:' etc
RedSquirrelious Oct 3, 2016
186b728
changed labels, added date formatting, added ruby logic to completion…
RedSquirrelious Oct 3, 2016
95aadbe
repeats edit view. wrong/?
RedSquirrelious Oct 3, 2016
7265500
experimented with root vs root to, added update and edit routes
RedSquirrelious Oct 3, 2016
ac17d89
updated schema to include completed field to allow for checkbox funct…
RedSquirrelious Oct 3, 2016
66fb9cb
added partials
RedSquirrelious Oct 4, 2016
5cdf881
the partial form completer
RedSquirrelious Oct 4, 2016
eab84a3
changed edit and new methods to allow for partial
RedSquirrelious Oct 4, 2016
e89da73
changed update route to allow for partial
RedSquirrelious Oct 4, 2016
f49608a
style sheets from portfolio
RedSquirrelious Oct 4, 2016
74ba72b
changed index view to work with css. moved add new task button to top
RedSquirrelious Oct 4, 2016
a6b320c
stylesheet to help reset-normalize webpages
RedSquirrelious Oct 4, 2016
ba1190c
tweaked database, added some and deleted some in practice
RedSquirrelious Oct 4, 2016
cb4ba61
Updated Gemfile for Heroku
RedSquirrelious Oct 7, 2016
463fd86
added gems per CM direction
RedSquirrelious Oct 18, 2016
a464f65
omniauth user authentication test setup
RedSquirrelious Oct 18, 2016
7639432
uncommented sqlite3 gem, added sessions controller
RedSquirrelious Oct 18, 2016
53ac337
new tests from curriculum
RedSquirrelious Oct 18, 2016
34c62d7
new test from curriculum, make sure users are logged in first
RedSquirrelious Oct 18, 2016
0d32c55
added require minitest-reporters gem for color
RedSquirrelious Oct 18, 2016
6d21565
filled in user fixture
RedSquirrelious Oct 18, 2016
788cf0e
rearranged tests
RedSquirrelious Oct 18, 2016
19ea836
added sessions routes, added routes headers
RedSquirrelious Oct 25, 2016
3f75a0f
added relationship to user
RedSquirrelious Oct 25, 2016
b9fc309
added relationship to tasks, added build from github method
RedSquirrelious Oct 25, 2016
7768392
added import foundation, foundation overrides, app files
RedSquirrelious Oct 25, 2016
5e65689
added current user helper method
RedSquirrelious Oct 25, 2016
a4a4114
added nav class top bar and oauth logic
RedSquirrelious Oct 25, 2016
9c85e2b
added oauth logic
RedSquirrelious Oct 25, 2016
9c97bdc
rebuilt controller
RedSquirrelious Oct 25, 2016
fc05889
space for my own styling
RedSquirrelious Oct 25, 2016
b21c103
the shoulders of giants
RedSquirrelious Oct 25, 2016
84ab4a8
deleted and rebuilt sessions controller
RedSquirrelious Oct 25, 2016
02d6169
changed title
RedSquirrelious Oct 25, 2016
eb1579b
added oauth logic for greeting and task list
RedSquirrelious Oct 25, 2016
83f15b8
filled in the blanks
RedSquirrelious Oct 25, 2016
1cf602e
added oauth test task validation
RedSquirrelious Oct 25, 2016
eaf68e4
added oauth tests, create user, no double login
RedSquirrelious Oct 25, 2016
d54e30e
updated ruby, checked on gems
RedSquirrelious Oct 25, 2016
ddf0724
updated assert response
RedSquirrelious Oct 25, 2016
1c56462
now using mini test reporters...
RedSquirrelious Oct 25, 2016
d6cae8f
changes
RedSquirrelious Oct 25, 2016
93b2666
added require login method
RedSquirrelious Oct 25, 2016
08a5197
added require login safety - can create without login
RedSquirrelious Oct 25, 2016
c8b352e
changed login link to specify github, created goodle oauth placeholder
RedSquirrelious Oct 25, 2016
11f34c2
changed the login link color
RedSquirrelious Oct 25, 2016
450d8fa
added oauth requirements
RedSquirrelious Oct 25, 2016
6f7bfa5
finally
RedSquirrelious Oct 25, 2016
58e06db
updating ruby
RedSquirrelious Oct 25, 2016
1d29771
added wrapper class
RedSquirrelious Oct 25, 2016
3021ad7
added section hero class and div wrapper
RedSquirrelious Oct 25, 2016
831ed81
added specific name for each yaml entry
RedSquirrelious Oct 25, 2016
ccc17bd
added margin, max width to wrapper, removed padding from other sections
RedSquirrelious Oct 25, 2016
486f0a4
added a wrapper to nav
RedSquirrelious Oct 25, 2016
c73ec5f
added wrapper divs to both auth and unauth user view
RedSquirrelious Oct 25, 2016
7ddaaa9
added user to tasks
RedSquirrelious Oct 25, 2016
266a697
fixed discrepancy
RedSquirrelious Oct 26, 2016
a0ac0e0
standardized styling, using foundations
RedSquirrelious Oct 26, 2016
1e0533f
added require login method
RedSquirrelious Oct 26, 2016
10f488e
changed login redirect to allow for landing page
RedSquirrelious Oct 26, 2016
1658074
includes oauth
RedSquirrelious Oct 26, 2016
c944dfb
added logic around what shows in the topbar:
RedSquirrelious Oct 26, 2016
8d36756
changed title display based on method, added path and method
RedSquirrelious Oct 26, 2016
9f450f3
removed unnecessary header
RedSquirrelious Oct 26, 2016
453ef9a
messed with views for oauth
RedSquirrelious Oct 26, 2016
50ddaad
messed with oauth views
RedSquirrelious Oct 26, 2016
073992a
removed header, added to partial locals
RedSquirrelious Oct 27, 2016
a07b85b
added landing page route, change root path to landing, messed with na…
RedSquirrelious Oct 27, 2016
ebc44fa
changed task column user to user_id, added index
RedSquirrelious Oct 27, 2016
8b55144
added landing
RedSquirrelious Oct 27, 2016
5c0f9d3
slkdj
RedSquirrelious Oct 27, 2016
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
62 changes: 62 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,65 @@ build/

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

#hide logs

/log/development.log



# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

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

# Ignore this annoying MACOS file which is a caching file and keeps thumbnails
.DS_store

# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#*.rbc
capybara-*.html
.rspec

/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html

# TODO Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb

# Only include if you have production secrets in this file, which is no longer a Rails default
# config/secrets.yml

# dotenv
# TODO Comment out this rule if environment variables can be committed

# Hide the .env because of secrets
/.env

## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv

# Ignore Byebug command history file.
.byebug_history
65 changes: 65 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
source 'https://rubygems.org'
ruby '2.3.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'
# Use sqlite3 as the database for Active Record
# gem 'sqlite3'
# 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.1.0'
# 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 following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Unicorn as the app server
# gem 'unicorn'

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

#required for Heroku
gem 'pg', group: :production
gem 'rails_12factor', group: :production

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
#required for Heroku
gem 'sqlite3'
gem 'dotenv-rails'
gem "better_errors"
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'

gem "binding_of_caller"
end

gem 'omniauth'
gem 'omniauth-github'
gem 'awesome_print'

group :test do
gem 'minitest-reporters'
end

218 changes: 218 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7)
actionview (= 4.2.7)
activesupport (= 4.2.7)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.7)
activesupport (= 4.2.7)
globalid (>= 0.3.0)
activemodel (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
activerecord (4.2.7)
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activesupport (4.2.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (6.0.3)
awesome_print (1.7.0)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erubis (2.7.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashie (3.4.6)
i18n (0.7.0)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
jwt (1.5.6)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest-reporters (1.1.12)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pg (0.19.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7)
actionmailer (= 4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
activemodel (= 4.2.7)
activerecord (= 4.2.7)
activesupport (= 4.2.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
ruby-progressbar (1.8.1)
sass (3.4.22)
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)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.3)
execjs (>= 0.3.0, < 3)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
awesome_print
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
jbuilder (~> 2.0)
jquery-rails
minitest-reporters
omniauth
omniauth-github
pg
rails (= 4.2.7)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.13.5
28 changes: 28 additions & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
== README

This README would normally document whatever steps are necessary to get the
application up and running.

Things you may want to cover:

* Ruby version

* System dependencies

* Configuration

* Database creation

* Database initialization

* How to run the test suite

* Services (job queues, cache servers, search engines, etc.)

* Deployment instructions

* ...


Please feel free to use a different markup language if you do not plan to run
<tt>rake doc:app</tt>.
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 File.expand_path('../config/application', __FILE__)

Rails.application.load_tasks
Empty file added app/assets/images/.keep
Empty file.
Loading