refresh master

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "printWidth": 80,
+  "singleQuote": true,
+  "tabWidth": 2
+}

Docker → Dockerfile

@@ -34,4 +34,6 @@ COPY --from=server /app /usr/src/app
 COPY --from=builder /app/dist /usr/src/app
 ENV PORT 80
 
-CMD [ "node", "index.js" ]
+CMD [ "node", "index.js" ]
+
+# docker build -t ngfoundry -f Dockerfile .

README.md

@@ -38,7 +38,7 @@ ngFoundry mashes together computer science ideas from Object Oriented, programmi
 
 As an engineer practicing in the early days of computer programming, I was always disappointed that computer languages were created to procedurally execute instructions, and not semantically describe scenarios declaratively and optimize the outcome. I have learned that writing software is a process of primarily listening and coding toward the truth.  I believe visualization and collaboration leads to a deeper understanding of a problem and the people you are working with to build a solution.
 
-After 40 years of writing software I understand deeply understand why this must be true, but there is still a part of me that hopes by creating language elements that let non-programmers declarative describe their domain using their own vocabulary the task of creating software can become use error prone    
+After 40 years of writing software I understand deeply why this must be true, but there is still a part of me that hopes by creating language elements that let non-programmers declarative describe their domain using their own vocabulary the task of creating software can become use error prone    
 
 
 # Instructions for building and running ngFoundry yourself

package.json

@@ -8,25 +8,30 @@
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "postinstall": "node version.js"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.0.0",
-    "@angular/common": "^5.0.0",
-    "@angular/compiler": "^5.0.0",
-    "@angular/core": "^5.0.0",
-    "@angular/forms": "^5.0.0",
-    "@angular/http": "^5.0.0",
-    "@angular/platform-browser": "^5.0.0",
-    "@angular/platform-browser-dynamic": "^5.0.0",
-    "@angular/router": "^5.0.0",
-    "@aspnet/signalr-client": "^1.0.0-alpha2-final",
+    "@angular/animations": "^5.2.0",
+    "@angular/common": "^5.2.0",
+    "@angular/compiler": "^5.2.0",
+    "@angular/core": "^5.2.0",
+    "@angular/forms": "^5.2.0",
+    "@angular/http": "^5.2.0",
+    "@angular/platform-browser": "^5.2.0",
+    "@angular/platform-browser-dynamic": "^5.2.0",
+    "@angular/router": "^5.2.0",
+    "core-js": "^2.4.1",
+    "rxjs": "^5.5.6",
+    "zone.js": "^0.8.19",
+    "@aspnet/signalr": "^1.0.0",
     "@ngrx/store": "^4.1.1",
     "@types/three": "^0.89.2",
-    "core-js": "^2.4.1",
+    "angular2-moment": "^1.8.0",
     "d3": "^4.12.0",
     "font-awesome": "^4.7.0",
+    "git-describe": "^4.0.2",
     "gsap": "^1.20.3",
     "immutable": "^3.8.2",
     "interactjs": "^1.3.1",
@@ -37,30 +42,28 @@
     "ngx-bootstrap": "^2.0.0-rc.0",
     "raw-loader": "^0.5.1",
     "reflect-metadata": "^0.1.10",
-    "rxjs": "^5.5.2",
+    "savery": "^1.2.0",
     "three": "^0.84.0",
-    "webvr-polyfill": "^0.9.40",
-    "zone.js": "^0.8.14"
+    "webvr-polyfill": "^0.9.40"
   },
   "devDependencies": {
-    "@angular/cli": "1.6.0",
-    "@angular/compiler-cli": "^5.0.0",
-    "@angular/language-service": "^5.0.0",
-    "@types/jasmine": "~2.5.53",
+    "@angular/cli": "~1.7.3",
+    "@angular/compiler-cli": "^5.2.0",
+    "@angular/language-service": "^5.2.0",
+    "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
     "codelyzer": "^4.0.1",
-    "jasmine-core": "~2.6.2",
-    "jasmine-spec-reporter": "~4.1.0",
-    "karma": "~1.7.0",
-    "karma-chrome-launcher": "~2.1.1",
-    "karma-cli": "~1.0.1",
+    "jasmine-core": "~2.8.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~2.0.0",
+    "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "^1.2.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.1.2",
-    "ts-node": "~3.2.0",
-    "tslint": "~5.7.0",
-    "typescript": "~2.4.2"
+    "ts-node": "~4.1.0",
+    "tslint": "~5.9.1",
+    "typescript": "~2.5.3"
   }
 }

