diff --git a/src/app/app.component.html b/src/app/app.component.html index 8d08b1b..3816dbf 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -3,4 +3,5 @@ + diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d7f3cb7..2674f2f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -16,6 +16,10 @@ import { CoursesDescriptionComponent } from './courses-description/courses-descr import { ForumComponent } from './forum/forum.component'; import { CoursePreviewComponent } from './course-preview/course-preview.component'; import { AboutComponent } from './about/about.component'; +import { UdCompletedCoursesComponent } from './user-dashboard/ud-completed-courses/ud-completed-courses.component'; +import { UdOverdueCoursesComponent } from './user-dashboard/ud-overdue-courses/ud-overdue-courses.component'; +import { UdCardsComponent } from './user-dashboard/ud-cards/ud-cards.component'; +import { UdQuizesComponent } from './user-dashboard/ud-quizes/ud-quizes.component'; import { CategoriesComponent } from './categories/categories.component'; import { CourseCategoryComponent } from './courses/course-category/course-category.component'; import { AllCoursesComponent } from './courses/all-courses/all-courses.component'; @@ -35,6 +39,10 @@ import { AllCoursesComponent } from './courses/all-courses/all-courses.component CoursePreviewComponent, ContactComponent, AboutComponent, + UdCompletedCoursesComponent, + UdOverdueCoursesComponent, + UdCardsComponent, + UdQuizesComponent, CategoriesComponent, CourseCategoryComponent, AllCoursesComponent, diff --git a/src/app/user-dashboard/ud-cards/ud-cards.component.html b/src/app/user-dashboard/ud-cards/ud-cards.component.html new file mode 100644 index 0000000..a985536 --- /dev/null +++ b/src/app/user-dashboard/ud-cards/ud-cards.component.html @@ -0,0 +1,58 @@ +
+
+
+
+ +
+
5(to be updated)
+

+

Courses Enrolled

+ +

+ + +
+

+ +

+
+
+ +
+
5(to be updated)
+

+

Completed courses

+

+ +
+

+ +

+
+
+ +
+
5(to be updated)
+

+

Overdue Courses

+

+ + +
+

+ +

