Cleanup

Author: Ives van Hoorne

src/app/components/spacing/Margin.js

@@ -3,4 +3,5 @@ import getSpacing from './get-spacing';
 
 export default styled.div`
   margin: ${getSpacing};
+  box-sizing: border-box;
 `;

src/app/components/Notification.js …containers/Notifications/Notification.jssrc/app/components/Notification.js renamed to src/app/containers/Notifications/Notification.js src/app/components/Notification.js renamed to src/app/containers/Notifications/Notification.js

@@ -5,10 +5,12 @@ import styled, { injectGlobal } from 'styled-components';
 import { connect } from 'react-redux';
 import { spring, Motion } from 'react-motion';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
+import notificationActionCreators from 'app/store/notifications/actions';
+import Portal from 'app/components/Portal';
+
 import type { Notification } from 'common/types';
-import notificationActionCreators from '../store/notifications/actions';
-import NotificationComponent from '../components/Notification';
-import Portal from '../components/Portal';
+
+import NotificationComponent from './Notification';
 
 type Props = {
   notifications: Array<Notification>,

src/app/containers/Notifications.js src/app/containers/Notifications/index.jssrc/app/containers/Notifications.js renamed to src/app/containers/Notifications/index.js

@@ -1,13 +1,12 @@
 // @flow
-
 import type { Module, Directory } from 'common/types';
 
 export const validateTitle = (
   id: string,
   title: string,
   siblings: Array<Module | Directory>, // eslint-disable-line
 ) => {
-  if (title.length === 0) return 'title cannot be empty';
+  if (title.length === 0) return 'Title cannot be empty';
   if (/^[09azAZ_.]+$/.test(title)) {
     // It has whitespaces
     return 'Title cannot have whitespaces or special characters';

src/app/store/entities/sandboxes/modules/validator.js

@@ -104,13 +104,15 @@ export default ({ sandbox, setCurrentModule, currentModule }: Props) => (
 
     <Item>
       <Title>Dependencies</Title>
+
       <Subtitle>NPM Dependencies</Subtitle>
       {Object.keys(sandbox.npmDependencies).map(dep => (
         <EntryContainer key={dep}>
           {dep}
           <Version>{sandbox.npmDependencies[dep]}</Version>
         </EntryContainer>
       ))}
+
       <Subtitle>External Resources</Subtitle>
       {sandbox.externalResources.map(dep => (
         <EntryContainer key={dep}>
@@ -120,6 +122,7 @@ export default ({ sandbox, setCurrentModule, currentModule }: Props) => (
         </EntryContainer>
       ))}
     </Item>
+
     <Item hover>
       <Padding margin={1}>
         <EditorLink id={sandbox.id} />

src/embed/components/Sidebar.js

@@ -8,6 +8,10 @@ const compareTitle = (original: string, test: string) => {
   return false;
 };
 
+const throwError = (path: string) => {
+  throw new Error(`Cannot find module in ${path}`);
+};
+
 /**
  * Convert the module path to a module
  */
@@ -19,40 +23,38 @@ export default (
 ) => {
   // Split path
   const splitPath = path.replace(/^.\//, '').split('/');
-  const founddirectoryShortid = splitPath.reduce(
+  const foundDirectoryShortid = splitPath.reduce(
     (dirId: ?string, pathPart: string, i: number) => {
       // Meaning this is the last argument, so the file
       if (i === splitPath.length - 1) return dirId;
 
       if (pathPart === '..') {
         // Find the parent
         const dir = directories.find(d => d.shortid === dirId);
-        if (dir == null) throw new Error(`Cannot find module in ${path}`);
+        if (dir == null) throwError(path);
 
         return dir.directoryShortid;
       }
 
-      // For == check on null
-      // eslint-disable-next-line eqeqeq
       const directoriesInDirectory = directories.filter(
+        // eslint-disable-next-line eqeqeq
         m => m.directoryShortid == dirId,
       );
       const nextDirectory = directoriesInDirectory.find(d =>
         compareTitle(d.title, pathPart),
       );
 
-      if (nextDirectory == null)
-        throw new Error(`Cannot find module in ${path}`);
+      if (nextDirectory == null) throwError(path);
 
       return nextDirectory.shortid;
     },
     startdirectoryShortid,
   );
 
   const lastPath = splitPath[splitPath.length - 1];
-  // eslint-disable-next-line eqeqeq
   const modulesInFoundDirectory = modules.filter(
-    m => m.directoryShortid == founddirectoryShortid,
+    // eslint-disable-next-line eqeqeq
+    m => m.directoryShortid == foundDirectoryShortid,
   );
 
   // Find module with same name
@@ -61,22 +63,25 @@ export default (
   );
   if (foundModule) return foundModule;
 
-  // eslint-disable-next-line eqeqeq
+  // Check all directories in said directory for same name
   const directoriesInFoundDirectory = directories.filter(
-    m => m.directoryShortid == founddirectoryShortid,
+    // eslint-disable-next-line eqeqeq
+    m => m.directoryShortid == foundDirectoryShortid,
   );
   const foundDirectory = directoriesInFoundDirectory.find(m =>
     compareTitle(m.title, lastPath),
   );
 
+  // If it refers to a directory
   if (foundDirectory) {
-    // eslint-disable-next-line eqeqeq
+    // Find module named index
     const indexModule = modules.find(
       m =>
+        // eslint-disable-next-line eqeqeq
         m.directoryShortid == foundDirectory.shortid &&
         compareTitle(m.title, 'index'),
     );
-    if (indexModule == null) throw new Error(`Cannot find module in ${path}`);
+    if (indexModule == null) throwError(path);
     return indexModule;
   }
 
@@ -87,5 +92,6 @@ export default (
     );
     if (indexModule) return indexModule;
   }
-  throw new Error(`Cannot find module in ${path}`);
+
+  throwError(path);
 };