diff --git a/src/app/app.component.html b/src/app/app.component.html
index bb127a4..9541dd6 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1 +1,4 @@
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/src/app/app.component.sass b/src/app/app.component.sass
index 8f75c93..f1591c9 100644
--- a/src/app/app.component.sass
+++ b/src/app/app.component.sass
@@ -5,4 +5,33 @@
grid-template: 7.5% 92.5% / 25% 50% 25%
display: grid
min-height: 100vh
- max-height: 100vh
\ No newline at end of file
+ max-height: 100vh
+
+#imprint
+ background-color: $cSecondaryBackground
+ grid-template: 15% 70% 15% / 15% 70% 15%
+ display: grid
+ min-height: 100vh
+ max-height: 100vh
+
+#about
+ background-color: $cSecondaryBackground
+ grid-template: 15% 70% 15% / 15% 70% 15%
+ display: grid
+ min-height: 100vh
+ max-height: 100vh
+
+#login
+ background-color: $cSecondaryBackground
+ grid-template: 15% 70% 15% / 15% 70% 15%
+ display: grid
+ min-height: 100vh
+ max-height: 100vh
+
+#register
+ background-color: $cSecondaryBackground
+ grid-template: 15% 70% 15% / 15% 70% 15%
+ display: grid
+ min-height: 100vh
+ max-height: 100vh
+
\ No newline at end of file
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 73203c5..07aa102 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,9 +1,11 @@
import { Component, OnInit } from '@angular/core';
+import { RegisterService } from './services/register/register.service';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
- styleUrls: ['./app.component.sass']
+ styleUrls: ['./app.component.sass'],
+ providers: [RegisterService]
})
export class AppComponent implements OnInit {
constructor() { }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e5d22c0..cc64064 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,6 +15,8 @@ import { FeedComponent } from './components/feed/feed.component';
import { HomeComponent } from './components/home/home.component';
import { SocialComponent } from './components/social/social.component';
import { GroupsComponent } from './components/social/groups/groups.component';
+import { ImprintComponent } from './components/imprint/imprint.component';
+import { AboutComponent } from './components/about/about.component';
const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} };
@@ -25,6 +27,8 @@ const config: SocketIoConfig = { url: 'http://localhost:4444', options: {} };
DocumentComponent,
RegisterComponent,
LoginComponent,
+ ImprintComponent,
+ AboutComponent,
AppScaffoldComponent,
ChatComponent,
FriendsComponent,
diff --git a/src/app/components/about/about.component.html b/src/app/components/about/about.component.html
new file mode 100644
index 0000000..e71b8c6
--- /dev/null
+++ b/src/app/components/about/about.component.html
@@ -0,0 +1,8 @@
+
+
+
What´s Greenvironment?
+
Hello Greenvironment!
+
We, the greenviroment team want to create a netwok for environmentalists who care for our nature and our planet as much as we do.
+
We believe, that together we can do amazing things to protect our environment and keep it clean and green.
+
You aren´t part of greenvironment yet? - join us here
+
\ No newline at end of file
diff --git a/src/app/components/about/about.component.sass b/src/app/components/about/about.component.sass
new file mode 100644
index 0000000..e044948
--- /dev/null
+++ b/src/app/components/about/about.component.sass
@@ -0,0 +1,10 @@
+@import '../../../styles/mixins.sass'
+@import '../../../styles/vars.sass'
+
+#aboutcontainer
+ @include gridPosition(2, 2,2,2)
+ background-color: $cPrimaryBackground
+input
+ margin: 0.25em
+#header
+ @include gridPosition(1, 2, 1, 2)
diff --git a/src/app/components/about/about.component.spec.ts b/src/app/components/about/about.component.spec.ts
new file mode 100644
index 0000000..6b77344
--- /dev/null
+++ b/src/app/components/about/about.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AboutComponent } from './about.component';
+
+describe('AboutComponent', () => {
+ let component: AboutComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ AboutComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AboutComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/about/about.component.ts b/src/app/components/about/about.component.ts
new file mode 100644
index 0000000..88f7f9f
--- /dev/null
+++ b/src/app/components/about/about.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-about',
+ templateUrl: './about.component.html',
+ styleUrls: ['./about.component.sass']
+})
+export class AboutComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/components/home/home.component.sass b/src/app/components/home/home.component.sass
index b869ac1..597c854 100644
--- a/src/app/components/home/home.component.sass
+++ b/src/app/components/home/home.component.sass
@@ -14,11 +14,7 @@
grid-template: 7.5% 92.5% /100%
background-color: $cBoxBodyBackground
-#feedcontainer
- @include gridPosition(2, 3, 2, 3)
- display: grid
- grid-template: 10% 90% /100%
- background-color: $cSecondaryBackground
+
#socialcontainer
@include gridPosition(2, 3, 3, 4)
diff --git a/src/app/components/imprint/imprint.component.html b/src/app/components/imprint/imprint.component.html
new file mode 100644
index 0000000..a17a238
--- /dev/null
+++ b/src/app/components/imprint/imprint.component.html
@@ -0,0 +1,7 @@
+
+
+
Imprint
+
The greenvironment network is being developed by Bliblablub
+
Contact
+
Email: mailadress
+
\ No newline at end of file
diff --git a/src/app/components/imprint/imprint.component.sass b/src/app/components/imprint/imprint.component.sass
new file mode 100644
index 0000000..9e83ff5
--- /dev/null
+++ b/src/app/components/imprint/imprint.component.sass
@@ -0,0 +1,10 @@
+@import '../../../styles/mixins.sass'
+@import '../../../styles/vars.sass'
+
+#imprintcontainer
+ @include gridPosition(2, 2,2,2)
+ background-color: $cPrimaryBackground
+input
+ margin: 0.25em
+#header
+ @include gridPosition(1, 2, 1, 2)
diff --git a/src/app/components/imprint/imprint.component.spec.ts b/src/app/components/imprint/imprint.component.spec.ts
new file mode 100644
index 0000000..49b68ae
--- /dev/null
+++ b/src/app/components/imprint/imprint.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ImprintComponent } from './imprint.component';
+
+describe('ImprintComponent', () => {
+ let component: ImprintComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ImprintComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ImprintComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/imprint/imprint.component.ts b/src/app/components/imprint/imprint.component.ts
new file mode 100644
index 0000000..ba755c1
--- /dev/null
+++ b/src/app/components/imprint/imprint.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-imprint',
+ templateUrl: './imprint.component.html',
+ styleUrls: ['./imprint.component.sass']
+})
+export class ImprintComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
index cbdfa13..e95e613 100644
--- a/src/app/components/login/login.component.html
+++ b/src/app/components/login/login.component.html
@@ -1,3 +1,16 @@
-
- login works!
-
+
+
\ No newline at end of file
diff --git a/src/app/components/login/login.component.sass b/src/app/components/login/login.component.sass
new file mode 100644
index 0000000..b21da90
--- /dev/null
+++ b/src/app/components/login/login.component.sass
@@ -0,0 +1,11 @@
+@import '../../../styles/mixins.sass'
+@import '../../../styles/vars.sass'
+
+#logincontainer
+ @include gridPosition(2, 2,2,2)
+ grid-template: 15% 15% 15% 15% 15% 15% / 100%
+ background-color: $cPrimaryBackground
+input
+ margin: 0.25em
+#header
+ @include gridPosition(1, 2, 1, 2)
diff --git a/src/app/components/login/login.component.scss b/src/app/components/login/login.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index 12de138..848c59b 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
- styleUrls: ['./login.component.scss']
+ styleUrls: ['./login.component.sass']
})
export class LoginComponent implements OnInit {
diff --git a/src/app/components/register/register.component.html b/src/app/components/register/register.component.html
index 665902b..dd0a12d 100644
--- a/src/app/components/register/register.component.html
+++ b/src/app/components/register/register.component.html
@@ -1,3 +1,23 @@
-
- register works!
-
+
\ No newline at end of file
diff --git a/src/app/components/register/register.component.sass b/src/app/components/register/register.component.sass
new file mode 100644
index 0000000..b427e70
--- /dev/null
+++ b/src/app/components/register/register.component.sass
@@ -0,0 +1,13 @@
+@import '../../../styles/mixins.sass'
+@import '../../../styles/vars.sass'
+
+#registercontainer
+ @include gridPosition(2, 2,2,2)
+ grid-template: 15% 15% 15% 15% 15% 15% / 100%
+ background-color: $cPrimaryBackground
+ padding: 1em
+input
+ margin: 0.25em
+
+#header
+ @include gridPosition(1, 2, 1, 2)
diff --git a/src/app/components/register/register.component.scss b/src/app/components/register/register.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/components/register/register.component.ts b/src/app/components/register/register.component.ts
index 37009dc..8d69477 100644
--- a/src/app/components/register/register.component.ts
+++ b/src/app/components/register/register.component.ts
@@ -5,12 +5,12 @@ import {Registration} from '../../models/registration';
@Component({
selector: 'registration',
templateUrl: './register.component.html',
- styleUrls: ['./register.component.scss']
-})
+ styleUrls: ['./register.component.sass']
+})/*
export class RegisterComponent implements OnInit {
registration: Registration
-
- constructor(private registerService: RegisterService) { }
+
+ constructor(private registerService: RegisterService) {}
onClickSubmit(pUsername: string, pEmail: string, pPasswordHash: string) {
this.registration.username = pUsername
@@ -20,6 +20,14 @@ export class RegisterComponent implements OnInit {
this.registerService.register(this.registration)
}
+ ngOnInit() {}
+
+}
+*/
+export class RegisterComponent implements OnInit {
+
+ constructor() { }
+
ngOnInit() {
}