Move components to ./src/components

Author: qti3e

src/cell.tsx src/components/cell.tsx

@@ -21,8 +21,8 @@
  */
 
 import { Component, h } from "preact";
+import { delay } from "../util";
 import { CodeMirrorComponent } from "./codemirror";
-import { delay } from "./util";
 
 export const cellExecuteQueue: Cell[] = [];
 

src/codemirror.tsx src/components/codemirror.tsx

@@ -16,10 +16,10 @@
 // React wrapper around CodeMirror editor.
 
 // tslint:disable:no-reference
-/// <reference path="../node_modules/@types/codemirror/index.d.ts" />
+/// <reference path="../../node_modules/@types/codemirror/index.d.ts" />
 
 import { Component, h } from "preact";
-import { normalizeCode } from "./common";
+import { normalizeCode } from "../common";
 
 const codeMirrorElements = new Map<string, Element>();
 

src/index.tsx src/components/index.tsx

@@ -15,10 +15,11 @@
 // tslint:disable:variable-name
 import { readFileSync } from "fs";
 import { h } from "preact";
-import { GlobalHeader } from "./common";
+import { GlobalHeader } from "../common";
 
 export const PropelIndex = props => {
-  let md = readFileSync(__dirname + "/../README.md", "utf8");
+  console.log(__dirname);
+  let md = readFileSync(__dirname + "/../../README.md", "utf8");
   md = "<p>" + md.replace(/\n\n/g, "\n\n<p>");
   return (
     <div class="index">

src/inspector.tsx src/components/inspector.tsx

@@ -19,8 +19,8 @@ import {
   InspectorData,
   PropertyDescriptor,
   ValueDescriptor
-} from "./serializer";
-import { IS_WEB, isNumericalKey, randomString } from "./util";
+} from "../serializer";
+import { IS_WEB, isNumericalKey, randomString } from "../util";
 
 type ElementLike = JSX.Element | string | null;
 type ElementList = ElementLike[];

src/list.tsx src/components/list.tsx

@@ -19,8 +19,8 @@
  */
 
 import { Component, h } from "preact";
+import { NbInfo } from "../types";
 import { NotebookPreview } from "./preview";
-import { NbInfo } from "./types";
 
 export interface NotebookListProps {
   // List of notebooks we would like to render.

src/notebook.tsx src/components/notebook.tsx

@@ -19,13 +19,13 @@
  */
 
 import { Component, h } from "preact";
+import { docTitle, UserTitle } from "../common";
+import * as db from "../db";
+import { OutputHandlerDOM } from "../output_handler";
+import * as types from "../types";
+import { createResolvable, IS_WEB, randomString, Resolvable } from "../util";
+import { createRPCHandler, VM } from "../vm";
 import { Cell, drainExecuteQueue, OUTPUT_ID_PREFIX } from "./cell";
-import { docTitle, UserTitle } from "./common";
-import * as db from "./db";
-import { OutputHandlerDOM } from "./output_handler";
-import * as types from "./types";
-import { createResolvable, IS_WEB, randomString, Resolvable } from "./util";
-import { createRPCHandler, VM } from "./vm";
 
 const newNotebookText = "// New Notebook. Insert code here.";
 const DEFAULT_TITLE = IS_WEB && document.title;

src/preview.tsx src/components/preview.tsx

@@ -19,9 +19,9 @@
  */
 
 import { Component, h } from "preact";
-import { Avatar, docTitle, fmtDate } from "./common";
-import * as db from "./db";
-import * as types from "./types";
+import { Avatar, docTitle, fmtDate } from "../common";
+import * as db from "../db";
+import * as types from "../types";
 
 export interface NotebookPreviewProps {
   notebook: types.NbInfo;

src/profile.tsx src/components/profile.tsx

@@ -19,9 +19,9 @@
  */
 
 import { Component, h } from "preact";
-import { newNotebookButton, UserTitle } from "./common";
+import { newNotebookButton, UserTitle } from "../common";
+import * as types from "../types";
 import { NotebookList } from "./list";
-import * as types from "./types";
 
 export interface ProfileProps {
   userInfo: types.UserInfo;

src/inspector_test.ts

@@ -1,6 +1,6 @@
 import { h, render } from "preact";
 import { test, testBrowser } from "../tools/tester";
-import { Inspector } from "./inspector";
+import { Inspector } from "./components/inspector";
 import { describe, DescriptorSet, InspectorOptions } from "./serializer";
 import { assertEqual } from "./util";
 

src/main.tsx

@@ -1,5 +1,5 @@
 import { h, render, rerender } from "preact";
-import { drainExecuteQueue } from "./cell";
+import { drainExecuteQueue } from "./components/cell";
 import { enableFirebase } from "./db";
 import { Router } from "./pages";
 import { assert, IS_WEB } from "./util";

src/nb_test.ts

@@ -1,8 +1,8 @@
 import { h, render, rerender } from "preact";
 import { testBrowser } from "../tools/tester";
-import { cellExecuteQueue } from "./cell";
+import { cellExecuteQueue } from "./components/cell";
+import { Notebook } from "./components/notebook";
 import * as db from "./db";
-import { Notebook } from "./notebook";
 import * as nb from "./notebook_root";
 import { assert, assertEqual, createResolvable } from "./util";
 

src/notebook_root.tsx

@@ -29,8 +29,8 @@ import {
   UserMenu,
   UserTitle
 } from "./common";
+import { Notebook } from "./components/notebook";
 import * as db from "./db";
-import { Notebook } from "./notebook";
 import * as types from "./types";
 
 // An anonymous notebook doc for when users aren't logged in

src/output_handler.ts

@@ -19,7 +19,7 @@
 
 import { h, render } from "preact";
 import * as vega from "vega-lib";
-import { Inspector } from "./inspector";
+import { Inspector } from "./components/inspector";
 import { InspectorData } from "./serializer";
 
 export type PlotData = Array<Array<{ x: number; y: number }>>;

src/pages.tsx

@@ -16,8 +16,8 @@
 // This is the propelml.org website. It is used both server-side and
 // client-side for generating HTML.
 import { Component, h, render } from "preact";
+import { PropelIndex } from "./components/index";
 import * as db from "./db";
-import { PropelIndex } from "./index";
 import * as nb from "./notebook_root";
 import * as types from "./types";