midgard/tap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix-tap-on-herbert'

Browse source
This commit is contained in:
Rien Maertens 2018-08-08 00:30:23 +02:00
commit 4ff6ac7a03
No known key found for this signature in database
GPG key ID: 943CAB70C511D23C
9 changed files with 112 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,6 +3,7 @@
# If you find yourself ignoring temporary files generated by your text editor # If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead: # or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global' # git config --global core.excludesfile '~/.gitignore_global'
.byebug_history
# Ignore bundler config. # Ignore bundler config.
/.bundle /.bundle

2
.ruby-version
View file

@ -1 +1 @@
2.3.0-dev 2.4.0

30
Gemfile
View file

@ -1,19 +1,21 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'byebug'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.4' gem 'rails', '4.2.10'
# Assets # Assets
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails', '~> 4.0.3'
gem 'bootstrap-sass', '3.2.0.0' gem 'bootstrap-sass', '3.2.0.0'
gem 'bootstrap-switch-rails' gem 'bootstrap-switch-rails', '3.3.3'
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
gem 'jquery-rails' gem 'jquery-rails', '4.1.0'
# Haml for templating! # Haml for templating!
gem "haml-rails", "~> 0.9" gem "haml-rails", "~> 0.9"
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks' gem 'turbolinks', '2.5.3'
# Friendly ids! # Friendly ids!
gem 'friendly_id', '~> 5.1.0' gem 'friendly_id', '~> 5.1.0'
@ -35,15 +37,15 @@ end
group :development do group :development do
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
gem 'sqlite3' gem 'sqlite3', '1.3.11'
gem 'annotate' gem 'annotate'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring' gem 'spring', '1.6.2'
# Deployment # Deployment
gem 'capistrano', '~> 3.1' gem 'capistrano', '~> 3.4'
gem 'capistrano-rails', '~> 1.1' gem 'capistrano-rails', '~> 1.1'
gem 'capistrano-rvm' gem 'capistrano-rvm'
gem 'capistrano-rbenv' gem 'capistrano-rbenv'
@ -51,7 +53,7 @@ group :development do
end end
group :development, :test do group :development, :test do
gem 'factory_girl_rails' gem 'factory_girl_rails', '4.6.0'
gem 'faker', '1.4.2' gem 'faker', '1.4.2'
end end
@ -63,21 +65,21 @@ gem 'will_paginate', '3.0.7'
gem 'bootstrap-will_paginate', '0.0.10' gem 'bootstrap-will_paginate', '0.0.10'
# Paperclip for easy file attachment # Paperclip for easy file attachment
gem 'paperclip' gem 'paperclip', '4.3.4'
# Use devise for users and admins # Use devise for users and admins
gem 'devise' gem 'devise', '3.5.6'
gem 'omniauth-oauth2', '1.3.1' gem 'omniauth-oauth2', '1.3.1'
# Use cancancan for authorization # Use cancancan for authorization
gem 'cancancan' gem 'cancancan', '1.13.1'
# Default avatar for users # Default avatar for users
gem 'identicon' gem 'identicon', '0.0.5'
# Run stuff in the background # Run stuff in the background
gem 'daemons' gem 'daemons', '1.2.3'
gem 'delayed_job', '~> 4.0' gem 'delayed_job', '~> 4.0'
gem 'delayed_job_active_record' gem 'delayed_job_active_record'
gem 'httparty' gem 'httparty', '0.13.7'

159
Gemfile.lock
View file

