From cd99acf72674335aa0d6998311ae3ff67ed29d43 Mon Sep 17 00:00:00 2001
From: Vyacheslav Nagel <v9gel@mail.ru>
Date: Mon, 10 Jul 2023 00:49:04 +0700
Subject: [PATCH] refactoring

---
 src/App.vue                  | 95 ++----------------------------------
 src/components/Container.vue | 16 ++++++
 src/components/Switch.vue    | 77 +++++++++++++++++++++++++++++
 src/style.css                |  7 +++
 4 files changed, 105 insertions(+), 90 deletions(-)
 create mode 100644 src/components/Container.vue
 create mode 100644 src/components/Switch.vue

diff --git a/src/App.vue b/src/App.vue
index f78cc5f..e2612aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,6 +6,8 @@ import Button from "./components/Button.vue";
 import Page from "./components/Page.vue";
 import Input from "./components/Input.vue";
 import Canvas from "./components/Canvas.vue";
+import Switch from './components/Switch.vue';
+import Container from './components/Container.vue';
 import { ButtonSize, InputType } from "./types";
 import { useStore } from "./store";
 import { storeToRefs } from "pinia";
@@ -40,7 +42,7 @@ const savePng = async () => {
 </script>
 
 <template>
-  <div class="container">
+  <Container>
     <Sidebar>
       <SidebarBlock title="Фон">
         <Input v-model="imageBackgroundColor" :type="InputType.Color">Цвет {{ store.imageBackgroundColor }}</Input>
@@ -62,10 +64,7 @@ const savePng = async () => {
       </SidebarBlock>
 
       <SidebarBlock title="Поля">
-        <label class="switch">
-          <input v-model="marginEnable" type="checkbox">
-          <span class="slider round"></span>
-        </label>
+        <Switch v-model="marginEnable"/>
         <div v-if="marginEnable">
           <Input v-model="marginColor" :type="InputType.Color">
           Цвет {{ marginColor }}
@@ -99,92 +98,8 @@ const savePng = async () => {
         </ButtonsBar>
       </SidebarBlock>
     </Sidebar>
-  </div>
+  </Container>
 </template>
 
 <style scoped>
-#app,
-body,
-html {
-  height: 100vh;
-  width: 100vw;
-}
-
-.container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100vh;
-  width: 100vw;
-  font-family: MPLUS1p, sans-serif;
-}
-
-body {
-  background-color: aqua;
-}
-
-/* The switch - the box around the slider */
-.switch {
-  position: relative;
-  display: inline-block;
-  width: 60px;
-  height: 27px;
-  margin: 10px 0;
-}
-
-/* Hide default HTML checkbox */
-.switch input {
-  opacity: 0;
-  width: 0;
-  height: 0;
-}
-
-/* The slider */
-.slider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #ccc;
-  -webkit-transition: .4s;
-  transition: .4s;
-  border: 1px solid #5E503F;
-}
-
-.slider:before {
-  position: absolute;
-  content: "";
-  height: 17px;
-  width: 17px;
-  left: 5px;
-  bottom: 4px;
-  background-color: white;
-  -webkit-transition: .4s;
-  transition: .4s;
-}
-
-input:checked+.slider {
-  background-color: #EAE0D5;
-}
-
-input:focus+.slider {
-  box-shadow: 0 0 1px #EAE0D5;
-}
-
-input:checked+.slider:before {
-  -webkit-transform: translateX(31px);
-  -ms-transform: translateX(31px);
-  transform: translateX(31px);
-}
-
-/* Rounded sliders */
-.slider.round {
-  border-radius: 34px;
-}
-
-.slider.round:before {
-  border-radius: 50%;
-}
 </style>
diff --git a/src/components/Container.vue b/src/components/Container.vue
new file mode 100644
index 0000000..05ac561
--- /dev/null
+++ b/src/components/Container.vue
@@ -0,0 +1,16 @@
+<template>
+  <div class="container">
+    <slot></slot>
+  </div>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  width: 100vw;
+  font-family: MPLUS1p, sans-serif;
+}
+</style>
diff --git a/src/components/Switch.vue b/src/components/Switch.vue
new file mode 100644
index 0000000..ef0a92c
--- /dev/null
+++ b/src/components/Switch.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+const modelValue = defineModel<boolean>();
+</script>
+
+<template>
+  <label class="switch">
+    <input v-model="modelValue" type="checkbox">
+    <span class="slider round"></span>
+  </label>
+</template>
+
+<style scoped>
+/* The switch - the box around the slider */
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 60px;
+  height: 27px;
+  margin: 10px 0;
+}
+
+/* Hide default HTML checkbox */
+.switch input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+/* The slider */
+.slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: .4s;
+  transition: .4s;
+  border: 1px solid #5E503F;
+}
+
+.slider:before {
+  position: absolute;
+  content: "";
+  height: 17px;
+  width: 17px;
+  left: 5px;
+  bottom: 4px;
+  background-color: white;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+input:checked+.slider {
+  background-color: #EAE0D5;
+}
+
+input:focus+.slider {
+  box-shadow: 0 0 1px #EAE0D5;
+}
+
+input:checked+.slider:before {
+  -webkit-transform: translateX(31px);
+  -ms-transform: translateX(31px);
+  transform: translateX(31px);
+}
+
+/* Rounded sliders */
+.slider.round {
+  border-radius: 34px;
+}
+
+.slider.round:before {
+  border-radius: 50%;
+}
+</style>
diff --git a/src/style.css b/src/style.css
index fd095ce..ba35280 100644
--- a/src/style.css
+++ b/src/style.css
@@ -1,3 +1,10 @@
+#app,
+body,
+html {
+  height: 100vh;
+  width: 100vw;
+}
+
 @font-face {
   font-family: "MPLUS1p";
   font-style: normal;