cleaned up some code on server.js and updated README

Author: Anthonytorrero

README.md

@@ -16,7 +16,7 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo
 
 - **Mac users**: After opening the dmg and dragging ReacType into your Applications folder, ctrl+click the icon and select 'Open' from the context menu to run the app. This extra step is necessary since we don't have an Apple developer license yet.
 
-- **Windows users**: Install the application by running ReacType Setup 5.0.0.exe.
+- **Windows users**: Install the application by running ReacType Setup 6.0.0.exe.
 
 - **Linux users**: Run the application as a super user in order to read and write files.
 
@@ -44,14 +44,16 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo
 
  **New with version 6.0:**
 
-### Dashboard
+### Features
 
 - **Dashboard**: Click the 'Dashboard' button to view the Public Dashboard and User Dashboard.
 - **Like**: Like other people's templates by clicking on the star icon.
 - **Comment**: Comment on other templates by typing in the input field and clicking the comment icon.
 - **Download**: Save any public template by clicking the download icon to save a copy as your own.
 - **Publish**: Publish any template to the Public Dashboard for other users to download, like, or comment on.  Click again to unpublish projects.
 - **Sort By**: Click the 'Sort By' button to choose different metrics to sort the Public Dashboard by.
+- **Form Nesting**: Nesting within form tags is now fully functional
+- **Added Undo and Redo functionality**
 
 ### Keyboard Shortcuts
 

app/src/Dashboard/styles.css

@@ -1,25 +1,3 @@
-/* @import url('https://fonts.googleapis.com/css2?family=Cabin&family=Oswald&display=swap');
-
-
-
-$primary-black: #22292f;
-$secondary-black: #606f7b;
-$teriary-grey: #f0f0f0;
-$light-grey: #bfcbd4;
-$light-blue: #759cc9;
-$button-blue: #24BCFF; */
-
-
-/* .project{
-  display: flex;
-  flex-direction: column;
-  background-color: white;
-  color: #606f7b;
-  align-items: center;
-  height: 300px;
-  justify-content: min;
-  width: 250px;
-} */
 
 .project {
   display: flex;
@@ -34,25 +12,7 @@ $button-blue: #24BCFF; */
   justify-content: space-between;
 }
 
-
-/* .form , .project{
-  display: flex;
-  flex-direction: column;
-  background-color: white;
-  border: 1px solid  #f0f0f0;
-  box-shadow: 0 0 5px rgba(0,0,0,0.3);
-  margin: 5px;
-  border-radius: 5px;
-  color: #606f7b;
-  align-items: center;
-  height: 300px;
-  justify-content: min;
-  width: 250px;
-} */
-
-
 .dashboardContainer {
-  /* overflow: scroll; */
   height: 100%;
 }
 
@@ -120,10 +80,3 @@ $button-blue: #24BCFF; */
 h1 {
   text-align: center;
 }
-/* .projectContainer {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-}  */

app/src/helperFunctions/renderChildren.tsx

@@ -57,7 +57,7 @@ const renderChildren = (children: ChildElement[]) => {
         />
       );
     }
-    else if (type === 'HTML Element' && typeId === 1000 /* || typeId === 2 */) {
+    else if (type === 'HTML Element' && typeId === 1000 ) {
       return (
         <SeparatorChild
           childId={childId}

server/server.js

@@ -79,12 +79,6 @@ const server = new ApolloServer({ typeDefs, resolvers });
 server.applyMiddleware({ app });
 /** ****************************************************************** */
 
-// app.use(express.static(path.resolve(__dirname, '../app/dist')));
-
-app.get('/', (req, res) => {
-  return res.status(200).sendFile(path.resolve(__dirname, '../app/dist/index-prod.html'));
-});
-
 app.post(
   '/signup',
   userController.createUser,