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

Feature/csv confirmation #131

Open
wants to merge 77 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
398cdd0
Update README.md
yonas024 Oct 11, 2017
d4e7808
Update README.md
msun908 Oct 11, 2017
b64013c
Update iter0.md
yonas024 Oct 11, 2017
dff9690
Update README.md
yonas024 Oct 11, 2017
84a2f5e
Update iter0.md
yonas024 Oct 11, 2017
ccc4346
specified the ruvy version
minjoosur Oct 11, 2017
d41ab9e
Merge branch 'master' of https://github.com/yonas024/enrollme
minjoosur Oct 11, 2017
86bbab6
Update README.md
msun908 Oct 11, 2017
1b90010
Update README.md
msun908 Oct 11, 2017
da94c26
Update Gemfile
msun908 Oct 11, 2017
7d6303e
Update Gemfile
msun908 Oct 11, 2017
1f9725a
Update iter0.md
yonas024 Oct 11, 2017
8032fff
Update iter0.md
yonas024 Oct 11, 2017
eefddd0
Update README.md
yonas024 Oct 11, 2017
338b43b
Update README.md
msun908 Oct 19, 2017
1f39ee1
monty's deployment
yonas024 Oct 19, 2017
22f4c80
Update README.md
msun908 Oct 19, 2017
2ca1fc8
Update README.md
msun908 Oct 19, 2017
17784d5
oauth done
yonas024 Oct 19, 2017
f2c34b5
added admins
yonas024 Oct 19, 2017
bb59547
Update README.md
yonas024 Oct 20, 2017
a322167
Update .travis.yml
yonas024 Oct 20, 2017
4fc52bc
Update .travis.yml
yonas024 Oct 20, 2017
fe7fd6e
coverage changes
yonas024 Oct 20, 2017
8490108
Update .travis.yml
yonas024 Oct 20, 2017
18d6ec8
Update seeds.rb
yonas024 Oct 20, 2017
7159eb7
added admin env
yonas024 Oct 20, 2017
929b20c
fixed merge
yonas024 Oct 20, 2017
5282a66
passing cucumber:
yonas024 Oct 20, 2017
8f513b0
seeds update, create group button
yonas024 Oct 21, 2017
ada85aa
seeds update, create group button
yonas024 Oct 21, 2017
3460749
discussionid to group
yonas024 Oct 22, 2017
3ec1ca0
gitignore now ignores all in tmp
Tstepro Oct 22, 2017
cc9388f
Including ruby 2.3.4 in gemfile
Tstepro Oct 22, 2017
512338e
Merge branch 'master' of github.com:yonas024/enrollme
Tstepro Oct 22, 2017
3422339
monty group
yonas024 Oct 22, 2017
c052544
Group View
Tstepro Oct 22, 2017
e98b31f
Fixed Group View and Resolved Merge Conflict
Tstepro Oct 22, 2017
f2b2aca
View Groups bug fixed and Cucumber Test passed
Tstepro Oct 22, 2017
a3da907
Monty's random method commit
Oct 22, 2017
86d20b4
Merge conflict resolved - random is working
Oct 22, 2017
fbabc61
Email feature
Oct 22, 2017
c573f3e
Added test for email feature
Oct 22, 2017
f309fb1
create group finished
yonas024 Oct 22, 2017
a58bf86
merged
yonas024 Oct 22, 2017
cd06e47
merged new
yonas024 Oct 22, 2017
60e2c8b
working create group/cucumber
yonas024 Oct 22, 2017
3276151
Merge branch 'master' of github.com:yonas024/enrollme
Oct 22, 2017
cdc41fc
unmerge button
yonas024 Oct 22, 2017
0fcf8c1
comment seeds
yonas024 Oct 22, 2017
86c3f86
heroku deploy
yonas024 Oct 22, 2017
1084eb7
Merge branch 'master' of github.com:yonas024/enrollme
Oct 22, 2017
549b4bc
coveralls
yonas024 Oct 22, 2017
579a3a4
coverall yml
yonas024 Oct 23, 2017
a5769cc
Update README.md
yonas024 Oct 25, 2017
2142aaa
Merge branch 'master' of github.com:yonas024/enrollme
Oct 25, 2017
a0f63f1
Done with iter1-2
Oct 26, 2017
a6938a4
Merge pull request #2 from msun908/new_email_feature
msun908 Oct 26, 2017
c13924d
cucumber passed
minjoosur Oct 26, 2017
03b8982
Update README.md
yonas024 Oct 26, 2017
3332dd5
Update README.md
yonas024 Oct 26, 2017
0b28fd2
.travisci changes
yonas024 Oct 26, 2017
5cc4c10
Merge branch 'master' of https://github.com/msun908/enrollme
yonas024 Oct 26, 2017
d5bf290
deleted tmp
yonas024 Oct 26, 2017
b1ea617
Update README.md
yonas024 Oct 26, 2017
ad8ad66
Update README.md
yonas024 Oct 26, 2017
b8ba10c
Update .travis.yml
yonas024 Oct 26, 2017
50a8d72
Update README.md
yonas024 Oct 26, 2017
af683e4
cucumber test done for select_teams ver.1
minjoosur Oct 26, 2017
5292eae
Merge pull request #3 from msun908/minjoo
imnotanoob Oct 26, 2017
2d04676
Change back config
msun908 Oct 26, 2017
4ca73d0
coveralls
msun908 Oct 26, 2017
dd1d9da
Update README.md
msun908 Oct 26, 2017
cec1142
Small css commit
Oct 28, 2017
1c1622a
Added a feature file
Oct 28, 2017
de1ea6c
Trying to get Travis CI Build to Pass
Nov 2, 2017
29cc6f0
Fixing feature file
Nov 2, 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
3 changes: 3 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
service_name: travis-ci
repo_secret_token: YAfnBPP741mMEGDoVdGABGsmPIoOovch5
# <%= ENV['coverall_token'] %>
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
/tmp
/tmp/*

#Ignore the coverage generation.
/coverage/*
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
language: ruby
rvm:
- 2.2
before_script:
- gpg --passphrase "$KEY" --decrypt --no-use-agent --output config/application.yml config/application.yml.asc
script:
- RAILS_ENV=test bundle exec rake db:migrate --trace
- bundle exec rake db:test:prepare
- bundle exec rspec
- bundle exec cucumber
after_script:
- bundle exec rake send_to_codeclimate
addons:
code_climate:
repo_token: 46e45a2fe953633bb2ecd54b9c1591d951cb25efa6c6987ccd9335aebfa95fe6
env:
- secure: "WqBTwwaITf4214Xvejf7KSAzo+4+2WQgBYMENhhtVQuXZQ+UPk5nPNEuT59vGiWpcdP+Xvk+XzYvRUVRMTBJw69dVeirii5vrPXNl5iC7qbnNtbIxWbczmkEdZofaZSGEZscbs136MX1UaPKlo3tdwIjYyAccuY1hrGDrn8aGubHKOScC+eGEirEqqYNPQsTX0NH+/xtaHlon0zLP/bvnedIn2a0XoN07WC7Qolfrcb9ugX9b+0FsJl50ImlyGp3d3p6UDyXr+g9wAreeRSDlnnmTV3f1vwWR0H3AEj171YP+eXfGFiqV7dELKRt8SWSYwZzmInMWBwFIULu3o/rpPfODP6lmYAnyXm+qZCOWymEzvvKxSQnSbCUFj30DTJ+LbgnPyd2xNl+IzBJYkkFzPwvOYoePAwiiQvv/3eLMDU1eEdyydW5+8kS7dUZOBwwl9kh8SfVAs3tGTugCnQBn4O3R1T1AJlHfNXY8B5Wiy3PC779ZuganrxfbDhK7pLPoSeBkhZP06Ffhs7MfgigZUR3h4K+t1mRFkEWuCEYh5OwkHGpuFSoxAWVjfRI+RMrlaPB4LJfHCeMvJw/3mXm11JGxQJLLdLFuhe8ruSpoRHtO/0PYg1Q6Qa8BFHJDZ0E8F4thnPFDb1fPnUVIgfKmkE8mnLaQoO7JTHuvyhvyDA="
- ADMIN_DELETE_DATA_PASSWORD: "hello"

3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
source 'https://rubygems.org'
# ruby '2.3.4'

gem 'coveralls', require: false

gem 'rails', '4.2.6'

@@ -12,6 +14,7 @@ gem 'haml'
gem "omniauth-google-oauth2", "~> 0.2.1"
gem "figaro"


# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'

134 changes: 80 additions & 54 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -41,15 +41,16 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (6.0.4)
arrayfields (4.9.2)
ast (2.3.0)
autotest-rails (4.2.1)
ZenTest (~> 4.5)
backports (3.10.0)
builder (3.2.3)
byebug (9.0.6)
byebug (9.1.0)
cane (2.6.2)
parallel
capybara (2.10.0)
@@ -59,7 +60,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-screenshot (1.0.14)
capybara-screenshot (1.0.17)
capybara (>= 1.0, < 3)
launchy
chronic (0.10.2)
@@ -74,12 +75,12 @@ GEM
clockwork (2.0.2)
activesupport
tzinfo
code_analyzer (0.4.7)
code_analyzer (0.4.8)
sexp_processor
code_metrics (0.1.3)
codeclimate-test-reporter (0.6.0)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.1)
coderay (1.1.2)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
@@ -91,16 +92,27 @@ GEM
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.0.5)
cucumber (2.4.0)
coveralls (0.7.1)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
crass (1.0.2)
cucumber (3.0.1)
builder (>= 2.1.2)
cucumber-core (~> 1.5.0)
cucumber-core (~> 3.0.0)
cucumber-expressions (~> 4.0.3)
cucumber-wire (~> 0.0.1)
diff-lcs (>= 1.1.3)
diff-lcs (~> 1.3)
gherkin (~> 4.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
cucumber-core (1.5.0)
gherkin (~> 4.0)
cucumber-core (3.0.0)
backports (>= 3.8.0)
cucumber-tag_expressions (>= 1.0.1)
gherkin (>= 4.1.3)
cucumber-expressions (4.0.4)
cucumber-rails (1.5.0)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 4)
@@ -109,9 +121,10 @@ GEM
railties (>= 4, < 5.2)
cucumber-rails-training-wheels (1.0.0)
cucumber-rails (>= 1.1.1)
cucumber-tag_expressions (1.0.1)
cucumber-wire (0.0.1)
database_cleaner (1.4.1)
diff-lcs (1.2.5)
diff-lcs (1.3)
docile (1.1.5)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
@@ -122,17 +135,18 @@ GEM
equalizer (0.0.11)
erubis (2.7.0)
execjs (2.7.0)
factory_girl (4.8.0)
factory_girl (4.8.1)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
faraday (0.11.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
fattr (2.3.0)
ffi (1.9.18)
figaro (1.1.1)
thor (~> 0.14)
flay (2.9.0)
flay (2.10.0)
erubis (~> 2.7.0)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
@@ -144,24 +158,24 @@ GEM
gherkin (4.1.3)
globalid (0.4.0)
activesupport (>= 4.2.0)
haml (5.0.1)
haml (5.0.3)
temple (>= 0.8.0)
tilt
hashie (3.5.5)
hashie (3.5.6)
hirb (0.7.3)
htmlentities (4.3.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.8.1)
i18n (0.8.6)
ice_nine (0.11.2)
jasmine-core (2.6.2)
jasmine-rails (0.14.1)
jasmine-core (2.8.0)
jasmine-rails (0.14.3)
jasmine-core (>= 1.3, < 3.0)
phantomjs (>= 1.9)
railties (>= 3.2.0)
sprockets-rails
jbuilder (2.6.4)
activesupport (>= 3.0.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
@@ -172,9 +186,10 @@ GEM
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.3)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.5)
mail (2.6.6)
mime-types (>= 1.16, < 4)
main (6.2.2)
arrayfields (~> 4.7, >= 4.7.4)
@@ -202,22 +217,22 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.2)
multi_json (1.12.1)
mini_portile2 (2.3.0)
minitest (5.10.3)
multi_json (1.12.2)
multi_test (0.1.2)
multi_xml (0.6.0)
multipart-post (2.0.0)
netrc (0.11.0)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
oauth2 (1.3.1)
faraday (>= 0.8, < 0.12)
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.6.1)
omniauth (1.7.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-google-oauth2 (0.2.10)
@@ -229,14 +244,14 @@ GEM
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
parallel (1.11.2)
parser (2.3.3.1)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
path_expander (1.0.2)
pg (0.20.0)
pg (0.21.0)
phantomjs (2.1.1.0)
procto (0.0.3)
public_suffix (2.0.5)
public_suffix (3.0.0)
rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
@@ -259,9 +274,9 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_best_practices (1.18.1)
rails_best_practices (1.19.0)
activesupport
code_analyzer (>= 0.4.3)
code_analyzer (>= 0.4.8)
erubis
i18n
json
@@ -274,7 +289,10 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
rake (12.0.0)
rake (12.1.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (4.3.0)
redcard (1.1.0)
reek (2.2.1)
@@ -305,10 +323,14 @@ GEM
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
ruby-progressbar (1.8.1)
ruby_parser (3.9.0)
sexp_processor (~> 4.1)
sass (3.4.24)
ruby-progressbar (1.9.0)
ruby_parser (3.10.1)
sexp_processor (~> 4.9)
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)
@@ -318,40 +340,43 @@ GEM
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sexp_processor (4.9.0)
simplecov (0.14.1)
sexp_processor (4.10.0)
simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
simplecov-html (0.10.2)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
temple (0.8.0)
thor (0.19.4)
term-ansicolor (1.6.0)
tins (~> 1.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.7)
tilt (2.0.8)
tins (1.15.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unparser (0.2.5)
unparser (0.2.6)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
diff-lcs (~> 1.2.5)
diff-lcs (~> 1.3)
equalizer (~> 0.0.9)
parser (~> 2.3.0)
parser (>= 2.3.1.2, < 2.5)
procto (~> 0.0.2)
xpath (2.0.0)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
@@ -366,6 +391,7 @@ DEPENDENCIES
clockwork
codeclimate-test-reporter (= 0.6.0)
coffee-rails (~> 4.1.0)
coveralls
cucumber-rails
cucumber-rails-training-wheels
database_cleaner (= 1.4.1)
@@ -390,4 +416,4 @@ DEPENDENCIES
uglifier (>= 1.3.0)

BUNDLED WITH
1.14.6
1.15.4
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@

# EnrollMe

[![Code Climate](https://codeclimate.com/github/adnanhemani/enrollme/badges/gpa.svg?)](https://codeclimate.com/github/adnanhemani/enrollme)
[![Test Coverage](https://codeclimate.com/github/adnanhemani/enrollme/badges/coverage.svg?)](https://codeclimate.com/github/adnanhemani/enrollme/coverage)
[![Build Status](https://travis-ci.org/adnanhemani/enrollme.svg?branch=master)](https://travis-ci.org/adnanhemani/enrollme)
[![Maintainability](https://api.codeclimate.com/v1/badges/83a3897f352fa9401cfb/maintainability)](https://codeclimate.com/github/msun908/enrollme/maintainability)
[![Coverage Status](https://coveralls.io/repos/github/msun908/enrollme/badge.svg)](https://coveralls.io/github/msun908/enrollme)
[![Build Status](https://travis-ci.org/msun908/enrollme.svg?branch=master)](https://travis-ci.org/msun908/enrollme)


Copyright (c) 2016 Jason Gao, Adnan Hemani, David Koh, Sid Masih, Varun Mathuria, Dasol Yoon
Copyright (c) 2017 Yonas Kbrom, Vikram Baid, Mark Sun, Timothy Stepro, Monty Inaya, Minjoo Sur

*Pivotal Tracker* https://www.pivotaltracker.com/n/projects/1886001
*Pivotal Tracker* https://www.pivotaltracker.com/n/projects/2121289

Michael-David Sasson, Berkeley’s CS enrollment coordinator, would like a tool that students can use to submit requests for their teams to be enrolled into CS 169. Students will be able to specify their team members and submit information like SID and major which will be used to process enrollment. There currently does not exist a website.

Deployed App: https://enrollme.herokuapp.com/
Deployed App: https://enrollme0.herokuapp.com/

The app will not work locally (at least, logging in specifically) unless you add your specific redirect URL to Google API credentials. This is only possible if you have access to the enrollmeberkeley at gmail.com account, which the next team in charge of this project will possess. To add your redirect URL, go to https://console.developers.google.com/apis/credentials, signed in with the enrollmeberkeley account, go to the edit page for the EnrollMe oauth client, and add your URL to the list of authorized redirect URLs. If you have any questions or confusions, feel free to contact at v.mathuria at berkeley.edu or adnan.h at berkeley.edu.

3 changes: 3 additions & 0 deletions app/assets/javascripts/group.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
Loading