Merge pull request #42 from hql287/update-settings-tour-window

Update settings tour window
hql287 · Dec 5, 2017 · a9dbd95 · a9dbd95
2 parents b77cf45 + a39e179
commit a9dbd95
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 63 deletions.
diff --git a/app/components/layout/AppUpdate.jsx b/app/components/layout/AppUpdate.jsx
@@ -52,12 +52,10 @@ class AppUpdate extends Component {
   }
 
   componentDidMount() {
-    // Checkinf For Update
     ipc.on('update-checking', event => {
       this.setState({message: 'Checking for update'});
     });
 
-    // Update available, ask user to download or not
     ipc.on('update-available', () => {
       openDialog(
         {
@@ -70,7 +68,6 @@ class AppUpdate extends Component {
       );
     });
 
-    // Update Not Available
     ipc.on('update-not-available', () => {
       openDialog({
         type: 'info',
@@ -80,7 +77,6 @@ class AppUpdate extends Component {
       this.removeMessage();
     });
 
-    // Update Error
     ipc.on('update-error', (event, error) => {
       openDialog({
         type: 'warning',
@@ -90,7 +86,6 @@ class AppUpdate extends Component {
       this.removeMessage();
     });
 
-    // Update Download Confirm
     ipc.on('update-download-confirmed', (event, index) => {
       // Start the download
       if (index === 0) {
@@ -106,14 +101,12 @@ class AppUpdate extends Component {
       }
     });
 
-    // Download Progress
     ipc.on('update-download-progress', (event, progressMessage) => {
       this.setState({
         message: progressMessage
       });
     });
 
-    // Update Downloaded
     ipc.on('update-downloaded', () => {
       // Update Message
       this.setState({
@@ -131,7 +124,6 @@ class AppUpdate extends Component {
       );
     });
 
-    // Upgrade Confirmation
     ipc.on('upgrade-confirmed', (event, index) => {
       if (index === 0) {
         ipc.send('restart-app');

diff --git a/app/components/settings/AppSettings.jsx b/app/components/settings/AppSettings.jsx
@@ -71,61 +71,50 @@ class AppSettings extends Component {
     return (
       <div>
         <div className="row">
-          <div className="pageItem col-md-6">
-            <label className="itemLabel">Export Directory</label>
-            <div className="input-group">
-              <input
-                className="form-control"
-                name="exportDir"
-                type="text"
-                value={this.state.exportDir}
-                disabled
-              />
-              <a
-                href="#"
-                className="input-group-customized "
-                onClick={this.selectExportDir}>
-                <i className="ion-folder" />
-              </a>
-            </div>
-          </div>
+          <div className="col-md-12">
+            <div className="pageItem">
+              <label className="itemLabel">Export Directory</label>
 
-          <div className="pageItem col-md-6">
-            <label className="itemLabel">Template</label>
-            <select
-              name="template"
-              value={this.state.template}
-              onChange={this.handleInputChange}>
-              <option value="minimal">Minimal</option>
-              <option value="business">Business</option>
-              {/*
-                <option value="modern">Modern</option>
-              */}
-            </select>
+              <div className="input-group">
+                <input
+                  className="form-control"
+                  name="exportDir"
+                  type="text"
+                  value={this.state.exportDir}
+                  disabled
+                />
+                <a
+                  href="#"
+                  className="input-group-customized "
+                  onClick={this.selectExportDir}>
+                  <i className="ion-folder" />
+                </a>
+              </div>
+            </div>
           </div>
         </div>
 
         <div className="row">
           <div className="col-md-6">
             <div className="pageItem">
-              <label className="itemLabel">Default Language</label>
+              <label className="itemLabel">Default Currency</label>
               <select
-                name="language"
-                value={this.state.language}
+                name="currency"
+                value={this.state.currency}
                 onChange={this.handleInputChange}>
-                <option value="en">English</option>
-                <option value="vi">Vietnamese</option>
+                {currenciesOptions}
               </select>
             </div>
           </div>
           <div className="col-md-6">
             <div className="pageItem">
-              <label className="itemLabel">Default Currency</label>
+              <label className="itemLabel">Default Template</label>
               <select
-                name="currency"
-                value={this.state.currency}
+                name="template"
+                value={this.state.template}
                 onChange={this.handleInputChange}>
-                {currenciesOptions}
+                <option value="minimal">Minimal</option>
+                <option value="business">Business</option>
               </select>
             </div>
           </div>
@@ -146,7 +135,7 @@ class AppSettings extends Component {
           </div>
           <div className="col-md-6">
             <div className="pageItem">
-              <label className="itemLabel">Muted?</label>
+              <label className="itemLabel">Mute Sound?</label>
               <label className="switch">
                 <input
                   name="muted"

diff --git a/app/renderers/menu.js b/app/renderers/menu.js
@@ -155,13 +155,6 @@ let menuTemplate = [
           ipc.send('start-tour');
         },
       },
-      {
-        label: 'Check For Updates',
-        accelerator: 'CmdOrCtrl+U',
-        click() {
-          ipc.send('check-for-updates');
-        },
-      },
       {
         label: 'Learn More',
         click() {
@@ -178,6 +171,14 @@ if (process.platform === 'darwin') {
     submenu: [
       {role: 'about'},
       {type: 'separator'},
+      {
+        label: 'Check For Updates',
+        accelerator: 'CmdOrCtrl+U',
+        click() {
+          ipc.send('check-for-updates');
+        },
+      },
+      {type: 'separator'},
       {role: 'services', submenu: []},
       {type: 'separator'},
       {role: 'hide'},

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "Manta",
   "homepage": "https://manta.life",
   "productName": "Manta",
-  "version": "1.0.1",
+  "version": "1.0.0",
   "license": "ISC",
   "description": "Painless invoicing with customizable templates",
   "author": {

diff --git a/tour/components/slides/Preview.jsx b/tour/components/slides/Preview.jsx
@@ -9,8 +9,9 @@ Manta comes with professional looking templates which can be customized further
 function Preview() {
   return (
     <Slide
-      fromColor="#FFD200"
-      toColor="#F7971E"
+      inverted
+      fromColor="#5691c8"
+      toColor="#457fca"
       heading="Step 2. Customize"
       description={description}
       imgSrc={path.resolve(__dirname, './imgs/Preview.svg')}

diff --git a/tour/components/slides/Save.jsx b/tour/components/slides/Save.jsx
@@ -9,13 +9,12 @@ const description = `
 function Save() {
   return (
     <Slide
-      inverted
-      fromColor="#E52D27"
-      toColor="#B31217"
+      fromColor="#FFD200"
+      toColor="#F7971E"
       heading="3. Save"
       description={description}
       imgSrc={path.resolve(__dirname, './imgs/Save.svg')}
-      imgSize="360px"
+      imgSize="460px"
     />
   );
 }

diff --git a/tour/imgs/Save.svg b/tour/imgs/Save.svg