Merge branch 'fix/pouchdb-search-init' into develop

Author: jarrodek

.gitignore

@@ -30,6 +30,7 @@ Temporary Items
 !.vscode/extensions.json
 
 test/tests-exe-dir
-tasks/mac-app-distribution-cert.p12
-tasks/advancedrestclient.pfx
+advancedrestclient.pfx
+arc-mac-certs.p12
+certs.tar
 web_modules

.travis.yml

@@ -25,14 +25,13 @@ install:
 - npm install
 script: "./test/travis-build.sh"
 after_success:
-- openssl aes-256-cbc -K $encrypted_36ee0d5a95ce_key -iv $encrypted_36ee0d5a95ce_iv
-  -in tasks/advancedrestclient.pfx.enc -out tasks/advancedrestclient.pfx -d
-- openssl aes-256-cbc -K $encrypted_36ee0d5a95ce_key -iv $encrypted_36ee0d5a95ce_iv
-  -in tasks/mac-app-distribution-cert.p12.enc -out tasks/mac-app-distribution-cert.p12
-  -d
 - tasks/arc-publish.sh
 env:
   global:
   - secure: NQtwpDyG5qcPNDVJvHUn2LQKqAI3BYFektAQb7RyCD/eDlzA1b3Orv8nnOPmZ6H05YJBO00RRpvPDAc2944pm7XqY0HuDB0KBjUjb3kLAChiD9D7SKAnTJ4Lvjfyyf6eVXdDRBU5hTFKtsABfn/hIz+J/XVInDVaPOYIeTB70BsgMzkVlDj0hsyM2n7AvPzHupBsgpTL/hGNR0pm45oSV5c9mM72JGy84c6rAW01DLC7N6CgVkRNjAIQ4SYbZj57kO3WLXJ9Hryhqz5manq84R/j5Jg9XggR3+XCvloyFKXYO3n+ogw4zV3Ie81JDqbLJA4u2ayJ8h9wHaUWoSroW594xQchqsAVypnc/fgvHOxRrSozRDja3q9kKdJ/7nSOJ3k1jsy1gJEaDT0OO2py/OQ6F+1gfvMVmID30mL1m5UR9ARpwLyn+gezw4zvCt3JQv3WjzRZzsBhtCj5Mt75GRJK4bROsELO3tDLYzjewI/1tCw/xst097G5MCImVxepOrnlDguqij+0gpE10Pdwto/VUQBvlakLGXSF6CcatXiyIkwVpQEaKT9HGUHXXY51UoMwxS5CvzkvyAEzNam5/GRv6ifDJal0jHe4bLSUHJwC3CQDjZG3LVcIr+SpuEZ/Kq5/Kvr/1QoWAwoMBrCAkdoZmw7gyflm2d/pXsy9pBE=
   - secure: EBvXAmYLyceTXTWfjR8ygJBU1vGr+Ld9MgSTpBtS/pOjU4XOOH7flcGk+YbfFG/Gaejlpb50rejmvjBh/JBwRy9IUy3+EY1bNlQNLT+ywG/7y9i9BRrTkh6lnITWAA+fUDbqjgMqO77O5vN+DWKV9UcIp0u8WrrNJjJ2O2qJMdBVcRO3YMua7EXAAbEOkb2qHPqv8g3K5plhSlK2PnBJKcwrlIdVsSH9nrKhe++FOYwpyTX2AkqGY2BOom29wKtNy9CSy82XcmaofKF8VMn0AxYULmV0ocoNnyYO86Ex6PH/0iufpmuvPNlFIbaIXdzqa8SNqci7Z8nkizNAOW5VDdCoVtYIzgI5xHq/Oht56yN648fY/LNU9YrDG8L/71CPdGLWkYZjd+nrSY3E+nTJvYTsSvq6abZWpUU8Sss41SeX8kjVDNNbLOXb0vCOLLUTHwMx90yNNwtudpwmw1kPmZ8nAQCSN69Kb4opG90LoxSvFI61Oku2pQHb74pOrRbiMVdOTprSUFSQTnJ+D3PUIasjrh+pehNEQ0RzEE0Zj8yHq9xlFitpOilcAs+BohdjWLqMxPnJhMDHN/+m/5b8bLo8pILyfZCOM3ksYDR00b48rJPKRJbJsSXOIs292b8iFqpwoUFZxe3AMFNjlVsZBtdzpRyjtKheggT39Z4x+ZQ=
   - secure: vqjLjFS1r21KkSV6g5rrnHnEDvytxFZUZGglmVBfEMWMTLmUt6tpUOZ9fQhNK02Lwoqabx+jwqkqQH3n2Qh4rdgrHciaZz8rVpB+BNRbGpk8Av9pvJEFt5P2UUfjgthgBEUCAkcMlFAWvVgGoiaZPTLufxh9YZvjilG6QrZq6907+YZmxanFfQs/YpCwhG1S36BZ5ce3FxWk7z46DETD3LIe5ThImdmxruEv31F1pNNfInoDGg1qucQiZ2Icd6e+TK6tHH76KJbWc7kaJFSaubu1zIepmUNAxwdLN13nCPcxZaTkPs+LkCel3/C0hD/GLYEc48qC6zQDiQ61/JbUqtfZqShR5qpWhG0jETwpJqlUGNeWjO8KaPUcsolDy49Iiyy+ZMN8g7qiVcxqInLM3BT0Do3vyEZA3Z3WxXDF5wGeHy8PhUbFa3wZdRxtTgNoXCPJCPAzZIPYNUbby6auhWraBHU5UfyitH+CDP34FPaM9eG9TcJbEmdoA9rB9RYEH2T6OxGN/IntSuSP1cdkN/gi4c1ZsWlZSpCS9l5emakrGa4CMl7PKUBhefvKmn/UeYi+REHR2+iNOBYGBBAzfuwSn2iLg//Cg0SdDOs557vKFozVjM2u35Qp1zoncvEZWPSL3WaVGNzmlV35yjgculysZt1tEQpLWGIBmNjEa0c=
