Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source 10

fix(deps): update dependency @angular/cdk to v14 · 2bf6b4c1
Renovate Bot authored Sep 14, 2022

2bf6b4c1
US175: remove newsletter from admin panel · 9ba85251
Hugo SUBTIL authored Sep 14, 2022 and Bastien DUMONT committed Sep 14, 2022

9ba85251

Merge branch 'feat/US175-mailchimp' into 'V2.0' · 443d8d88

Bastien DUMONT authored Sep 14, 2022

US175: remove newsletter from admin panel

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!326

443d8d88

fix(form): protection against no formation selection for pricing · da0b9386
Hugo SUBTIL authored Sep 14, 2022

da0b9386

Merge branch '31-creation-de-structure-ces-formations-sont-elles-gratuites' into 'V2.0' · 32553a58

Hugo SUBTIL authored Sep 14, 2022

Resolve "[Création de structure] - Ces formations sont-elles gratuites ?"

Closes #31

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!321

32553a58

feat(hoursForm): can now remove the second hours input · 38c9cf35
Rémi PAILHAREY authored Sep 14, 2022

38c9cf35

Merge branch... · 7978c8e6

Rémi PAILHAREY authored Sep 14, 2022

Merge branch '30-creation-de-structure-les-horaires-d-ouverture-ne-peuvent-pas-etre-supprimes-depuis-le-composant' into 'V2.0'

Resolve "[Création de structure] Les horaires d'ouverture ne peuvent pas être supprimés depuis le composant"

Closes #30

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!325

7978c8e6

feat(carto): revert carto lib components · 8be6a6df
Hugo SUBTIL authored Sep 14, 2022

8be6a6df

Merge branch 'feat/revert-carto' into 'V2.0' · cf82c55b

Hugo SUBTIL authored Sep 14, 2022

Feat/revert carto

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!330

cf82c55b

Merge branch 'renovate/major-angularmaterial-monorepo' into 'V2.0' · 9489eaaa

Hugo SUBTIL authored Sep 14, 2022

fix(deps): update dependency @angular/cdk to v14

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!301

9489eaaa

Some changes are not shown.

For a faster browsing experience, only 85 of 159 files are shown. Download one of the files below to see all changes.

.eslintignore

deleted100644 → 0

+0 −8

Original line number	Original line	Diff line number	Diff line
	.angular/
	.git/
	.idea/
	.vscode/
	build/
	coverage/
	dist/
	node_modules/
	No newline at end of file

.eslintrc.json

deleted100644 → 0

+0 −37

Original line number	Original line	Diff line number	Diff line
	{
	"root": true,
	"ignorePatterns": ["projects/*/"],
	"overrides": [
	{
	"files": ["*.ts"],
	"parserOptions": {
	"project": ["tsconfig.json"],
	"createDefaultProgram": true
	},
	"extends": ["plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates"],
	"rules": {
	"@angular-eslint/directive-selector": [
	"error",
	{
	"type": "attribute",
	"prefix": "app",
	"style": "camelCase"
	}
	],
	"@angular-eslint/component-selector": [
	"error",
	{
	"type": "element",
	"prefix": "app",
	"style": "kebab-case"
	}
	]
	}
	},
	{
	"files": ["*.html"],
	"extends": ["plugin:@angular-eslint/template/recommended"],
	"rules": {}
	}
	]
	}

.gitignore

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,5 +54,9 @@ api/db.json
	# Documentation generated with compodoc		# Documentation generated with compodoc
	documentation		documentation

			CHANGELOG.md

			package-lock.json

	# External libs		# External libs
	/projects		/projects

.prettierrc

+4 −16

Original line number	Original line	Diff line number	Diff line
	{		{
	"printWidth": 128,		"printWidth": 120,
	"tabWidth": 2,		"singleQuote": true,
	"useTabs": false,		"useTabs": false,
			"tabWidth": 2,
	"semi": true,		"semi": true,
	"singleQuote": true,		"bracketSpacing": true
	"quoteProps": "as-needed",
	"jsxSingleQuote": true,
	"trailingComma": "none",
	"bracketSpacing": true,
	"bracketSameLine": true,
	"arrowParens": "always",
	"requirePragma": false,
	"insertPragma": false,
	"proseWrap": "preserve",
	"htmlWhitespaceSensitivity": "ignore",
	"vueIndentScriptAndStyle": false,
	"endOfLine": "lf",
	"embeddedLanguageFormatting": "auto"
	}		}

Dockerfile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,6 @@ RUN npm install --silent
	COPY angular.json .		COPY angular.json .
	COPY tsconfig.json .		COPY tsconfig.json .
	COPY tsconfig.app.json .		COPY tsconfig.app.json .
	COPY tsconfig.base.json .
	COPY ngsw-config.json .		COPY ngsw-config.json .
	COPY /nginx/nginx.conf .		COPY /nginx/nginx.conf .
	COPY /src ./src		COPY /src ./src

