Skip to content

Commit 0fab3a1

Browse files
authored
Version 1.0.0
Version 1.0.0
2 parents 2e42417 + 06f0e55 commit 0fab3a1

13 files changed

Lines changed: 239 additions & 78 deletions

File tree

src/app/app.routing.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,18 @@ const routes: Routes = [
6868
loadChildren: () =>
6969
import('./dashboard/dashboard.module').then((m) => m.DashboardModule),
7070
},
71+
{
72+
path: '**',
73+
redirectTo: '/dashboard',
74+
},
7175
],
7276
},
7377
],
7478
},
79+
{
80+
path: '**',
81+
redirectTo: '',
82+
},
7583
];
7684

7785
@NgModule({

src/app/auth/auth.routing.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ const routes: Routes = [
5858
pathMatch: 'full',
5959
component: RegisterPage,
6060
},
61+
{
62+
path: '**',
63+
redirectTo: '',
64+
},
6165
],
6266
},
6367
];

src/app/auth/pages/delete-account/delete-account.page.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<div class="logo" routerLink="/"></div>
55
<div>
66
<h2 class="text-xl font-bold" i18n>Your account has been deleted.</h2>
7-
<p class="text-base" i18n>If you are going to revive your account, you can log in to your account <a
8-
routerLink="/auth/login">click here to log in</a> </p>
7+
<p class="text-base" i18n>Your account has been deleted. If you would like to restore it, please <a
8+
routerLink="/auth/login">log in</a> within the next 7 days. After that, restoration will no longer be possible.</p>
99
</div>
1010
</section>
1111
<section class="image-side">

src/app/auth/pages/login/login.page.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<form [formGroup]="form" (submit)="login()">
66
<div>
77
<h2 class="text-xl font-bold" i18n>Login to system</h2>
8-
<p class="text-base" i18n>This is a secure site. Please enter your login information to enter or <a
9-
routerLink="/auth/register">click here</a> to register.</p>
8+
<p class="text-base" i18n>Please enter your email and password to log in. If you don't have an account, you can create one by clicking <a
9+
routerLink="/auth/register">register</a>.</p>
1010
</div>
1111

1212
<div *ngIf="error" class="error-box">

src/app/auth/pages/register/register.page.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<form [formGroup]="form" (submit)="register()">
66
<div>
77
<h2 class="text-xl font-bold" i18n>Register</h2>
8-
<p class="text-base" i18n>This is a secure site. Please enter your register information or if you have an
9-
account already, <a routerLink="/auth/login">click here</a> to login.</p>
8+
<p class="text-base" i18n>Please fill out the form below to create a new account. All fields are required. Already have an account? Please <a routerLink="/auth/login">click here</a> to log in.</p>
109
</div>
1110

1211
<div *ngIf="error" class="error-box">
@@ -25,10 +24,7 @@ <h2 class="text-xl font-bold" i18n>Register</h2>
2524

2625
<div class="agreements">
2726
<app-checkbox formControlName="agreements" i18n>
28-
<span>I agree to the <a routerLink="/terms-and-conditions" target="_blank" click-stop-propagation>Terms
29-
and
30-
Conditions</a> and <a routerLink="/privacy-policy" target="_blank" click-stop-propagation>Privacy
31-
Policy</a></span>.
27+
<span>I agree to the <a routerLink="/terms-and-conditions" target="_blank" click-stop-propagation>Terms and Conditions</a> and <a routerLink="/privacy-policy" target="_blank" click-stop-propagation>Privacy Policy</a></span>.
3228
</app-checkbox>
3329
</div>
3430

src/app/auth/pages/register/register.page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class RegisterPage {
119119
}),
120120
)
121121
.subscribe(() => {
122-
this.router.navigate(['/register/in-progress']);
122+
this.router.navigate(['/auth/register/in-progress']);
123123
});
124124
}
125125
}

