Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
  • uiUpdates
  • 1.0.0
3 results

Target

Select target project
  • JSTUREK8/unl-resource-scheduler
  • erasmussen2/unl-resource-scheduler
  • dxg/unl-resource-scheduler
3 results
Select Git revision
  • master
  • 1.0.0
2 results
Show changes
Commits on Source (5)
source "https://rubygems.org" source "https://rubygems.org"
ruby '2.6.5' #ruby '2.6.5'
gem 'sinatra' gem 'sinatra'
gem 'sinatra-contrib' gem 'sinatra-contrib'
...@@ -13,6 +13,8 @@ gem 'rest-client' ...@@ -13,6 +13,8 @@ gem 'rest-client'
gem 'rack', '2.2.3' gem 'rack', '2.2.3'
gem 'rack-cas' gem 'rack-cas'
gem 'icalendar' gem 'icalendar'
gem 'json'
gem 'bigdecimal'
group :development do group :development do
gem 'shotgun' gem 'shotgun'
......
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activemodel (6.0.2.1) activemodel (7.0.3)
activesupport (= 6.0.2.1) activesupport (= 7.0.3)
activerecord (6.0.2.1) activerecord (7.0.3)
activemodel (= 6.0.2.1) activemodel (= 7.0.3)
activesupport (= 6.0.2.1) activesupport (= 7.0.3)
activesupport (6.0.2.1) activesupport (7.0.3)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 1.6, < 2)
minitest (~> 5.1) minitest (>= 5.1)
tzinfo (~> 1.1) tzinfo (~> 2.0)
zeitwerk (~> 2.2) addressable (2.8.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
backports (3.15.0) bcrypt (3.1.18)
bcrypt (3.1.13) bigdecimal (3.1.2)
coderay (1.1.2) coderay (1.1.3)
commonjs (0.2.7) commonjs (0.2.7)
concurrent-ruby (1.1.5) concurrent-ruby (1.1.10)
daemons (1.3.1) daemons (1.4.1)
domain_name (0.5.20190701) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
eventmachine (1.2.7) eventmachine (1.2.7)
ffi (1.11.3) ffi (1.15.5)
formatador (0.2.5) formatador (1.1.0)
guard (2.16.1) guard (2.18.0)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (>= 2.7, < 4.0) listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0) lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1) nenv (~> 0.1)
notiffany (~> 0.0) notiffany (~> 0.0)
pry (>= 0.9.12) pry (>= 0.13.0)
shellany (~> 0.0) shellany (~> 0.0)
thor (>= 0.18.1) thor (>= 0.18.1)
guard-compat (1.2.1) guard-compat (1.2.1)
...@@ -40,56 +39,57 @@ GEM ...@@ -40,56 +39,57 @@ GEM
guard-compat (~> 1.2) guard-compat (~> 1.2)
less (~> 2.3) less (~> 2.3)
http-accept (1.7.0) http-accept (1.7.0)
http-cookie (1.0.3) http-cookie (1.0.5)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (1.8.2) i18n (1.10.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
icalendar (2.6.1) icalendar (2.7.1)
ice_cube (~> 0.16) ice_cube (~> 0.16)
ice_cube (0.16.3) ice_cube (0.16.4)
kgio (2.11.3) json (2.6.2)
kgio (2.11.4)
less (2.6.0) less (2.6.0)
commonjs (~> 0.2.7) commonjs (~> 0.2.7)
libv8 (3.16.14.19) libv8 (3.16.14.19-x86_64-linux)
listen (3.2.1) listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.1.1) lumberjack (1.2.8)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
method_source (0.9.2) method_source (1.0.0)
mime-types (3.3.1) mime-types (3.4.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009) mime-types-data (3.2022.0105)
mini_mime (1.0.2) mini_mime (1.1.2)
mini_portile2 (2.4.0) minitest (5.15.0)
minitest (5.14.0) multi_json (1.15.0)
multi_json (1.14.1)
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mysql2 (0.5.3) mysql2 (0.5.4)
nenv (0.3.0) nenv (0.3.0)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.10.7) nokogiri (1.13.6-x86_64-linux)
mini_portile2 (~> 2.4.0) racc (~> 1.4)
notiffany (0.1.3) notiffany (0.1.3)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
pony (1.13.1) pony (1.13.1)
mail (>= 2.0) mail (>= 2.0)
pry (0.12.2) pry (0.14.1)
coderay (~> 1.1.0) coderay (~> 1.1)
method_source (~> 0.9.0) method_source (~> 1.0)
public_suffix (4.0.3) public_suffix (4.0.7)
racc (1.6.0)
rack (2.2.3) rack (2.2.3)
rack-cas (0.16.1) rack-cas (0.16.1)
addressable (~> 2.3) addressable (~> 2.3)
nokogiri (~> 1.5) nokogiri (~> 1.5)
rack (>= 1.3) rack (>= 1.3)
rack-protection (2.0.8.1) rack-protection (2.2.0)
rack rack
raindrops (0.19.1) raindrops (0.20.0)
rb-fsevent (0.10.3) rb-fsevent (0.11.1)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
ref (2.0.0) ref (2.0.0)
...@@ -98,51 +98,50 @@ GEM ...@@ -98,51 +98,50 @@ GEM
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0) mime-types (>= 1.16, < 4.0)
netrc (~> 0.8) netrc (~> 0.8)
ruby2_keywords (0.0.2) ruby2_keywords (0.0.5)
shellany (0.0.1) shellany (0.0.1)
shotgun (0.9.2) shotgun (0.9.2)
rack (>= 1.0) rack (>= 1.0)
sinatra (2.0.8.1) sinatra (2.2.0)
mustermann (~> 1.0) mustermann (~> 1.0)
rack (~> 2.0) rack (~> 2.2)
rack-protection (= 2.0.8.1) rack-protection (= 2.2.0)
tilt (~> 2.0) tilt (~> 2.0)
sinatra-contrib (2.0.8.1) sinatra-contrib (2.2.0)
backports (>= 2.8.2)
multi_json multi_json
mustermann (~> 1.0) mustermann (~> 1.0)
rack-protection (= 2.0.8.1) rack-protection (= 2.2.0)
sinatra (= 2.0.8.1) sinatra (= 2.2.0)
tilt (~> 2.0) tilt (~> 2.0)
therubyracer (0.12.3) therubyracer (0.12.3)
libv8 (~> 3.16.14.15) libv8 (~> 3.16.14.15)
ref ref
thin (1.7.2) thin (1.8.1)
daemons (~> 1.0, >= 1.0.9) daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4) eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3) rack (>= 1, < 3)
thor (1.0.1) thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10) tilt (2.0.10)
tzinfo (1.2.6) tzinfo (2.0.4)
thread_safe (~> 0.1) concurrent-ruby (~> 1.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.6) unf_ext (0.0.8.1)
unicorn (5.5.2) unicorn (6.1.0)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
zeitwerk (2.2.2)
PLATFORMS PLATFORMS
ruby x86_64-linux
DEPENDENCIES DEPENDENCIES
activerecord activerecord
bcrypt bcrypt
bigdecimal
guard guard
guard-less guard-less
icalendar icalendar
json
mysql2 mysql2
pony pony
rack (= 2.2.3) rack (= 2.2.3)
...@@ -155,8 +154,5 @@ DEPENDENCIES ...@@ -155,8 +154,5 @@ DEPENDENCIES
thin thin
unicorn unicorn
RUBY VERSION
ruby 2.6.5p114
BUNDLED WITH BUNDLED WITH
2.0.2 2.2.24
GEM
remote: https://rubygems.org/
specs:
activemodel (6.0.2.1)
activesupport (= 6.0.2.1)
activerecord (6.0.2.1)
activemodel (= 6.0.2.1)
activesupport (= 6.0.2.1)
activesupport (6.0.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
backports (3.15.0)
bcrypt (3.1.13)
coderay (1.1.2)
commonjs (0.2.7)
concurrent-ruby (1.1.5)
daemons (1.3.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
eventmachine (1.2.7)
ffi (1.11.3)
formatador (0.2.5)
guard (2.16.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-less (2.0.0)
guard (~> 2.0)
guard-compat (~> 1.2)
less (~> 2.3)
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
icalendar (2.6.1)
ice_cube (~> 0.16)
ice_cube (0.16.3)
kgio (2.11.3)
less (2.6.0)
commonjs (~> 0.2.7)
libv8 (3.16.14.19)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.1.1)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.9.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.0)
multi_json (1.14.1)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
mysql2 (0.5.3)
nenv (0.3.0)
netrc (0.11.0)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
pony (1.13.1)
mail (>= 2.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.3)
rack (2.2.3)
rack-cas (0.16.1)
addressable (~> 2.3)
nokogiri (~> 1.5)
rack (>= 1.3)
rack-protection (2.0.8.1)
rack
raindrops (0.19.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
ref (2.0.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ruby2_keywords (0.0.2)
shellany (0.0.1)
shotgun (0.9.2)
rack (>= 1.0)
sinatra (2.0.8.1)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
sinatra-contrib (2.0.8.1)
backports (>= 2.8.2)
multi_json
mustermann (~> 1.0)
rack-protection (= 2.0.8.1)
sinatra (= 2.0.8.1)
tilt (~> 2.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicorn (5.5.2)
kgio (~> 2.6)
raindrops (~> 0.7)
zeitwerk (2.2.2)
PLATFORMS
ruby
DEPENDENCIES
activerecord
bcrypt
guard
guard-less
icalendar
mysql2
pony
rack (= 2.2.3)
rack-cas
rest-client
shotgun
sinatra
sinatra-contrib
therubyracer
thin
unicorn
RUBY VERSION
ruby 2.6.5p114
BUNDLED WITH
1.17.3
...@@ -7,7 +7,9 @@ Patch ...@@ -7,7 +7,9 @@ Patch
============ ============
Supporting UNL's October 2018 move to shib.unl.edu/idp/profile/cas requires CAS tickets longer than 256 chars. Manually patch the rack-cas library to support tickets up to 1024. Supporting UNL's October 2018 move to shib.unl.edu/idp/profile/cas requires CAS tickets longer than 256 chars. Manually patch the rack-cas library to support tickets up to 1024.
- https://github.com/biola/rack-cas/blob/master/lib/rack-cas/cas_request.rb#L35 - https://github.com/biola/rack-cas/blob/master/lib/rack-cas/cas_request.rb#L35
- vendor/bundle/ruby/2.2.0/gems/rack-cas-0.16.0/lib/rack-cas/cas_request.rb - vendor/bundle/ruby/3.0.0/gems/rack-cas-0.16.1/lib/rack-cas/cas_request.rb
This has been fixed as of https://github.com/biola/rack-cas/commit/b6787f521e645ebd703d2749c629e84e419c2777 in 2020 but as of May 2022 there is not a newer release than 0.16.1 that includes the update.
Installation Installation
============ ============
...@@ -35,3 +37,10 @@ Quick Tutorial ...@@ -35,3 +37,10 @@ Quick Tutorial
4. Events *may* include a resource reservation but do not have to. 4. Events *may* include a resource reservation but do not have to.
5. Admins with the right privilege can set the *hours* of the space, which indicate when reservations can be made. 5. Admins with the right privilege can set the *hours* of the space, which indicate when reservations can be made.
6. The agenda is a quick overview of the day for Admins to look at. 6. The agenda is a quick overview of the day for Admins to look at.
Deploying Updates on Production
===============================
```
$ sudo -u ucommscheduler -s -H
$ systemctl --user restart unicorn
```
...@@ -51,9 +51,8 @@ before do ...@@ -51,9 +51,8 @@ before do
@title = 'UNL Resource Scheduler' @title = 'UNL Resource Scheduler'
@breadcrumbs = [ @breadcrumbs = [
{ {
:href => 'http://www.unl.edu/', :href => 'https://www.unl.edu/',
:text => 'UNL', :text => 'Nebraska',
:title => 'University of Nebraska&ndash;Lincoln'
}, },
{ {
:href => '/', :href => '/',
......
<nav id="dcf-footer-group-1" role="navigation" aria-labelledby="dcf-footer-group-1-heading"> <nav id="dcf-footer-group-1" role="navigation" aria-labelledby="dcf-footer-group-1-heading">
<div class=""> <div class="">
<h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-1-heading">About UNL Resource Scheduler</h3> <h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-1-heading">About UNL Resource Scheduler</h3>
<p>This application is a product of the <a href="https://dxg.unl.edu/">Digital Experience Group at Nebraska</a>. DXG is a partnership of <a href="https://ucomm.unl.edu/">University Communication</a> and <a href="https://its.unl.edu/">Information Technology Services</a>.</p> <p>This application is a product of the <a href="https://dxg.unl.edu/">Digital Experience Group</a> at <a href="http://www.unl.edu/">Nebraska</a>. DXG is part of <a href="https://ucomm.unl.edu/">University Communication &amp; Marketing</a>.</p>
</div> </div>
</nav> </nav>
<nav id="dcf-footer-group-2" role="navigation" aria-labelledby="dcf-footer-group-2-heading"> <nav id="dcf-footer-group-2" role="navigation" aria-labelledby="dcf-footer-group-2-heading">
......