@ -1,38 +1,37 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.2.4) actionmailer (4.2.10)
actionpack (= 4.2.4) actionpack (= 4.2.10)
actionview (= 4.2.4) actionview (= 4.2.10)
activejob (= 4.2.4) activejob (= 4.2.10)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.4) actionpack (4.2.10)
actionview (= 4.2.4) actionview (= 4.2.10)
activesupport (= 4.2.4) activesupport (= 4.2.10)
rack (~> 1.6) rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.4) actionview (4.2.10)
activesupport (= 4.2.4) activesupport (= 4.2.10)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.4) activejob (4.2.10)
activesupport (= 4.2.4) activesupport (= 4.2.10)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.4) activemodel (4.2.10)
activesupport (= 4.2.4) activesupport (= 4.2.10)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.4) activerecord (4.2.10)
activemodel (= 4.2.4) activemodel (= 4.2.10)
activesupport (= 4.2.4) activesupport (= 4.2.10)
arel (~> 6.0) arel (~> 6.0)
activesupport (4.2.4) activesupport (4.2.10)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
@ -40,22 +39,26 @@ GEM
airbrake (4.3.5) airbrake (4.3.5)
builder builder
multi_json multi_json
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
annotate (2.7.0) annotate (2.7.0)
activerecord (>= 3.2, < 6.0) activerecord (>= 3.2, < 6.0)
rake (~> 10.4) rake (~> 10.4)
arel (6.0.3) arel (6.0.4)
bcrypt (3.1.10) bcrypt (3.1.10)
bootstrap-sass (3.2.0.0) bootstrap-sass (3.2.0.0)
sass (~> 3.2) sass (~> 3.2)
bootstrap-switch-rails (3.3.3) bootstrap-switch-rails (3.3.3)
bootstrap-will_paginate (0.0.10) bootstrap-will_paginate (0.0.10)
will_paginate will_paginate
builder (3.2.2) builder (3.2.3)
byebug (10.0.2)
cancancan (1.13.1) cancancan (1.13.1)
capistrano (3.4.0) capistrano (3.11.0)
airbrussh (>= 1.0.0)
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (~> 1.3) sshkit (>= 1.9.0)
capistrano-bundler (1.1.4) capistrano-bundler (1.1.4)
capistrano (~> 3.1) capistrano (~> 3.1)
sshkit (~> 1.2) sshkit (~> 1.2)
@ -84,6 +87,7 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.10.0) coffee-script-source (1.10.0)
concurrent-ruby (1.0.5)
coveralls (0.8.10) coveralls (0.8.10)
json (~> 1.8) json (~> 1.8)
rest-client (>= 1.6.8, < 2) rest-client (>= 1.6.8, < 2)
@ -93,6 +97,7 @@ GEM
tins (~> 1.6.0) tins (~> 1.6.0)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
crass (1.0.4)
daemons (1.2.3) daemons (1.2.3)
delayed_job (4.1.1) delayed_job (4.1.1)
activesupport (>= 3.0, < 5.0) activesupport (>= 3.0, < 5.0)
@ -123,8 +128,8 @@ GEM
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
friendly_id (5.1.0) friendly_id (5.1.0)
activerecord (>= 4.0.0) activerecord (>= 4.0.0)
globalid (0.3.6) globalid (0.4.1)
activesupport (>= 4.1.0) activesupport (>= 4.2.0)
haml (4.0.7) haml (4.0.7)
tilt tilt
haml-rails (0.9.0) haml-rails (0.9.0)
@ -146,33 +151,36 @@ GEM
httparty (0.13.7) httparty (0.13.7)
json (~> 1.8) json (~> 1.8)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (0.7.0) i18n (0.9.5)
concurrent-ruby (~> 1.0)
identicon (0.0.5) identicon (0.0.5)
chunky_png chunky_png
jquery-rails (4.1.0) jquery-rails (4.1.0)
rails-dom-testing (~> 1.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.3) json (1.8.6)
jwt (1.5.1) jwt (1.5.1)
loofah (2.0.3) loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.3) mail (2.7.0)
mime-types (>= 1.16, < 3) mini_mime (>= 0.1.1)
mime-types (2.99) mime-types (2.99.3)
mimemagic (0.3.0) mimemagic (0.3.0)
mini_portile2 (2.0.0) mini_mime (1.0.0)
minitest (5.8.4) mini_portile2 (2.1.0)
multi_json (1.11.2) minitest (5.11.3)
multi_json (1.13.1)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.3.20) mysql2 (0.3.20)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (3.0.2) net-ssh (5.0.2)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.6.7.2) nokogiri (1.6.8.1)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.1.0)
oauth2 (1.1.0) oauth2 (1.1.0)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2) jwt (~> 1.0, < 1.5.2)
@ -192,31 +200,31 @@ GEM
cocaine (~> 0.5.5) cocaine (~> 0.5.5)
mime-types mime-types
mimemagic (= 0.3.0) mimemagic (= 0.3.0)
rack (1.6.4) rack (1.6.10)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.4) rails (4.2.10)
actionmailer (= 4.2.4) actionmailer (= 4.2.10)
actionpack (= 4.2.4) actionpack (= 4.2.10)
actionview (= 4.2.4) actionview (= 4.2.10)
activejob (= 4.2.4) activejob (= 4.2.10)
activemodel (= 4.2.4) activemodel (= 4.2.10)
activerecord (= 4.2.4) activerecord (= 4.2.10)
activesupport (= 4.2.4) activesupport (= 4.2.10)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.4) railties (= 4.2.10)
sprockets-rails sprockets-rails
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7) rails-dom-testing (1.0.9)
activesupport (>= 4.2.0.beta, < 5.0) activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.4)
loofah (~> 2.0) loofah (~> 2.2, >= 2.2.2)
railties (4.2.4) railties (4.2.10)
actionpack (= 4.2.4) actionpack (= 4.2.10)
activesupport (= 4.2.4) activesupport (= 4.2.10)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.5.0) rake (10.5.0)
@ -264,7 +272,7 @@ GEM
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.0)
spring (1.6.2) spring (1.6.2)
sprockets (2.12.4) sprockets (2.12.5)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
@ -274,18 +282,18 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.11) sqlite3 (1.3.11)
sshkit (1.8.1) sshkit (1.17.0)
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
term-ansicolor (1.3.2) term-ansicolor (1.3.2)
tins (~> 1.0) tins (~> 1.0)
thor (0.19.1) thor (0.19.4)
thread_safe (0.3.5) thread_safe (0.3.6)
tilt (1.4.1) tilt (1.4.1)
tins (1.6.0) tins (1.6.0)
turbolinks (2.5.3) turbolinks (2.5.3)
coffee-rails coffee-rails
tzinfo (1.2.2) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.7.2) uglifier (2.7.2)
execjs (>= 0.3.0) execjs (>= 0.3.0)
@ -308,40 +316,41 @@ DEPENDENCIES
airbrake (~> 4) airbrake (~> 4)
annotate annotate
bootstrap-sass (= 3.2.0.0) bootstrap-sass (= 3.2.0.0)
bootstrap-switch-rails bootstrap-switch-rails (= 3.3.3)
bootstrap-will_paginate (= 0.0.10) bootstrap-will_paginate (= 0.0.10)
cancancan byebug
capistrano (~> 3.1) cancancan (= 1.13.1)
capistrano (~> 3.4)
capistrano-passenger capistrano-passenger
capistrano-rails (~> 1.1) capistrano-rails (~> 1.1)
capistrano-rbenv capistrano-rbenv
capistrano-rvm capistrano-rvm
codeclimate-test-reporter codeclimate-test-reporter
coveralls coveralls
daemons daemons (= 1.2.3)
delayed_job (~> 4.0) delayed_job (~> 4.0)
delayed_job_active_record delayed_job_active_record
devise devise (= 3.5.6)
factory_girl_rails factory_girl_rails (= 4.6.0)
faker (= 1.4.2) faker (= 1.4.2)
friendly_id (~> 5.1.0) friendly_id (~> 5.1.0)
haml-rails (~> 0.9) haml-rails (~> 0.9)
httparty httparty (= 0.13.7)
identicon identicon (= 0.0.5)
jquery-rails jquery-rails (= 4.1.0)
mysql2 (~> 0.3.18) mysql2 (~> 0.3.18)
omniauth-oauth2 (= 1.3.1) omniauth-oauth2 (= 1.3.1)
paperclip paperclip (= 4.3.4)
rails (= 4.2.4) rails (= 4.2.10)
rspec-rails rspec-rails
sass-rails (~> 4.0.3) sass-rails (~> 4.0.3)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
spring spring (= 1.6.2)
sqlite3 sqlite3 (= 1.3.11)
turbolinks turbolinks (= 2.5.3)
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
webmock webmock
will_paginate (= 3.0.7) will_paginate (= 3.0.7)
BUNDLED WITH BUNDLED WITH
1.11.2 1.16.1

