From c5fef9442a3ce191573c39851b1478fe06645a5c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Oct 2019 10:47:01 +0530 Subject: [PATCH] fix: SetupWizard - White background - Placeholders for inputs --- models/doctype/SetupWizard/SetupWizard.js | 5 + package.json | 5 +- src/components/Sidebar.vue | 2 +- src/pages/DatabaseSelector.vue | 4 +- src/pages/SetupWizard/SetupWizard.vue | 2 +- yarn.lock | 633 ++++++++++++++++++---- 6 files changed, 545 insertions(+), 106 deletions(-) diff --git a/models/doctype/SetupWizard/SetupWizard.js b/models/doctype/SetupWizard/SetupWizard.js index 0a737214..be9c1d28 100644 --- a/models/doctype/SetupWizard/SetupWizard.js +++ b/models/doctype/SetupWizard/SetupWizard.js @@ -14,6 +14,7 @@ module.exports = { fieldname: 'country', label: 'Country', fieldtype: 'AutoComplete', + placeholder: 'India', required: 1, getList: () => Object.keys(countryList).sort() }, @@ -22,6 +23,7 @@ module.exports = { fieldname: 'fullname', label: 'Name', fieldtype: 'Data', + placeholder: 'John Doe', required: 1 }, @@ -29,6 +31,7 @@ module.exports = { fieldname: 'email', label: 'Email', fieldtype: 'Data', + placeholder: 'john@doe.com', required: 1, inputType: 'email' }, @@ -36,6 +39,7 @@ module.exports = { { fieldname: 'companyName', label: 'Company Name', + placeholder: 'Acme Inc', fieldtype: 'Data', required: 1 }, @@ -84,6 +88,7 @@ module.exports = { fieldname: 'currency', label: 'Currency', fieldtype: 'Data', + placeholder: 'INR', formula: doc => { if (!doc.country) return; return countryList[doc.country].currency; diff --git a/package.json b/package.json index 86432c7e..ed8ffedf 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,13 @@ "cross-env": "^5.2.0", "file-saver": "^2.0.2", "frappe-charts": "^1.2.4", - "frappejs": "0.0.10", + "frappejs": "https://github.com/frappe/frappejs", "nodemailer": "^4.7.0", "popper.js": "^1.14.4", "vue-color": "^2.7.0", "vue-toasted": "^1.1.25" + }, + "devDependencies": { + "electron-builder": "^21.2.0" } } diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 9249e000..dcfe6e3c 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -1,7 +1,7 @@