From c0c7036ada0ae1c578758f69594f22078cceae09 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Mon, 9 Sep 2019 11:27:00 +0530
Subject: [PATCH] :art: Fixed some UI glitch

---
 assets/css/styles.scss  | 26 +++++++++++++-----
 assets/js/curlparser.js |  2 +-
 components/history.vue  |  2 +-
 components/modal.vue    | 59 +++++++++++++++++------------------------
 pages/index.vue         | 14 +++++-----
 5 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/assets/css/styles.scss b/assets/css/styles.scss
index b276105cb..d746da607 100644
--- a/assets/css/styles.scss
+++ b/assets/css/styles.scss
@@ -17,6 +17,10 @@ $responsiveWidth: 720px;
   background-color: rgba(0, 0, 0, .5);
 }
 
+::placeholder {
+  color: var(--fg-color);
+}
+
 * {
   box-sizing: border-box;
   outline: 0;
@@ -194,6 +198,14 @@ fieldset.red legend {
   color: #ff5555;
 }
 
+fieldset.yellow {
+  border-color: #f1fa8c;
+}
+
+fieldset.yellow legend {
+  color: #f1fa8c;
+}
+
 .hidden {
   display: none;
 }
@@ -204,7 +216,7 @@ option,
 textarea,
 pre {
   margin: 4px;
-  padding: 8px 16px;
+  padding: 8px;
   border-radius: 4px;
   width: calc(100% - 8px);
   background-color: var(--bg-dark-color);
@@ -213,12 +225,6 @@ pre {
   font-size: 18px;
   font-family: monospace;
   transition: all 0.2s ease-in-out;
-}
-
-select,
-input,
-option {
-  height: 41px;
 
   &:not([readonly]):hover,
   &:not([readonly]):focus {
@@ -227,6 +233,12 @@ option {
   }
 }
 
+select,
+input,
+option {
+  height: 41px;
+}
+
 input[type="checkbox"] {
   display: none;
 
diff --git a/assets/js/curlparser.js b/assets/js/curlparser.js
index 0b2c52f1f..710e92f7b 100644
--- a/assets/js/curlparser.js
+++ b/assets/js/curlparser.js
@@ -220,4 +220,4 @@ function parseCurlCommand(curlCommand) {
 }
 
 
-export default parseCurlCommand;
\ No newline at end of file
+export default parseCurlCommand;
diff --git a/components/history.vue b/components/history.vue
index 592b5571e..eb09bb796 100644
--- a/components/history.vue
+++ b/components/history.vue
@@ -3,7 +3,7 @@
     <ul>
       <li id="filter-history">
         <label for="filter-history-input">Search History</label>
-        <input id="filter-history-input" type="text" :readonly="history.length === 0 || isClearingHistory" v-model="filterText">
+        <input id="filter-history-input" type="text" placeholder="search history" :readonly="history.length === 0 || isClearingHistory" v-model="filterText">
       </li>
     </ul>
     <virtual-list class="virtual-list" :class="{filled: filteredHistory.length}" :size="89" :remain="Math.min(5, filteredHistory.length)">
diff --git a/components/modal.vue b/components/modal.vue
index 2edeaa518..8f6ebeba8 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -5,17 +5,13 @@
         <div class="modal-wrapper">
           <div class="modal-container">
             <div class="modal-header">
-              <slot name="header">default header</slot>
+              <slot name="header"></slot>
             </div>
-
             <div class="modal-body">
-              <slot name="body">default body</slot>
+              <slot name="body"></slot>
             </div>
-
             <div class="modal-footer">
-              <slot name="footer">
-                default footer
-              </slot>
+              <slot name="footer"></slot>
             </div>
           </div>
         </div>
@@ -23,50 +19,43 @@
     </transition>
   </div>
 </template>
-
 <style scoped>
 .modal-mask {
   position: fixed;
-  z-index: 9998;
+  z-index: 9;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.5);
-  display: table;
-  transition: opacity 0.3s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.2s ease;
 }
 
 .modal-wrapper {
-  display: table-cell;
-  vertical-align: middle;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-grow: 1;
+  max-width: 800px;
 }
 
 .modal-container {
-  width: 40rem;
-  height: 30rem;
-  margin: 0px auto;
-  padding: 20px 30px;
-  background-color: #fff;
-  border-radius: 2px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
-  transition: all 0.3s ease;
-  font-family: Helvetica, Arial, sans-serif;
-  background-color: rgba(0, 0, 0, 0.95);
-}
-
-.modal-header h3 {
-  margin-top: 0;
-  color: #42b983;
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+  margin: 8px;
+  padding: 16px;
+  transition: all 0.2s ease;
+  background-color: var(--bg-color);
+  border: 2px solid var(--ac-color);
+  border-radius: 4px;
 }
 
 .modal-body {
-  height: 20rem;
-  margin: 20px 0;
-}
-
-.modal-default-button {
-  float: right;
+  margin: 8px 0;
 }
 
 /*
@@ -91,4 +80,4 @@
   -webkit-transform: scale(1.1);
   transform: scale(1.1);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/index.vue b/pages/index.vue
index f0c7d70ae..894f90668 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="page">
-    <pw-section class="blue" label="Import" ref="import">
-      <button id="show-modal" @click="showModal = true">Import</button>
+    <pw-section class="yellow" label="Import" ref="import">
+      <button id="show-modal" @click="showModal = true">Import cURL</button>
       <import-modal v-if="showModal" @close="showModal = false">
         <div slot="header">
-          <h2>Import cURL</h2>
+          <h3 class="title">Import cURL</h3>
         </div>
         <div slot="body">
-          <textarea id="import-text" style="height:20rem">
+          <textarea id="import-text" autofocus rows="8">
           </textarea>
         </div>
         <div slot="footer">
@@ -90,7 +90,7 @@
               </button>
             </div>
           </div>
-          <textarea ref="generatedCode" name="generatedCode" style="font-family: monospace;" rows="16">{{requestCode}}</textarea>
+          <textarea ref="generatedCode" name="generatedCode" rows="16">{{requestCode}}</textarea>
         </li>
       </ul>
     </pw-section>
@@ -135,7 +135,7 @@
         </ul>
       </div>
       <div v-else>
-        <textarea @keydown="formatRawParams" rows="16" style="font-family: monospace;" v-model="rawParams" v-textarea-auto-height="rawParams"></textarea>
+        <textarea @keydown="formatRawParams" rows="16" v-model="rawParams" v-textarea-auto-height="rawParams"></textarea>
       </div>
     </pw-section>
     <pw-section class="purple" id="response" label="Response" ref="response">
@@ -803,12 +803,10 @@
         observer.observe(requestElement);
       },
       handleImport () {
-        console.log("handleimport");
         let textarea = document.getElementById("import-text")
         let text = textarea.value;
         try {
          let parsedCurl = parseCurlCommand(text);
-         console.log(parsedCurl); 
          this.url=parsedCurl.url.replace(/\"/g,"").replace(/\'/g,"");
          this.url = this.url[this.url.length -1] == '/' ? this.url.slice(0, -1): this.url;
          this.path = "";