cleaned up codebase

Author: stephenkim612

.dockerignore

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 ReacType
+Copyright (c) 2022 ReacType
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Dockerfile

@@ -5,7 +5,7 @@
 
 [![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-blue.svg)
-![Version 9.0.0]
+![Version 10.0.0]
 
 **ReacType** is a rapid prototyping tool for developers employing **React** component architecture alongside the comprehensive type-checking of **TypeScript**.
 In other words, **you can draw prototypes and export React / TypeScript code!**
@@ -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 9.0.0.exe.
+- **Windows users**: Install the application by running ReacType Setup 10.0.0.exe.
 
 - **Linux users**: Run the application as a super user in order to read and write files.
 

LICENSE.md

@@ -6,7 +6,6 @@ import BottomTabs from '../app/src/components/bottom/BottomTabs';
 import StateContext from '../app/src/context/context';
 import initialState from '../app/src/context/initialState';
 import reducer from '../app/src/reducers/componentReducer';
-
 function Test() {
   const [state, dispatch] = useReducer(reducer, initialState);
   return (
@@ -15,7 +14,6 @@ function Test() {
     </StateContext.Provider>
   )
 }
-
 test('Bottom Panel Contains Two Tabs: Code Preview and Component Tree', () => {
   render(<Test/>);
   expect(screen.getAllByRole('tab')).toHaveLength(2);

README.md

@@ -3,13 +3,10 @@ import '@testing-library/jest-dom';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { render, fireEvent, cleanup, screen } from '@testing-library/react';
-
 import StateContext from '../app/src/context/context';
 import initialState from '../app/src/context/initialState';
 import reducer from '../app/src/reducers/componentReducer';
 import HTMLPanel from '../app/src/components/left/HTMLPanel';
-
-
 function Test() {
   const [state, dispatch] = useReducer(reducer, initialState);
   return (
@@ -20,8 +17,6 @@ function Test() {
     </DndProvider>
   )
 }
-
-
 test('Renders HTMLPanel component properly', () => {
   render(
     <Test/>
@@ -44,15 +39,12 @@ test('Adds new custom element', () => {
   render(
     <Test/>
   );
-
   fireEvent.change(screen.getAllByRole('textbox')[0], {
     target: { value: 'Testing' }
   });
   fireEvent.change(screen.getAllByRole('textbox')[1], {
     target: { value: 'Testing' }
   });
-
   fireEvent.click(screen.getByDisplayValue('Add Element'));
-
   expect(screen.getByText('Testing')).toBeInTheDocument();
 });

__tests__/BottomTabs.test.tsx

@@ -218,25 +218,19 @@ describe('Testing componentReducer functionality', () => {
       expect(state.components[focusIndex].future.length).toEqual(1);
     })
   });
-
-  
   // TEST 'REDO'
   describe('REDO reducer', () => {
     it('should remove the last element from the future array and push it to the past array', () => {
       const focusIndex = state.canvasFocus.componentId - 1;
-  
       const actionRedo: Action = {
         type: 'REDO',
          payload: {},
       };
       state = reducer(state, actionRedo);
-
       expect(state.components[focusIndex].future.length).toEqual(0);
       expect(state.components[focusIndex].past.length).toEqual(1);
     })
   });
-
-
   // TEST 'RESET STATE'
   describe('RESET STATE reducer', () => {
     it('should reset project to initial state', () => {

__tests__/HTMLPanel.test.tsx

@@ -2,9 +2,7 @@ const { Mongoose } = require('mongoose');
 const request = require('supertest');
 const http = require('http');
 const app = require('../server/server.js');
-
 const mock = require('../mockData');
-
 // tests user signup and login routes
 describe('GraphQL tests', () => {
   let server;
@@ -14,17 +12,14 @@ describe('GraphQL tests', () => {
   const makeCopyUserIdTest = '604333d10004ad51c899e250';
   const makeCopyUsernameTest = 'test1';
   let makeCopyProjId = '';
-
   beforeAll((done) => {
     server = http.createServer(app);
     server.listen(done);
   });
-
   afterAll((done) => {
     Mongoose.disconnect();
     server.close(done);
   });
-
   // GraphQL Query
   describe('Testing GraphQL query', () => {
     it('getAllProjects should return more than 1 project by default', () => request(server)
@@ -35,7 +30,6 @@ describe('GraphQL tests', () => {
       })
       .expect(200)
       .then(res => expect(res.body.data.getAllProjects.length).toBeGreaterThanOrEqual(1)));
-
     it('getAllProjects should return projects that matches the provided userId', () => request(server)
       .post('/graphql')
       .set('Content-Type', 'application/json')
@@ -48,7 +42,6 @@ describe('GraphQL tests', () => {
       .expect(200)
       .then(res => expect(res.body.data.getAllProjects[0].userId).toBe('604d21b2b61a1c95f2dc9105')));
   });
-
   // GraphQL Mutation
   describe('Testing GraphQL mutation', () => {
     // Add likes
@@ -64,7 +57,6 @@ describe('GraphQL tests', () => {
       })
       .expect(200)
       .then(res => expect(res.body.data.addLike.likes).toBe(testNum)));
-
     // Publish project
     it('Should set the "published" on the project document to TRUE', () => request(server)
       .post('/graphql')
@@ -78,7 +70,6 @@ describe('GraphQL tests', () => {
       })
       .expect(200)
       .then(res => expect(res.body.data.publishProject.published).toBe(true)));
-
     it('Should set the "published" on the project document to FALSE', () => request(server)
       .post('/graphql')
       .set('Content-Type', 'application/json')
@@ -91,7 +82,6 @@ describe('GraphQL tests', () => {
       })
       .expect(200)
       .then(res => expect(res.body.data.publishProject.published).toBe(false)));
-
     // Make copy
     it('Should make a copy of an existing project and change the userId and userName', () => request(server)
       .post('/graphql')

__tests__/componentReducer.test.ts

@@ -49,14 +49,10 @@ let menuBuilder;
 async function createWindow() {
   // install react dev tools if we are in development mode
   if (isDev) {
-    // await installExtension([REACT_DEVELOPER_TOOLS])
-    //   .then(name => console.log(`Added Extension:  ${name}`))
-    //   .catch(err => console.log('An error occurred: ', err));
   } else {
     // this will happen before creating the browser window. it returns a Boolean whether the protocol of scheme 'app://' was successfully registered and a file (index-prod.html) was sent as the response
     protocol.registerBufferProtocol(Protocol.scheme, Protocol.requestHandler);
   }
-
   // Create the browser window.
   win = new BrowserWindow({
     // full screen
@@ -69,7 +65,6 @@ async function createWindow() {
     // the browser window will not display initially as it's loading
     // once the browser window renders, a function is called below  that hides the splash screen and displays the browser window
     show: false,
-    // icon: path.join(__dirname, '../src/public/icons/png/256x256.png'),
     webPreferences: {
       zoomFactor: 0.7,
       // enable devtools when in development mode 
@@ -106,9 +101,6 @@ async function createWindow() {
     website: 'www.reactype.io',
     text: 'Initializing ...',
   });
-
-
-
   // Load app
   if (isDev) {
     // load app from web-dev server

__tests__/gql.projects.test.js renamed to __tests__/gql.projects.test.ts

@@ -64,7 +64,6 @@ var MenuBuilder = function(mainWindow, appName) {
 
   let defaultTemplate = function() {
     return [
-      // { role: "appMenu" }
       ...(isMac
         ? [
             {

__tests__/projects.test.js renamed to __tests__/projects.test.ts

@@ -42,10 +42,8 @@ const useStyles = makeStyles((theme: Theme) => createStyles({
     justifyContent: 'center',
   },
 }));
-
 // sorting options
 const sortMethods = ['RATING', 'DATE', 'USER'];
-
 // Drop down menu button for SORT PROJECTS
 const StyledMenu = withStyles({
   paper: {
@@ -66,7 +64,6 @@ const StyledMenu = withStyles({
     {...props}
   />
 ));
-
 const StyledMenuItem = withStyles(theme => ({
   root: {
     '&:focus': {
@@ -76,30 +73,22 @@ const StyledMenuItem = withStyles(theme => ({
     }
   }
 }))(MenuItem);
-
 // TO DO: set types of props validation
 export default function NavBar(props) {
   // TO DO: import setStyle
   const classes = useStyles();
   const { style, setStyle } = useContext(styleContext);
-
   const toggling = () => setIsOpen(!isOpen);
-  
   // toggle to open and close dropdown sorting menu
   const [isOpen, setIsOpen] = useState(false);
-
   // State for sort projects button
   const [anchorEl, setAnchorEl] = React.useState(null);
-
-
   const handleClick = event => {
     setAnchorEl(event.currentTarget);
   };
-
   const handleClose = () => {
     setAnchorEl(null);
   };
-
   return (
     <div className={classes.root} style={style}>
       <AppBar position='static'>
@@ -108,10 +97,7 @@ export default function NavBar(props) {
           <Typography variant="h6" style={{ marginLeft: '1rem' }} className={classes.title}>
             ReacType
           </Typography>
-
-          {/* ==========================================Sort by Button================================================== */}
-         
-          <div style ={ { textDecoration: 'none' } }>
+           <div style ={ { textDecoration: 'none' } }>
             <Button
             variant='contained'
             color='primary'
@@ -166,9 +152,7 @@ export default function NavBar(props) {
             }}
           >
             {props.isThemeLight ? 'Dark Mode' : 'Light Mode'}
-          </Button>
-          {/* ====================================Home Button============================================== */}
-          
+          </Button>  
           <div>
             <Link to='/' style={{textDecoration: 'none'}}>
               <Button