merge

Author: georgievtodor

src/app/app.component.html

@@ -25,6 +25,7 @@
                 <li class="cd-log_reg home" [routerLinkActive]="['active']"><a class="cd-signin" [routerLink]="['/profile/home']">Profile</a></li>
                 <li class="cd-log_reg home" [routerLinkActive]="['active']"><a class="cd-signin" [routerLink]="['/logout']" (click)="logout()">Logout</a></li>
                 <li class="cd-log_reg" [routerLinkActive]="['active']"><a class="cd-signup" [routerLink]="['/forum/1']">Forum</a></li>
+                <li class="cd-log_reg" [routerLinkActive]="['active']"><a class="cd-signup" [routerLink]="['/forum/create']">Create Post</a></li>
             </ul>
         </div>
     </div>

src/app/app.module.ts

@@ -25,6 +25,7 @@ import { CategoryModule } from './category/category.module';
 import { AllPostsByUserComponent } from './users/all-posts-by-user/all-posts-by-user.component';
 import { BiggerFontDirective } from './directives/bigger-font-size.directive';
 import { FooterComponent } from './footer/footer.component';
+import { CreateCategoryComponent } from './create-category/create-category.component';
 
 @NgModule({
   bootstrap: [AppComponent],
@@ -39,7 +40,11 @@ import { FooterComponent } from './footer/footer.component';
     ProfileOutboxComponent,
     AllPostsByUserComponent,
     BiggerFontDirective,
+<<<<<<< HEAD
     FooterComponent
+=======
+    CreateCategoryComponent
+>>>>>>> beed9c51347c179d07fbe5a1034c1a2b3510cb3e
   ],
   imports: [
     BrowserModule,

src/app/create-category/create-category.component.css

@@ -0,0 +1,3 @@
+<p>
+  create-category works!
+</p>

src/app/create-category/create-category.component.html

@@ -0,0 +1,28 @@
+/* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { CreateCategoryComponent } from './create-category.component';
+
+describe('CreateCategoryComponent', () => {
+  let component: CreateCategoryComponent;
+  let fixture: ComponentFixture<CreateCategoryComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CreateCategoryComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateCategoryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/create-category/create-category.component.spec.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-create-category',
+  templateUrl: './create-category.component.html',
+  styleUrls: ['./create-category.component.css']
+})
+export class CreateCategoryComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}