-
Welcome To Feature Modules
-
-
+
+ Work Here, Ask Cameron and Ramses, instruction may not be perfectly written, Asking questions does not make you seem less smart
+ GET /api/hello: {{ message }}
+
diff --git a/src/app/feature/feature.component.ts b/src/app/feature/feature.component.ts
index 63e1a28..4d4e05e 100755
--- a/src/app/feature/feature.component.ts
+++ b/src/app/feature/feature.component.ts
@@ -1,29 +1,23 @@
import { Component, OnInit } from '@angular/core';
-import { Router, NavigationStart, NavigationEnd } from '@angular/router';
+import { FeatureService } from './feature.service';
@Component({
selector: 'app-feature',
templateUrl: './feature.component.html',
- styleUrls: ['./feature.component.scss']
+ styleUrls: ['./feature.component.scss'],
+ providers: [FeatureService]
})
export class FeatureComponent implements OnInit {
- showLoder: Boolean = false;
- constructor(private router: Router) {
-
- this.router.events.subscribe(event => {
- if (event instanceof NavigationStart) {
- this.showLoder = true;
- console.log('event started');
- } else if (event instanceof NavigationEnd) {
- this.showLoder = false;
- console.log('event end');
- }
- });
- }
+ message: string;
+ constructor(private featureService: FeatureService) { }
ngOnInit() {
+ this.featureService.getMessage().subscribe(
+ (message: string) => { this.message = message; console.log(this.message); },
+ error => { console.error(error); }
+ );
}
}
diff --git a/src/app/feature/feature.module.ts b/src/app/feature/feature.module.ts
index b3b8955..158a95d 100755
--- a/src/app/feature/feature.module.ts
+++ b/src/app/feature/feature.module.ts
@@ -1,18 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import {FeatureComponent} from './feature.component';
+import { FeatureComponent } from './feature.component';
import { FeatureRoutingModule } from './feature-routing.module';
import { MatCardModule } from '@angular/material/card';
-
+import { SharedModule } from './../shared/shared.module';
@NgModule({
imports: [
CommonModule,
FeatureRoutingModule,
- MatCardModule
+ MatCardModule,
+ SharedModule
],
declarations: [
- FeatureComponent,
+ FeatureComponent
+
]
})
export class FeatureModule { }
diff --git a/src/app/feature/feature.service.ts b/src/app/feature/feature.service.ts
new file mode 100644
index 0000000..f0efd71
--- /dev/null
+++ b/src/app/feature/feature.service.ts
@@ -0,0 +1,17 @@
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+export class FeatureService {
+
+ constructor(private http: HttpClient) { }
+
+ getMessage () {
+ return new Observable(observer => {
+ this.http.get(`/api/hello`).subscribe(
+ (data: any) => { observer.next(data.message); },
+ err => { observer.error(err); }
+ );
+ });
+ }
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 42e8170..03fa50c 100755
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -1,38 +1,13 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import {
- MatCardModule,
- MatRippleModule,
- MatSnackBarModule,
- MatNativeDateModule,
- MatProgressSpinnerModule,
- MatDialogModule
-} from '@angular/material';
-import { MatInputModule } from '@angular/material/input';
-import { MatSelectModule } from '@angular/material/select';
-import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatCardModule } from '@angular/material/card';
import { MatButtonModule } from '@angular/material/button';
-import { MatExpansionModule } from '@angular/material/expansion';
-import { MatAutocompleteModule } from '@angular/material/autocomplete';
@NgModule({
exports: [
CommonModule,
- ReactiveFormsModule,
- FormsModule,
MatCardModule,
- MatRippleModule,
- MatDialogModule,
- MatSnackBarModule,
- MatProgressSpinnerModule,
- MatInputModule,
- MatSelectModule,
- MatDatepickerModule,
- MatNativeDateModule,
- MatButtonModule,
- MatExpansionModule,
- MatAutocompleteModule
+ MatButtonModule
]
})
diff --git a/src/app/welcome/welcome.component.html b/src/app/welcome/welcome.component.html
deleted file mode 100755
index ac426f5..0000000
--- a/src/app/welcome/welcome.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/welcome/welcome.component.scss b/src/app/welcome/welcome.component.scss
deleted file mode 100755
index e69de29..0000000
diff --git a/src/app/welcome/welcome.component.spec.ts b/src/app/welcome/welcome.component.spec.ts
deleted file mode 100755
index eb910c6..0000000
--- a/src/app/welcome/welcome.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WelcomeComponent } from './welcome.component';
-
-describe('WelcomeComponent', () => {
- let component: WelcomeComponent;
- let fixture: ComponentFixture
;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ WelcomeComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(WelcomeComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/welcome/welcome.component.ts b/src/app/welcome/welcome.component.ts
deleted file mode 100755
index 9f80120..0000000
--- a/src/app/welcome/welcome.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-welcome',
- templateUrl: './welcome.component.html',
- styleUrls: ['./welcome.component.scss']
-})
-export class WelcomeComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-
-}
diff --git a/src/index.html b/src/index.html
index 0ab074e..19a2ed8 100755
--- a/src/index.html
+++ b/src/index.html
@@ -16,7 +16,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index dda6153..7bdc4dd 100755
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
{
- "short_name": "Angular 5 Boiler",
- "name": "Angular 5 PWA",
+ "short_name": "Angular 8 Boiler",
+ "name": "Angular 8 PWA",
"start_url": "/",
"theme_color": "#f48c5b",
"background_color": "#ffffff",
diff --git a/src/styles.scss b/src/styles.scss
index 45512d1..f17de05 100755
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -2,6 +2,16 @@
@import 'http://github.com/~@angular/material/prebuilt-themes/deeppurple-amber.css';
+html,
+body {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ min-height: 60vh;
+}
+
.white-text {
color: white;
}
diff --git a/ui/Screenshot 2024-06-25 at 18.33.24.png b/ui/Screenshot 2024-06-25 at 18.33.24.png
new file mode 100644
index 0000000..54daaf0
Binary files /dev/null and b/ui/Screenshot 2024-06-25 at 18.33.24.png differ
diff --git a/ui/Screenshot 2024-06-25 at 18.33.42.png b/ui/Screenshot 2024-06-25 at 18.33.42.png
new file mode 100644
index 0000000..033e0b0
Binary files /dev/null and b/ui/Screenshot 2024-06-25 at 18.33.42.png differ
diff --git a/ui/colors.md b/ui/colors.md
new file mode 100644
index 0000000..2993510
--- /dev/null
+++ b/ui/colors.md
@@ -0,0 +1,4 @@
+background-gray = #587fa7 hsl(210,31%,50%) rgb(88,127,167)
+text-gray = rgb(158, 158, 158)
+character-card-grey: #5e84ac hsl(211,32%,52%) rgb(94,132,172)
+control-button-border-orange = rgb(255, 152, 0)
\ No newline at end of file