cleanup

abey-thomas · Feb 11, 2019 · df0a967 · df0a967
1 parent f099bbc
commit df0a967
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "scripts": {
     "test": "tsc && jasmine dist/**/*.spec.js",
-    "dev": "tsc --watch | nodemon --inspect ./dist/index.js --watch dist"
+    "dev": "tsc --watch | nodemon --inspect ./dist/src/index.js --watch dist"
   },
   "author": "",
   "license": "ISC",
@@ -18,4 +18,4 @@
     "tslint": "^5.12.1",
     "typescript": "^3.3.3"
   }
-}
+}
diff --git a/spec/AllocationManagerImpl.spec.ts b/spec/AllocationManagerImpl.spec.ts
@@ -1,8 +1,8 @@
-import Allocation from '../src/Allocation';
 import AllocationManagerImpl from '../src/AllocationManagerImpl';
 import ArrayModelStore from '../src/ArrayModelStore';
-import Developer from '../src/Developer';
-import Project from '../src/Project';
+import Allocation from '../src/models/Allocation';
+import Developer from '../src/models/Developer';
+import Project from '../src/models/Project';
 import Technology from '../src/Technology';
 
 describe('AllocationManagerImpl', function () {

diff --git a/src/AllocationManager.ts b/src/AllocationManager.ts
@@ -1,5 +1,5 @@
-import Developer from './Developer';
-import Project from './Project';
+import Developer from './models/Developer';
+import Project from './models/Project';
 import Technology from './Technology';
 
 export default interface AllocationManager {

diff --git a/src/AllocationManagerImpl.ts b/src/AllocationManagerImpl.ts
@@ -1,8 +1,8 @@
-import Allocation from './Allocation';
 import AllocationManager from './AllocationManager';
-import Developer from './Developer';
+import Allocation from './models/Allocation';
+import Developer from './models/Developer';
+import Project from './models/Project';
 import ModelStore from './ModelStore';
-import Project from './Project';
 import Technology from './Technology';
 
 export default class AllocationManagerImpl implements AllocationManager {

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,6 @@
-import Developer from "./Developer";
-import { developerStore } from "./stores";
-import Technology from "./Technology";
+import Developer from './models/Developer';
+import { developerStore } from './stores';
+import Technology from './Technology';
 
 const d = new Developer();
 
@@ -9,4 +9,5 @@ d.knownTechnologies = [Technology.JAVA, Technology.PYTHON];
 
 developerStore.add(d);
 
-console.log(developerStore.getById(1));
+console.log(developerStore.getById(1));
+
diff --git a/src/Allocation.ts → src/models/Allocation.ts b/src/Allocation.ts → src/models/Allocation.ts
@@ -1,5 +1,5 @@
-import Model from './Model';
-import Technology from './Technology';
+import Model from '../Model';
+import Technology from '../Technology';
 
 export default class Allocation extends Model {
     developerId: number;

diff --git a/src/Developer.ts → src/models/Developer.ts b/src/Developer.ts → src/models/Developer.ts
@@ -1,5 +1,5 @@
-import Model from './Model';
-import Technology from './Technology';
+import Model from '../Model';
+import Technology from '../Technology';
 
 export default class Developer extends Model {
     name: string;

diff --git a/src/Project.ts → src/models/Project.ts b/src/Project.ts → src/models/Project.ts
@@ -1,5 +1,5 @@
-import Model from './Model';
-import Technology from './Technology';
+import Model from '../Model';
+import Technology from '../Technology';
 
 export default class Project extends Model {
     name: string;

diff --git a/src/stores.ts b/src/stores.ts
@@ -1,7 +1,7 @@
-import Allocation from './Allocation';
 import ArrayModelStore from './ArrayModelStore';
-import Developer from './Developer';
-import Project from './Project';
+import Allocation from './models/Allocation';
+import Developer from './models/Developer';
+import Project from './models/Project';
 
 export const developerStore = new ArrayModelStore<Developer>();
 export const projectStore = new ArrayModelStore<Project>();