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

Added link between Proposal and Event tables. Added Twitter and Google authentication #44

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5e71cc4
Added new code to have a database for selected and not archived events
dummyuser Feb 12, 2016
11b9b45
Added migration for events
dummyuser Feb 13, 2016
d979940
changed routes and added events button
dummyuser Feb 13, 2016
40da11b
removed clothes from routes
dummyuser Feb 13, 2016
8b0b048
clean up rails_admin
dummyuser Feb 13, 2016
bdc4493
Rspec tests for event and authentication
dummyuser Feb 21, 2016
939e12b
Added relationship between event and proposal
dummyuser Feb 21, 2016
959c2dd
Added authentication for Twitter and Googl
dummyuser Mar 1, 2016
7a8ec13
template to create a sample username and password
dummyuser Mar 2, 2016
da68014
Added Foreign key and event_id
dummyuser Mar 2, 2016
3e974f1
removed wrong migration file
dummyuser Mar 2, 2016
305f2d3
Modified migration file due to duplicate name
dummyuser Mar 2, 2016
47439e5
added scoped for event
dummyuser Mar 2, 2016
58b2a14
Style change use if in return
dummyuser Mar 20, 2016
33d57d7
added rspec for testing sign in using twitter and Google
dummyuser Mar 21, 2016
e4ad82d
DRY' omniauth callbacks duplicate code goes into one
dummyuser Mar 21, 2016
fa3c56c
Combined twitter and google omniauth functions into one
dummyuser Mar 21, 2016
7df4cda
ignore lock file
dummyuser Mar 21, 2016
5539a70
nickname added to the admin user table because twitter does not retur…
dummyuser Mar 21, 2016
a697e81
Prevent any user from accessing admin page
dummyuser Mar 22, 2016
728d0f3
Added rake task to create admin user
dummyuser Mar 22, 2016
ef2cdcf
additional conditions to prevent unauthorized user from accessing adm…
dummyuser Mar 23, 2016
2a2328d
added rspec for testing authorization of users using twitter and google
dummyuser Mar 24, 2016
0a02588
added bang when creating admin user
dummyuser Mar 24, 2016
f4cb1af
Added tests for authorization
dummyuser Mar 26, 2016
b2fc36c
Made rake file more user friendly
dummyuser Mar 26, 2016
12a140d
Added on delete cascade to prevent orphaned proposals
dummyuser Mar 26, 2016
bc59609
non-null added
dummyuser Apr 13, 2016
e0a5231
tickets changed to tickets_url
dummyuser Apr 13, 2016
3c1511d
modified spec to accommodate for non nullable columns
dummyuser Apr 13, 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ config/database.yml

# Docker
.docker-custom.yml

# Gemfile.lock
.Gemfile.lock
11 changes: 9 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ gem "rails_admin"
gem "dotenv-rails"
gem "pg"
gem "sqlite3", require: true
gem 'omniauth-twitter'
gem 'omniauth-google-oauth2'
gem 'devise'

group :assets do
gem "sass-rails"
Expand All @@ -33,15 +36,19 @@ end
group :development, :test do
gem "rspec-rails"
gem "database_cleaner"
gem "capybara"
# gem "capybara"
gem "shoulda-matchers"
gem "launchy"
end

group :test do
gem "factory_girl_rails"
gem "rspec-instafail"
# gem "rspec-instafail"
gem "codeclimate-test-reporter", require: nil
gem 'capybara'
# gem 'selenium-webdriver'
gem 'webrick'
gem 'capybara-webkit'
end

group :production do
Expand Down
291 changes: 0 additions & 291 deletions Gemfile.lock

This file was deleted.

2 changes: 2 additions & 0 deletions app/assets/javascripts/events.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.
3 changes: 3 additions & 0 deletions app/assets/stylesheets/events.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the Events controller here.
// They will automatically be included in application.css.
// You can use Sass here: http://sass-lang.com/
60 changes: 60 additions & 0 deletions app/assets/stylesheets/scaffolds.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
body
background-color: #fff
color: #333
font-family: verdana, arial, helvetica, sans-serif
font-size: 13px
line-height: 18px

p, ol, ul, td
font-family: verdana, arial, helvetica, sans-serif
font-size: 13px
line-height: 18px

pre
background-color: #eee
padding: 10px
font-size: 11px

a
color: #000

&:visited
color: #666

&:hover
color: #fff
background-color: #000

div
&.field, &.actions
margin-bottom: 10px

#notice
color: green

.field_with_errors
padding: 2px
background-color: red
display: table

#error_explanation
width: 450px
border: 2px solid red
padding: 7px
padding-bottom: 0
margin-bottom: 20px
background-color: #f0f0f0

h2
text-align: left
font-weight: bold
padding: 5px 5px 5px 15px
font-size: 12px
margin: -7px
margin-bottom: 0px
background-color: #c00
color: #fff

ul li
font-size: 12px
list-style: square
Loading