Skip to content

Commit

Permalink
Merge pull request #2479 from tulibraries/qa
Browse files Browse the repository at this point in the history 
Week of 09-12-2022
  • Loading branch information
@cdoyle-temple
cdoyle-temple authored Sep 12, 2022
2 parents ed59020 + cc74497 commit 654deae
Show file tree
Hide file tree
Showing 45 changed files with 1,004 additions and 177 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ yarn-debug.log*
.yarn-integrity
.DS_Store
spec/.DS_Store
public/alerts.json
57 changes: 31 additions & 26 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,19 +161,19 @@ GEM
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
erubi (1.10.0)
erubi (1.11.0)
execjs (2.8.1)
factory_bot (6.2.0)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (2.22.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
faraday (2.2.0)
faraday-net_http (~> 2.0)
faraday (2.5.2)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (2.0.1)
faraday-net_http (3.0.0)
fast_jsonapi (1.5)
activesupport (>= 4.2)
feedjira (3.2.1)
Expand Down Expand Up @@ -265,7 +265,7 @@ GEM
rdf (~> 3.2, >= 3.2.9)
json-schema (3.0.0)
addressable (>= 2.8)
jwt (2.3.0)
jwt (2.5.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand Down Expand Up @@ -309,20 +309,20 @@ GEM
mini_magick (4.11.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.2)
minitest (5.16.3)
momentjs-rails (2.29.1.1)
railties (>= 3.1)
msgpack (1.5.4)
multi_json (1.15.0)
multi_xml (0.6.0)
mutant (0.11.14)
mutant (0.11.16)
diff-lcs (~> 1.3)
parser (~> 3.1.0)
regexp_parser (~> 2.3, >= 2.3.1)
sorbet-runtime (~> 0.5.0)
unparser (~> 0.6.5)
mutant-rspec (0.11.14)
mutant (= 0.11.14)
mutant-rspec (0.11.16)
mutant (= 0.11.16)
rspec-core (>= 3.8.0, < 4.0.0)
nenv (0.3.0)
nio4r (2.5.8)
Expand All @@ -332,25 +332,26 @@ GEM
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
oauth2 (1.4.9)
oauth2 (2.0.8)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
okcomputer (1.18.4)
omniauth (2.1.0)
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
omniauth-google-oauth2 (1.0.1)
omniauth-google-oauth2 (1.1.1)
jwt (>= 2.0)
oauth2 (~> 1.1)
oauth2 (~> 2.0.6)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.8.0)
omniauth-oauth2 (1.8.0)
oauth2 (>= 1.4, < 3)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-oauth2 (1.7.2)
oauth2 (~> 1.4)
omniauth (>= 1.9, < 3)
omniauth-rails_csrf_protection (1.0.1)
actionpack (>= 4.2)
omniauth (~> 2.0)
Expand All @@ -377,11 +378,11 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.7)
puma (5.6.4)
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.4)
rack-protection (2.2.0)
rack-protection (2.2.2)
rack
rack-proxy (0.7.2)
rack
Expand Down Expand Up @@ -466,12 +467,12 @@ GEM
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.11.0)
rswag-api (2.5.1)
rswag-api (2.6.0)
railties (>= 3.1, < 7.1)
rswag-ui (2.5.1)
rswag-ui (2.6.0)
actionpack (>= 3.1, < 7.1)
railties (>= 3.1, < 7.1)
rubocop (1.35.0)
rubocop (1.36.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.2.1)
Expand All @@ -483,10 +484,10 @@ GEM
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
rubocop-rails (2.15.2)
rubocop-rails (2.16.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.12.1)
rubocop (~> 1.31)
ruby-graphviz (1.2.5)
Expand Down Expand Up @@ -538,7 +539,10 @@ GEM
skylight-core (= 4.3.2)
skylight-core (4.3.2)
activesupport (>= 4.2.0)
sorbet-runtime (0.5.10242)
snaky_hash (2.0.0)
hashie
version_gem (~> 1.1)
sorbet-runtime (0.5.10415)
spring (2.1.1)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
Expand Down Expand Up @@ -567,6 +571,7 @@ GEM
diff-lcs (~> 1.3)
parser (>= 3.1.0)
vcr (6.1.0)
version_gem (1.1.0)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.0)
Expand Down
Binary file modified app/assets/images/charles/0.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/charles/1.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/charles/2.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/charles/3.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 52 additions & 3 deletions app/assets/javascripts/listeners.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,32 @@ $(document).on('turbolinks:load', function() {
var subject = encodeURIComponent($("#subject").find(":selected").val());
window.location.href = "/people?specialty="+subject+"&page=1";
});

