diff --git a/project-manager/src/app/app.component.html b/project-manager/src/app/app.component.html index c4d5474..38c8c1e 100644 --- a/project-manager/src/app/app.component.html +++ b/project-manager/src/app/app.component.html @@ -88,4 +88,11 @@ + + diff --git a/project-manager/src/app/app.component.ts b/project-manager/src/app/app.component.ts index 0137fa1..67b39be 100644 --- a/project-manager/src/app/app.component.ts +++ b/project-manager/src/app/app.component.ts @@ -65,6 +65,13 @@ export class AppComponent { return false; } + toggleChat() { + if (!this.router.url.includes('chat')) { + this.router.navigate([ {outlets: {'bottom': [ 'chat']}}]); + } else { + this.router.navigate([ {outlets: {'bottom': null}}]); + } + } } diff --git a/project-manager/src/app/app.routing.ts b/project-manager/src/app/app.routing.ts index bf7cadb..7804e83 100644 --- a/project-manager/src/app/app.routing.ts +++ b/project-manager/src/app/app.routing.ts @@ -11,6 +11,8 @@ import {RxDemoComponent} from './rxdemo/rxdemo.component'; import {LoginGuard} from './login/login.guard'; import {blogRoutingComponents} from "./blog/blog.routing"; import {ModelDrivenFormComponent} from "./model-driven-form/model-driven-form.component"; +import {modelDrivenFormRoutingProviders} from "./model-driven-form/model-driven-form.routing"; +import {ChatComponent} from "./chat-component/chat.component"; export const appRoutes: Routes = [ {path: 'dashboard', component: DashboardComponent, data: {title: 'Startseite'}}, @@ -21,6 +23,8 @@ export const appRoutes: Routes = [ {path: 'blog', component: BlogComponent, data: {title: 'Blog'}}, {path: 'model-form', component: ModelDrivenFormComponent, data: {title: 'Model Driven Task Form'}}, + {path: 'chat', component: ChatComponent, outlet: 'bottom'}, + {path: 'login', component: LoginComponent}, {path: 'tasks', canActivate: [LoginGuard], children: tasksRoutes}, @@ -35,7 +39,7 @@ export const appRoutes: Routes = [ export const appRouting = RouterModule.forRoot(appRoutes); export const routingComponents = [DashboardComponent, SettingsComponent, AboutComponent, LoginComponent, NotFoundComponent, - RxDemoComponent, ModelDrivenFormComponent, ...blogRoutingComponents, ...tasksRoutingComponents]; + RxDemoComponent, ModelDrivenFormComponent, ChatComponent, ...blogRoutingComponents, ...tasksRoutingComponents]; -export const routingProviders = [LoginGuard, +export const routingProviders = [LoginGuard, ...modelDrivenFormRoutingProviders, ...tasksRoutingProviders]; diff --git a/project-manager/src/app/chat-component/chat.component.css b/project-manager/src/app/chat-component/chat.component.css new file mode 100644 index 0000000..f62352e --- /dev/null +++ b/project-manager/src/app/chat-component/chat.component.css @@ -0,0 +1,59 @@ +.chat +{ + list-style: none; + margin: 0; + padding: 0; +} + +.chat li +{ + margin-bottom: 10px; + padding-bottom: 5px; + border-bottom: 1px dotted #B3A9A9; +} + +.chat li.left .chat-body +{ + margin-left: 60px; +} + +.chat li.right .chat-body +{ + margin-right: 60px; +} + + +.chat li .chat-body p +{ + margin: 0; + color: #777777; +} + +.panel .slidedown .glyphicon, .chat .glyphicon +{ + margin-right: 5px; +} + +.panel-body +{ + overflow-y: scroll; + height: 250px; +} + +::-webkit-scrollbar-track +{ + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + background-color: #F5F5F5; +} + +::-webkit-scrollbar +{ + width: 12px; + background-color: #F5F5F5; +} + +::-webkit-scrollbar-thumb +{ + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3); + background-color: #555; +} \ No newline at end of file diff --git a/project-manager/src/app/chat-component/chat.component.html b/project-manager/src/app/chat-component/chat.component.html new file mode 100644 index 0000000..9678cea --- /dev/null +++ b/project-manager/src/app/chat-component/chat.component.html @@ -0,0 +1,83 @@ +
+
+
+
+
+ Chat +
+
+
    + +
+
+
+
+ + + + +
+
+
+
+
+ +
diff --git a/project-manager/src/app/chat-component/chat.component.ts b/project-manager/src/app/chat-component/chat.component.ts new file mode 100644 index 0000000..8d16eed --- /dev/null +++ b/project-manager/src/app/chat-component/chat.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + templateUrl: 'chat.component.html', + styleUrls: ['chat.component.css'] +}) +export class ChatComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/project-manager/src/app/chat-component/index.ts b/project-manager/src/app/chat-component/index.ts new file mode 100644 index 0000000..eca793f --- /dev/null +++ b/project-manager/src/app/chat-component/index.ts @@ -0,0 +1 @@ +export * from './chat.component'; diff --git a/project-manager/src/app/model-driven-form/model-driven-form.routing.ts b/project-manager/src/app/model-driven-form/model-driven-form.routing.ts index e11a625..c79ba64 100644 --- a/project-manager/src/app/model-driven-form/model-driven-form.routing.ts +++ b/project-manager/src/app/model-driven-form/model-driven-form.routing.ts @@ -1,3 +1,3 @@ -import {ModelDrivenFormComponent} from "./model-driven-form.component"; +import {TaskServiceModelForm} from "../services/task-service/task-model-form.service"; -export const modelDrivenFormRoutingComponent = [ModelDrivenFormComponent]; +export const modelDrivenFormRoutingProviders = [TaskServiceModelForm]; diff --git a/project-manager/src/styles.css b/project-manager/src/styles.css index fd29aa3..8cdf9d0 100644 --- a/project-manager/src/styles.css +++ b/project-manager/src/styles.css @@ -47,3 +47,9 @@ form { #right { overflow: hidden } + +.chat-button { + position: absolute; + bottom: 0px; + right: 10px; +}