From f2a2740938404584983e5cbc62312b6d0e27e34f Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sat, 25 Jul 2020 14:17:05 -0400 Subject: [PATCH 1/6] feat(dashboard): Adds category labels to sidebar --- .../layouts/manage/application.html.haml | 67 +++++++++++-------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/app/views/layouts/manage/application.html.haml b/app/views/layouts/manage/application.html.haml index ca57834d6..6d0e669a8 100644 --- a/app/views/layouts/manage/application.html.haml +++ b/app/views/layouts/manage/application.html.haml @@ -34,44 +34,55 @@ = active_link_to manage_questionnaires_path, class: "nav-link" do .fa.fa-inbox.fa-fw.icon-space-r-half Questionnaires - %li.nav-item - = active_link_to manage_checkins_path, class: "nav-link" do - .fa.fa-drivers-license-o.fa-fw.icon-space-r-half - Check-in - - if current_user.admin? - %li.nav-item - = active_link_to manage_users_path, class: "nav-link" do - .fa.fa-users.fa-fw.icon-space-r-half - = t(:title, scope: 'pages.manage.users') %li.nav-item = active_link_to manage_messages_path, class: "nav-link" do .fa.fa-bullhorn.fa-fw.icon-space-r-half Messages - %li.nav-item - = active_link_to manage_bus_lists_path, class: "nav-link" do - .fa.fa-bus.fa-fw.icon-space-r-half - Bus Lists - %li.nav-item - = active_link_to manage_schools_path, class: "nav-link" do - .fa.fa-home.fa-fw.icon-space-r-half - Schools - %li.nav-item - = active_link_to manage_stats_path, class: "nav-link" do - .fa.fa-table.fa-fw.icon-space-r-half - Stats - %li.nav-item - = active_link_to manage_trackable_tags_path, class: "nav-link" do - .fa.fa-tag.fa-fw.icon-space-r-half - Trackable Tags + + %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted + %span Logistics + %ul.nav.flex-column.mb-2 + %li.nav-item + = active_link_to manage_checkins_path, class: "nav-link" do + .fa.fa-drivers-license-o.fa-fw.icon-space-r-half + Check-in + %li.nav-item + = active_link_to manage_stats_path, class: "nav-link" do + .fa.fa-table.fa-fw.icon-space-r-half + Stats + %li.nav-item + = active_link_to manage_trackable_tags_path, class: "nav-link" do + .fa.fa-tag.fa-fw.icon-space-r-half + Trackable Tags + + %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted + %span Travel + %ul.nav.flex-column.mb-2 + %li.nav-item + = active_link_to manage_bus_lists_path, class: "nav-link" do + .fa.fa-bus.fa-fw.icon-space-r-half + Bus Lists + %li.nav-item + = active_link_to manage_schools_path, class: "nav-link" do + .fa.fa-home.fa-fw.icon-space-r-half + Schools + - if current_user.admin? %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted - %span Advanced + %span Administration %ul.nav.flex-column.mb-2 + %li.nav-item + = active_link_to manage_users_path, class: "nav-link" do + .fa.fa-users.fa-fw.icon-space-r-half + = t(:title, scope: 'pages.manage.users') %li.nav-item = active_link_to manage_configs_path, class: "nav-link" do .fa.fa-wrench.fa-fw.icon-space-r-half - Config - .nav-item-description Manage configuration + Hackathon Settings + + %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted + %span Advanced + %ul.nav.flex-column.mb-2 %li.nav-item = active_link_to sidekiq_web_path, target: '_blank', class: "nav-link" do .fa.fa-tasks.fa-fw.icon-space-r-half From 275a3aa10e396ea1d943096a6a9f617cc375357b Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sat, 25 Jul 2020 14:29:19 -0400 Subject: [PATCH 2/6] refactor: Changes config to settings, adds localization --- app/views/layouts/manage/application.html.haml | 4 ++-- app/views/manage/configs/index.html.haml | 2 +- config/locales/en.yml | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/manage/application.html.haml b/app/views/layouts/manage/application.html.haml index 6d0e669a8..a98bc1403 100644 --- a/app/views/layouts/manage/application.html.haml +++ b/app/views/layouts/manage/application.html.haml @@ -78,8 +78,8 @@ %li.nav-item = active_link_to manage_configs_path, class: "nav-link" do .fa.fa-wrench.fa-fw.icon-space-r-half - Hackathon Settings - + = t(:title, scope: 'pages.manage.settings') + %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted %span Advanced %ul.nav.flex-column.mb-2 diff --git a/app/views/manage/configs/index.html.haml b/app/views/manage/configs/index.html.haml index 7b0438c46..067f252cf 100644 --- a/app/views/manage/configs/index.html.haml +++ b/app/views/manage/configs/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Hackathon Configuration" += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.settings') .row .col-lg-6.mb-3 diff --git a/config/locales/en.yml b/config/locales/en.yml index 060806f62..469683285 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -169,3 +169,6 @@ en: yes: Yes no: No save: Save + settings: + title: Hackathon Settings + From 5583390a72beb91643a58d60f31e3288e1ecafe1 Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sat, 25 Jul 2020 14:37:22 -0400 Subject: [PATCH 3/6] refactor: Adds localization to sidebar --- app/views/layouts/manage/application.html.haml | 16 ++++++++-------- config/locales/en.yml | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/manage/application.html.haml b/app/views/layouts/manage/application.html.haml index a98bc1403..056e74a1e 100644 --- a/app/views/layouts/manage/application.html.haml +++ b/app/views/layouts/manage/application.html.haml @@ -29,15 +29,15 @@ %li.nav-item = active_link_to manage_root_path, class: "nav-link", active_children: false do .fa.fa-area-chart.fa-fw.icon-space-r-half - Dashboard + = t(:title, scope: 'pages.manage.dashboard') %li.nav-item = active_link_to manage_questionnaires_path, class: "nav-link" do .fa.fa-inbox.fa-fw.icon-space-r-half - Questionnaires + = t(:title, scope: 'pages.manage.questionnaires') %li.nav-item = active_link_to manage_messages_path, class: "nav-link" do .fa.fa-bullhorn.fa-fw.icon-space-r-half - Messages + = t(:title, scope: 'pages.manage.messages') %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted %span Logistics @@ -45,15 +45,15 @@ %li.nav-item = active_link_to manage_checkins_path, class: "nav-link" do .fa.fa-drivers-license-o.fa-fw.icon-space-r-half - Check-in + = t(:title, scope: 'pages.manage.check-in') %li.nav-item = active_link_to manage_stats_path, class: "nav-link" do .fa.fa-table.fa-fw.icon-space-r-half - Stats + = t(:title, scope: 'pages.manage.stats') %li.nav-item = active_link_to manage_trackable_tags_path, class: "nav-link" do .fa.fa-tag.fa-fw.icon-space-r-half - Trackable Tags + = t(:title, scope: 'pages.manage.trackable-tags') %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted %span Travel @@ -61,11 +61,11 @@ %li.nav-item = active_link_to manage_bus_lists_path, class: "nav-link" do .fa.fa-bus.fa-fw.icon-space-r-half - Bus Lists + = t(:title, scope: 'pages.manage.bus-lists') %li.nav-item = active_link_to manage_schools_path, class: "nav-link" do .fa.fa-home.fa-fw.icon-space-r-half - Schools + = t(:title, scope: 'pages.manage.schools') - if current_user.admin? %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted diff --git a/config/locales/en.yml b/config/locales/en.yml index 469683285..6209706fc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -119,6 +119,22 @@ en: thanks_for_rsvp_message: Thanks For RSVP Message pages: manage: + dashboard: + title: Dashboard + questionnaires: + title: Questionnaires + messages: + title: Messages + check-in: + title: Check-in + stats: + title: Stats + trackable-tags: + title: Trackable Tags + bus-lists: + title: Bus Lists + schools: + title: Schools users: title: Users & Staff users: All Users From 3a0a16bc664d747fab614269d2635d860c348d72 Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Sat, 25 Jul 2020 15:15:11 -0400 Subject: [PATCH 4/6] refactor: Adds localization to page titles --- app/views/manage/bus_lists/index.html.haml | 2 +- app/views/manage/checkins/index.html.haml | 2 +- app/views/manage/dashboard/index.html.haml | 2 +- app/views/manage/messages/index.html.haml | 2 +- app/views/manage/questionnaires/index.html.haml | 2 +- app/views/manage/schools/index.html.haml | 2 +- app/views/manage/stats/index.html.haml | 2 +- app/views/manage/trackable_tags/index.html.haml | 2 +- config/locales/en.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/manage/bus_lists/index.html.haml b/app/views/manage/bus_lists/index.html.haml index 33db1cda8..e20889cb9 100644 --- a/app/views/manage/bus_lists/index.html.haml +++ b/app/views/manage/bus_lists/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Bus Lists", docs: 'https://coderit.org/hackathon-manager/docs/busses' do += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.bus-lists'), docs: 'https://coderit.org/hackathon-manager/docs/busses' do = link_to "New Bus List", new_manage_bus_list_path, class: "btn btn-sm btn-outline-secondary" .mb-4 diff --git a/app/views/manage/checkins/index.html.haml b/app/views/manage/checkins/index.html.haml index 21386b20d..772f15e15 100644 --- a/app/views/manage/checkins/index.html.haml +++ b/app/views/manage/checkins/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Check-in" += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.check-in') .mb-4 %table.checkins.datatable.table.table-striped.table-hover{ "data-source" => datatable_manage_checkins_path(format: :json) } diff --git a/app/views/manage/dashboard/index.html.haml b/app/views/manage/dashboard/index.html.haml index 7291650c8..574d2b775 100644 --- a/app/views/manage/dashboard/index.html.haml +++ b/app/views/manage/dashboard/index.html.haml @@ -9,7 +9,7 @@ = javascript_include_tag "vendor/queue.v1.min.js" = javascript_include_tag "vendor/topojson.v1.min.js" -= render "layouts/manage/page_title", title: "Dashboard" += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.dashboard') .row .col diff --git a/app/views/manage/messages/index.html.haml b/app/views/manage/messages/index.html.haml index 99d733353..7c8299518 100644 --- a/app/views/manage/messages/index.html.haml +++ b/app/views/manage/messages/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Messages" do += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.messages') do = link_to "New Message", new_manage_message_path, class: "btn btn-sm btn-outline-secondary" .mb-4 diff --git a/app/views/manage/questionnaires/index.html.haml b/app/views/manage/questionnaires/index.html.haml index 2948f03d6..4ba428587 100644 --- a/app/views/manage/questionnaires/index.html.haml +++ b/app/views/manage/questionnaires/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Questionnaires" do += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.questionnaires') do = link_to "New Questionnaire", new_manage_questionnaire_path, class: "btn btn-sm btn-outline-secondary" = render "questionnaire_datatable" diff --git a/app/views/manage/schools/index.html.haml b/app/views/manage/schools/index.html.haml index 8f7e9a1b0..10d963f00 100644 --- a/app/views/manage/schools/index.html.haml +++ b/app/views/manage/schools/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Schools" do += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.schools') do = link_to "New School", new_manage_school_path, class: "btn btn-sm btn-outline-secondary" .mb-4 diff --git a/app/views/manage/stats/index.html.haml b/app/views/manage/stats/index.html.haml index 9e5f22cd2..2e325cc71 100644 --- a/app/views/manage/stats/index.html.haml +++ b/app/views/manage/stats/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Statistics & Info" += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.stats') .row .col diff --git a/app/views/manage/trackable_tags/index.html.haml b/app/views/manage/trackable_tags/index.html.haml index 63a01917c..1dbc9f1a8 100644 --- a/app/views/manage/trackable_tags/index.html.haml +++ b/app/views/manage/trackable_tags/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Trackable Tags" do += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.trackable-tags') do = link_to "New Tag", new_manage_trackable_tag_path, class: "btn btn-sm btn-outline-secondary" %table.table.table-striped diff --git a/config/locales/en.yml b/config/locales/en.yml index 6209706fc..03c786b29 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -128,7 +128,7 @@ en: check-in: title: Check-in stats: - title: Stats + title: Statistics trackable-tags: title: Trackable Tags bus-lists: From 38f95ec5c62145df2fc440ca35771c6c305faccc Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Thu, 30 Jul 2020 16:05:42 -0400 Subject: [PATCH 5/6] refactor: Adds "Overview" category for event-wide pages --- app/views/layouts/manage/application.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/manage/application.html.haml b/app/views/layouts/manage/application.html.haml index 056e74a1e..df035ccc9 100644 --- a/app/views/layouts/manage/application.html.haml +++ b/app/views/layouts/manage/application.html.haml @@ -25,7 +25,9 @@ .row %nav.col-md-2.d-none.d-md-block.bg-light.sidebar .sidebar-sticky - %ul.nav.flex-column + %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted + %span Overview + %ul.nav.flex-column.mb-2 %li.nav-item = active_link_to manage_root_path, class: "nav-link", active_children: false do .fa.fa-area-chart.fa-fw.icon-space-r-half From ae5745228bdf95a219e36b8063c51e884adda977 Mon Sep 17 00:00:00 2001 From: "Chris Baudouin, Jr" Date: Thu, 30 Jul 2020 19:53:08 -0400 Subject: [PATCH 6/6] refactor: Adds missing localizers --- .../layouts/manage/application.html.haml | 35 ++++++++++++------- app/views/manage/data_exports/index.html.haml | 2 +- config/locales/en.yml | 22 +++++++++++- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/manage/application.html.haml b/app/views/layouts/manage/application.html.haml index df035ccc9..730a76151 100644 --- a/app/views/layouts/manage/application.html.haml +++ b/app/views/layouts/manage/application.html.haml @@ -26,7 +26,8 @@ %nav.col-md-2.d-none.d-md-block.bg-light.sidebar .sidebar-sticky %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted - %span Overview + %span + = t(:overview, scope: 'layouts.manage.navigation') %ul.nav.flex-column.mb-2 %li.nav-item = active_link_to manage_root_path, class: "nav-link", active_children: false do @@ -42,7 +43,8 @@ = t(:title, scope: 'pages.manage.messages') %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted - %span Logistics + %span + = t(:logistics, scope: 'layouts.manage.navigation') %ul.nav.flex-column.mb-2 %li.nav-item = active_link_to manage_checkins_path, class: "nav-link" do @@ -58,7 +60,8 @@ = t(:title, scope: 'pages.manage.trackable-tags') %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted - %span Travel + %span + = t(:travel, scope: 'layouts.manage.navigation') %ul.nav.flex-column.mb-2 %li.nav-item = active_link_to manage_bus_lists_path, class: "nav-link" do @@ -71,7 +74,8 @@ - if current_user.admin? %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted - %span Administration + %span + = t(:administration, scope: 'layouts.manage.navigation') %ul.nav.flex-column.mb-2 %li.nav-item = active_link_to manage_users_path, class: "nav-link" do @@ -83,31 +87,36 @@ = t(:title, scope: 'pages.manage.settings') %h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted - %span Advanced + %span + = t(:advanced, scope: 'layouts.manage.navigation') %ul.nav.flex-column.mb-2 %li.nav-item = active_link_to sidekiq_web_path, target: '_blank', class: "nav-link" do .fa.fa-tasks.fa-fw.icon-space-r-half - Sidekiq + = t(:title, scope: 'pages.manage.sidekiq') %span.fa.fa-external-link.icon-space-l-half - .nav-item-description Monitor background jobs + .nav-item-description + = t(:sidekiq, scope: 'layouts.manage.navigation.descriptors') %li.nav-item = active_link_to blazer_path, target: '_blank', class: "nav-link" do .fa.fa-terminal.fa-fw.icon-space-r-half - Blazer + = t(:title, scope: 'pages.manage.blazer') %span.fa.fa-external-link.icon-space-l-half - .nav-item-description Run custom SQL queries + .nav-item-description + = t(:blazer, scope: 'layouts.manage.navigation.descriptors') %li.nav-item = active_link_to oauth_applications_path, target: '_blank', class: "nav-link" do .fa.fa-unlock.fa-fw.icon-space-r-half - Doorkeeper + = t(:title, scope: 'pages.manage.doorkeeper') %span.fa.fa-external-link.icon-space-l-half - .nav-item-description OAuth2 provider management + .nav-item-description + = t(:doorkeeper, scope: 'layouts.manage.navigation.descriptors') %li.nav-item = active_link_to manage_data_exports_path, class: "nav-link" do .fa.fa-download.fa-fw.icon-space-r-half - Data Exports - .nav-item-description Generate & export data + = t(:title, scope: 'pages.manage.data-exports') + .nav-item-description + = t(:dataexports, scope: 'layouts.manage.navigation.descriptors') %main.col-md-10.ml-sm-auto.px-4{role: "main"} = render "layouts/manage/flashes" = yield diff --git a/app/views/manage/data_exports/index.html.haml b/app/views/manage/data_exports/index.html.haml index 7597773ea..1f47f9ab7 100644 --- a/app/views/manage/data_exports/index.html.haml +++ b/app/views/manage/data_exports/index.html.haml @@ -1,4 +1,4 @@ -= render "layouts/manage/page_title", title: "Data Exports" do += render "layouts/manage/page_title", title: t(:title, scope: 'pages.manage.data-exports') do = link_to "New Data Export", new_manage_data_export_path, class: "btn btn-sm btn-outline-secondary" %table.table.table-striped diff --git a/config/locales/en.yml b/config/locales/en.yml index 03c786b29..95d7deacc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -187,4 +187,24 @@ en: save: Save settings: title: Hackathon Settings - + sidekiq: + title: Sidekiq + blazer: + title: Blazer + doorkeeper: + title: Doorkeeper + data-exports: + title: Data Exports + layouts: + manage: + navigation: + overview: Overview + logistics: Logistics + travel: Travel + administration: Administration + advanced: Advanced + descriptors: + sidekiq: Monitor background jobs + blazer: Run custom SQL queries + doorkeeper: OAuth2 provider management + dataexports: Generate & export data