fix(sidebar): fixed UI problems for diffrent roles

removed the duplicate checkin button for orginizers and had checkin page defaut to be highlighted for volenteers
codeRIT · Sep 20, 2020 · b5ad3b8 · b5ad3b8
1 parent 057e3aa
commit b5ad3b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
@@ -10,6 +10,8 @@
         = btn_link_to "Home", homepage_url
     .header-nav
       - if user_signed_in?
-        - if current_user.staff?
+        - if current_user.organizing_staff?
           = btn_link_to "Manage", manage_root_path
+        - elsif current_user.volunteer?
+          = btn_link_to "Manage", manage_checkins_path
         = btn_link_to "Sign Out", destroy_user_session_path, method: :delete
diff --git a/app/views/layouts/manage/application.html.haml b/app/views/layouts/manage/application.html.haml
@@ -42,12 +42,18 @@
                   = active_link_to manage_messages_path, class: "nav-link" do
                     .fa.fa-bullhorn.fa-fw.icon-space-r-half
                     = t(:title, scope: 'pages.manage.messages')
+            - elsif current_user.organizer?
+              %ul.nav.flex-column.mb-2
+                %li.nav-item
+                  = active_link_to manage_questionnaires_path, class: "nav-link" do
+                    .fa.fa-inbox.fa-fw.icon-space-r-half
+                    = t(:title, scope: 'pages.manage.questionnaires')
             - else
               %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')
+                  = 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_questionnaires_path, class: "nav-link" do
                     .fa.fa-inbox.fa-fw.icon-space-r-half