From 04ec2ebb91d7dd1d78cfb65bf66e899c5283eba5 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 14:08:20 -0500 Subject: [PATCH 01/19] feat(companies): created company model --- src/app/employers/model/company.ts | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/app/employers/model/company.ts diff --git a/src/app/employers/model/company.ts b/src/app/employers/model/company.ts new file mode 100644 index 0000000..64f3bd1 --- /dev/null +++ b/src/app/employers/model/company.ts @@ -0,0 +1,6 @@ +export interface Company { + id: number; + name: string; + address: string; + email: string; +} From 077bd52cfdec8db9c41d22f671a52bf9dedc8812 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 14:12:26 -0500 Subject: [PATCH 02/19] feat(companies): implemented companies service --- .../services/companies.service.spec.ts | 16 ++++ .../employers/services/companies.service.ts | 74 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 src/app/employers/services/companies.service.spec.ts create mode 100644 src/app/employers/services/companies.service.ts diff --git a/src/app/employers/services/companies.service.spec.ts b/src/app/employers/services/companies.service.spec.ts new file mode 100644 index 0000000..687b22e --- /dev/null +++ b/src/app/employers/services/companies.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from "@angular/core/testing"; + +import { CompaniesService } from "./companies.service"; + +describe("CompaniesService", () => { + let service: CompaniesService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(CompaniesService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/employers/services/companies.service.ts b/src/app/employers/services/companies.service.ts new file mode 100644 index 0000000..0a0156c --- /dev/null +++ b/src/app/employers/services/companies.service.ts @@ -0,0 +1,74 @@ +import { + HttpClient, + HttpErrorResponse, + HttpHeaders, +} from "@angular/common/http"; +import { Injectable } from "@angular/core"; +import { catchError, Observable, retry, throwError } from "rxjs"; +import { environment } from "src/environments/environment"; +import { Company } from "../model/company"; + +@Injectable({ + providedIn: "root", +}) +export class CompaniesService { + private basePath = `${environment.apiUrlBase}/companies`; + + private httpOptions = { + headers: new HttpHeaders({ + "Content-Type": "application/json", + }), + }; + + constructor(private http: HttpClient) {} + + handleError(error: HttpErrorResponse) { + if (error.error instanceof ErrorEvent) { + console.error( + `An error ocurred ${error.status}, body was ${error.error}` + ); + } else { + console.error( + `Backend returned code ${error.status}, body was: ${error.error}` + ); + } + return throwError( + () => + new Error("Something happened with request, please try again later.") + ); + } + + create(company: Company): Observable { + return this.http + .post(this.basePath, JSON.stringify(company), this.httpOptions) + .pipe(retry(2), catchError(this.handleError)); + } + + getAll(): Observable { + return this.http + .get(this.basePath, this.httpOptions) + .pipe(retry(2), catchError(this.handleError)); + } + + getById(id: number): Observable { + return this.http + .get(`${this.basePath}/${id}`, this.httpOptions) + .pipe(retry(2), catchError(this.handleError)); + } + + update(id: number, item: Company): Observable { + return this.http + .put( + `${this.basePath}/${id}`, + JSON.stringify(item), + this.httpOptions + ) + .pipe(retry(2), catchError(this.handleError)); + } + + delete(id: number) { + return this.http + .delete(`${this.basePath}/${id}`, this.httpOptions) + .pipe(retry(2), catchError(this.handleError)); + } +} From 57266743691dbe904d378bf153777d3c82069c90 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 15:19:57 -0500 Subject: [PATCH 03/19] feat(companies): generated companies component --- src/app/app.module.ts | 2 ++ .../pages/companies/companies.component.css | 0 .../pages/companies/companies.component.html | 1 + .../companies/companies.component.spec.ts | 24 +++++++++++++ .../pages/companies/companies.component.ts | 35 +++++++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 src/app/employers/pages/companies/companies.component.css create mode 100644 src/app/employers/pages/companies/companies.component.html create mode 100644 src/app/employers/pages/companies/companies.component.spec.ts create mode 100644 src/app/employers/pages/companies/companies.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7a7a7bd..4175e81 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -33,6 +33,7 @@ import { MatDialogModule } from "@angular/material/dialog"; import { MatSnackBarModule } from "@angular/material/snack-bar"; import { MatProgressBarModule } from "@angular/material/progress-bar"; import { FooterComponent } from "./common/components/footer/footer.component"; +import { CompaniesComponent } from "./employers/pages/companies/companies.component"; export const imports: NonNullable = [ AppRoutingModule, @@ -70,6 +71,7 @@ export const imports: NonNullable = [ ResetpasswordComponent, ChangepasswordComponent, FooterComponent, + CompaniesComponent, ], imports: [BrowserModule, ...imports], providers: [], diff --git a/src/app/employers/pages/companies/companies.component.css b/src/app/employers/pages/companies/companies.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/employers/pages/companies/companies.component.html b/src/app/employers/pages/companies/companies.component.html new file mode 100644 index 0000000..48b93b8 --- /dev/null +++ b/src/app/employers/pages/companies/companies.component.html @@ -0,0 +1 @@ +

companies works!

diff --git a/src/app/employers/pages/companies/companies.component.spec.ts b/src/app/employers/pages/companies/companies.component.spec.ts new file mode 100644 index 0000000..80d3bd3 --- /dev/null +++ b/src/app/employers/pages/companies/companies.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { CompaniesComponent } from "./companies.component"; + +describe("CompaniesComponent", () => { + let component: CompaniesComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [CompaniesComponent], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(CompaniesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/employers/pages/companies/companies.component.ts b/src/app/employers/pages/companies/companies.component.ts new file mode 100644 index 0000000..36b058e --- /dev/null +++ b/src/app/employers/pages/companies/companies.component.ts @@ -0,0 +1,35 @@ +import { Component, OnInit } from "@angular/core"; +import { Company } from "../../model/company"; +import { CompaniesService } from "../../services/companies.service"; + +@Component({ + selector: "app-companies", + templateUrl: "./companies.component.html", + styleUrls: ["./companies.component.css"], +}) +export class CompaniesComponent implements OnInit { + // currentItem: Partial = {}; + dataSource: Company[] = []; + constructor(private companiesService: CompaniesService) {} + + ngOnInit() { + this.getAll(); + } + + getAll() { + this.companiesService.getAll().subscribe(response => { + this.dataSource = response; + }); + } + /* + createCompany(company: Company) { + this.companiesService.create(company).subscribe(); + } + + deleteCompany(id: number) { + this.companiesService.delete(id).subscribe(() => { + + }) + } + */ +} From 423fbf16736dd79a34a61e3bf3657c08e6d3d551 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 16:01:07 -0500 Subject: [PATCH 04/19] feat(companies): added test companies data --- server/db.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/server/db.json b/server/db.json index 727f3b7..a75df83 100644 --- a/server/db.json +++ b/server/db.json @@ -175,5 +175,37 @@ "salaryRange": "$135k-$157k", "published": false } + ], + "companies": [ + { + "id": 1, + "name": "Google Inc.", + "address": "Silicon Valley", + "email": "google@support.com" + }, + { + "id": 2, + "name": "Oracle", + "address": "Silicon Valley", + "email": "oracle@support.com" + }, + { + "id": 3, + "name": "Microsoft Inc.", + "address": "Silicon Valley", + "email": "microsoft@support.com" + }, + { + "id": 4, + "name": "Meta", + "address": "Silicon Valley", + "email": "meta@support.com" + }, + { + "id": 5, + "name": "Apple Inc.", + "address": "Silicon Valley", + "email": "apple@support.com" + } ] } From 9de10cc12a6fccec2ea1b650b32daf7f74feff1b Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 16:01:44 -0500 Subject: [PATCH 05/19] feat(companies): implemented first component view --- .../pages/companies/companies.component.css | 5 +++++ .../pages/companies/companies.component.html | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/app/employers/pages/companies/companies.component.css b/src/app/employers/pages/companies/companies.component.css index e69de29..27acf9b 100644 --- a/src/app/employers/pages/companies/companies.component.css +++ b/src/app/employers/pages/companies/companies.component.css @@ -0,0 +1,5 @@ +h1 { + font-size: x-large; + font-weight: 500; + text-align: center; +} diff --git a/src/app/employers/pages/companies/companies.component.html b/src/app/employers/pages/companies/companies.component.html index 48b93b8..2545905 100644 --- a/src/app/employers/pages/companies/companies.component.html +++ b/src/app/employers/pages/companies/companies.component.html @@ -1 +1,16 @@ -

companies works!

+
+

Associate Companies

+ + {{ item.name }} + + {{ item.email }} + + + {{ item.address }} + + + + + + +
From 0e8f64df503ddd7c6d7a7aa76f6d20d7c9f1731c Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 16:02:27 -0500 Subject: [PATCH 06/19] refactor: reordered imports --- src/app/app.module.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4175e81..1bacb5e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -16,6 +16,8 @@ import { JobsSearchComponent } from "./jobs/pages/jobs-search/jobs-search.compon import { JobConfirmationDialogComponent } from "./jobs/components/job-confirmation-dialog/job-confirmation-dialog.component"; import { ChangepasswordComponent } from "./auth/pages/changepassword/changepassword.component"; import { ResetpasswordComponent } from "./auth/pages/resetpassword/resetpassword.component"; +import { CompaniesComponent } from "./employers/pages/companies/companies.component"; +import { FooterComponent } from "./common/components/footer/footer.component"; import { MatToolbarModule } from "@angular/material/toolbar"; import { MatIconModule } from "@angular/material/icon"; @@ -32,8 +34,7 @@ import { MatMenuModule } from "@angular/material/menu"; import { MatDialogModule } from "@angular/material/dialog"; import { MatSnackBarModule } from "@angular/material/snack-bar"; import { MatProgressBarModule } from "@angular/material/progress-bar"; -import { FooterComponent } from "./common/components/footer/footer.component"; -import { CompaniesComponent } from "./employers/pages/companies/companies.component"; +import { MatCard, MatCardModule } from "@angular/material/card"; export const imports: NonNullable = [ AppRoutingModule, @@ -56,6 +57,7 @@ export const imports: NonNullable = [ MatDialogModule, MatSnackBarModule, MatProgressBarModule, + MatCardModule, ]; @NgModule({ From 2d2588584d5f0481381d04a738e9b9a271c88237 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 16:15:24 -0500 Subject: [PATCH 07/19] feat(companies): modified cards style --- .../pages/companies/companies.component.html | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/app/employers/pages/companies/companies.component.html b/src/app/employers/pages/companies/companies.component.html index 2545905..9bda5f6 100644 --- a/src/app/employers/pages/companies/companies.component.html +++ b/src/app/employers/pages/companies/companies.component.html @@ -1,16 +1,20 @@

Associate Companies

- - {{ item.name }} - - {{ item.email }} - - - {{ item.address }} - - - - - - +
+
+ + {{ item.name }} + + {{ item.email }} + + + {{ item.address }} + + + + + + +
+
From dedb86cecc19655b8297f2bc576a94a81e88bc1b Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 20:29:13 -0500 Subject: [PATCH 08/19] feat: implemented component CRUD actions --- .../pages/companies/companies.component.ts | 56 +++++++++++++++++-- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/src/app/employers/pages/companies/companies.component.ts b/src/app/employers/pages/companies/companies.component.ts index 36b058e..7226e2b 100644 --- a/src/app/employers/pages/companies/companies.component.ts +++ b/src/app/employers/pages/companies/companies.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, OnInit, ViewChild } from "@angular/core"; +import { NgForm } from "@angular/forms"; import { Company } from "../../model/company"; import { CompaniesService } from "../../services/companies.service"; @@ -8,10 +9,18 @@ import { CompaniesService } from "../../services/companies.service"; styleUrls: ["./companies.component.css"], }) export class CompaniesComponent implements OnInit { - // currentItem: Partial = {}; + currentCompany: Partial = {}; dataSource: Company[] = []; + + @ViewChild("companiesForm", { static: false }) + companiesForm!: NgForm; + constructor(private companiesService: CompaniesService) {} + get isEditMode() { + return !!this.currentCompany.id; + } + ngOnInit() { this.getAll(); } @@ -21,15 +30,50 @@ export class CompaniesComponent implements OnInit { this.dataSource = response; }); } - /* + createCompany(company: Company) { - this.companiesService.create(company).subscribe(); + this.companiesService.create(company).subscribe(response => { + this.dataSource = [...this.dataSource, response]; + }); + } + + editCompany(company: Company) { + this.currentCompany = { ...company }; + } + + cancelEdit() { + this.currentCompany = {}; + this.companiesForm.resetForm(); + } + + updateCompany(id: number, company: Company) { + this.companiesService.update(id, company).subscribe(response => { + this.dataSource = this.dataSource.map(current => { + if (current.id === id) return response; + return current; + }); + }); } deleteCompany(id: number) { this.companiesService.delete(id).subscribe(() => { + this.dataSource = this.dataSource.filter(current => current.id !== id); + }); + } - }) + handleSubmit() { + console.log("handling submit..."); + if (!this.companiesForm.form.valid) return; + console.log("passed validation..."); + const company = this.currentCompany as Company; + if (this.isEditMode) { + console.log("sending update..."); + this.updateCompany(company.id, company); + } else { + console.log("sending create..."); + this.createCompany(company); + } + this.cancelEdit(); + console.log("finished..."); } - */ } From 6463077c1f15a3050ce61cbf8693f40338d5df3f Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 20:30:19 -0500 Subject: [PATCH 09/19] feat(companies): implemented view for companies --- .../pages/companies/companies.component.css | 6 ++ .../pages/companies/companies.component.html | 94 +++++++++++++++---- 2 files changed, 81 insertions(+), 19 deletions(-) diff --git a/src/app/employers/pages/companies/companies.component.css b/src/app/employers/pages/companies/companies.component.css index 27acf9b..3331e02 100644 --- a/src/app/employers/pages/companies/companies.component.css +++ b/src/app/employers/pages/companies/companies.component.css @@ -3,3 +3,9 @@ h1 { font-weight: 500; text-align: center; } + +h2 { + font-size: large; + font-weight: 500; + text-align: center; +} diff --git a/src/app/employers/pages/companies/companies.component.html b/src/app/employers/pages/companies/companies.component.html index 9bda5f6..8b3afa3 100644 --- a/src/app/employers/pages/companies/companies.component.html +++ b/src/app/employers/pages/companies/companies.component.html @@ -1,20 +1,76 @@ -
-

Associate Companies

-
-
- - {{ item.name }} - - {{ item.email }} - - - {{ item.address }} - - - - - - -
+

Associate Companies

+
+

+ {{ isEditMode ? "Edit company information" : "Add new company" }} +

+
+ + Name + + + Max characters: {{ input.value?.length || 0 }}/100 + + + + Address + + + + Email + + + + +
+
+
+
+ + {{ item.name }} + + {{ item.email }} + + + {{ item.address }} + + + + + +
-
+ From deec9388d237f0b6dda526bf51b79841ce5eb01c Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 22:25:57 -0500 Subject: [PATCH 10/19] style: improved action buttons with icons --- .../employers/pages/companies/companies.component.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/employers/pages/companies/companies.component.html b/src/app/employers/pages/companies/companies.component.html index 8b3afa3..70e968f 100644 --- a/src/app/employers/pages/companies/companies.component.html +++ b/src/app/employers/pages/companies/companies.component.html @@ -68,8 +68,12 @@

{{ item.address }} - - + + From 74d1bd6a9a242113dbd563a74780e1e4c8df016e Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 22:34:09 -0500 Subject: [PATCH 11/19] refactor: deleted unused import --- src/app/app.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1bacb5e..aab35ea 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -34,7 +34,7 @@ import { MatMenuModule } from "@angular/material/menu"; import { MatDialogModule } from "@angular/material/dialog"; import { MatSnackBarModule } from "@angular/material/snack-bar"; import { MatProgressBarModule } from "@angular/material/progress-bar"; -import { MatCard, MatCardModule } from "@angular/material/card"; +import { MatCardModule } from "@angular/material/card"; export const imports: NonNullable = [ AppRoutingModule, From 592cb0674f14df086fa359d44245920938a6ee1e Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 24 Jun 2022 22:34:51 -0500 Subject: [PATCH 12/19] feat: added required prop to email --- src/app/employers/pages/companies/companies.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/employers/pages/companies/companies.component.html b/src/app/employers/pages/companies/companies.component.html index 70e968f..982658c 100644 --- a/src/app/employers/pages/companies/companies.component.html +++ b/src/app/employers/pages/companies/companies.component.html @@ -34,6 +34,7 @@

maxlength="256" type="email" name="email" + required [(ngModel)]="this.currentCompany.email" /> -
-
+
+
- {{ item.name }} - + {{ item.name }} + {{ item.email }} - + {{ item.address }} - + - From fb68853b7a2647e6c1459ef76cf37c1914a155a6 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Tue, 28 Jun 2022 01:55:33 -0500 Subject: [PATCH 14/19] feat: added component routing --- src/app/app-routing.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e194cf4..379625b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -7,6 +7,7 @@ import { JobsComponent } from "./jobs/pages/jobs/jobs.component"; import { JobsSearchComponent } from "./jobs/pages/jobs-search/jobs-search.component"; import { ResetpasswordComponent } from "./auth/pages/resetpassword/resetpassword.component"; import { ChangepasswordComponent } from "./auth/pages/changepassword/changepassword.component"; +import { CompaniesComponent } from "./employers/pages/companies/companies.component"; const routes: Routes = [ { path: "", redirectTo: "account/profile", pathMatch: "full" }, @@ -17,6 +18,7 @@ const routes: Routes = [ { path: "account/search", component: JobsSearchComponent }, { path: "account/resetpassword", component: ResetpasswordComponent }, { path: "account/changepassword", component: ChangepasswordComponent }, + { path: "account/companies", component: CompaniesComponent }, ]; @NgModule({ From e1b3118bfccf0be4160ada58aaa1cdf0679fd9b3 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Tue, 28 Jun 2022 01:59:45 -0500 Subject: [PATCH 15/19] feat: added component linker --- src/app/common/components/header/header.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/common/components/header/header.component.ts b/src/app/common/components/header/header.component.ts index e5bce4b..5d2a8ef 100644 --- a/src/app/common/components/header/header.component.ts +++ b/src/app/common/components/header/header.component.ts @@ -42,6 +42,12 @@ export class HeaderComponent extends UseUser implements OnInit, OnDestroy { icon: "person", visible: () => this.user !== null, }, + { + label: "Companies", + path: "account/companies", + icon: "apartment", + visible: () => this.user !== null, + }, { label: "Settings", path: "/account/settings", From ce8b5bc4eb085d9bb91204f5eafb47e28db2ed3d Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 1 Jul 2022 11:57:51 -0500 Subject: [PATCH 16/19] fix: updated spec file due to test failure --- src/app/employers/pages/companies/companies.component.spec.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/employers/pages/companies/companies.component.spec.ts b/src/app/employers/pages/companies/companies.component.spec.ts index 80d3bd3..edc9174 100644 --- a/src/app/employers/pages/companies/companies.component.spec.ts +++ b/src/app/employers/pages/companies/companies.component.spec.ts @@ -2,12 +2,15 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { CompaniesComponent } from "./companies.component"; +import { imports } from "src/app/app.module"; + describe("CompaniesComponent", () => { let component: CompaniesComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ + imports: [...imports], declarations: [CompaniesComponent], }).compileComponents(); }); From fb864cf79aa14c7fd682a2c495b4e2613bf91f12 Mon Sep 17 00:00:00 2001 From: Angel Meneses Date: Fri, 1 Jul 2022 12:04:17 -0500 Subject: [PATCH 17/19] fix: added http client injection for tests --- src/app/employers/services/companies.service.spec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/employers/services/companies.service.spec.ts b/src/app/employers/services/companies.service.spec.ts index 687b22e..8eaccb1 100644 --- a/src/app/employers/services/companies.service.spec.ts +++ b/src/app/employers/services/companies.service.spec.ts @@ -1,3 +1,4 @@ +import { HttpClientModule } from "@angular/common/http"; import { TestBed } from "@angular/core/testing"; import { CompaniesService } from "./companies.service"; @@ -6,7 +7,9 @@ describe("CompaniesService", () => { let service: CompaniesService; beforeEach(() => { - TestBed.configureTestingModule({}); + TestBed.configureTestingModule({ + imports: [HttpClientModule], + }); service = TestBed.inject(CompaniesService); }); From c0fcfbadc51f873eb7c8b17e684dc82211536c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Meneses?= Date: Fri, 1 Jul 2022 13:26:38 -0500 Subject: [PATCH 18/19] Update companies.component.ts --- src/app/employers/pages/companies/companies.component.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/employers/pages/companies/companies.component.ts b/src/app/employers/pages/companies/companies.component.ts index 7226e2b..a1ad84a 100644 --- a/src/app/employers/pages/companies/companies.component.ts +++ b/src/app/employers/pages/companies/companies.component.ts @@ -62,18 +62,13 @@ export class CompaniesComponent implements OnInit { } handleSubmit() { - console.log("handling submit..."); if (!this.companiesForm.form.valid) return; - console.log("passed validation..."); const company = this.currentCompany as Company; if (this.isEditMode) { - console.log("sending update..."); this.updateCompany(company.id, company); } else { - console.log("sending create..."); this.createCompany(company); } this.cancelEdit(); - console.log("finished..."); } } From 6ed36c390ef849eab9ada1765e0d0a228bcd1628 Mon Sep 17 00:00:00 2001 From: dalbitresb12-bot Date: Sat, 2 Jul 2022 02:09:45 +0000 Subject: [PATCH 19/19] chore(sync): Synced file(s) with futureleadersupc/waw-backend-json --- server/db.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/server/db.json b/server/db.json index 727f3b7..336c038 100644 --- a/server/db.json +++ b/server/db.json @@ -175,5 +175,37 @@ "salaryRange": "$135k-$157k", "published": false } + ], + "companies": [ + { + "id": 1, + "name": "Google Inc.", + "address": "Silicon Valley", + "email": "google@support.com" + }, + { + "id": 2, + "name": "Microsoft Inc.", + "address": "Silicon Valley", + "email": "microsoft@support.com" + }, + { + "id": 3, + "name": "Meta", + "address": "Silicon Valley", + "email": "meta@support.com" + }, + { + "id": 4, + "name": "Apple Inc.", + "address": "Silicon Valley", + "email": "apple@support.com" + }, + { + "id": 5, + "name": "Oracle", + "address": "Silicon Valley", + "email": "oracle@support.com" + } ] }