Merge branch 'upgrade-angular' into 'master' (cb0757fe) · Commits · to be continuous... / kicker

.gitlab-ci.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,12 +10,12 @@ include:
		file: '/templates/gitlab-ci-s3.yml'

		variables:
		NG_CLI_IMAGE: "registry.hub.docker.com/trion/ng-cli-karma:14.2.6"
		NG_CLI_IMAGE: "registry.hub.docker.com/trion/ng-cli-karma:16.2.9"
		NG_BUILD_ARGS: "build --configuration production"
		# deploy: landing page (static/), mkdocs build (public/), Angular build (kicker/dist/) and aggregated kicker (kicker-aggregated/)
		S3_DEPLOY_FILES: "dist/kicker/"
		S3_STAGING_DISABLED: "true"
		S3_PROD_DISABLED: "true"
		S3_REVIEW_PREFIX: ${CI_COMMIT_REF_SLUG}

		stages:
		- build

angular.json

+0 −6

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@
		"src/assets"
		],
		"styles": [
		"node_modules/boosted/dist/css/orangeHelvetica.css",
		"node_modules/boosted/dist/css/boosted.min.css",
		"src/styles.css"
		],
		@@ -64,11 +63,6 @@
		"builder": "@angular-devkit/build-angular:dev-server",
		"options": {
		"browserTarget": "kicker:build"
		},
		"configurations": {
		"production": {
		"browserTarget": "kicker:build:production"
		}
		}
		},
		"extract-i18n": {

package-lock.json

+7488 −4719

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+24 −25

Original line number	Diff line number	Diff line
		@@ -11,39 +11,38 @@
		},
		"private": true,
		"dependencies": {
		"@angular/animations": "15.2.9",
		"@angular/common": "15.2.9",
		"@angular/compiler": "15.2.9",
		"@angular/core": "15.2.9",
		"@angular/forms": "15.2.9",
		"@angular/localize": "15.2.9",
		"@angular/platform-browser": "15.2.9",
		"@angular/platform-browser-dynamic": "15.2.9",
		"@angular/router": "15.2.9",
		"@ng-bootstrap/ng-bootstrap": "14.2.0",
		"boosted": "4.3.1",
		"@angular/animations": "16.2.12",
		"@angular/common": "16.2.12",
		"@angular/compiler": "16.2.12",
		"@angular/core": "16.2.12",
		"@angular/forms": "16.2.12",
		"@angular/localize": "16.2.12",
		"@angular/platform-browser": "16.2.12",
		"@angular/platform-browser-dynamic": "16.2.12",
		"@angular/router": "16.2.12",
		"@ng-bootstrap/ng-bootstrap": "15.1.2",
		"boosted": "5.3.3",
		"marked": "^4.3.0",
		"ng-process-env": "^16.0.6",
		"ngx-matomo": "1.1.0",
		"ngx-showdown": "6.0.0",
		"ngx-markdown": "^16.0.0",
		"ngx-matomo": "2.0.0",
		"rxjs": "7.8.1",
		"showdown": "1.9.1",
		"tslib": "^2.0.0",
		"zone.js": "0.13.3"
		},
		"devDependencies": {
		"@angular-devkit/build-angular": "15.2.10",
		"@angular-eslint/builder": "15.2.1",
		"@angular-eslint/eslint-plugin": "15.2.1",
		"@angular-eslint/eslint-plugin-template": "15.2.1",
		"@angular-eslint/schematics": "15.2.1",
		"@angular-eslint/template-parser": "15.2.1",
		"@angular/cli": "15.2.10",
		"@angular/compiler-cli": "15.2.9",
		"@angular/language-service": "15.2.9",
		"@angular-devkit/build-angular": "16.2.14",
		"@angular-eslint/builder": "16.2.0",
		"@angular-eslint/eslint-plugin": "16.2.0",
		"@angular-eslint/eslint-plugin-template": "16.2.0",
		"@angular-eslint/schematics": "16.2.0",
		"@angular-eslint/template-parser": "16.2.0",
		"@angular/cli": "16.2.14",
		"@angular/compiler-cli": "16.2.12",
		"@angular/language-service": "16.2.12",
		"@types/jasmine": "~5.1.0",
		"@types/jasminewd2": "2.0.13",
		"@types/node": "20.12.11",
		"@types/showdown": "1.9.4",
		"@typescript-eslint/eslint-plugin": "^7.0.0",
		"@typescript-eslint/eslint-plugin-tslint": "^7.0.0",
		"@typescript-eslint/parser": "^7.0.0",
		@@ -62,6 +61,6 @@
		"karma-junit-reporter": "2.0.1",
		"protractor": "~7.0.0",
		"ts-node": "10.9.2",
		"typescript": "^4.8.4"
		"typescript": "^5.1.3"
		}
		}

src/app/app.component.html

+17 −14

Original line number	Diff line number	Diff line
		<!--HEADER START-->
		<header role="banner">
		<nav class="navbar navbar-expand-lg navbar-dark bg-dark" aria-label="Main navigation">
		<header data-bs-theme="dark">
		<nav class="navbar navbar-expand-lg" aria-label="Main navigation">
		<div class="container">
		<a class="navbar-brand my-2 py-1 my-md-0 py-sm-0" title="Home" href="/doc">
		<img src="./assets/img/tbc-orange-50.png" alt="Orange Logo">
		<!-- tbc logo -->
		<div class="navbar-brand me-auto me-lg-4">
		<a class="stretched-link" title="Home" href="/doc">
		<img src="./assets/img/tbc-50.png" alt="TBC Logo">
		</a>
		<span class="navbar-title h1 text-white mt-2 mt-md-auto ml-2 mr-auto mb-0">to be continuous</span>
		<h1 class="title">to be continuous</h1>
		</div>
		<button type="button" class="navbar-toggler" [attr.aria-expanded]="!isMenuCollapsed" (click)="isMenuCollapsed = !isMenuCollapsed">
		<span class="navbar-toggler-icon"></span>
		</button>
		<div class="collapse navbar-collapse" [ngbCollapse]="isMenuCollapsed" >
		<ul class="nav navbar-nav ml-auto">
		<li class="nav-item ml-0">
		<div class="collapse navbar-collapse ms-auto" [ngbCollapse]="isMenuCollapsed" >
		<ul class="navbar-nav">
		<li class="nav-item ms-0">
		<a class="nav-link" href="/doc/intro" title="Documentation portal">Docs</a>
		</li>
		<li class="nav-item active">
		<span class="nav-link" title="Template initializer tool"><span
		class="fa fa-wrench"></span> Kicker</span></li>
		<li class="nav-item">
		<span class="nav-link active" title="Template initializer tool"><span
		class="fa fa-wrench pe-1"></span> Kicker</span></li>
		<li class="nav-item">
		<a class="nav-link"
		href="https://gitlab.com/to-be-continuous/samples"
		title="Project samples using templates"><span class="fab fa-gitlab"></span> Examples</a></li>
		title="Project samples using templates"><span class="fab fa-gitlab pe-1"></span> Examples</a></li>
		<li class="nav-item">
		<a class="nav-link"
		[href]="tbcUrl"
		title="Templates code and documentation"><span class="fab fa-gitlab"></span> GitLab</a></li>
		title="Templates code and documentation"><span class="fab fa-gitlab pe-1"></span> GitLab</a></li>
		</ul>
		</div>
		</div>