Compare commits

...

4 Commits

Author SHA1 Message Date
f11fd84b6f chore(deps): update dependency jasmine-core to v4
Some checks reported errors
charlyghislain/charlyghislaindotcom/pipeline/pr-master Something is wrong with the build of this commit
2022-04-18 01:00:37 +00:00
0a52e84933 Update dockerfile
Some checks failed
charlyghislain/charlyghislaindotcom/pipeline/head There was a failure building this commit
2022-04-18 01:55:11 +02:00
c50cd318cc Update jenkinsfile
Some checks failed
charlyghislain/charlyghislaindotcom/pipeline/head There was a failure building this commit
2022-04-18 01:16:01 +02:00
e0a0f26560 Migrate moment to luxon
Some checks failed
charlyghislain/charlyghislaindotcom/pipeline/head There was a failure building this commit
2022-04-18 01:06:06 +02:00
5 changed files with 121 additions and 13838 deletions

View File

@ -1,4 +1,4 @@
FROM docker.valuya.com/apache-front:2.4.48
FROM docker.valuya.com/apache-front:2.4.52
ARG CLANG=en
COPY docker/httpd.conf /var/run/httpd.conf.tmp

2
Jenkinsfile vendored
View File

@ -24,7 +24,7 @@ pipeline {
stages {
stage ('Build') {
steps {
nodejs(nodeJSInstallationName: 'node 15', configId: 'npm-global-config') { catchError {
nodejs(nodeJSInstallationName: 'node 16', configId: 'npm-global-config') { catchError {
ansiColor('xterm') {
sh '''
rm -rfv dist*

13942
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -21,7 +21,7 @@
"@angular/platform-browser-dynamic": "^13.3.3",
"@angular/router": "^13.3.3",
"core-js": "^2.6.12",
"moment-es6": "^1.0.0",
"luxon": "^2.3.2",
"rxjs": "^6.6.7",
"tslib": "^2.0.0",
"zone.js": "~0.11.5"
@ -33,9 +33,10 @@
"@angular/language-service": "^13.3.3",
"@types/jasmine": "~3.6.11",
"@types/jasminewd2": "^2.0.10",
"@types/node": "^14.18.13",
"@types/node": "^16.11.27",
"@types/luxon": "^2.3.1",
"codelyzer": "^6.0.2",
"jasmine-core": "~3.6.0",
"jasmine-core": "~4.1.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~6.3.18",
"karma-chrome-launcher": "~3.1.1",

View File

@ -3,7 +3,7 @@ import {BuildInfoService} from './build-info.service';
import {Observable, of} from 'rxjs';
import {catchError, defaultIfEmpty, filter, map, publishReplay, refCount} from 'rxjs/operators';
import {BuildInfo} from './build-info';
import moment from 'moment-es6';
import {DateTime} from 'luxon';
@Component({
selector: 'app-root',
@ -36,7 +36,7 @@ export class AppComponent implements OnInit {
}
private parseDate(dateString: string) {
const dateMoment = dateString == null ? moment() : moment(dateString);
return dateMoment.format('DD/MM/YYYY HH:mm:ss');
const parsedDateString = dateString == null ? undefined : DateTime.fromISO(dateString).toISODate();
return parsedDateString;
}
}