5
README.md
View file

@ -1,3 +1,8 @@
# [Tap](https://zeus.ugent.be/tap) [![Code Climate](https://codeclimate.com/github/ZeusWPI/Tap/badges/gpa.svg)](https://codeclimate.com/github/ZeusWPI/Tap) [![Travis CI](https://travis-ci.org/ZeusWPI/Tap.svg)](https://travis-ci.org/ZeusWPI/Tap) [![Coverage Status](https://coveralls.io/repos/ZeusWPI/Tap/badge.svg?branch=master&service=github)](https://coveralls.io/github/ZeusWPI/Tap?branch=master) # [Tap](https://zeus.ugent.be/tap) [![Code Climate](https://codeclimate.com/github/ZeusWPI/Tap/badges/gpa.svg)](https://codeclimate.com/github/ZeusWPI/Tap) [![Travis CI](https://travis-ci.org/ZeusWPI/Tap.svg)](https://travis-ci.org/ZeusWPI/Tap) [![Coverage Status](https://coveralls.io/repos/ZeusWPI/Tap/badge.svg?branch=master&service=github)](https://coveralls.io/github/ZeusWPI/Tap?branch=master)
Yes. We have to drink. But we also have to pay. This is the drinking part. Yes. We have to drink. But we also have to pay. This is the drinking part.
## Installation
1. Make sure Ruby version 2.3.0-dev is installed by running `rbenv version`. If it isn't, install by running `rbenv install 2.3.0-dev`
2. Run `bundle update` and `bundle install`
3. Start Tap by running `bundle exec rails s`