src/app/auth/services/user/user.service.ts

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,15 @@ export class UserService extends BaseService<Errors<any>> {
169169
* @returns default user preferences
170170
*/
171171
public getUserDefaultPreferences() {
172+
const navigatorLanguage = this.isLanguageValid(navigator.language)
173+
? navigator.language
174+
: 'en-US';
175+
const urlLanguage = this.isLanguageValid(this.routerExtensionsService.getLanguageFromUrl())
176+
? this.routerExtensionsService.getLanguageFromUrl()
177+
: 'en-US';
178+
172179
return {
173-
language: navigator.language || this.routerExtensionsService.getLanguageFromUrl(),
180+
language: navigatorLanguage || urlLanguage || 'en-US',
174181
dateFormat: 'DD.MM.YYYY',
175182
timeFormat: 'HH:mm',
176183
firstDayOfWeek: 1,
@@ -257,12 +264,19 @@ export class UserService extends BaseService<Errors<any>> {
257264
.pipe(this.validate({}));
258265
}
259266

267+
private isLanguageValid(lang: string | null) {
268+
if (!lang) return false;
269+
return ['pl-PL', 'en-GB', 'it-IT', 'es-ES', 'de-DE', 'uk-UA'].includes(lang);
270+
}
271+
260272
public loadLocale(): void {
261273
this.getMyself().subscribe((user: User) => {
262-
if (
263-
this.routerExtensionsService.getLanguageFromUrl() &&
264-
user.language !== this.routerExtensionsService.getLanguageFromUrl()
265-
) {
274+
const urlLanguage = this.isLanguageValid(this.routerExtensionsService.getLanguageFromUrl())
275+
? this.routerExtensionsService.getLanguageFromUrl()
276+
: null;
277+
const userLanguage = this.isLanguageValid(user.language) ? user.language : null;
278+
279+
if (urlLanguage && userLanguage && userLanguage !== urlLanguage) {
266280
this.routerExtensionsService.reloadWithLanguage(user.language);
267281
return;
268282
}

src/app/dashboard/modules/integration-modules/components/integration-github/integration-github.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ <h2 class="text-xl font-bold mb-5">Github</h2>
55
<div class="card-content">
66
<!-- If GitHub account does not exist show Connect to GitHub button -->
77
<ng-container *ngIf="((gitHubAccounts$ | async) || []).length === 0">
8-
<p i18n>You are not connected to any GitHub account. You need to connect to GitHub first.</p>
8+
<p i18n>In order to proceed, you'll need to connect your GitHub account first.</p>
99
</ng-container>
1010
<ng-container *ngIf="((gitHubAccounts$ | async) || []).length! > 0">
11-
<p i18n>Note: You need to authorize repositories to be able to use them in your integrations.</p>
11+
<p i18n>Note: To use your repositories in our integrations, you'll need to authorize them first.</p>
1212
</ng-container>
1313
</div>
1414
<div class="card-actions flex justify-end">

src/app/dashboard/services/member/member.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class MemberService extends BaseService<
1919
> {
2020
protected override errorCodes = {
2121
NOT_ENOUGH_PRIVILEGES: {
22-
message: $localize`You don't have enough privileges to do this`,
22+
message: $localize`I'm sorry, but it looks like you don't have the necessary permissions to perform this action.`,
2323
},
2424
PROJECT_NOT_FOUND: {
2525
message: $localize`Project not found`,

src/app/tasks/components/task-list/task-list.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<!-- Header -->
44
<div class="header-row">
5-
<div class="header-cell w-full">Title</div>
6-
<div class="header-cell w-52">Status</div>
7-
<div class="header-cell w-52">Assignee</div>
8-
<div class="header-cell w-52">Time tracking</div>
9-
<div class="header-cell w-52">Deadline</div>
10-
<div class="header-cell w-52">Story points</div>
5+
<div class="header-cell w-full" i18n>Title</div>
6+
<div class="header-cell w-52" i18n>Status</div>
7+
<div class="header-cell w-40" i18n>Assignee</div>
8+
<div class="header-cell w-52" i18n>Time tracking</div>
9+
<div class="header-cell w-52" i18n>Deadline</div>
10+
<div class="header-cell w-40" i18n>Story points</div>
1111
<div class="header-cell action">
1212
<!-- Actions -->
1313
</div>

0 commit comments

Comments
 (0)