From 73818195b3a13fadfba713226fad58225296f234 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 12 Feb 2020 17:47:51 +0300
Subject: [PATCH] Render nested settings as a tree

---
 src/views/settings/components/Inputs.vue      | 40 ++++++++++++++++++-
 .../inputComponents/ProxyUrlInput.vue         |  2 +-
 src/views/settings/styles/main.scss           |  7 ++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue
index d7f6def4..4325dbbf 100644
--- a/src/views/settings/components/Inputs.vue
+++ b/src/views/settings/components/Inputs.vue
@@ -1,7 +1,29 @@
 <template>
   <div class="input-container">
-    <el-form-item :label-width="customLabelWidth" :class="labelClass" class="settings-input">
-      <span slot="label">
+    <div v-if="setting.type === 'keyword'" style="width:100%">
+      <el-form-item :label-width="customLabelWidth" :class="labelClass" :style="`margin-left:${margin}px;margin-bottom:0`" class="settings-input">
+        <span slot="label">
+          {{ setting.label }}
+          <el-tooltip v-if="canBeDeleted && isDesktop" :content="$t('settings.removeFromDB')" placement="bottom-end">
+            <el-button icon="el-icon-delete" circle size="mini" style="margin-left:5px" @click="removeSetting"/>
+          </el-tooltip>
+        </span>
+      </el-form-item>
+      <el-form-item v-for="subSetting in setting.children" :key="subSetting.key" class="settings-input has-nested">
+        <inputs
+          :setting-group="settingGroup"
+          :setting-parent="[...settingParent, subSetting]"
+          :setting="subSetting"
+          :data="data[setting.key]"
+          :custom-label-width="isDesktop ? 'auto' : '100px'"
+          :label-class="'center-label'"
+          :input-class="'keyword-inner-input'"
+          :margin="margin + 20"
+          :nested="true"/>
+      </el-form-item>
+    </div>
+    <el-form-item v-if="setting.type !== 'keyword'" :label-width="customLabelWidth" :class="labelClass" class="settings-input">
+      <span slot="label" :style="`margin-left:${margin}px`">
         {{ setting.label }}
         <el-tooltip v-if="canBeDeleted && isDesktop" :content="$t('settings.removeFromDB')" placement="bottom-end">
           <el-button icon="el-icon-delete" circle size="mini" style="margin-left:5px" @click="removeSetting"/>
@@ -56,6 +78,7 @@
       </el-input>
       <div v-if="setting.type === 'keyword'">
         <div v-for="subSetting in setting.children" :key="subSetting.key">
+          <!-- {{ [...settingParent, subSetting].map(s => s.label) }} -->
           <inputs
             :setting-group="settingGroup"
             :setting-parent="[...settingParent, subSetting]"
@@ -80,6 +103,7 @@
       <div
         v-if="setting.description && setting.type !== 'keyword'"
         :class="inputClass"
+        :style="`margin-left:${margin}px`"
         class="expl"
         v-html="getFormattedDescription(setting.description)"/>
     </el-form-item>
@@ -136,6 +160,13 @@ export default {
       },
       required: false
     },
+    margin: {
+      type: Number,
+      default: function() {
+        return 0
+      },
+      required: false
+    },
     nested: {
       type: Boolean,
       default: function() {
@@ -162,6 +193,11 @@ export default {
       required: false
     }
   },
+  data() {
+    return {
+      currentMargin: 0
+    }
+  },
   computed: {
     canBeDeleted() {
       const { group, key } = this.settingGroup
diff --git a/src/views/settings/components/inputComponents/ProxyUrlInput.vue b/src/views/settings/components/inputComponents/ProxyUrlInput.vue
index 83829bd5..dc9d3b24 100644
--- a/src/views/settings/components/inputComponents/ProxyUrlInput.vue
+++ b/src/views/settings/components/inputComponents/ProxyUrlInput.vue
@@ -3,7 +3,7 @@
     <el-input
       :value="proxyUrlData.host"
       placeholder="host (e.g. localhost or 127.0.0.1)"
-      class="proxy-url-value-input"
+      class="proxy-url-host-input"
       @input="updateProxyUrl($event, 'host')"/> :
     <el-input
       :value="proxyUrlData.port"
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index 04d71905..f94c67cd 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -4,6 +4,9 @@
   }
   .center-label label {
     text-align: center;
+    span {
+      float: left;
+    }
   }
   .code {
     background-color: #adbed67a;
@@ -151,6 +154,10 @@
     width: 20%;
     margin-right: 8px
   }
+  .proxy-url-host-input {
+    width: 35%;
+    margin-right: 10px
+  }
   .proxy-url-value-input {
     width: 35%;
     margin-left: 8px;