Skip to content

Commit

Permalink
Merge pull request #140 from aspc/feature/#4-create-course-reviews
Browse files Browse the repository at this point in the history
Feature/#4 create course reviews
  • Loading branch information
thebradbain authored May 8, 2019
2 parents 766c9ae + 3bad7a1 commit f3ce009
Show file tree
Hide file tree
Showing 37 changed files with 759 additions and 138 deletions.
170 changes: 84 additions & 86 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.2)
actionpack (= 5.2.2)
actioncable (5.2.0)
actionpack (= 5.2.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
actionmailer (5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.2)
actionview (= 5.2.2)
activesupport (= 5.2.2)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.2)
activesupport (= 5.2.2)
actionview (5.2.0)
activesupport (= 5.2.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -36,51 +36,52 @@ GEM
ransack (>= 1.8.7)
sass (~> 3.1)
sprockets (< 4.1)
activejob (5.2.2)
activesupport (= 5.2.2)
activejob (5.2.0)
activesupport (= 5.2.0)
globalid (>= 0.3.6)
activemodel (5.2.2)
activesupport (= 5.2.2)
activerecord (5.2.2)
activemodel (= 5.2.2)
activesupport (= 5.2.2)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activerecord-session_store (1.1.1)
actionpack (>= 4.0)
activerecord (>= 4.0)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0)
activestorage (5.2.2)
actionpack (= 5.2.2)
activerecord (= 5.2.2)
activestorage (5.2.0)
actionpack (= 5.2.0)
activerecord (= 5.2.0)
marcel (~> 0.3.1)
activesupport (5.2.2)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
airbrussh (1.3.1)
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
arbre (1.1.1)
activesupport (>= 3.0.0)
archive-zip (0.11.0)
io-like (~> 0.3.0)
arel (9.0.0)
bindex (0.5.0)
bootsnap (1.4.0)
bootsnap (1.3.1)
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.0)
byebug (10.0.2)
capistrano (3.11.0)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (1.5.0)
capistrano-bundler (1.3.0)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-rails (1.4.0)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
Expand All @@ -95,17 +96,16 @@ GEM
capistrano (~> 3.7)
capistrano-bundler
puma (~> 3.4)
capybara (3.14.0)
capybara (3.5.1)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
xpath (~> 3.1)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
chromedriver-helper (1.2.0)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
chronic (0.10.2)
Expand All @@ -116,11 +116,11 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.4)
concurrent-ruby (1.0.5)
crass (1.0.4)
erubi (1.8.0)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.10.0)
ffi (1.9.25)
font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0)
font-awesome-sass (4.7.0)
Expand All @@ -132,15 +132,14 @@ GEM
mime-types (~> 3.1)
mini_magick (~> 4.5.0)
wysiwyg-rails (~> 2.6.0)
globalid (0.4.2)
globalid (0.4.1)
activesupport (>= 4.2.0)
has_scope (0.7.2)
actionpack (>= 4.1)
activesupport (>= 4.1)
httparty (0.16.4)
mime-types (~> 3.0)
httparty (0.16.2)
multi_xml (>= 0.5.2)
i18n (1.5.3)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
icalendar (2.5.2)
ice_cube (~> 0.16)
Expand All @@ -151,7 +150,7 @@ GEM
railties (>= 4.2, < 5.3)
responders
io-like (0.3.0)
jbuilder (2.8.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
Expand All @@ -175,78 +174,77 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
logster (2.1.2)
loofah (2.2.3)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.7.0)
mini_mime (>= 0.1.1)
marcel (0.3.3)
marcel (0.3.2)
mimemagic (~> 0.3.2)
method_source (0.9.2)
method_source (0.9.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mimemagic (0.3.3)
mimemagic (0.3.2)
mini_magick (4.5.1)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
msgpack (1.2.6)
msgpack (1.2.4)
multi_json (1.13.1)
multi_xml (0.6.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (5.1.0)
net-ssh (5.0.2)
nio4r (2.3.1)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
pg (1.1.4)
public_suffix (3.0.3)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
pg (1.0.0)
public_suffix (3.0.2)
puma (3.12.0)
rack (2.0.6)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.2)
actioncable (= 5.2.2)
actionmailer (= 5.2.2)
actionpack (= 5.2.2)
actionview (= 5.2.2)
activejob (= 5.2.2)
activemodel (= 5.2.2)
activerecord (= 5.2.2)
activestorage (= 5.2.2)
activesupport (= 5.2.2)
rails (5.2.0)
actioncable (= 5.2.0)
actionmailer (= 5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
activemodel (= 5.2.0)
activerecord (= 5.2.0)
activestorage (= 5.2.0)
activesupport (= 5.2.0)
bundler (>= 1.3.0)
railties (= 5.2.2)
railties (= 5.2.0)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.2)
actionpack (= 5.2.2)
activesupport (= 5.2.2)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
ransack (2.1.1)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
ransack (2.0.1)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
i18n
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redis (4.1.0)
regexp_parser (1.3.0)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.7.3)
rubyzip (1.2.1)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -257,9 +255,9 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.141.0)
selenium-webdriver (3.14.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
rubyzip (~> 1.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
Expand All @@ -272,19 +270,19 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sshkit (1.18.2)
sshkit (1.17.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thor (0.20.3)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.9)
tilt (2.0.8)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.20)
uglifier (4.1.17)
execjs (>= 0.3.0, < 3)
watir (6.14.0)
selenium-webdriver (~> 3.4, >= 3.4.1)
web-console (3.7.0)
web-console (3.6.2)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
Expand All @@ -297,7 +295,7 @@ GEM
wysiwyg-rails (2.6.6)
font-awesome-sass (~> 4.4, >= 4.4.0)
railties (>= 3.2, < 6.0)
xpath (3.2.0)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
Expand Down
7 changes: 7 additions & 0 deletions app/admin/course_review.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
course_review_page = Proc.new do
menu parent: "Models"

permit_params :overall_rating, :challenge_rating, :inclusivity_rating, :comments, :course_id, :work_per_week
end

ActiveAdmin.register CourseReview, :namespace => :admin, &course_review_page
3 changes: 2 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@
//= require sessions.js
//= require static.js
//= require courses.js
//= require menu.js
//= require menu.js
//= require course_reviews.js
File renamed without changes.
13 changes: 12 additions & 1 deletion app/assets/javascripts/courses.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
// 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/
$( document ).ready(function() {
$(document).ready(function () {
$('select[id*="time"]').wrap('<div class="select">');

$(".expand-search-options").click(function (e) {
e.preventDefault();
$(".expandable").toggle('slow', 'swing', function () {
if ($('.expandable').css('display') == 'block') {
$(".expand-search-options").text("Hide advanced search")
} else {
$(".expand-search-options").text("Show advanced search")
}
});
});
});
9 changes: 9 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
*= require home.scss
*= require static.scss
*= require menu.scss
*= require course_reviews.scss
*
* Global styles defined in this file
*= require_self
Expand Down Expand Up @@ -261,6 +262,14 @@ a {
color: white !important;
}

.has-brightness {
filter: brightness(1.25);
}

.results-heading {
margin: 20px auto 10px 0;
}

.campus_KS {
background-color: #391858 !important;
color: white !important;
Expand Down
File renamed without changes.
Loading

0 comments on commit f3ce009

Please sign in to comment.