2
app/views/layouts/_header.html.haml
View file

@ -28,6 +28,6 @@
%li %li
%p.navbar-text %p.navbar-text
Balance: Balance:
= link_to euro_from_cents(current_user.balance), "https://zeus.ugent.be/tab/users/#{current_user.name}" = link_to euro_from_cents(current_user.balance), "https://tab.zeus.gent/users/#{current_user.name}"
.visible-xs.navbar-form .visible-xs.navbar-form
= render 'layouts/session_button' = render 'layouts/session_button'

2
config/deploy.rb
View file

@ -4,7 +4,7 @@
set :application, 'Tap' set :application, 'Tap'
set :repo_url, 'git@github.com:ZeusWPI/Tap.git' set :repo_url, 'git@github.com:ZeusWPI/Tap.git'
set :branch, 'master' set :branch, 'fix-tap-on-herbert'
set :deploy_to, '/home/tap/production' set :deploy_to, '/home/tap/production'
# Default branch is :master # Default branch is :master

2
config/deploy/production.rb
View file

@ -1,4 +1,4 @@
server 'zeus.ugent.be', user: 'tap', roles: %w{web app db}, ssh_options: { server 'tap.zeus.gent', user: 'tap', roles: %w{web app db}, ssh_options: {
forward_agent: true, forward_agent: true,
auth_methods: ['publickey'], auth_methods: ['publickey'],
port: 2222 port: 2222

11
config/environments/production.rb
View file

@ -79,13 +79,6 @@ Rails.application.configure do
Paperclip.options[:command_path] = "/usr/local/bin/" Paperclip.options[:command_path] = "/usr/local/bin/"
# Help the asset pipeline for staging # Help the asset pipeline for staging
config.x.host = 'zeus.ugent.be' config.x.host = 'tab.zeus.gent'
config.relative_url_root = "/tap" config.api_url = "https://tab.zeus.gent/"
config.action_mailer.default_url_options = {
host: config.x.host,
script_name: config.relative_url_root,
}
config.api_url = "https://zeus.ugent.be/tab"
end end