Skip to content

Commit 0ca3b4e

Browse files
Johaney-sJohaney-s
committed
Merge branch 'master' into production
2 parents 0b6eb2f + 9a26d36 commit 0ca3b4e

File tree

157 files changed

+6967
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+6967
-232
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,5 @@ apps/user-profile/src/assets/config/instanceFavicon.ico
4949
apps/publications/src/assets/config/instanceConfig.json
5050
apps/password-reset/src/assets/config/instanceConfig.json
5151
apps/password-reset/src/assets/config/instanceFavicon.ico
52+
53+
.angular

‎angular.json

Lines changed: 232 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,122 @@
220220
},
221221
"tags": []
222222
},
223+
"consolidator": {
224+
"projectType": "application",
225+
"root": "apps/consolidator",
226+
"sourceRoot": "apps/consolidator/src",
227+
"prefix": "perun-web-apps",
228+
"architect": {
229+
"build": {
230+
"builder": "@angular-devkit/build-angular:browser",
231+
"outputs": ["{options.outputPath}"],
232+
"options": {
233+
"outputPath": "dist/apps/consolidator",
234+
"index": "apps/consolidator/src/index.html",
235+
"main": "apps/consolidator/src/main.ts",
236+
"polyfills": "apps/consolidator/src/polyfills.ts",
237+
"tsConfig": "apps/consolidator/tsconfig.app.json",
238+
"inlineStyleLanguage": "scss",
239+
"assets": ["apps/consolidator/src/favicon.ico", "apps/consolidator/src/assets"],
240+
"styles": ["apps/consolidator/src/styles.scss"],
241+
"scripts": []
242+
},
243+
"configurations": {
244+
"production": {
245+
"budgets": [
246+
{
247+
"type": "initial",
248+
"maximumWarning": "500kb",
249+
"maximumError": "1mb"
250+
},
251+
{
252+
"type": "anyComponentStyle",
253+
"maximumWarning": "2kb",
254+
"maximumError": "4kb"
255+
}
256+
],
257+
"fileReplacements": [
258+
{
259+
"replace": "apps/consolidator/src/environments/environment.ts",
260+
"with": "apps/consolidator/src/environments/environment.prod.ts"
261+
}
262+
],
263+
"outputHashing": "all"
264+
},
265+
"development": {
266+
"buildOptimizer": false,
267+
"optimization": false,
268+
"vendorChunk": true,
269+
"extractLicenses": false,
270+
"sourceMap": true,
271+
"namedChunks": true
272+
}
273+
},
274+
"defaultConfiguration": "production"
275+
},
276+
"serve": {
277+
"builder": "@angular-devkit/build-angular:dev-server",
278+
"configurations": {
279+
"production": {
280+
"browserTarget": "consolidator:build:production"
281+
},
282+
"development": {
283+
"browserTarget": "consolidator:build:development"
284+
}
285+
},
286+
"defaultConfiguration": "development"
287+
},
288+
"extract-i18n": {
289+
"builder": "@angular-devkit/build-angular:extract-i18n",
290+
"options": {
291+
"browserTarget": "consolidator:build"
292+
}
293+
},
294+
"lint": {
295+
"builder": "@nrwl/linter:eslint",
296+
"options": {
297+
"lintFilePatterns": ["apps/consolidator/src/**/*.ts", "apps/consolidator/src/**/*.html"]
298+
}
299+
},
300+
"test": {
301+
"builder": "@nrwl/jest:jest",
302+
"outputs": ["coverage/apps/consolidator"],
303+
"options": {
304+
"jestConfig": "apps/consolidator/jest.config.js",
305+
"passWithNoTests": true
306+
}
307+
}
308+
},
309+
"tags": []
310+
},
311+
"consolidator-e2e": {
312+
"root": "apps/consolidator-e2e",
313+
"sourceRoot": "apps/consolidator-e2e/src",
314+
"projectType": "application",
315+
"architect": {
316+
"e2e": {
317+
"builder": "@nrwl/cypress:cypress",
318+
"options": {
319+
"cypressConfig": "apps/consolidator-e2e/cypress.json",
320+
"devServerTarget": "consolidator:serve:development"
321+
},
322+
"configurations": {
323+
"production": {
324+
"devServerTarget": "consolidator:serve:production"
325+
}
326+
}
327+
},
328+
"lint": {
329+
"builder": "@nrwl/linter:eslint",
330+
"outputs": ["{options.outputFile}"],
331+
"options": {
332+
"lintFilePatterns": ["apps/consolidator-e2e/**/*.{js,ts}"]
333+
}
334+
}
335+
},
336+
"tags": [],
337+
"implicitDependencies": ["consolidator"]
338+
},
223339
"general": {
224340
"projectType": "library",
225341
"root": "libs/general",
@@ -249,6 +365,122 @@
249365
},
250366
"tags": []
251367
},
368+
"linker": {
369+
"projectType": "application",
370+
"root": "apps/linker",
371+
"sourceRoot": "apps/linker/src",
372+
"prefix": "perun-web-apps",
373+
"architect": {
374+
"build": {
375+
"builder": "@angular-devkit/build-angular:browser",
376+
"outputs": ["{options.outputPath}"],
377+
"options": {
378+
"outputPath": "dist/apps/linker",
379+
"index": "apps/linker/src/index.html",
380+
"main": "apps/linker/src/main.ts",
381+
"polyfills": "apps/linker/src/polyfills.ts",
382+
"tsConfig": "apps/linker/tsconfig.app.json",
383+
"inlineStyleLanguage": "scss",
384+
"assets": ["apps/linker/src/favicon.ico", "apps/linker/src/assets"],
385+
"styles": ["apps/linker/src/styles.scss"],
386+
"scripts": []
387+
},
388+
"configurations": {
389+
"production": {
390+
"budgets": [
391+
{
392+
"type": "initial",
393+
"maximumWarning": "500kb",
394+
"maximumError": "1mb"
395+
},
396+
{
397+
"type": "anyComponentStyle",
398+
"maximumWarning": "2kb",
399+
"maximumError": "4kb"
400+
}
401+
],
402+
"fileReplacements": [
403+
{
404+
"replace": "apps/linker/src/environments/environment.ts",
405+
"with": "apps/linker/src/environments/environment.prod.ts"
406+
}
407+
],
408+
"outputHashing": "all"
409+
},
410+
"development": {
411+
"buildOptimizer": false,
412+
"optimization": false,
413+
"vendorChunk": true,
414+
"extractLicenses": false,
415+
"sourceMap": true,
416+
"namedChunks": true
417+
}
418+
},
419+
"defaultConfiguration": "production"
420+
},
421+
"serve": {
422+
"builder": "@angular-devkit/build-angular:dev-server",
423+
"configurations": {
424+
"production": {
425+
"browserTarget": "linker:build:production"
426+
},
427+
"development": {
428+
"browserTarget": "linker:build:development"
429+
}
430+
},
431+
"defaultConfiguration": "development"
432+
},
433+
"extract-i18n": {
434+
"builder": "@angular-devkit/build-angular:extract-i18n",
435+
"options": {
436+
"browserTarget": "linker:build"
437+
}
438+
},
439+
"lint": {
440+
"builder": "@nrwl/linter:eslint",
441+
"options": {
442+
"lintFilePatterns": ["apps/linker/src/**/*.ts", "apps/linker/src/**/*.html"]
443+
}
444+
},
445+
"test": {
446+
"builder": "@nrwl/jest:jest",
447+
"outputs": ["coverage/apps/linker"],
448+
"options": {
449+
"jestConfig": "apps/linker/jest.config.js",
450+
"passWithNoTests": true
451+
}
452+
}
453+
},
454+
"tags": []
455+
},
456+
"linker-e2e": {
457+
"root": "apps/linker-e2e",
458+
"sourceRoot": "apps/linker-e2e/src",
459+
"projectType": "application",
460+
"architect": {
461+
"e2e": {
462+
"builder": "@nrwl/cypress:cypress",
463+
"options": {
464+
"cypressConfig": "apps/linker-e2e/cypress.json",
465+
"devServerTarget": "linker:serve:development"
466+
},
467+
"configurations": {
468+
"production": {
469+
"devServerTarget": "linker:serve:production"
470+
}
471+
}
472+
},
473+
"lint": {
474+
"builder": "@nrwl/linter:eslint",
475+
"outputs": ["{options.outputFile}"],
476+
"options": {
477+
"lintFilePatterns": ["apps/linker-e2e/**/*.{js,ts}"]
478+
}
479+
}
480+
},
481+
"tags": [],
482+
"implicitDependencies": ["linker"]
483+
},
252484
"password-reset": {
253485
"projectType": "application",
254486
"schematics": {
@@ -464,7 +696,6 @@
464696
},
465697
"schematics": {
466698
"@nrwl/angular:component": {
467-
"styleext": "scss"
468699
}
469700
},
470701
"tags": []

‎apps/admin-gui-e2e/src/integration/facility-management-perun_admin.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ context('Actions', () => {
33
const dbFacilityName2 = 'test-e2e-facility-from-db-2';
44
const dbVoName = 'test-e2e-vo-from-db-for-facility';
55
const dbResourceName = 'test-e2e-resource-from-db';
6+
67
const addedAttribute = 'login-namespace';
78
const deleteAttribute = 'gid-namespace';
89
const addManagerUser = 'facility-manager-2';

0 commit comments

Comments
 (0)