$("#failover-global-search").submit(function(){
var query = document.getElementById("failover-global-search").elements[0].value;
var delims = "any,contains,";
document.getElementById("failover-global-search").elements[0].style.color = "white";
document.getElementById("failover-global-search").elements[0].value = delims+query;
});
$("#failover-mobile-search-form").submit(function(){
var query = document.getElementById("failover-mobile-search-form").elements[0].value;
var delims = "any,contains,";
document.getElementById("failover-mobile-search-form").elements[0].style.color = "white";
document.getElementById("failover-mobile-search-form").elements[0].value = delims+query;
});
$("#failover-global-mobile-search-form").submit(function(){
var query = document.getElementById("failover-global-mobile-search-form").elements[0].value;
var delims = "any,contains,";
document.getElementById("failover-global-mobile-search-form").elements[0].style.color = "white";
document.getElementById("failover-global-mobile-search-form").elements[0].value = delims+query;
});
$("#failover-desktop-search-form").submit(function(){
var query = document.getElementById("failover-desktop-search-form").elements[0].value;
var delims = "any,contains,";
document.getElementById("failover-desktop-search-form").elements[0].style.setProperty("color", "white", "important");
document.getElementById("failover-desktop-search-form").elements[0].value = delims+query;
});

});

$(document).ready(function(){
Expand Down Expand Up @@ -57,17 +83,40 @@ $(document).ready(function(){
// end wpvi

setTimeout(function(){
$('form#main-search').on('keypress', function (evt) {
$('form#desktop-search-form').on('keypress', function (evt) {
if (evt.keyCode == 13) {
handleEventClicks("main-search", "Search");

}
});
$('form#failover-desktop-search-form').on('keypress', function (evt) {
if (evt.keyCode == 13) {
handleEventClicks("main-search", "Search");

}
});

$('form#header-search').on('keypress', function (evt) {
$('form#global-search-form').on('keypress', function (evt) {
if (evt.keyCode == 13) {
handleEventClicks("header-search", "Search");
}
});
});
$('form#failover-global-search-form').on('keypress', function (evt) {
if (evt.keyCode == 13) {
handleEventClicks("header-search", "Search");
}
});

$('form#mobile-search-form').on('keypress', function (evt) {
if (evt.keyCode == 13) {
handleEventClicks("mobile-search", "Search");
}
});
$('form#failover-mobile-search-form').on('keypress', function (evt) {
if (evt.keyCode == 13) {
handleEventClicks("mobile-search", "Search");
}
});

$('staffSearch').on('keypress', function (evt) {
if (evt.keyCode == 13) {
Expand Down
7 changes: 7 additions & 0 deletions app/assets/stylesheets/administrate/application.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,10 @@
select[multiple] {
resize: vertical;
}

.application-failover-text {
padding: 42px;
h2 {
margin-bottom: 35px;
}
}
9 changes: 8 additions & 1 deletion app/assets/stylesheets/categories.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,14 @@ a.category-home {
.carousel-indicators {
bottom: -42px;
li {
background-color: $black;
background-color: $black;
}
}
.image-caption {
height: 28px;
background-color: $black;
color: $white;
font-family: 'Robot Bold';
padding-top: 2px
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/pages.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
display: inline-block;
}
}
form#main-search-form {
#desktop-search-form, #failover-desktop-search-form {
width: 65%;
margin:auto;
position:relative;
Expand Down
44 changes: 21 additions & 23 deletions app/assets/stylesheets/partials/_footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
margin-bottom: 0;
li {
text-decoration: none;
/*font-size: 90%;*/
color: $black;
padding-left: 0;
a {
Expand All @@ -45,18 +44,14 @@
line-height: 2rem;
letter-spacing: 1.25px;
}
@media (max-width: 1040px) {
border-top: solid $white 1px;
margin-top: 14px;
padding-top: 14px;
}
}
}
}

a.donate {
vertical-align: middle;
padding: 10px 14px;
height: 3rem;
position: relative;
top: 17px;
left: 0;
Expand All @@ -66,30 +61,33 @@ a.donate {
font-weight: 600;
font-size: 20px;
box-shadow: 0px 2px 5px $light-grey;
@media(max-width: 500px) {
margin-right: 21px;
}
}
.social {
background-color: $lighter-grey;
.social-link {
ul.social-links {
margin-top: 7px;
a:hover {
text-decoration: none;
}
}
ul {
padding-left: 0;
@media(max-width: 766px) {
margin-top: 35px;
@media(max-width: 485px) {
margin-top: 21px;
}
}
li.social-footer {
display: inline-block;
position: relative;
top: 7px;
padding: 6px 14px;
img {
width: 42px;
height: 42px;
max-width: 42px;
max-height: 42px;
padding-left: 0;
padding-bottom: 10px;
li {
display: inline-block;
position: relative;
top: 7px;
padding: 6px 14px;
img {
width: 42px;
height: 42px;
max-width: 42px;
max-height: 42px;
}
}
}
li.facebook {
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/partials/_vars.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ $footer-grey: #a3a3a3;
$footer-gray: #525353;
$footer-dark-gray: #403f3f;

// new styles

$red: #A32035;
$red: #A41E35;
$dark-red: #910C22;
$lighter-grey: #F0F0F0;
$new-gold: #CCA969;
Expand Down
Loading

0 comments on commit 654deae

Please sign in to comment.