Merge pull request #89 from Danger-Noodle/master

Beta v2.0.0

Author: darryl-amour

.gitignore

@@ -483,4 +483,7 @@ ASALocalRun/
 React-Proto.dmg
 installers/
 
+# yarn primary pkg mgr. npm lock file
+package-lock.json
+
 # End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn

README.md

@@ -6,7 +6,10 @@
 
 React-Proto allows the user to visualize/setup their application architecture upfront and eject this architecture as application files either into a previous project or a new create-react-app project or a starter template from any repository.
 
-Download for [MacOS](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto-1.0.0.dmg), [Windows](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto.Web.Setup.1.0.0.exe), [Linux](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/react-proto_1.0.0_amd64.deb).
+Download for v1.0.0 [MacOS](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto-1.0.0.dmg), [Windows](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto.Web.Setup.1.0.0.exe), [Linux](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/react-proto_1.0.0_amd64.deb).
+
+Download for v2.0.0-beta [MacOS](https://github.com/React-Proto/react-proto/releases/download/v2.0.0-beta/React-Proto-2.0.0.dmg), [Windows](https://github.com/React-Proto/react-proto/releases/download/v2.0.0-beta/react-proto-2.0.0-x86_64.AppImage), [Linux](https://github.com/React-Proto/react-proto/releases/download/v2.0.0-beta/react-proto_2.0.0_amd64.deb).
+
 * Mac users only: for now you might need to go to your security settings to allow the app run on your system as we do not have an Apple license yet.
 
 If you find any issues, [file issue](https://github.com/React-Proto/react-proto/issues)
@@ -48,6 +51,12 @@ If you find any issues, [file issue](https://github.com/React-Proto/react-proto/
 
 [Erik Guntner](https://www.linkedin.com/in/erik-guntner-9aa324b9/) [@erikguntner](https://github.com/erikguntner)
 
+[Adrian Sun](https://www.linkedin.com/in/adrian-sun/) [@adriansun1](https://github.com/adriansun1)
+
+[Darryl Amour](https://www.linkedin.com/in/darryl-amour/) [@darryl-amour](https://github.com/darryl-amour)
+
+[Frank Ma](https://www.linkedin.com/in/frankma2/) [@frankyma](https://github.com/frankyma)
+
 ## Running Your Own Version
 
 - **Fork** and **Clone** Repository.

assets/dragging.gif

@@ -70,7 +70,7 @@ <h3 class="detail-title">Quick Prototyping</h3>
         </div>
       </div>
       <div class="about-image">
-        <img src="assets/dragging.gif" alt="">
+        <img src="../assets/dragging.gif" alt="">
       </div>
     </div>
     <div class="about-container">
@@ -83,7 +83,7 @@ <h3 class="detail-title">Define component hierarchy </h3>
         </div>
       </div>
       <div class="about-image">
-        <img src="assets/hierarchy.gif" alt="">
+        <img src="../assets/hierarchy.gif" alt="">
       </div>
     </div>
     <div class="about-container">
@@ -96,7 +96,7 @@ <h3 class="detail-title">Export Files</h3>
         </div>
       </div>
       <div class="about-image">
-        <img src="assets/export.gif" alt="">
+        <img src="../assets/export.gif" alt="">
       </div>
     </div>
   </section>

assets/export.gif

@@ -2,7 +2,7 @@ directories:
   output: dist
   buildResources: build
 appId: com.eevee.react-proto
-copyright: Copyright © 2018
+copyright: Copyright © 2019
 linux:
   target:
     - AppImage
@@ -29,4 +29,4 @@ dmg:
       'y': 150
       type: link
       path: /Applications
-electronVersion: 2.0.7
+electronVersion: 3.1.0

assets/hierarchy.gif

@@ -8,7 +8,7 @@ const spinner = new Spinner('running app... %s');
 spinner.setSpinnerString('|/-\\');
 
 program
-  .version('1.0.0', '-v, --version, -V')
+  .version('2.0.0 Beta', '-v, --version, -V')
   .description('An application for prototyping React application.');
 
 program

docs/assets/dragging.gif

@@ -31,6 +31,85 @@ function openFile() {
   mainWindow.webContents.send('new-file', file);
 }
 
+/*
+ *  openWorkspace:  Verify the user wants to perform Open Workspace
+ *                  as any unsaved work will be lost. If user proceeds
+ *                  opens file dialog looking for workspace file with extension
+ *                  '*.rproto'.
+ */
+const openWorkspace = () => {
+  // Prompt user to verify they want to move continue
+  dialog.showMessageBox(
+    mainWindow,
+    {
+      type: 'warning',
+      buttons: ['Go Back', 'Continue'],
+      defaultId: 0,
+      cancelId: 0,
+      title: 'Open Workspace',
+      message: 'Are you sure you want to open another Workspace?',
+      detail: 'Current work will be lost if not saved',
+    },
+    (response) => {
+      if (response === 0) return; // If 'Go Back' return to main window w/ no changes
+      if (response === 1) {
+        // If 'Continue' allow user to select workspace file
+        dialog.showOpenDialog(
+          mainWindow,
+          {
+            properties: ['openFile'],
+            title: 'Open Workspace',
+            filters: [{
+              name: 'Workspaces',
+              extensions: ['rproto'],
+            }],
+          },
+          (filePaths) => {
+            if (!filePaths) return; // if no files return to main window
+            const workspaceFilePath = filePaths[0];
+            // send selected file back to React application
+            mainWindow.webContents.send('chosen-workspace', workspaceFilePath);
+          },
+        );
+      }
+    },
+  );
+};
+
+
+/*
+ *  saveWorkspace:  Opens file save dialog allowing user to specify file name and
+ *                  location for workspace file with extension '*.rproto'.
+ */
+const saveWorkspace = () => {
+  dialog.showSaveDialog(
+    mainWindow,
+    {
+      title: 'Save Workspace As',
+      nameFieldLabel: 'Workspace',
+      filters: [{
+        name: 'Workspace',
+        extensions: ['rproto'],
+      }],
+    },
+    (filename) => {
+      if (!filename) return; // if no file return to main window
+      // send identified new file path back to React application
+      mainWindow.webContents.send('new-workspace', filename);
+    },
+  );
+};
+
+// Receive message from React main-header-buttons palette
+ipcMain.on('save_workspace', () => {
+  saveWorkspace();
+});
+
+// Receive message from React main-header-buttons palette
+ipcMain.on('open_workspace', () => {
+  openWorkspace();
+});
+
 // Choose directory
 ipcMain.on('choose_app_dir', (event) => {
   const directory = dialog.showOpenDialog(mainWindow, {
@@ -57,6 +136,10 @@ const createWindow = () => {
   mainWindow = new BrowserWindow({
     width,
     height,
+    webPreferences: {
+      nodeIntegration: true,
+      webSecurity: true,
+    },
   });
 
   // and load the index.html of the app.
@@ -65,11 +148,28 @@ const createWindow = () => {
   const template = [{
     label: 'File',
     submenu: [{
-      label: 'Open File',
-      accelerator: process.platform === 'darwin' ? 'Cmd+O' : 'Ctrl+Shift+O',
+      label: 'Update Image',
+      accelerator: process.platform === 'darwin' ? 'Cmd+U' : 'Ctrl+Shift+U',
       click() {
         openFile();
       },
+    },
+    {
+      type: 'separator',
+    },
+    {
+      label: 'Open Workspace...',
+      accelerator: process.platform === 'darwin' ? 'Cmd+O' : 'Ctrl+Shift+O',
+      click() {
+        openWorkspace();
+      },
+    },
+    {
+      label: 'Save Workspace As...',
+      accelerator: process.platform === 'darwin' ? 'Cmd+S' : 'Ctrl+Shift+S',
+      click() {
+        saveWorkspace();
+      },
     }],
   },
   {