From 0aa61eb28914079d86fea3d0dfe1eaa300f0bb27 Mon Sep 17 00:00:00 2001
From: John Doe <john.doe@example.com>
Date: Wed, 21 Oct 2020 15:00:17 -0700
Subject: [PATCH 01/17] show user/pass when in development environment
---
app/views/devise/sessions/new.html.erb | 29 ++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 1322b3ed..e9da5921 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,5 +1,3 @@
-
-
<%- if devise_mapping.omniauthable? %>
<%- resource_class.omniauth_providers.each do |provider| %>
<div class="background">
@@ -8,5 +6,32 @@
<% end %>
<% end %>
+<%# Show user/pass login if in development environment so we can use test users %>
+<%- if Rails.env.development? %>
+
+ <h2 style="text-align: center;">Dev environment log in</h2>
+ <div style="max-width: 300px; margin: auto;">
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+ <div class="field">
+ <%= f.label :email %><br/>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+ </div>
+
+ <div class="field">
+ <%= f.label :password %><br/>
+ <%= f.password_field :password, autocomplete: "current-password" %>
+ </div>
+ <% if devise_mapping.rememberable? %>
+ <div class="field">
+ <%= f.check_box :remember_me %>
+ <%= f.label :remember_me %>
+ </div>
+ <% end %>
+ <div class="actions">
+ <%= f.submit "Log in" %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
\ No newline at end of file
From 7ffd8e179c72b837045323c795ceabdff2d5eaa2 Mon Sep 17 00:00:00 2001
From: John Doe <john.doe@example.com>
Date: Wed, 21 Oct 2020 15:35:15 -0700
Subject: [PATCH 02/17] adding .idea to gitignore
---
.gitignore | 1 +
config/credentials.yml.enc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index f528d722..bfab4cae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ yarn-debug.log*
#Ignore AWS env vars
/aws.env
+.idea/
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index f1b9ccaa..8470ec95 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-Cu8bv6DTSY+mZ8KJPw6tqNeW9MRvc6fl+Wy6xNRemztwGCire8mu2sP58iP5PMoann47afI8Yxs8H+HvAD4wczCQwZ28ipy8PywrJWhqsWaKhA5iz4PgJUniKHAM0Xcrbfei2F2pUqDpipEmSjtNirXDjeQIMMQO8mUDhylWxk0D51s/V0Ia421t9v11kFBayeqQJh4/80cdur0f9RYctet1a3UPJrwsjVP4CkmYUlP+E2xddEY4JRI0hX4d/w9XqgO/vIFZeGH4W7pGRVyR6mB0cugJOWj2IyJldW82wYtRpbgN+Fs+PagHojOS1UoKu9e7qW8B8GJ5LjW7V3xQ1A/9zzMwRApwT2QrCbyGUW9uD4GO9pL0hKPwQcMPC4/eZ2Ye4Nr/EmvFEfczhyKpsMnkYH9tiSO8iPXzJI22stZaiBRUbaeuoL8M1DeRKxlr6rR81t95uRC6bMBXqoG25S3k3OAGET6XGSOJzkWOT61LVd/TqZamIPMlRVABzlkzHaSPJb6HmAgaSsK0nfnoWVwtLvagwiaA6hKTeFHQFj0uESd50Qt19P09WnN0daLUsA==--kXdPerAvKX9BNqcO--oBpfONbfQTSKGMIe526QIw==
\ No newline at end of file
+BitNwcD+H6hGJFRFptkdgOvDydD+s8qtScINmmhW8jxy6D/iy37vJqovVae/IaEGflUQwlARsekb5kmH/MVzvy6lf0Um9TdA0489/hnt0QahS0qSSc3NF9Iph0JC1yIFW6I0GBP3BFLCDBomEysfVJ70+Xz7YnefN6ZmlsSBnTsY9bC1UJoQIAzv29II9xYq4PLCSM1jPQn7u7noUtNMaLqi2xfJnklFp6/KwrTmUWTeR3yC3+7P4dlE6bxjgPlRqE7bpPW8rFj48+kmlZFln0lWNuwm0FI0ZgGCR2DyNk8y86FKJ4V3AIKo+62s5GKhU3025VK/jMLgV6AT3jax6/uhgC9AemRDunWTKNuifBWrGhT+DH4Zn6vyvb0tumYZkNkCwBV0hGb7hrPWpDMxqq2ABylgjeDLmz1irEz2+sRCPOb7pLpr5hA4VCcInfsoBp4+NbasAXexsMOLAlMEddH84rI0jgep9KxFoV2z4j0n5edoaY9ypxosuzYWxFmPl1FD7FMOFN2E8+67m/061VglnIe2h7Iyn50OKS8E60MR7cp1Fh51BRx7mp1sDUCHyMo=--9F6czkY1HJWFrKaT--3MpzTnw08ERLm/EzWQ/q7w==
\ No newline at end of file
From 7b86ad468f01ebfa794eed286c1fe329a7f03e6b Mon Sep 17 00:00:00 2001
From: John Doe <john.doe@example.com>
Date: Wed, 21 Oct 2020 15:35:30 -0700
Subject: [PATCH 03/17] Revert "adding .idea to gitignore"
This reverts commit 7ffd8e179c72b837045323c795ceabdff2d5eaa2.
---
.gitignore | 1 -
config/credentials.yml.enc | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index bfab4cae..f528d722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,3 @@ yarn-debug.log*
#Ignore AWS env vars
/aws.env
-.idea/
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index 8470ec95..f1b9ccaa 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-BitNwcD+H6hGJFRFptkdgOvDydD+s8qtScINmmhW8jxy6D/iy37vJqovVae/IaEGflUQwlARsekb5kmH/MVzvy6lf0Um9TdA0489/hnt0QahS0qSSc3NF9Iph0JC1yIFW6I0GBP3BFLCDBomEysfVJ70+Xz7YnefN6ZmlsSBnTsY9bC1UJoQIAzv29II9xYq4PLCSM1jPQn7u7noUtNMaLqi2xfJnklFp6/KwrTmUWTeR3yC3+7P4dlE6bxjgPlRqE7bpPW8rFj48+kmlZFln0lWNuwm0FI0ZgGCR2DyNk8y86FKJ4V3AIKo+62s5GKhU3025VK/jMLgV6AT3jax6/uhgC9AemRDunWTKNuifBWrGhT+DH4Zn6vyvb0tumYZkNkCwBV0hGb7hrPWpDMxqq2ABylgjeDLmz1irEz2+sRCPOb7pLpr5hA4VCcInfsoBp4+NbasAXexsMOLAlMEddH84rI0jgep9KxFoV2z4j0n5edoaY9ypxosuzYWxFmPl1FD7FMOFN2E8+67m/061VglnIe2h7Iyn50OKS8E60MR7cp1Fh51BRx7mp1sDUCHyMo=--9F6czkY1HJWFrKaT--3MpzTnw08ERLm/EzWQ/q7w==
\ No newline at end of file
+Cu8bv6DTSY+mZ8KJPw6tqNeW9MRvc6fl+Wy6xNRemztwGCire8mu2sP58iP5PMoann47afI8Yxs8H+HvAD4wczCQwZ28ipy8PywrJWhqsWaKhA5iz4PgJUniKHAM0Xcrbfei2F2pUqDpipEmSjtNirXDjeQIMMQO8mUDhylWxk0D51s/V0Ia421t9v11kFBayeqQJh4/80cdur0f9RYctet1a3UPJrwsjVP4CkmYUlP+E2xddEY4JRI0hX4d/w9XqgO/vIFZeGH4W7pGRVyR6mB0cugJOWj2IyJldW82wYtRpbgN+Fs+PagHojOS1UoKu9e7qW8B8GJ5LjW7V3xQ1A/9zzMwRApwT2QrCbyGUW9uD4GO9pL0hKPwQcMPC4/eZ2Ye4Nr/EmvFEfczhyKpsMnkYH9tiSO8iPXzJI22stZaiBRUbaeuoL8M1DeRKxlr6rR81t95uRC6bMBXqoG25S3k3OAGET6XGSOJzkWOT61LVd/TqZamIPMlRVABzlkzHaSPJb6HmAgaSsK0nfnoWVwtLvagwiaA6hKTeFHQFj0uESd50Qt19P09WnN0daLUsA==--kXdPerAvKX9BNqcO--oBpfONbfQTSKGMIe526QIw==
\ No newline at end of file
From d948fc2eaafde45be8300f0ceacf012cdb4ff45e Mon Sep 17 00:00:00 2001
From: Jessi Shank <jessishank1@gmail.com>
Date: Wed, 21 Oct 2020 15:37:19 -0700
Subject: [PATCH 04/17] adding .idea to gitignore
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index f528d722..bfab4cae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ yarn-debug.log*
#Ignore AWS env vars
/aws.env
+.idea/
From 95727e5cac15e84eea8745355d1441ff6992cbef Mon Sep 17 00:00:00 2001
From: Becky McCarthy <beckymccarthy777@gmail.com>
Date: Mon, 26 Oct 2020 17:00:51 -0700
Subject: [PATCH 05/17] 1-eliminated side navbar scrollbars
---
Gemfile.lock | 235 ++++++++++++-----------
app/javascript/components/Main/styles.js | 3 +-
config/credentials.yml.enc | 2 +-
3 files changed, 124 insertions(+), 116 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a2183db..3f2e0a92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (6.0.3)
- actionpack (= 6.0.3)
+ actioncable (6.0.3.4)
+ actionpack (= 6.0.3.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.0.3)
- actionpack (= 6.0.3)
- activejob (= 6.0.3)
- activerecord (= 6.0.3)
- activestorage (= 6.0.3)
- activesupport (= 6.0.3)
+ actionmailbox (6.0.3.4)
+ actionpack (= 6.0.3.4)
+ activejob (= 6.0.3.4)
+ activerecord (= 6.0.3.4)
+ activestorage (= 6.0.3.4)
+ activesupport (= 6.0.3.4)
mail (>= 2.7.1)
- actionmailer (6.0.3)
- actionpack (= 6.0.3)
- actionview (= 6.0.3)
- activejob (= 6.0.3)
+ actionmailer (6.0.3.4)
+ actionpack (= 6.0.3.4)
+ actionview (= 6.0.3.4)
+ activejob (= 6.0.3.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (6.0.3)
- actionview (= 6.0.3)
- activesupport (= 6.0.3)
+ actionpack (6.0.3.4)
+ actionview (= 6.0.3.4)
+ activesupport (= 6.0.3.4)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.0.3)
- actionpack (= 6.0.3)
- activerecord (= 6.0.3)
- activestorage (= 6.0.3)
- activesupport (= 6.0.3)
+ actiontext (6.0.3.4)
+ actionpack (= 6.0.3.4)
+ activerecord (= 6.0.3.4)
+ activestorage (= 6.0.3.4)
+ activesupport (= 6.0.3.4)
nokogiri (>= 1.8.5)
- actionview (6.0.3)
- activesupport (= 6.0.3)
+ actionview (6.0.3.4)
+ activesupport (= 6.0.3.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@@ -42,89 +42,90 @@ GEM
activemodel (>= 4.1, < 6.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
- activejob (6.0.3)
- activesupport (= 6.0.3)
+ activejob (6.0.3.4)
+ activesupport (= 6.0.3.4)
globalid (>= 0.3.6)
- activemodel (6.0.3)
- activesupport (= 6.0.3)
+ activemodel (6.0.3.4)
+ activesupport (= 6.0.3.4)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
- activerecord (6.0.3)
- activemodel (= 6.0.3)
- activesupport (= 6.0.3)
- activestorage (6.0.3)
- actionpack (= 6.0.3)
- activejob (= 6.0.3)
- activerecord (= 6.0.3)
+ activerecord (6.0.3.4)
+ activemodel (= 6.0.3.4)
+ activesupport (= 6.0.3.4)
+ activestorage (6.0.3.4)
+ actionpack (= 6.0.3.4)
+ activejob (= 6.0.3.4)
+ activerecord (= 6.0.3.4)
marcel (~> 0.3.1)
- activesupport (6.0.3)
+ activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
- ast (2.4.0)
+ ast (2.4.1)
aws-eventstream (1.1.0)
- aws-partitions (1.308.0)
- aws-sdk-core (3.94.0)
+ aws-partitions (1.383.0)
+ aws-sdk-core (3.109.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.30.0)
- aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sdk-kms (1.39.0)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.63.0)
- aws-sdk-core (~> 3, >= 3.83.0)
+ aws-sdk-s3 (1.83.1)
+ aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.1.3)
- aws-eventstream (~> 1.0, >= 1.0.2)
+ aws-sigv4 (1.2.2)
+ aws-eventstream (~> 1, >= 1.0.2)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
backport (1.1.2)
- bcrypt (3.1.13)
+ bcrypt (3.1.16)
benchmark (0.1.0)
bindex (0.8.1)
- bootsnap (1.4.6)
+ bootsnap (1.4.8)
msgpack (~> 1.0)
builder (3.2.4)
byebug (11.1.3)
case_transform (0.2)
activesupport
- coderay (1.1.2)
- concurrent-ruby (1.1.6)
- connection_pool (2.2.2)
+ coderay (1.1.3)
+ concurrent-ruby (1.1.7)
+ connection_pool (2.2.3)
crass (1.0.6)
- devise (4.7.1)
+ devise (4.7.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
- diff-lcs (1.3)
+ diff-lcs (1.4.4)
e2mmap (0.1.0)
erubi (1.9.0)
execjs (2.7.0)
- faker (2.11.0)
+ faker (2.14.0)
i18n (>= 1.6, < 2)
- faraday (1.0.1)
+ faraday (1.1.0)
multipart-post (>= 1.2, < 3)
- ffi (1.12.2)
+ ruby2_keywords
+ ffi (1.13.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
- haml (5.1.2)
+ haml (5.2.0)
temple (>= 0.8.0)
tilt
hashie (4.1.0)
- i18n (1.8.2)
+ i18n (1.8.5)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
- jbuilder (2.10.0)
+ jbuilder (2.10.1)
activesupport (>= 5.0.0)
jmespath (1.4.0)
jquery-rails (4.4.0)
@@ -134,24 +135,24 @@ GEM
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
jsonapi-renderer (0.2.2)
- jwt (2.2.1)
- kaminari (1.2.0)
+ jwt (2.2.2)
+ kaminari (1.2.1)
activesupport (>= 4.1.0)
- kaminari-actionview (= 1.2.0)
- kaminari-activerecord (= 1.2.0)
- kaminari-core (= 1.2.0)
- kaminari-actionview (1.2.0)
+ kaminari-actionview (= 1.2.1)
+ kaminari-activerecord (= 1.2.1)
+ kaminari-core (= 1.2.1)
+ kaminari-actionview (1.2.1)
actionview
- kaminari-core (= 1.2.0)
- kaminari-activerecord (1.2.0)
+ kaminari-core (= 1.2.1)
+ kaminari-activerecord (1.2.1)
activerecord
- kaminari-core (= 1.2.0)
- kaminari-core (1.2.0)
+ kaminari-core (= 1.2.1)
+ kaminari-core (1.2.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
- loofah (2.5.0)
+ loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -163,14 +164,14 @@ GEM
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
- minitest (5.14.0)
+ minitest (5.14.2)
msgpack (1.3.3)
- multi_json (1.14.1)
+ multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
nested_form (0.3.2)
- nio4r (2.5.2)
- nokogiri (1.10.9)
+ nio4r (2.5.4)
+ nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.4)
faraday (>= 0.8, < 2.0)
@@ -185,13 +186,13 @@ GEM
jwt (>= 2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.6)
- omniauth-oauth2 (1.6.0)
- oauth2 (~> 1.1)
+ omniauth-oauth2 (1.7.0)
+ oauth2 (~> 1.4)
omniauth (~> 1.9)
orm_adapter (0.5.0)
- parallel (1.19.1)
- parser (2.7.1.2)
- ast (~> 2.4.0)
+ parallel (1.19.2)
+ parser (2.7.2.0)
+ ast (~> 2.4.1)
pg (1.2.3)
pry (0.13.1)
coderay (~> 1.1)
@@ -199,10 +200,10 @@ GEM
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
- puma (3.12.4)
+ puma (3.12.6)
pundit (2.1.0)
activesupport (>= 3.0.0)
- rack (2.2.2)
+ rack (2.2.3)
rack-pjax (1.1.0)
nokogiri (~> 1.5)
rack (>= 1.1)
@@ -210,20 +211,20 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (6.0.3)
- actioncable (= 6.0.3)
- actionmailbox (= 6.0.3)
- actionmailer (= 6.0.3)
- actionpack (= 6.0.3)
- actiontext (= 6.0.3)
- actionview (= 6.0.3)
- activejob (= 6.0.3)
- activemodel (= 6.0.3)
- activerecord (= 6.0.3)
- activestorage (= 6.0.3)
- activesupport (= 6.0.3)
+ rails (6.0.3.4)
+ actioncable (= 6.0.3.4)
+ actionmailbox (= 6.0.3.4)
+ actionmailer (= 6.0.3.4)
+ actionpack (= 6.0.3.4)
+ actiontext (= 6.0.3.4)
+ actionview (= 6.0.3.4)
+ activejob (= 6.0.3.4)
+ activemodel (= 6.0.3.4)
+ activerecord (= 6.0.3.4)
+ activestorage (= 6.0.3.4)
+ activesupport (= 6.0.3.4)
bundler (>= 1.3.0)
- railties (= 6.0.3)
+ railties (= 6.0.3.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
@@ -242,9 +243,9 @@ GEM
rails (>= 5.0, < 7)
remotipart (~> 1.3)
sassc-rails (>= 1.3, < 3)
- railties (6.0.3)
- actionpack (= 6.0.3)
- activesupport (= 6.0.3)
+ railties (6.0.3.4)
+ actionpack (= 6.0.3.4)
+ activesupport (= 6.0.3.4)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
@@ -259,14 +260,15 @@ GEM
execjs
railties (>= 3.2)
tilt
+ regexp_parser (1.8.2)
remotipart (1.4.4)
- responders (3.0.0)
+ responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
- reverse_markdown (1.4.0)
+ reverse_markdown (2.0.0)
nokogiri
rexml (3.2.4)
- rspec-core (3.9.2)
+ rspec-core (3.9.3)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
@@ -274,7 +276,7 @@ GEM
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
- rspec-rails (4.0.0)
+ rspec-rails (4.0.1)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
@@ -283,14 +285,19 @@ GEM
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.3)
- rubocop (0.83.0)
+ rubocop (0.93.1)
parallel (~> 1.10)
- parser (>= 2.7.0.1)
+ parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
+ regexp_parser (>= 1.8)
rexml
+ rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
+ rubocop-ast (0.8.0)
+ parser (>= 2.7.1.5)
ruby-progressbar (1.10.1)
+ ruby2_keywords (0.0.2)
ruby_dep (1.5.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
@@ -303,7 +310,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- sassc (2.3.0)
+ sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
@@ -311,9 +318,9 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
- sentry-raven (3.0.0)
+ sentry-raven (3.1.1)
faraday (>= 1.0)
- solargraph (0.39.7)
+ solargraph (0.39.17)
backport (~> 1.1)
benchmark
bundler (>= 1.17.2)
@@ -322,19 +329,19 @@ GEM
maruku (~> 0.7, >= 0.7.3)
nokogiri (~> 1.9, >= 1.9.1)
parser (~> 2.3)
- reverse_markdown (~> 1.0, >= 1.0.5)
+ reverse_markdown (>= 1.0.5, < 3)
rubocop (~> 0.52)
thor (~> 1.0)
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
- spring (2.1.0)
+ spring (2.1.1)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.2.1)
+ sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@@ -348,22 +355,22 @@ GEM
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
- warden (1.2.8)
- rack (>= 2.0.6)
- web-console (4.0.2)
+ warden (1.2.9)
+ rack (>= 2.0.9)
+ web-console (4.0.4)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- webpacker (4.2.2)
+ webpacker (4.3.0)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
- websocket-driver (0.7.1)
+ websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.4)
+ websocket-extensions (0.1.5)
yard (0.9.25)
- zeitwerk (2.3.0)
+ zeitwerk (2.4.0)
PLATFORMS
ruby
@@ -401,4 +408,4 @@ RUBY VERSION
ruby 2.6.3p62
BUNDLED WITH
- 2.0.2
+ 2.1.4
diff --git a/app/javascript/components/Main/styles.js b/app/javascript/components/Main/styles.js
index 5fd826cd..50a271ef 100644
--- a/app/javascript/components/Main/styles.js
+++ b/app/javascript/components/Main/styles.js
@@ -14,12 +14,13 @@ const styles = () => ({
drawerPaper: {
width: drawerWidth,
backgroundColor: '#29313C',
+ overflow: 'hidden',
},
// necessary for content to be below app bar
content: {
flexGrow: 1,
backgroundColor: 'rgba(210, 220, 225, 0.63)',
- position: 'absolute',
+ position: 'relative',
left: drawerWidth,
minHeight: '100vh',
width: 'calc(100vw - 130px)',
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index f1b9ccaa..6329142b 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-Cu8bv6DTSY+mZ8KJPw6tqNeW9MRvc6fl+Wy6xNRemztwGCire8mu2sP58iP5PMoann47afI8Yxs8H+HvAD4wczCQwZ28ipy8PywrJWhqsWaKhA5iz4PgJUniKHAM0Xcrbfei2F2pUqDpipEmSjtNirXDjeQIMMQO8mUDhylWxk0D51s/V0Ia421t9v11kFBayeqQJh4/80cdur0f9RYctet1a3UPJrwsjVP4CkmYUlP+E2xddEY4JRI0hX4d/w9XqgO/vIFZeGH4W7pGRVyR6mB0cugJOWj2IyJldW82wYtRpbgN+Fs+PagHojOS1UoKu9e7qW8B8GJ5LjW7V3xQ1A/9zzMwRApwT2QrCbyGUW9uD4GO9pL0hKPwQcMPC4/eZ2Ye4Nr/EmvFEfczhyKpsMnkYH9tiSO8iPXzJI22stZaiBRUbaeuoL8M1DeRKxlr6rR81t95uRC6bMBXqoG25S3k3OAGET6XGSOJzkWOT61LVd/TqZamIPMlRVABzlkzHaSPJb6HmAgaSsK0nfnoWVwtLvagwiaA6hKTeFHQFj0uESd50Qt19P09WnN0daLUsA==--kXdPerAvKX9BNqcO--oBpfONbfQTSKGMIe526QIw==
\ No newline at end of file
+wAPvYLoQ4I0Stta+1ndMCaixAECubpqZCpWXcf62evlD9hnSM9H2f6YfcG46Y0XGK3neXOvVqT92H2zBwJdD6MbL6NCANuXiq/IG5BSdlAakpqbi396mrHH6bHjMg3FDAneFCyjtd1U0QKqRNwZQVSdfMR3581bXElQpAyBAVxdaHD4KOwdPorZnt3y7VhMFhpDp7shJltQuoNcVUSbgVLk20CzLvXloF2cI87n4uWtuhIhROmk5LHu/C7LazoiSyBcyoYKWWmEobcuKFVlyIQp+9EGRkxW7eivvn8HVjZkbJiND45U6DWLT4wZw5aqBrkCc4viAnRBz5vzfNKl+OvlIv5BiXFMOJZLFSpORIky8BgEPAtWL52NLE+Iyg4QM1YKVXRR2tIhISGdVDcbEOSoHXflyBaRXANQfUg4BZ1//HFTkeoQhFikkgW4f7wEU5W21VBc7pd2s6+mhbl2FrT5GR8A44Qc6AuoOfoTDtptVv8HAImgJmk7X6oQqu3aQJ+u9JnOKC814fhxEyg3ER6/M9m6gGtpZWPY+BLgzFh02knAKHRPFQpiz0G36FpRJJmw=--movjFc6h8FNhHEai--YHq4omfIAC6NXqvhqRimdA==
\ No newline at end of file
From 03af54d9c781c79e9830eb4d353860bf33efea3b Mon Sep 17 00:00:00 2001
From: Jessi Shank <jessishank1@gmail.com>
Date: Tue, 27 Oct 2020 09:03:18 -0700
Subject: [PATCH 06/17] fix errors in main/index.js
---
app/javascript/components/Main/index.js | 15 +++++++++------
package.json | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/app/javascript/components/Main/index.js b/app/javascript/components/Main/index.js
index 8691f17f..c8204778 100644
--- a/app/javascript/components/Main/index.js
+++ b/app/javascript/components/Main/index.js
@@ -64,7 +64,9 @@ function Main(props) {
disableFocusRipple
disableTouchRipple
className={classes.navBarItem}
- onClick={() => (window.location.href = '/admin')}
+ onClick={() => {
+ window.location.href = '/admin';
+ }}
>
<ExitToAppIcon />
<div className={classes.navText}> Admin View </div>
@@ -80,6 +82,7 @@ function Main(props) {
case 'Assessments':
return <BarChartIcon />;
default:
+ return null;
}
};
@@ -126,6 +129,7 @@ function Main(props) {
<ActionItemCreationPage {...contentProps}></ActionItemCreationPage>
);
default:
+ return null;
}
};
@@ -160,13 +164,12 @@ function Main(props) {
<div className={classes.navText}> Sign Out </div>
</ListItem>
{props.isAdmin ? renderAdminButton() : null}
- {props.userType !== 'participant'
- ? Object.entries({
+ {props.userType !== 'participant' &&
+ Object.entries({
Dashboard: '/',
'Bulk Assign': '/assignments',
- Assessments: '/studio_assessments',
- }).map(n => getButton(n[0], n[1]))
- : null}
+ Assessments: '/studio_assessments',
+ }).map(n => getButton(n[0], n[1]))}
</List>
</Grid>
<Grid
diff --git a/package.json b/package.json
index 2be1eaa4..211e8308 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
"axios": "^0.19.0",
"babel-eslint": "^10.0.3",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
- "dotenv": "^8.2.0",
"date-fns": "^2.12.0",
+ "dotenv": "^8.2.0",
"draft-js": "^0.11.2",
"draft-js-plugins-editor": "^3.0.0",
"draftail": "^1.3.0",
From 35db2321b447b9dd3c78d98b5f36350e75fd9354 Mon Sep 17 00:00:00 2001
From: Becky McCarthy <beckymccarthy777@gmail.com>
Date: Tue, 27 Oct 2020 09:13:30 -0700
Subject: [PATCH 07/17] 1-eliminated side navbar scrollbars
---
app/javascript/components/Main/styles.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app/javascript/components/Main/styles.js b/app/javascript/components/Main/styles.js
index 50a271ef..5fd826cd 100644
--- a/app/javascript/components/Main/styles.js
+++ b/app/javascript/components/Main/styles.js
@@ -14,13 +14,12 @@ const styles = () => ({
drawerPaper: {
width: drawerWidth,
backgroundColor: '#29313C',
- overflow: 'hidden',
},
// necessary for content to be below app bar
content: {
flexGrow: 1,
backgroundColor: 'rgba(210, 220, 225, 0.63)',
- position: 'relative',
+ position: 'absolute',
left: drawerWidth,
minHeight: '100vh',
width: 'calc(100vw - 130px)',
From df05802e0a2b8f51525edf6df699ad1a7f3da307 Mon Sep 17 00:00:00 2001
From: Becky McCarthy <beckymccarthy777@gmail.com>
Date: Tue, 27 Oct 2020 11:35:10 -0700
Subject: [PATCH 08/17] 1-eliminated side navbar scrollbar
---
app/javascript/components/Main/styles.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/javascript/components/Main/styles.js b/app/javascript/components/Main/styles.js
index 5fd826cd..be9ca0f6 100644
--- a/app/javascript/components/Main/styles.js
+++ b/app/javascript/components/Main/styles.js
@@ -14,6 +14,7 @@ const styles = () => ({
drawerPaper: {
width: drawerWidth,
backgroundColor: '#29313C',
+ overflow: 'hidden',
},
// necessary for content to be below app bar
content: {
From 040761642eed9d6887b5adf155bf4a660b50049f Mon Sep 17 00:00:00 2001
From: Becky McCarthy <beckymccarthy777@gmail.com>
Date: Tue, 27 Oct 2020 16:20:09 -0700
Subject: [PATCH 09/17] Fixed Fonts in Bulk Assignments #6
---
app/javascript/components/ActionItemForm/styles.js | 1 +
.../components/ActionItemSearchParticipants/styles.js | 2 ++
app/javascript/components/AddFromExistingForm/styles.js | 1 +
3 files changed, 4 insertions(+)
diff --git a/app/javascript/components/ActionItemForm/styles.js b/app/javascript/components/ActionItemForm/styles.js
index 1f2bf25d..f98354c6 100644
--- a/app/javascript/components/ActionItemForm/styles.js
+++ b/app/javascript/components/ActionItemForm/styles.js
@@ -11,6 +11,7 @@ const styles = theme => ({
padding: '8px',
minHeight: '300px',
width: '100%',
+ fontFamily: 'Roboto',
},
iconStyle: {
boxShadow: 'None',
diff --git a/app/javascript/components/ActionItemSearchParticipants/styles.js b/app/javascript/components/ActionItemSearchParticipants/styles.js
index 61d24ec7..f126b85c 100644
--- a/app/javascript/components/ActionItemSearchParticipants/styles.js
+++ b/app/javascript/components/ActionItemSearchParticipants/styles.js
@@ -13,6 +13,7 @@ export const styles = () => ({
categoryItem: {
width: 'calc(100% - 16px)',
margin: '8px',
+ fontFamily: 'Roboto',
},
statusButton: {
@@ -26,6 +27,7 @@ export const styles = () => ({
searchIndividual: {
width: 'calc(100% - 16px)',
margin: '8px',
+ fontFamily: 'Roboto',
},
searchBar: {
diff --git a/app/javascript/components/AddFromExistingForm/styles.js b/app/javascript/components/AddFromExistingForm/styles.js
index 082e3360..04344159 100644
--- a/app/javascript/components/AddFromExistingForm/styles.js
+++ b/app/javascript/components/AddFromExistingForm/styles.js
@@ -10,6 +10,7 @@ const styles = theme => ({
padding: '8px',
minHeight: '300px',
width: '100%',
+ fontFamily: 'Roboto, san-serif',
},
iconStyle: {
boxShadow: 'None',
From 050fed062be741b86def1ee54250f3edc720e53f Mon Sep 17 00:00:00 2001
From: Becky McCarthy <beckymccarthy777@gmail.com>
Date: Wed, 28 Oct 2020 12:56:23 -0700
Subject: [PATCH 10/17] Added Typography to unstyled text
---
app/javascript/components/ActionItemForm/index.js | 8 ++++----
.../components/ActionItemSearchParticipants/index.js | 5 +++--
app/javascript/components/AddFromExistingForm/index.js | 5 +++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/app/javascript/components/ActionItemForm/index.js b/app/javascript/components/ActionItemForm/index.js
index 9aba5658..51d36c64 100644
--- a/app/javascript/components/ActionItemForm/index.js
+++ b/app/javascript/components/ActionItemForm/index.js
@@ -63,7 +63,7 @@ function ActionItemForm({
color: failedSubmit && !categorySelected ? 'red' : 'black',
}}
>
- Choose Category
+ <Typography variant="body1">Choose Category</Typography>
</Grid>
<Grid item container justify="center" spacing={1}>
{categoryList.slice(0, 4)}
@@ -81,7 +81,7 @@ function ActionItemForm({
>
<Grid item>
<div style={{ color: failedSubmit && !title ? 'red' : 'black' }}>
- Assignment Title
+ <Typography variant="body1">Assignment Title</Typography>
</div>
<TextField
className={classes.searchBar}
@@ -100,7 +100,7 @@ function ActionItemForm({
color: failedSubmit && !description ? 'red' : 'black',
}}
>
- Assignment Description
+ <Typography variant="body1">Assignment Description</Typography>
</div>
<TextField
variant="outlined"
@@ -116,7 +116,7 @@ function ActionItemForm({
/>
</Grid>
<Grid item>
- <div>Due Date (Optional)</div>
+ <Typography variant="body1">Due Date (Optional)</Typography>
<TextField
type="date"
value={dueDate}
diff --git a/app/javascript/components/ActionItemSearchParticipants/index.js b/app/javascript/components/ActionItemSearchParticipants/index.js
index 81fbf66b..438b5d7a 100644
--- a/app/javascript/components/ActionItemSearchParticipants/index.js
+++ b/app/javascript/components/ActionItemSearchParticipants/index.js
@@ -5,6 +5,7 @@ import {
InputBase,
Fab,
Grid,
+ Typography,
} from '@material-ui/core';
import { withStyles } from '@material-ui/core/styles';
import PropTypes from 'prop-types';
@@ -180,7 +181,7 @@ class ActionItemSearchParticipants extends React.Component {
>
{/* Filter By Category */}
<Grid item className={classes.categoryItem}>
- FILTER BY CATEGORY
+ <Typography variant="body1">FILTER BY CATEGORY</Typography>
<Grid justify="center" item>
{this.statusButtons()}
</Grid>
@@ -188,7 +189,7 @@ class ActionItemSearchParticipants extends React.Component {
{/* Search for an individual */}
<Grid container direction="column" className={classes.searchIndividual}>
- <Grid item>SEARCH FOR INDIVIDUAL</Grid>
+ <Typography variant="body1">SEARCH FOR INDIVIDUAL</Typography>
<Grid item>
<InputBase
className={classes.searchBar}
diff --git a/app/javascript/components/AddFromExistingForm/index.js b/app/javascript/components/AddFromExistingForm/index.js
index e88b4464..eeb1b95a 100644
--- a/app/javascript/components/AddFromExistingForm/index.js
+++ b/app/javascript/components/AddFromExistingForm/index.js
@@ -48,6 +48,7 @@ class AddFromExistingForm extends React.Component {
componentDidUpdate(prevProps) {
if (this.props.templates.length !== prevProps.templates.length) {
+ // eslint-disable-next-line react/no-did-update-set-state
this.setState({ actionItemTemplates: this.props.templates });
}
}
@@ -184,7 +185,7 @@ class AddFromExistingForm extends React.Component {
<Paper elevation={0} className={classes.formStyle}>
<Grid container direction="column">
<Grid item container direction="column" spacing={1}>
- <Grid item>SEARCH BY CATEGORY</Grid>
+ <Typography variant="body1">SEARCH BY CATEGORY</Typography>
<Grid item container justify="center" spacing={1}>
{categoryList.slice(0, 4)}
</Grid>
@@ -194,7 +195,7 @@ class AddFromExistingForm extends React.Component {
</Grid>
<Grid item container direction="column" alignItems="stretch">
<Grid item>
- <div>SEARCH FOR ASSIGNMENT</div>
+ <Typography variant="body1">SEARCH FOR ASSIGNMENT</Typography>
<TextField
className={classes.searchBar}
onChange={this.filterActionItems}
From 9778ed223398f2d0992380684b423bad1a2ad19b Mon Sep 17 00:00:00 2001
From: Becky McCarthy <beckymccarthy777@gmail.com>
Date: Wed, 28 Oct 2020 13:09:10 -0700
Subject: [PATCH 11/17] undid font fix from styles files
---
app/javascript/components/ActionItemForm/styles.js | 1 -
.../components/ActionItemSearchParticipants/styles.js | 2 --
app/javascript/components/AddFromExistingForm/styles.js | 1 -
3 files changed, 4 deletions(-)
diff --git a/app/javascript/components/ActionItemForm/styles.js b/app/javascript/components/ActionItemForm/styles.js
index f98354c6..1f2bf25d 100644
--- a/app/javascript/components/ActionItemForm/styles.js
+++ b/app/javascript/components/ActionItemForm/styles.js
@@ -11,7 +11,6 @@ const styles = theme => ({
padding: '8px',
minHeight: '300px',
width: '100%',
- fontFamily: 'Roboto',
},
iconStyle: {
boxShadow: 'None',
diff --git a/app/javascript/components/ActionItemSearchParticipants/styles.js b/app/javascript/components/ActionItemSearchParticipants/styles.js
index f126b85c..61d24ec7 100644
--- a/app/javascript/components/ActionItemSearchParticipants/styles.js
+++ b/app/javascript/components/ActionItemSearchParticipants/styles.js
@@ -13,7 +13,6 @@ export const styles = () => ({
categoryItem: {
width: 'calc(100% - 16px)',
margin: '8px',
- fontFamily: 'Roboto',
},
statusButton: {
@@ -27,7 +26,6 @@ export const styles = () => ({
searchIndividual: {
width: 'calc(100% - 16px)',
margin: '8px',
- fontFamily: 'Roboto',
},
searchBar: {
diff --git a/app/javascript/components/AddFromExistingForm/styles.js b/app/javascript/components/AddFromExistingForm/styles.js
index 04344159..082e3360 100644
--- a/app/javascript/components/AddFromExistingForm/styles.js
+++ b/app/javascript/components/AddFromExistingForm/styles.js
@@ -10,7 +10,6 @@ const styles = theme => ({
padding: '8px',
minHeight: '300px',
width: '100%',
- fontFamily: 'Roboto, san-serif',
},
iconStyle: {
boxShadow: 'None',
From e29212e3befc5e08083a3843550282b0431f4928 Mon Sep 17 00:00:00 2001
From: Becky McCarthy <beckymccarthy777@gmail.com>
Date: Thu, 29 Oct 2020 11:49:47 -0700
Subject: [PATCH 12/17] Save Button in Bulk Assignment
Conditionally enabled the SAVE & CONTINUE button after assignment is added and after a participant is added.
May be duplicate due to error on first try
issue #8
---
.../ActionItemCreationPage/index.js | 53 +++++++++++++++----
1 file changed, 44 insertions(+), 9 deletions(-)
diff --git a/app/javascript/components/ActionItemCreationPage/index.js b/app/javascript/components/ActionItemCreationPage/index.js
index 1e3ac33b..8a872648 100644
--- a/app/javascript/components/ActionItemCreationPage/index.js
+++ b/app/javascript/components/ActionItemCreationPage/index.js
@@ -18,11 +18,17 @@ import { apiPost, apiDelete } from 'utils/axios';
import * as Sentry from '@sentry/browser';
import styles from './styles';
+const steps = {
+ CHOOSE_ASSIGNMENT: 0,
+ CHOOSE_PARTICIPANT: 1,
+ CONFIRM_SUBMIT: 2,
+};
+
class ActionItemCreationPage extends React.Component {
constructor(props) {
super(props);
this.state = {
- step: 0,
+ step: steps.CHOOSE_ASSIGNMENT,
participants: this.props.participants,
selectedParticipants: [],
actionItemTitle: '',
@@ -373,16 +379,21 @@ class ActionItemCreationPage extends React.Component {
let rightComponentText;
let headerText;
switch (stepSize) {
- case 0:
+ case steps.CHOOSE_ASSIGNMENT:
leftComponentText = 'Assignments';
rightComponentText = 'Add Assignments';
headerText = 'Add Assignments to List';
- leftComponent = (
+ leftComponent = this.state.selectedActionItems.length ? (
<ActionItemList
selectedActionItems={this.state.selectedActionItems}
removeSelectedActionItem={this.removeSelectedActionItem}
handleOpenModal={this.handleOpenModal}
/>
+ ) : (
+ <Typography variant="body1">
+ Select or create from scratch at least one assignment to assign to
+ participants.
+ </Typography>
);
rightComponent = (
<ActionItemCreationContainer
@@ -408,15 +419,20 @@ class ActionItemCreationPage extends React.Component {
/>
);
break;
- case 1:
+ case steps.CHOOSE_PARTICIPANT:
leftComponentText = 'Students';
rightComponentText = 'Add Students';
headerText = 'Add Students to Assignments';
- leftComponent = (
+ leftComponent = this.state.selectedParticipants.length ? (
<ActionItemDisplayParticipants
selectedParticipants={this.state.selectedParticipants}
/>
+ ) : (
+ <Typography variant="body1">
+ Select at least one individual from the right to attach your
+ assignments to.
+ </Typography>
);
rightComponent = (
<ActionItemSearchParticipants
@@ -430,7 +446,7 @@ class ActionItemCreationPage extends React.Component {
/>
);
break;
- case 2:
+ case steps.CONFIRM_SUBMIT:
leftComponentText = 'Review Students';
rightComponentText = this.state.submitErrored
? 'Failed Assignments'
@@ -468,10 +484,28 @@ class ActionItemCreationPage extends React.Component {
getButtons(stepSize) {
const { classes } = this.props;
- const forwardButtonText = stepSize === 2 ? 'ASSIGN' : 'SAVE & CONTINUE';
+ const forwardButtonText =
+ stepSize === steps.CONFIRM_SUBMIT ? 'ASSIGN' : 'SAVE & CONTINUE';
const handleForwardButtonClick =
- stepSize === 2 ? this.handleSubmit : this.nextStep;
-
+ stepSize === steps.CONFIRM_SUBMIT ? this.handleSubmit : this.nextStep;
+ const forwardButtonEnabled = () => {
+ if (
+ stepSize === steps.CHOOSE_ASSIGNMENT &&
+ this.state.selectedActionItems.length
+ ) {
+ return true;
+ }
+ if (
+ stepSize === steps.CHOOSE_PARTICIPANT &&
+ this.state.selectedParticipants.length
+ ) {
+ return true;
+ }
+ if (stepSize === steps.CONFIRM_SUBMIT) {
+ return true;
+ }
+ return false;
+ };
const backButton = (
<Grid item>
<Fab
@@ -496,6 +530,7 @@ class ActionItemCreationPage extends React.Component {
variant="extended"
size="medium"
aria-label="category"
+ disabled={forwardButtonEnabled}
onClick={handleForwardButtonClick}
>
<Typography className={classes.categoryButtonStyle} align="center">
From 61333b9d1afe75ace854083c09cba4cd938309f4 Mon Sep 17 00:00:00 2001
From: becky <beckymccarthy777@gmail.com>
Date: Fri, 30 Oct 2020 15:11:11 -0700
Subject: [PATCH 13/17] Conditionally Enable Save Button
Disabled the SAVE & CONTINUE button and conditionally enable it once
an assignment is added and again once a participant is added in Bulk
Assignment
issue #8
---
app/javascript/components/ActionItemCreationPage/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/javascript/components/ActionItemCreationPage/index.js b/app/javascript/components/ActionItemCreationPage/index.js
index 8a872648..41796b74 100644
--- a/app/javascript/components/ActionItemCreationPage/index.js
+++ b/app/javascript/components/ActionItemCreationPage/index.js
@@ -530,7 +530,7 @@ class ActionItemCreationPage extends React.Component {
variant="extended"
size="medium"
aria-label="category"
- disabled={forwardButtonEnabled}
+ disabled={!forwardButtonEnabled()}
onClick={handleForwardButtonClick}
>
<Typography className={classes.categoryButtonStyle} align="center">
From 0383bcb2b90301da13810728c07d3fa0995eb130 Mon Sep 17 00:00:00 2001
From: becky <beckymccarthy777@gmail.com>
Date: Mon, 2 Nov 2020 11:46:15 -0800
Subject: [PATCH 14/17] Refactored forwardButtonEnabled logic
using the existing case statements.
---
.../ActionItemCreationPage/index.js | 35 ++++++++-----------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/app/javascript/components/ActionItemCreationPage/index.js b/app/javascript/components/ActionItemCreationPage/index.js
index 41796b74..d8f01a29 100644
--- a/app/javascript/components/ActionItemCreationPage/index.js
+++ b/app/javascript/components/ActionItemCreationPage/index.js
@@ -378,6 +378,7 @@ class ActionItemCreationPage extends React.Component {
let leftComponentText;
let rightComponentText;
let headerText;
+ let forwardButtonEnabled;
switch (stepSize) {
case steps.CHOOSE_ASSIGNMENT:
leftComponentText = 'Assignments';
@@ -418,6 +419,7 @@ class ActionItemCreationPage extends React.Component {
categories={this.props.categories}
/>
);
+ forwardButtonEnabled = !!this.state.selectedActionItems.length;
break;
case steps.CHOOSE_PARTICIPANT:
leftComponentText = 'Students';
@@ -445,6 +447,7 @@ class ActionItemCreationPage extends React.Component {
removeAllUsers={this.removeAllUsersFromState}
/>
);
+ forwardButtonEnabled = !!this.state.selectedParticipants.length;
break;
case steps.CONFIRM_SUBMIT:
leftComponentText = 'Review Students';
@@ -465,6 +468,7 @@ class ActionItemCreationPage extends React.Component {
handleOpenModal={this.handleOpenModal}
/>
);
+ forwardButtonEnabled = true;
break;
default:
leftComponent = null;
@@ -472,6 +476,7 @@ class ActionItemCreationPage extends React.Component {
leftComponentText = null;
rightComponentText = null;
headerText = null;
+ forwardButtonEnabled = false;
}
return {
leftComponent,
@@ -479,33 +484,17 @@ class ActionItemCreationPage extends React.Component {
leftComponentText,
rightComponentText,
headerText,
+ forwardButtonEnabled,
};
}
- getButtons(stepSize) {
+ getButtons(stepSize, forwardButtonEnabled) {
const { classes } = this.props;
const forwardButtonText =
stepSize === steps.CONFIRM_SUBMIT ? 'ASSIGN' : 'SAVE & CONTINUE';
const handleForwardButtonClick =
stepSize === steps.CONFIRM_SUBMIT ? this.handleSubmit : this.nextStep;
- const forwardButtonEnabled = () => {
- if (
- stepSize === steps.CHOOSE_ASSIGNMENT &&
- this.state.selectedActionItems.length
- ) {
- return true;
- }
- if (
- stepSize === steps.CHOOSE_PARTICIPANT &&
- this.state.selectedParticipants.length
- ) {
- return true;
- }
- if (stepSize === steps.CONFIRM_SUBMIT) {
- return true;
- }
- return false;
- };
+
const backButton = (
<Grid item>
<Fab
@@ -530,7 +519,7 @@ class ActionItemCreationPage extends React.Component {
variant="extended"
size="medium"
aria-label="category"
- disabled={!forwardButtonEnabled()}
+ disabled={!forwardButtonEnabled}
onClick={handleForwardButtonClick}
>
<Typography className={classes.categoryButtonStyle} align="center">
@@ -557,8 +546,12 @@ class ActionItemCreationPage extends React.Component {
rightComponent,
rightComponentText,
headerText,
+ forwardButtonEnabled,
} = this.getMainComponents(this.state.step);
- const buttonsGrid = this.getButtonsGrid(this.state.step);
+ const buttonsGrid = this.getButtonsGrid(
+ this.state.step,
+ forwardButtonEnabled,
+ );
return (
<div>
From 1134197eacb55207fd983f114328bf2ec3f411eb Mon Sep 17 00:00:00 2001
From: becky <beckymccarthy777@gmail.com>
Date: Mon, 2 Nov 2020 13:38:42 -0800
Subject: [PATCH 15/17] Fixed Console Errors Throughout
Mostly PropTypes and properties of Grid errors
---
app/javascript/components/ActionItemCard/index.js | 6 +++---
.../components/ActionItemCreationPage/index.js | 4 ++--
app/javascript/components/ActionItemParticipant/index.js | 2 +-
.../components/ActionItemSearchParticipants/index.js | 9 ++++-----
app/javascript/components/EnhancedTable/index.js | 5 ++---
app/javascript/components/LoadModal/index.js | 2 +-
app/javascript/components/Main/index.js | 2 --
app/javascript/components/ParticipantCard/styles.js | 1 -
8 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/app/javascript/components/ActionItemCard/index.js b/app/javascript/components/ActionItemCard/index.js
index f1614e2d..6419a133 100644
--- a/app/javascript/components/ActionItemCard/index.js
+++ b/app/javascript/components/ActionItemCard/index.js
@@ -253,7 +253,7 @@ function ActionItemCard({
item
container
justify="flex-end"
- style={{ 'padding-left': '16px', width: 'calc(100% - 100px)' }}
+ style={{ paddingLeft: '16px', width: 'calc(100% - 100px)' }}
>
{/* Make sure renderClose + participantShowPage are not both true, or else you get two edit buttons. */}
<Grid item>{renderCompleteButton()}</Grid>
@@ -280,8 +280,8 @@ ActionItemCard.propTypes = {
removeActionItem: PropTypes.func,
addBorderBottom: PropTypes.bool,
participantShowPage: PropTypes.bool,
- initialCompletedStaff: PropTypes.bool.isRequired,
- initialCompletedParticipant: PropTypes.bool.isRequired,
+ initialCompletedStaff: PropTypes.bool,
+ initialCompletedParticipant: PropTypes.bool,
assignmentId: PropTypes.number,
};
diff --git a/app/javascript/components/ActionItemCreationPage/index.js b/app/javascript/components/ActionItemCreationPage/index.js
index d8f01a29..426bf01d 100644
--- a/app/javascript/components/ActionItemCreationPage/index.js
+++ b/app/javascript/components/ActionItemCreationPage/index.js
@@ -512,7 +512,7 @@ class ActionItemCreationPage extends React.Component {
</Grid>
);
const forwardButton = (
- <Grid item style={{ 'padding-left': '16px' }}>
+ <Grid item style={{ paddingLeft: '16px' }}>
<Fab
className={classes.iconStyle}
component="span"
@@ -631,7 +631,7 @@ class ActionItemCreationPage extends React.Component {
item
direction="row"
alignItems="flex-start"
- justifyContent="center"
+ justifycontent="center"
className={classes.headerStyle}
>
<Grid item>
diff --git a/app/javascript/components/ActionItemParticipant/index.js b/app/javascript/components/ActionItemParticipant/index.js
index d8bd4aee..c688c598 100644
--- a/app/javascript/components/ActionItemParticipant/index.js
+++ b/app/javascript/components/ActionItemParticipant/index.js
@@ -44,7 +44,7 @@ function ActionItemParticipant({
container
direction="row"
alignItems="center"
- justifyContent="flex-start"
+ justifycontent="flex-start"
zeroMinWidth
style={{ width: '80%' }}
>
diff --git a/app/javascript/components/ActionItemSearchParticipants/index.js b/app/javascript/components/ActionItemSearchParticipants/index.js
index 438b5d7a..dc11432a 100644
--- a/app/javascript/components/ActionItemSearchParticipants/index.js
+++ b/app/javascript/components/ActionItemSearchParticipants/index.js
@@ -177,14 +177,13 @@ class ActionItemSearchParticipants extends React.Component {
className={classes.boundaryBox}
direction="column"
alignItems="center"
- justifyContent="space-evenly"
+ justifycontent="space-evenly"
+ justify="center"
>
{/* Filter By Category */}
<Grid item className={classes.categoryItem}>
<Typography variant="body1">FILTER BY CATEGORY</Typography>
- <Grid justify="center" item>
- {this.statusButtons()}
- </Grid>
+ <Grid item>{this.statusButtons()}</Grid>
</Grid>
{/* Search for an individual */}
@@ -205,7 +204,7 @@ class ActionItemSearchParticipants extends React.Component {
</Grid>
{/* Select All Button */}
- <Grid item alignItems="flex-end" className={classes.selectAll}>
+ <Grid item className={classes.selectAll}>
<FormControlLabel
control={
<Checkbox
diff --git a/app/javascript/components/EnhancedTable/index.js b/app/javascript/components/EnhancedTable/index.js
index 956eb991..2ed768f0 100644
--- a/app/javascript/components/EnhancedTable/index.js
+++ b/app/javascript/components/EnhancedTable/index.js
@@ -53,7 +53,6 @@ function EnhancedTableHead(props) {
<TableCell
key={headCell.id}
align="left"
- pointer-events={headCell.sortable}
sortDirection={orderBy === headCell.id ? order : false}
>
{headCell.sortable ? (
@@ -124,7 +123,7 @@ function EnhancedTable(props) {
<Table
className={classes.table}
aria-labelledby="tableTitle"
- size="large"
+ size="medium"
aria-label="enhanced table"
>
<EnhancedTableHead
@@ -180,7 +179,7 @@ EnhancedTable.propTypes = {
headCells: PropTypes.array.isRequired,
classes: PropTypes.object.isRequired,
pageHandler: PropTypes.func.isRequired,
- page: PropTypes.object.isRequired,
+ page: PropTypes.number.isRequired,
type: PropTypes.string,
};
diff --git a/app/javascript/components/LoadModal/index.js b/app/javascript/components/LoadModal/index.js
index 183ba0e5..4565dbf0 100644
--- a/app/javascript/components/LoadModal/index.js
+++ b/app/javascript/components/LoadModal/index.js
@@ -77,7 +77,7 @@ function LoadModal({
<Grid item>
<DialogContent>
<DialogContentText id="alert-dialog-description">
- <Typography className={classes.textStyle}>{titleText}</Typography>
+ {titleText}
</DialogContentText>
</DialogContent>
</Grid>
diff --git a/app/javascript/components/Main/index.js b/app/javascript/components/Main/index.js
index c8204778..58c85bb5 100644
--- a/app/javascript/components/Main/index.js
+++ b/app/javascript/components/Main/index.js
@@ -61,7 +61,6 @@ function Main(props) {
<ListItem
button
component="a"
- disableFocusRipple
disableTouchRipple
className={classes.navBarItem}
onClick={() => {
@@ -155,7 +154,6 @@ function Main(props) {
<ListItem
button
component="a"
- disableFocusRipple
disableTouchRipple
className={classes.navBarItem}
onClick={logout}
diff --git a/app/javascript/components/ParticipantCard/styles.js b/app/javascript/components/ParticipantCard/styles.js
index 5aca0787..339bde80 100644
--- a/app/javascript/components/ParticipantCard/styles.js
+++ b/app/javascript/components/ParticipantCard/styles.js
@@ -34,7 +34,6 @@ const styles = theme => ({
case 'Studio':
return theme.palette.common.studio;
default:
- console.error('Participant has no status');
return theme.palette.common.darkestBlue;
}
},
From 2f7b3fedd2aa0e93bfeb0e51f32d2c31fe361285 Mon Sep 17 00:00:00 2001
From: becky <beckymccarthy777@gmail.com>
Date: Tue, 3 Nov 2020 09:52:42 -0800
Subject: [PATCH 16/17] Edited more PropType errors found
---
app/javascript/components/ParticipantShowPage/index.js | 2 +-
app/javascript/components/StudioAssessmentForm/index.js | 2 +-
app/javascript/components/ViewMoreModal/index.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/javascript/components/ParticipantShowPage/index.js b/app/javascript/components/ParticipantShowPage/index.js
index 4076a32e..4dbc888f 100644
--- a/app/javascript/components/ParticipantShowPage/index.js
+++ b/app/javascript/components/ParticipantShowPage/index.js
@@ -147,7 +147,7 @@ ParticipantShowPage.propTypes = {
personalQuestionnaire: PropTypes.object.isRequired,
professionalQuestionnaire: PropTypes.object.isRequired,
studioAssessments: PropTypes.array.isRequired,
- resumeURL: PropTypes.string.isRequired,
+ resumeURL: PropTypes.string,
categories: PropTypes.array.isRequired,
assignmentList: PropTypes.array,
};
diff --git a/app/javascript/components/StudioAssessmentForm/index.js b/app/javascript/components/StudioAssessmentForm/index.js
index 7748e4da..7219cb19 100644
--- a/app/javascript/components/StudioAssessmentForm/index.js
+++ b/app/javascript/components/StudioAssessmentForm/index.js
@@ -88,7 +88,7 @@ export const StudioAssessmentForm = ({
};
StudioAssessmentForm.propTypes = {
- studioAssessment: PropTypes.object.isRequired,
+ studioAssessment: PropTypes.object,
participantId: PropTypes.number.isRequired,
userType: PropTypes.oneOf(['staff', 'participant']).isRequired,
onClose: PropTypes.func,
diff --git a/app/javascript/components/ViewMoreModal/index.js b/app/javascript/components/ViewMoreModal/index.js
index 064e07d0..b752eaa6 100644
--- a/app/javascript/components/ViewMoreModal/index.js
+++ b/app/javascript/components/ViewMoreModal/index.js
@@ -119,7 +119,7 @@ ViewMoreModal.propTypes = {
classes: PropTypes.object.isRequired,
description: PropTypes.string,
title: PropTypes.string,
- category: PropTypes.string.isRequired,
+ category: PropTypes.string,
dueDate: PropTypes.string,
open: PropTypes.bool.isRequired,
isCaseNote: PropTypes.bool,
From 10519e68aa361a951fbc4823da59c16e0894f27e Mon Sep 17 00:00:00 2001
From: Jessi Shank <jessishank1@gmail.com>
Date: Tue, 3 Nov 2020 14:54:59 -0800
Subject: [PATCH 17/17] add participant and staff types back into rails admin
view
---
config/initializers/rails_admin.rb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb
index 48045546..15cef2f1 100644
--- a/config/initializers/rails_admin.rb
+++ b/config/initializers/rails_admin.rb
@@ -29,9 +29,7 @@
config.actions do
dashboard # mandatory
- index do
- except ['Participant', 'Staff']
- end
+ index
new
export
bulk_delete