Address update

Reviewed-on: #49

.dockerignore

@@ -1,5 +1,5 @@
 .idea/
 e2e/
-jenkins/
+../../../valuya/cluster/valuya-cluster-state/charlyghislaindotcom/jenkins/
 node_modules/
 src/

.gitignore

@@ -1,4 +1,5 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
+.angular/
 
 # compiled output
 /dist

Dockerfile

@@ -1,10 +1,9 @@
-FROM docker.charlyghislain.com/front-apache:2.4.39-a
+FROM docker.valuya.com/apache-front:2.4.52
 ARG  CLANG=en
 
 COPY docker/httpd.conf /var/run/httpd.conf.tmp
-RUN apk add gettext \
- && mkdir /var/run/httpd \
- && cat /var/run/httpd.conf.tmp | envsubst > /var/run/httpd/charlyghislaindotcom.conf
+RUN mkdir -p /var/run/httpd \
+ && (cat /var/run/httpd.conf.tmp | envsubst > /var/run/httpd/charlyghislaindotcom.conf)
 
 # dist/fr/fr/ -> /var/www/html/fr/
 COPY dist/${CLANG}/${CLANG}/ /var/www/html/${CLANG}/

Jenkinsfile

@@ -13,7 +13,7 @@ pipeline {
           description: 'Image to push (suffixed -fr or -en)'
         )
         string(
-          name: 'REPO', defaultValue: 'docker.charlyghislain.com',
+          name: 'REPO', defaultValue: 'docker.valuya.com',
           description: 'Repo to push'
         )
         credentials(
@@ -24,11 +24,11 @@ pipeline {
     stages {
         stage ('Build') {
             steps {
-              nodejs(nodeJSInstallationName: 'node 10', configId: 'npm-global-config') {  catchError {
+              nodejs(nodeJSInstallationName: 'node 16', configId: 'npm-global-config') {  catchError {
                 ansiColor('xterm') {
                   sh '''
                    rm -rfv dist*
-                   npm install
+                   npm ci
 
                    export DATE="$(date -Iseconds)"
                    export COMMIT="$(git rev-parse --short HEAD)"
@@ -69,16 +69,14 @@ pipeline {
         stage ('Update cluster') {
           when {
             allOf {
+                expression { return env.BRANCH_NAME == 'master' }
                 expression { return params.SKIP_PUBLISH != true }
                 expression { return params.SKIP_CLUSTER_UPDATE != true }
             }
           }
           steps {
-            build job: 'infra/cluster-conf-update', parameters: [
-              string(name:"STACK", value:"charlyghislaindotcom"),
-              string(name:"VALUES_FILE", value:"values.yaml"),
-              string(name:"VALUES_KEY", value:".deployment.imageTag"),
-              string(name:"VALUES_VALUE", value:"\"${VERSION}\""),
+            build job: 'cghislai-releases/charlyghislaindotcom-release/master', parameters: [
+              string(name:"IMAGE_TAG", value:"\"${VERSION}\""),
             ]
           }
         }

jenkins/dsl/_charlyghislaindotcom.groovy

@@ -1 +0,0 @@
-folder('charlyghislaindotcom')

jenkins/dsl/charlyghislaindotcom.groovy

@@ -1,43 +0,0 @@
-multibranchPipelineJob('charlyghislaindotcom/charlyghislaindotcom') {
-    branchSources {
-        branchSource {
-            source {
-                git {
-                    id('charlyghislaindotcom-front_repo') // IMPORTANT: use a constant and unique identifier
-                    remote('ssh://git@gitea.charlyghislain.com:2022/cghislai/charlyghislaindotcom.git')
-                    credentialsId('jenkins-jenkins-ssh-key')
-                    traits {
-                        gitBranchDiscovery()
-                        wipeWorkspaceTrait()
-                    }
-                }
-            }
-            strategy {
-                namedBranchesDifferent {
-                    namedExceptions {
-                        named {
-                            name('master')
-                            props {
-                                suppressAutomaticTriggering()
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    triggers {
-        periodic(30)
-    }
-    orphanedItemStrategy {
-        discardOldItems {
-            daysToKeep(7)
-        }
-    }
-    factory {
-        workflowBranchProjectFactory {
-            scriptPath('Jenkinsfile')
-        }
-    }
-}
-

package.json

@@ -11,40 +11,41 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^11.2.0",
-    "@angular/common": "^11.2.0",
-    "@angular/compiler": "^11.2.0",
-    "@angular/core": "^11.2.0",
-    "@angular/forms": "^11.2.0",
-    "@angular/localize": "~11.2.0",
-    "@angular/platform-browser": "^11.2.0",
-    "@angular/platform-browser-dynamic": "^11.2.0",
-    "@angular/router": "^11.2.0",
+    "@angular/animations": "^13.3.3",
+    "@angular/common": "^13.3.3",
+    "@angular/compiler": "^13.3.3",
+    "@angular/core": "^13.3.3",
+    "@angular/forms": "^13.3.3",
+    "@angular/localize": "~13.4.0",
+    "@angular/platform-browser": "^13.3.3",
+    "@angular/platform-browser-dynamic": "^13.3.3",
+    "@angular/router": "^13.3.3",
     "core-js": "^2.6.12",
-    "moment-es6": "^1.0.0",
-    "rxjs": "^6.6.3",
+    "luxon": "^3.0.0",
+    "rxjs": "^7.0.0",
     "tslib": "^2.0.0",
-    "zone.js": "~0.11.3"
+    "zone.js": "~0.11.5"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1102.0",
-    "@angular/cli": "~11.2.0",
-    "@angular/compiler-cli": "^11.2.0",
-    "@angular/language-service": "^11.2.0",
-    "@types/jasmine": "~3.6.0",
-    "@types/jasminewd2": "^2.0.8",
-    "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
-    "karma-chrome-launcher": "~3.1.0",
+    "@angular-devkit/build-angular": "~13.3.3",
+    "@angular/cli": "~13.3.3",
+    "@angular/compiler-cli": "^13.3.3",
+    "@angular/language-service": "^13.3.3",
+    "@types/jasmine": "~4.6.0",
+    "@types/jasminewd2": "^2.0.10",
+    "@types/node": "^16.11.27",
+    "@types/luxon": "^3.0.0",
+    "codelyzer": "^6.0.2",
+    "jasmine-core": "~4.6.0",
+    "jasmine-spec-reporter": "~7.0.0",
+    "karma": "~6.4.0",
+    "karma-chrome-launcher": "~3.2.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
+    "karma-jasmine": "~5.1.0",
+    "karma-jasmine-html-reporter": "^2.0.0",
     "protractor": "~7.0.0",
-    "ts-node": "~5.0.1",
+    "ts-node": "~10.9.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.1.5"
+    "typescript": "~4.6.3"
   }
 }

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>valuya.com-infra/renovate-config"
+  ]
+}

src/app/app.component.ts

@@ -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;
   }
 }

src/app/contact-route/contact-route.component.html

@@ -21,9 +21,9 @@
     charlyghislain SRL
   </li>
   <li class="address">
-    Rue Godefroid 50/1
+    Rue Jean Francois, 5
     <br/>
-    5000 Namur (Belgium)
+    4500 Ben-Ahin (Belgium)
   </li>
   <li class="number">
     BE0736581871