Merge remote-tracking branch 'upstream/master' into fix-code-generation

mingnoi · Nov 6, 2019 · 8398db9 · 8398db9
2 parents 177585c + 7ac9c34
commit 8398db9
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 16 deletions.
diff --git a/components/collections/index.vue b/components/collections/index.vue
@@ -51,6 +51,11 @@ TODO:
           <i class="material-icons">import_export</i>
           <span>Import / Export</span>
         </button>
+        <a href="https://github.com/liyasthomas/postwoman/wiki/Collections" target="_blank">
+          <button class="icon" v-tooltip="'Wiki'">
+            <i class="material-icons">help</i>
+          </button>
+        </a>
       </div>
     </div>
 

diff --git a/pages/index.vue b/pages/index.vue
@@ -43,18 +43,32 @@
     <pw-section
       v-if="showPreRequestScript"
       class="orange"
-      label="Pre-Request • β (experimental)"
+      label="Pre-Request"
       ref="preRequest"
     >
-      <textarea
-        id="preRequestScript"
-        @keydown="formatRawParams"
-        rows="8"
-        v-model="preRequestScript"
-        v-textarea-auto-height="preRequestScript"
-        spellcheck="false"
-        placeholder="pw.environment.set('variable', 'value');"
-      ></textarea>
+      <ul>
+        <li>
+          <div class="flex-wrap">
+            <label for="generatedCode">JavaScript Code</label>
+            <div>
+              <a href="https://github.com/liyasthomas/postwoman/wiki/Pre-Request-Scripts" target="_blank">
+                <button class="icon" v-tooltip="'Wiki'">
+                  <i class="material-icons">help</i>
+                </button>
+              </a>
+            </div>
+          </div>
+          <textarea
+            id="preRequestScript"
+            @keydown="formatRawParams"
+            rows="8"
+            v-model="preRequestScript"
+            v-textarea-auto-height="preRequestScript"
+            spellcheck="false"
+            placeholder="pw.environment.set('variable', 'value');"
+          ></textarea>
+        </li>
+      </ul>
     </pw-section>
 
     <pw-section class="blue" label="Request" ref="request">

diff --git a/pages/settings.vue b/pages/settings.vue
@@ -57,12 +57,19 @@
     <pw-section class="blue" label="Proxy" ref="proxy">
       <ul>
         <li>
-          <span>
-            <pw-toggle
-              :on="settings.PROXY_ENABLED"
-              @change="toggleSetting('PROXY_ENABLED')"
-            >Proxy {{ settings.PROXY_ENABLED ? "enabled" : "disabled" }}</pw-toggle>
-          </span>
+          <div class="flex-wrap">
+            <span>
+              <pw-toggle
+                :on="settings.PROXY_ENABLED"
+                @change="toggleSetting('PROXY_ENABLED')"
+              >Proxy {{ settings.PROXY_ENABLED ? "enabled" : "disabled" }}</pw-toggle>
+            </span>
+            <a href="https://github.com/liyasthomas/postwoman/wiki/Proxy" target="_blank">
+              <button class="icon" v-tooltip="'Wiki'">
+                <i class="material-icons">help</i>
+              </button>
+            </a>
+          </div>
         </li>
       </ul>
       <ul class="info">