Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion frontend/scripts/update-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export const version = '${version}';
`;

fs.writeFileSync(versionTsPath, versionTsContent);
console.log(`Updated version.ts with version ${version}`);
console.log(`Updated version.ts with version ${version}`);
51 changes: 19 additions & 32 deletions frontend/src/app/animations/toggle.animation.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,25 @@
import {
trigger,
transition,
style,
animate,
query,
group,
} from '@angular/animations';
import { animate, group, query, style, transition, trigger } from '@angular/animations';

const easing = 'cubic-bezier(0.4, 0.0, 0.2, 1)';
const duration = '600ms';

export const toggleAnimation = trigger('toggle', [
transition(':enter', [
style({ height: 0, opacity: 0 }),
query('.details', [
style({ transform: 'translateY(-100%)' })
], { optional: true }),
group([
animate(`${duration} ${easing}`, style({ height: '*', opacity: 1 })),
query('.details', [
animate(`${duration} ${easing}`, style({ transform: 'translateY(0)' }))
], { optional: true })
])
]),
transition(':leave', [
style({ height: '*', opacity: 1 }),
query('.details', [
style({ transform: 'translateY(0)' })
], { optional: true }),
group([
animate(`${duration} ${easing}`, style({ height: 0, opacity: 0 })),
query('.details', [
animate(`${duration} ${easing}`, style({ transform: 'translateY(-100%)' }))
], { optional: true })
])
])
transition(':enter', [
style({ height: 0, opacity: 0 }),
query('.details', [style({ transform: 'translateY(-100%)' })], { optional: true }),
group([
animate(`${duration} ${easing}`, style({ height: '*', opacity: 1 })),
query('.details', [animate(`${duration} ${easing}`, style({ transform: 'translateY(0)' }))], { optional: true }),
]),
]),
transition(':leave', [
style({ height: '*', opacity: 1 }),
query('.details', [style({ transform: 'translateY(0)' })], { optional: true }),
group([
animate(`${duration} ${easing}`, style({ height: 0, opacity: 0 })),
query('.details', [animate(`${duration} ${easing}`, style({ transform: 'translateY(-100%)' }))], {
optional: true,
}),
]),
]),
]);
23 changes: 11 additions & 12 deletions frontend/src/app/auth.guard.spec.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { TestBed, inject } from '@angular/core/testing';

import { AuthGuard } from './auth.guard';
import { inject, TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AuthGuard } from './auth.guard';

describe('AuthGuard', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [AuthGuard],
imports: [RouterTestingModule]
});
});
beforeEach(() => {
TestBed.configureTestingModule({
providers: [AuthGuard],
imports: [RouterTestingModule],
});
});

it('should ...', inject([AuthGuard], (guard: AuthGuard) => {
expect(guard).toBeTruthy();
}));
it('should ...', inject([AuthGuard], (guard: AuthGuard) => {
expect(guard).toBeTruthy();
}));
});
51 changes: 22 additions & 29 deletions frontend/src/app/auth.guard.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,30 @@
import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot, Router } from '@angular/router';
import { differenceInMilliseconds } from 'date-fns'

import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
import { differenceInMilliseconds } from 'date-fns';

@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class AuthGuard implements CanActivate {
constructor(private router: Router) {}

constructor(
private router: Router
) {}

async canActivate(
_route: ActivatedRouteSnapshot,
_state: RouterStateSnapshot
) {
try {
const expirationToken = localStorage.getItem('token_expiration');
let expirationTime = null;
if (expirationToken) expirationTime = new Date(expirationToken);
const currantTime = new Date();
async canActivate(_route: ActivatedRouteSnapshot, _state: RouterStateSnapshot) {
try {
const expirationToken = localStorage.getItem('token_expiration');
let expirationTime = null;
if (expirationToken) expirationTime = new Date(expirationToken);
const currantTime = new Date();

if (expirationTime && currantTime) {
const expirationInterval = differenceInMilliseconds(expirationTime, currantTime);
if (expirationInterval > 0) return true;
} else {
console.log('auth guard, expirationInterval <= 0');
this.router.navigate(['/login']);
}
return false;
} catch {
return false;
}
}
if (expirationTime && currantTime) {
const expirationInterval = differenceInMilliseconds(expirationTime, currantTime);
if (expirationInterval > 0) return true;
} else {
console.log('auth guard, expirationInterval <= 0');
this.router.navigate(['/login']);
}
return false;
} catch {
return false;
}
}
}
Loading
Loading