Skip to content

Commit d8eaa71

Browse files
zenkietzenkiet
committed
update
1 parent 4a6c60d commit d8eaa71

File tree

10 files changed

+215
-71
lines changed

10 files changed

+215
-71
lines changed

‎apps/client/src/app/mock-api/common/navigation/data.ts

Lines changed: 107 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,132 @@
22
import { FuseNavigationItem } from '@fuse/components/navigation';
33

44
export const defaultNavigation: FuseNavigationItem[] = [
5+
{
6+
id: 'dashboard',
7+
title: 'Dashboard',
8+
type: 'basic',
9+
icon: 'duotone:gauge',
10+
link: '/dashboards/project',
11+
},
512
{
613
id: 'project',
714
title: 'Project',
815
type: 'basic',
9-
icon: 'duotone:square-kanban',
10-
link: '/project',
16+
icon: 'duotone:bars-progress',
17+
link: '/plan',
18+
},
19+
{
20+
id: 'Todo',
21+
title: 'Todo',
22+
type: 'group',
23+
icon: 'duotone:clipboard-list-check',
24+
children: [
25+
{
26+
id: 'tasks',
27+
title: 'Tasks',
28+
type: 'basic',
29+
icon: 'duotone:list-check',
30+
link: '/tasks',
31+
},
32+
{
33+
id: 'scrumboard',
34+
title: 'Scrumboard',
35+
type: 'basic',
36+
icon: 'duotone:square-kanban',
37+
link: 'scrumboard/plan',
38+
},
39+
],
40+
},
41+
{
42+
id: 'settings',
43+
title: 'Settings',
44+
type: 'basic',
45+
icon: 'duotone:gear',
46+
link: '/settings',
1147
},
1248
];
1349
export const compactNavigation: FuseNavigationItem[] = [
50+
{
51+
id: 'dashboard',
52+
title: 'Dashboard',
53+
type: 'basic',
54+
icon: 'duotone:gauge',
55+
link: '/dashboards/project',
56+
},
1457
{
1558
id: 'project',
1659
title: 'Project',
1760
type: 'basic',
61+
icon: 'duotone:bars-progress',
62+
link: '/plan',
63+
},
64+
65+
{
66+
id: 'tasks',
67+
title: 'Tasks',
68+
type: 'basic',
69+
icon: 'duotone:list-check',
70+
link: '/tasks',
71+
},
72+
{
73+
id: 'scrumboard',
74+
title: 'Scrumboard',
75+
type: 'basic',
1876
icon: 'duotone:square-kanban',
19-
link: '/project',
77+
link: 'scrumboard/plan',
78+
},
79+
80+
{
81+
id: 'settings',
82+
title: 'Settings',
83+
type: 'basic',
84+
icon: 'duotone:gear',
85+
link: '/settings',
2086
},
2187
];
2288
export const futuristicNavigation: FuseNavigationItem[] = [
89+
{
90+
id: 'dashboard',
91+
title: 'Dashboard',
92+
type: 'basic',
93+
icon: 'duotone:gauge',
94+
link: '/dashboards/project',
95+
},
2396
{
2497
id: 'project',
2598
title: 'Project',
2699
type: 'basic',
27-
icon: 'duotone:square-kanban',
28-
link: '/project',
100+
icon: 'duotone:bars-progress',
101+
link: '/plan',
102+
},
103+
{
104+
id: 'Todo',
105+
title: 'Todo',
106+
type: 'group',
107+
icon: 'duotone:clipboard-list-check',
108+
children: [
109+
{
110+
id: 'tasks',
111+
title: 'Tasks',
112+
type: 'basic',
113+
icon: 'duotone:list-check',
114+
link: '/tasks',
115+
},
116+
{
117+
id: 'scrumboard',
118+
title: 'Scrumboard',
119+
type: 'basic',
120+
icon: 'duotone:square-kanban',
121+
link: 'scrumboard/plan',
122+
},
123+
],
124+
},
125+
{
126+
id: 'settings',
127+
title: 'Settings',
128+
type: 'basic',
129+
icon: 'duotone:gear',
130+
link: '/settings',
29131
},
30132
];
31133
export const horizontalNavigation: FuseNavigationItem[] = [

‎apps/client/src/app/modules/admin/apps/plan/components/dialogs/plan/plan-diolog-plan.component.html

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<div class="md:w-160 md:min-w-160 -m-6 flex flex-auto flex-col">
2-
<form [formGroup]="planForm" class="px-4 py-10 sm:p-8 md:mx-0">
2+
<form [formGroup]="planForm" class="p-4 sm:p-8 md:mx-0">
3+
<!-- Header -->
34
<div class="mx-auto max-w-md">
45
<div class="flex items-center gap-4">
56
<div
@@ -18,22 +19,29 @@
1819
</div>
1920
</div>
2021
</div>
22+
2123
<!-- Title -->
22-
<mat-form-field class="my-3 w-full px-8" [subscriptSizing]="'dynamic'">
24+
<mat-form-field
25+
class="my-3 w-full px-2 sm:px-4 md:px-8"
26+
[subscriptSizing]="'dynamic'"
27+
>
2328
<mat-label>Title</mat-label>
2429
<mat-icon
2530
class="icon-size-5"
2631
[svgIcon]="'duotone:heading'"
2732
matPrefix
2833
></mat-icon>
2934
<input [formControlName]="'title'" matInput placeholder="Title" />
35+
<mat-error class="px-2" *ngIf="require('title')" @expandCollapse>
36+
<span> Title không được để trống </span>
37+
</mat-error>
3038
</mat-form-field>
31-
<mat-error class="px-8" *ngIf="require('title')" @expandCollapse>
32-
<span> Title không được để trống </span>
33-
</mat-error>
3439

3540
<!-- Description -->
36-
<mat-form-field class="my-3 w-full px-8" [subscriptSizing]="'dynamic'">
41+
<mat-form-field
42+
class="my-3 w-full px-2 sm:px-4 md:px-8"
43+
[subscriptSizing]="'dynamic'"
44+
>
3745
<mat-label>Description</mat-label>
3846
<mat-icon
3947
class="icon-size-5"
@@ -48,14 +56,16 @@
4856
<mat-hint align="end">{{
4957
this.planForm.get('description').value.length
5058
}}</mat-hint>
59+
<mat-error class="px-2" *ngIf="require('description')" @expandCollapse>
60+
<span> Description không được để trống </span>
61+
</mat-error>
5162
</mat-form-field>
52-
<mat-error class="px-8" *ngIf="require('description')" @expandCollapse>
53-
<span> Description không được để trống </span>
54-
</mat-error>
5563

5664
<!-- Category & Assigned To -->
57-
<div class="my-3 flex w-full items-center justify-center gap-4 px-8">
58-
<div class="grow">
65+
<div
66+
class="my-3 flex w-full flex-col items-center justify-center gap-4 px-2 sm:flex-row sm:px-4 md:px-8"
67+
>
68+
<div class="w-full grow">
5969
<mat-form-field
6070
class="fuse-mat-dense w-full"
6171
[subscriptSizing]="'dynamic'"
@@ -87,7 +97,8 @@
8797
</mat-select>
8898
</mat-form-field>
8999
</div>
90-
<div class="w-1/3 flex-none">
100+
101+
<div class="w-full flex-none sm:w-auto">
91102
<mat-form-field
92103
class="fuse-mat-dense w-full"
93104
[subscriptSizing]="'dynamic'"
@@ -105,7 +116,10 @@
105116
</div>
106117

107118
<!-- Members -->
108-
<mat-form-field class="my-3 w-full px-8" [subscriptSizing]="'dynamic'">
119+
<mat-form-field
120+
class="my-3 w-full px-2 sm:px-4 md:px-8"
121+
[subscriptSizing]="'dynamic'"
122+
>
109123
<mat-label>Particular</mat-label>
110124
<mat-icon
111125
class="icon-size-5 mr-4"

‎apps/client/src/app/modules/admin/apps/plan/components/dialogs/task/plan-dialogs-task.component.html

Lines changed: 46 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="md:w-160 md:min-w-160 -m-6 flex flex-auto flex-col">
2-
<form [formGroup]="taskForm" class="px-4 py-10 sm:p-8 md:mx-0">
1+
<div class="md:w-160 md:min-w-160 flex flex-auto flex-col sm:-m-6">
2+
<form [formGroup]="taskForm" class="sm:p-8 md:mx-0">
33
<!-- Header Form -->
44
<div class="mx-auto max-w-md">
55
<div class="flex items-center gap-4">
@@ -21,7 +21,9 @@
2121
</div>
2222

2323
<!-- Title & DueDate -->
24-
<div class="my-3 flex w-full items-center justify-center gap-4 px-8">
24+
<div
25+
class="my-3 flex w-full flex-col items-center justify-center gap-4 sm:flex-row sm:px-4 md:px-8"
26+
>
2527
<mat-form-field class="w-full grow" [subscriptSizing]="'dynamic'">
2628
<mat-label>Title</mat-label>
2729
<mat-icon
@@ -36,7 +38,7 @@
3638
</mat-form-field>
3739

3840
<!-- Due date -->
39-
<div class="flex-none">
41+
<div class="w-full flex-none sm:w-auto">
4042
<div class="font-medium">Due date</div>
4143
<div
4244
class="relative mt-1 flex cursor-pointer items-center rounded-md px-4 py-1.5 leading-9"
@@ -99,7 +101,10 @@
99101
</div>
100102

101103
<!-- Description -->
102-
<mat-form-field class="my-3 w-full px-8" [subscriptSizing]="'dynamic'">
104+
<mat-form-field
105+
class="my-3 w-full sm:px-4 md:px-8"
106+
[subscriptSizing]="'dynamic'"
107+
>
103108
<mat-label>Description</mat-label>
104109
<mat-icon
105110
class="icon-size-5"
@@ -120,42 +125,44 @@
120125
</mat-form-field>
121126

122127
<!-- Assigned To and Priorty -->
123-
<div class="my-3 flex w-full items-center justify-center gap-4 px-8">
124-
<div class="grow">
125-
<mat-form-field
126-
class="fuse-mat-dense w-full"
127-
[subscriptSizing]="'dynamic'"
128-
>
129-
<mat-label>Assigned To</mat-label>
130-
<mat-select [formControlName]="'assignee'" class="py-3">
131-
<mat-form-field class="my-3 w-full rounded-lg px-4 shadow-md">
132-
<input
133-
matInput
134-
#ownerInput
135-
placeholder="Search..."
136-
[formControl]="ownerSearch"
137-
/>
138-
</mat-form-field>
139-
<ng-container *ngIf="filterMembers$ | async as members">
140-
<mat-option
141-
*ngFor="let member of members"
142-
[value]="member.info.email"
128+
<div
129+
class="my-3 flex w-full flex-col items-center justify-center gap-4 sm:flex-row sm:px-4 md:px-8"
130+
>
131+
<mat-form-field
132+
class="fuse-mat-dense w-full grow"
133+
[subscriptSizing]="'dynamic'"
134+
>
135+
<mat-label>Assigned To</mat-label>
136+
<mat-select [formControlName]="'assignee'" class="py-3">
137+
<mat-form-field class="my-3 w-full rounded-lg px-4 shadow-md">
138+
<input
139+
matInput
140+
#ownerInput
141+
placeholder="Search..."
142+
[formControl]="ownerSearch"
143+
/>
144+
</mat-form-field>
145+
<ng-container *ngIf="filterMembers$ | async as members">
146+
<mat-option
147+
*ngFor="let member of members"
148+
[value]="member.info.email"
149+
>
150+
<div
151+
class="flex items-center justify-center gap-2 border-t-gray-400"
143152
>
144-
<div class="flex items-center justify-center gap-2">
145-
<img
146-
class="h-8 w-8 rounded-full ring-1 ring-gray-500 ring-offset-1"
147-
[src]="member.info.avatar"
148-
alt="Avatar Member"
149-
/>
153+
<img
154+
class="h-8 w-8 rounded-full ring-1 ring-gray-500 ring-offset-1"
155+
[src]="member.info.avatar"
156+
alt="Avatar Member"
157+
/>
150158

151-
<span>{{ member.info.name }}</span>
152-
</div>
153-
</mat-option>
154-
</ng-container>
155-
</mat-select>
156-
</mat-form-field>
157-
</div>
158-
<div class="flex-none">
159+
<span>{{ member.info.name }}</span>
160+
</div>
161+
</mat-option>
162+
</ng-container>
163+
</mat-select>
164+
</mat-form-field>
165+
<div class="w-full flex-none sm:w-auto">
159166
<mat-form-field
160167
class="fuse-mat-dense w-full"
161168
[subscriptSizing]="'dynamic'"

‎apps/client/src/environments/environment.development.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
export const environment = {
22
production: false,
3+
apiUrl: 'http://128.199.206.10:3000',
34
};

‎apps/client/src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export const environment = {
22
production: true,
3-
s3_url: 'https://cloud.task-management.zenfection.com'
3+
apiUrl: 'http://128.199.206.10:3000',
44
};

‎apps/client/src/proxy-prod.conf.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"/api": {
3+
"target": "https://128.199.206.10:3000",
4+
"secure": false,
5+
"logLevel": "debug",
6+
"changeOrigin": true,
7+
"pathRewrite": {"^/api" : "https://128.199.206.10:3000"}
8+
}
9+
}

‎apps/client/src/proxy.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"/api": {
3-
"target": "http://localhost:3000",
3+
"target": "http://localhost:3000/api",
44
"secure": false,
55
"pathRewrite": {
66
"^/api": ""

0 commit comments

Comments
 (0)