+
+
+ + +
+ +
+ diff --git a/src/app/user-dashboard/ud-cards/ud-cards.component.scss b/src/app/user-dashboard/ud-cards/ud-cards.component.scss new file mode 100644 index 0000000..d5ed5c0 --- /dev/null +++ b/src/app/user-dashboard/ud-cards/ud-cards.component.scss @@ -0,0 +1,17 @@ +.card +{ + min-height: 100px; + min-width: 2rem; + text-align: center; + margin-left: 130px; + margin-right: 100px; +} +img +{ + height: 153px; + min-width: 50px; + padding-left: 65px; + padding-right: 65px; + padding-top: 10px; + +} \ No newline at end of file diff --git a/src/app/user-dashboard/ud-cards/ud-cards.component.spec.ts b/src/app/user-dashboard/ud-cards/ud-cards.component.spec.ts new file mode 100644 index 0000000..4c162b7 --- /dev/null +++ b/src/app/user-dashboard/ud-cards/ud-cards.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UdCardsComponent } from './ud-cards.component'; + +describe('UdCardsComponent', () => { + let component: UdCardsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UdCardsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UdCardsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/user-dashboard/ud-cards/ud-cards.component.ts b/src/app/user-dashboard/ud-cards/ud-cards.component.ts new file mode 100644 index 0000000..b6cb286 --- /dev/null +++ b/src/app/user-dashboard/ud-cards/ud-cards.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-ud-cards', + templateUrl: './ud-cards.component.html', + styleUrls: ['./ud-cards.component.scss'] +}) +export class UdCardsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.html b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.html new file mode 100644 index 0000000..fa92947 --- /dev/null +++ b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.html @@ -0,0 +1,22 @@ +
+

+ Completed Courses +

+
+
+
+
+
+ Name of course +
+
+ +
+
+ +
+
+
+

+ + diff --git a/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.scss b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.scss new file mode 100644 index 0000000..085ee64 --- /dev/null +++ b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.scss @@ -0,0 +1,11 @@ +.head +{ + padding-left: 35px; + color: #44579a; +} +.c-courses +{ + background: #106aa0; + color: white; + border-radius: 5px; +} diff --git a/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.spec.ts b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.spec.ts new file mode 100644 index 0000000..ce28749 --- /dev/null +++ b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UdCompletedCoursesComponent } from './ud-completed-courses.component'; + +describe('UdCompletedCoursesComponent', () => { + let component: UdCompletedCoursesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UdCompletedCoursesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UdCompletedCoursesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.ts b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.ts new file mode 100644 index 0000000..ff39f30 --- /dev/null +++ b/src/app/user-dashboard/ud-completed-courses/ud-completed-courses.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-ud-completed-courses', + templateUrl: './ud-completed-courses.component.html', + styleUrls: ['./ud-completed-courses.component.scss'] +}) +export class UdCompletedCoursesComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.html b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.html new file mode 100644 index 0000000..4e02ee9 --- /dev/null +++ b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.html @@ -0,0 +1,66 @@ +
+
+

+ Overdue Courses +

+
+
+
+
+
+ Name of course +
+
+ +
+
+ +
+ This is Progress bars with current value labels +
+

+ + +

+

+ +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+
+
+
+

\ No newline at end of file diff --git a/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.scss b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.scss new file mode 100644 index 0000000..44a741e --- /dev/null +++ b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.scss @@ -0,0 +1,21 @@ +.head +{ + padding-left: 35px; + color: #44579a; +} +.card +{ + margin-left: 60px; + +} +.o-course-two +{ + background: #106aa0; + color: white; + text-align: center; + border-radius: 5px; +} +.o-course-one +{ + display: flex; +} \ No newline at end of file diff --git a/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.spec.ts b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.spec.ts new file mode 100644 index 0000000..5b1f6d4 --- /dev/null +++ b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UdOverdueCoursesComponent } from './ud-overdue-courses.component'; + +describe('UdOverdueCoursesComponent', () => { + let component: UdOverdueCoursesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UdOverdueCoursesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UdOverdueCoursesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.ts b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.ts new file mode 100644 index 0000000..dc45652 --- /dev/null +++ b/src/app/user-dashboard/ud-overdue-courses/ud-overdue-courses.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-ud-overdue-courses', + templateUrl: './ud-overdue-courses.component.html', + styleUrls: ['./ud-overdue-courses.component.scss'] +}) +export class UdOverdueCoursesComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/user-dashboard/ud-quizes/ud-quizes.component.html b/src/app/user-dashboard/ud-quizes/ud-quizes.component.html new file mode 100644 index 0000000..0d6b631 --- /dev/null +++ b/src/app/user-dashboard/ud-quizes/ud-quizes.component.html @@ -0,0 +1,74 @@ +
+

+ Your Performance +

+
+
+
+
+

Achievement/Quizzes 1

+
+ This is Progress bars with current value labels +
+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+
+
+
+
+
+
+

Achievement/Quizzes 2

+
+ This is Global configuration of progress bars +
+

This progress bar uses the customized default values.

+

+ +

+ This progress bar uses the customized default values, but changes the + type using an input. +

+

+
+
+
+ + diff --git a/src/app/user-dashboard/ud-quizes/ud-quizes.component.scss b/src/app/user-dashboard/ud-quizes/ud-quizes.component.scss new file mode 100644 index 0000000..0e67068 --- /dev/null +++ b/src/app/user-dashboard/ud-quizes/ud-quizes.component.scss @@ -0,0 +1,5 @@ +.head +{ + padding-left: 35px; + color: #44579a; +} \ No newline at end of file diff --git a/src/app/user-dashboard/ud-quizes/ud-quizes.component.spec.ts b/src/app/user-dashboard/ud-quizes/ud-quizes.component.spec.ts new file mode 100644 index 0000000..a43c680 --- /dev/null +++ b/src/app/user-dashboard/ud-quizes/ud-quizes.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UdQuizesComponent } from './ud-quizes.component'; + +describe('UdQuizesComponent', () => { + let component: UdQuizesComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UdQuizesComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UdQuizesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/user-dashboard/ud-quizes/ud-quizes.component.ts b/src/app/user-dashboard/ud-quizes/ud-quizes.component.ts new file mode 100644 index 0000000..88413d2 --- /dev/null +++ b/src/app/user-dashboard/ud-quizes/ud-quizes.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-ud-quizes', + templateUrl: './ud-quizes.component.html', + styleUrls: ['./ud-quizes.component.scss'] +}) +export class UdQuizesComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/user-dashboard/user-dashboard.component.html b/src/app/user-dashboard/user-dashboard.component.html index ac42747..463b59f 100644 --- a/src/app/user-dashboard/user-dashboard.component.html +++ b/src/app/user-dashboard/user-dashboard.component.html @@ -1,56 +1,23 @@ -
-
-
-
-

Name of Course

-
- This is Progress bars with current value labels -
-

- - -

-

- -

-

- - -

-

- - -

-

- - -

-

- - -

+
+
+

+ Welcome ! To Your Online Assistant +

-
-
+
+
+ +
+
+
+

+ +

+ + + +
+
@@ -100,6 +67,7 @@
+
@@ -149,71 +117,9 @@
-
-
-
-

Achievement/Quizzes 1

-
- This is Progress bars with current value labels -
-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-
-
-
-
-
-
-

Achievement/Quizzes 2

-
- This is Global configuration of progress bars -
-

This progress bar uses the customized default values.

-

- -

- This progress bar uses the customized default values, but changes the - type using an input. -

-

-
-
-
+

+ +
+ + \ No newline at end of file diff --git a/src/app/user-dashboard/user-dashboard.component.scss b/src/app/user-dashboard/user-dashboard.component.scss index e69de29..2d3774e 100644 --- a/src/app/user-dashboard/user-dashboard.component.scss +++ b/src/app/user-dashboard/user-dashboard.component.scss @@ -0,0 +1,17 @@ +.main +{ + display: flex; +} +.head +{ + padding-left:35px; + padding-top:20px; + color: #44579a; + background-color: qqqqqq"" + +} +.search +{ + margin-top: 20px; + margin-left: 560px; +} diff --git a/src/assets/images/clock.png b/src/assets/images/clock.png new file mode 100644 index 0000000..56ed564 Binary files /dev/null and b/src/assets/images/clock.png differ diff --git a/src/assets/images/graduate.png b/src/assets/images/graduate.png new file mode 100644 index 0000000..05e8cc2 Binary files /dev/null and b/src/assets/images/graduate.png differ diff --git a/src/assets/images/medal.png b/src/assets/images/medal.png new file mode 100644 index 0000000..f3a62a9 Binary files /dev/null and b/src/assets/images/medal.png differ