merging data table styling

Author: tolgamizrakci

.gitignore

@@ -480,7 +480,7 @@ ASALocalRun/
 .mfractor/
 
 # DMG File
-React-Proto.dmg
+reactype.dmg
 installers/
 
 # End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn

.npmignore

@@ -477,7 +477,7 @@ ASALocalRun/
 .mfractor/
 
 # DMG File
-React-Proto.dmg
+reactype.dmg
 installers/
 assets/
 .git/

README.md

@@ -1,5 +1,8 @@
-# ReacType
 
+<p align="center">
+  <img width="50" src="https://github.com/team-reactype/ReacType/blob/master/src/public/icons/png/256x256.png?raw=true">
+  <h1 align="center">ReacType </h1>
+</p>
 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/team-reactype/ReacType/pulls)
 ![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)
@@ -8,7 +11,9 @@
 
 **ReacType** allows the user to _visualize_ their application architecture dynamically, employing a _canvas display_, an _application tree_, and a _component code preview_. The user can create components and load _instances_ of these components, as well as nested HTML elements, onto the canvas. This architecture can then be _exported_ as TypeScript application files to be used as a starter template for any repository.
 
- Download for [MacOS](), [Windows](), [Linux]().
+Download for [MacOS](https://github.com/team-reactype/ReacType/releases/tag/Mac.Version.1.0), [Windows](https://github.com/team-reactype/ReacType/releases/tag/PC.Version.1.0), [Linux](https://github.com/team-reactype/ReacType/releases/tag/Linux.Version.1.0).
+
+![Image of ReacType Application](https://i.imgur.com/2sefnAk.jpg)
 
 ### How to use
 
@@ -19,10 +24,12 @@
 - The bottom panel allows the user to toggle between 4 different views: a tree diagram of the application, a preview of the exportable code, a form to enter component props, and a form to add HTML attributes.
 - **_Props_** can be added to each component within its tab on bottom panel. Enter in a _key-value pair_, select its data _type_ and press the bottom 'ADD PROP'.
 - **_HTML Element Attributes_** of class name and ID can be added to each HTML element after an HTML element has been rendered to the canvas.
-- To **_delete_** a _child_ or instance from the canvas, select the desired instance and either press the _delete_ key or click the 'DELETE CHILD' button.
+- To **_delete_** a _child_ or instance from the canvas, select the desired instance and either press the _delete_ key.
 - To **_delete_** a _component_, click the 'DELETE' button of the desired component in the left panel.
 - To _start over_, select the blue 'CLEAR WORKSPACE' button in the left panel. This will **clear the entire application**.
 
+![Image of ReacType Application 2](https://i.imgur.com/OCJ8nnw.png)
+
 ### To Export Files
 
 - Once finished setting up the application template, press the green 'EXPORT PROJECT' button at the bottom of the left panel and choose between two options to export your files:

electron-builder.yml

@@ -7,7 +7,7 @@ linux:
   target:
     - AppImage
     - deb
-  maintainer: test@gmail.com
+  maintainer: spincycle01@yahoo.com
 mac:
   category: public.app-category.developer-tools
   target: dmg

main.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 const {
   app,
   BrowserWindow,
@@ -8,7 +10,11 @@ const {
 } = require("electron");
 
 // Uncomment below for hot reloading during development
+<<<<<<< HEAD
 require("electron-reload")(__dirname);
+=======
+// require('electron-reload')(__dirname);
+>>>>>>> 11e0643d114b6c294dc2b66c3fd4727ffb173825
 
 // const isDev = true;
 const isDev =
@@ -70,7 +76,12 @@ const createWindow = () => {
       zoomFactor: 0.7,
       "node-Integration": false
     },
-    show: false
+    show: false,
+    icon: path.join(__dirname, '/src/public/icons/mac/icon.icns'),
+    win: {
+      icon: path.join(__dirname, '/src/public/icons/win/icon.ico'),
+      target: ['portable'],
+    },
   });
 
   // and load the index.html of the app.