merge

Author: orcuntuna

README.md

@@ -10,6 +10,10 @@
 
 ## Install and Usage
 
+<a href="https://snapcraft.io/guvercin">
+  <img alt="Get it from the Snap Store" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg" />
+</a>
+
 ```sh
 git clone https://github.com/orcuntuna/guvercin.git
 cd guvercin
@@ -31,7 +35,7 @@ npm start
 👤 **Orçun Tuna**
 
 * Website: https://www.arkkod.com/
-* Twitter: [@\_tunaorcun](https://twitter.com/tunaorcun\_)
+* Twitter: [@tunaorcun\_](https://twitter.com/tunaorcun\_)
 * Github: [@orcuntuna](https://github.com/orcuntuna)
 
 👤 **Murat Ahmet Korkmaz**

main.js

@@ -1,7 +1,9 @@
-const { app, BrowserWindow, Menu, shell, ipcMain, ipcRenderer } = require('electron');
+const { app, BrowserWindow, Menu, shell, ipcMain, ipcRenderer, clipboard } = require('electron');
 
 let win;
 
+const isMac = process.platform === 'darwin'
+
 function createWindow () {
   win = new BrowserWindow({
     width: 800,
@@ -44,6 +46,17 @@ function createWindow () {
         }
       ]
     },
+    {
+      label: "Edit",
+      submenu: [
+        { label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
+        { label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
+        { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
+        { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
+        { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
+        { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
+      ]
+    },
     {
       label: "Go",
       submenu: [

package.json

@@ -39,7 +39,8 @@
     "request",
     "response",
     "postman",
-    "güvercin"
+    "güvercin",
+    "response"
   ],
   "build": {
     "appId": "com.arkkod.guvercin",

pages/home.html

@@ -170,6 +170,9 @@
                 </ul>
                 <div class="tabs">
                   <div class="tab" id="tab-response-data" tab="response-data">
+                    <div id="loading" class="loading" style="display: none;">
+                      Sending Request...
+                    </div>
                     <div id="response-editor"></div>
                   </div>
                   <div class="tab" id="tab-response-details" tab="response-details">

renderers/collection.js

@@ -116,15 +116,19 @@ $(function () {
             $("#tab-headers .header-list").html("");
             $("#tab-headers .header-list").append(create_header_template(element.key, element.value)); 
         });
-        $("#tab-headers .header-list").append(create_header_template()); 
+        if (collection_request_headers.length > 0) {
+            $("#tab-headers .header-list").append(create_header_template()); 
+        }
 
 
         collection_request_parameters.forEach(element => {
             element = JSON.parse(element);
             $("#tab-params .param-list").html("");
             $("#tab-params .param-list").append(create_parameter_template(element.key, element.value));
         });
-        $("#tab-params .param-list").append(create_parameter_template());
+        if (collection_request_parameters.length > 0) {
+            $("#tab-params .param-list").append(create_parameter_template());
+        }
         body_editor.clearSelection();
     });
 

renderers/home.js

@@ -1,11 +1,16 @@
+const remote = require("electron").remote;
 const Swal = require('sweetalert2');
 const ace = require('ace-builds/src/ace');
 var xml_beautify = require('xml-formatter');
 const low = require('lowdb');
 const FileSync = require('lowdb/adapters/FileSync');
 const { ipcRenderer, ipcMain } = require('electron');
+const path = require("path");
 
-const adapter = new FileSync('db.json');
+const app = remote.app;
+const db_path = path.join(app.getPath('home'), "/.guvercin.json");
+
+const adapter = new FileSync(db_path);
 const db = low(adapter);
 
 db.defaults({ history: [], collection: [] }).write();

renderers/send.js

@@ -1,10 +1,9 @@
 function validateURL(){
     var url = $("#url").val();
-    if(validate({website: url}, {website: {url: true}}) != undefined){
-        return false;
-    }else{
+    if(url){
         return true;
     }
+    return false;
 }
 
 var response_codes = [
@@ -48,6 +47,9 @@ $(function(){
 
     $("#request-form").on("submit", function(e){
         e.preventDefault();
+        $("#send").attr("disabled", "disabled");
+        $("#loading").show();
+        $("#response-editor").hide();
         if(validateURL()){
 
             params.url = $("#url").val();
@@ -104,6 +106,10 @@ $(function(){
             }).then(data => {
 
                 clearInterval(response_timer);
+                $("#send").removeAttr("disabled");
+                $("#loading").hide();
+                $("#response-editor").show();
+
                 /* History Save */
                 last_history = db.get("history").value();
 
@@ -183,6 +189,9 @@ $(function(){
 
             }).catch(err => {
                 clearInterval(response_timer);
+                $("#send").removeAttr("disabled");
+                $("#loading").hide();
+                $("#response-editor").show();
                 console.log(err);
                 response_editor.setValue("");
                 $("#response-headers").html("");
@@ -194,6 +203,9 @@ $(function(){
             });
 
         }else{
+            $("#send").removeAttr("disabled");
+            $("#loading").hide();
+            $("#response-editor").show();
             $("#request-alert span.message").html("<strong>Hata!</strong> Girdğiniz istek adresi geçerli bir URL değil.");
             $("#request-alert").show()
         }

renderers/settings.js

@@ -110,6 +110,11 @@ function setAceOption(user_ace_option) {
     $("#body-content-type option[value='" + user_ace_option + "']").attr("selected", "selected");
 }
 
+function setAceThemeOption(theme_option) {
+    $('#body-editor-theme option:selected').removeAttr('selected');
+    $("#body-editor-theme option[value='" + theme_option + "']").attr("selected", "selected");
+}
+
 $(function () {
 
     user_theme = window.localStorage.getItem("theme");
@@ -121,7 +126,8 @@ $(function () {
         body_editor.setTheme(require('ace-builds/src/theme-tomorrow_night_eighties'));
         response_editor.setTheme(require('ace-builds/src/theme-tomorrow_night_eighties'));
         $('#theme option:selected').removeAttr('selected');
-        $("#theme option[value='dark']").attr("selected", "selected");
+        $("#theme option[value='" + user_theme + "']").attr("selected", "selected");
+        setAceThemeOption("dark");
     }
 
 
@@ -136,12 +142,14 @@ $(function () {
                 window.localStorage.setItem("theme", "dark");
                 body_editor.setTheme(require('ace-builds/src/theme-tomorrow_night_eighties'));
                 response_editor.setTheme(require('ace-builds/src/theme-tomorrow_night_eighties'));
+                setAceThemeOption("dark");
             }
             else if (theme_option == "light") {
                 $("#theme-link").attr("href", "../styles/empty.css");
                 window.localStorage.setItem("theme", "light");
                 body_editor.setTheme(require('ace-builds/src/theme-xcode'));
                 response_editor.setTheme(require('ace-builds/src/theme-xcode'));
+                setAceThemeOption("light");
             }
         }
     });

styles/dark-theme.css

@@ -67,4 +67,8 @@ section.request-bar,
     background-color: #666;
     color: #fff;
     border-color: transparent;
+}
+
+.xdsoft_autocomplete_dropdown{
+    color: #333;
 }

styles/home.css

@@ -273,4 +273,16 @@ input, button, select, a{
 .header-label {
     font-weight: bold;
     margin-bottom: 8px;
+}
+
+#tab-response-data {
+    position: relative;
+}
+
+.loading {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    font-weight: bold;
+    font-size: 20px;
 }