Move blocks to subfolder

src/client/blocks/block.ts

@@ -1,5 +1,5 @@
-import { IBlock } from "./octoTypes"
-import { Utils } from "./utils"
+import { IBlock } from "../octoTypes"
+import { Utils } from "../utils"
 
 class Block implements IBlock {
 	id: string = Utils.createGuid()

src/client/blocks/boardView.ts

@@ -1,5 +1,5 @@
+import { FilterGroup } from "../filterGroup"
 import { Block } from "./block"
-import { FilterGroup } from "./filterGroup"
 
 type IViewType = "board" | "table" | "calendar" | "list" | "gallery"
 type ISortOption = { propertyId: "__name" | string, reversed: boolean }

src/client/boardTree.ts

@@ -1,6 +1,6 @@
-import { Board, IPropertyOption, IPropertyTemplate } from "./board"
-import { BoardView } from "./boardView"
-import { Card } from "./card"
+import { Board, IPropertyOption, IPropertyTemplate } from "./blocks/board"
+import { BoardView } from "./blocks/boardView"
+import { Card } from "./blocks/card"
 import { CardFilter } from "./cardFilter"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"

src/client/cardFilter.ts

@@ -1,5 +1,5 @@
-import { IPropertyTemplate } from "./board"
-import { Card } from "./card"
+import { IPropertyTemplate } from "./blocks/board"
+import { Card } from "./blocks/card"
 import { FilterClause } from "./filterClause"
 import { FilterGroup } from "./filterGroup"
 import { Utils } from "./utils"

src/client/cardTree.ts

@@ -1,4 +1,4 @@
-import { Card } from "./card"
+import { Card } from "./blocks/card"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"
 

src/client/components/boardCard.tsx

@@ -1,7 +1,7 @@
 import React from "react"
-import { Block } from "../block"
-import { IPropertyTemplate } from "../board"
-import { Card } from "../card"
+import { Block } from "../blocks/block"
+import { IPropertyTemplate } from "../blocks/board"
+import { Card } from "../blocks/card"
 import { Menu } from "../menu"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"

src/client/components/boardComponent.tsx

@@ -1,23 +1,23 @@
 import React from "react"
 import { Archiver } from "../archiver"
 import { BlockIcons } from "../blockIcons"
-import { IPropertyOption } from "../board"
+import { IPropertyOption } from "../blocks/board"
+import { Card } from "../blocks/card"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
 import { CardFilter } from "../cardFilter"
 import ViewMenu from "../components/viewMenu"
-import MenuWrapper from "../widgets/menuWrapper"
-import Menu from "../widgets/menu"
 import { Constants } from "../constants"
 import { Menu as OldMenu } from "../menu"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"
 import { Utils } from "../utils"
+import Menu from "../widgets/menu"
+import MenuWrapper from "../widgets/menuWrapper"
 import { BoardCard } from "./boardCard"
 import { BoardColumn } from "./boardColumn"
 import Button from "./button"
-import { Editable } from "./editable"
 import { CardDialog } from "./cardDialog"
+import { Editable } from "./editable"
 import RootPortal from "./rootPortal"
 
 type Props = {

src/client/components/cardDialog.tsx

@@ -1,6 +1,6 @@
 import React from "react"
-import { Block } from "../block"
-import { Card } from "../card"
+import { Block } from "../blocks/block"
+import { Card } from "../blocks/card"
 import { BlockIcons } from "../blockIcons"
 import { BoardTree } from "../boardTree"
 import { CardTree } from "../cardTree"

src/client/components/sidebar.tsx

@@ -1,6 +1,6 @@
 import React from "react"
 import { Archiver } from "../archiver"
-import { Board } from "../board"
+import { Board } from "../blocks/board"
 import { BoardTree } from "../boardTree"
 import Menu from '../widgets/menu'
 import MenuWrapper from '../widgets/menuWrapper'

src/client/components/tableComponent.tsx

@@ -1,23 +1,22 @@
 import React from "react"
 import { Archiver } from "../archiver"
-import { Block } from "../block"
 import { BlockIcons } from "../blockIcons"
-import { IPropertyTemplate } from "../board"
+import { IPropertyTemplate } from "../blocks/board"
+import { Card } from "../blocks/card"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
 import ViewMenu from "../components/viewMenu"
-import MenuWrapper from "../widgets/menuWrapper"
-import Menu from "../widgets/menu"
 import { CsvExporter } from "../csvExporter"
 import { Menu as OldMenu } from "../menu"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"
 import { Utils } from "../utils"
+import Menu from "../widgets/menu"
+import MenuWrapper from "../widgets/menuWrapper"
 import Button from "./button"
-import { Editable } from "./editable"
-import { TableRow } from "./tableRow"
 import { CardDialog } from "./cardDialog"
+import { Editable } from "./editable"
 import RootPortal from "./rootPortal"
+import { TableRow } from "./tableRow"
 
 type Props = {
 	boardTree?: BoardTree

src/client/components/tableRow.tsx

@@ -1,6 +1,6 @@
 import React from "react"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
+import { Card } from "../blocks/card"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"
 import { Editable } from "./editable"

src/client/components/viewMenu.tsx

@@ -1,7 +1,7 @@
 import React from "react"
-import { Board } from "../board"
+import { Board } from "../blocks/board"
+import { BoardView } from "../blocks/boardView"
 import { BoardTree } from "../boardTree"
-import { BoardView } from "../boardView"
 import mutator from "../mutator"
 import { Utils } from "../utils"
 import Menu from "../widgets/menu"

src/client/components/workspaceComponent.tsx

@@ -1,6 +1,5 @@
 import React from "react"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
 import { Utils } from "../utils"
 import { WorkspaceTree } from "../workspaceTree"
 import { BoardComponent } from "./boardComponent"

src/client/csvExporter.ts

@@ -1,5 +1,5 @@
+import { BoardView } from "./blocks/boardView"
 import { BoardTree } from "./boardTree"
-import { BoardView } from "./boardView"
 import { OctoUtils } from "./octoUtils"
 import { Utils } from "./utils"
 

src/client/mutator.ts

@@ -1,8 +1,8 @@
-import { Block } from "./block"
-import { Board, IPropertyOption, IPropertyTemplate, PropertyType } from "./board"
+import { Block } from "./blocks/block"
+import { Board, IPropertyOption, IPropertyTemplate, PropertyType } from "./blocks/board"
+import { BoardView, ISortOption } from "./blocks/boardView"
+import { Card } from "./blocks/card"
 import { BoardTree } from "./boardTree"
-import { BoardView, ISortOption } from "./boardView"
-import { Card } from "./card"
 import { FilterGroup } from "./filterGroup"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"

src/client/octoTypes.ts

@@ -1,5 +1,3 @@
-import { Card } from "./card"
-
 // A block is the fundamental data type
 interface IBlock {
 	id: string

src/client/octoUtils.tsx

@@ -1,8 +1,8 @@
 import React from "react"
-import { IPropertyTemplate } from "./board"
+import { IPropertyTemplate } from "./blocks/board"
+import { ISortOption } from "./blocks/boardView"
+import { Card } from "./blocks/card"
 import { BoardTree } from "./boardTree"
-import { ISortOption } from "./boardView"
-import { Card } from "./card"
 import { Editable } from "./components/editable"
 import { Menu } from "./menu"
 import mutator from "./mutator"

src/client/pages/boardPage.tsx

@@ -1,15 +1,12 @@
 import React from "react"
 import ReactDOM from "react-dom"
+import { BoardView } from "../blocks/boardView"
 import { BoardTree } from "../boardTree"
-import { BoardView } from "../boardView"
-import { Card } from "../card"
 import { CardTree } from "../cardTree"
-import { CardDialog } from "../components/cardDialog"
 import { FilterComponent } from "../components/filterComponent"
 import { WorkspaceComponent } from "../components/workspaceComponent"
 import { FlashMessage } from "../flashMessage"
 import mutator from "../mutator"
-import octoClient from "../octoClient"
 import { OctoListener } from "../octoListener"
 import { Utils } from "../utils"
 import { WorkspaceTree } from "../workspaceTree"

src/client/pages/homePage.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { Archiver } from "../archiver"
-import { Board } from "../board"
+import { Board } from "../blocks/board"
 import Button from '../components/button'
-import mutator from '../mutator'
 import octoClient from "../octoClient"
 import { IBlock } from "../octoTypes"
 import { Utils } from "../utils"

src/client/pages/loginPage.tsx

@@ -18,10 +18,10 @@ export default class LoginPage extends React.Component<Props, State> {
     }
 
     handleLogin = () => {
-        console.log("Logging in");
+        console.log("Logging in")
     }
 
-    public render(): React.ReactNode {
+    render(): React.ReactNode {
         return (
             <div className='LoginPage'>
                 <div className='username'>

src/client/propertyMenu.ts

@@ -1,4 +1,4 @@
-import { IPropertyTemplate, PropertyType } from "./board"
+import { IPropertyTemplate, PropertyType } from "./blocks/board"
 import { Menu } from "./menu"
 import { Utils } from "./utils"
 

src/client/workspaceTree.ts

@@ -1,4 +1,4 @@
-import { Board } from "./board"
+import { Board } from "./blocks/board"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"