+before_install:
+- openssl aes-256-cbc -K $encrypted_c7c10d38055a_key -iv $encrypted_c7c10d38055a_iv
+  -in certs.tar.enc -out certs.tar -d
+- tar xvf certs.tar

appresources/themes/@advanced-rest-client/arc-electron-default-theme/arc-electron-default-theme.css

@@ -131,6 +131,8 @@ body {
                 0 9px 46px 8px rgba(0, 0, 0, 0.12),
                 0 11px 15px -7px rgba(0, 0, 0, 0.4);
   --bottom-sheet-box-shadow: var(--box-shadow-6dp);
+
+  --variables-preview-overlay-background-color: var(--primary-background-color);
 }
 
 body[narrow] {

certs.tar.enc

@@ -1,7 +1,7 @@
 {
   "name": "advanced-rest-client",
   "description": "The Advanced REST Client desktop application.",
-  "version": "14.0.0-alpha.5",
+  "version": "14.0.0-beta.3",
   "homepage": "https://advancedrestclient.com",
   "license": "Apache-2.0",
   "author": {
@@ -18,7 +18,7 @@
     "test": "npm run test-main && npm run test-renderer && npm run test-app",
     "test-main": "NODE_ENV=test ELECTRON_PATH=node_modules/.bin/electron electron-mocha test/**/*.main.spec.js scripts/packages/**/*.main.spec.js",
     "test-renderer": "NODE_ENV=test ELECTRON_PATH=node_modules/.bin/electron electron-mocha --renderer --require-main 'test/renderer-setup-paths.js' scripts/packages/**/*.renderer.spec.js",
-    "test-app": "NODE_ENV=test ELECTRON_PATH=node_modules/.bin/electron mocha test/**.app.spec.js",
+    "test-app": "NODE_ENV=test ELECTRON_PATH=node_modules/.bin/electron mocha test/**.app.spec.js --timeout 10000",
     "test-win-all": "npm run test-win-main && npm run test-win-renderer && npm run test-win-app",
     "test-win-main": "node node_modules/.bin/electron-mocha test/**/*.main.spec.js scripts/packages/**/*.main.spec.js",
     "test-win-renderer": "node node_modules/.bin/electron-mocha --renderer scripts/packages/**/*.renderer.spec.js",

package-lock.json

@@ -21,6 +21,7 @@ import styles from './AppStyles.js';
 import poweredIcon from './poweredby.js';
 window.PouchDB = PouchDB;
 window.PouchQuickSearch = PouchQuickSearch;
+window.PouchDB.plugin(window.PouchQuickSearch);
 window.marked = marked;
 window.Jexl = Jexl;
 /* eslint-disable max-len */

package.json

@@ -4,17 +4,35 @@ if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_BRANCH != 'master' ] && [ $TRAVI
 fi
 
 export CSC_NAME="Pawel Psztyc"
-export WIN_CSC_LINK="$(pwd)/tasks/advancedrestclient.pfx"
-export CSC_LINK="$(pwd)/tasks/mac-app-distribution-cert.p12"
+export WIN_CSC_LINK="advancedrestclient.pfx"
+export CSC_LINK="arc-mac-certs.p12"
+
+# echo "Decrypring Window key into: $WIN_CSC_LINK"
+# openssl aes-256-cbc -K "$encrypted_c7c10d38055a_key" -iv "$encrypted_c7c10d38055a_iv" -in tasks/advancedrestclient.pfx.enc -out "$WIN_CSC_LINK" -d
+if [ -f "$WIN_CSC_LINK" ]; then
+  echo "Windows sign key ready."
+else
+  echo "Windows key is not ready."
+  exit -1
+fi
+
+# echo "Decrypring Mac key into: $CSC_LINK"
+# openssl aes-256-cbc -K "$encrypted_c7c10d38055a_key" -iv "$encrypted_c7c10d38055a_iv" -in tasks/mac-app-distribution-cert.p12.enc -out "$CSC_LINK" -d
+if [ -f "$CSC_LINK" ]; then
+  echo "Mac sign key ready."
+else
+  echo "Mac key is not ready."
+  exit -1
+fi
 
 if [ "$TRAVIS_OS_NAME" == "linux" ]; then
   docker run --rm \
-    --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
+    --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|WIN_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
     -v ${PWD}:/project \
     -v ~/.cache/electron:/root/.cache/electron \
     -v ~/.cache/electron-builder:/root/.cache/electron-builder \
     electronuserland/builder:wine \
-    /bin/bash -c "./node_modules/.bin/electron-builder --linux --win"
+    /bin/bash -c "./node_modules/.bin/electron-builder --linux --win --publish always"
 else
-  /bin/bash -c "./node_modules/.bin/electron-builder --mac"
+  /bin/bash -c "./node_modules/.bin/electron-builder --mac --publish always"
 fi