Merge branch 'master' of https://github.com/ioet/time-tracker-ui into TimeClock-find-project-#3

Author: daros10

angular.json

@@ -1,130 +1,138 @@
 {
-    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-    "version": 1,
-    "newProjectRoot": "projects",
-    "projects": {
-        "time-tracker": {
-            "projectType": "application",
-            "schematics": {},
-            "root": "",
-            "sourceRoot": "src",
-            "prefix": "app",
-            "architect": {
-                "build": {
-                    "builder": "@angular-devkit/build-angular:browser",
-                    "options": {
-                        "outputPath": "dist/time-tracker",
-                        "index": "src/index.html",
-                        "main": "src/main.ts",
-                        "polyfills": "src/polyfills.ts",
-                        "tsConfig": "tsconfig.app.json",
-                        "aot": true,
-                        "assets": [
-                            "src/favicon.ico",
-                            "src/assets"
-                        ],
-                        "styles": [
-                            "./node_modules/bootstrap/dist/css/bootstrap.min.css",
-                            "src/styles.css"
-                        ],
-                        "scripts": [
-                            "./node_modules/jquery/dist/jquery.min.js",
-                            "./node_modules/bootstrap/dist/js/bootstrap.min.js"
-                        ]
-                    },
-                    "configurations": {
-                        "production": {
-                            "fileReplacements": [{
-                                "replace": "src/environments/environment.ts",
-                                "with": "src/environments/environment.prod.ts"
-                            }],
-                            "optimization": true,
-                            "outputHashing": "all",
-                            "sourceMap": false,
-                            "extractCss": true,
-                            "namedChunks": false,
-                            "extractLicenses": true,
-                            "vendorChunk": false,
-                            "buildOptimizer": true,
-                            "budgets": [{
-                                    "type": "initial",
-                                    "maximumWarning": "2mb",
-                                    "maximumError": "5mb"
-                                },
-                                {
-                                    "type": "anyComponentStyle",
-                                    "maximumWarning": "6kb",
-                                    "maximumError": "10kb"
-                                }
-                            ]
-                        }
-                    }
-                },
-                "serve": {
-                    "builder": "@angular-devkit/build-angular:dev-server",
-                    "options": {
-                        "browserTarget": "time-tracker:build"
-                    },
-                    "configurations": {
-                        "production": {
-                            "browserTarget": "time-tracker:build:production"
-                        }
-                    }
-                },
-                "extract-i18n": {
-                    "builder": "@angular-devkit/build-angular:extract-i18n",
-                    "options": {
-                        "browserTarget": "time-tracker:build"
-                    }
-                },
-                "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
-                    "options": {
-                        "main": "src/test.ts",
-                        "polyfills": "src/polyfills.ts",
-                        "tsConfig": "tsconfig.spec.json",
-                        "karmaConfig": "karma.conf.js",
-                        "codeCoverage": true,
-                        "assets": [
-                            "src/favicon.ico",
-                            "src/assets"
-                        ],
-                        "styles": [
-                            "src/styles.css"
-                        ],
-                        "scripts": []
-                    }
-                },
-                "lint": {
-                    "builder": "@angular-devkit/build-angular:tslint",
-                    "options": {
-                        "tsConfig": [
-                            "tsconfig.app.json",
-                            "tsconfig.spec.json",
-                            "e2e/tsconfig.json"
-                        ],
-                        "exclude": [
-                            "**/node_modules/**"
-                        ]
-                    }
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "time-tracker": {
+      "projectType": "application",
+      "schematics": {},
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/time-tracker",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "aot": true,
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "./node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "src/styles.scss"
+            ],
+            "scripts": [
+              "./node_modules/jquery/dist/jquery.min.js",
+              "./node_modules/bootstrap/dist/js/bootstrap.min.js"
+            ]
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
                 },
-                "e2e": {
-                    "builder": "@angular-devkit/build-angular:protractor",
-                    "options": {
-                        "protractorConfig": "e2e/protractor.conf.js",
-                        "devServerTarget": "time-tracker:serve"
-                    },
-                    "configurations": {
-                        "production": {
-                            "devServerTarget": "time-tracker:serve:production"
-                        }
-                    }
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
                 }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "time-tracker:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "time-tracker:build:production"
             }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "time-tracker:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "codeCoverage": true,
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        },
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "time-tracker:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "time-tracker:serve:production"
+            }
+          }
         }
-    },
-    "defaultProject": "time-tracker",
-    "cli": {
-        "analytics": false
+      }
+    }
+  },
+  "defaultProject": "time-tracker",
+  "cli": {
+    "analytics": false
+  },
+  "schematics": {
+    "@schematics/angular:component": {
+      "styleext": "scss"
     }
-}
+  }
+}

