From cb76318601fe6cd892fe27be0c5be6a0920234f7 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Wed, 31 Jul 2019 17:10:30 +0200
Subject: [PATCH] Re-add solution toggle to module navigation bar

---
 client/cypress/integration/solutions.spec.js          |  2 +-
 client/src/components/modules/ModuleNavigation.vue    | 11 +++++++----
 client/src/components/toggle-menu/ToggleEditing.vue   |  6 ++----
 .../toggle-menu/ToggleSolutionsForModule.vue          |  1 -
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/cypress/integration/solutions.spec.js b/client/cypress/integration/solutions.spec.js
index da561c1e..bf6d9c97 100644
--- a/client/cypress/integration/solutions.spec.js
+++ b/client/cypress/integration/solutions.spec.js
@@ -7,7 +7,7 @@ describe('Solutions', () => {
 //   //   cy.visit('/module/lohn-und-budget');
 //   // });
 //
-  it.skip('toggles the solution as teacher, then the student can display it', () => {
+  it('toggles the solution as teacher, then the student can display it', () => {
     cy.exec("python ../server/manage.py hidesolutions");
     cy.startGraphQLCapture();
     cy.route('POST', '/api/graphql/').as('graphQL');
diff --git a/client/src/components/modules/ModuleNavigation.vue b/client/src/components/modules/ModuleNavigation.vue
index 097c306f..d7496eb0 100644
--- a/client/src/components/modules/ModuleNavigation.vue
+++ b/client/src/components/modules/ModuleNavigation.vue
@@ -34,14 +34,15 @@
 
     <div class="module-navigation__toggle-menu">
       <toggle-editing></toggle-editing>
-    </div>
-
-    <!--toggle-solutions-for-module
+      <toggle-solutions-for-module
       v-if="onModulePage && module.id"
       :module="module.id"
       :enabled="module.solutionsEnabled"
       class="module-navigation__solution-toggle"
-      data-cy="toggle-enable-solutions"></toggle-solutions-for-module-->
+      data-cy="toggle-enable-solutions"></toggle-solutions-for-module>
+    </div>
+
+
   </nav>
 
 </template>
@@ -163,6 +164,8 @@
 
     &__toggle-menu {
       margin-left: auto;
+      display: flex;
+      align-items: center;
     }
   }
 </style>
diff --git a/client/src/components/toggle-menu/ToggleEditing.vue b/client/src/components/toggle-menu/ToggleEditing.vue
index ffbf9cd4..f6de1cd6 100644
--- a/client/src/components/toggle-menu/ToggleEditing.vue
+++ b/client/src/components/toggle-menu/ToggleEditing.vue
@@ -1,12 +1,10 @@
 <template>
-  <div class="toggle-editing">
-    <checkbox label="Modul anpassen" :checked="checked" @input="toggle"></checkbox>
-  </div>
+  <checkbox class="toggle-editing" label="Modul anpassen" :checked="checked" @input="toggle"></checkbox>
 </template>
 
 <script>
   import Checkbox from '@/components/Checkbox';
-  import { mapGetters, mapActions } from 'vuex';
+  import {mapGetters, mapActions} from 'vuex';
 
   export default {
     components: {
diff --git a/client/src/components/toggle-menu/ToggleSolutionsForModule.vue b/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
index b5b33a38..21d23ce9 100644
--- a/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
+++ b/client/src/components/toggle-menu/ToggleSolutionsForModule.vue
@@ -51,7 +51,6 @@
               const variables = {
                 id: module
               };
-              console.log(variables);
               const query = MODULE_QUERY;
               const data = store.readQuery({query, variables});
               data.module.solutionsEnabled = solutionsEnabled;