src/app/app-routing.module.ts

@@ -16,6 +16,7 @@ import { TestSvgCircleComponent } from './networkview/test-svg-circle.component'
 import { ZoneTestComponent } from './zone-test/zone-test.component';
 import { DomainComponent } from './canvas/domain.component';
 import { DevSecOpsComponent } from './canvas/devsecops.component';
+import { DashboardComponent } from './dashboard/dashboard.component';
 
 const routes: Routes = [
   { path: '', pathMatch: 'full', redirectTo: 'welcome' },
@@ -26,6 +27,7 @@ const routes: Routes = [
   { path: 'world', component: WorldComponent },
   { path: 'domian', component: DomainComponent },
   { path: 'devsecops', component: DevSecOpsComponent },
+  { path: 'dashboard', component: DashboardComponent },
   { path: 'test', component: CanvasTestComponent },
   { path: 'svg', component: TestSvgComponent },
   { path: 'circle', component: TestSvgCircleComponent },

src/app/app.component.html

@@ -5,6 +5,7 @@
     <a class="nav navbar-brand " [routerLink]="[ '/domian'] ">Domian</a>
     <a class="nav navbar-brand " [routerLink]="[ '/drawing'] ">Drawing</a>
     <a class="nav navbar-brand " [routerLink]="[ '/world'] ">World</a>
+    <a class="nav navbar-brand " [routerLink]="[ '/dashboard'] ">Dashboard</a>
     <a class="nav navbar-brand " [routerLink]="[ '/devsecops'] ">DevSecOps</a>
 
     <div class="nav navbar-nav navbar-right ">

src/app/app.module.ts

@@ -9,6 +9,7 @@ import { HttpModule } from '@angular/http';
 
 import { ToastModule } from 'ng2-toastr/ng2-toastr';
 import { MaptoKeysPipe, ModelJsonPipe } from './common/maptokeys.pipe';
+import { DateFormatPipe, MomentModule } from 'angular2-moment';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -64,6 +65,12 @@ import { DomainComponent } from './canvas/domain.component';
 import { foStructureCardComponent } from './fo-inspector/fo-structure-card.component';
 import { foSolutionCardComponent } from './fo-inspector/fo-solution-card.component';
 import { DevSecOpsComponent } from './canvas/devsecops.component';
+import { ShapeTestingComponent } from './specs/shape-testing/shape-testing.component';
+import { foControllerCardComponent } from './fo-inspector/fo-controller-card.component';
+import { DashboardComponent } from './dashboard/dashboard.component';
+import { CardAComponent } from './dashboard/card-a.component';
+import { CardBComponent } from './dashboard/card-b.component';
+import { CardCComponent } from './dashboard/card-c.component';
 
 @NgModule({
   declarations: [
@@ -113,7 +120,18 @@ import { DevSecOpsComponent } from './canvas/devsecops.component';
     DomainComponent,
     foStructureCardComponent,
     foSolutionCardComponent,
-    DevSecOpsComponent
+    DevSecOpsComponent,
+    ShapeTestingComponent,
+    foControllerCardComponent,
+    DashboardComponent,
+    CardAComponent,
+    CardBComponent,
+    CardCComponent
+  ],
+  entryComponents: [
+    CardAComponent,
+    CardBComponent,
+    CardCComponent
   ],
   imports: [
     BrowserAnimationsModule,
@@ -122,13 +140,15 @@ import { DevSecOpsComponent } from './canvas/devsecops.component';
     TabsModule.forRoot(),
     ToastModule.forRoot(),
 
+    MomentModule,
     BrowserModule,
     FormsModule,
     HttpModule,
     AppRoutingModule
   ],
   providers: [
     DockerecosystemService, 
+    DateFormatPipe,
     SwimService, 
     SignalRService,
     SharingService