src/app/app-routing.module.ts

@@ -1,3 +1,5 @@
+// tslint:disable-next-line:max-line-length
+import { ActivitiesManagementComponent } from './components/options-sidebar/activities/activities-management/activities-management.component';
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { ReportsComponent } from './components/options-sidebar/reports/reports.component';
@@ -10,6 +12,7 @@ const routes: Routes = [
   {path: 'time-clock', component: TimeClockComponent},
   {path: 'time-entries', component: TimeEntriesComponent},
   {path: 'project-management', component: ProjectManagementComponent},
+  {path: 'activities-management', component: ActivitiesManagementComponent},
   {path: '', pathMatch: 'full', redirectTo: 'time-clock'},
   {path: '**', pathMatch: 'full', redirectTo: 'time-clock'},
 ];

src/app/app.component.css src/app/app.component.scsssrc/app/app.component.css renamed to src/app/app.component.scss

@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
   title = 'time-tracker';

src/app/app.component.ts

@@ -1,3 +1,5 @@
+import { ActivityListComponent } from './components/options-sidebar/activities/activity-list/activity-list.component';
+import { CreateActivityComponent } from './components/options-sidebar/activities/create-activity/create-activity.component';
 import { CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
@@ -23,7 +25,8 @@ import { EmptyStateComponent } from './components/shared/empty-state/empty-state
 import { GroupByDatePipe } from './components/shared/pipes/group-by-date/group-by-date.pipe';
 import { SearchProjectComponent } from './components/shared/search-project/search-project.component';
 import { FilterProjectPipe } from './components/shared/pipes/filter-project/filter-project.pipe';
-
+// tslint:disable-next-line:max-line-length
+import { ActivitiesManagementComponent } from './components/options-sidebar/activities/activities-management/activities-management.component';
 
 @NgModule({
   declarations: [
@@ -46,6 +49,9 @@ import { FilterProjectPipe } from './components/shared/pipes/filter-project/filt
     GroupByDatePipe,
     SearchProjectComponent,
     FilterProjectPipe
+    ActivitiesManagementComponent,
+    CreateActivityComponent,
+    ActivityListComponent
   ],
   imports: [
     CommonModule,

src/app/app.module.ts

@@ -0,0 +1,22 @@
+.parent {
+    display: flex;
+  }
+  
+  .item {
+    width: 50%;
+    margin: 2em;
+    min-height: 500px;
+    max-height: 500px;
+  }
+  
+  @media screen and (max-width: 600px){
+    .parent {
+      flex-direction: column-reverse;
+    }
+  
+    .item {
+      width: auto;
+      min-height: 200px;
+    }
+  }
+  

src/app/components/options-sidebar/activities/activities-management/activities-management.component.css

@@ -0,0 +1,7 @@
+<div class="parent">
+    <app-create-activity class="item">
+    </app-create-activity>
+
+    <app-activity-list [activities]="activities" class="item">
+    </app-activity-list>
+</div>

src/app/components/options-sidebar/activities/activities-management/activities-management.component.html

@@ -0,0 +1,32 @@
+import { HttpClient, HttpHandler } from '@angular/common/http';
+import { Activity } from './../model/activity';
+import { of } from 'rxjs';
+import { ActivityService } from './../services/activity.service';
+import { async, TestBed } from '@angular/core/testing';
+
+import { ActivitiesManagementComponent } from './activities-management.component';
+
+describe('ActivitiesManagementComponent', () => {
+  let component: ActivitiesManagementComponent;
+  let activityService: ActivityService;
+  const activitiesFromApi: Activity[] = [{id: '123', name: 'aaa', description: 'xxx'}];
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ActivitiesManagementComponent],
+      providers: [ ActivityService, HttpClient, HttpHandler ]
+    });
+    component = TestBed.createComponent(ActivitiesManagementComponent).componentInstance;
+    activityService = TestBed.get(ActivityService);
+    spyOn(activityService, 'getActivities').and.returnValue(of(activitiesFromApi));
+  }));
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should load activities', () => {
+    component.ngOnInit();
+    expect(component.activities).toBe(activitiesFromApi);
+  });
+});

src/app/components/options-sidebar/activities/activities-management/activities-management.component.spec.ts

@@ -0,0 +1,19 @@
+import { Activity } from './../model/activity';
+import { ActivityService } from './../services/activity.service';
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-activities-management',
+  templateUrl: './activities-management.component.html',
+  styleUrls: ['./activities-management.component.css']
+})
+export class ActivitiesManagementComponent implements OnInit {
+
+  constructor(private activityService: ActivityService) { }
+
+  activities: Activity[];
+
+  ngOnInit(): void {
+    this.activityService.getActivities().subscribe( data =>  this.activities = data );
+  }
+}