diff --git a/app/assets/images/framework_wheel.png b/app/assets/images/framework_wheel.png new file mode 100644 index 00000000..d2cbb660 Binary files /dev/null and b/app/assets/images/framework_wheel.png differ diff --git a/app/assets/stylesheets/bootstrap-overrides.scss b/app/assets/stylesheets/bootstrap-overrides.scss index 25df457d..44d3d522 100644 --- a/app/assets/stylesheets/bootstrap-overrides.scss +++ b/app/assets/stylesheets/bootstrap-overrides.scss @@ -14,6 +14,8 @@ $spacers: ( 8: ($spacer * 6), 9: ($spacer * 7), 10: ($spacer * 8), + 11: ($spacer * 9), + 12: ($spacer * 10), ); $nav-link-color: $white; @@ -21,5 +23,12 @@ $nav-link-font-weight: 600; $nav-tabs-border-color: transparent; $nav-tabs-border-radius: 15px; $font-family-base: 'Cabin', sans-serif; +$headings-font-family: 'Bitter', serif; +$headings-font-weight: 700; $body-color: $black; + $btn-border-radius: 0; +$input-btn-focus-color-opacity: 0.35; + +$accordion-border-radius: 8px; +$accordion-button-active-bg: $gray-3; diff --git a/app/assets/stylesheets/clear-margin-padding.scss b/app/assets/stylesheets/clear-margin-padding.scss index 2d47f2a1..0e074101 100644 --- a/app/assets/stylesheets/clear-margin-padding.scss +++ b/app/assets/stylesheets/clear-margin-padding.scss @@ -11,7 +11,6 @@ h3, h4, h5, h6, -p, blockquote, pre, a, diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss index d688c5ae..4165093e 100644 --- a/app/assets/stylesheets/welcome.scss +++ b/app/assets/stylesheets/welcome.scss @@ -19,12 +19,17 @@ text-align: center; } -.hero-description{ +.hero-description { max-width: 588px; margin: auto; font-size: 20px; } +img.framework-wheel { + width: 442px; + max-width: 100%; +} + .welcome-controls { @extend .py-5; } @@ -35,3 +40,20 @@ $black, $black, $white, $gray-2, transparent, $white); } + +#landing-accordion { + max-width: 550px; +} + +footer { + color: $white; + .btn { + @extend .font-bitter; + @extend .font-size-14; + @extend .weight-700; + } +} +.footer-content { + margin: auto; + max-width: 792px; +} diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index d53a1e76..a2dc76ad 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -2,5 +2,7 @@ class HomeController < ActionController::Base def index @districts = District.all.order(:name) @schools = School.all + + @categories = SqmCategory.all end end diff --git a/app/javascript/home.js b/app/javascript/home.js index ed7b5c18..4cf80ff0 100644 --- a/app/javascript/home.js +++ b/app/javascript/home.js @@ -1,3 +1,5 @@ +import 'bootstrap'; + export function initializeListenersForHomeDropdowns() { const districtDropdown = document.querySelector("#district-dropdown"); if (districtDropdown) { diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index d0f6b57e..7b4cf381 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -20,3 +20,54 @@ + +
+
+
+
+ <%= image_tag('framework_wheel.png', alt: 'MCIEA School Quality Framework Wheel', class: 'framework-wheel') %> +
+
+

School Quality Measures Framework

+

Through a strand of work led by professor Jack Schneider at the University of Massachusetts Lowell and a team + of researchers, MCIEA is reimagining how we measure the quality of our schools and the learning experiences of + our students.

+

To achieve this goal, MCIEA sought input from stakeholders in each consortium district to build a school + quality framework that reflects what the public wants to know about their schools.

+

The framework has been built around multiple measures, which include academic, social-emotional, and school + culture indicators, in order to piece together a fairer and more comprehensive picture of school performance. + It + consists of five major categories.

+ +
+ <% @categories.each do |category| %> +
+

+ +

+
+
+ <%= category.description %> +
+
+
+ <% end %> +
+
+
+
+
+ + diff --git a/app/views/sqm_categories/show.html.erb b/app/views/sqm_categories/show.html.erb index 9d894e83..9cabf837 100644 --- a/app/views/sqm_categories/show.html.erb +++ b/app/views/sqm_categories/show.html.erb @@ -11,7 +11,7 @@ <% end %>

<%= @category.name %>

-

<%= @category.description %>

+

<%= @category.description %>

<% @category.subcategories.each do |subcategory| %>
@@ -23,7 +23,7 @@
<%= render partial: "gauge_graph", locals: { gauge: subcategory.gauge_presenter, gauge_class: 'gauge-graph-lg', font_class: 'sub-header-3' } %>
-

<%= subcategory.description %>

+

<%= subcategory.description %>

diff --git a/package.json b/package.json index 46a4c6a3..351c04c9 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,13 @@ "private": "true", "dependencies": { "@babel/preset-env": "^7.15.8", - "babel-preset-es2015": "^6.24.1", - "esbuild": "^0.13.6", + "@popperjs/core": "^2.10.2", "@rails/actioncable": "^6.0.0", "@rails/activestorage": "^6.0.0", "@rails/ujs": "^6.0.0", + "babel-preset-es2015": "^6.24.1", + "bootstrap": "^5.1.3", + "esbuild": "^0.13.6", "turbolinks": "^5.2.0" }, "scripts": { diff --git a/spec/features/school_dashboard_feature_spec.rb b/spec/features/school_dashboard_feature_spec.rb index 4c237154..471b43e2 100644 --- a/spec/features/school_dashboard_feature_spec.rb +++ b/spec/features/school_dashboard_feature_spec.rb @@ -70,6 +70,7 @@ feature 'School dashboard', type: feature do page.driver.basic_authorize(username, password) visit '/welcome' + expect(page).to have_text("Teachers & Leadership") go_to_school_dashboard_from_welcome_page(district, school) district_admin_sees_dashboard_content diff --git a/spec/views/home/index.html.erb_spec.rb b/spec/views/home/index.html.erb_spec.rb index a3379842..11ba40b7 100644 --- a/spec/views/home/index.html.erb_spec.rb +++ b/spec/views/home/index.html.erb_spec.rb @@ -5,6 +5,7 @@ describe 'home/index.html.erb' do before :each do assign :districts, [create(:district), create(:district)] + assign :categories, [create(:sqm_category)] render end diff --git a/yarn.lock b/yarn.lock index 453f5e6a..f0dcff72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1079,6 +1079,11 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" +"@popperjs/core@^2.10.2": + version "2.10.2" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590" + integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ== + "@rails/actioncable@^6.0.0": version "6.1.4" resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.4.tgz#c3c5a9f8302c429af9722b6c50ab48049016d2a3" @@ -1777,6 +1782,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +bootstrap@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" + integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"