From a744ede597988894a4556eb85b21a81292a9bc76 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Tue, 31 Oct 2017 18:19:55 -0400 Subject: [PATCH 1/2] feat(companies): initial work, added firebase for companies list --- package.json | 2 + src/app/companies/companies.component.html | 23 +++++++++ src/app/companies/companies.component.scss | 29 ++++++++++++ src/app/companies/companies.component.ts | 46 +++++++++++++++++- src/app/companies/companies.module.ts | 23 +++++++-- src/app/companies/company.service.spec.ts | 26 ++++++++++ src/app/companies/company.service.ts | 21 +++++++++ src/app/companies/test.js | 0 .../company-dialog.component.html | 23 +++++++++ .../company-dialog.component.scss | 0 .../company-dialog.component.spec.ts | 47 +++++++++++++++++++ .../company-dialog.component.ts | 41 ++++++++++++++++ src/app/material/material.module.ts | 21 ++++++--- src/environments/environment.prod.ts | 10 +++- src/environments/environment.ts | 11 ++++- 15 files changed, 309 insertions(+), 14 deletions(-) create mode 100644 src/app/companies/company.service.spec.ts create mode 100644 src/app/companies/company.service.ts create mode 100644 src/app/companies/test.js create mode 100644 src/app/company-dialog/company-dialog.component.html create mode 100644 src/app/company-dialog/company-dialog.component.scss create mode 100644 src/app/company-dialog/company-dialog.component.spec.ts create mode 100644 src/app/company-dialog/company-dialog.component.ts diff --git a/package.json b/package.json index 5225b37a..c0c01e59 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,9 @@ "@angular/router": "5.1.1", "@angular/service-worker": "5.1.1", "@types/hammerjs": "2.0.35", + "angularfire2": "5.0.0-rc.3", "core-js": "2.4.1", + "firebase": "4.6.2", "hammerjs": "2.0.8", "rxjs": "5.5.5", "ts-loader": "3.1.1", diff --git a/src/app/companies/companies.component.html b/src/app/companies/companies.component.html index 8b137891..59aae7cf 100644 --- a/src/app/companies/companies.component.html +++ b/src/app/companies/companies.component.html @@ -1 +1,24 @@ +
+ + + +
+ +
+ {{company.Name}} + + {{company.Location}} + + + + + + +
\ No newline at end of file diff --git a/src/app/companies/companies.component.scss b/src/app/companies/companies.component.scss index e69de29b..ff65ed6c 100644 --- a/src/app/companies/companies.component.scss +++ b/src/app/companies/companies.component.scss @@ -0,0 +1,29 @@ +.example-header-image { + background-image: url('../../assets/img/Rx_Logo-96-96.png'); + background-size: cover; +} + +.companies-container { + margin: 0 15px; +} + +.website-button { + position: absolute; + right: 0; + top: 0; +} + +mat-card { + margin-top: 15px; +} + +.company-add-button { + position: absolute; + z-index: 99; + right: 0; + top: 5px; +} + +.company-logo{ + height: 40px; +} \ No newline at end of file diff --git a/src/app/companies/companies.component.ts b/src/app/companies/companies.component.ts index cb729f61..64f050cb 100644 --- a/src/app/companies/companies.component.ts +++ b/src/app/companies/companies.component.ts @@ -1,4 +1,14 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { + AngularFirestore, + AngularFirestoreCollection +} from 'angularfire2/firestore'; +import * as firebase from 'firebase'; +import { MatDialog } from '@angular/material'; + +import { CompanyDialogComponent } from '../company-dialog/company-dialog.component'; +import { CompanyService } from './company.service'; @Component({ selector: 'app-companies', @@ -6,5 +16,37 @@ import { Component } from '@angular/core'; styleUrls: ['./companies.component.scss'] }) export class CompaniesComponent { - constructor() {} + companies: Observable; + private uploadTask: firebase.storage.UploadTask; + private companiesCollection: AngularFirestoreCollection; + constructor( + db: AngularFirestore, + private dialog: MatDialog, + private companyService: CompanyService + ) { + this.companiesCollection = db.collection('companies'); + this.companies = this.companiesCollection.valueChanges(); + } + + uploadSingle(file: any) { + return this.companyService.pushUpload(file); + } + + addCompany() { + const dialogRef = this.dialog.open(CompanyDialogComponent, {}); + dialogRef.afterClosed().subscribe(company => { + if (company) { + const file = this.uploadSingle(company.File).then((fileResult: any) => { + company.File = fileResult.downloadURL; + this.companiesCollection.add(company).then(result => { + console.log(result); + }); + }); + } + }); + } + + openWindow(url: string) { + window.open(url, '_blank'); + } } diff --git a/src/app/companies/companies.module.ts b/src/app/companies/companies.module.ts index af95e2c1..8720e879 100644 --- a/src/app/companies/companies.module.ts +++ b/src/app/companies/companies.module.ts @@ -1,9 +1,26 @@ +import { CommonModule } from '@angular/common'; +import { MaterialModule } from './../material/material.module'; import { NgModule } from '@angular/core'; +import { AngularFireModule } from 'angularfire2'; +import { AngularFirestoreModule } from 'angularfire2/firestore'; + import { CompaniesComponent } from './companies.component'; import { CompaniesRoutingModule } from './companies-routing.module'; - +import { environment } from '../../environments/environment'; +import { CompanyDialogComponent } from '../company-dialog/company-dialog.component'; +import { MatDialogRef } from '@angular/material'; +import { CompanyService } from './company.service'; +import { AngularFireDatabase } from 'angularfire2/database'; @NgModule({ - imports: [CompaniesRoutingModule], - declarations: [CompaniesComponent] + imports: [ + CommonModule, + CompaniesRoutingModule, + MaterialModule, + AngularFirestoreModule, + AngularFireModule.initializeApp(environment.firebase) + ], + declarations: [CompaniesComponent, CompanyDialogComponent], + entryComponents: [CompanyDialogComponent], + providers: [CompanyService, AngularFireDatabase] }) export class CompaniesModule {} diff --git a/src/app/companies/company.service.spec.ts b/src/app/companies/company.service.spec.ts new file mode 100644 index 00000000..f73d9a69 --- /dev/null +++ b/src/app/companies/company.service.spec.ts @@ -0,0 +1,26 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { CompanyService } from './company.service'; +import { AngularFireDatabase } from 'angularfire2/database'; +import { AngularFirestoreModule } from 'angularfire2/firestore'; +import { AngularFireModule } from 'angularfire2'; +import { environment } from '../../environments/environment'; + +describe('CompanyService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + AngularFirestoreModule, + AngularFireModule.initializeApp(environment.firebase) + ], + providers: [CompanyService, AngularFireDatabase] + }); + }); + + it( + 'should be created', + inject([CompanyService, AngularFireDatabase], (service: CompanyService) => { + expect(service).toBeTruthy(); + }) + ); +}); diff --git a/src/app/companies/company.service.ts b/src/app/companies/company.service.ts new file mode 100644 index 00000000..93877ed0 --- /dev/null +++ b/src/app/companies/company.service.ts @@ -0,0 +1,21 @@ +import { Injectable } from "@angular/core"; +import { AngularFireDatabase, AngularFireList } from "angularfire2/database"; +import * as firebase from "firebase"; +import { Observable } from "rxjs/Observable"; + +@Injectable() +export class CompanyService { + constructor(private db: AngularFireDatabase) {} + basePath = "uploads"; + uploadsRef: AngularFireList; + uploads: Observable; + // Executes the file uploading to firebase https://firebase.google.com/docs/storage/web/upload-files + + pushUpload(upload: any) { + const storageRef = firebase.storage().ref(); + const uploadTask = storageRef + .child(`${this.basePath}/${upload.name}`) + .put(upload); + return uploadTask; + } +} diff --git a/src/app/companies/test.js b/src/app/companies/test.js new file mode 100644 index 00000000..e69de29b diff --git a/src/app/company-dialog/company-dialog.component.html b/src/app/company-dialog/company-dialog.component.html new file mode 100644 index 00000000..59573ded --- /dev/null +++ b/src/app/company-dialog/company-dialog.component.html @@ -0,0 +1,23 @@ +

New Company Form

+ +
+ + + + + + + + + http://reactivex.io + + + + + +
+ + + + + \ No newline at end of file diff --git a/src/app/company-dialog/company-dialog.component.scss b/src/app/company-dialog/company-dialog.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/company-dialog/company-dialog.component.spec.ts b/src/app/company-dialog/company-dialog.component.spec.ts new file mode 100644 index 00000000..57e25f84 --- /dev/null +++ b/src/app/company-dialog/company-dialog.component.spec.ts @@ -0,0 +1,47 @@ +// import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +// import { CompanyDialogComponent } from './company-dialog.component'; +// import { NgModule } from '@angular/core'; +// import { MatDialogModule, MatDialog } from '@angular/material'; +// import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +// import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; + +// import { SharedModule } from '../shared.module'; +// import { inject } from '@angular/core/testing'; +// import { CompaniesModule } from '../companies/companies.module'; +// import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; +// import { CommonModule } from '@angular/common'; + +// describe('CompanyDialogComponent', () => { +// let component: CompanyDialogComponent; +// let fixture: ComponentFixture; +// let dialog: MatDialog; + +// beforeEach( +// async(() => { +// TestBed.configureTestingModule({ +// imports: [SharedModule, NoopAnimationsModule], +// declarations: [CompanyDialogComponent], +// providers: [], +// }).overrideModule(BrowserDynamicTestingModule, { +// set: { +// entryComponents: [CompanyDialogComponent] +// } +// }).compileComponents(); +// }) +// ); + +// beforeEach(() => { +// fixture = TestBed.createComponent(CompanyDialogComponent); +// component = fixture.componentInstance; +// fixture.detectChanges(); + +// dialog = TestBed.get(MatDialog); +// let dialogRef = dialog.open(CompanyDialogComponent); +// component = dialogRef.componentInstance; +// }); + +// it('should create', () => { +// expect(component).toBeTruthy(); +// }); +// }); diff --git a/src/app/company-dialog/company-dialog.component.ts b/src/app/company-dialog/company-dialog.component.ts new file mode 100644 index 00000000..9ee46757 --- /dev/null +++ b/src/app/company-dialog/company-dialog.component.ts @@ -0,0 +1,41 @@ +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { CompanyService } from '../companies/company.service'; + +@Component({ + selector: 'app-company-dialog', + templateUrl: './company-dialog.component.html', + styleUrls: ['./company-dialog.component.scss'] +}) +export class CompanyDialogComponent { + companyForm: FormGroup; + selectedFile: File; + + constructor(private formBuilder: FormBuilder) { + this.createCompanyForm(); + } + + detectFiles(event) { + const fileControl = this.companyForm.get('File'); + this.selectedFile = event.target.files.item(0).name; + fileControl.setValue(event.target.files.item(0)); + } + + private createCompanyForm() { + this.companyForm = this.formBuilder.group({ + Name: ['', Validators.required], + Location: ['', Validators.required], + Website: ['', Validators.required], + File: '' + }); + } + + private subscribeToForm() { + const nameControl = this.companyForm.get('Name'); + nameControl.valueChanges.forEach((value: string) => console.log(value)); + const locationControl = this.companyForm.get('Location'); + nameControl.valueChanges.forEach((value: string) => console.log(value)); + const websiteControl = this.companyForm.get('Website'); + nameControl.valueChanges.forEach((value: string) => console.log(value)); + } +} diff --git a/src/app/material/material.module.ts b/src/app/material/material.module.ts index d762a596..78be3a4c 100644 --- a/src/app/material/material.module.ts +++ b/src/app/material/material.module.ts @@ -4,44 +4,51 @@ import { FlexLayoutModule } from '@angular/flex-layout'; import { MatToolbarModule, MatIconModule, + MatButtonModule, + MatDialogModule, MatListModule, MatSidenavModule, - MatButtonModule, MatExpansionModule, MatCardModule, MatInputModule, MatMenuModule, - MatTooltipModule, - MatSnackBarModule + MatTooltipModule } from '@angular/material'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; @NgModule({ declarations: [], imports: [ MatToolbarModule, MatIconModule, + MatButtonModule, + MatDialogModule, MatListModule, MatSidenavModule, - MatButtonModule, MatExpansionModule, MatCardModule, MatInputModule, MatMenuModule, MatTooltipModule, - MatSnackBarModule + FlexLayoutModule, + ReactiveFormsModule, + FormsModule ], exports: [ MatToolbarModule, MatIconModule, + MatButtonModule, + MatDialogModule, MatListModule, MatSidenavModule, - MatButtonModule, MatExpansionModule, MatCardModule, MatInputModule, MatMenuModule, MatTooltipModule, - MatSnackBarModule + FlexLayoutModule, + ReactiveFormsModule, + FormsModule ] }) export class MaterialModule {} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 3612073b..7b57ba02 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,3 +1,11 @@ export const environment = { - production: true + production: true, + firebase: { + apiKey: '', + authDomain: '', + databaseURL: '', + projectId: '', + storageBucket: '', + messagingSenderId: '' + } }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b7f639ae..9decac33 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,6 +3,15 @@ // `ng build --env=prod` then `environment.prod.ts` will be used instead. // The list of which env maps to which file can be found in `.angular-cli.json`. +// rxjsdemo@gmail.com //rxjsdemo1234 export const environment = { - production: false + production: false, + firebase: { + apiKey: "", + authDomain: "", + databaseURL: "", + projectId: "", + storageBucket: "", + messagingSenderId: "" + } }; From 8c5164cbdeb2bcffad59784e620f49eaace43f40 Mon Sep 17 00:00:00 2001 From: Ashwin Sureshkumar Date: Fri, 22 Dec 2017 11:23:39 -0500 Subject: [PATCH 2/2] feat(companies): Implement showcase of companies from list in the repo - Showcase list of companies using RxJS - Remove firebase implementation temporarily to move forward - Added a temporary list of companies to test Close #10 --- package.json | 2 - src/app/companies/companies-list.ts | 16 ++++++ src/app/companies/companies.component.html | 15 +++--- src/app/companies/companies.component.scss | 10 ++-- src/app/companies/companies.component.ts | 43 ++-------------- src/app/companies/companies.model.ts | 6 +++ src/app/companies/companies.module.ts | 18 ++----- src/app/companies/company.service.spec.ts | 12 ++--- src/app/companies/company.service.ts | 23 +++------ src/app/companies/test.js | 0 .../company-dialog.component.html | 23 --------- .../company-dialog.component.scss | 0 .../company-dialog.component.spec.ts | 47 ------------------ .../company-dialog.component.ts | 41 --------------- src/app/material/material.module.ts | 13 ++--- src/assets/companies/google.png | Bin 0 -> 7844 bytes src/assets/companies/microsoft.png | Bin 0 -> 5598 bytes src/environments/environment.prod.ts | 10 +--- src/environments/environment.ts | 11 +--- 19 files changed, 56 insertions(+), 234 deletions(-) create mode 100644 src/app/companies/companies-list.ts create mode 100644 src/app/companies/companies.model.ts delete mode 100644 src/app/companies/test.js delete mode 100644 src/app/company-dialog/company-dialog.component.html delete mode 100644 src/app/company-dialog/company-dialog.component.scss delete mode 100644 src/app/company-dialog/company-dialog.component.spec.ts delete mode 100644 src/app/company-dialog/company-dialog.component.ts create mode 100644 src/assets/companies/google.png create mode 100644 src/assets/companies/microsoft.png diff --git a/package.json b/package.json index c0c01e59..5225b37a 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,7 @@ "@angular/router": "5.1.1", "@angular/service-worker": "5.1.1", "@types/hammerjs": "2.0.35", - "angularfire2": "5.0.0-rc.3", "core-js": "2.4.1", - "firebase": "4.6.2", "hammerjs": "2.0.8", "rxjs": "5.5.5", "ts-loader": "3.1.1", diff --git a/src/app/companies/companies-list.ts b/src/app/companies/companies-list.ts new file mode 100644 index 00000000..6fca3190 --- /dev/null +++ b/src/app/companies/companies-list.ts @@ -0,0 +1,16 @@ +import { Company } from './companies.model'; + +export const COMPANIES_LIST: Company[] = [ + { + name: 'Google', + location: 'California', + logo: '../../assets/companies/google.png', + website: 'http://google.com' + }, + { + name: 'Microsoft', + location: 'Seattle', + logo: '../../assets/companies/microsoft.png', + website: 'http://microsoft.com' + } +]; diff --git a/src/app/companies/companies.component.html b/src/app/companies/companies.component.html index 59aae7cf..9f180b6a 100644 --- a/src/app/companies/companies.component.html +++ b/src/app/companies/companies.component.html @@ -1,24 +1,21 @@
-
- +
- {{company.Name}} + {{company.name}} - {{company.Location}} - + -
\ No newline at end of file + diff --git a/src/app/companies/companies.component.scss b/src/app/companies/companies.component.scss index ff65ed6c..c87f968a 100644 --- a/src/app/companies/companies.component.scss +++ b/src/app/companies/companies.component.scss @@ -17,13 +17,11 @@ mat-card { margin-top: 15px; } -.company-add-button { - position: absolute; - z-index: 99; - right: 0; - top: 5px; +mat-card-avatar { + margin-right: 10px; } .company-logo{ height: 40px; -} \ No newline at end of file + width: 40px; +} diff --git a/src/app/companies/companies.component.ts b/src/app/companies/companies.component.ts index 64f050cb..e82514c8 100644 --- a/src/app/companies/companies.component.ts +++ b/src/app/companies/companies.component.ts @@ -1,14 +1,10 @@ +import { COMPANIES_LIST } from './companies-list'; import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { - AngularFirestore, - AngularFirestoreCollection -} from 'angularfire2/firestore'; -import * as firebase from 'firebase'; import { MatDialog } from '@angular/material'; -import { CompanyDialogComponent } from '../company-dialog/company-dialog.component'; import { CompanyService } from './company.service'; +import { Company } from './companies.model'; @Component({ selector: 'app-companies', @@ -16,37 +12,8 @@ import { CompanyService } from './company.service'; styleUrls: ['./companies.component.scss'] }) export class CompaniesComponent { - companies: Observable; - private uploadTask: firebase.storage.UploadTask; - private companiesCollection: AngularFirestoreCollection; - constructor( - db: AngularFirestore, - private dialog: MatDialog, - private companyService: CompanyService - ) { - this.companiesCollection = db.collection('companies'); - this.companies = this.companiesCollection.valueChanges(); - } - - uploadSingle(file: any) { - return this.companyService.pushUpload(file); - } - - addCompany() { - const dialogRef = this.dialog.open(CompanyDialogComponent, {}); - dialogRef.afterClosed().subscribe(company => { - if (company) { - const file = this.uploadSingle(company.File).then((fileResult: any) => { - company.File = fileResult.downloadURL; - this.companiesCollection.add(company).then(result => { - console.log(result); - }); - }); - } - }); - } - - openWindow(url: string) { - window.open(url, '_blank'); + companies: Observable; + constructor(private companyService: CompanyService) { + this.companies = this.companyService.getCompanies(); } } diff --git a/src/app/companies/companies.model.ts b/src/app/companies/companies.model.ts new file mode 100644 index 00000000..b848225c --- /dev/null +++ b/src/app/companies/companies.model.ts @@ -0,0 +1,6 @@ +export interface Company { + name: string; + location: string; + website: string; + logo: string; +} diff --git a/src/app/companies/companies.module.ts b/src/app/companies/companies.module.ts index 8720e879..23faea80 100644 --- a/src/app/companies/companies.module.ts +++ b/src/app/companies/companies.module.ts @@ -1,26 +1,14 @@ import { CommonModule } from '@angular/common'; import { MaterialModule } from './../material/material.module'; import { NgModule } from '@angular/core'; -import { AngularFireModule } from 'angularfire2'; -import { AngularFirestoreModule } from 'angularfire2/firestore'; import { CompaniesComponent } from './companies.component'; import { CompaniesRoutingModule } from './companies-routing.module'; import { environment } from '../../environments/environment'; -import { CompanyDialogComponent } from '../company-dialog/company-dialog.component'; -import { MatDialogRef } from '@angular/material'; import { CompanyService } from './company.service'; -import { AngularFireDatabase } from 'angularfire2/database'; @NgModule({ - imports: [ - CommonModule, - CompaniesRoutingModule, - MaterialModule, - AngularFirestoreModule, - AngularFireModule.initializeApp(environment.firebase) - ], - declarations: [CompaniesComponent, CompanyDialogComponent], - entryComponents: [CompanyDialogComponent], - providers: [CompanyService, AngularFireDatabase] + imports: [CommonModule, CompaniesRoutingModule, MaterialModule], + declarations: [CompaniesComponent], + providers: [CompanyService] }) export class CompaniesModule {} diff --git a/src/app/companies/company.service.spec.ts b/src/app/companies/company.service.spec.ts index f73d9a69..72389aad 100644 --- a/src/app/companies/company.service.spec.ts +++ b/src/app/companies/company.service.spec.ts @@ -1,25 +1,19 @@ import { TestBed, inject } from '@angular/core/testing'; import { CompanyService } from './company.service'; -import { AngularFireDatabase } from 'angularfire2/database'; -import { AngularFirestoreModule } from 'angularfire2/firestore'; -import { AngularFireModule } from 'angularfire2'; import { environment } from '../../environments/environment'; describe('CompanyService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - AngularFirestoreModule, - AngularFireModule.initializeApp(environment.firebase) - ], - providers: [CompanyService, AngularFireDatabase] + imports: [], + providers: [CompanyService] }); }); it( 'should be created', - inject([CompanyService, AngularFireDatabase], (service: CompanyService) => { + inject([CompanyService], (service: CompanyService) => { expect(service).toBeTruthy(); }) ); diff --git a/src/app/companies/company.service.ts b/src/app/companies/company.service.ts index 93877ed0..62f000a0 100644 --- a/src/app/companies/company.service.ts +++ b/src/app/companies/company.service.ts @@ -1,21 +1,12 @@ -import { Injectable } from "@angular/core"; -import { AngularFireDatabase, AngularFireList } from "angularfire2/database"; -import * as firebase from "firebase"; -import { Observable } from "rxjs/Observable"; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; +import { COMPANIES_LIST } from './companies-list'; +import { Company } from './companies.model'; @Injectable() export class CompanyService { - constructor(private db: AngularFireDatabase) {} - basePath = "uploads"; - uploadsRef: AngularFireList; - uploads: Observable; - // Executes the file uploading to firebase https://firebase.google.com/docs/storage/web/upload-files - - pushUpload(upload: any) { - const storageRef = firebase.storage().ref(); - const uploadTask = storageRef - .child(`${this.basePath}/${upload.name}`) - .put(upload); - return uploadTask; + getCompanies(): Observable { + return of(COMPANIES_LIST); } } diff --git a/src/app/companies/test.js b/src/app/companies/test.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/company-dialog/company-dialog.component.html b/src/app/company-dialog/company-dialog.component.html deleted file mode 100644 index 59573ded..00000000 --- a/src/app/company-dialog/company-dialog.component.html +++ /dev/null @@ -1,23 +0,0 @@ -

New Company Form

- -
- - - - - - - - - http://reactivex.io - - - - - -
- - - - - \ No newline at end of file diff --git a/src/app/company-dialog/company-dialog.component.scss b/src/app/company-dialog/company-dialog.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/company-dialog/company-dialog.component.spec.ts b/src/app/company-dialog/company-dialog.component.spec.ts deleted file mode 100644 index 57e25f84..00000000 --- a/src/app/company-dialog/company-dialog.component.spec.ts +++ /dev/null @@ -1,47 +0,0 @@ -// import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -// import { CompanyDialogComponent } from './company-dialog.component'; -// import { NgModule } from '@angular/core'; -// import { MatDialogModule, MatDialog } from '@angular/material'; -// import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -// import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; - -// import { SharedModule } from '../shared.module'; -// import { inject } from '@angular/core/testing'; -// import { CompaniesModule } from '../companies/companies.module'; -// import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; -// import { CommonModule } from '@angular/common'; - -// describe('CompanyDialogComponent', () => { -// let component: CompanyDialogComponent; -// let fixture: ComponentFixture; -// let dialog: MatDialog; - -// beforeEach( -// async(() => { -// TestBed.configureTestingModule({ -// imports: [SharedModule, NoopAnimationsModule], -// declarations: [CompanyDialogComponent], -// providers: [], -// }).overrideModule(BrowserDynamicTestingModule, { -// set: { -// entryComponents: [CompanyDialogComponent] -// } -// }).compileComponents(); -// }) -// ); - -// beforeEach(() => { -// fixture = TestBed.createComponent(CompanyDialogComponent); -// component = fixture.componentInstance; -// fixture.detectChanges(); - -// dialog = TestBed.get(MatDialog); -// let dialogRef = dialog.open(CompanyDialogComponent); -// component = dialogRef.componentInstance; -// }); - -// it('should create', () => { -// expect(component).toBeTruthy(); -// }); -// }); diff --git a/src/app/company-dialog/company-dialog.component.ts b/src/app/company-dialog/company-dialog.component.ts deleted file mode 100644 index 9ee46757..00000000 --- a/src/app/company-dialog/company-dialog.component.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { CompanyService } from '../companies/company.service'; - -@Component({ - selector: 'app-company-dialog', - templateUrl: './company-dialog.component.html', - styleUrls: ['./company-dialog.component.scss'] -}) -export class CompanyDialogComponent { - companyForm: FormGroup; - selectedFile: File; - - constructor(private formBuilder: FormBuilder) { - this.createCompanyForm(); - } - - detectFiles(event) { - const fileControl = this.companyForm.get('File'); - this.selectedFile = event.target.files.item(0).name; - fileControl.setValue(event.target.files.item(0)); - } - - private createCompanyForm() { - this.companyForm = this.formBuilder.group({ - Name: ['', Validators.required], - Location: ['', Validators.required], - Website: ['', Validators.required], - File: '' - }); - } - - private subscribeToForm() { - const nameControl = this.companyForm.get('Name'); - nameControl.valueChanges.forEach((value: string) => console.log(value)); - const locationControl = this.companyForm.get('Location'); - nameControl.valueChanges.forEach((value: string) => console.log(value)); - const websiteControl = this.companyForm.get('Website'); - nameControl.valueChanges.forEach((value: string) => console.log(value)); - } -} diff --git a/src/app/material/material.module.ts b/src/app/material/material.module.ts index 78be3a4c..20fbe321 100644 --- a/src/app/material/material.module.ts +++ b/src/app/material/material.module.ts @@ -5,16 +5,15 @@ import { MatToolbarModule, MatIconModule, MatButtonModule, - MatDialogModule, MatListModule, MatSidenavModule, MatExpansionModule, MatCardModule, MatInputModule, MatMenuModule, - MatTooltipModule + MatTooltipModule, + MatSnackBarModule } from '@angular/material'; -import { ReactiveFormsModule, FormsModule } from '@angular/forms'; @NgModule({ declarations: [], @@ -22,7 +21,6 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms'; MatToolbarModule, MatIconModule, MatButtonModule, - MatDialogModule, MatListModule, MatSidenavModule, MatExpansionModule, @@ -31,14 +29,12 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms'; MatMenuModule, MatTooltipModule, FlexLayoutModule, - ReactiveFormsModule, - FormsModule + MatSnackBarModule ], exports: [ MatToolbarModule, MatIconModule, MatButtonModule, - MatDialogModule, MatListModule, MatSidenavModule, MatExpansionModule, @@ -47,8 +43,7 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms'; MatMenuModule, MatTooltipModule, FlexLayoutModule, - ReactiveFormsModule, - FormsModule + MatSnackBarModule ] }) export class MaterialModule {} diff --git a/src/assets/companies/google.png b/src/assets/companies/google.png new file mode 100644 index 0000000000000000000000000000000000000000..0a02a7b97c447fa934a3ed7e7784ebeb0dd7e010 GIT binary patch literal 7844 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 literal 0 HcmV?d00001 diff --git a/src/assets/companies/microsoft.png b/src/assets/companies/microsoft.png new file mode 100644 index 0000000000000000000000000000000000000000..11feffc1d82cf95f4fcf7eaf9ad39991d5d99056 GIT binary patch literal 5598 zcmeAS@N?(olHy`uVBq!ia0y~yV15C@9Be=l-^Ev+04d25*NBqf{Irtt#G+IN$CUh} zR0Yr6#Prml)Wnp^!jq{s3=E>p*LBuuCJx2Rl0&`xhM^LkCL_=*v zqw5W)l83jr);Ml#$j=f;obldLA(AbwZ36eSju}8p7)nJO`G6FYERYZYx`9FA0wa(d z6(lP_)&hfWG%Tr|j$#)uGcYtbumi)E#R^DplmH2b5iNMw{NC@W&b(Vz&7UtfUCP|< z-mbhoJaUW|79CF02vcZY$q5S~NNNNJ8#rf!gKbohoB$au6lqaQfHO0=#DL^*aLqF+ z2&#(750H^vI8wQ`5Qay^u&;d_;*5nS1mrU<2>gEP`?r5A4P9O?5sfkJyF`>382$+Q zHaoBb^CvJ}Hu8bWg2ujK$1k5D2+VpMB?2!#e0Hv_D+^ylMU(QQ0S95^PV+ICKS3j3^P6