Compare commits

..
Author SHA1 Message Date
Jovan Krunić c9ada93f87 fix: remove expired label from the id cards 2026-10-19 17:33:15 +02:00
13 changed files with 473 additions and 413 deletions
+2 -1
View File
@@ -53,6 +53,7 @@
"@types/geojson": "1.0.6",
"@types/node": "22.15.31",
"@types/node-cron": "3.0.7",
"@types/nodemailer": "8.0.2",
"@types/promise-queue": "2.2.0",
"@types/uuid": "8.3.4",
"body-parser": "1.20.3",
@@ -68,7 +69,7 @@
"nock": "13.3.1",
"node-cache": "5.1.2",
"node-cron": "3.0.2",
"nodemailer": "10.1.7",
"nodemailer": "8.0.11",
"prom-client": "14.1.1",
"promise-queue": "2.2.5",
"uuid": "8.3.2"
+6 -6
View File
@@ -48,13 +48,13 @@
"test:integration": "sh integration-test.sh"
},
"dependencies": {
"@angular/animations": "20.3.32",
"@angular/animations": "20.3.31",
"@angular/cdk": "20.2.14",
"@angular/common": "20.3.32",
"@angular/core": "20.3.32",
"@angular/forms": "20.3.32",
"@angular/platform-browser": "20.3.32",
"@angular/router": "20.3.32",
"@angular/common": "20.3.31",
"@angular/core": "20.3.31",
"@angular/forms": "20.3.31",
"@angular/platform-browser": "20.3.31",
"@angular/router": "20.3.31",
"@awesome-cordova-plugins/calendar": "8.1.0",
"@awesome-cordova-plugins/core": "8.1.0",
"@capacitor-community/in-app-review": "8.0.0",
@@ -1,9 +1,6 @@
import {ChangeDetectionStrategy, Component, ElementRef, Input, inject} from '@angular/core';
import {SCIdCard} from '@openstapps/core';
import {ThingTranslateModule} from '../../translation/thing-translate.module';
import {AsyncPipe, TitleCasePipe} from '@angular/common';
import {IntervalIsNowPipe, ToDateIntervalPipe} from '../../util/in-range.pipe';
import {TranslateModule} from '@ngx-translate/core';
import {AnimationController, ModalController} from '@ionic/angular/standalone';
import {ScreenBrightness} from '@capacitor-community/screen-brightness';
import {ScreenOrientation} from '@capacitor/screen-orientation';
@@ -15,14 +12,7 @@ import {iosDuration, iosEasing, mdDuration, mdEasing} from 'src/app/animation/ea
templateUrl: 'id-card.html',
styleUrls: ['id-card.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [
ThingTranslateModule,
IntervalIsNowPipe,
ToDateIntervalPipe,
AsyncPipe,
TranslateModule,
TitleCasePipe,
],
imports: [ThingTranslateModule],
})
export class IdCardComponent {
private modalController = inject(ModalController);
@@ -4,6 +4,3 @@
draggable="false"
(click)="presentFullscreen()"
/>
@if (item.validity && (item.validity | rangeToDateInterval | dfnsIntervalIsNow | async) === false) {
<div class="expired">{{ 'profile.userInfo.expired' | translate | titlecase }}</div>
}
@@ -6,24 +6,3 @@
img {
border-radius: 3mm;
}
.expired {
position: absolute;
top: 48px;
left: 48px;
transform-origin: center;
translate: -50% -50%;
rotate: -45deg;
display: flex;
align-items: center;
justify-content: center;
width: 256px;
padding: var(--spacing-xs);
font-weight: bold;
color: var(--ion-color-danger-contrast);
background: var(--ion-color-danger);
}
-1
View File
@@ -405,7 +405,6 @@
}
},
"userInfo": {
"expired": "Abgelaufen",
"studentId": "Matrikelnr.",
"username": "Nutzername",
"email": "Email",
-1
View File
@@ -405,7 +405,6 @@
}
},
"userInfo": {
"expired": "expired",
"studentId": "Matriculation Nr.",
"username": "Username",
"email": "Email",
+1 -1
View File
@@ -51,7 +51,7 @@
"commander": "10.0.0",
"fs-extra": "10.1.0",
"junit-report-builder": "3.0.1",
"wait-on": "9.5.1"
"wait-on": "6.0.1"
},
"devDependencies": {
"@openstapps/eslint-config": "workspace:*",
+4 -4
View File
@@ -52,8 +52,8 @@
"better-ajv-errors": "1.2.0",
"commander": "10.0.0",
"deepmerge": "4.3.1",
"del": "9.0.1",
"flatted": "3.4.4",
"del": "6.1.1",
"flatted": "3.2.7",
"fs-extra": "10.1.0",
"glob": "10.5.0",
"got": "12.6.0",
@@ -62,9 +62,9 @@
"mustache": "4.2.0",
"openapi-types": "12.1.0",
"plantuml-encoder": "1.4.0",
"re2": "1.27.0",
"re2": "1.21.0",
"toposort": "2.0.2",
"ts-json-schema-generator": "1.5.0"
"ts-json-schema-generator": "1.2.0"
},
"devDependencies": {
"@openstapps/eslint-config": "workspace:*",
+1 -1
View File
@@ -29,7 +29,7 @@
"@elastic/elasticsearch": "8.14.1",
"commander": "10.0.0",
"deepmerge": "4.3.1",
"flatted": "3.4.4",
"flatted": "3.2.7",
"typedoc": "0.18.0",
"typescript": "3.8.3"
},
+3 -2
View File
@@ -28,9 +28,10 @@
"test": "c8 mocha"
},
"dependencies": {
"@types/nodemailer": "8.0.2",
"chalk": "5.2.0",
"flatted": "3.4.4",
"nodemailer": "10.1.7"
"flatted": "3.2.7",
"nodemailer": "8.0.11"
},
"devDependencies": {
"@openstapps/eslint-config": "workspace:*",
+4 -4
View File
@@ -312,19 +312,19 @@ export class SMTP extends VerifiableTransport {
*/
public async sendMail(mail: SendMailOptions): Promise<string> {
// info is the response of the smtp server
const info = await this.transportAgent.sendMail(mail);
let info = await this.transportAgent.sendMail(mail);
// it can be undefined (empty response)
if (info === undefined) {
(info['message'] as string) = 'Successfully sent mail';
info = 'Successfully sent mail';
}
// or not of type string
if (typeof info !== 'string') {
(info.message as string) = JSON.stringify(info.message);
info = JSON.stringify(info);
}
return info.message;
return info;
}
/**
+451 -357
View File
File diff suppressed because it is too large Load Diff