diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 14ea1ce2..30faee02 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -50,6 +50,11 @@ import { NotificationService } from "./services/notification.service"; import { MediaViewerComponent } from './components/media-viewer/media-viewer.component'; import { CreateStatusComponent } from './components/create-status/create-status.component'; import { MediaComponent } from './components/create-status/media/media.component'; +import { MyAccountComponent } from './components/floating-column/manage-account/my-account/my-account.component'; +import { FavoritesComponent } from './components/floating-column/manage-account/favorites/favorites.component'; +import { DirectMessagesComponent } from './components/floating-column/manage-account/direct-messages/direct-messages.component'; +import { MentionsComponent } from './components/floating-column/manage-account/mentions/mentions.component'; +import { NotificationsComponent } from './components/floating-column/manage-account/notifications/notifications.component'; const routes: Routes = [ { path: "", redirectTo: "home", pathMatch: "full" }, @@ -89,7 +94,12 @@ const routes: Routes = [ NotificationHubComponent, MediaViewerComponent, CreateStatusComponent, - MediaComponent + MediaComponent, + MyAccountComponent, + FavoritesComponent, + DirectMessagesComponent, + MentionsComponent, + NotificationsComponent ], imports: [ FontAwesomeModule, diff --git a/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.html b/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.html new file mode 100644 index 00000000..2712dd95 --- /dev/null +++ b/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.html @@ -0,0 +1,3 @@ +

+ direct-messages works! +

diff --git a/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.scss b/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.spec.ts b/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.spec.ts new file mode 100644 index 00000000..f64d0fe8 --- /dev/null +++ b/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DirectMessagesComponent } from './direct-messages.component'; + +xdescribe('DirectMessagesComponent', () => { + let component: DirectMessagesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DirectMessagesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DirectMessagesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.ts b/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.ts new file mode 100644 index 00000000..018ccab7 --- /dev/null +++ b/src/app/components/floating-column/manage-account/direct-messages/direct-messages.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-direct-messages', + templateUrl: './direct-messages.component.html', + styleUrls: ['./direct-messages.component.scss'] +}) +export class DirectMessagesComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/components/floating-column/manage-account/favorites/favorites.component.html b/src/app/components/floating-column/manage-account/favorites/favorites.component.html new file mode 100644 index 00000000..5b593a28 --- /dev/null +++ b/src/app/components/floating-column/manage-account/favorites/favorites.component.html @@ -0,0 +1,3 @@ +

+ favorites works! +

diff --git a/src/app/components/floating-column/manage-account/favorites/favorites.component.scss b/src/app/components/floating-column/manage-account/favorites/favorites.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/floating-column/manage-account/favorites/favorites.component.spec.ts b/src/app/components/floating-column/manage-account/favorites/favorites.component.spec.ts new file mode 100644 index 00000000..1e356c74 --- /dev/null +++ b/src/app/components/floating-column/manage-account/favorites/favorites.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FavoritesComponent } from './favorites.component'; + +xdescribe('FavoritesComponent', () => { + let component: FavoritesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ FavoritesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FavoritesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/floating-column/manage-account/favorites/favorites.component.ts b/src/app/components/floating-column/manage-account/favorites/favorites.component.ts new file mode 100644 index 00000000..d3a373e1 --- /dev/null +++ b/src/app/components/floating-column/manage-account/favorites/favorites.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-favorites', + templateUrl: './favorites.component.html', + styleUrls: ['./favorites.component.scss'] +}) +export class FavoritesComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/components/floating-column/manage-account/manage-account.component.html b/src/app/components/floating-column/manage-account/manage-account.component.html index 90187024..c2286cc2 100644 --- a/src/app/components/floating-column/manage-account/manage-account.component.html +++ b/src/app/components/floating-column/manage-account/manage-account.component.html @@ -5,20 +5,25 @@ - - - - - diff --git a/src/app/components/floating-column/manage-account/manage-account.component.scss b/src/app/components/floating-column/manage-account/manage-account.component.scss index c137f10e..a17b99f5 100644 --- a/src/app/components/floating-column/manage-account/manage-account.component.scss +++ b/src/app/components/floating-column/manage-account/manage-account.component.scss @@ -42,7 +42,7 @@ $account-header-height: 60px; &--notification { color: rgb(250, 152, 41); &:hover { - color: rgb(250, 152, 41); + color: rgb(255, 185, 106); } } } diff --git a/src/app/components/floating-column/manage-account/manage-account.component.ts b/src/app/components/floating-column/manage-account/manage-account.component.ts index a66a1372..c14d8812 100644 --- a/src/app/components/floating-column/manage-account/manage-account.component.ts +++ b/src/app/components/floating-column/manage-account/manage-account.component.ts @@ -22,6 +22,10 @@ export class ManageAccountComponent implements OnInit { faStar = faStar; faUserPlus = faUserPlus; + subPanel = 'account'; + hasNotifications = false; + hasMentions = false; + @Input() account: AccountWrapper; availableStreams: StreamElement[] = []; @@ -55,4 +59,9 @@ export class ManageAccountComponent implements OnInit { this.navigationService.closePanel(); return false; } + + loadSubPanel(subpanel: string): boolean { + this.subPanel = subpanel; + return false; + } } diff --git a/src/app/components/floating-column/manage-account/mentions/mentions.component.html b/src/app/components/floating-column/manage-account/mentions/mentions.component.html new file mode 100644 index 00000000..2989427b --- /dev/null +++ b/src/app/components/floating-column/manage-account/mentions/mentions.component.html @@ -0,0 +1,3 @@ +

+ mentions works! +

diff --git a/src/app/components/floating-column/manage-account/mentions/mentions.component.scss b/src/app/components/floating-column/manage-account/mentions/mentions.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/floating-column/manage-account/mentions/mentions.component.spec.ts b/src/app/components/floating-column/manage-account/mentions/mentions.component.spec.ts new file mode 100644 index 00000000..2a25e786 --- /dev/null +++ b/src/app/components/floating-column/manage-account/mentions/mentions.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MentionsComponent } from './mentions.component'; + +xdescribe('MentionsComponent', () => { + let component: MentionsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MentionsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MentionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/floating-column/manage-account/mentions/mentions.component.ts b/src/app/components/floating-column/manage-account/mentions/mentions.component.ts new file mode 100644 index 00000000..5b839408 --- /dev/null +++ b/src/app/components/floating-column/manage-account/mentions/mentions.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-mentions', + templateUrl: './mentions.component.html', + styleUrls: ['./mentions.component.scss'] +}) +export class MentionsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/components/floating-column/manage-account/my-account/my-account.component.html b/src/app/components/floating-column/manage-account/my-account/my-account.component.html new file mode 100644 index 00000000..964d915c --- /dev/null +++ b/src/app/components/floating-column/manage-account/my-account/my-account.component.html @@ -0,0 +1,3 @@ +

+ my-account works! +

diff --git a/src/app/components/floating-column/manage-account/my-account/my-account.component.scss b/src/app/components/floating-column/manage-account/my-account/my-account.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/floating-column/manage-account/my-account/my-account.component.spec.ts b/src/app/components/floating-column/manage-account/my-account/my-account.component.spec.ts new file mode 100644 index 00000000..bfa42339 --- /dev/null +++ b/src/app/components/floating-column/manage-account/my-account/my-account.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MyAccountComponent } from './my-account.component'; + +xdescribe('MyAccountComponent', () => { + let component: MyAccountComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MyAccountComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MyAccountComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/floating-column/manage-account/my-account/my-account.component.ts b/src/app/components/floating-column/manage-account/my-account/my-account.component.ts new file mode 100644 index 00000000..71e07eb8 --- /dev/null +++ b/src/app/components/floating-column/manage-account/my-account/my-account.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-my-account', + templateUrl: './my-account.component.html', + styleUrls: ['./my-account.component.scss'] +}) +export class MyAccountComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/components/floating-column/manage-account/notifications/notifications.component.html b/src/app/components/floating-column/manage-account/notifications/notifications.component.html new file mode 100644 index 00000000..adc7936b --- /dev/null +++ b/src/app/components/floating-column/manage-account/notifications/notifications.component.html @@ -0,0 +1,3 @@ +

+ notifications works! +

diff --git a/src/app/components/floating-column/manage-account/notifications/notifications.component.scss b/src/app/components/floating-column/manage-account/notifications/notifications.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/app/components/floating-column/manage-account/notifications/notifications.component.spec.ts b/src/app/components/floating-column/manage-account/notifications/notifications.component.spec.ts new file mode 100644 index 00000000..9efda899 --- /dev/null +++ b/src/app/components/floating-column/manage-account/notifications/notifications.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NotificationsComponent } from './notifications.component'; + +xdescribe('NotificationsComponent', () => { + let component: NotificationsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NotificationsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NotificationsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/floating-column/manage-account/notifications/notifications.component.ts b/src/app/components/floating-column/manage-account/notifications/notifications.component.ts new file mode 100644 index 00000000..51e07a49 --- /dev/null +++ b/src/app/components/floating-column/manage-account/notifications/notifications.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-notifications', + templateUrl: './notifications.component.html', + styleUrls: ['./notifications.component.scss'] +}) +export class NotificationsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}