From 2de3dafada597b6244bb75d7308e7b54b7c6da37 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Thu, 15 Mar 2018 21:03:23 -0400 Subject: [PATCH] Added stream comp, changed app name --- Mamoth/.angular-cli.json | 2 +- Mamoth/Mamoth.njsproj | 5 ++++ Mamoth/main.js | 4 +-- Mamoth/package-lock.json | 4 +-- Mamoth/package.json | 2 +- Mamoth/src/app/app.module.ts | 4 ++- .../components/stream/stream.component.css | 7 ++++++ .../components/stream/stream.component.html | 3 +++ .../stream/stream.component.spec.ts | 25 +++++++++++++++++++ .../app/components/stream/stream.component.ts | 15 +++++++++++ .../streams-main-display.component.html | 2 +- Mamoth/src/index.html | 2 +- 12 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 Mamoth/src/app/components/stream/stream.component.css create mode 100644 Mamoth/src/app/components/stream/stream.component.html create mode 100644 Mamoth/src/app/components/stream/stream.component.spec.ts create mode 100644 Mamoth/src/app/components/stream/stream.component.ts diff --git a/Mamoth/.angular-cli.json b/Mamoth/.angular-cli.json index 34d6b6be..b0365b10 100644 --- a/Mamoth/.angular-cli.json +++ b/Mamoth/.angular-cli.json @@ -1,7 +1,7 @@ { "$schema": "./node_modules/@angular/cli/lib/config/schema.json", "project": { - "name": "ang-electron" + "name": "mamoth" }, "apps": [ { diff --git a/Mamoth/Mamoth.njsproj b/Mamoth/Mamoth.njsproj index cc8e7149..cd52457f 100644 --- a/Mamoth/Mamoth.njsproj +++ b/Mamoth/Mamoth.njsproj @@ -45,6 +45,8 @@ + + @@ -66,6 +68,7 @@ + @@ -80,6 +83,8 @@ + + diff --git a/Mamoth/main.js b/Mamoth/main.js index d9f0a67d..259f0c43 100644 --- a/Mamoth/main.js +++ b/Mamoth/main.js @@ -8,7 +8,7 @@ const url = require('url') function createWindow () { // Create the browser window. - win = new BrowserWindow({width: 400, height: 800}) + win = new BrowserWindow({ width: 400, height: 800, title: "Mamoth"}) win.setMenu(null); // and load the index.html of the app. @@ -53,4 +53,4 @@ const url = require('url') }) // In this file you can include the rest of your app's specific main process - // code. You can also put them in separate files and require them here. \ No newline at end of file + // code. You can also put them in separate files and require them here. diff --git a/Mamoth/package-lock.json b/Mamoth/package-lock.json index b3aa84aa..81d68ee8 100644 --- a/Mamoth/package-lock.json +++ b/Mamoth/package-lock.json @@ -1,6 +1,6 @@ { - "name": "ang-electron", - "version": "0.0.0", + "name": "mamoth", + "version": "0.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/Mamoth/package.json b/Mamoth/package.json index e338cd8a..99c22d43 100644 --- a/Mamoth/package.json +++ b/Mamoth/package.json @@ -1,5 +1,5 @@ { - "name": "ang-electron", + "name": "mamoth", "version": "0.0.0", "license": "MIT", "main": "main.js", diff --git a/Mamoth/src/app/app.module.ts b/Mamoth/src/app/app.module.ts index 37fa2d06..cf4a16ef 100644 --- a/Mamoth/src/app/app.module.ts +++ b/Mamoth/src/app/app.module.ts @@ -6,13 +6,15 @@ import { NgxElectronModule } from 'ngx-electron'; import { AppComponent } from './app.component'; import { LeftSideBarComponent } from './components/left-side-bar/left-side-bar.component'; import { StreamsMainDisplayComponent } from './components/streams-main-display/streams-main-display.component'; +import { StreamComponent } from './components/stream/stream.component'; @NgModule({ declarations: [ AppComponent, LeftSideBarComponent, - StreamsMainDisplayComponent + StreamsMainDisplayComponent, + StreamComponent ], imports: [ BrowserModule, diff --git a/Mamoth/src/app/components/stream/stream.component.css b/Mamoth/src/app/components/stream/stream.component.css new file mode 100644 index 00000000..db87d81d --- /dev/null +++ b/Mamoth/src/app/components/stream/stream.component.css @@ -0,0 +1,7 @@ +#mam-stream-column { + width: 300px; + height: calc(100%); + + background-color: aqua; + +} diff --git a/Mamoth/src/app/components/stream/stream.component.html b/Mamoth/src/app/components/stream/stream.component.html new file mode 100644 index 00000000..008587cc --- /dev/null +++ b/Mamoth/src/app/components/stream/stream.component.html @@ -0,0 +1,3 @@ +
+ stream works! +
diff --git a/Mamoth/src/app/components/stream/stream.component.spec.ts b/Mamoth/src/app/components/stream/stream.component.spec.ts new file mode 100644 index 00000000..72c6dd15 --- /dev/null +++ b/Mamoth/src/app/components/stream/stream.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StreamComponent } from './stream.component'; + +describe('StreamComponent', () => { + let component: StreamComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ StreamComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StreamComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mamoth/src/app/components/stream/stream.component.ts b/Mamoth/src/app/components/stream/stream.component.ts new file mode 100644 index 00000000..406c616d --- /dev/null +++ b/Mamoth/src/app/components/stream/stream.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-stream', + templateUrl: './stream.component.html', + styleUrls: ['./stream.component.css'] +}) +export class StreamComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/Mamoth/src/app/components/streams-main-display/streams-main-display.component.html b/Mamoth/src/app/components/streams-main-display/streams-main-display.component.html index 420cb252..7ef5cec2 100644 --- a/Mamoth/src/app/components/streams-main-display/streams-main-display.component.html +++ b/Mamoth/src/app/components/streams-main-display/streams-main-display.component.html @@ -1,4 +1,4 @@
- +
diff --git a/Mamoth/src/index.html b/Mamoth/src/index.html index f7385eb6..14326f9c 100644 --- a/Mamoth/src/index.html +++ b/Mamoth/src/index.html @@ -2,7 +2,7 @@ - AngElectron + Mamoth