Merge pull request #55 from tsully/build

Fixed Electron-builder configuration

Author: andrewjcho84

app/electron/main.js

@@ -24,7 +24,6 @@ const MenuBuilder = require('./menu');
 const path = require('path');
 // const fs = require('fs');
 
-console.log('NODE ENV is ', process.env.NODE_ENV);
 const isDev =
   process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';
 const port = 8080;
@@ -238,8 +237,6 @@ app.on('web-contents-created', (event, contents) => {
 
   contents.on('will-redirect', (event, navigationUrl) => {
     const parsedUrl = new URL(navigationUrl);
-    //console.log('parsedUrl is', parsedUrl);
-    //console.log('parsedUrl.origin is', parsedUrl.origin);
     const validOrigins = [
       selfHost,
       'http://localhost:5000',

app/src/components/App.tsx

@@ -36,9 +36,6 @@ export const App = (): JSX.Element => {
       });
     } else {
       // otherwise if a user is logged in, use a fetch request to load user's projects from DB
-      // getProjects().then(projects =>
-      //   console.log('UseEffect in App getprojects() returns', projects)
-      // );
       let userId;
       if (Cookies.get('ssid')) {
         userId = Cookies.get('ssid');
@@ -69,10 +66,8 @@ export const App = (): JSX.Element => {
       userId = window.localStorage.getItem('ssid');
     }
     if (state.isLoggedIn === false) {
-      //console.log('Saving guest project as', state);
       localforage.setItem('guestProject', state);
     } else if (state.name !== '') {
-      //console.log('Saving user project as', state);
       saveProject(state.name, state);
       localforage.setItem(userId, state);
     }

app/src/components/login/SignIn.tsx

@@ -121,13 +121,11 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
   */
   const handleLogin = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     e.preventDefault();
-    console.log('click fired on handleLogin');
     setInvalidUser(false);
     setInvalidUserMsg('');
     setInvalidPass(false);
     setInvalidPassMsg('');
     sessionIsCreated(username, password).then(loginStatus => {
-      console.log('login fetch', loginStatus);
       if (loginStatus === 'Success') {
         props.history.push('/');
       } else {
@@ -157,7 +155,6 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
   const handleLoginGuest = (
     e: React.MouseEvent<HTMLButtonElement, MouseEvent>
   ) => {
-    console.log('Handle login guest fired');
     e.preventDefault();
     // generate "cookie" in localStorage for guest users
     window.localStorage.setItem('ssid', 'guest');
@@ -247,9 +244,6 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
 
         <Grid container>
           <Grid item xs>
-            {/* <Link href="#" variant="body2">
-              Forgot password?
-            </Link> */}
             <RouteLink to={`/signup`} className="nav_link">
               Forgot password?
             </RouteLink>

app/src/components/login/SignUp.tsx

@@ -182,14 +182,9 @@ const SignUp: React.FC<LoginInt & RouteComponentProps> = props => {
       setInvalidVerifyPassword(false);
     }
 
-    console.log('invalidUsername', invalidUsername);
-    console.log('invalidPassword', invalidPassword);
-    console.log('invalidEmail', invalidEmail);
-    console.log('invalidVerifyPassword', invalidVerifyPassword);
     // if(!invalidUsername && !invalidPassword && !invalidEmail && !invalidVerifyPassword) {
     newUserIsCreated(username, email, password).then(userCreated => {
       if (userCreated === 'Success') {
-        console.log('user created');
 
         props.history.push('/');
       } else {

app/src/components/main/Canvas.tsx

@@ -9,7 +9,6 @@ import renderChildren from '../../helperFunctions/renderChildren';
 function Canvas() {
   const [state, dispatch] = useContext(stateContext);
 
-  console.log('state is ', state);
   // find the current component to render on the canvas
   const currentComponent: Component = state.components.find(
     (elem: Component) => elem.id === state.canvasFocus.componentId

app/src/components/main/IndirectChild.tsx

@@ -25,8 +25,6 @@ function IndirectChild({ style, children, placeHolder, linkId }) {
     combinedStyle = combineStyles(combinedStyle, { color: 'blue' });
   }
 
-  //console.log('children are ', children);
-  //console.log('place holder is ', placeHolder);
   return (
     <div style={combinedStyle}>
       {linkId ? (

app/src/components/right/ProjectsFolder.tsx

@@ -27,10 +27,6 @@ function ProjectsDialog(props: ProjectDialogProps) {
   const { onClose, open, projects } = props;
   const [_, dispatch] = useContext(stateContext);
 
-  useEffect(() => {
-    console.log('state is', _);
-  }, [_]);
-
   // If no projects selected, keep the name of the current displayed
   const handleClose = () => {
     // onClose(selectedValue);

app/src/helperFunctions/auth.ts

@@ -12,7 +12,6 @@ export const sessionIsCreated = (
     username,
     password
   });
-  console.log(process.env.NODE_ENV);
   const result = fetch(`${serverURL}/login`, {
     method: 'POST',
     credentials: 'include',
@@ -25,10 +24,8 @@ export const sessionIsCreated = (
       return res.json();
     })
     .then(data => {
-      console.log('the data', data);
       if (data.sessionId && typeof data.sessionId === 'string') {
         // check that a session id was passed down
-        console.log('Inside success');
         window.localStorage.setItem('ssid', data.sessionId);
         return 'Success';
       } else {
@@ -64,7 +61,6 @@ export const newUserIsCreated = (
       return res.json();
     })
     .then(data => {
-      console.log('the data', data);
       if (data.sessionId && typeof data.sessionId === 'string') {
         // check that a session id was passed down
         window.localStorage.setItem('ssid', data.sessionId);

app/src/helperFunctions/generateCode.ts

@@ -27,7 +27,6 @@ const generateUnformattedCode = (
 
   // get metadata for each child (e.g. the name/tag of the component/elemnt)
   const getEnrichedChildren = (currentComponent: Component | ChildElement) => {
-    console.log('enriching component ', currentComponent);
     const enrichedChildren = currentComponent.children.map((elem: any) => {
       const child = { ...elem };
       if (child.type === 'Component') {
@@ -60,7 +59,6 @@ const generateUnformattedCode = (
   const writeNestedElements = (enrichedChildren: any) => {
     return `${enrichedChildren
       .map((child: any) => {
-        console.log('the child is ', child);
         if (child.type === 'Component') {
           return `<${child.name}${formatStyles(child.style)} />`;
         } else if (child.type === 'HTML Element') {
@@ -127,7 +125,6 @@ const generateUnformattedCode = (
 
   const enrichedChildren: any = getEnrichedChildren(currentComponent);
 
-  console.log(enrichedChildren);
   const next = true;
 
   // import statements differ between root (pages) and regular components (components)
@@ -248,8 +245,6 @@ const generateCode = (
   rootComponents: number[],
   projectType: string
 ) => {
-  console.log('generating next.js code');
-  // return ''
   const code = generateUnformattedCode(
     components,
     componentId,

app/src/helperFunctions/projectGetSave.ts

@@ -6,9 +6,7 @@ if (isDev) {
 // helper functions that will do fetch requests to get and save user/guest projects
 
 export const getProjects = (): Promise<Object> => {
-  //console.log("Loading user's projects...");
   let userId = window.localStorage.getItem('ssid');
-  //console.log('userId from localStorage is', userId);
   const body = JSON.stringify({ userId });
   const projects = fetch(`${serverURL}/getProjects`, {
     method: 'POST',
@@ -21,7 +19,6 @@ export const getProjects = (): Promise<Object> => {
   })
     .then(res => res.json())
     .then(data => {
-      //console.log("User's projects are", data);
       return data;
     })
     .catch(err => console.log(`Error getting project ${err}`));
@@ -32,7 +29,7 @@ export const saveProject = (
   name: String,
   workspace: Object
 ): Promise<Object> => {
-  //console.log("Saving user's project...");
+
   const body = JSON.stringify({
     name,
     project: workspace,
@@ -48,7 +45,6 @@ export const saveProject = (
   })
     .then(res => res.json())
     .then(data => {
-      //console.log('Saved project is', data.project);
       return data.project;
     })
     .catch(err => console.log(`Error saving project ${err}`));

app/src/utils/createApplication.util.ts

@@ -30,7 +30,6 @@ function createIndexHtml(path, appName) {
   let dirComponent;
   if (!dir.match(/`${appName}`|\*$/)) {
     dir = `${dir}/${appName}`;
-    console.log('dir is ', dir);
     if (!window.api.existsSync(dir)) {
       window.api.mkdirSync(dir);
       dirSrc = `${dir}/src`;

electron-builder.yml

@@ -13,6 +13,7 @@ linux:
     - rpm
     - snap
     - AppImage
+  maintainer: [email protected]
 mac:
   category: public.app-category.developer-tools
   target: dmg

package.json

@@ -4,6 +4,7 @@
   "description": "Prototyping tool for React/Typescript Applications.",
   "private": true,
   "main": "app/electron/main.js",
+  "author": "OS Labs",
   "contributors": [
     "Adam Singer",
     "Charles Finocchiaro",