merged json changes into beta repo

Author: codeByCandlelight

README.md

@@ -1,7 +1,7 @@
 <h1 align="center">
   <img src="https://raw.githubusercontent.com/jeisele2/OverVue/master/src/assets/overvue-icons/apple-icon-72x72.png">
   <br/>
-  OverVue (Beta)
+  OverVue 
 </h1>
 
 <p align="center"><b>Prototyping Tool for Vue Developers</b></p>
@@ -10,9 +10,19 @@
 
 <p>这个程序能帮你生成Vue 组件, 设置 routes , 也可以帮你显像Component Parent-Child组件树。你只要做一些小配置然后可以下载code boilerplate. 这样你就可以很方便简洁地生成Vue前台APP了！</p>
 
-![](https://raw.githubusercontent.com/jeisele2/OverVue/master/src/assets/gifs/screenshot.png)
+![](./src/assets/readme/overvue1.png)
 
-#### Features
+## Table of Contents
+
+* [Features](#features)
+* [OverVue 2.0 Changelog](#changelog)
+* [Tutorial](#how-to-use)
+  + [New Features Tutorial](#overvue-v20-how-to)
+* [How to Run](#running-a-local-version)
+* [Contributing](#contributing)
+* [Authors](#authors)
+
+### Features
 + Upload a frontend mockup image
 + Visualize draggable and resizable components
 + Create parent-child hierarchy of components
@@ -30,7 +40,9 @@
 + Will now load route images along with project <sub><sup>(v2.0)</sup></sub>
 + Windows compatibility for uploading mockup images. <sub><sup>(v2.0)</sup></sub>
 
-#### Changelog
+[↥Back to top](#table-of-contents)
+
+### Changelog
 <details><summary>OverVue 2.0</summary>
   <ul>
   <li>Improved hierarchy tree rendering</li>
@@ -47,25 +59,27 @@
   </ul>
 </details>
 
-#### How to use
+[↥Back to top](#table-of-contents)
+
+## How to use
 + Opening the application will create by default a root App component and a root route called "HomeView"
 + Upload a mockup from your filesystem if you'd like. Remove the mockup and choose a new one if needed.
-![](https://raw.githubusercontent.com/jeisele2/OverVue/master/src/assets/gifs/upload-image-drawers.gif)
+![](./src/assets/readme/upload_one_mockup.gif)
 
 + To add a new component, type its name in the component name box and select any HTML elements that should be rendered by that component.
 + HTML elements can also be added after creation by selecting the component in the display, then selecting HTML elements.
 + Select a parent component for the new component if needed.
 + After adding, you can move and resize the component in the display.
-![alt text](https://raw.githubusercontent.com/jeisele2/OverVue/master/src/assets/gifs/component_creation.gif)
+![alt text](./src/assets/readme/create_resize_move.gif)
 
 + You can also add children to components by right-clicking the component to add children to, and you can see the tree re-render as you create new components or change the hierarchy.
-![](https://raw.githubusercontent.com/jeisele2/OverVue/master/src/assets/gifs/HTML-elements-tree-rerender.gif)
+![](./src/assets/readme/right_click_add_children.gif)
 
 + The dashboard shows info about each component (code snippets and HTML elements). Click a component in the display to see its properties.                                               
-![](https://raw.githubusercontent.com/jeisele2/OverVue/master/src/assets/gifs/snippets-active-component.gif)
+![](./src/assets/readme/dashboard.gif)
 
 + You can add new routes and view all components and routes in the sidebar.
-![](https://raw.githubusercontent.com/jeisele2/OverVue/master/src/assets/gifs/sidebar-components-routes.gif)
+![](./src/assets/readme/add_new_route.gif)
 
 + When finished creating, you can export to a file location of your choice. Below is the exported file structure:
 
@@ -89,8 +103,11 @@ src/
 babel.config.js
 package.json
 ```
-###### OverVue v2.0 How to
+[↥Back to top](#table-of-contents)
+
+### OverVue v2.0 How to
 + Undo/Redo feature has been added to the top right of the program, you can also use CTRL+z and CTRL+y respectively.
+![](./src/assets/readme/undo_redo.gif)
 
 + You can nest html elements in two different ways:
     1. Upon creating a component and adding an html element into it, Select the component to make it the active component.
@@ -100,17 +117,15 @@ package.json
     2. Similar to above, but instead of double clicking, you can press the down arrow icon on the html element button to enter it.
     From there the view will change to the contents of that particular HTML element.
     You can then add html elements like you would for a component using the left hand side
+    ![](./src/assets/readme/nesting_html.gif)
 
 + Setting layers on a component is done by right clicking the desired component on the component display and using the menu option
   All components start on layer 1 by default.
+![](./src/assets/readme/layers.gif)
 
+[↥Back to top](#table-of-contents)
 
-
-
-
-
-
-#### Running a local version
+### Running a local version
 This app was developed using the Quasar framework, so first you will need to install the Quasar cli
 ```
 npm i -g @quasar/cli
@@ -128,7 +143,9 @@ To build a new .dmg / windows .exe
 quasar build -m electron
 ```
 
-#### Contributing
+[↥Back to top](#table-of-contents)
+
+### Contributing
 We'd love for you to test this application out and submit any issues you encounter. Also feel free to fork to your own repo and submit PRs.
 Here are some features we're thinking about adding:
 + Vuex state prototyping and boilerplate export
@@ -137,7 +154,9 @@ Here are some features we're thinking about adding:
 + Integration with Storybook
 + Ability to add a copy of an existing component from one route to another
 
-#### Authors
+[↥Back to top](#table-of-contents)
+
+### Authors
 ```
 Contributors:
 Joseph Eisele @jeisele2
@@ -150,3 +169,5 @@ Allison Pratt @allisons11
 Joju Olaode @JojuOlaode
 ```
 Inspired by [PreVue](https://github.com/open-source-labs/PreVue)
+
+[↥Back to top](#table-of-contents)

package-lock.json

@@ -1,11 +1,15 @@
 {
   "name": "overvue",
-  "version": "0.0.1",
+  "version": "2.0.0",
   "description": "Vue Prototype DevTool",
   "productName": "OverVue",
   "cordovaId": "org.cordova.quasar.app",
-  "author": "Team OverVue",
+  "author": "Team OverVue, Team Vuetiful",
   "private": true,
+  "bugs": {
+    "url": "https://github.com/TeamOverVue/OverVue/issues"
+  },
+  "homepage": "https://github.com/TeamOverVue/OverVue",
   "scripts": {
     "lint": "eslint --ext .js,.vue src",
     "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
@@ -21,14 +25,25 @@
     "aws-amplify": "^1.1.30",
     "aws-amplify-vue": "^0.2.13",
     "aws-appsync": "^1.8.1",
+    "dot-prop": "^6.0.0",
     "fs-extra": "^8.1.0",
     "localforage": "^1.7.3",
+<<<<<<< HEAD
     "lodash": "^4.17.21",
     "lodash.isequal": "^4.5.0",
     "lodash.throttle": "^4.1.1",
     "mousetrap": "^1.6.3",
     "npm": "^6.14.14",
     "prismjs": "^1.24.1",
+=======
+    "lodash": ">=4.17.19",
+    "lodash.isequal": "^4.5.0",
+    "lodash.throttle": "^4.1.1",
+    "mousetrap": "^1.6.3",
+    "node-forge": "^0.10.0",
+    "npm": "^6.14.5",
+    "prismjs": "^1.16.0",
+>>>>>>> 835023cad4c4adea81c05464317c052a0a8931d2
     "quasar": "^1.0.0",
     "vue-custom-context-menu": "^3.0.1",
     "vue-drag-resize": "^1.3.2",
@@ -48,8 +63,13 @@
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.1",
     "devtron": "^1.4.0",
+<<<<<<< HEAD
     "electron": "^5.0.6",
     "electron-builder": "^22.11.10",
+=======
+    "electron": "^7.2.4",
+    "electron-builder": "^22.7.0",
+>>>>>>> 835023cad4c4adea81c05464317c052a0a8931d2
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
     "eslint": "^5.10.0",