Added stream comp, changed app name

This commit is contained in:
Nicolas Constant 2018-03-15 21:03:23 -04:00
parent 3ec22bac0c
commit 2de3dafada
12 changed files with 66 additions and 9 deletions

View File

@ -1,7 +1,7 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "ang-electron"
"name": "mamoth"
},
"apps": [
{

View File

@ -45,6 +45,8 @@
<Content Include="src\app\components\left-side-bar\left-side-bar.component.html" />
<Content Include="src\app\components\streams-main-display\streams-main-display.component.css" />
<Content Include="src\app\components\streams-main-display\streams-main-display.component.html" />
<Content Include="src\app\components\stream\stream.component.css" />
<Content Include="src\app\components\stream\stream.component.html" />
<Content Include="src\assets\.gitkeep" />
<Content Include="src\favicon.ico" />
<Content Include="src\index.html" />
@ -66,6 +68,7 @@
<Folder Include="src\app\components\left-side-bar\" />
<Folder Include="src\app\components\" />
<Folder Include="src\app\components\streams-main-display\" />
<Folder Include="src\app\components\stream\" />
<Folder Include="src\app\services\" />
<Folder Include="src\assets\" />
<Folder Include="src\environments\" />
@ -80,6 +83,8 @@
<TypeScriptCompile Include="src\app\components\left-side-bar\left-side-bar.component.ts" />
<TypeScriptCompile Include="src\app\components\streams-main-display\streams-main-display.component.spec.ts" />
<TypeScriptCompile Include="src\app\components\streams-main-display\streams-main-display.component.ts" />
<TypeScriptCompile Include="src\app\components\stream\stream.component.spec.ts" />
<TypeScriptCompile Include="src\app\components\stream\stream.component.ts" />
<TypeScriptCompile Include="src\environments\environment.prod.ts" />
<TypeScriptCompile Include="src\environments\environment.ts" />
<TypeScriptCompile Include="src\main.ts" />

View File

@ -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.
// code. You can also put them in separate files and require them here.

View File

@ -1,6 +1,6 @@
{
"name": "ang-electron",
"version": "0.0.0",
"name": "mamoth",
"version": "0.0.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,5 +1,5 @@
{
"name": "ang-electron",
"name": "mamoth",
"version": "0.0.0",
"license": "MIT",
"main": "main.js",

View File

@ -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,

View File

@ -0,0 +1,7 @@
#mam-stream-column {
width: 300px;
height: calc(100%);
background-color: aqua;
}

View File

@ -0,0 +1,3 @@
<div id="mam-stream-column">
stream works!
</div>

View File

@ -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<StreamComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ StreamComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(StreamComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -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() {
}
}

View File

@ -1,4 +1,4 @@
<div id="mam-main-display">
<app-stream></app-stream>
</div>

View File

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>AngElectron</title>
<title>Mamoth</title>
<base href="./">
<meta name="viewport" content="width=device-width, initial-scale=1">