Revert "feat: Layout component" (snapshot-labs#221)

* Revert "feat: Layout component (snapshot-labs#218)" This reverts commit 9f02b01. * Fix modals (snapshot-labs#222) * feat: Layout component * refactor: Move container into layout * fix: Back button * fix: Models now open again Co-authored-by: Fabien <[email protected]> * Update src/views/Settings.vue Co-authored-by: Sam <[email protected]>
alik81 · Jan 25, 2021 · 3c63ca0 · 3c63ca0
1 parent 9f02b01
commit 3c63ca0
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 70 deletions.
diff --git a/src/views/Create.vue b/src/views/Create.vue
@@ -109,24 +109,23 @@
         </UiButton>
       </Block>
     </template>
-
-    <teleport to="#modal">
-      <ModalSelectDate
-        :value="form[selectedDate]"
-        :selectedDate="selectedDate"
-        :open="modalOpen"
-        @close="modalOpen = false"
-        @input="setDate"
-      />
-      <ModalPlugins
-        :space="space"
-        :proposal="{ ...form, choices }"
-        v-model="form.metadata.plugins"
-        :open="modalPluginsOpen"
-        @close="modalPluginsOpen = false"
-      />
-    </teleport>
   </Layout>
+  <teleport to="#modal">
+    <ModalSelectDate
+      :value="form[selectedDate]"
+      :selectedDate="selectedDate"
+      :open="modalOpen"
+      @close="modalOpen = false"
+      @input="setDate"
+    />
+    <ModalPlugins
+      :space="space"
+      :proposal="{ ...form, choices }"
+      v-model="form.metadata.plugins"
+      :open="modalPluginsOpen"
+      @close="modalPluginsOpen = false"
+    />
+  </teleport>
 </template>
 
 <script>

diff --git a/src/views/Delegate.vue b/src/views/Delegate.vue
@@ -90,18 +90,17 @@
         </UiButton>
       </Block>
     </template>
-
-    <teleport to="#modal">
-      <ModalClearDelegate
-        v-if="loaded"
-        :open="modalOpen"
-        @close="modalOpen = false"
-        @reload="load"
-        :id="currentId"
-        :delegate="currentDelegate"
-      />
-    </teleport>
   </Layout>
+  <teleport to="#modal">
+    <ModalClearDelegate
+      v-if="loaded"
+      :open="modalOpen"
+      @close="modalOpen = false"
+      @reload="load"
+      :id="currentId"
+      :delegate="currentDelegate"
+    />
+  </teleport>
 </template>
 
 <script>

diff --git a/src/views/Proposal.vue b/src/views/Proposal.vue
@@ -170,29 +170,28 @@
         :network="space.network"
       />
     </template>
-
-    <teleport to="#modal">
-      <ModalConfirm
-        v-if="loaded"
-        :open="modalOpen"
-        @close="modalOpen = false"
-        @reload="loadProposal"
-        :space="space"
-        :proposal="proposal"
-        :id="id"
-        :selectedChoice="selectedChoice"
-        :totalScore="totalScore"
-        :scores="scores"
-        :snapshot="payload.snapshot"
-      />
-      <ModalStrategies
-        :open="modalStrategiesOpen"
-        @close="modalStrategiesOpen = false"
-        :space="space"
-        :strategies="space.strategies"
-      />
-    </teleport>
   </Layout>
+  <teleport to="#modal">
+    <ModalConfirm
+      v-if="loaded"
+      :open="modalOpen"
+      @close="modalOpen = false"
+      @reload="loadProposal"
+      :space="space"
+      :proposal="proposal"
+      :id="id"
+      :selectedChoice="selectedChoice"
+      :totalScore="totalScore"
+      :scores="scores"
+      :snapshot="payload.snapshot"
+    />
+    <ModalStrategies
+      :open="modalStrategiesOpen"
+      @close="modalStrategiesOpen = false"
+      :space="space"
+      :strategies="space.strategies"
+    />
+  </teleport>
 </template>
 
 <script>

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -197,27 +197,26 @@
         </UiButton>
       </Block>
     </template>
-
-    <teleport to="#modal">
-      <ModalNetworks
-        :open="modalNetworksOpen"
-        @close="modalNetworksOpen = false"
-        v-model="form.network"
-      />
-      <ModalSkins
-        :open="modalSkinsOpen"
-        @close="modalSkinsOpen = false"
-        v-model="form.skin"
-      />
-      <ModalStrategy
-        :open="modalStrategyOpen"
-        @close="modalStrategyOpen = false"
-        @add="handleSubmitAddStrategy"
-        :strategy="currentStrategy"
-        :strategyIndex="currentStrategyIndex"
-      />
-    </teleport>
   </Layout>
+  <teleport to="#modal">
+    <ModalNetworks
+      :open="modalNetworksOpen"
+      @close="modalNetworksOpen = false"
+      v-model="form.network"
+    />
+    <ModalSkins
+      :open="modalSkinsOpen"
+      @close="modalSkinsOpen = false"
+      v-model="form.skin"
+    />
+    <ModalStrategy
+      :open="modalStrategyOpen"
+      @close="modalStrategyOpen = false"
+      @add="handleSubmitAddStrategy"
+      :strategy="currentStrategy"
+      :strategyIndex="currentStrategyIndex"
+    />
+  </teleport>
 </template>
 
 <script>