Merge branch 'master' of https://github.com/ioet/time-tracker-ui into Time-Clock-Timer-Component

Author: daros10

.github/workflows/CI-time-tracker-ui.yml

@@ -1,13 +1,6 @@
 name: CI process for time-tracker app
 
 on:
-  # Trigger the workflow on push or pull request
-  push:
-    branches:
-      - '*'
-      - '*/*'
-      - '!master'
-
   pull_request:
     types: [opened, edited, reopened, synchronize]
     branches:

src/app/app-routing.module.ts

@@ -1,21 +1,17 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { GettingStartedComponent } from './components/options-sidebar/getting-started/getting-started.component';
 import { ReportsComponent } from './components/options-sidebar/reports/reports.component';
 import { TimeClockComponent } from './components/options-sidebar/time-clock/time-clock.component';
 import { TimeEntriesComponent } from './components/options-sidebar/time-entries/time-entries.component';
-import { TimeOffComponent } from './components/options-sidebar/time-off/time-off.component';
 import { ProjectManagementComponent } from './components/options-sidebar/project-management/project-management.component';
 
 const routes: Routes = [
-  {path: 'getting-started', component: GettingStartedComponent},
   {path: 'reports', component: ReportsComponent},
   {path: 'time-clock', component: TimeClockComponent},
   {path: 'time-entries', component: TimeEntriesComponent},
-  {path: 'time-off', component: TimeOffComponent},
   {path: 'project-management', component: ProjectManagementComponent},
-  {path: '', pathMatch: 'full', redirectTo: 'getting-started'},
-  {path: '**', pathMatch: 'full', redirectTo: 'getting-started'},
+  {path: '', pathMatch: 'full', redirectTo: 'time-clock'},
+  {path: '**', pathMatch: 'full', redirectTo: 'time-clock'},
 ];
 
 @NgModule({

src/app/app.module.ts

@@ -5,19 +5,24 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 
 import { AppRoutingModule } from './app-routing.module';
-
 import { AppComponent } from './app.component';
 import { NavbarComponent } from './components/shared/navbar/navbar.component';
 import { UserComponent } from './components/shared/user/user.component';
 import { SidebarComponent } from './components/shared/sidebar/sidebar.component';
 import { ClockComponent } from './components/shared/clock/clock.component';
 import { TimeClockComponent } from './components/options-sidebar/time-clock/time-clock.component';
 import { ProjectManagementComponent } from './components/options-sidebar/project-management/project-management.component';
+import { TimeEntriesComponent } from './components/options-sidebar/time-entries/time-entries.component';
 import { ProjectListComponent } from './components/shared/project-list/project-list.component';
 import { CreateProjectComponent } from './components/shared/create-project/create-project.component';
 import { DetailsFieldsComponent } from './components/shared/details-fields/details-fields.component';
 import { ProjectListHoverComponent } from './components/shared/project-list-hover/project-list-hover.component';
 import { ModalComponent } from './components/shared/modal/modal.component';
+import { MonthPickerComponent } from './components/shared/month-picker/month-picker.component';
+import { EmptyStateComponent } from './components/shared/empty-state/empty-state.component';
+import { GroupByDatePipe } from './components/shared/pipes/group-by-date/group-by-date.pipe';
+
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -32,7 +37,11 @@ import { ModalComponent } from './components/shared/modal/modal.component';
     TimeClockComponent,
     DetailsFieldsComponent,
     ProjectListHoverComponent,
-    ModalComponent
+    ModalComponent,
+    TimeEntriesComponent,
+    MonthPickerComponent,
+    EmptyStateComponent,
+    GroupByDatePipe
   ],
   imports: [
     CommonModule,
@@ -46,4 +55,3 @@ import { ModalComponent } from './components/shared/modal/modal.component';
   bootstrap: [AppComponent]
 })
 export class AppModule { }
-

src/app/components/options-sidebar/getting-started/getting-started.component.css

@@ -1,33 +1,34 @@
 import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
 import { ProjectManagementComponent } from './project-management.component';
-import { Project } from '../../../interfaces/project';
+import { Project } from '../../../interfaces';
 import { ProjectService } from '../../../services/project.service';
 import { of } from 'rxjs';
 import { CreateProjectComponent } from '../../../components/shared/create-project/create-project.component';
 import { ProjectListComponent } from '../../../components/shared/project-list/project-list.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 describe('ProjectManagementComponent', () => {
   let component: ProjectManagementComponent;
   let fixture: ComponentFixture<ProjectManagementComponent>;
   let projectService: ProjectService;
 
   const projects: Project[] = [{
-    id: 1,
+    id: '1',
     name: 'app 1',
     details: 'It is a good app',
     status: 'inactive',
     completed: true
   },
   {
-    id: 2,
+    id: '2',
     name: 'app 2',
     details: 'It is a good app',
     status: 'inactive',
     completed: false
   },
   {
-    id: 3,
+    id: '3',
     name: 'app 3',
     details: 'It is a good app',
     status: 'active',
@@ -89,14 +90,14 @@ describe('ProjectManagementComponent', () => {
 
   it('should edit a project #updateProject', () => {
     const project = {
-      id: 1,
+      id: '1',
       name: 'app test',
       details: 'It is a excelent app',
       status: 'inactive',
       completed: true
     };
 
-    component.editedProjectId = 1;
+    component.editedProjectId = '1';
     component.updateProject(project);
     expect(component.projects.length).toEqual(3);
     expect(component.projects[0].name).toBe('app test');
@@ -106,14 +107,14 @@ describe('ProjectManagementComponent', () => {
   });
 
   it('should filter the project to edit #editProject', () => {
-    const editProjectId = 2;
+    const editProjectId = '2';
     component.editProject(editProjectId);
     expect(component.project.name).toBe('app 2');
   });
 
   it('should clean the project #cancelForm', () => {
     const project = {
-      id: 1,
+      id: '1',
       name: 'app 1',
       details: 'It is a good app',
       status: 'inactive',
@@ -149,7 +150,7 @@ describe('ProjectManagementComponent', () => {
   }));
 
   it('should delete a project #deleteProject', () => {
-    const projectId = 1;
+    const projectId = '1';
 
     component.deleteProject(projectId);
     expect(component.projects.length).toEqual(2);

src/app/components/options-sidebar/getting-started/getting-started.component.html

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Project } from '../../../interfaces/project';
+import { Project } from '../../../interfaces';
 import { ProjectService } from '../../../services/project.service';
 
 @Component({
@@ -30,7 +30,7 @@ export class ProjectManagementComponent implements OnInit {
       this.projects[projectIndex].status = projectData.status;
       this.projects[projectIndex].completed = projectData.completed;
     } else {
-      const newProject: Project = { id: this.projects.length + 1, name: projectData.name,
+      const newProject: Project = { id: (this.projects.length + 1).toString(), name: projectData.name,
         details: projectData.details, status: projectData.status, completed: false
       };
       this.projects = this.projects.concat(newProject);