Merge pull request #11744 from rtibbles/coach_app_nav_bar

Remove coach page specific sub nav toggling.
learningequality · Jan 19, 2024 · a579274 · a579274
2 parents 0f182a3 + bd4d77c
commit a579274
Show file tree

Hide file tree

Showing 27 changed files with 2 additions and 37 deletions.
diff --git a/kolibri/plugins/coach/assets/src/views/CoachAppBarPage.vue b/kolibri/plugins/coach/assets/src/views/CoachAppBarPage.vue
@@ -5,10 +5,7 @@
     :authorizedRole="authorizedRole"
   >
     <AppBarPage :title="appBarTitle || defaultAppBarTitle">
-      <template
-        v-if="showSubNav && !isAppContext"
-        #subNav
-      >
+      <template #subNav>
         <TopNavbar />
       </template>
       <div class="coach-main">
@@ -24,7 +21,7 @@
 
 <script>
 
-  import { mapState, mapGetters } from 'vuex';
+  import { mapState } from 'vuex';
   import AppBarPage from 'kolibri.coreVue.components.AppBarPage';
   import NotificationsRoot from 'kolibri.coreVue.components.NotificationsRoot';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -78,17 +75,11 @@
         type: String,
         default: null,
       },
-      showSubNav: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
     },
     computed: {
       ...mapState({
         error: state => state.core.error,
       }),
-      ...mapGetters(['isAppContext']),
     },
     $trs: {
       kolibriTitleMessage: {

diff --git a/kolibri/plugins/coach/assets/src/views/home/HomeActivityPage.vue b/kolibri/plugins/coach/assets/src/views/home/HomeActivityPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
     <KPageContainer>
       <p>

diff --git a/kolibri/plugins/coach/assets/src/views/home/HomePage/index.vue b/kolibri/plugins/coach/assets/src/views/home/HomePage/index.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KGrid gutter="16">

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/plan/GroupMembersPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/GroupMembersPage/index.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
     <KPageContainer>
       <p>

diff --git a/kolibri/plugins/coach/assets/src/views/plan/GroupsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/GroupsPage/index.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
     <KPageContainer>
       <PlanHeader :activeTabId="PlanTabs.GROUPS" />

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/index.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KGrid v-if="!loading">

diff --git a/kolibri/plugins/coach/assets/src/views/plan/QuizSummaryPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/QuizSummaryPage/index.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="$store.getters.userIsAuthorizedForCoach"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KGrid gutter="16">

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ExerciseQuestionListPageBase.vue b/kolibri/plugins/coach/assets/src/views/reports/ExerciseQuestionListPageBase.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupActivityPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupActivityPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupLearnerListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupLearnerListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/...lugins/coach/assets/src/views/reports/ReportsGroupReportLessonExerciseLearnerListPage.vue b/...lugins/coach/assets/src/views/reports/ReportsGroupReportLessonExerciseLearnerListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/...lugins/coach/assets/src/views/reports/ReportsGroupReportLessonResourceLearnerListPage.vue b/...lugins/coach/assets/src/views/reports/ReportsGroupReportLessonResourceLearnerListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsGroupReportPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerActivityPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerActivityPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportLessonPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportLessonPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLearnerReportPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonBase.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonBase.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KGrid gutter="16">

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonExerciseLearnerListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonExerciseLearnerListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerBase.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonLearnerBase.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonManagerPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonManagerPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonResourceLearnerListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsLessonResourceLearnerListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer>

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsQuizBaseListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsQuizBaseListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KGrid gutter="16">

diff --git a/kolibri/plugins/coach/assets/src/views/reports/ReportsQuizListPage.vue b/kolibri/plugins/coach/assets/src/views/reports/ReportsQuizListPage.vue
@@ -3,7 +3,6 @@
   <CoachAppBarPage
     :authorized="userIsAuthorized"
     authorizedRole="adminOrCoach"
-    :showSubNav="true"
   >
 
     <KPageContainer :class="{ 'print': $isPrint }">