angular.json

+5 −18

Original line number	Original line	Diff line number	Diff line
	@@ -35,10 +35,7 @@
	"polyfills": "src/polyfills.ts",		"polyfills": "src/polyfills.ts",
	"tsConfig": "tsconfig.app.json",		"tsConfig": "tsconfig.app.json",
	"localize": true,		"localize": true,
	"allowedCommonJsDependencies": [		"allowedCommonJsDependencies": ["lodash", "leaflet.locatecontrol"],
	"lodash",
	"leaflet.locatecontrol"
	],
	"assets": [		"assets": [
	"src/favicon.ico",		"src/favicon.ico",
	"src/assets",		"src/assets",
	@@ -98,14 +95,10 @@
	"ngswConfigPath": "ngsw-config.json"		"ngswConfigPath": "ngsw-config.json"
	},		},
	"fr": {		"fr": {
	"localize": [		"localize": ["fr"]
	"fr"
	]
	},		},
	"en": {		"en": {
	"localize": [		"localize": ["en"]
	"en"
	]
	}		}
	},		},
	"defaultConfiguration": ""		"defaultConfiguration": ""
	@@ -141,14 +134,8 @@
	"polyfills": "src/polyfills.ts",		"polyfills": "src/polyfills.ts",
	"tsConfig": "tsconfig.spec.json",		"tsConfig": "tsconfig.spec.json",
	"karmaConfig": "karma.conf.js",		"karmaConfig": "karma.conf.js",
	"assets": [		"assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"],
	"src/favicon.ico",		"styles": ["src/styles.scss"],
	"src/assets",
	"src/manifest.webmanifest"
	],
	"styles": [
	"src/styles.scss"
	],
	"scripts": []		"scripts": []
	}		}
	},		},

jest.config.js

deleted100644 → 0

+0 −7

Original line number	Original line	Diff line number	Diff line
	module.exports = {
	preset: 'jest-preset-angular',
	setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
	moduleNameMapper: {
	'@gouvfr-anct/(.*)': '<rootDir>/dist/@gouvfr-anct/$1',
	},
	};

jest.setup.ts

deleted100644 → 0

+0 −1

Original line number	Original line	Diff line number	Diff line
	import 'jest-preset-angular/jest-preset';

package-lock.json

+409 −1006

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@
	"private": true,		"private": true,
	"dependencies": {		"dependencies": {
	"@angular/animations": "^14.2.1",		"@angular/animations": "^14.2.1",
	"@angular/cdk": "^13.1.1",		"@angular/cdk": "^14.0.0",
	"@angular/common": "^14.2.1",		"@angular/common": "^14.2.1",
	"@angular/compiler": "^14.2.1",		"@angular/compiler": "^14.2.1",
	"@angular/core": "^14.2.1",		"@angular/core": "^14.2.1",
	@@ -29,7 +29,6 @@
	"@angular/router": "^14.2.1",		"@angular/router": "^14.2.1",
	"@angular/service-worker": "^14.2.1",		"@angular/service-worker": "^14.2.1",
	"@asymmetrik/ngx-leaflet": "^8.1.0",		"@asymmetrik/ngx-leaflet": "^8.1.0",
	"@gouvfr-anct/mediation-numerique": "^0.0.17",
	"@ngx-translate/core": "^13.0.0",		"@ngx-translate/core": "^13.0.0",
	"ag-grid-angular": "^26.2.0",		"ag-grid-angular": "^26.2.0",
	"ag-grid-community": "^26.2.1",		"ag-grid-community": "^26.2.1",
	@@ -57,7 +56,6 @@
	"@compodoc/compodoc": "^1.1.16",		"@compodoc/compodoc": "^1.1.16",
	"@types/jasmine": "~4.0.0",		"@types/jasmine": "~4.0.0",
	"@types/jasminewd2": "~2.0.3",		"@types/jasminewd2": "~2.0.3",
	"@types/jest": "^27.5.0",
	"@types/leaflet": "^1.5.17",		"@types/leaflet": "^1.5.17",
	"@types/leaflet.locatecontrol": "^0.60.7",		"@types/leaflet.locatecontrol": "^0.60.7",
	"@types/node": "^16.0.0",		"@types/node": "^16.0.0",
	@@ -81,7 +79,6 @@
	"prettier": "^2.1.2",		"prettier": "^2.1.2",
	"protractor": "~7.0.0",		"protractor": "~7.0.0",
	"standard-version": "^9.3.2",		"standard-version": "^9.3.2",
	"ts-jest": "^27.1.4",
	"ts-node": "~8.3.0",		"ts-node": "~8.3.0",
	"tslint": "~6.1.0",		"tslint": "~6.1.0",
	"typescript": "~4.8.3"		"typescript": "~4.8.3"

Source

Target

Files

Some changes are not shown.