Skip to content

Commit

Permalink
feat(Dashboard): Redesigns sidebar with category labels (#290)
Browse files Browse the repository at this point in the history
* feat(dashboard): Adds category labels to sidebar

* refactor: Changes config to settings, adds localization

* refactor: Adds localization to sidebar

* refactor: Adds localization to page titles

* refactor: Adds "Overview" category for event-wide pages

* refactor: Adds missing localizers
  • Loading branch information
cbaudouinjr authored Aug 30, 2020
1 parent c6d33a9 commit abcf634
Show file tree
Hide file tree
Showing 12 changed files with 111 additions and 50 deletions.
102 changes: 62 additions & 40 deletions app/views/layouts/manage/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -25,76 +25,98 @@
.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
= 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
.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
%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')
= 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
%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
= 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
= 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
.fa.fa-drivers-license-o.fa-fw.icon-space-r-half
= 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
= 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
= 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
= 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
.fa.fa-bus.fa-fw.icon-space-r-half
= 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
= 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
%span Advanced
%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
.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
= 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
= 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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/bus_lists/index.html.haml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/checkins/index.html.haml
Original file line number Diff line number Diff line change
@@ -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) }
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/configs/index.html.haml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/dashboard/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/data_exports/index.html.haml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/messages/index.html.haml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/questionnaires/index.html.haml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/schools/index.html.haml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/stats/index.html.haml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/trackable_tags/index.html.haml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
39 changes: 39 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: Statistics
trackable-tags:
title: Trackable Tags
bus-lists:
title: Bus Lists
schools:
title: Schools
users:
title: Users & Staff
users: All Users
Expand Down Expand Up @@ -169,3 +185,26 @@ en:
yes: Yes
no: No
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

0 comments on commit abcf634

Please sign in to comment.