diff --git a/frontend/app/.eslintignore b/frontend/app/.eslintignore index 15298306..0b48282a 100644 --- a/frontend/app/.eslintignore +++ b/frontend/app/.eslintignore @@ -1 +1,2 @@ src/app/_helpers/data +node_modules diff --git a/frontend/app/.eslintrc.json b/frontend/app/.eslintrc.json index e99efd23..828ef112 100644 --- a/frontend/app/.eslintrc.json +++ b/frontend/app/.eslintrc.json @@ -8,7 +8,7 @@ "parserOptions": { "ecmaVersion": 2020, "sourceType": "module", - "project": ["tsconfig.json", "e2e/tsconfig.e2e.json"], + "project": ["tsconfig.json", "tsconfig.spec.json", "e2e/tsconfig.e2e.json"], "createDefaultProgram": true }, "extends": [ @@ -44,7 +44,6 @@ ], "unicorn/no-nested-ternary": "off", "unicorn/better-regex": "off", - "jsdoc/no-types": "error", "jsdoc/require-param": "off", "jsdoc/require-param-description": "error", @@ -52,7 +51,6 @@ "jsdoc/require-returns": "off", "jsdoc/require-param-type": "off", "jsdoc/require-returns-type": "off", - "@typescript-eslint/explicit-module-boundary-types": "off", "@typescript-eslint/no-unused-vars": [ "error", diff --git a/frontend/app/.gitlab-ci.yml b/frontend/app/.gitlab-ci.yml index 6898d8a3..a6a07d75 100644 --- a/frontend/app/.gitlab-ci.yml +++ b/frontend/app/.gitlab-ci.yml @@ -26,7 +26,7 @@ setup: services: - docker:dind script: - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com - docker build -t registry.gitlab.com/openstapps/app . - docker push registry.gitlab.com/openstapps/app cache: {} # disable irrelevant cache for this job diff --git a/frontend/app/cypress/integration/app.spec.ts b/frontend/app/cypress/integration/app.spec.ts index cb92312c..fce4eaf2 100644 --- a/frontend/app/cypress/integration/app.spec.ts +++ b/frontend/app/cypress/integration/app.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -22,7 +22,7 @@ describe('App', () => { it('should have a proper working navigation', () => { cy.visit('/'); - cy.contains('Einstellungen').click(); - cy.get('ion-title').contains('Einstellungen'); + cy.contains('ion-tab-button', 'Mensa').click(); + cy.get('ion-title').contains('Mensa'); }); }); diff --git a/frontend/app/cypress/integration/context-menu.spec.ts b/frontend/app/cypress/integration/context-menu.spec.ts index af21800c..26e587cf 100644 --- a/frontend/app/cypress/integration/context-menu.spec.ts +++ b/frontend/app/cypress/integration/context-menu.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -54,14 +54,14 @@ describe('context menu', function () { it('should truncate categories', function () { cy.get('stapps-context').within(() => { - cy.contains('ion-item', '(4) Universitätsveranstaltung').should('not.exist'); + cy.contains('ion-item', '(1) Universitätsveranstaltung').should('not.exist'); cy.get('.context-filter > ion-button').click(); cy.contains('ion-item', '(4) Universitätsveranstaltung').should('exist'); }); }); it('should truncate long category items', function () { - cy.contains('ion-list', 'Kategorien | Akademische Veranstaltung').within(() => { + cy.contains('ion-list', 'Akademische Veranstaltung / Kategorien').within(() => { cy.contains('ion-item', '(1) Tutorium').should('not.exist'); cy.get('div > ion-button').click(); cy.contains('ion-item', '(1) Tutorium').should('exist'); diff --git a/frontend/app/cypress/integration/favorites.spec.ts b/frontend/app/cypress/integration/favorites.spec.ts index 1bad5a20..0829c951 100644 --- a/frontend/app/cypress/integration/favorites.spec.ts +++ b/frontend/app/cypress/integration/favorites.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -40,7 +40,6 @@ describe('favorites', function () { cy.get('.title').should('contain', text); cy.get('stapps-favorite-button').click(); }); - cy.get('cdk-virtual-scroll-viewport').should('be.not.visible'); cy.get('stapps-data-list').contains('Keine Ergebnisse').should('be.visible'); }); }); diff --git a/frontend/app/cypress/integration/ical.spec.ts b/frontend/app/cypress/integration/ical.spec.ts index 1a0f5c7a..fd0f62f6 100644 --- a/frontend/app/cypress/integration/ical.spec.ts +++ b/frontend/app/cypress/integration/ical.spec.ts @@ -30,14 +30,14 @@ describe('ical', function () { cy.get('ion-app > ion-modal').within(() => { cy.get('ion-footer > ion-toolbar > ion-button').should('have.attr', 'disabled'); - cy.contains('ion-item', /eine Stunde um 19. Jan. 2059, \d+:00/).click(); + cy.contains('ion-item', /19\.\s+Januar\s+2059,\s+\d{2}:00\s+-\s+\d{2}:00/).click(); cy.get('ion-footer > ion-toolbar > ion-button').should('not.have.attr', 'disabled'); cy.get('ion-footer > ion-toolbar > ion-button').click(); }); cy.get('add-event-review-modal').within(() => { cy.get('ion-item-group').should('contain', 'UNIcert (Test)'); - cy.contains('ion-item-group', /19. Jan. 2059, \d+:00/); + cy.contains('ion-item-group', /19\.\s+Jan\.\s+2059,\s+\d{2}:00/); }); }); }); diff --git a/frontend/app/cypress/tsconfig.json b/frontend/app/cypress/tsconfig.json index 79d78d7e..e7094d5c 100644 --- a/frontend/app/cypress/tsconfig.json +++ b/frontend/app/cypress/tsconfig.json @@ -4,5 +4,6 @@ "compilerOptions": { "sourceMap": false, "types": ["cypress"] - } + }, + "exclude": [] } diff --git a/frontend/app/package-lock.json b/frontend/app/package-lock.json index 56803a9a..9d80dbe6 100644 --- a/frontend/app/package-lock.json +++ b/frontend/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openstapps/app", - "version": "2.0.0", + "version": "2.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2735,6 +2735,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", + "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -2751,6 +2752,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -2761,7 +2763,8 @@ "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true } } }, @@ -2844,25 +2847,19 @@ "integrity": "sha512-hebf0ixGPugiZfH6g7HS/hrDzkKmNdJV/pV2jUz5lfoZXFMjE+7aeAr1AqwW6EGNej65WcEP8VUL5YUc3wSCjw==" }, "@humanwhocodes/config-array": { - "version": "0.10.7", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", - "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", + "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", "requires": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", - "minimatch": "^3.0.4" + "minimatch": "^3.0.5" } }, - "@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==" - }, "@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" }, "@humanwhocodes/momoa": { "version": "2.0.4", @@ -4022,26 +4019,26 @@ } }, "@openstapps/api": { - "version": "0.45.0", - "resolved": "https://registry.npmjs.org/@openstapps/api/-/api-0.45.0.tgz", - "integrity": "sha512-lF1TIxbtqQlRYCvSyS3EDjQiwVK7BmZ3/HQ01MhlUR1ucfvMTk1GyIPx5E8HmrKSi3Pv8shurCObSwStQJjK+Q==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@openstapps/api/-/api-1.0.1.tgz", + "integrity": "sha512-M7aBEikw730t+jYIDYrJrdNhNvA0N1y9j6qGz2XAKwXbZN7NwDgs/41BCsPLPJgPPRGDL1bH/PbcbkKCn/vTTg==", "requires": { "@krlwlfrt/async-pool": "0.7.0", - "@openstapps/core": "0.72.0", - "@openstapps/core-tools": "0.32.0", + "@openstapps/core": "1.0.1", + "@openstapps/core-tools": "0.34.0", "@openstapps/logger": "1.1.1", "@types/cli-progress": "3.11.0", - "@types/express": "4.17.14", - "@types/morgan": "1.9.3", - "@types/node": "14.18.34", + "@types/express": "4.17.17", + "@types/morgan": "1.9.4", + "@types/node": "14.18.43", "@types/traverse": "0.6.32", "@types/uuid": "8.3.4", "@types/wait-on": "5.3.1", - "body-parser": "1.20.1", - "cli-progress": "3.11.2", - "commander": "9.4.1", + "body-parser": "1.20.2", + "cli-progress": "3.12.0", + "commander": "9.5.0", "express": "4.18.2", - "got": "11.8.5", + "got": "11.8.6", "json-schema": "0.4.0", "moment": "2.29.4", "morgan": "1.10.0", @@ -4051,164 +4048,200 @@ "wait-on": "6.0.1" }, "dependencies": { + "@types/express": { + "version": "4.17.17", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz", + "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==", + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "@types/express-serve-static-core": { + "version": "4.17.34", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.34.tgz", + "integrity": "sha512-fvr49XlCGoUj2Pp730AItckfjat4WNb0lb3kfrLWffd+RLeoGAMsq7UOy04PAPtoL01uKwcp6u8nhzpgpDYr3w==", + "requires": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, "@types/node": { - "version": "14.18.34", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.34.tgz", - "integrity": "sha512-hcU9AIQVHmPnmjRK+XUUYlILlr9pQrsqSrwov/JK1pnf3GTQowVBhx54FbvM0AU/VXGH4i3+vgXS5EguR7fysA==" + "version": "14.18.43", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.43.tgz", + "integrity": "sha512-n3eFEaoem0WNwLux+k272P0+aq++5o05bA9CfiwKPdYPB5ZambWKdWoeHy7/OJiizMhzg27NLaZ6uzjLTzXceQ==" + }, + "body-parser": { + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.5", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.2", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + } + }, + "commander": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", + "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==" + }, + "content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } } } }, "@openstapps/configuration": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@openstapps/configuration/-/configuration-0.33.0.tgz", - "integrity": "sha512-sum9DB8+2r5eXnJhie1UPcQQTPupd0m3Xgsft+D6LVvbjbmt/XCpCMvlZSoM+LE1ZkUdgUmbFJ81mqjWKgCsJA==", + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/@openstapps/configuration/-/configuration-0.34.0.tgz", + "integrity": "sha512-woPn4v3mQMUibtRs84VDpiC0EarowA4HvtpXbzc6ddWcYs8jtPLwA+mSbWSiROhJ2CeRQTJtMK+bJ4yhIRfdKw==", "requires": { - "@types/node": "14.18.24", - "@types/semver": "7.3.12", + "@types/node": "14.18.36", + "@types/semver": "7.3.13", "@types/yaml": "1.9.7", "chalk": "4.1.2", - "commander": "9.4.0", - "semver": "7.3.7", + "commander": "9.5.0", + "semver": "7.3.8", "yaml": "1.10.2" }, "dependencies": { + "@types/node": { + "version": "14.18.36", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz", + "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==" + }, + "@types/semver": { + "version": "7.3.13", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz", + "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==" + }, "commander": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", - "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==" - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", - "requires": { - "lru-cache": "^6.0.0" - } + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", + "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==" } } }, "@openstapps/core": { - "version": "0.72.0", - "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.72.0.tgz", - "integrity": "sha512-bT22CWKf0Do32FwJLf+rWxbQTHTiPbJEzm3dd3Sk5utGgNTAeFequaNea2csvCOA1dRaVrRVQ7Ed9prVdep9ow==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-1.0.1.tgz", + "integrity": "sha512-+JlycoMcj+QIaXicOZYlNU07XlDc3zRIydYEoLGueAfkTbKt0ap5FWbNL+Hz8ve3ApQP2Hj+4FuU8H6QyLA0vQ==", "requires": { - "@openstapps/core-tools": "0.32.0", + "@openstapps/core-tools": "0.34.0", "@types/geojson": "1.0.6", "@types/json-patch": "0.0.30", "@types/json-schema": "7.0.11", - "@types/node": "14.18.24", + "@types/node": "14.18.36", "fast-deep-equal": "3.1.3", "http-status-codes": "2.2.0", "json-patch": "0.7.0", "json-schema": "0.4.0", "rfdc": "1.3.0", "ts-optchain": "0.1.8" + }, + "dependencies": { + "@types/node": { + "version": "14.18.36", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz", + "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==" + } } }, "@openstapps/core-tools": { - "version": "0.32.0", - "resolved": "https://registry.npmjs.org/@openstapps/core-tools/-/core-tools-0.32.0.tgz", - "integrity": "sha512-PXfb9b3B2uVQUhu+QBi3tlz7I2nHz4hlyTNvfHIxuO8pC0ONaZWY56tjBgqg1Af9BP1ZGq3J3Zg2sWWsYlGFEw==", + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/@openstapps/core-tools/-/core-tools-0.34.0.tgz", + "integrity": "sha512-gCnmBX0Mp1vf9p66i64u2lQAXBTKxI6Lt92ZUxkrMcIv0CmGAEw1mEEgg4hf4nRDm0umBSu0tRfh7DFnuQyOEA==", "requires": { - "@openstapps/logger": "1.0.0", - "ajv": "8.11.0", + "@openstapps/logger": "1.1.1", + "ajv": "8.12.0", "better-ajv-errors": "1.2.0", - "chai": "4.3.6", - "commander": "9.4.0", - "deepmerge": "4.2.2", + "chai": "4.3.7", + "commander": "10.0.0", + "deepmerge": "4.3.0", "del": "6.1.1", - "eslint": "8.22.0", - "flatted": "3.2.6", + "eslint": "8.33.0", + "flatted": "3.2.7", "fs-extra": "10.1.0", - "glob": "8.0.3", - "got": "11.8.5", + "glob": "8.1.0", + "got": "11.8.6", "humanize-string": "3.0.0", "json-schema": "0.4.0", "lodash": "4.17.21", "mustache": "4.2.0", - "openapi-types": "12.0.0", + "openapi-types": "12.1.0", "plantuml-encoder": "1.4.0", - "re2": "1.17.7", + "re2": "1.18.0", "toposort": "2.0.2", - "ts-json-schema-generator": "1.0.0", + "ts-json-schema-generator": "1.2.0", "ts-node": "10.9.1" }, "dependencies": { - "@openstapps/logger": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@openstapps/logger/-/logger-1.0.0.tgz", - "integrity": "sha512-ImCfnLJWHWwFJ1W7KCIWgFe7EXI0cAtap0Dznz+758BPAlLZ+hJHSbIbGHWwEAfRNAB53TIABF5npSsKSDq4Sw==", + "@eslint/eslintrc": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "requires": { - "@types/node": "14.18.24", - "@types/nodemailer": "6.4.5", - "chalk": "4.1.2", - "flatted": "3.2.6", - "moment": "2.29.4", - "nodemailer": "6.7.8" - } - }, - "commander": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", - "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==" - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" - }, - "eslint": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", - "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", - "requires": { - "@eslint/eslintrc": "^1.3.0", - "@humanwhocodes/config-array": "^0.10.4", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "ajv": "^6.12.4", "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", - "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.3", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^6.0.1", - "globals": "^13.15.0", - "globby": "^11.1.0", - "grapheme-splitter": "^1.0.4", + "espree": "^9.4.0", + "globals": "^13.19.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", + "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "regexpp": "^3.2.0", - "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "strip-json-comments": "^3.1.1" }, "dependencies": { "ajv": { @@ -4221,6 +4254,136 @@ "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + } + } + }, + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "commander": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.0.tgz", + "integrity": "sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==" + }, + "deepmerge": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz", + "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==" + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + }, + "eslint": { + "version": "8.33.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz", + "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==", + "requires": { + "@eslint/eslintrc": "^1.4.1", + "@humanwhocodes/config-array": "^0.11.8", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.4.0", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "grapheme-splitter": "^1.0.4", + "ignore": "^5.2.0", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-sdsl": "^4.1.4", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", + "strip-json-comments": "^3.1.0", + "text-table": "^0.2.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + } + } + }, + "flatted": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" + }, + "glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "dependencies": { + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } } } }, @@ -4232,10 +4395,13 @@ "is-glob": "^4.0.3" } }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "globals": { + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "requires": { + "type-fest": "^0.20.2" + } } } }, @@ -4257,23 +4423,10 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.32.tgz", "integrity": "sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==" }, - "@types/nodemailer": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.6.tgz", - "integrity": "sha512-pD6fL5GQtUKvD2WnPmg5bC2e8kWCAPDwMPmHe/ohQbW+Dy0EcHgZ2oCSuPlWNqk74LS5BVMig1SymQbFMPPK3w==", - "requires": { - "@types/node": "*" - } - }, "flatted": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" - }, - "nodemailer": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz", - "integrity": "sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==" } } }, @@ -4327,9 +4480,9 @@ } }, "@sideway/formula": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz", - "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" }, "@sideway/pinpoint": { "version": "2.0.0", @@ -4521,6 +4674,7 @@ "version": "4.17.14", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz", "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==", + "dev": true, "requires": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.18", @@ -4532,6 +4686,7 @@ "version": "4.17.31", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz", "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==", + "dev": true, "requires": { "@types/node": "*", "@types/qs": "*", @@ -4679,9 +4834,9 @@ "dev": true }, "@types/morgan": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.9.3.tgz", - "integrity": "sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.9.4.tgz", + "integrity": "sha512-cXoc4k+6+YAllH3ZHmx4hf7La1dzUk6keTR4bF4b4Sc0mZxU/zK4wO7l+ZzezXm/jkYj/qC+uYGZrarZdIVvyQ==", "requires": { "@types/node": "*" } @@ -4692,9 +4847,9 @@ "integrity": "sha512-aJdn8XErcSrfr7k8ZDDfU6/2OgjZcB2Fu9d+ESK8D7Oa5mtsv8Fa8GpcwTA0v60kuZBaalKPzuzun4Ov1YWO/w==" }, "@types/nodemailer": { - "version": "6.4.5", - "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.5.tgz", - "integrity": "sha512-zuP3nBRQHI6M2PkXnGGy1Ww4VB+MyYHGgnfV2T+JR9KLkeWqPJuyVUgLpKXuFnA/b7pZaIDFh2sV4759B7jK1g==", + "version": "6.4.6", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.6.tgz", + "integrity": "sha512-pD6fL5GQtUKvD2WnPmg5bC2e8kWCAPDwMPmHe/ohQbW+Dy0EcHgZ2oCSuPlWNqk74LS5BVMig1SymQbFMPPK3w==", "requires": { "@types/node": "*" } @@ -4750,7 +4905,24 @@ "@types/semver": { "version": "7.3.12", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz", - "integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==" + "integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==", + "dev": true + }, + "@types/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz", + "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==", + "requires": { + "@types/mime": "^1", + "@types/node": "*" + }, + "dependencies": { + "@types/mime": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", + "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" + } + } }, "@types/serve-index": { "version": "1.9.1", @@ -5494,6 +5666,7 @@ "version": "8.11.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -6448,13 +6621,13 @@ "dev": true }, "chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", + "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", "requires": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", - "deep-eql": "^3.0.1", + "deep-eql": "^4.1.2", "get-func-name": "^2.0.0", "loupe": "^2.3.1", "pathval": "^1.1.1", @@ -6689,9 +6862,9 @@ } }, "cli-progress": { - "version": "3.11.2", - "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.2.tgz", - "integrity": "sha512-lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA==", + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz", + "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==", "requires": { "string-width": "^4.2.3" } @@ -7827,9 +8000,9 @@ } }, "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", "requires": { "type-detect": "^4.0.0" } @@ -9653,11 +9826,6 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==" - }, "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -10020,6 +10188,7 @@ "version": "13.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", + "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -10038,9 +10207,9 @@ } }, "got": { - "version": "11.8.5", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz", - "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==", + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "requires": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -10646,9 +10815,9 @@ "dev": true }, "install-artifact-from-github": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.3.1.tgz", - "integrity": "sha512-3l3Bymg2eKDsN5wQuMfgGEj2x6l5MCAv0zPL6rxHESufFVlEAKW/6oY9F1aGgvY/EgWm5+eWGRjINveL4X7Hgg==" + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.3.2.tgz", + "integrity": "sha512-yCFcLvqk0yQdxx0uJz4t9Z3adDMLAYrcGYv546uRXCSvxE+GqNYhhz/KmrGcUKGI/gVLR9n/e/zM9jX/+ASMJQ==" }, "ionic-appauth": { "version": "0.9.0", @@ -11154,22 +11323,21 @@ "dev": true }, "joi": { - "version": "17.7.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.7.0.tgz", - "integrity": "sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==", + "version": "17.9.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz", + "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==", "requires": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", "@sideway/address": "^4.1.3", - "@sideway/formula": "^3.0.0", + "@sideway/formula": "^3.0.1", "@sideway/pinpoint": "^2.0.0" } }, "js-sdsl": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", - "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", - "dev": true + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==" }, "js-tokens": { "version": "4.0.0", @@ -12896,9 +13064,9 @@ "dev": true }, "node-gyp": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.0.tgz", - "integrity": "sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz", + "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==", "requires": { "env-paths": "^2.2.0", "glob": "^7.1.4", @@ -12940,9 +13108,9 @@ "dev": true }, "nodemailer": { - "version": "6.7.8", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.8.tgz", - "integrity": "sha512-2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g==" + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz", + "integrity": "sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==" }, "nopt": { "version": "6.0.0", @@ -12967,8 +13135,7 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, "normalize-range": { "version": "0.1.2", @@ -13203,9 +13370,9 @@ } }, "openapi-types": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.0.0.tgz", - "integrity": "sha512-6Wd9k8nmGQHgCbehZCP6wwWcfXcvinhybUTBatuhjRsCxUIujuYFZc9QnGeae75CyHASewBtxs0HX/qwREReUw==" + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.0.tgz", + "integrity": "sha512-XpeCy01X6L5EpP+6Hc3jWN7rMZJ+/k1lwki/kTmWzbVhdPie3jd5O2ZtedEx8Yp58icJ0osVldLMrTB/zslQXA==" }, "opencollective-postinstall": { "version": "2.0.3", @@ -14907,13 +15074,13 @@ } }, "re2": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/re2/-/re2-1.17.7.tgz", - "integrity": "sha512-X8GSuiBoVWwcjuppqSjsIkRxNUKDdjhkO9SBekQbZ2ksqWUReCy7DQPWOVpoTnpdtdz5PIpTTxTFzvJv5UMfjA==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/re2/-/re2-1.18.0.tgz", + "integrity": "sha512-MoCYZlJ9YUgksND9asyNF2/x532daXU/ARp1UeJbQ5flMY6ryKNEhrWt85aw3YluzOJlC3vXpGgK2a1jb0b4GA==", "requires": { "install-artifact-from-github": "^1.3.1", - "nan": "^2.16.0", - "node-gyp": "^9.0.0" + "nan": "^2.17.0", + "node-gyp": "^9.3.0" } }, "read": { @@ -15553,9 +15720,9 @@ } }, "safe-stable-stringify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz", - "integrity": "sha512-dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA==" + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", + "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==" }, "safer-buffer": { "version": "2.1.2", @@ -17242,35 +17409,23 @@ "dev": true }, "ts-json-schema-generator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-1.0.0.tgz", - "integrity": "sha512-F5VofsyMhNSXKII32NDS8/Ur8o2K3Sh5i/U2ke3UgCKf26ybgm2cZeT2x7VJPl1trML/9QLzz/82l0mvzmb3Vw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-1.2.0.tgz", + "integrity": "sha512-tUMeO3ZvA12d3HHh7T/AK8W5hmUhDRNtqWRHSMN3ZRbUFt+UmV0oX8k1RK4SA+a+BKNHpmW2v06MS49e8Fi3Yg==", "requires": { - "@types/json-schema": "^7.0.9", - "commander": "^9.0.0", - "glob": "^7.2.0", - "json5": "^2.2.0", - "safe-stable-stringify": "^2.3.1", - "typescript": "~4.6.2" + "@types/json-schema": "^7.0.11", + "commander": "^9.4.1", + "glob": "^8.0.3", + "json5": "^2.2.1", + "normalize-path": "^3.0.0", + "safe-stable-stringify": "^2.4.1", + "typescript": "~4.9.3" }, "dependencies": { - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, "typescript": { - "version": "4.6.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz", - "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==" + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" } } }, @@ -17584,7 +17739,8 @@ "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true }, "v8-compile-cache-lib": { "version": "3.0.1", @@ -17665,16 +17821,6 @@ "lodash": "^4.17.21", "minimist": "^1.2.5", "rxjs": "^7.5.4" - }, - "dependencies": { - "rxjs": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz", - "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==", - "requires": { - "tslib": "^2.1.0" - } - } } }, "watchpack": { diff --git a/frontend/app/package.json b/frontend/app/package.json index a0b67831..e04a6d07 100644 --- a/frontend/app/package.json +++ b/frontend/app/package.json @@ -1,6 +1,6 @@ { "name": "@openstapps/app", - "version": "2.0.0", + "version": "2.1.1", "description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.", "license": "GPL-3.0-only", "author": "Karl-Philipp Wulfert ", @@ -19,7 +19,7 @@ "build:android": "ionic capacitor build android --no-open && cd android && ./gradlew clean assembleDebug && cd ..", "build:prod": "ng build --configuration=production", "build:stats": "ng build --configuration=production --stats-json", - "changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0 && git add src/assets/about/CHANGELOG.md", + "changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0", "check-configuration": "openstapps-configuration", "cypress:open": "cypress open", "cypress:run": "cypress run", @@ -31,7 +31,7 @@ "docker:serve": "sudo docker run -p 8100:8100 -p 35729:35729 -p 53703:53703 -v $PWD:/app -it registry.gitlab.com/openstapps/app bash -c \"npm run start:external\"", "documentation": "compodoc -p tsconfig.json -d docs", "e2e": "ng e2e", - "licenses": "license-checker --json > src/assets/about/licenses.json && ts-node ./scripts/accumulate-licenses.ts && git add src/assets/about/licenses.json", + "licenses": "license-checker --json > src/assets/about/licenses.json && ts-node ./scripts/accumulate-licenses.ts", "minify-icons": "ts-node scripts/minify-icon-font.ts", "check-icons": "ts-node scripts/check-icon-correctness.ts", "format:check": "prettier --check .", @@ -40,7 +40,7 @@ "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts,.html src/", "ng": "ng", "postinstall": "npx jetify", - "version": "npm run changelog && npm run licenses && npm run format:fix", + "version": "npm run changelog && npm run licenses && npm run format:fix && git add src/assets/about/CHANGELOG.md && git add src/assets/about/licenses.json", "prepublishOnly": "npm ci && npm run build && npm run lint && npm run format:check", "preversion": "npm run prepublishOnly", "push": "git push && git push origin \"v$npm_package_version\"", @@ -86,9 +86,9 @@ "@ionic/storage-angular": "3.0.6", "@ngx-translate/core": "14.0.0", "@ngx-translate/http-loader": "7.0.0", - "@openstapps/api": "0.45.0", - "@openstapps/configuration": "0.33.0", - "@openstapps/core": "0.72.0", + "@openstapps/api": "1.0.1", + "@openstapps/configuration": "0.34.0", + "@openstapps/core": "1.0.1", "@transistorsoft/capacitor-background-fetch": "1.0.2", "capacitor-secure-storage-plugin": "0.8.1", "cordova-plugin-calendar": "5.1.6", diff --git a/frontend/app/src/app/_helpers/rxjs/mutation-observer.ts b/frontend/app/src/app/_helpers/rxjs/mutation-observer.ts new file mode 100644 index 00000000..590081f1 --- /dev/null +++ b/frontend/app/src/app/_helpers/rxjs/mutation-observer.ts @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +import {Observable} from 'rxjs'; + +/** + * + */ +export function fromMutationObserver( + target: Node, + options?: MutationObserverInit, +): Observable { + return new Observable(subscriber => { + const observer = new MutationObserver(mutations => { + subscriber.next(mutations); + }); + observer.observe(target, options); + return () => { + observer.disconnect(); + }; + }); +} diff --git a/packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts b/frontend/app/src/app/animation/easings.ts similarity index 65% rename from packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts rename to frontend/app/src/app/animation/easings.ts index 1582345e..4c84acee 100644 --- a/packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts +++ b/frontend/app/src/app/animation/easings.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -13,12 +13,8 @@ * this program. If not, see . */ -export enum ThingType { - AggArray = 'agg array', - AggGlobal = 'agg global', - AggGlobalNested = 'agg global nested', - AggNested = 'agg nested', - AggInherited = 'agg inherited', - AggInheritedGlobal = 'agg inherited global', - AggInheritedOverwritten = 'agg inherited overwritten', -} +// these are the ionic values +export const iosEasing = 'cubic-bezier(0.32,0.72,0,1)'; +export const iosDuration = 540; +export const mdEasing = 'cubic-bezier(0.36,0.66,0.04,1)'; +export const mdDuration = 280; diff --git a/frontend/app/src/app/animation/fab-expand.ts b/frontend/app/src/app/animation/fab-expand.ts new file mode 100644 index 00000000..92823fb5 --- /dev/null +++ b/frontend/app/src/app/animation/fab-expand.ts @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +import {AnimationBuilder, AnimationController} from '@ionic/angular'; +import {AnimationOptions} from '@ionic/angular/providers/nav-controller'; +import {iosDuration, iosEasing, mdDuration, mdEasing} from './easings'; + +/** + * + */ +export function fabExpand(animationController: AnimationController): AnimationBuilder { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return (_baseElement: HTMLElement, options: AnimationOptions | any) => { + const rootTransition = animationController + .create() + .duration(options.duration ?? (options.mode === 'ios' ? iosDuration : mdDuration * 1.4)) + .easing(options.mode === 'ios' ? iosEasing : mdEasing); + const back = options.direction === 'back'; + const fabView = back ? options.enteringEl! : options.leavingEl!; + const otherView = back ? options.leavingEl! : options.enteringEl!; + + const fab = fabView.querySelector('ion-fab-button').shadowRoot.querySelector('.button-native'); + const fabBounds = fab.getBoundingClientRect(); + const viewBounds = otherView.getBoundingClientRect(); + + const useReducedMotion = viewBounds.width > 500; + const reducedMotionTransform = `${Math.min(viewBounds.width * 0.3, 200)}px`; + const reducedMotionViewBorderRadius = '128px'; + const reducedMotionFabGrow = '2'; + const reducedMotionViewShrink = '0.9'; + + const viewCenterX = (viewBounds.width - viewBounds.x) / 2; + const viewCenterY = (viewBounds.height - viewBounds.y) / 2; + + const viewOnFab = useReducedMotion + ? `translate(${reducedMotionTransform}, ${reducedMotionTransform}) scale(${reducedMotionViewShrink})` + : `translate(${(fabBounds.x - viewBounds.x) / 2}px, ${(fabBounds.y - viewBounds.y) / 2}px) scale(${ + fabBounds.width / viewBounds.width + }, ${fabBounds.height / viewBounds.height})`; + const fabOnView = useReducedMotion + ? `translate(-${reducedMotionTransform}, -${reducedMotionTransform}) scale(${reducedMotionFabGrow})` + : `translate(${viewCenterX - fabBounds.x}px, ${viewCenterY - fabBounds.y}px) scale(${ + viewBounds.width / fabBounds.width + }, ${viewBounds.height / fabBounds.height})`; + const transformNormal = `translate(0px, 0px) scale(1, 1)`; + + const viewBorderRadius = useReducedMotion ? reducedMotionViewBorderRadius : '50%'; + + const fabViewFade = animationController + .create() + .beforeStyles({zIndex: -1}) + .fromTo('opacity', '1', '1') + .addElement(fabView); + const fabGrow = animationController + .create() + .beforeStyles({transformOrigin: 'center'}) + .fromTo('transform', back ? fabOnView : transformNormal, back ? transformNormal : fabOnView) + .fromTo('opacity', back ? '0' : '1', back ? '1' : '0') + .fromTo('borderRadius', back ? '0' : '50%', back ? '50%' : '0') + .addElement(fab); + const viewGrow = animationController + .create() + .beforeStyles({zIndex: 200, overflow: 'hidden', transformOrigin: 'center'}) + .fromTo('transform', back ? transformNormal : viewOnFab, back ? viewOnFab : transformNormal) + .fromTo('opacity', back ? '1' : '0', back ? '0' : '1') + .fromTo('borderRadius', back ? '0' : viewBorderRadius, back ? viewBorderRadius : '0') + .addElement(otherView); + + return rootTransition.addAnimation(fabGrow).addAnimation(viewGrow).addAnimation(fabViewFade); + }; +} diff --git a/frontend/app/src/app/app.component.html b/frontend/app/src/app/app.component.html index b7d2183c..5bd8b4ac 100644 --- a/frontend/app/src/app/app.component.html +++ b/frontend/app/src/app/app.component.html @@ -1,3 +1,22 @@ + +<<<<<<<< HEAD:frontend/app/src/app/util/simple-swiper.html + +======== + +>>>>>>>> app/develop:frontend/app/src/app/app.component.html diff --git a/frontend/app/src/app/modules/about/about-changelog.html b/frontend/app/src/app/modules/about/about-changelog.html index e0f1aa09..61d385b6 100644 --- a/frontend/app/src/app/modules/about/about-changelog.html +++ b/frontend/app/src/app/modules/about/about-changelog.html @@ -22,10 +22,8 @@ - -
-
- -
+ +
+
diff --git a/frontend/app/src/app/modules/about/about-licenses.html b/frontend/app/src/app/modules/about/about-licenses.html index 9b5b2612..e8562129 100644 --- a/frontend/app/src/app/modules/about/about-licenses.html +++ b/frontend/app/src/app/modules/about/about-licenses.html @@ -22,32 +22,30 @@ - -
-
- - - - {{ license.name }} - - + +
+ + + + {{ license.name }} + + - - {{ license.authors || license.publisher }} - - - - - - {{ license.licenses }} License - - - -
+ + {{ license.authors || license.publisher }} + + + + + + {{ license.licenses }} License + + +
diff --git a/frontend/app/src/app/modules/about/about-licenses.scss b/frontend/app/src/app/modules/about/about-licenses.scss index 00c9e63c..c0eabcec 100644 --- a/frontend/app/src/app/modules/about/about-licenses.scss +++ b/frontend/app/src/app/modules/about/about-licenses.scss @@ -1,5 +1,10 @@ +<<<<<<<< HEAD:packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts +/* + * Copyright (C) 2020 StApps +======== /*! * Copyright (C) 2023 StApps +>>>>>>>> app/develop:frontend/app/src/app/modules/about/about-licenses.scss * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -13,6 +18,17 @@ * this program. If not, see . */ +<<<<<<<< HEAD:packages/es-mapping-generator/test/mapping-model/aggregations/src/types.ts +export enum ThingType { + AggArray = 'agg array', + AggGlobal = 'agg global', + AggGlobalNested = 'agg global nested', + AggNested = 'agg nested', + AggInherited = 'agg inherited', + AggInheritedGlobal = 'agg inherited global', + AggInheritedOverwritten = 'agg inherited overwritten', +} +======== ion-content > div { height: 100%; } @@ -22,7 +38,7 @@ cdk-virtual-scroll-viewport { width: 100%; } -::ng-deep { +:host ::ng-deep { .cdk-virtual-scroll-content-wrapper { width: 100%; } @@ -36,3 +52,4 @@ cdk-virtual-scroll-viewport { vertical-align: text-top; height: 14px; } +>>>>>>>> app/develop:frontend/app/src/app/modules/about/about-licenses.scss diff --git a/frontend/app/src/app/modules/about/about-page/about-page-content.html b/frontend/app/src/app/modules/about/about-page/about-page-content.html index 936cbd65..b2e56d95 100644 --- a/frontend/app/src/app/modules/about/about-page/about-page-content.html +++ b/frontend/app/src/app/modules/about/about-page/about-page-content.html @@ -1,5 +1,5 @@ - - - - {{ 'modal.settings' | translate | titlecase }} - - {{ 'modal.DISMISS_CANCEL' | translate }} - - - {{ 'modal.DISMISS_CONFIRM' | translate }} - - - - - - - - - - {{ item.labelLocalized }} - - - - - - - {{ 'dashboard.canteens.choose_favorite' | translate }} - - - {{ item.labelLocalized }} - - - - - diff --git a/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal.component.scss b/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal.component.scss deleted file mode 100644 index 8206b7d9..00000000 --- a/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -:host { - --width: 100vw; -} diff --git a/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal.component.ts b/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal.component.ts deleted file mode 100644 index acb4d47b..00000000 --- a/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal.component.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2022 StApps - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ -import {Component, Input, OnInit, ViewChild} from '@angular/core'; -import {IonReorderGroup, ModalController} from '@ionic/angular'; -import {ItemReorderEventDetail} from '@ionic/core'; -import {EditModalItem, EditModalTypeEnum} from './edit-modal-type.enum'; - -/** - * Shows a modal window to sort and enable/disable menu items - */ -@Component({ - selector: 'stapps-dashboard-edit-modal', - templateUrl: 'edit-modal.component.html', - styleUrls: ['edit-modal.component.scss'], -}) -export class EditModalComponent implements OnInit { - @ViewChild(IonReorderGroup) reorderGroup: IonReorderGroup; - - @Input() type: EditModalTypeEnum = EditModalTypeEnum.CHECKBOXES; - - @Input() items: EditModalItem[]; - - @Input() selectedValue: string; - - reorderedItems: EditModalItem[]; - - types = EditModalTypeEnum; - - constructor(public modalController: ModalController) {} - - ngOnInit() { - this.reorderedItems = this.items; - } - - ionViewWillLeave() { - this.dismissModal(); - } - - doReorder(event: CustomEvent) { - this.reorderedItems = event.detail.complete(this.reorderedItems); - } - - onSaveClick() { - this.modalController.dismiss({ - items: this.reorderedItems, - selectedValue: this.selectedValue, - }); - } - - dismissModal() { - this.modalController.dismiss(); - } -} diff --git a/frontend/app/src/app/modules/dashboard/fade.animation.ts b/frontend/app/src/app/modules/dashboard/fade.animation.ts new file mode 100644 index 00000000..d9c2dbbb --- /dev/null +++ b/frontend/app/src/app/modules/dashboard/fade.animation.ts @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +import {animate, style, transition, trigger} from '@angular/animations'; + +export const fadeAnimation = trigger('fade', [ + transition(':enter', [style({opacity: '0'}), animate(250, style({opacity: '1'}))]), +]); diff --git a/frontend/app/src/app/modules/dashboard/mensa-filters.ts b/frontend/app/src/app/modules/dashboard/mensa-filters.ts new file mode 100644 index 00000000..fbe73d61 --- /dev/null +++ b/frontend/app/src/app/modules/dashboard/mensa-filters.ts @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +import {SCBuildingCategories, SCThings, SCThingWithCategories} from '@openstapps/core'; + +const mensaCategories = new Set(['canteen', 'cafe', 'student canteen', 'restaurant']); + +/** + * + */ +export function isMensaThing(item: SCThings): boolean { + return ( + (item as SCThingWithCategories).categories?.some(category => + mensaCategories.has(category as never), + ) || false + ); +} diff --git a/frontend/app/src/app/modules/dashboard/sections/favorites-section/favorites-section.component.html b/frontend/app/src/app/modules/dashboard/sections/favorites-section/favorites-section.component.html index 33592964..ac771633 100644 --- a/frontend/app/src/app/modules/dashboard/sections/favorites-section/favorites-section.component.html +++ b/frontend/app/src/app/modules/dashboard/sections/favorites-section/favorites-section.component.html @@ -17,9 +17,9 @@ - + . */ -import {Component, OnInit} from '@angular/core'; -import {ActivatedRoute, Router} from '@angular/router'; -import {AlertController, AnimationController} from '@ionic/angular'; -import {combineLatest} from 'rxjs'; -import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators'; -import {NGXLogger} from 'ngx-logger'; -import {SCThings} from '@openstapps/core'; - -import {DataProvider} from '../../../data/data.provider'; -import {DataRoutingService} from '../../../data/data-routing.service'; -import {SearchPageComponent} from '../../../data/list/search-page.component'; -import {PositionService} from '../../../map/position.service'; -import {SettingsProvider} from '../../../settings/settings.provider'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; +import {filter, map} from 'rxjs/operators'; import {FavoritesService} from '../../../favorites/favorites.service'; -import {ContextMenuService} from '../../../menu/context/context-menu.service'; -import {ConfigProvider} from '../../../config/config.provider'; +import {fadeAnimation} from '../../fade.animation'; +import {isMensaThing} from '../../mensa-filters'; /** * Shows a section with meals of the chosen mensa @@ -36,95 +25,14 @@ import {ConfigProvider} from '../../../config/config.provider'; selector: 'stapps-favorites-section', templateUrl: 'favorites-section.component.html', styleUrls: ['favorites-section.component.scss'], + animations: [fadeAnimation], + changeDetection: ChangeDetectionStrategy.OnPush, }) -export class FavoritesSectionComponent extends SearchPageComponent implements OnInit { - constructor( - protected readonly alertController: AlertController, - protected dataProvider: DataProvider, - protected readonly contextMenuService: ContextMenuService, - protected readonly settingsProvider: SettingsProvider, - protected readonly logger: NGXLogger, - protected dataRoutingService: DataRoutingService, - protected router: Router, - route: ActivatedRoute, - positionService: PositionService, - private favoritesService: FavoritesService, - configProvider: ConfigProvider, - animationController: AnimationController, - ) { - super( - alertController, - dataProvider, - contextMenuService, - settingsProvider, - logger, - dataRoutingService, - router, - route, - positionService, - configProvider, - animationController, - ); - } +export class FavoritesSectionComponent { + items = this.favoritesService.favoriteThings$.pipe( + map(favorites => favorites.filter(it => !isMensaThing(it))), + filter(favorites => favorites.length > 0), + ); - async initialize() { - this.subscriptions.push( - combineLatest([ - this.queryTextChanged.pipe( - debounceTime(this.searchQueryDueTime), - distinctUntilChanged(), - startWith(this.queryText), - ), - this.favoritesService.favoritesChanged$, - ]).subscribe(async () => { - await this.fetchAndUpdateItems(); - this.queryChanged.next(); - }), - ); - } - - /** - * Fetches/updates the favorites (search page component's method override) - */ - async fetchAndUpdateItems() { - this.favoritesService - .search(this.queryText, this.filterQuery, this.sortQuery) - .pipe(take(1)) - .subscribe(result => { - this.items = new Promise(resolve => { - resolve(result.data && result.data.filter(item => !this.isMensaThing(item))); - }); - }); - } - - /** - * Helper function as 'typeof' is not accessible in HTML - * - * @param item TODO - */ - isMensaThing(item: SCThings): boolean { - return ( - this.hasCategories(item) && - ((item.categories as string[]).includes('canteen') || - (item.categories as string[]).includes('cafe') || - (item.categories as string[]).includes('student canteen') || - (item.categories as string[]).includes('restaurant')) - ); - } - - /** - * TODO - * - * @param item TODO - */ - hasCategories(item: SCThings): item is SCThings & {categories: string[]} { - return typeof (item as {categories: string[]}).categories !== 'undefined'; - } - - /** - * Emit event that an item was selected - */ - notifySelect(item: SCThings) { - this.dataRoutingService.emitChildEvent(item); - } + constructor(private favoritesService: FavoritesService) {} } diff --git a/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section-content.component.ts b/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section-content.component.ts index 4765f9a4..6dfcbcbc 100644 --- a/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section-content.component.ts +++ b/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section-content.component.ts @@ -12,11 +12,11 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Component, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {SCDish, SCPlace, SCThings} from '@openstapps/core'; import {PlaceMensaService} from '../../../data/types/place/special/mensa/place-mensa-service'; -import {animate, style, transition, trigger} from '@angular/animations'; import moment from 'moment'; +import {fadeAnimation} from '../../fade.animation'; /** * Shows a section with meals of the chosen mensa @@ -25,11 +25,8 @@ import moment from 'moment'; selector: 'stapps-mensa-section-content', templateUrl: 'mensa-section-content.component.html', styleUrls: ['mensa-section-content.component.scss'], - animations: [ - trigger('fade', [ - transition(':enter', [style({opacity: '0'}), animate('500ms ease', style({opacity: '1'}))]), - ]), - ], + animations: [fadeAnimation], + changeDetection: ChangeDetectionStrategy.OnPush, }) export class MensaSectionContentComponent { /** diff --git a/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.html b/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.html index a8bfd224..cf55a5c5 100644 --- a/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.html +++ b/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.html @@ -30,7 +30,7 @@ {{ 'dashboard.canteens.no_favorite_prefix' | translate }} - {{ 'dashboard.canteens.no_favorite_link' | translate }} + {{ 'dashboard.canteens.no_favorite_link' | translate }} {{ 'dashboard.canteens.no_favorite_suffix' | translate }} diff --git a/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.ts b/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.ts index f8043538..ae4fecf6 100644 --- a/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.ts +++ b/frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.ts @@ -12,23 +12,11 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Component} from '@angular/core'; -import {ActivatedRoute, Router} from '@angular/router'; -import {AlertController, AnimationController, ModalController} from '@ionic/angular'; -import {combineLatest, Subscription} from 'rxjs'; -import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators'; -import {NGXLogger} from 'ngx-logger'; -import {SCThings} from '@openstapps/core'; - -import {DataProvider} from '../../../data/data.provider'; -import {DataRoutingService} from '../../../data/data-routing.service'; -import {FoodDataListComponent} from '../../../data/list/food-data-list.component'; -import {PositionService} from '../../../map/position.service'; -import {SettingsProvider} from '../../../settings/settings.provider'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; +import {map} from 'rxjs/operators'; import {FavoritesService} from '../../../favorites/favorites.service'; -import {ContextMenuService} from '../../../menu/context/context-menu.service'; -import {ConfigProvider} from '../../../config/config.provider'; -import {animate, style, transition, trigger} from '@angular/animations'; +import {fadeAnimation} from '../../fade.animation'; +import {isMensaThing} from '../../mensa-filters'; /** * Shows a section with meals of the chosen mensa @@ -37,107 +25,11 @@ import {animate, style, transition, trigger} from '@angular/animations'; selector: 'stapps-mensa-section', templateUrl: 'mensa-section.component.html', styleUrls: ['mensa-section.component.scss'], - animations: [ - trigger('fade', [transition(':enter', [style({opacity: '0'}), animate(250, style({opacity: '1'}))])]), - ], + animations: [fadeAnimation], + changeDetection: ChangeDetectionStrategy.OnPush, }) -export class MensaSectionComponent extends FoodDataListComponent { - sub: Subscription; +export class MensaSectionComponent { + items = this.favoritesService.favoriteThings$.pipe(map(favorites => favorites.filter(isMensaThing))); - constructor( - protected readonly alertController: AlertController, - protected dataProvider: DataProvider, - protected readonly contextMenuService: ContextMenuService, - protected readonly settingsProvider: SettingsProvider, - protected readonly logger: NGXLogger, - protected dataRoutingService: DataRoutingService, - protected router: Router, - route: ActivatedRoute, - protected positionService: PositionService, - public modalController: ModalController, - protected favoritesService: FavoritesService, - configProvider: ConfigProvider, - animationController: AnimationController, - ) { - super( - alertController, - dataProvider, - contextMenuService, - settingsProvider, - logger, - dataRoutingService, - router, - route, - positionService, - configProvider, - animationController, - ); - } - - async initialize() { - super.initialize(); - - this.subscriptions.push( - combineLatest([ - this.queryTextChanged.pipe( - debounceTime(this.searchQueryDueTime), - distinctUntilChanged(), - startWith(this.queryText), - ), - this.favoritesService.favoritesChanged$, - ]).subscribe(async query => { - this.queryText = query[0]; - this.from = 0; - if (typeof this.filterQuery !== 'undefined' || this.queryText?.length > 0 || this.showDefaultData) { - await this.fetchAndUpdateItems(); - this.queryChanged.next(); - } - }), - ); - } - - /** - * Fetches/updates the favorites (search page component's method override) - */ - async fetchAndUpdateItems() { - this.favoritesService - .search(this.queryText, this.filterQuery, this.sortQuery) - .pipe(take(1)) - .subscribe(result => { - this.items = new Promise(resolve => { - resolve(result.data && result.data.filter(item => this.isMensaThing(item))); - }); - }); - } - - /** - * Helper function as 'typeof' is not accessible in HTML - * - * @param item TODO - */ - isMensaThing(item: SCThings): boolean { - return ( - this.hasCategories(item) && - ((item.categories as string[]).includes('canteen') || - (item.categories as string[]).includes('cafe') || - (item.categories as string[]).includes('student canteen') || - (item.categories as string[]).includes('restaurant')) - ); - } - - /** - * TODO - * - * @param item TODO - */ - hasCategories(item: SCThings): item is SCThings & {categories: string[]} { - return typeof (item as {categories: string[]}).categories !== 'undefined'; - } - - /** - * Action when user clicked edit to this section - */ - onSectionEdit() { - void this.router.navigate(['/canteen']); - } + constructor(protected favoritesService: FavoritesService) {} } diff --git a/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss b/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss index 0930dad6..64093ebd 100644 --- a/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss +++ b/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss @@ -13,12 +13,36 @@ * this program. If not, see . */ +<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list-item.scss +:host { + display: block; +} + +ion-item::part(native) { + height: 100%; +} + +.ion-text-wrap ::ng-deep ion-label { + white-space: normal !important; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; +} + +ion-item { + --border-color: transparent; + @include border-radius-in-parallax(var(--border-radius-default)); + overflow: hidden; + --inner-padding-end: 0; + --padding-start: var(--spacing-sm); + margin: var(--spacing-sm); +======== simple-swiper { --swiper-slide-width: 256px; } +>>>>>>>> app/develop:frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss .more-news { - width: 128px; font-size: var(--font-size-xl); --color: var(--ion-color-medium-tint); @@ -43,3 +67,43 @@ simple-swiper { width: 200px; } } + +:host.square ::ng-deep { + ion-item { + margin: 0; + } + + ion-row { + flex-direction: column; + justify-content: space-between; + height: 120px; + } + + ion-col { + flex-grow: 0; + flex-basis: min-content; + } + + .title { + display: -webkit-box; + white-space: break-spaces; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; + } + + .title-sub { + display: none; + } + + // fix for Safari + stapps-offers-in-list { + position: absolute; + bottom: 0; + right: 0; + } + + stapps-offers-in-list .place { + display: none; + } +} diff --git a/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.ts b/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.ts index 98b5e223..ccbf57ca 100644 --- a/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.ts +++ b/frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.ts @@ -12,11 +12,9 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Component} from '@angular/core'; +import {ChangeDetectionStrategy, Component} from '@angular/core'; import {NewsProvider} from '../../../news/news.provider'; -import {SCMessage} from '@openstapps/core'; -import {animate, style, transition, trigger} from '@angular/animations'; -import {Router} from '@angular/router'; +import {fadeAnimation} from '../../fade.animation'; /** * Shows a section with news @@ -25,21 +23,14 @@ import {Router} from '@angular/router'; selector: 'stapps-news-section', templateUrl: 'news-section.component.html', styleUrls: ['news-section.component.scss'], - animations: [ - trigger('fade', [ - transition(':enter', [ - style({opacity: '0', transform: 'translateX(100px)'}), - animate('250ms ease', style({opacity: '1', transform: 'translateX(0)'})), - ]), - ]), - ], + animations: [fadeAnimation], + changeDetection: ChangeDetectionStrategy.OnPush, }) export class NewsSectionComponent { - news: Promise; + news = this.newsProvider + .getCurrentFilters() + // eslint-disable-next-line unicorn/prefer-top-level-await,unicorn/consistent-function-scoping + .then(filters => this.newsProvider.getList(5, 0, filters)); - constructor(readonly newsProvider: NewsProvider, readonly router: Router) { - this.news = this.newsProvider - .getCurrentFilters() - .then(filters => this.newsProvider.getList(5, 0, filters)); - } + constructor(readonly newsProvider: NewsProvider) {} } diff --git a/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html b/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html index 6365aa5f..27eceb5c 100644 --- a/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html +++ b/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html @@ -13,12 +13,24 @@ ~ this program. If not, see . --> +<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list-item-host-default.html +

+ {{ 'name' | thingTranslate: item }} +

+

+ +

+======== +>>>>>>>> app/develop:frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html diff --git a/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.ts b/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.ts index 053241f7..a4c4783a 100644 --- a/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.ts +++ b/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.ts @@ -13,10 +13,7 @@ * this program. If not, see . */ import {Component} from '@angular/core'; -import {Router} from '@angular/router'; -import {Capacitor} from '@capacitor/core'; -import {Keyboard} from '@capacitor/keyboard'; -import {AnimationBuilder, AnimationController} from '@ionic/angular'; +import {AnimationController} from '@ionic/angular'; import {homePageSearchTransition} from './search-route-transition'; /** @@ -28,29 +25,7 @@ import {homePageSearchTransition} from './search-route-transition'; styleUrls: ['search-section.component.scss'], }) export class SearchSectionComponent { - searchTerm = ''; + routeTransition = homePageSearchTransition(this.animationController); - routeTransition: AnimationBuilder; - - constructor(private router: Router, private animationController: AnimationController) { - this.routeTransition = homePageSearchTransition(this.animationController); - } - - /** - * User submits search - */ - onSubmitSearch() { - this.router - .navigate(['/search'], {queryParams: {query: this.searchTerm}}) - .then(() => this.hideKeyboard()); - } - - /** - * Hides keyboard in native app environments - */ - hideKeyboard() { - if (Capacitor.isNativePlatform()) { - Keyboard.hide(); - } - } + constructor(private animationController: AnimationController) {} } diff --git a/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.html b/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.html index d5f0bc3e..1f09b1a6 100644 --- a/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.html +++ b/frontend/app/src/app/modules/data/chips/data/add-event-action-chip.html @@ -1,5 +1,5 @@ +<<<<<<<< HEAD:frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html + + + + + +======== +>>>>>>>> app/develop:frontend/app/src/app/modules/data/elements/favorite-button.component.html diff --git a/frontend/app/src/app/modules/data/elements/favorite-button.component.scss b/frontend/app/src/app/modules/data/elements/favorite-button.component.scss index d8997b9f..4810f30a 100644 --- a/frontend/app/src/app/modules/data/elements/favorite-button.component.scss +++ b/frontend/app/src/app/modules/data/elements/favorite-button.component.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -27,6 +27,7 @@ } .selected { + // TODO color: #fbc02d; } } diff --git a/frontend/app/src/app/modules/data/elements/offers-in-list.html b/frontend/app/src/app/modules/data/elements/offers-in-list.html index df269aa8..c0bcb3f0 100644 --- a/frontend/app/src/app/modules/data/elements/offers-in-list.html +++ b/frontend/app/src/app/modules/data/elements/offers-in-list.html @@ -14,17 +14,17 @@ -->
- +

{{ price | currency: 'EUR':'symbol':undefined:'de' }}

- +

{{ 'data.detail.offers.sold_out' | translate }}

-

+

{{ _offers[0].inPlace.name }}...

diff --git a/frontend/app/src/app/modules/data/elements/title-card.component.html b/frontend/app/src/app/modules/data/elements/title-card.component.html index d3ecafdb..aab97c59 100644 --- a/frontend/app/src/app/modules/data/elements/title-card.component.html +++ b/frontend/app/src/app/modules/data/elements/title-card.component.html @@ -38,7 +38,6 @@ diff --git a/frontend/app/src/app/modules/data/elements/title-card.component.scss b/frontend/app/src/app/modules/data/elements/title-card.component.scss index c58e09d4..348beb30 100644 --- a/frontend/app/src/app/modules/data/elements/title-card.component.scss +++ b/frontend/app/src/app/modules/data/elements/title-card.component.scss @@ -39,10 +39,14 @@ ion-card { padding: 0 0 var(--header-spacing-bottom); .description * { - color: var(--ion-color-light); + color: var(--ion-color-primary-contrast); } .openingHours { - color: var(--ion-color-light); + color: var(--ion-color-primary-contrast); } } + + ion-button { + --color: var(--ion-color-primary-contrast); + } } diff --git a/frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts b/frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts index 6491d88e..64618af3 100644 --- a/frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts +++ b/frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts @@ -13,6 +13,19 @@ * this program. If not, see . */ +<<<<<<<< HEAD:frontend/app/src/app/util/simple-swiper.component.ts +import {Component, ContentChildren, ElementRef, ViewContainerRef} from '@angular/core'; + +@Component({ + selector: 'simple-swiper', + templateUrl: 'simple-swiper.html', + styleUrls: ['simple-swiper.scss'], +}) +export class SimpleSwiperComponent { + constructor(readonly viewContainerRef: ViewContainerRef) {} + + @ContentChildren('*') children: ElementRef; +======== import {Component, Input} from '@angular/core'; import {SCThings} from '@openstapps/core'; @@ -22,4 +35,5 @@ import {SCThings} from '@openstapps/core'; }) export class DataListItemHostDefaultComponent { @Input() item: SCThings; +>>>>>>>> app/develop:frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts } diff --git a/frontend/app/src/app/modules/data/list/data-list-item.scss b/frontend/app/src/app/modules/data/list/data-list-item.scss index 714f93af..aa4883a7 100644 --- a/frontend/app/src/app/modules/data/list/data-list-item.scss +++ b/frontend/app/src/app/modules/data/list/data-list-item.scss @@ -13,7 +13,6 @@ * this program. If not, see . */ @import 'src/theme/util/_mixins.scss'; -@import 'src/theme/common/_helper.scss'; :host { display: block; @@ -44,17 +43,13 @@ ion-item { ion-label { width: 100%; + margin-right: 0; div { display: flex; flex-direction: column; } } - ::ng-deep { - ion-note { - @extend %horizontal-list; - } - } } :host.square ::ng-deep { diff --git a/frontend/app/src/app/modules/data/list/data-list.component.ts b/frontend/app/src/app/modules/data/list/data-list.component.ts index 6fd07fa9..74535865 100644 --- a/frontend/app/src/app/modules/data/list/data-list.component.ts +++ b/frontend/app/src/app/modules/data/list/data-list.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,7 +12,6 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; import { Component, ContentChild, @@ -29,6 +28,7 @@ import { } from '@angular/core'; import {SCThings} from '@openstapps/core'; import {BehaviorSubject, Observable, Subscription} from 'rxjs'; +import {IonInfiniteScroll} from '@ionic/angular'; export interface DataListContext { $implicit: T; @@ -43,11 +43,6 @@ export interface DataListContext { styleUrls: ['data-list.scss'], }) export class DataListComponent implements OnChanges, OnInit, OnDestroy { - /** - * Amount of list items left to show (in percent) that should trigger a data reload - */ - private readonly reloadThreshold = 0.2; - /** * All SCThings to display */ @@ -86,7 +81,7 @@ export class DataListComponent implements OnChanges, OnInit, OnDestroy { */ subscriptions: Subscription[] = []; - @ViewChild(CdkVirtualScrollViewport) viewPort: CdkVirtualScrollViewport; + @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; /** * Signalizes that the data is being loaded @@ -113,6 +108,7 @@ export class DataListComponent implements OnChanges, OnInit, OnDestroy { ngOnChanges(changes: SimpleChanges): void { if (Array.isArray(this.items) && typeof changes.items !== 'undefined') { this.itemStream.next(this.items); + this.infiniteScroll.complete(); } } @@ -127,7 +123,7 @@ export class DataListComponent implements OnChanges, OnInit, OnDestroy { if (typeof this.resetToTop !== 'undefined') { this.subscriptions.push( this.resetToTop.subscribe(() => { - this.viewPort.scrollToIndex(0); + // this.viewPort.scrollToIndex(0); }), ); } @@ -139,18 +135,4 @@ export class DataListComponent implements OnChanges, OnInit, OnDestroy { notifyLoadMore() { this.loadMore.emit(); } - - /** - * Function to call whenever scroll view visible range changed - */ - scrolled(index: number) { - if ( - // first condition prevents "load more" to be executed even before scrolling - index > 0 && - (this.items?.length ?? 0) - this.viewPort.getRenderedRange().end <= - (this.items?.length ?? 0) * this.reloadThreshold - ) { - this.notifyLoadMore(); - } - } } diff --git a/frontend/app/src/app/modules/data/list/data-list.html b/frontend/app/src/app/modules/data/list/data-list.html index b6569188..a0f8c0ea 100644 --- a/frontend/app/src/app/modules/data/list/data-list.html +++ b/frontend/app/src/app/modules/data/list/data-list.html @@ -15,29 +15,23 @@ - - + + - + + + +
{{ 'search.nothing_found' | translate | titlecase }}
- - - + diff --git a/frontend/app/src/app/modules/data/list/data-list.scss b/frontend/app/src/app/modules/data/list/data-list.scss index 086552c5..1cdcfa27 100644 --- a/frontend/app/src/app/modules/data/list/data-list.scss +++ b/frontend/app/src/app/modules/data/list/data-list.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,18 +12,14 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ +<<<<<<<< HEAD:frontend/app/src/app/modules/settings/item/settings-item.scss +======== -cdk-virtual-scroll-viewport { +ion-list { + background: none; +} + +skeleton-list { height: 100%; - width: 100%; -} - -::ng-deep { - .cdk-virtual-scroll-content-wrapper { - width: 100%; - } -} - -.virtual-scroll-expander { - clear: both; } +>>>>>>>> app/develop:frontend/app/src/app/modules/data/list/data-list.scss diff --git a/frontend/app/src/app/modules/data/list/food-data-list.component.ts b/frontend/app/src/app/modules/data/list/food-data-list.component.ts index 4f260d72..95e6afbc 100644 --- a/frontend/app/src/app/modules/data/list/food-data-list.component.ts +++ b/frontend/app/src/app/modules/data/list/food-data-list.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,10 +12,11 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {Component} from '@angular/core'; +import {Component, OnDestroy, OnInit} from '@angular/core'; import {MapPosition} from '../../map/position.service'; import {SearchPageComponent} from './search-page.component'; import {Geolocation} from '@capacitor/geolocation'; +import {Subscription} from 'rxjs'; /** * Presents a list of places for eating/drinking @@ -24,15 +25,19 @@ import {Geolocation} from '@capacitor/geolocation'; templateUrl: 'search-page.html', styleUrls: ['../../data/list/search-page.scss'], }) -export class FoodDataListComponent extends SearchPageComponent { +export class FoodDataListComponent extends SearchPageComponent implements OnInit, OnDestroy { title = 'canteens.title'; showNavigation = false; + locationWatch?: Subscription; + /** * Sets the forced filter to present only places for eating/drinking */ - initialize() { + ngOnInit() { + this.locationWatch?.unsubscribe(); + this.locationWatch = this.createLocationWatch(); this.showDefaultData = true; this.sortQuery = [ @@ -92,29 +97,36 @@ export class FoodDataListComponent extends SearchPageComponent { }, ]; } + + super.ngOnInit(); + } + + private createLocationWatch(): Subscription { + return this.positionService + .watchCurrentLocation(this.constructor.name, {enableHighAccuracy: false, maximumAge: 1000}) + .subscribe({ + next: (position: MapPosition) => { + this.positionService.position = position; + }, + error: async _error => { + this.positionService.position = undefined; + await Geolocation.checkPermissions(); + }, + }); } async ionViewWillEnter() { await super.ionViewWillEnter(); - this.subscriptions.push( - this.positionService - .watchCurrentLocation(this.constructor.name, {enableHighAccuracy: false, maximumAge: 1000}) - .subscribe({ - next: (position: MapPosition) => { - this.positionService.position = position; - }, - error: async _error => { - this.positionService.position = undefined; - await Geolocation.checkPermissions(); - }, - }), - ); + this.locationWatch?.unsubscribe(); + this.locationWatch = this.createLocationWatch(); } ionViewWillLeave() { - void this.positionService.clearWatcher(this.constructor.name); - for (const sub of this.subscriptions) { - sub.unsubscribe(); - } + this.locationWatch?.unsubscribe(); + } + + ngOnDestroy() { + super.ngOnDestroy(); + this.locationWatch?.unsubscribe(); } } diff --git a/frontend/app/src/app/modules/data/list/search-page.component.ts b/frontend/app/src/app/modules/data/list/search-page.component.ts index 0fb4ceb1..1b4ee9a5 100644 --- a/frontend/app/src/app/modules/data/list/search-page.component.ts +++ b/frontend/app/src/app/modules/data/list/search-page.component.ts @@ -46,7 +46,13 @@ import {searchPageSwitchAnimation} from './search-page-switch-animation'; providers: [ContextMenuService], }) export class SearchPageComponent implements OnInit, OnDestroy { - title = 'search.title'; + @Input() title = 'search.title'; + + @Input() placeholder = 'search.search_bar.placeholder'; + + @Input() searchInstruction = 'search.instruction'; + + @Input() backUrl?: string; isHebisAvailable = false; diff --git a/frontend/app/src/app/modules/data/list/search-page.html b/frontend/app/src/app/modules/data/list/search-page.html index 1ae5bc0d..f795f974 100644 --- a/frontend/app/src/app/modules/data/list/search-page.html +++ b/frontend/app/src/app/modules/data/list/search-page.html @@ -15,9 +15,9 @@ - + - + {{ title | translate }} @@ -28,12 +28,12 @@ (search)="hideKeyboard()" [(ngModel)]="queryText" showClearButton="always" - placeholder="{{ 'search.search_bar.placeholder' | translate }}" + placeholder="{{ placeholder | translate }}" mode="md" type="search" enterkeyhint="search" class="filterable" - autofocus + [autofocus]="!showDefaultData" > @@ -56,9 +56,12 @@ -
+
- {{ 'search.instruction' | translate }} + {{ searchInstruction | translate }}
div { diff --git a/frontend/app/src/app/modules/data/list/skeleton-list.component.ts b/frontend/app/src/app/modules/data/list/skeleton-list.component.ts new file mode 100644 index 00000000..6fd383eb --- /dev/null +++ b/frontend/app/src/app/modules/data/list/skeleton-list.component.ts @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +import {Component, Input} from '@angular/core'; +import {SCThings} from '@openstapps/core'; + +@Component({ +<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts + selector: 'data-list-item-host-default', + templateUrl: 'data-list-item-host-default.html', +}) +export class DataListItemHostDefaultComponent { + @Input() item: SCThings; +} +======== + selector: 'skeleton-list', + templateUrl: 'skeleton-list.html', + styleUrls: ['skeleton-list.scss'], +}) +export class SkeletonListComponent {} +>>>>>>>> app/develop:frontend/app/src/app/modules/data/list/skeleton-list.component.ts diff --git a/frontend/app/src/app/modules/data/list/skeleton-list.html b/frontend/app/src/app/modules/data/list/skeleton-list.html new file mode 100644 index 00000000..5348bcba --- /dev/null +++ b/frontend/app/src/app/modules/data/list/skeleton-list.html @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/backend/src/storage/elasticsearch/query/sort/generic.ts b/frontend/app/src/app/modules/data/list/skeleton-list.scss similarity index 61% rename from backend/backend/src/storage/elasticsearch/query/sort/generic.ts rename to frontend/app/src/app/modules/data/list/skeleton-list.scss index 38188c7c..6b525fd6 100644 --- a/backend/backend/src/storage/elasticsearch/query/sort/generic.ts +++ b/frontend/app/src/app/modules/data/list/skeleton-list.scss @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2022 StApps +/*! + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,16 +12,23 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {SortOptions} from '@elastic/elasticsearch/lib/api/types'; -import {SCGenericSort} from '@openstapps/core'; - -/** - * Converts a generic sort to elasticsearch syntax - * - * @param sort A sorting definition - */ -export function buildGenericSort(sort: SCGenericSort): SortOptions { - return { - [sort.arguments.field]: sort.order, - }; +svg { + width: 100%; + height: 100%; +} + +$item-height: 92; +$gap: 4; + +.label { + fill: var(--ion-color-medium); + opacity: 0.1; +} + +.item { + rx: var(--border-radius-default); + fill: var(--ion-item-background, var(--ion-background-color, #fff)); + x: var(--spacing-sm); + y: var(--spacing-sm); + width: calc(100% - var(--spacing-sm) * 2); } diff --git a/frontend/app/src/app/modules/data/types/dish/dish-characteristics.component.ts b/frontend/app/src/app/modules/data/types/dish/dish-characteristics.component.ts new file mode 100644 index 00000000..1ba54039 --- /dev/null +++ b/frontend/app/src/app/modules/data/types/dish/dish-characteristics.component.ts @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +import {Component, Input} from '@angular/core'; +import {SCDish} from '@openstapps/core'; + +@Component({ + selector: 'stapps-dish-characteristics', + templateUrl: 'dish-characteristics.html', + styleUrls: ['dish-characteristics.scss'], +}) +export class DishCharacteristicsComponent { + @Input() item: SCDish; +} diff --git a/frontend/app/src/app/modules/schedule/page/modal/modal-event-creator.html b/frontend/app/src/app/modules/data/types/dish/dish-characteristics.html similarity index 50% rename from frontend/app/src/app/modules/schedule/page/modal/modal-event-creator.html rename to frontend/app/src/app/modules/data/types/dish/dish-characteristics.html index 7f7b39aa..e890ab41 100644 --- a/frontend/app/src/app/modules/schedule/page/modal/modal-event-creator.html +++ b/frontend/app/src/app/modules/data/types/dish/dish-characteristics.html @@ -1,5 +1,5 @@ - - - {{ 'schedule.addEventModal.addEvent' | translate | titlecase }} - - - {{ 'modal.DISMISS' | translate }} - - - - - - - + + + + + + + + + {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }} + + diff --git a/frontend/app/src/app/modules/data/types/dish/dish-characteristics.scss b/frontend/app/src/app/modules/data/types/dish/dish-characteristics.scss new file mode 100644 index 00000000..cf013fb7 --- /dev/null +++ b/frontend/app/src/app/modules/data/types/dish/dish-characteristics.scss @@ -0,0 +1,38 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +ion-note { + list-style: none; + display: flex; + flex-direction: row-reverse; + justify-content: start; +} + +abbr { + width: 16px; + aspect-ratio: 1; + + background: var(--ion-color-medium); + + mask-image: var(--background-url); + mask-repeat: no-repeat; + mask-position: center; + mask-size: contain; + mask-mode: alpha; + + + ion-label::after { + content: '•'; + margin-inline: var(--spacing-xs); + } +} diff --git a/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html b/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html index ee1c1221..ec1305bc 100644 --- a/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html +++ b/frontend/app/src/app/modules/data/types/dish/dish-detail-content.html @@ -13,31 +13,7 @@ ~ this program. If not, see . --> - - - - - - {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }} - - - - - - -
    -
  • - - - -
    • -
- - - - - - + diff --git a/frontend/app/src/app/modules/data/types/dish/dish-detail-content.scss b/frontend/app/src/app/modules/data/types/dish/dish-detail-content.scss index 85527a04..7c94e516 100644 --- a/frontend/app/src/app/modules/data/types/dish/dish-detail-content.scss +++ b/frontend/app/src/app/modules/data/types/dish/dish-detail-content.scss @@ -12,10 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - -@import 'src/theme/common/_helper.scss'; -.vertical-list { - ul li img { - filter: unset; - } +stapps-dish-characteristics { + margin: var(--spacing-lg); + margin-block-end: var(--spacing-sm); } diff --git a/frontend/app/src/app/modules/data/types/dish/dish-list-item.html b/frontend/app/src/app/modules/data/types/dish/dish-list-item.html index 5567c6e5..3afafbe3 100644 --- a/frontend/app/src/app/modules/data/types/dish/dish-list-item.html +++ b/frontend/app/src/app/modules/data/types/dish/dish-list-item.html @@ -14,28 +14,17 @@ --> - - + +
{{ 'name' | thingTranslate: item }}

{{ 'description' | thingTranslate: item }}

- -
    -
  • - {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }} -
    • -
  • - - - -
    • -
- +
- +
diff --git a/frontend/app/src/app/modules/data/types/event/event-list-item.html b/frontend/app/src/app/modules/data/types/event/event-list-item.html index 3815915e..b11fc91e 100644 --- a/frontend/app/src/app/modules/data/types/event/event-list-item.html +++ b/frontend/app/src/app/modules/data/types/event/event-list-item.html @@ -24,9 +24,9 @@

{{ 'name' | thingTranslate: item.academicTerms[0] }}

- {{ 'type' | thingTranslate: item }} + {{ 'type' | thingTranslate: item | titlecase }} - {{ 'categories' | thingTranslate: item | join: ', ' }} + {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }}
diff --git a/frontend/app/src/app/modules/data/types/message/message-detail-content.html b/frontend/app/src/app/modules/data/types/message/message-detail-content.html index d285968e..898be3ff 100644 --- a/frontend/app/src/app/modules/data/types/message/message-detail-content.html +++ b/frontend/app/src/app/modules/data/types/message/message-detail-content.html @@ -1,5 +1,5 @@ - + diff --git a/frontend/app/src/app/modules/menu/navigation/navigation.scss b/frontend/app/src/app/modules/menu/navigation/navigation.scss index 830ebd71..2b62e80a 100644 --- a/frontend/app/src/app/modules/menu/navigation/navigation.scss +++ b/frontend/app/src/app/modules/menu/navigation/navigation.scss @@ -16,7 +16,7 @@ @import '../../../../theme/util/mixins'; stapps-navigation-tabs { - @include ion-lg-up { + @include ion-xl-up { display: none; } } @@ -41,7 +41,7 @@ stapps-offline-notice.is-offline ~ ion-split-pane { margin-left: var(--navigation-rail-width); } - @include ion-lg-up { + @include ion-xl-up { margin-left: 0; } } @@ -66,7 +66,7 @@ stapps-offline-notice.is-offline ~ ion-split-pane { } ion-router-outlet { - background: white; + background: var(--ion-background-color); } .menu-category { diff --git a/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts b/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts index ea933589..28345a40 100644 --- a/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts +++ b/frontend/app/src/app/modules/menu/navigation/root-link.directive.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,7 +12,6 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - import {Directive, ElementRef, Input, OnDestroy, OnInit, Renderer2} from '@angular/core'; import {AnimationController, NavController} from '@ionic/angular'; import {Router, RouterEvent} from '@angular/router'; @@ -46,6 +45,12 @@ export class RootLinkDirective implements OnInit, OnDestroy { ngOnInit() { const animation = tabsTransition(this.animationController); this.renderer.setAttribute(this.element.nativeElement, 'button', ''); + if (document.querySelector('#main')?.childNodes.length === 1) { + if (this.router.url === this.rootLink) { + this.setActive(); + } + this.needsInit = false; + } this.subscriptions.push( this.router.events.subscribe(event => { diff --git a/frontend/app/src/app/modules/news/item/news-item.scss b/frontend/app/src/app/modules/news/item/news-item.scss index 495db923..f1c2309a 100644 --- a/frontend/app/src/app/modules/news/item/news-item.scss +++ b/frontend/app/src/app/modules/news/item/news-item.scss @@ -23,7 +23,7 @@ ion-card::part(native) { display: flex; flex-direction: column-reverse; height: 100%; - background: linear-gradient(to top, var(--ion-color-dark), transparent); + background: linear-gradient(to top, #0e0e0e, transparent); } .card { @@ -38,10 +38,10 @@ ion-card-title { -webkit-box-orient: vertical; overflow: hidden; font-size: var(--font-size-xl); - --color: var(--ion-color-dark-contrast); + --color: var(--ion-text-color-dark, white); max-lines: 3; } ion-card-subtitle { - --color: var(--ion-color-dark-contrast); + --color: var(--ion-text-color-dark, white); } diff --git a/frontend/app/src/app/modules/news/page/news-page.html b/frontend/app/src/app/modules/news/page/news-page.html index 8b631bf2..86f2f903 100644 --- a/frontend/app/src/app/modules/news/page/news-page.html +++ b/frontend/app/src/app/modules/news/page/news-page.html @@ -22,41 +22,39 @@ - -
- - - - - - - - - - - -
- - - - - - -
- - {{ 'search.nothing_found' | translate | titlecase }} - - - - + + + + + + + + + + + + +
+ + + + + +
+ + {{ 'search.nothing_found' | translate | titlecase }} + + + + diff --git a/frontend/app/src/app/modules/profile/page/profile-page-section.component.ts b/frontend/app/src/app/modules/profile/page/profile-page-section.component.ts index eacd025a..f9103d52 100644 --- a/frontend/app/src/app/modules/profile/page/profile-page-section.component.ts +++ b/frontend/app/src/app/modules/profile/page/profile-page-section.component.ts @@ -14,13 +14,11 @@ */ import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {SCSection} from './sections'; +import {SCSection} from '../../../../config/profile-page-sections'; import {AuthHelperService} from '../../auth/auth-helper.service'; import {Observable, Subscription} from 'rxjs'; import {SCAuthorizationProviderType} from '@openstapps/core'; import Swiper from 'swiper'; -import {AlertController} from '@ionic/angular'; -import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'stapps-profile-page-section', @@ -55,11 +53,7 @@ export class ProfilePageSectionComponent implements OnInit, OnDestroy { }, }; - constructor( - private authHelper: AuthHelperService, - private alertController: AlertController, - private translateService: TranslateService, - ) {} + constructor(private authHelper: AuthHelperService) {} ngOnInit() { if (this.item.authProvider) { @@ -100,27 +94,7 @@ export class ProfilePageSectionComponent implements OnInit, OnDestroy { async signOut(providerType: SCAuthorizationProviderType) { await this.authHelper.getProvider(providerType).signOut(); - - const alert: HTMLIonAlertElement = await this.alertController.create({ - header: this.translateService.instant(`auth.messages.${providerType}.log_out_alert.header`), - message: this.translateService.instant(`auth.messages.${providerType}.log_out_alert.message`), - buttons: [ - { - text: this.translateService.instant('no'), - cssClass: 'default', - }, - { - text: this.translateService.instant('yes'), - role: 'confirm', - cssClass: 'preferred', - handler: () => { - this.authHelper.endBrowserSession(providerType); - }, - }, - ], - }); - - await alert.present(); + await this.authHelper.endBrowserSession(providerType); } ngOnDestroy() { diff --git a/frontend/app/src/app/modules/profile/page/profile-page-section.html b/frontend/app/src/app/modules/profile/page/profile-page-section.html index 053ea254..ac78accb 100644 --- a/frontend/app/src/app/modules/profile/page/profile-page-section.html +++ b/frontend/app/src/app/modules/profile/page/profile-page-section.html @@ -28,6 +28,7 @@ *ngFor="let link of item.links" [routerLink]="link.link" [disabled]="link.needsAuth && !isLoggedIn" + [detail]="false" >
diff --git a/frontend/app/src/app/modules/profile/page/profile-page-section.scss b/frontend/app/src/app/modules/profile/page/profile-page-section.scss index fd2d18f1..18c14b48 100644 --- a/frontend/app/src/app/modules/profile/page/profile-page-section.scss +++ b/frontend/app/src/app/modules/profile/page/profile-page-section.scss @@ -12,6 +12,8 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ +@use 'sass:math'; + $width: 108px; simple-swiper { @@ -22,7 +24,7 @@ simple-swiper { @each $i in 7, 6, 5, 4, 3, 2, 1 { $max: #{($width + 8px) * $i}; @container (inline-size < #{$max}) { - --swiper-slide-width: #{100cqi / $i}; + --swiper-slide-width: #{math.div(100cqi, $i)}; } } } @@ -50,6 +52,7 @@ ion-item { justify-content: center; align-items: center; font-size: var(--font-size-sm); + padding: 0 var(--spacing-xs) 0 var(--spacing-xs); } &::part(native) { diff --git a/frontend/app/src/app/modules/profile/page/profile-page.component.ts b/frontend/app/src/app/modules/profile/page/profile-page.component.ts index 62aa913e..c876d7b6 100644 --- a/frontend/app/src/app/modules/profile/page/profile-page.component.ts +++ b/frontend/app/src/app/modules/profile/page/profile-page.component.ts @@ -21,7 +21,7 @@ import {ActivatedRoute} from '@angular/router'; import {ScheduleProvider} from '../../calendar/schedule.provider'; import moment from 'moment'; import {SCIcon} from '../../../util/ion-icon/icon'; -import {profilePageSections} from './sections'; +import {profilePageSections} from '../../../../config/profile-page-sections'; import {filter, map} from 'rxjs/operators'; const CourseCard = { diff --git a/frontend/app/src/app/modules/profile/page/profile-page.html b/frontend/app/src/app/modules/profile/page/profile-page.html index a52c2550..a9dd7227 100644 --- a/frontend/app/src/app/modules/profile/page/profile-page.html +++ b/frontend/app/src/app/modules/profile/page/profile-page.html @@ -22,101 +22,97 @@ - -
-
- - - - - {{ - userInfo.role ? (userInfo?.role | titlecase) : ('profile.role_guest' | translate | titlecase) - }} - - - - - - - - - - - {{ userInfo?.name }} + +
+ + + + + {{ userInfo.role ? (userInfo?.role | titlecase) : ('profile.role_guest' | translate | titlecase) }} + + + + + + + + + + + {{ userInfo?.name }} + +
+ + {{ 'profile.userInfo.studentId' | translate | uppercase }} + + + {{ userInfo?.studentId }} -
- - {{ 'profile.userInfo.studentId' | translate | uppercase }} - - - {{ userInfo?.studentId }} - -
-
- - {{ 'profile.userInfo.username' | translate | uppercase }} - - {{ userInfo?.id }} -
- - +
+
+ + {{ 'profile.userInfo.username' | translate | uppercase }} + + {{ userInfo?.id }} +
+ + + + + + - - - - - - - - - -
- -
- - {{ 'profile.titleCourses' | translate | uppercase }} - - - - {{ 'profile.courses.today' | translate | uppercase }} - - - - -
- {{ 'profile.courses.no_courses' | translate }} + + + + + +
+ +
+ + {{ 'profile.titleCourses' | translate | uppercase }} + + + + {{ 'profile.courses.today' | translate | uppercase }} + + + + +
+ {{ 'profile.courses.no_courses' | translate }} +
+ + +
+
{{ myCourse?.startTime }} - {{ myCourse?.endTime }}
+
{{ myCourse?.course.event?.originalCategory }}
+
+ {{ myCourse.course?.event?.name }}
- - -
-
{{ myCourse?.startTime }} - {{ myCourse?.endTime }}
-
{{ myCourse?.course.event?.originalCategory }}
-
- {{ myCourse.course?.event?.name }} -
-
- {{ myCourse.course?.inPlace.name }} -
+
+ {{ myCourse.course?.inPlace.name }}
- - - -
-
+
+ + + + diff --git a/frontend/app/src/app/modules/profile/page/profile-page.scss b/frontend/app/src/app/modules/profile/page/profile-page.scss index ff2ecdce..05052972 100644 --- a/frontend/app/src/app/modules/profile/page/profile-page.scss +++ b/frontend/app/src/app/modules/profile/page/profile-page.scss @@ -12,15 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -@import 'src/theme/common/ion-content-parallax'; - :host { - ion-content { - --background: var(--ion-color-light); - - @include ion-content-parallax($content-size: 130px); - } - section { margin-bottom: calc(2 * var(--spacing-lg) - var(--spacing-md)); padding: var(--spacing-md); @@ -159,14 +151,14 @@ max-width: 800px; ion-card-header { - background-color: var(--ion-color-light-contrast); + background-color: var(--ion-item-background); border-radius: var(--border-radius-default) var(--border-radius-default) 0 0; display: flex; justify-content: space-between; align-items: center; span { - color: var(--ion-color-light); + color: var(--ion-item-background-color-contrast); font-size: var(--font-size-lg); font-weight: var(--font-weight-bold); } @@ -179,7 +171,7 @@ ion-card-content { margin: 0; padding: 0; - background-color: var(--ion-color-primary-contrast); + background-color: var(--ion-item-background); border-radius: var(--border-radius-default); max-height: 0; overflow: hidden; @@ -196,7 +188,7 @@ div { font-size: var(--font-size-md); font-weight: var(--font-weight-black); - color: var(--ion-color-light-contrast); + color: var(--ion-item-background-color-contrast); text-align: center; &.no-course { diff --git a/frontend/app/src/app/modules/schedule/page/choose-events-page.component.ts b/frontend/app/src/app/modules/schedule/page/choose-events-page.component.ts new file mode 100644 index 00000000..be8079dc --- /dev/null +++ b/frontend/app/src/app/modules/schedule/page/choose-events-page.component.ts @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +import {Component} from '@angular/core'; +import {SCSearchFilter, SCThingType} from '@openstapps/core'; + +@Component({ + selector: 'stapps-choose-events-page', + templateUrl: 'choose-events-page.html', +}) +export class ChooseEventsPageComponent { + forcedFilter: SCSearchFilter = { + arguments: { + field: 'type', + value: SCThingType.AcademicEvent, + }, + type: 'value', + }; +} diff --git a/frontend/app/src/app/modules/schedule/page/choose-events-page.html b/frontend/app/src/app/modules/schedule/page/choose-events-page.html new file mode 100644 index 00000000..55cc1c78 --- /dev/null +++ b/frontend/app/src/app/modules/schedule/page/choose-events-page.html @@ -0,0 +1,23 @@ + + diff --git a/frontend/app/src/app/modules/schedule/page/components/calendar-component.scss b/frontend/app/src/app/modules/schedule/page/components/calendar-component.scss index feb3fcfa..dc7cc4c8 100644 --- a/frontend/app/src/app/modules/schedule/page/components/calendar-component.scss +++ b/frontend/app/src/app/modules/schedule/page/components/calendar-component.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -86,17 +86,17 @@ ion-content { .hours-wrapper { z-index: 100; - background-color: var(--ion-color-primary-contrast); + background-color: var(--ion-background-color); .hour-lines { width: 40px; height: 70px; - border-right: 1px solid var(--ion-color-light); + border-right: 1px solid var(--ion-item-border-color); text-align: center; top: 0; position: absolute; font-weight: var(--font-weight-bold); - background-color: var(--calender-background-color); + background-color: var(--ion-background-color); } } @@ -106,7 +106,7 @@ ion-content { } .date-header { - border-bottom: 1px solid var(--calender-date-line-gray); + border-bottom: 1px solid var(--ion-item-border-color); padding: var(--spacing-sm) auto; height: fit-content; font-weight: var(--font-weight-bold); diff --git a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts index 277f5adb..332d4ca7 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts +++ b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -27,8 +27,8 @@ import {ScheduleEvent} from '../schema/schema'; }) export class ScheduleCardComponent implements OnInit { cardColor = { - isBlack: false, - isBlue: false, + isExercise: false, + isLecture: false, isDefault: false, }; @@ -91,8 +91,8 @@ export class ScheduleCardComponent implements OnInit { this.title = this.scheduleEvent.dateSeries.event.name; this.cardColor = { - isBlack: false, - isBlue: false, + isLecture: false, + isExercise: false, isDefault: false, }; @@ -102,10 +102,10 @@ export class ScheduleCardComponent implements OnInit { : '' ) { case 'lecture': - this.cardColor.isBlue = true; + this.cardColor.isLecture = true; break; case 'exercise': - this.cardColor.isBlack = true; + this.cardColor.isExercise = true; break; default: this.cardColor.isDefault = true; diff --git a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html index 97369540..d5ab3ded 100644 --- a/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html +++ b/frontend/app/src/app/modules/schedule/page/grid/schedule-card.html @@ -1,5 +1,5 @@ - - - + + + - + - - {{ 'settings.resetSettings' | translate }} - - -
+ + {{ 'settings.resetSettings' | translate }} + +
diff --git a/frontend/app/src/app/modules/settings/page/settings-page.scss b/frontend/app/src/app/modules/settings/page/settings-page.scss index bb51ff33..3467c553 100644 --- a/frontend/app/src/app/modules/settings/page/settings-page.scss +++ b/frontend/app/src/app/modules/settings/page/settings-page.scss @@ -49,7 +49,7 @@ display: flex; flex-direction: column; gap: var(--spacing-sm); - background: var(--ion-color-light); + background: var(--ion-item-background); @include border-radius-in-parallax(var(--border-radius-default)); & > * { @@ -62,7 +62,6 @@ @include border-radius-in-parallax(var(--border-radius-default)); overflow: hidden; position: relative; - background-color: var(--ion-color-primary-contrast); margin: 0; & > ion-thumbnail { diff --git a/frontend/app/src/app/util/ion-content-parallax.directive.ts b/frontend/app/src/app/util/ion-content-parallax.directive.ts new file mode 100644 index 00000000..1182e386 --- /dev/null +++ b/frontend/app/src/app/util/ion-content-parallax.directive.ts @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +import {Directive, ElementRef, HostBinding, Input, OnDestroy, OnInit} from '@angular/core'; + +type IonicColor = + | 'danger' + | 'dark' + | 'light' + | 'medium' + | 'primary' + | 'secondary' + | 'success' + | 'tertiary' + | 'warning' + | string; + +/** + * Adds a parallax effect to `` elements + * + * Why is this necessary and why do we need to inject + * elements into a foreign element's shadow DOM just for this? + * + * We previously had used a global style in conjunction with + * adding a child `
`, however, unfortunately Safari 16.4 + * broke 3D transforms where the parent is inside the shadow + * DOM and child elements are outside. + * + * We also have to use `` as ionic relies on the + * `` selector to make iOS animations work. + * + * Which means this is pretty much the only way to solve this + * problem. + * + * This directive, when applied using ``, + * will transform its shadow DOM from + * + * ```html + *
+ *
+ * + *
+ * + * ``` + * + * To + * + * ```html + *
+ *
+ *
+ *
+ * + *
+ *
+ * + * ``` + * + * Which we can then be used through `::part()` to style it from + * a global style sheet. + */ +@Directive({ + selector: 'ion-content[parallax]', +}) +export class IonContentParallaxDirective implements OnInit, OnDestroy { + @HostBinding('style.--parallax-content-size.px') @Input() parallaxSize = 230; + + @Input() set parallaxColor(value: IonicColor) { + this.parallaxBackground = `var(--ion-color-${value})`; + } + + @HostBinding('style.--parallax-background') parallaxBackground?: string; + + private mutationObserver: MutationObserver; + + constructor(private element: ElementRef) {} + + ngOnInit() { + this.mutationObserver = new MutationObserver(() => { + const inner = this.element.nativeElement.shadowRoot.querySelector('.inner-scroll') as + | HTMLDivElement + | undefined; + if (!inner) return; + + // eslint-disable-next-line unicorn/no-array-for-each + inner.childNodes.forEach(node => node.remove()); + + inner.part.add('parallax-scroll'); + const parallaxParentElement = document.createElement('div'); + parallaxParentElement.part.add('parallax-parent'); + const parallaxElement = document.createElement('div'); + parallaxElement.part.add('parallax'); + + inner.append(parallaxParentElement); + parallaxParentElement.append(parallaxElement, document.createElement('slot')); + }); + this.mutationObserver.observe(this.element.nativeElement.shadowRoot, { + childList: true, + }); + } + + ngOnDestroy() { + this.mutationObserver.disconnect(); + } +} diff --git a/frontend/app/src/app/util/ion-icon/icon.component.ts b/frontend/app/src/app/util/ion-icon/icon.component.ts index 4c5a1747..62a0fd02 100644 --- a/frontend/app/src/app/util/ion-icon/icon.component.ts +++ b/frontend/app/src/app/util/ion-icon/icon.component.ts @@ -1,24 +1,25 @@ /* - * Copyright (C) 2022 StApps - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 3. + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ -import {Component, HostBinding, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, HostBinding, Input} from '@angular/core'; @Component({ selector: 'stapps-icon', templateUrl: 'icon.html', styleUrls: ['icon.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, }) export class IconComponent { @HostBinding('style.--size') diff --git a/frontend/app/src/app/util/searchbar-autofocus.directive.ts b/frontend/app/src/app/util/searchbar-autofocus.directive.ts index f896948f..39ddae79 100644 --- a/frontend/app/src/app/util/searchbar-autofocus.directive.ts +++ b/frontend/app/src/app/util/searchbar-autofocus.directive.ts @@ -13,24 +13,24 @@ * this program. If not, see . */ -import {AfterViewInit, Directive, ElementRef} from '@angular/core'; +import {AfterViewInit, Directive, ElementRef, Input} from '@angular/core'; import {IonSearchbar} from '@ionic/angular'; @Directive({ selector: 'ion-searchbar[autofocus]', }) export class SearchbarAutofocusDirective implements AfterViewInit { + @Input() autofocus = true; + constructor(private element: ElementRef) {} ngAfterViewInit() { - const label = `focus`; - console.time(label); + if (!this.autofocus) return; const interval = setInterval(() => { const searchbar = this.element.nativeElement as IonSearchbar; - searchbar.setFocus(); + void searchbar.setFocus(); }); const onFocus = () => { - console.timeEnd(label); clearInterval(interval); this.element.nativeElement.removeEventListener('ionFocus', onFocus); }; diff --git a/frontend/app/src/app/util/section.component.html b/frontend/app/src/app/util/section.component.html index 469f032b..18e62b92 100644 --- a/frontend/app/src/app/util/section.component.html +++ b/frontend/app/src/app/util/section.component.html @@ -25,14 +25,24 @@ - + - + - + diff --git a/frontend/app/src/app/util/section.component.scss b/frontend/app/src/app/util/section.component.scss index 7d31943e..982fc2b6 100644 --- a/frontend/app/src/app/util/section.component.scss +++ b/frontend/app/src/app/util/section.component.scss @@ -55,6 +55,7 @@ ion-col { } :host { + transition: height 250ms ease; display: block; padding: var(--spacing-sm) var(--spacing-md) var(--spacing-sm); --swiper-scroll-padding: var(--spacing-md); diff --git a/frontend/app/src/app/util/section.component.ts b/frontend/app/src/app/util/section.component.ts index b0504acc..ef228d27 100644 --- a/frontend/app/src/app/util/section.component.ts +++ b/frontend/app/src/app/util/section.component.ts @@ -12,8 +12,11 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {AfterContentInit, Component, Input, OnDestroy, ViewContainerRef} from '@angular/core'; +import {AfterContentInit, ChangeDetectionStrategy, Component, Input, ViewContainerRef} from '@angular/core'; import {SCThings} from '@openstapps/core'; +import {fromMutationObserver} from '../_helpers/rxjs/mutation-observer'; +import {mergeMap, ReplaySubject, takeLast} from 'rxjs'; +import {distinctUntilChanged, filter, map, startWith} from 'rxjs/operators'; /** * Shows a horizontal list of action chips @@ -22,50 +25,34 @@ import {SCThings} from '@openstapps/core'; selector: 'stapps-section', templateUrl: 'section.component.html', styleUrls: ['section.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, }) -export class SectionComponent implements AfterContentInit, OnDestroy { +export class SectionComponent implements AfterContentInit { @Input() title = ''; @Input() item?: SCThings; - mutationObserver: MutationObserver; + nativeElement = new ReplaySubject(1); - swiper?: HTMLElement; + swiper = this.nativeElement.pipe( + takeLast(1), + mergeMap(element => + fromMutationObserver(element, { + childList: true, + subtree: true, + }).pipe( + startWith([]), + map(() => element.querySelector('simple-swiper') as HTMLElement), + distinctUntilChanged(), + filter(element => !!element), + ), + ), + ); constructor(readonly viewContainerRef: ViewContainerRef) {} ngAfterContentInit() { - this.mutationObserver = new MutationObserver(() => { - const simpleSwiper = this.viewContainerRef.element.nativeElement.querySelector('simple-swiper'); - if (!simpleSwiper) return; - - this.swiper = simpleSwiper; - }); - this.mutationObserver.observe(this.viewContainerRef.element.nativeElement, { - childList: true, - subtree: true, - }); - } - - slideNext() { - if (this.swiper) { - this.swiper.scrollBy({ - left: this.swiper.offsetWidth, - behavior: 'smooth', - }); - } - } - - slidePrev() { - if (this.swiper) { - this.swiper.scrollBy({ - left: -this.swiper.offsetWidth, - behavior: 'smooth', - }); - } - } - - ngOnDestroy() { - this.mutationObserver.disconnect(); + this.nativeElement.next(this.viewContainerRef.element.nativeElement); + this.nativeElement.complete(); } } diff --git a/frontend/app/src/app/util/section/section-link-card.html b/frontend/app/src/app/util/section/section-link-card.html new file mode 100644 index 00000000..e69de29b diff --git a/frontend/app/src/app/util/section/section-tail-prompt-card.html b/frontend/app/src/app/util/section/section-tail-prompt-card.html new file mode 100644 index 00000000..e69de29b diff --git a/frontend/app/src/app/util/simple-swiper.component.ts b/frontend/app/src/app/util/simple-swiper.component.ts index 640cc1d5..903855bd 100644 --- a/frontend/app/src/app/util/simple-swiper.component.ts +++ b/frontend/app/src/app/util/simple-swiper.component.ts @@ -13,15 +13,29 @@ * this program. If not, see . */ -import {Component, ContentChildren, ElementRef, ViewContainerRef} from '@angular/core'; +<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list.scss +cdk-virtual-scroll-viewport { + height: 100%; + width: 100%; +} + +::ng-deep { + .cdk-virtual-scroll-content-wrapper { + width: 100%; + } +} + +.virtual-scroll-expander { + clear: both; +} +======== +import {ChangeDetectionStrategy, Component} from '@angular/core'; @Component({ selector: 'simple-swiper', templateUrl: 'simple-swiper.html', styleUrls: ['simple-swiper.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, }) -export class SimpleSwiperComponent { - constructor(readonly viewContainerRef: ViewContainerRef) {} - - @ContentChildren('*') children: ElementRef; -} +export class SimpleSwiperComponent {} +>>>>>>>> app/develop:frontend/app/src/app/util/simple-swiper.component.ts diff --git a/frontend/app/src/app/util/simple-swiper.scss b/frontend/app/src/app/util/simple-swiper.scss index 1768aba4..d335b406 100644 --- a/frontend/app/src/app/util/simple-swiper.scss +++ b/frontend/app/src/app/util/simple-swiper.scss @@ -29,7 +29,7 @@ gap: var(--swiper-gap, 0); - &::ng-deep > *:not(ion-button) { + &::ng-deep > * { contain: layout; scroll-snap-align: start; scroll-margin-inline: var(--swiper-scroll-padding, 0); @@ -45,6 +45,10 @@ padding-inline-end: var(--swiper-scroll-padding); width: calc(var(--swiper-slide-width) + var(--swiper-scroll-padding)); } + + &:only-child { + width: calc(var(--swiper-slide-width) + 2 * var(--swiper-scroll-padding)); + } } &::-webkit-scrollbar { diff --git a/frontend/app/src/app/util/util.module.ts b/frontend/app/src/app/util/util.module.ts index c003e269..b36edc67 100644 --- a/frontend/app/src/app/util/util.module.ts +++ b/frontend/app/src/app/util/util.module.ts @@ -30,10 +30,13 @@ import {ThingTranslateModule} from '../translation/thing-translate.module'; import {SimpleSwiperComponent} from './simple-swiper.component'; import {SearchbarAutofocusDirective} from './searchbar-autofocus.directive'; import {SectionComponent} from './section.component'; +import {RouterModule} from '@angular/router'; +import {IonContentParallaxDirective} from './ion-content-parallax.directive'; @NgModule({ - imports: [BrowserModule, IonicModule, TranslateModule, ThingTranslateModule.forChild()], + imports: [BrowserModule, IonicModule, TranslateModule, ThingTranslateModule.forChild(), RouterModule], declarations: [ + IonContentParallaxDirective, ElementSizeChangeDirective, ArrayLastPipe, DateIsThisPipe, @@ -49,6 +52,7 @@ import {SectionComponent} from './section.component'; SearchbarAutofocusDirective, ], exports: [ + IonContentParallaxDirective, ElementSizeChangeDirective, ArrayLastPipe, DateIsThisPipe, diff --git a/frontend/app/src/assets/about/CHANGELOG.md b/frontend/app/src/assets/about/CHANGELOG.md index 74dd33b2..0c7c3f68 100644 --- a/frontend/app/src/assets/about/CHANGELOG.md +++ b/frontend/app/src/assets/about/CHANGELOG.md @@ -1,3 +1,221 @@ +## [2.1.1](https://gitlab.com/openstapps/app/compare/v2.0.1...v2.1.1) (2023-05-10) + +### Bug Fixes + +- autofocus searchbar only when no default data is displayed ([e90286f](https://gitlab.com/openstapps/app/commit/e90286fc6814f5c40af3e297be42f23128b991be)) +- breadcrumbs are under parallax ([9e160e8](https://gitlab.com/openstapps/app/commit/9e160e8d1ee9409e4fbe518c9dd9748705e680e1)) +- browser logout only if endSession url defined ([7f6de94](https://gitlab.com/openstapps/app/commit/7f6de94ab572be66d7f10758c37dcf10af46b4e0)), closes [#395](https://gitlab.com/openstapps/app/issues/395) +- can't select some list elements on safari 16.4 ([3e99d7f](https://gitlab.com/openstapps/app/commit/3e99d7fa8fcae4538e1afe6a017570b0cb6ff45e)) +- canteen view removes item select listener on view exit ([05e996a](https://gitlab.com/openstapps/app/commit/05e996ae9052b11c23dc1093ef526f08e3e2e6b6)) +- catalog module semester selection ([afbd1fc](https://gitlab.com/openstapps/app/commit/afbd1fc048997acbc0113f8957016f8947b58626)) +- catalog semester selection ([a8c7d5a](https://gitlab.com/openstapps/app/commit/a8c7d5ab5934adf853cc40c1df311178df54057e)) +- data detail local favorite fallback causing duplicate nested favorite view ([dff4a95](https://gitlab.com/openstapps/app/commit/dff4a95acc55574b4872b0e4e39555cce0b2fd60)) +- data-detail favorite button color leaking to list items ([95f2da2](https://gitlab.com/openstapps/app/commit/95f2da2def39ec56f40a660a63e5f7fddb4b3d53)) +- location flow on iOS devices ([f207e02](https://gitlab.com/openstapps/app/commit/f207e029f1b30624bf411a57b3c552ef259e13ed)) +- parallax broken since safari 16.4 ([0f970fa](https://gitlab.com/openstapps/app/commit/0f970fa1f164a310e24a85140d8bf0da21e5a5f1)) +- remove infinite scroll e2e test ([47565e5](https://gitlab.com/openstapps/app/commit/47565e51b0dda5c8227238b6dc19f0d277408429)) +- replace breadcrumb popover with simply expanding the breadcrumbs ([1318cbc](https://gitlab.com/openstapps/app/commit/1318cbca7f0cf72e10d96fff1a1116ba073fe8dc)) +- schedule tabs navigating to the wrong url ([abf2ab6](https://gitlab.com/openstapps/app/commit/abf2ab6a5a94941d439adf54ec677332823892db)) +- translate simple pipe doesn't update on language changes ([f5ca150](https://gitlab.com/openstapps/app/commit/f5ca1508fb9d95693615bfb9e03bc127bd83be00)) +- typo in catalog provider query ([f49c44f](https://gitlab.com/openstapps/app/commit/f49c44f5c53780e4794dc1ef4cbacfb20cabbd97)) +- workaround for side menu items not being active on page load ([947cab4](https://gitlab.com/openstapps/app/commit/947cab458ca770f116d28a1f22687ae620e71b59)) + +### Features + +- add content to empty catalogs ([982fb16](https://gitlab.com/openstapps/app/commit/982fb1653b3c1253aac9366733f14c22c94d2537)) +- add easy way to configure search filtering for nested properties ([2220ab2](https://gitlab.com/openstapps/app/commit/2220ab24b385188515da7c176bf9c1ac72651fd9)) +- dark theme ([e75a466](https://gitlab.com/openstapps/app/commit/e75a46633ca3685d6044eb9a8b2fd670f2cd030f)) +- dashboard search rework ([8c30a47](https://gitlab.com/openstapps/app/commit/8c30a47706f07eb222fac47ad7fed61f9044328a)) +- implement custom cdk virtual scroll behavior ([968cb72](https://gitlab.com/openstapps/app/commit/968cb729575c529fd6d1d35da1b50a8689057c46)) +- optional logout from identity provider ([8cd2d77](https://gitlab.com/openstapps/app/commit/8cd2d777ab3a67b1ab24f03aa50a3ff73550c3d2)), closes [#372](https://gitlab.com/openstapps/app/issues/372) +- revamp dashboard mensa section ([33a74d9](https://gitlab.com/openstapps/app/commit/33a74d96ae92137f53a775e90bff99e5f2d41f6a)) +- rework settings page design ([2f1298c](https://gitlab.com/openstapps/app/commit/2f1298c9d7df25d2a16576245ea62c1b6094e507)) +- show in-place in date series modal, resolves [#385](https://gitlab.com/openstapps/app/issues/385) ([22e70ae](https://gitlab.com/openstapps/app/commit/22e70ae92b35578b559e6644dccb8d4bfd06af1e)), closes [#386](https://gitlab.com/openstapps/app/issues/386) [#388](https://gitlab.com/openstapps/app/issues/388) +- transition to full sidebar at xl instead of lg ([cc939f3](https://gitlab.com/openstapps/app/commit/cc939f38873833b7cc0260525a2ecd536f27bfa5)) + +## [2.0.1](https://gitlab.com/openstapps/app/compare/v2.0.0...v2.0.1) (2023-02-13) + +### Bug Fixes + +- assessment segments can become unreadable ([939fb6e](https://gitlab.com/openstapps/app/commit/939fb6ef0f11b40cb71fbe61da90f50b1f75c3f7)) +- login button not easily found ([11d1ac3](https://gitlab.com/openstapps/app/commit/11d1ac3f7ce27c2822ea8f839df3f3dffbd6c020)) +- remove misleading assessment calculations ([aefae33](https://gitlab.com/openstapps/app/commit/aefae33d5c9fa9ee3efe346e45429aca79ae3c48)) +- right-align add event detail chip ([1eee652](https://gitlab.com/openstapps/app/commit/1eee652533c6b8f613ce09df9c3421f89209419a)) + +### Features + +- offline notice ([9b4caf5](https://gitlab.com/openstapps/app/commit/9b4caf526ffb53ec8d8885342323fcc52fd9fc09)) +- separate prettier from eslint ([a88d000](https://gitlab.com/openstapps/app/commit/a88d000ccd6cbdeb5fbb07d209f2491023f9d76c)) + # [2.0.0](https://gitlab.com/openstapps/app/compare/v0.0.1...v2.0.0) (2023-01-11) -### Inital release +### Bug Fixes + +- daia_url missing in environment configs ([863a3ff](https://gitlab.com/openstapps/app/commit/863a3ffd488425e3313ab9b812c4b6d50c68a244)) +- 404 on all surge links ([f1b4930](https://gitlab.com/openstapps/app/commit/f1b4930a3068e73aee20b4c3d71dac551ab60c35)) +- add areaServed to person detail ([488150f](https://gitlab.com/openstapps/app/commit/488150f7f5558c05c1ec8a71afcb9f9a37e68a37)) +- add event popover expanding beyond screen width ([046a95b](https://gitlab.com/openstapps/app/commit/046a95ba1dca3f5ded7e5555d3167f52f95be107)) +- add location info to dates from timetable ([92adb9d](https://gitlab.com/openstapps/app/commit/92adb9dd2db18027dcc327433027e28c81ecbd4b)), closes [#344](https://gitlab.com/openstapps/app/issues/344) +- add missing profile translation ([cdb6ac4](https://gitlab.com/openstapps/app/commit/cdb6ac4084f8704d7f2336387a837b86f78c062b)) +- add nav button to schedule page ([e628f39](https://gitlab.com/openstapps/app/commit/e628f396e22e51da2c9f2489fe89e42ccf474e2b)) +- add openingHours config and catch its errors ([6125d43](https://gitlab.com/openstapps/app/commit/6125d43e8c18f2bf2afda67c0ff72e00d98ab34f)) +- add PKCE parameters for PAIA auth ([f3e83bf](https://gitlab.com/openstapps/app/commit/f3e83bfcc88423f0935a060ccd0bf6198da58351)) +- address late init from ionic components ([0bce9e5](https://gitlab.com/openstapps/app/commit/0bce9e5452fc5d05123756348dc30308de675bfa)) +- adjust code to overcome the breaking changes (ionic 4 to 5) ([f779042](https://gitlab.com/openstapps/app/commit/f7790426cd2da4a6b33e2aa73783943f45b3de02)), closes [#70](https://gitlab.com/openstapps/app/issues/70) +- adjust hebis catalog templates ([83d9a4a](https://gitlab.com/openstapps/app/commit/83d9a4a8b8fe5b8687c72a717b3a2964524006e0)) +- adjust library account user info ([bafabb1](https://gitlab.com/openstapps/app/commit/bafabb1d4ec299e2bea43cd4b8442ef33be2329a)), closes [#331](https://gitlab.com/openstapps/app/issues/331) +- adjust npm docker scripts and typos ([82bb15b](https://gitlab.com/openstapps/app/commit/82bb15b863e2d2e4df20244fda2f2e0d049ff43f)) +- angular1 ng-if leftover ([25434d5](https://gitlab.com/openstapps/app/commit/25434d54e3800fd72a6c5d9188fb11f441d73aa9)) +- assign navigation app name dynamically ([90b9733](https://gitlab.com/openstapps/app/commit/90b97339d3948b0864f634519416fe4a458b459f)) +- background fetch crashing android app ([3316ad9](https://gitlab.com/openstapps/app/commit/3316ad9169ed2b29a2755405589213f824aec9d1)) +- calculating SCDateSeries for next unit view ([82ba5f8](https://gitlab.com/openstapps/app/commit/82ba5f81211fb10cc5fde04991856567c4ac9680)) +- canteen module layout ([b89f5c4](https://gitlab.com/openstapps/app/commit/b89f5c4edd1ed14f7529edc4e4ea54f9d98fda7c)) +- canteen module layout ([6f7c680](https://gitlab.com/openstapps/app/commit/6f7c680ed89f027d863ebc02f5b24895d84f32e4)) +- cards not having rounded corners in safari ([8a04a43](https://gitlab.com/openstapps/app/commit/8a04a439032920ead799f8b7483f29b896797c37)) +- catch error `Setting "language" not provided` ([584878d](https://gitlab.com/openstapps/app/commit/584878d9503b8406b6ee7ec69dde5b8b3c4fd954)) +- CI stage/job setup ([ae429ca](https://gitlab.com/openstapps/app/commit/ae429ca5fb3b5f10cad377d37b251806b3dabf6c)) +- config.get issue by updating ionic ([9386351](https://gitlab.com/openstapps/app/commit/93863510fac32ed5b887011175a4807df3f522b8)) +- **config:** fix catch ConfigFetchError in getValue ([161da63](https://gitlab.com/openstapps/app/commit/161da630ea59f6205ee53dece950972d4f36ada5)), closes [#46](https://gitlab.com/openstapps/app/issues/46) +- correct data path color ([0d755bc](https://gitlab.com/openstapps/app/commit/0d755bcbd3d6fea59a4f7a59981fd28844ff90d5)) +- correct html whitespace handling for icon detection ([9bc3642](https://gitlab.com/openstapps/app/commit/9bc3642990b687dd524470fd26df80351aa85f1e)) +- daia availability ([13cee2d](https://gitlab.com/openstapps/app/commit/13cee2d4261c7301c1c763446ae44dcdd005172d)) +- dashboard next unit structural directive causing animation issues ([c8f6a27](https://gitlab.com/openstapps/app/commit/c8f6a27c571e51bcc0ac0120968e6bc9a20c8dd7)) +- **data:** fix and adjust detail test using translation ([478f49a](https://gitlab.com/openstapps/app/commit/478f49a8744211b3c9458b3dadc791d62a46ae46)), closes [#50](https://gitlab.com/openstapps/app/issues/50) +- **data:** fix template and other consistency issues ([c3bc227](https://gitlab.com/openstapps/app/commit/c3bc227a3ca4a295b2b31bfe7fd34830b33c9f05)) +- detail page when dish of mensa selected ([e5c2270](https://gitlab.com/openstapps/app/commit/e5c227073a183a1c562e17f3fe14a51048d01637)), closes [#140](https://gitlab.com/openstapps/app/issues/140) +- download events should respect selection ([28fbfef](https://gitlab.com/openstapps/app/commit/28fbfef18cc3b457f7020a70157ea7a4fff345d0)) +- enable background fetch on iOS ([a1592f8](https://gitlab.com/openstapps/app/commit/a1592f84cc48f7cae8c55ef806cddbe806034bb5)) +- enable overflow for day labels in schedule ([1195c5f](https://gitlab.com/openstapps/app/commit/1195c5ffc8cea07f1e224d92a7fb25aa5858bf0a)) +- encode URI parameter to proxy URI ([bc13cc5](https://gitlab.com/openstapps/app/commit/bc13cc5e1fe6144fe0a0e53c0748a154844a5c29)), closes [#326](https://gitlab.com/openstapps/app/issues/326) +- extend landing period button not working on android ([0caa69c](https://gitlab.com/openstapps/app/commit/0caa69c28cbb2f962b70a1da13659739c1c6dd3e)), closes [#333](https://gitlab.com/openstapps/app/issues/333) +- failing native http requests with body ([fed4f20](https://gitlab.com/openstapps/app/commit/fed4f20c3cf43221512f3d2b6dd3c3fe7a4cf43a)) +- feedback not allowing valid emails ([cf74c8e](https://gitlab.com/openstapps/app/commit/cf74c8e19f8bd34a31d5af931781e84be2c04dea)), closes [#349](https://gitlab.com/openstapps/app/issues/349) +- fix issues found by ng build for production ([a503811](https://gitlab.com/openstapps/app/commit/a503811c1cfcf909571af766ccd884856aad8ec9)), closes [#48](https://gitlab.com/openstapps/app/issues/48) +- fix various typos ([ad0dae4](https://gitlab.com/openstapps/app/commit/ad0dae46ff04d28551d2ece950d9a4d3442541d2)) +- fixate webdriver to match used chrome version ([24dbb42](https://gitlab.com/openstapps/app/commit/24dbb42b345458b7dbdd17b2759824b3b68cb0e4)) +- generate library online links properly ([9854541](https://gitlab.com/openstapps/app/commit/9854541a0c062c31bce167673586dccc8af81785)), closes [#340](https://gitlab.com/openstapps/app/issues/340) +- handle prices as an optional property ([9e71efc](https://gitlab.com/openstapps/app/commit/9e71efca9f7b1086db26f580192d6b349bdcb964)), closes [#219](https://gitlab.com/openstapps/app/issues/219) +- header logo changing size on ios navigate ([38f0a30](https://gitlab.com/openstapps/app/commit/38f0a300769a5b7cda35af0927c17099f93981b8)) +- ignore null-island location ([d3188f5](https://gitlab.com/openstapps/app/commit/d3188f50905d610097de6c90bc58e6373d30e0dc)), closes [#149](https://gitlab.com/openstapps/app/issues/149) +- item not available in offer template ([7b402d6](https://gitlab.com/openstapps/app/commit/7b402d61c30aed81a5671d778a38c8393a5bc7c8)), closes [#110](https://gitlab.com/openstapps/app/issues/110) +- library account missing ready for pickup ([e504d8c](https://gitlab.com/openstapps/app/commit/e504d8cf6dd1c12fcb8f6a315527337313662385)), closes [#330](https://gitlab.com/openstapps/app/issues/330) +- library fines should load item title only if needed ([cbb949e](https://gitlab.com/openstapps/app/commit/cbb949e3977a5821e6bd1b654dec66a82e4d8c81)), closes [#342](https://gitlab.com/openstapps/app/issues/342) +- links of timetable tabs ([837c69b](https://gitlab.com/openstapps/app/commit/837c69bb21c92a91259051d5680e1073b390fc0e)), closes [#144](https://gitlab.com/openstapps/app/issues/144) +- logged out button not showing on profile ([ebdc14d](https://gitlab.com/openstapps/app/commit/ebdc14d3c398ac7564c077757c564f4e414fe244)), closes [#239](https://gitlab.com/openstapps/app/issues/239) +- make action chips react to changes of their item ([c0d0b1b](https://gitlab.com/openstapps/app/commit/c0d0b1bd9934e8d9e23f47825cae6a5d8ea2f38a)) +- make keyboard dismissable on mobile devices ([b2cc1fd](https://gitlab.com/openstapps/app/commit/b2cc1fd91fc5bd66c994dcbe10771a22d91a1b3e)) +- map search on iOS ([7d449b4](https://gitlab.com/openstapps/app/commit/7d449b43d0d86825f711848110ac6f044084eba0)), closes [#148](https://gitlab.com/openstapps/app/issues/148) +- map widget not loading tiles properly ([09aa7bb](https://gitlab.com/openstapps/app/commit/09aa7bb5c59e8d167fa91c69745f5f80229094d7)), closes [#127](https://gitlab.com/openstapps/app/issues/127) +- missing init (config setup) in default auth service ([f16e539](https://gitlab.com/openstapps/app/commit/f16e5394cce5a8019f4dfe367e5e0a2f0cca4ce2)), closes [#227](https://gitlab.com/openstapps/app/issues/227) +- missing translations ([30d801a](https://gitlab.com/openstapps/app/commit/30d801a3b419b382d40d96dda995bd35e493523d)) +- modals not reacting after several uses ([f39c29f](https://gitlab.com/openstapps/app/commit/f39c29f10bc05ab986b74dfa8a8648df5fb307b4)) +- news module not scrollable on large screens ([44b6a4a](https://gitlab.com/openstapps/app/commit/44b6a4aea008ca6c89f6cb289467429fb3f8c1fa)) +- ngx-translate defaultLanguage not set ([581a5b2](https://gitlab.com/openstapps/app/commit/581a5b2e55ceda99cf7c41200366c3c5e09f1c63)) +- omit sync native calendar when no uuids ([c9720dc](https://gitlab.com/openstapps/app/commit/c9720dc104cce78ae1a422d5efed7b8a58946836)), closes [#177](https://gitlab.com/openstapps/app/issues/177) +- opening hours pipe refreshing too often ([95e1734](https://gitlab.com/openstapps/app/commit/95e1734d26b175d8d1156abb10863155fed89ec0)) +- overhaul auth to avoid issues ([99e8d6c](https://gitlab.com/openstapps/app/commit/99e8d6c9bcbc68b639b035af36bc05de0237b1f9)), closes [#336](https://gitlab.com/openstapps/app/issues/336) +- overview search bar scrolling behind header ([a037090](https://gitlab.com/openstapps/app/commit/a037090eec06e867a703b88a43620a74770287fe)) +- performance degradation when scrolling ([f0a45d1](https://gitlab.com/openstapps/app/commit/f0a45d1b8eb2b33a6c68b94ed7f96f81db3a728b)) +- person list should use long-inline-text ([8b2b853](https://gitlab.com/openstapps/app/commit/8b2b853942ac76904ff49d940dfef625b0397150)) +- prevent multiple heavy setting inits ([f772637](https://gitlab.com/openstapps/app/commit/f7726378f443d9809a6174411d25a811e1d0b5e9)) +- prevent opening invalid links ([fdee2db](https://gitlab.com/openstapps/app/commit/fdee2db8a42b8f6c99c4a72b3104ae0ba1a41c5a)), closes [#328](https://gitlab.com/openstapps/app/issues/328) +- profile module items show click effect on scroll ([8b2f2c0](https://gitlab.com/openstapps/app/commit/8b2f2c063c65278580d9469b00d9e67f01caaffb)) +- recurring schedule offset and event limit ([9c6b513](https://gitlab.com/openstapps/app/commit/9c6b5131cd4cadb2572769d368b346054f19de1c)) +- refresh token not used by default auth provider ([15ccbe4](https://gitlab.com/openstapps/app/commit/15ccbe4c1879417f2fc5849204fa9f6bdcce87fc)), closes [#311](https://gitlab.com/openstapps/app/issues/311) +- remove "extend landing" button when renewal not possible ([f60a228](https://gitlab.com/openstapps/app/commit/f60a22839200019a38586a14a0cce32e2c0029e7)), closes [#338](https://gitlab.com/openstapps/app/issues/338) +- remove item before adding it to secure storage ([ec511fb](https://gitlab.com/openstapps/app/commit/ec511fb8f40219e2559b08c62bd915d773d2a36f)) +- schedule navigation bar layout ([e7d5f83](https://gitlab.com/openstapps/app/commit/e7d5f83100f43564b55249909a6658e583e3a9b2)) +- set android status bar color correctly ([b38a969](https://gitlab.com/openstapps/app/commit/b38a96996a10e4e43ff1b06ecd2235a0e3bdfa1c)) +- setting of default language ([ccf8b1a](https://gitlab.com/openstapps/app/commit/ccf8b1a5cc9fe834ba3e04a1ed67b2d082004403)) +- show nothing for empty array properties ([1c56c89](https://gitlab.com/openstapps/app/commit/1c56c891e15b034826b5d6b2b35141fc872c922d)), closes [#154](https://gitlab.com/openstapps/app/issues/154) +- single map place width ([88684f0](https://gitlab.com/openstapps/app/commit/88684f068ab130f43e520c87f1d7383e0ae43944)), closes [#147](https://gitlab.com/openstapps/app/issues/147) +- some android devices don't support implied css animation units ([54cc883](https://gitlab.com/openstapps/app/commit/54cc8838aefe8f8c2d25d9228a136ef727a08230)) +- status bar being black on Android 13 devices ([feee9e8](https://gitlab.com/openstapps/app/commit/feee9e8db90e66cf2346f7c5cc24f075eb70676c)) +- suppress router event logs in console ([28caaf1](https://gitlab.com/openstapps/app/commit/28caaf1d21f7961b678cf339a712abf860ade5e7)), closes [#207](https://gitlab.com/openstapps/app/issues/207) +- swap missing icon after ionic update ([643b6c9](https://gitlab.com/openstapps/app/commit/643b6c967f3268cb305a24d614c3bc91275b0ac3)) +- temporary disable flaky ui test ([6b9b1fa](https://gitlab.com/openstapps/app/commit/6b9b1fa8548d5c5fca04b2c1d63e893de39278a2)) +- timetable dates cannot be removed ([9242438](https://gitlab.com/openstapps/app/commit/924243813207fa791d3c4938f8653a999b6382ff)) +- translate back button title ([b8db0f3](https://gitlab.com/openstapps/app/commit/b8db0f3e70a46f2b493e183a244cb29d1954c257)) +- translations ([5e1a902](https://gitlab.com/openstapps/app/commit/5e1a902d4c0d2345f21500fba5394c1907e04eb8)) +- typo in translation ([7928534](https://gitlab.com/openstapps/app/commit/7928534d88a26db28b098bbceb47bc1103022a57)) +- update core and apply stricter tslint rules ([911492d](https://gitlab.com/openstapps/app/commit/911492d064ff0280dd6626244cd8038cbfc0f408)) +- use HashLocationStrategy for routes ([9d68212](https://gitlab.com/openstapps/app/commit/9d682125db55c87cab2b33c7633bfa133d2fc5a9)), closes [#54](https://gitlab.com/openstapps/app/issues/54) +- use localized date and time ([6ca0b97](https://gitlab.com/openstapps/app/commit/6ca0b9763761c5204a757a243056a087c5f35fd9)) +- use stapps core version to compare with backends' core version ([66b8720](https://gitlab.com/openstapps/app/commit/66b8720da0f264824a396f2d9e598b0e48c8e3d1)), closes [#77](https://gitlab.com/openstapps/app/issues/77) +- user info card ([998edcb](https://gitlab.com/openstapps/app/commit/998edcb5cdfb588c2986f466f4a2951f172a8bb4)), closes [#305](https://gitlab.com/openstapps/app/issues/305) + +### Features + +- add "no results" screen to search ([c75ca68](https://gitlab.com/openstapps/app/commit/c75ca68c440a20e197213ecbb47d05fc293afd9c)) +- add about module ([d420008](https://gitlab.com/openstapps/app/commit/d42000892694f4a3b29fa623c43fb45f8ba54687)) +- add action chips to search results ([67fb4a4](https://gitlab.com/openstapps/app/commit/67fb4a43c95043caba50d43ace2ab276f3319b81)) +- add auth support (default and paia) ([b5f239e](https://gitlab.com/openstapps/app/commit/b5f239ea4edebd0d27b1cdaad4a830998ce2f681)) +- add backend toggle ([c1d3330](https://gitlab.com/openstapps/app/commit/c1d33303aa11da3b3e150c6717d77ef484a16ac1)) +- add basic templates for data list items ([3e697b1](https://gitlab.com/openstapps/app/commit/3e697b17b4448c15781d0f6dd55577b638e9d974)) +- add catalog module ([03084b1](https://gitlab.com/openstapps/app/commit/03084b1c966de98b3723d0bee2b2475589393c59)) +- add ConfigModule and FakeBackendInterceptor ([406f400](https://gitlab.com/openstapps/app/commit/406f40055567bfde4ec5edf26cff942411bd073e)), closes [#34](https://gitlab.com/openstapps/app/issues/34) [#37](https://gitlab.com/openstapps/app/issues/37) +- add detail view for news ([2566a71](https://gitlab.com/openstapps/app/commit/2566a71a81a3408dbb16b97d3a453d95e25d1f00)) +- add duration pipe with frequency capabilites ([49a1758](https://gitlab.com/openstapps/app/commit/49a1758da358958ffe590700c19aaf90ec748ee5)) +- add favorites support ([e9452d6](https://gitlab.com/openstapps/app/commit/e9452d6520c34f6513623c16e291dc23d6ea9757)) +- add feedback module ([867f9e9](https://gitlab.com/openstapps/app/commit/867f9e9b832e3bd54c04801fef63a11543e8f3dd)) +- add filter chips for news ([5435f85](https://gitlab.com/openstapps/app/commit/5435f85cc43dc3baa774a5008d2920ac7b3783f6)) +- add formatting pipes basted on Intl ([4b932af](https://gitlab.com/openstapps/app/commit/4b932af1c07e1af4369414667a987d31181c073c)) +- add HeBIS HDS search ([9a3241c](https://gitlab.com/openstapps/app/commit/9a3241c42ab59e15c0084178f76dc4a2450a2bb8)) +- add library account screens ([080e6fa](https://gitlab.com/openstapps/app/commit/080e6fa3e8c18e9608d7fa2efc95e4fd65c43a15)) +- add library action confirmations ([42b860e](https://gitlab.com/openstapps/app/commit/42b860e41793fc3983a39237a4f7128416485fae)), closes [#334](https://gitlab.com/openstapps/app/issues/334) +- add logger ([a0c798f](https://gitlab.com/openstapps/app/commit/a0c798f765d87c5eebcbed65b70f3b05f285d0ce)) +- add map module ([c1c9a92](https://gitlab.com/openstapps/app/commit/c1c9a92ec900403218b887fdebfe5132b232e1e0)) +- add new font and new icons ([915fd72](https://gitlab.com/openstapps/app/commit/915fd72bd4bfed16e15fcc3c57879db0ec0379e2)) +- add not found screen ([e3d9ef4](https://gitlab.com/openstapps/app/commit/e3d9ef40ccd626c81c67ea2d790eecbe6e025780)) +- add permission check for geoLocation setting ([d5fa2fd](https://gitlab.com/openstapps/app/commit/d5fa2fd9a578d48cd2513eeb1380f1d2bc4d3754)) +- add service and pipe for core translator ([4565600](https://gitlab.com/openstapps/app/commit/456560026cc9550a10a9f42657d942122be34d53)) +- apply new layout overhaul ([7bbdba5](https://gitlab.com/openstapps/app/commit/7bbdba5c0b886e2789d2a603c4be627dfd16b60e)) +- assessment tree view ([0b037f9](https://gitlab.com/openstapps/app/commit/0b037f96e634b412fbaaee24747df08afdc0e565)) +- assessments module ([e68d1b7](https://gitlab.com/openstapps/app/commit/e68d1b73f94b36abcefe9b2bf42e98de00b69188)) +- calendar plugin ([a57c302](https://gitlab.com/openstapps/app/commit/a57c3029df61ac3157c856744380a85dc001abc6)) +- dashboard ui tests ([9f8ab5c](https://gitlab.com/openstapps/app/commit/9f8ab5c7a15a918f7bd05423f0a43f22a33d9228)) +- **data:** add basic methods of data provider ([ffe05e4](https://gitlab.com/openstapps/app/commit/ffe05e4548fc399183ef651047cb02a3cdc80c67)), closes [#1](https://gitlab.com/openstapps/app/issues/1) +- **data:** add data detail templates ([5855acc](https://gitlab.com/openstapps/app/commit/5855accc169579d87f5779fd602d4f00f2b479a1)) +- **data:** add method that checks if data item has been saved ([017fc67](https://gitlab.com/openstapps/app/commit/017fc67765bdb75542045830fb85f8eb4b899485)) +- **data:** implement basic facets handling ([b6f92a7](https://gitlab.com/openstapps/app/commit/b6f92a74494e1a39d5c828d593eb70c7002bb0f6)), closes [#1](https://gitlab.com/openstapps/app/issues/1) +- **data:** show skeleton screens before data is loaded ([e1039aa](https://gitlab.com/openstapps/app/commit/e1039aa2260a0e9d8ccca5a18ded480bf2f12530)), closes [#4](https://gitlab.com/openstapps/app/issues/4) +- **data:** use data provider for list and detail view ([7caaa18](https://gitlab.com/openstapps/app/commit/7caaa18b7eb94ed8e4ff4e54d760ba1dba3ae3be)) +- **data:** use general template for all offers ([58960a2](https://gitlab.com/openstapps/app/commit/58960a29ea0cd73f26a43186b41f5b53864810e0)) +- display availability and item data for library items ([d571b1d](https://gitlab.com/openstapps/app/commit/d571b1dbe59f8e2270d88dd050b94283bf0a7056)) +- dynamic news page rows ([848d257](https://gitlab.com/openstapps/app/commit/848d2574c7046d6f84b91e32aa83ca57fca8ad2e)) +- expandable accordion in grades module ([3f81afd](https://gitlab.com/openstapps/app/commit/3f81afda82cf87bb393fbb3b71d27eee77ae42d9)) +- get tab navigation items from config ([c3130a3](https://gitlab.com/openstapps/app/commit/c3130a392a53c9ec3657e24a53ed0b3333ba162b)) +- Implement variable for styling ([8ecf347](https://gitlab.com/openstapps/app/commit/8ecf347c9a8abac9347dca45e99ebe35eca8f252)) +- include font licenses in the licenses section ([82479f4](https://gitlab.com/openstapps/app/commit/82479f463cbee834507a0c8faf895a729631eb06)) +- Ionic v6 breadcrumbs in catalog module ([7b491ed](https://gitlab.com/openstapps/app/commit/7b491ed3bb5466a845493bd8ea0bbb836a4f03d2)) +- lazy load all news ([e48134e](https://gitlab.com/openstapps/app/commit/e48134eddcd1ca4d5ec5dbf910571e33a3311ba1)) +- **menu:** add context menu ([1dbf451](https://gitlab.com/openstapps/app/commit/1dbf4515fe57cc8250a7fa2213ced682e3e5e0fc)), closes [#3](https://gitlab.com/openstapps/app/issues/3) +- navigation rail ([6b08af6](https://gitlab.com/openstapps/app/commit/6b08af6a746bf12005d3297ec97c130e84477615)) +- news module ([22cd0af](https://gitlab.com/openstapps/app/commit/22cd0af1bf92a4576316f5510c22f012e085a237)) +- profile page sections ([e395e9d](https://gitlab.com/openstapps/app/commit/e395e9d270f41bd4f6e5ecd88e438a28dde92465)), closes [#233](https://gitlab.com/openstapps/app/issues/233) [#261](https://gitlab.com/openstapps/app/issues/261) [#267](https://gitlab.com/openstapps/app/issues/267) +- refresh on pull for news module ([1f3d9ad](https://gitlab.com/openstapps/app/commit/1f3d9ad5f0c0557add2dcf242cf0b7dd7685bb1b)) +- resume at origin path after login ([a5e5a5b](https://gitlab.com/openstapps/app/commit/a5e5a5b40799e7505557f7ebd764b9c563be0f4b)), closes [#168](https://gitlab.com/openstapps/app/issues/168) +- schedule layout ([e416590](https://gitlab.com/openstapps/app/commit/e4165901bb5efa6b38e397cdf5d66138e396d7f2)) +- scroll schedule cursor into view ([bc4c3d7](https://gitlab.com/openstapps/app/commit/bc4c3d78dbd906243dcddac4db9ac8ccaca79056)) +- search url query param handling ([f349bd7](https://gitlab.com/openstapps/app/commit/f349bd72335c47d292d0a007b1a4ce7f5c694a61)) +- seperate dishes by menu sections ([400c6b8](https://gitlab.com/openstapps/app/commit/400c6b8d8c5300035862186096e38883f781d297)) +- show availability in offers ([5fdef95](https://gitlab.com/openstapps/app/commit/5fdef95c065e7b467a13045adbb56a641cb2dc12)) +- show feedback when map search yields no results ([c54ea86](https://gitlab.com/openstapps/app/commit/c54ea867bd64af187446dbf8dc03967aae600961)) +- show menu for multiple days for canteens and cafes ([3c079cd](https://gitlab.com/openstapps/app/commit/3c079cd189e3b75d3b203bd46ab57378f99e88cc)), closes [#19](https://gitlab.com/openstapps/app/issues/19) [#79](https://gitlab.com/openstapps/app/issues/79) +- **storage:** add search using regex ([86b9bff](https://gitlab.com/openstapps/app/commit/86b9bff09a51b17151efa5ec322cddcc50a54cb2)) +- **storage:** support deletion of multiple entries ([63266f5](https://gitlab.com/openstapps/app/commit/63266f588f6ddb2476e2cea4bab42a3864f77470)) +- **storage:** support search using a string ([4334cad](https://gitlab.com/openstapps/app/commit/4334cad68c7d0abb7443e245b6eb983804547925)) +- support deep links ([2e3f668](https://gitlab.com/openstapps/app/commit/2e3f6684ef5fbac8e4fb127c536b2b438399ce37)) +- support overlapping timetable dates ([93c37b2](https://gitlab.com/openstapps/app/commit/93c37b26cca7764dea66fb12c0e53acc8fd78d2b)) +- tab navigation bar animations and state ([7ecba0b](https://gitlab.com/openstapps/app/commit/7ecba0b7819ae5a7ab32d86f6049de0ab6c68e55)) +- timetable module - schedule and calendar ([d8ede00](https://gitlab.com/openstapps/app/commit/d8ede006dfbd613dfbc752eb6de80db2e7e84531)) +- turn on oauth2 state check for PAIA ([5bd0b50](https://gitlab.com/openstapps/app/commit/5bd0b50816973548a0a4aa5dbed3f2d0902590dd)), closes [#172](https://gitlab.com/openstapps/app/issues/172) +- use http interceptor for backendless development ([2558163](https://gitlab.com/openstapps/app/commit/2558163ad6c3038445a79e6338f1827cb1e6510e)), closes [#37](https://gitlab.com/openstapps/app/issues/37) +- use school-neutral news image fallback via css ([bb94c71](https://gitlab.com/openstapps/app/commit/bb94c71761ca5d3bf6639476ba0c143678cfabbd)) +- webpack bundle analyzer ([552911c](https://gitlab.com/openstapps/app/commit/552911cfcfecec8d9be8b8bbb155b597d1f70fa2)) + +## [0.0.1](https://gitlab.com/openstapps/app/compare/8b23159e678773b08252bc5826510de2a302fa1d...v0.0.1) (2018-12-11) + +### Features + +- add the app ([8b23159](https://gitlab.com/openstapps/app/commit/8b23159e678773b08252bc5826510de2a302fa1d)) diff --git a/frontend/app/src/assets/about/licenses.json b/frontend/app/src/assets/about/licenses.json index 0a72a29a..294414e2 100644 --- a/frontend/app/src/assets/about/licenses.json +++ b/frontend/app/src/assets/about/licenses.json @@ -1,55 +1,55 @@ [ { "licenseText": "Angular\n=======\n\nThe sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.\n\nUsage information and reference details can be found in [Angular documentation](https://angular.io/docs).\n\nLicense: MIT\n", - "name": "@angular/animations@13.3.10", + "name": "@angular/animations@13.3.11", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "angular" }, { "licenseText": "The MIT License\n\nCopyright (c) 2022 Google LLC.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", - "name": "@angular/cdk@13.3.8", + "name": "@angular/cdk@13.3.9", "licenses": "MIT", "repository": "https://github.com/angular/components" }, { "licenseText": "Angular\n=======\n\nThe sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.\n\nUsage information and reference details can be found in [Angular documentation](https://angular.io/docs).\n\nLicense: MIT\n", - "name": "@angular/common@13.3.10", + "name": "@angular/common@13.3.11", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "angular" }, { "licenseText": "Angular\n=======\n\nThe sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.\n\nUsage information and reference details can be found in [Angular documentation](https://angular.io/docs).\n\nLicense: MIT\n", - "name": "@angular/core@13.3.10", + "name": "@angular/core@13.3.11", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "angular" }, { "licenseText": "Angular\n=======\n\nThe sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.\n\nUsage information and reference details can be found in [Angular documentation](https://angular.io/docs).\n\nLicense: MIT\n", - "name": "@angular/forms@13.3.10", + "name": "@angular/forms@13.3.11", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "angular" }, { "licenseText": "Angular\n=======\n\nThe sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.\n\nUsage information and reference details can be found in [Angular documentation](https://angular.io/docs).\n\nLicense: MIT\n", - "name": "@angular/platform-browser-dynamic@13.3.10", + "name": "@angular/platform-browser-dynamic@13.3.11", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "angular" }, { "licenseText": "Angular\n=======\n\nThe sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.\n\nUsage information and reference details can be found in [Angular documentation](https://angular.io/docs).\n\nLicense: MIT\n", - "name": "@angular/platform-browser@13.3.10", + "name": "@angular/platform-browser@13.3.11", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "angular" }, { "licenseText": "Angular\n=======\n\nThe sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.\n\nUsage information and reference details can be found in [Angular documentation](https://angular.io/docs).\n\nLicense: MIT\n", - "name": "@angular/router@13.3.10", + "name": "@angular/router@13.3.11", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "angular" @@ -69,28 +69,20 @@ "publisher": "Asymmetrik, Ltd." }, { - "name": "@awesome-cordova-plugins/calendar@5.43.0", + "name": "@awesome-cordova-plugins/calendar@5.45.0", "licenses": "MIT", "repository": "https://github.com/danielsogl/awesome-cordova-plugins", "publisher": "ionic" }, { - "name": "@awesome-cordova-plugins/core@5.43.0", + "name": "@awesome-cordova-plugins/core@5.45.0", "licenses": "MIT", "repository": "https://github.com/danielsogl/awesome-cordova-plugins", "publisher": "ionic" }, - { - "licenseText": "MIT License\n\nCopyright (c) 2020 Drifty Co.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n", - "name": "@capacitor-community/http@1.4.1", - "licenses": "MIT", - "repository": "https://github.com/capacitor-community/http", - "publisher": "Max Lynch", - "email": "max@ionic.io" - }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/app@1.1.1", + "name": "@capacitor/app@4.1.1", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -98,15 +90,15 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.", - "name": "@capacitor/browser@1.0.7", + "name": "@capacitor/browser@4.1.0", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", "email": "hi@ionicframework.com" }, { - "licenseText": "Copyright 2017-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/core@3.5.1", + "licenseText": "MIT License\n\nCopyright (c) 2017-present Drifty Co.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n", + "name": "@capacitor/core@4.6.1", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor", "publisher": "Ionic Team", @@ -115,7 +107,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/device@1.1.2", + "name": "@capacitor/device@4.1.0", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -123,7 +115,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.", - "name": "@capacitor/dialog@1.0.7", + "name": "@capacitor/dialog@4.1.0", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -131,7 +123,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/filesystem@1.1.0", + "name": "@capacitor/filesystem@4.1.4", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -139,7 +131,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/geolocation@1.3.1", + "name": "@capacitor/geolocation@4.1.0", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -147,7 +139,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/haptics@1.1.4", + "name": "@capacitor/haptics@4.1.0", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -155,7 +147,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/keyboard@1.2.2", + "name": "@capacitor/keyboard@4.1.0", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -163,7 +155,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/local-notifications@1.1.0", + "name": "@capacitor/local-notifications@4.1.4", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -171,7 +163,15 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/network@1.0.7", + "name": "@capacitor/network@4.1.0", + "licenses": "MIT", + "repository": "https://github.com/ionic-team/capacitor-plugins", + "publisher": "Ionic", + "email": "hi@ionicframework.com" + }, + { + "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", + "name": "@capacitor/preferences@4.0.2", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -179,7 +179,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.", - "name": "@capacitor/share@1.1.2", + "name": "@capacitor/share@4.1.0", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -187,7 +187,7 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/splash-screen@1.2.2", + "name": "@capacitor/splash-screen@4.1.2", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", @@ -195,19 +195,18 @@ }, { "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/status-bar@1.0.8", + "name": "@capacitor/status-bar@4.1.1", "licenses": "MIT", "repository": "https://github.com/ionic-team/capacitor-plugins", "publisher": "Ionic", "email": "hi@ionicframework.com" }, { - "licenseText": "Copyright 2020-present Ionic\nhttps://ionic.io\n\nMIT License\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\nLIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\nOF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\nWITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "@capacitor/storage@1.2.5", + "licenseText": "MIT License\r\n\r\nCopyright (c) 2021 Hugo Tomazi\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a copy\r\nof this software and associated documentation files (the \"Software\"), to deal\r\nin the Software without restriction, including without limitation the rights\r\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r\ncopies of the Software, and to permit persons to whom the Software is\r\nfurnished to do so, subject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included in all\r\ncopies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r\nSOFTWARE.\r\n", + "name": "@hugotomazi/capacitor-navigation-bar@2.0.0", "licenses": "MIT", - "repository": "https://github.com/ionic-team/capacitor-plugins", - "publisher": "Ionic", - "email": "hi@ionicframework.com" + "repository": "https://github.com/hugotomazi/navigation-bar", + "publisher": "hugotomazi" }, { "name": "@ionic-native/core@5.36.0", @@ -215,16 +214,9 @@ "repository": "https://github.com/ionic-team/ionic-native", "publisher": "ionic" }, - { - "licenseText": "\n Improve this doc\n\n\n# File Opener\n\n```\n$ ionic cordova plugin add cordova-plugin-file-opener2\n$ npm install @ionic-native/file-opener\n```\n\n## [Usage Documentation](https://ionicframework.com/docs/native/file-opener/)\n\nPlugin Repo: [https://github.com/pwlin/cordova-plugin-file-opener2](https://github.com/pwlin/cordova-plugin-file-opener2)\n\nThis plugin will open a file on your device file system with its default application.\n\n## Supported platforms\n\n- Android\n - iOS\n - Windows\n - Windows Phone 8\n \n\n\n", - "name": "@ionic-native/file-opener@5.36.0", - "licenses": "MIT", - "repository": "https://github.com/ionic-team/ionic-native", - "publisher": "ionic" - }, { "licenseText": "# @ionic/angular\n\nIonic Angular specific building blocks on top of [@ionic/core](https://www.npmjs.com/package/@ionic/core) components.\n\n\n## Related\n\n* [Ionic Core Components](https://www.npmjs.com/package/@ionic/core)\n* [Ionic Documentation](https://ionicframework.com/docs/)\n* [Ionic Forum](https://forum.ionicframework.com/)\n* [Ionicons](http://ionicons.com/)\n* [Stencil](https://stenciljs.com/)\n* [Stencil Worldwide Slack](https://stencil-worldwide.herokuapp.com/)\n* [Capacitor](https://capacitor.ionicframework.com/)\n\n\n## License\n\n* [MIT](https://raw.githubusercontent.com/ionic-team/ionic/main/LICENSE)\n\n## Testing ng-add in ionic\n\n1. Pull the latest from `main`\n2. Build ionic/angular: `npm run build`\n3. Run `npm link` from `ionic/angular/dist` directory\n4. Create a blank angular project\n\n```\nng new add-test\n// Say yes to including the router, we need it\ncd add-test\n```\n\n5. To run schematics locally, we need the schematics-cli (once published, this will not be needed)\n\n```\nnpm install @angular-devkit/schematics-cli\n```\n\n6. Link `@ionic/angular`\n\n```\nnpm link @ionic/angular\n```\n\n\n7. Run the local copy of the ng-add schematic\n\n```\n$ npx schematics @ionic/angular:ng-add\n```\n\n\nYou'll now be able to add ionic components to a vanilla Angular app setup.\n", - "name": "@ionic/angular@6.1.7", + "name": "@ionic/angular@6.3.9", "licenses": "MIT", "repository": "https://github.com/ionic-team/ionic" }, @@ -247,7 +239,7 @@ }, { "licenseText": "GNU GENERAL PUBLIC LICENSE\nVersion 3, 29 June 2007\n\nCopyright © 2007 Free Software Foundation, Inc. \n\nEveryone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\n\nPreamble\n\nThe GNU General Public License is a free, copyleft license for software and other kinds of works.\n\nThe licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.\n\nWhen we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\n\nTo protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.\n\nFor example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\n\nDevelopers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.\n\nFor the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.\n\nSome devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.\n\nFinally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.\n\nThe precise terms and conditions for copying, distribution and modification follow.\n\nTERMS AND CONDITIONS\n\n0. Definitions.\n\"This License\" refers to version 3 of the GNU General Public License.\n\n\"Copyright\" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.\n\n\"The Program\" refers to any copyrightable work licensed under this License. Each licensee is addressed as \"you\". \"Licensees\" and \"recipients\" may be individuals or organizations.\n\nTo \"modify\" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \"modified version\" of the earlier work or a work \"based on\" the earlier work.\n\nA \"covered work\" means either the unmodified Program or a work based on the Program.\n\nTo \"propagate\" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.\n\nTo \"convey\" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.\n\nAn interactive user interface displays \"Appropriate Legal Notices\" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.\n\n1. Source Code.\nThe \"source code\" for a work means the preferred form of the work for making modifications to it. \"Object code\" means any non-source form of a work.\nA \"Standard Interface\" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.\n\nThe \"System Libraries\" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \"Major Component\", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.\n\nThe \"Corresponding Source\" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.\n\nThe Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.\n\nThe Corresponding Source for a work in source code form is that same work.\n\n2. Basic Permissions.\nAll rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.\nYou may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.\n\nConveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.\n\n3. Protecting Users' Legal Rights From Anti-Circumvention Law.\nNo covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.\nWhen you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.\n\n4. Conveying Verbatim Copies.\nYou may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.\nYou may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.\n\n5. Conveying Modified Source Versions.\nYou may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:\na) The work must carry prominent notices stating that you modified it, and giving a relevant date.\nb) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \"keep intact all notices\".\nc) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.\nd) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.\nA compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an \"aggregate\" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.\n\n6. Conveying Non-Source Forms.\nYou may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:\na) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.\nb) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.\nc) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.\nd) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.\ne) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.\nA separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.\n\nA \"User Product\" is either (1) a \"consumer product\", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \"normally used\" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.\n\n\"Installation Information\" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.\n\nIf you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).\n\nThe requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.\n\nCorresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.\n\n7. Additional Terms.\n\"Additional permissions\" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.\nWhen you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.\n\nNotwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:\n\na) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or\nb) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or\nc) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or\nd) Limiting the use for publicity purposes of names of licensors or authors of the material; or\ne) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or\nf) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.\nAll other non-permissive additional terms are considered \"further restrictions\" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.\n\nIf you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.\n\nAdditional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.\n\n8. Termination.\nYou may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).\nHowever, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.\n\nMoreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.\n\nTermination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.\n\n9. Acceptance Not Required for Having Copies.\nYou are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.\n10. Automatic Licensing of Downstream Recipients.\nEach time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.\nAn \"entity transaction\" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.\n\nYou may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.\n\n11. Patents.\nA \"contributor\" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \"contributor version\".\nA contributor's \"essential patent claims\" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \"control\" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.\n\nEach contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.\n\nIn the following three paragraphs, a \"patent license\" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \"grant\" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.\n\nIf you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. \"Knowingly relying\" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.\n\nIf, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.\n\nA patent license is \"discriminatory\" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.\n\nNothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.\n\n12. No Surrender of Others' Freedom.\nIf conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.\n13. Use with the GNU Affero General Public License.\nNotwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.\n14. Revised Versions of this License.\nThe Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\nEach version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \"or any later version\" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.\n\nIf the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.\n\nLater license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.\n\n15. Disclaimer of Warranty.\nTHERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n16. Limitation of Liability.\nIN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\n17. Interpretation of Sections 15 and 16.\nIf the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.\n\nEND OF TERMS AND CONDITIONS\n\nHow to Apply These Terms to Your New Programs\n\nIf you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\n\nTo do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the \"copyright\" line and a pointer to where the full notice is found.\n\n\nCopyright (C) \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\nIf the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:\n\n Copyright (C) \nThis program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\nThis is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an \"about box\".\n\nYou should also get your employer (if you work as a programmer) or school, if any, to sign a \"copyright disclaimer\" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see .\n\nThe GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read .\n", - "name": "@openstapps/api@0.41.1", + "name": "@openstapps/api@1.0.1", "licenses": "GPL-3.0-only", "repository": "git://gitlab.com/openstapps/api", "publisher": "Karl-Philipp Wulfert", @@ -255,7 +247,7 @@ }, { "licenseText": "GNU GENERAL PUBLIC LICENSE\nVersion 3, 29 June 2007\n\nCopyright © 2007 Free Software Foundation, Inc. \n\nEveryone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\n\nPreamble\n\nThe GNU General Public License is a free, copyleft license for software and other kinds of works.\n\nThe licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.\n\nWhen we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\n\nTo protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.\n\nFor example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\n\nDevelopers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.\n\nFor the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.\n\nSome devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.\n\nFinally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.\n\nThe precise terms and conditions for copying, distribution and modification follow.\n\nTERMS AND CONDITIONS\n\n0. Definitions.\n\"This License\" refers to version 3 of the GNU General Public License.\n\n\"Copyright\" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.\n\n\"The Program\" refers to any copyrightable work licensed under this License. Each licensee is addressed as \"you\". \"Licensees\" and \"recipients\" may be individuals or organizations.\n\nTo \"modify\" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \"modified version\" of the earlier work or a work \"based on\" the earlier work.\n\nA \"covered work\" means either the unmodified Program or a work based on the Program.\n\nTo \"propagate\" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.\n\nTo \"convey\" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.\n\nAn interactive user interface displays \"Appropriate Legal Notices\" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.\n\n1. Source Code.\nThe \"source code\" for a work means the preferred form of the work for making modifications to it. \"Object code\" means any non-source form of a work.\nA \"Standard Interface\" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.\n\nThe \"System Libraries\" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \"Major Component\", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.\n\nThe \"Corresponding Source\" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.\n\nThe Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.\n\nThe Corresponding Source for a work in source code form is that same work.\n\n2. Basic Permissions.\nAll rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.\nYou may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.\n\nConveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.\n\n3. Protecting Users' Legal Rights From Anti-Circumvention Law.\nNo covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.\nWhen you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.\n\n4. Conveying Verbatim Copies.\nYou may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.\nYou may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.\n\n5. Conveying Modified Source Versions.\nYou may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:\na) The work must carry prominent notices stating that you modified it, and giving a relevant date.\nb) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \"keep intact all notices\".\nc) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.\nd) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.\nA compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an \"aggregate\" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.\n\n6. Conveying Non-Source Forms.\nYou may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:\na) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.\nb) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.\nc) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.\nd) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.\ne) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.\nA separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.\n\nA \"User Product\" is either (1) a \"consumer product\", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \"normally used\" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.\n\n\"Installation Information\" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.\n\nIf you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).\n\nThe requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.\n\nCorresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.\n\n7. Additional Terms.\n\"Additional permissions\" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.\nWhen you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.\n\nNotwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:\n\na) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or\nb) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or\nc) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or\nd) Limiting the use for publicity purposes of names of licensors or authors of the material; or\ne) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or\nf) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.\nAll other non-permissive additional terms are considered \"further restrictions\" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.\n\nIf you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.\n\nAdditional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.\n\n8. Termination.\nYou may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).\nHowever, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.\n\nMoreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.\n\nTermination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.\n\n9. Acceptance Not Required for Having Copies.\nYou are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.\n10. Automatic Licensing of Downstream Recipients.\nEach time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.\nAn \"entity transaction\" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.\n\nYou may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.\n\n11. Patents.\nA \"contributor\" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \"contributor version\".\nA contributor's \"essential patent claims\" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \"control\" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.\n\nEach contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.\n\nIn the following three paragraphs, a \"patent license\" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \"grant\" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.\n\nIf you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. \"Knowingly relying\" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.\n\nIf, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.\n\nA patent license is \"discriminatory\" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.\n\nNothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.\n\n12. No Surrender of Others' Freedom.\nIf conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.\n13. Use with the GNU Affero General Public License.\nNotwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.\n14. Revised Versions of this License.\nThe Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\nEach version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \"or any later version\" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.\n\nIf the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.\n\nLater license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.\n\n15. Disclaimer of Warranty.\nTHERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n16. Limitation of Liability.\nIN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\n17. Interpretation of Sections 15 and 16.\nIf the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.\n\nEND OF TERMS AND CONDITIONS\n\nHow to Apply These Terms to Your New Programs\n\nIf you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\n\nTo do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the \"copyright\" line and a pointer to where the full notice is found.\n\n\nCopyright (C) \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\nIf the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:\n\n Copyright (C) \nThis program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\nThis is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an \"about box\".\n\nYou should also get your employer (if you work as a programmer) or school, if any, to sign a \"copyright disclaimer\" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see .\n\nThe GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read .\n", - "name": "@openstapps/configuration@0.29.1", + "name": "@openstapps/configuration@0.34.0", "licenses": "GPL-3.0-only", "repository": "git://gitlab.com/openstapps/configuration", "publisher": "Karl-Philipp Wulfert", @@ -263,7 +255,7 @@ }, { "licenseText": "GNU GENERAL PUBLIC LICENSE\nVersion 3, 29 June 2007\n\nCopyright © 2007 Free Software Foundation, Inc. \n\nEveryone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\n\nPreamble\n\nThe GNU General Public License is a free, copyleft license for software and other kinds of works.\n\nThe licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.\n\nWhen we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\n\nTo protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.\n\nFor example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\n\nDevelopers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.\n\nFor the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.\n\nSome devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.\n\nFinally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.\n\nThe precise terms and conditions for copying, distribution and modification follow.\n\nTERMS AND CONDITIONS\n\n0. Definitions.\n\"This License\" refers to version 3 of the GNU General Public License.\n\n\"Copyright\" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.\n\n\"The Program\" refers to any copyrightable work licensed under this License. Each licensee is addressed as \"you\". \"Licensees\" and \"recipients\" may be individuals or organizations.\n\nTo \"modify\" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \"modified version\" of the earlier work or a work \"based on\" the earlier work.\n\nA \"covered work\" means either the unmodified Program or a work based on the Program.\n\nTo \"propagate\" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.\n\nTo \"convey\" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.\n\nAn interactive user interface displays \"Appropriate Legal Notices\" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.\n\n1. Source Code.\nThe \"source code\" for a work means the preferred form of the work for making modifications to it. \"Object code\" means any non-source form of a work.\nA \"Standard Interface\" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.\n\nThe \"System Libraries\" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \"Major Component\", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.\n\nThe \"Corresponding Source\" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.\n\nThe Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.\n\nThe Corresponding Source for a work in source code form is that same work.\n\n2. Basic Permissions.\nAll rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.\nYou may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.\n\nConveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.\n\n3. Protecting Users' Legal Rights From Anti-Circumvention Law.\nNo covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.\nWhen you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.\n\n4. Conveying Verbatim Copies.\nYou may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.\nYou may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.\n\n5. Conveying Modified Source Versions.\nYou may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:\na) The work must carry prominent notices stating that you modified it, and giving a relevant date.\nb) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \"keep intact all notices\".\nc) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.\nd) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.\nA compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an \"aggregate\" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.\n\n6. Conveying Non-Source Forms.\nYou may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:\na) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.\nb) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.\nc) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.\nd) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.\ne) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.\nA separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.\n\nA \"User Product\" is either (1) a \"consumer product\", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \"normally used\" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.\n\n\"Installation Information\" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.\n\nIf you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).\n\nThe requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.\n\nCorresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.\n\n7. Additional Terms.\n\"Additional permissions\" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.\nWhen you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.\n\nNotwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:\n\na) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or\nb) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or\nc) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or\nd) Limiting the use for publicity purposes of names of licensors or authors of the material; or\ne) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or\nf) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.\nAll other non-permissive additional terms are considered \"further restrictions\" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.\n\nIf you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.\n\nAdditional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.\n\n8. Termination.\nYou may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).\nHowever, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.\n\nMoreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.\n\nTermination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.\n\n9. Acceptance Not Required for Having Copies.\nYou are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.\n10. Automatic Licensing of Downstream Recipients.\nEach time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.\nAn \"entity transaction\" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.\n\nYou may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.\n\n11. Patents.\nA \"contributor\" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \"contributor version\".\nA contributor's \"essential patent claims\" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \"control\" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.\n\nEach contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.\n\nIn the following three paragraphs, a \"patent license\" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \"grant\" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.\n\nIf you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. \"Knowingly relying\" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.\n\nIf, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.\n\nA patent license is \"discriminatory\" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.\n\nNothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.\n\n12. No Surrender of Others' Freedom.\nIf conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.\n13. Use with the GNU Affero General Public License.\nNotwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.\n14. Revised Versions of this License.\nThe Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\nEach version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \"or any later version\" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.\n\nIf the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.\n\nLater license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.\n\n15. Disclaimer of Warranty.\nTHERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n16. Limitation of Liability.\nIN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\n17. Interpretation of Sections 15 and 16.\nIf the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.\n\nEND OF TERMS AND CONDITIONS\n\nHow to Apply These Terms to Your New Programs\n\nIf you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\n\nTo do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the \"copyright\" line and a pointer to where the full notice is found.\n\n\nCopyright (C) \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\nIf the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:\n\n Copyright (C) \nThis program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\nThis is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an \"about box\".\n\nYou should also get your employer (if you work as a programmer) or school, if any, to sign a \"copyright disclaimer\" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see .\n\nThe GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read .\n", - "name": "@openstapps/core@0.67.0", + "name": "@openstapps/core@1.0.1", "licenses": "GPL-3.0-only", "repository": "git://gitlab.com/openstapps/core", "publisher": "Karl-Philipp Wulfert", @@ -271,7 +263,7 @@ }, { "licenseText": "# @transistorsoft/capacitor-background-fetch\n\n[![](https://dl.dropboxusercontent.com/s/nm4s5ltlug63vv8/logo-150-print.png?dl=1)](https://www.transistorsoft.com)\n\nBy [**Transistor Software**](http://transistorsoft.com), creators of [**Capacitor Background Geolocation**](http://www.transistorsoft.com/shop/products/capacitor-background-geolocation)\n\n------------------------------------------------------------------------------\n\n*Background Fetch* is a *very* simple plugin which attempts to awaken an app in the background about **every 15 minutes**, providing a short period of background running-time. This plugin will execute your provided `callbackFn` whenever a background-fetch event occurs.\n\nThere is **no way** to increase the rate which a fetch-event occurs and this plugin sets the rate to the most frequent possible — you will **never** receive an event faster than **15 minutes**. The operating-system will automatically throttle the rate the background-fetch events occur based upon usage patterns. Eg: if user hasn't turned on their phone for a long period of time, fetch events will occur less frequently or if an iOS user disables background refresh they may not happen at all.\n\n:new: Background Fetch now provides a [__`scheduleTask`__](#executing-custom-tasks) method for scheduling arbitrary \"one-shot\" or periodic tasks.\n\n### iOS\n- There is **no way** to increase the rate which a fetch-event occurs and this plugin sets the rate to the most frequent possible — you will **never** receive an event faster than **15 minutes**. The operating-system will automatically throttle the rate the background-fetch events occur based upon usage patterns. Eg: if user hasn't turned on their phone for a long period of time, fetch events will occur less frequently.\n- [__`scheduleTask`__](#executing-custom-tasks) seems only to fire when the device is plugged into power.\n- ⚠️ When your app is **terminated**, iOS *no longer fires events* — There is *no such thing* as [__`stopOnTerminate: false`__](https://transistorsoft.github.io/capacitor-background-fetch/interfaces/backgroundfetchconfig.html#stoponterminate) for iOS.\n- iOS can take *days* before Apple's machine-learning algorithm settles in and begins regularly firing events. Do not sit staring at your logs waiting for an event to fire. If your [*simulated events*](#debugging) work, that's all you need to know that everything is correctly configured.\n- If the user doesn't open your *iOS* app for long periods of time, *iOS* will **stop firing events**.\n\n### Android\n- The Android plugin provides a __*Headless*__ mechanism allowing you to continue handling events even after app-termination (see [Receiving Events After App Termination](#receiving-events-after-app-termination-1))\n\n-------------------------------------------------------------\n\n# Contents\n- ### :books: [API Documentation](https://transistorsoft.github.io/capacitor-background-fetch/)\n- ### [Installing the Plugin](#installing-the-plugin)\n- ### [Setup Guides](#setup-guides)\n - [iOS Setup](help/INSTALL-IOS.md)\n - [Android Setup](help/INSTALL-ANDROID.md)\n- ### [Example](#example)\n- ### [Receiving events after app termination](#receiving-events-after-app-termination-1)\n- ### [Debugging](#debugging)\n\n-------------------------------------------------------------\n\n## Installing the plugin\n\n### With `yarn`\n\n```bash\n$ yarn add @transistorsoft/capacitor-background-fetch\n$ npx cap sync\n```\n\n### With `npm`\n```bash\n$ npm install --save @transistorsoft/capacitor-background-fetch\n$ npx cap sync\n```\n\n- Proceed to [Required Setup Guides](#setup-guides)\n\n## Setup Guides\n\n### iOS Setup\n\n- [Required Setup](help/INSTALL-IOS.md)\n\n### Android Setup\n\n- [Required Setup](help/INSTALL-ANDROID.md)\n\n## Example ##\n\n:information_source: This repo contains its own *Example App*. See [`/example`](./example/README.md)\n\n#### Angular Example:\n\n- See API Docs [__`BackgroundFetch.configure`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#configure)\n\n```javascript\nimport { Component } from '@angular/core';\n\nimport {BackgroundFetch} from '@transistorsoft/capacitor-background-fetch';\n\n@Component({\n selector: 'app-home',\n templateUrl: 'home.page.html',\n styleUrls: ['home.page.scss'],\n})\nexport class HomePage {\n constructor() {}\n\n // Initialize in ngAfterContentInit\n // [WARNING] DO NOT use ionViewWillEnter, as that method won't run when app is launched in background.\n ngAfterContentInit() {\n this.initBackgroundFetch();\n }\n\n async initBackgroundFetch() {\n const status = await BackgroundFetch.configure({\n minimumFetchInterval: 15\n }, async (taskId) => {\n console.log('[BackgroundFetch] EVENT:', taskId);\n // Perform your work in an awaited Promise\n const result = await this.performYourWorkHere();\n console.log('[BackgroundFetch] work complete:', result);\n // [REQUIRED] Signal to the OS that your work is complete.\n BackgroundFetch.finish(taskId);\n }, async (taskId) => {\n // The OS has signalled that your remaining background-time has expired.\n // You must immediately complete your work and signal #finish.\n console.log('[BackgroundFetch] TIMEOUT:', taskId);\n // [REQUIRED] Signal to the OS that your work is complete.\n BackgroundFetch.finish(taskId);\n });\n\n // Checking BackgroundFetch status:\n if (status !== BackgroundFetch.STATUS_AVAILABLE) {\n // Uh-oh: we have a problem:\n if (status === BackgroundFetch.STATUS_DENIED) {\n alert('The user explicitly disabled background behavior for this app or for the whole system.');\n } else if (status === BackgroundFetch.STATUS_RESTRICTED) {\n alert('Background updates are unavailable and the user cannot enable them again.')\n }\n }\n }\n\n async performYourWorkHere() {\n return new Promise((resolve, reject) => {\n setTimeout(() => {\n resolve(true);\n }, 5000);\n });\n }\n}\n```\n\n## Receiving Events After App Termination\n\n- Only Android is able to continue receiving events after app termination. See API Docs [__`enableHeadless`__](https://transistorsoft.github.io/capacitor-background-fetch/interfaces/backgroundfetchconfig.html#enableheadless).\n- For iOS, there is __NO SUCH THING__ as [__`stopOnTerminate: false`__](https://transistorsoft.github.io/capacitor-background-fetch/interfaces/backgroundfetchconfig.html#stoponterminate). When an iOS app is terminated, the OS will **no longer fire events**.\n\n## Executing Custom Tasks\n\nIn addition to the default background-fetch task defined by [__`BackgroundFetch.configure`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#configure), you may also execute your own arbitrary \"oneshot\" or periodic tasks (iOS requires additional [Setup Instructions](help/INSTALL-IOS.md#configure-infoplist-new-ios-13)). See API Docs [__`BackgroundFetch.scheduleTask`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#scheduletask). However, all events will be fired into the Callback provided to [__`BackgroundFetch.configure`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#configure).\n\n### ⚠️ iOS:\n- [__`BackgroundFetch.scheduleTask`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#scheduletask) on *iOS* seems only to run when the device is plugged into power.\n- [__`BackgroundFetch.scheduleTask`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#scheduletask) on *iOS* are designed for *low-priority* tasks, such as purging cache files — they tend to be **unreliable for mission-critical tasks**. [__`BackgroundFetch.scheduleTask`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#scheduletask) will *never* run as frequently as you want.\n- The default `fetch` event is much more reliable and fires far more often.\n- [__`BackgroundFetch.scheduleTask`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#scheduletask) on *iOS* stop when the *user* terminates the app. There is no such thing as [__`stopOnTerminate: false`__](https://transistorsoft.github.io/capacitor-background-fetch/interfaces/backgroundfetchconfig.html#stoponterminate) for *iOS*.\n\n```javascript\n// Step 1: Configure BackgroundFetch as usual.\nlet status = await BackgroundFetch.configure({\n minimumFetchInterval: 15\n}, async (taskId) => { // <-- Event callback\n // This is the fetch-event callback.\n console.log(\"[BackgroundFetch] taskId: \", taskId);\n\n // Use a switch statement to route task-handling.\n switch (taskId) {\n case 'com.foo.customtask':\n print(\"Received custom task\");\n break;\n default:\n print(\"Default fetch task\");\n }\n // Finish, providing received taskId.\n BackgroundFetch.finish(taskId);\n}, async (taskId) => { // <-- Task timeout callback\n // This task has exceeded its allowed running-time.\n // You must stop what you're doing and immediately .finish(taskId)\n BackgroundFetch.finish(taskId);\n});\n\n// Step 2: Schedule a custom \"oneshot\" task \"com.foo.customtask\" to execute 5000ms from now.\nBackgroundFetch.scheduleTask({\n taskId: \"com.foo.customtask\",\n forceAlarmManager: true,\n delay: 5000 // <-- milliseconds\n});\n```\n\n\n## Debugging\n\n### iOS Simulated Events\n\n#### :new: `BGTaskScheduler` API for iOS 13+\n\n- :warning: At the time of writing, the new task simulator does not yet work in Simulator; Only real devices. Use [Old BackgroundFetch API](#old-backgroundfetch-api) so simulate events in Simulator.\n- See Apple docs [Starting and Terminating Tasks During Development](https://developer.apple.com/documentation/backgroundtasks/starting_and_terminating_tasks_during_development?language=objc)\n- After running your app in XCode, Click the `[||]` button to initiate a *Breakpoint*.\n- In the console `(lldb)`, paste the following command (**Note:** use cursor up/down keys to cycle through previously run commands):\n```obj-c\ne -l objc -- (void)[[BGTaskScheduler sharedScheduler] _simulateLaunchForTaskWithIdentifier:@\"com.transistorsoft.fetch\"]\n```\n- Click the `[ > ]` button to continue. The task will execute and the Callback function provided to [__`BackgroundFetch.configure`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#configure) will receive the event.\n\n\n![](https://dl.dropboxusercontent.com/s/zr7w3g8ivf71u32/ios-simulate-bgtask-pause.png?dl=1)\n\n![](https://dl.dropboxusercontent.com/s/87c9uctr1ka3s1e/ios-simulate-bgtask-paste.png?dl=1)\n\n![](https://dl.dropboxusercontent.com/s/bsv0avap5c2h7ed/ios-simulate-bgtask-play.png?dl=1)\n\n#### Simulating task-timeout events\n\n- Only the new `BGTaskScheduler` api supports *simulated* task-timeout events. To simulate a task-timeout, your `fetchCallback` must not call [__`BackgroundFetch.finish(taskId)`__](https://transistorsoft.github.io/capacitor-background-fetch/classes/backgroundfetch.html#finish):\n\n```javascript\nconst status = await BackgroundFetch.configure({\n minimumFetchInterval: 15\n}, async (taskId) => { // <-- Event callback.\n // This is the task callback.\n console.log(\"[BackgroundFetch] taskId\", taskId);\n //BackgroundFetch.finish(taskId); // <-- Disable .finish(taskId) when simulating an iOS task timeout\n}, async (taskId) => { // <-- Event timeout callback\n // This task has exceeded its allowed running-time.\n // You must stop what you're doing and immediately .finish(taskId)\n console.log(\"[BackgroundFetch] TIMEOUT taskId:\", taskId);\n BackgroundFetch.finish(taskId);\n});\n```\n\n- Now simulate an iOS task timeout as follows, in the same manner as simulating an event above:\n```obj-c\ne -l objc -- (void)[[BGTaskScheduler sharedScheduler] _simulateExpirationForTaskWithIdentifier:@\"com.transistorsoft.fetch\"]\n```\n\n#### Old `BackgroundFetch` API\n- Simulate background fetch events in XCode using **`Debug->Simulate Background Fetch`**\n- iOS can take some hours or even days to start a consistently scheduling background-fetch events since iOS schedules fetch events based upon the user's patterns of activity. If *Simulate Background Fetch* works, your can be **sure** that everything is working fine. You just need to wait.\n\n### Android Simulated Events\n\n- Observe plugin logs in `$ adb logcat`:\n\n```bash\n$ adb logcat *:S TSBackgroundFetch:V Capacitor/Console:V Capacitor/Plugin:V\n```\n\n- Simulate a background-fetch event on a device (insert *<your.application.id>*) (only works for sdk `21+`:\n```bash\n$ adb shell cmd jobscheduler run -f 999\n```\n- For devices with sdk `<21`, simulate a \"Headless JS\" event with (insert *<your.application.id>*)\n```bash\n$ adb shell am broadcast -a .event.BACKGROUND_FETCH\n\n```\n\n## Licence\n\nThe MIT License\n\nCopyright (c) 2013 Chris Scott, Transistor Software \nhttp://transistorsoft.com\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", - "name": "@transistorsoft/capacitor-background-fetch@0.0.6", + "name": "@transistorsoft/capacitor-background-fetch@1.0.2", "licenses": "MIT", "repository": "https://github.com/transistorsoft/capacitor-background-fetch", "publisher": "Transistor Software", @@ -286,7 +278,7 @@ }, { "licenseText": "MIT License\n\nCopyright (c) 2019 martinkasa\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n", - "name": "capacitor-secure-storage-plugin@0.7.0", + "name": "capacitor-secure-storage-plugin@0.8.1", "licenses": "MIT", "repository": "https://github.com/martinkasa/capacitor-secure-storage-plugin", "publisher": "martinkasa" @@ -300,13 +292,6 @@ "email": "eddyverbruggen@gmail.com", "url": "https://github.com/EddyVerbruggen" }, - { - "licenseText": "The MIT License (MIT)\r\n\r\nCopyright (c) 2013 pwlin - pwlin05@gmail.com\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a copy of\r\nthis software and associated documentation files (the \"Software\"), to deal in\r\nthe Software without restriction, including without limitation the rights to\r\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r\nthe Software, and to permit persons to whom the Software is furnished to do so,\r\nsubject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included in all\r\ncopies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r\n", - "name": "cordova-plugin-file-opener2@3.0.5", - "licenses": "MIT", - "repository": "https://github.com/pwlin/cordova-plugin-file-opener2", - "publisher": "pwlin05@gmail.com" - }, { "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2012 James Halliday, Josh Duff, and other contributors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", "name": "deepmerge@4.2.2", @@ -330,8 +315,8 @@ "publisher": "Casey Cesari" }, { - "licenseText": "MIT License\r\n\r\nCopyright (c) 2019 Wi3land\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a copy\r\nof this software and associated documentation files (the \"Software\"), to deal\r\nin the Software without restriction, including without limitation the rights\r\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r\ncopies of the Software, and to permit persons to whom the Software is\r\nfurnished to do so, subject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included in all\r\ncopies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r\nSOFTWARE.\r\n", - "name": "ionic-appauth@0.8.5", + "licenseText": "MIT License\n\nCopyright (c) 2019 Wi3land\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n", + "name": "ionic-appauth@0.9.0", "licenses": "MIT", "repository": "https://github.com/wi3land/ionic-appauth", "publisher": "wi3land" @@ -351,13 +336,19 @@ }, { "licenseText": "BSD 2-Clause License\r\n\r\nCopyright (c) 2010-2022, Vladimir Agafonkin\r\nCopyright (c) 2010-2011, CloudMade\r\nAll rights reserved.\r\n\r\nRedistribution and use in source and binary forms, with or without\r\nmodification, are permitted provided that the following conditions are met:\r\n\r\n1. Redistributions of source code must retain the above copyright notice, this\r\n list of conditions and the following disclaimer.\r\n\r\n2. Redistributions in binary form must reproduce the above copyright notice,\r\n this list of conditions and the following disclaimer in the documentation\r\n and/or other materials provided with the distribution.\r\n\r\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\r\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\r\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\r\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\r\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\r\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\r\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\r\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r\n", - "name": "leaflet@1.8.0", + "name": "leaflet@1.9.3", "licenses": "BSD-2-Clause", "repository": "https://github.com/Leaflet/Leaflet" }, + { + "licenseText": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n", + "name": "material-symbols@0.4.1", + "licenses": "Apache-2.0", + "repository": "https://github.com/marella/material-symbols" + }, { "licenseText": "Copyright (c) JS Foundation and other contributors\n\nPermission is hereby granted, free of charge, to any person\nobtaining a copy of this software and associated documentation\nfiles (the \"Software\"), to deal in the Software without\nrestriction, including without limitation the rights to use,\ncopy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the\nSoftware is furnished to do so, subject to the following\nconditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\nOF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\nNONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\nHOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nWHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\nOTHER DEALINGS IN THE SOFTWARE.\n", - "name": "moment@2.29.3", + "name": "moment@2.29.4", "licenses": "MIT", "repository": "https://github.com/moment/moment", "publisher": "Iskren Ivov Chernev", @@ -397,7 +388,7 @@ }, { "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright (c) 2015-2018 Google, Inc., Netflix, Inc., Microsoft Corp. and contributors\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n \n", - "name": "rxjs@6.6.7", + "name": "rxjs@7.8.0", "licenses": "Apache-2.0", "repository": "https://github.com/reactivex/rxjs", "publisher": "Ben Lesh", @@ -405,21 +396,21 @@ }, { "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2019 Vladimir Kharlampidi\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n", - "name": "swiper@8.1.6", + "name": "swiper@8.4.5", "licenses": "MIT", "repository": "https://github.com/nolimits4web/Swiper", "publisher": "Vladimir Kharlampidi" }, { "licenseText": "Copyright (c) Microsoft Corporation.\r\n\r\nPermission to use, copy, modify, and/or distribute this software for any\r\npurpose with or without fee is hereby granted.\r\n\r\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\r\nREGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\r\nAND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\r\nINDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\r\nLOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\r\nOTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\r\nPERFORMANCE OF THIS SOFTWARE.", - "name": "tslib@2.4.0", + "name": "tslib@2.4.1", "licenses": "0BSD", "repository": "https://github.com/Microsoft/tslib", "publisher": "Microsoft Corp." }, { "licenseText": "The MIT License\n\nCopyright (c) 2010-2022 Google LLC. https://angular.io/license\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n", - "name": "zone.js@0.11.5", + "name": "zone.js@0.12.0", "licenses": "MIT", "repository": "https://github.com/angular/angular", "publisher": "Brian Ford" diff --git a/frontend/app/src/assets/i18n/de.json b/frontend/app/src/assets/i18n/de.json index 3ce22d59..e4554570 100644 --- a/frontend/app/src/assets/i18n/de.json +++ b/frontend/app/src/assets/i18n/de.json @@ -153,7 +153,8 @@ "ALL": "Alle Termine", "AT": "um", "UNTIL": "bis", - "SINGLE": "Einzel" + "SINGLE": "Einzel", + "DATA_ERROR": "Fehlerhafte Daten" } } }, @@ -453,8 +454,10 @@ "recurring": "Stundenplan", "calendar": "Kalender", "single": "Einzeltermine", - "addEventModal": { - "addEvent": "Events Hinzufügen" + "addEventPage": { + "TITLE": "Termine Hinzufügen", + "PLACEHOLDER": "Termine", + "SEARCH_INSTRUCTION": "Termine finden" }, "card": { "forEach": "Alle", diff --git a/frontend/app/src/assets/i18n/en.json b/frontend/app/src/assets/i18n/en.json index 4075ccf1..664a7e34 100644 --- a/frontend/app/src/assets/i18n/en.json +++ b/frontend/app/src/assets/i18n/en.json @@ -153,7 +153,8 @@ "ALL": "All Events", "AT": "at", "UNTIL": "until", - "SINGLE": "single" + "SINGLE": "single", + "DATA_ERROR": "Invalid data" } } }, @@ -453,8 +454,10 @@ "recurring": "Recurring", "calendar": "Calendar", "single": "Single Events", - "addEventModal": { - "addEvent": "Add Events" + "addEventPage": { + "TITLE": "Add Events", + "PLACEHOLDER": "Events", + "SEARCH_INSTRUCTION": "Find events" }, "card": { "forEach": "Every", diff --git a/frontend/app/src/config/README.md b/frontend/app/src/config/README.md new file mode 100644 index 00000000..c9b047d6 --- /dev/null +++ b/frontend/app/src/config/README.md @@ -0,0 +1,4 @@ +# Config files + +This is a collection of config files which have been temporarily placed in the app, +but are designed or meant to be supplied by the backend as part of the config. diff --git a/frontend/app/src/app/modules/profile/page/sections.ts b/frontend/app/src/config/profile-page-sections.ts similarity index 99% rename from frontend/app/src/app/modules/profile/page/sections.ts rename to frontend/app/src/config/profile-page-sections.ts index 6da89ea3..37e80000 100644 --- a/frontend/app/src/app/modules/profile/page/sections.ts +++ b/frontend/app/src/config/profile-page-sections.ts @@ -22,7 +22,7 @@ import { SCThingRemoteOrigin, SCThingType, } from '@openstapps/core'; -import {SCIcon} from '../../../util/ion-icon/icon'; +import {SCIcon} from '../app/util/ion-icon/icon'; export const SCSectionThingType = 'section' as SCThingType; export const SCSectionLinkThingType = 'section link' as SCThingType; diff --git a/frontend/app/src/config/search-filter.ts b/frontend/app/src/config/search-filter.ts new file mode 100644 index 00000000..e51f3e13 --- /dev/null +++ b/frontend/app/src/config/search-filter.ts @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +import {SCTranslations} from '@openstapps/core'; + +export type RegExpString = string; +export type SCSearchFilterConfig = Record< + RegExpString, + Record< + RegExpString, + { + name?: string; + sortOrder: number; + translations?: SCTranslations<{name: string}>; + } + > +>; + +export const searchFilters: SCSearchFilterConfig = { + '.*': { + 'type': { + sortOrder: 0, + }, + '[^.]*': { + sortOrder: 10, + }, + 'academicTerms?\\.acronym': { + name: 'semester', + sortOrder: 2, + translations: { + de: { + name: 'Semester', + }, + en: { + name: 'Semester', + }, + }, + }, + }, +}; diff --git a/frontend/app/src/environments/environment.production.ts b/frontend/app/src/environments/environment.production.ts index c19d7443..53012f7c 100644 --- a/frontend/app/src/environments/environment.production.ts +++ b/frontend/app/src/environments/environment.production.ts @@ -21,7 +21,7 @@ export const environment = { backend_url: 'https://mobile.server.uni-frankfurt.de', app_host: 'mobile.app.uni-frankfurt.de', custom_url_scheme: 'de.anyschool.app', - backend_version: '2.0.0', + backend_version: '3.0.0', production: true, }; diff --git a/frontend/app/src/environments/environment.ts b/frontend/app/src/environments/environment.ts index 7849551f..fbdd4125 100644 --- a/frontend/app/src/environments/environment.ts +++ b/frontend/app/src/environments/environment.ts @@ -21,7 +21,7 @@ export const environment = { backend_url: 'https://mobile.server.uni-frankfurt.de', app_host: 'mobile.app.uni-frankfurt.de', custom_url_scheme: 'de.anyschool.app', - backend_version: '2.0.0', + backend_version: '3.0.0', production: false, }; diff --git a/frontend/app/src/global.scss b/frontend/app/src/global.scss index 44fd495a..b22f1e40 100644 --- a/frontend/app/src/global.scss +++ b/frontend/app/src/global.scss @@ -124,8 +124,15 @@ ion-header { } } -.ion-content-parallax { - @include ion-content-parallax(); +ion-alert { + button.alert-button.preferred { + background-color: var(--ion-color-primary); + color: var(--ion-color-primary-contrast); + } + button.alert-button.default { + background-color: transparent; + color: var(--ion-color-primary); + } } ion-alert { diff --git a/frontend/app/src/theme/color-processing.scss b/frontend/app/src/theme/color-processing.scss new file mode 100644 index 00000000..1aa7a21d --- /dev/null +++ b/frontend/app/src/theme/color-processing.scss @@ -0,0 +1,39 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +// Setting this to false significantly reduces the amount of variables +// being generated, but omits colors with -dark and -light suffixes, making +// it impossible to access dark theme colors while in light theme and vice versa +$include-theme-independent-colors: true; + +$tint-amount: 10%; +$shade-amount: 12%; +$placeholder-fade-amount: 20%; +$box-shadow-fade-amount: 10%; +$item-border-color-fade-amount: 15%; + +// The color chosen as contrast to another color +$contrast-threshold: 128; +$contrast-light-color: #fff; +$contrast-dark-color: #000; + +$fade-threshold: 50%; + +// https://ionicframework.com/docs/theming/themes#stepped-colors +$steps-start: 50; +$steps-end: 950; +$steps-step: 50; +$steps-range-start: 0; +$steps-range-end: 1000; diff --git a/frontend/app/src/theme/colors.scss b/frontend/app/src/theme/colors.scss new file mode 100644 index 00000000..4aa61ad1 --- /dev/null +++ b/frontend/app/src/theme/colors.scss @@ -0,0 +1,52 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +@import 'util/color-system'; + +@include ion-color(primary, #3880ff); +@include ion-color(secondary, #32db64); +@include ion-color(tertiary, #f4a942); +@include ion-color(success, #10dc60); +@include ion-color(warning, #ffce00); +@include ion-color(danger, #f53d3d); +@include ion-color(light, #f4f4f4, #222); +@include ion-color(medium, #989aa2, #989aa2); +@include ion-color(dark, #222, #f4f4f4); + +@include ion-background-color(#f5f5f5, #000); +@include ion-item-color(#fff, #0e0e0e); + +:root { + --calender-lecture-card: var(--ion-color-primary-tint); + --calender-lecture-card-rgb: var(--ion-color-primary-tint-rgb); + --calender-lecture-card-contrast: var(--ion-color-primary-contrast); + --calender-exercise-card: var(--ion-color-dark); + --calender-exercise-card-rgb: var(--ion-color-dark-rgb); + --calender-exercise-card-contrast: var(--ion-color-dark-contrast); + --calender-default-card: var(--ion-color-light); + --calender-default-card-rgb: var(--ion-color-light-rgb); + --calender-default-card-contrast: var(--ion-color-light-contrast); + + --map-box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 1px 5px 0 rgba(0, 0, 0, 0.12); + + --linear-gradient: linear-gradient(135deg, var(--ion-color-primary-shade), var(--ion-color-tertiary)); + + // Shadows + --shadow-default: 0px 0px 10px 4px var(--ion-box-shadow-color); + --shadow-cards: 0 0 8px 1px var(--ion-box-shadow-color); + --shadow-cards-hover: 5px 5px 8px 4px var(--ion-box-shadow-color); + --shadow-profile-card: 0 2px 6px 6px rgba(0, 0, 0, 0.06), 0 4px 5px 12px rgba(0, 0, 0, 0.04), + 0 5px 6px 20px rgba(0, 0, 0, 0.02); +} diff --git a/frontend/app/src/theme/common/_helper.scss b/frontend/app/src/theme/common/_helper.scss index 9b4ea081..64fcd35e 100644 --- a/frontend/app/src/theme/common/_helper.scss +++ b/frontend/app/src/theme/common/_helper.scss @@ -41,7 +41,7 @@ li img { max-height: 1.25rem; vertical-align: text-bottom; - filter: invert(45%) sepia(0%) saturate(0%) hue-rotate(227deg) brightness(97%) contrast(82%); + // filter: invert(45%) sepia(0%) saturate(0%) hue-rotate(227deg) brightness(97%) contrast(82%); } } } diff --git a/frontend/app/src/theme/common/_ion-content-parallax.scss b/frontend/app/src/theme/common/_ion-content-parallax.scss index ea54ebb4..c3599b8c 100644 --- a/frontend/app/src/theme/common/_ion-content-parallax.scss +++ b/frontend/app/src/theme/common/_ion-content-parallax.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,44 +12,34 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ +$overscroll-padding: 720px; +$parallax-strength: 2; +$default-parallax-content-size: 230px; -@mixin ion-content-parallax( - $parallax-background: var(--ion-color-primary), - $background: var(--ion-color-light), - $parallax-strength: 2, - $overscroll-padding: 720px, - $content-size: 230px -) { - &::part(background) { - background: $background; - } - &::part(scroll) { - perspective: 2px; - perspective-origin: center top; - } - > div { - transform-style: preserve-3d; - position: relative; - - &::after { - content: ' '; - position: absolute; - top: 0; - right: 0; - left: 0; - - $height: calc($content-size + $overscroll-padding); - $translateY: calc($overscroll-padding * $parallax-strength); - $translateZ: calc(-1px * $parallax-strength); - $transform-origin: calc($parallax-strength * $parallax-strength * $overscroll-padding); - - height: $height; - width: 150%; - transform-origin: 50% $transform-origin; - transform: translate3d(0px, $translateY, $translateZ) scale($parallax-strength); - z-index: -1; - - background: $parallax-background; - } - } +ion-content::part(parallax-scroll) { + perspective: 2px; + perspective-origin: center top; +} + +ion-content::part(parallax-parent) { + transform-style: preserve-3d; + position: relative; +} + +ion-content::part(parallax) { + position: absolute; + top: 0; + right: 0; + left: 0; + + $translateY: calc($overscroll-padding * $parallax-strength); + $translateZ: calc(-1px * $parallax-strength); + $transform-origin: calc($parallax-strength * $parallax-strength * $overscroll-padding); + + height: calc(var(--parallax-content-size, $default-parallax-content-size) + $overscroll-padding); + width: 150%; + transform-origin: 50% $transform-origin; + transform: translate3d(0px, $translateY, $translateZ) scale($parallax-strength); + + background: var(--parallax-background, var(--ion-color-primary)); } diff --git a/frontend/app/src/theme/common/_ion-menu.scss b/frontend/app/src/theme/common/_ion-menu.scss new file mode 100644 index 00000000..98c35f04 --- /dev/null +++ b/frontend/app/src/theme/common/_ion-menu.scss @@ -0,0 +1,18 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +ion-menu { + --ion-item-background: var(--ion-background-color); + --ion-item-color: var(--ion-background-color-contrast); +} diff --git a/examples/minimal-plugin/src/common.ts b/frontend/app/src/theme/common/_ion-searchbar.scss similarity index 84% rename from examples/minimal-plugin/src/common.ts rename to frontend/app/src/theme/common/_ion-searchbar.scss index 90e9327b..fe42211a 100644 --- a/examples/minimal-plugin/src/common.ts +++ b/frontend/app/src/theme/common/_ion-searchbar.scss @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2019 StApps +/*! + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -13,4 +13,6 @@ * this program. If not, see . */ -// TODO: place commonly used values here +ion-searchbar { + --background: var(--ion-item-background) !important; +} diff --git a/frontend/app/src/app/modules/schedule/page/modal/modal-event-creator.scss b/frontend/app/src/theme/common/_leaflet-tile.scss similarity index 68% rename from frontend/app/src/app/modules/schedule/page/modal/modal-event-creator.scss rename to frontend/app/src/theme/common/_leaflet-tile.scss index c933f1ae..f51af966 100644 --- a/frontend/app/src/app/modules/schedule/page/modal/modal-event-creator.scss +++ b/frontend/app/src/theme/common/_leaflet-tile.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,24 +12,14 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ +@import '../util/dark'; -:host { - height: 100%; - display: flex; - flex-direction: column; - flex: 1 1 20%; -} - -ion-button { - ion-label { - color: var(--ion-color-light); +@include dark-only { + .leaflet-tile-container > .leaflet-tile { + filter: invert(1); } } -ion-card-content { - height: 100%; - padding: 0; - stapps-data-list { - height: 100%; - } +.map-container.leaflet-container { + background: var(--ion-background-color); } diff --git a/frontend/app/src/theme/common/_typo.scss b/frontend/app/src/theme/common/_typo.scss index 50d3119c..0e0d7711 100644 --- a/frontend/app/src/theme/common/_typo.scss +++ b/frontend/app/src/theme/common/_typo.scss @@ -1,3 +1,18 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + body app-root { .title, .title[class*='sc-ion-label'] { @@ -13,6 +28,6 @@ body app-root { } .title-sub { - color: var(--ion-color-text); + // color: var(--ion-color-medium); } } diff --git a/frontend/app/src/theme/components/_card.scss b/frontend/app/src/theme/components/_card.scss index 01b1f31b..4cf8ab92 100644 --- a/frontend/app/src/theme/components/_card.scss +++ b/frontend/app/src/theme/components/_card.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -15,7 +15,7 @@ .card { box-shadow: var(--shadow-cards); - background-color: var(--ion-color-primary-contrast); + // background-color: var(--ion-item-color); border-radius: var(--border-radius-default); padding: var(--spacing-md); font-size: var(--font-size-sm); diff --git a/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal-type.enum.ts b/frontend/app/src/theme/components/_image-dark.scss similarity index 75% rename from frontend/app/src/app/modules/dashboard/edit-modal/edit-modal-type.enum.ts rename to frontend/app/src/theme/components/_image-dark.scss index 0e2aacc3..b0768648 100644 --- a/frontend/app/src/app/modules/dashboard/edit-modal/edit-modal-type.enum.ts +++ b/frontend/app/src/theme/components/_image-dark.scss @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2022 StApps +/*! + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -13,13 +13,10 @@ * this program. If not, see . */ -export enum EditModalTypeEnum { - CHECKBOXES, - RADIOBOXES, -} +@import '../util/dark'; -export interface EditModalItem { - id: unknown; - labelLocalized: string; - active: boolean; +@include dark-only { + .image-dark { + filter: invert(1); + } } diff --git a/frontend/app/src/theme/util/_color-system.scss b/frontend/app/src/theme/util/_color-system.scss new file mode 100644 index 00000000..01cec55b --- /dev/null +++ b/frontend/app/src/theme/util/_color-system.scss @@ -0,0 +1,120 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +@use 'sass:color'; +@use 'sass:math'; +@import '../color-processing'; +@import './dark'; + +@function toRGB($color) { + @return red($color) + ',' + green($color) + ',' + blue($color); +} + +@function toShade($color) { + @return darken($color, $shade-amount); +} + +@function toTint($color) { + @return lighten($color, $tint-amount); +} + +@function toContrast($color) { + $yiq: toYiq($color); + @return if($yiq >= $contrast-threshold, $contrast-dark-color, $contrast-light-color); +} + +@function fade($color, $amount) { + @return if(lightness($color) > $fade-threshold, darken($color, $amount), lighten($color, $amount)); +} + +@function map-range($value, $input-min, $input-max, $output-min, $output-max) { + @return calc(($value - $input-min) * ($output-max - $output-min) / ($input-max - $input-min) + $output-min); +} + +@function interpolate-colors($from, $to, $progress, $progress-min: 0, $progress-max: 100) { + @return rgb( + map-range($progress, $progress-min, $progress-max, red($from), red($to)), + map-range($progress, $progress-min, $progress-max, green($from), green($to)), + map-range($progress, $progress-min, $progress-max, blue($from), blue($to)) + ); +} + +/** + * Converts a color to the YIQ color system + */ +@function toYiq($color) { + @return math.div( + (color.red($color) * 299) + (color.green($color) * 587) + (color.blue($color) * 114), + 1000 + ); +} + +@mixin color-rgb($name, $color) { + #{$name}: #{$color}; + #{$name}-rgb: #{toRGB($color)}; +} + +@mixin light-dark-scheme($light, $dark) { + :root, + .light { + @if ($include-theme-independent-colors == true) { + @content ($light, -light); + @content (if($dark == none, $light, $dark), -dark); + } + @content ($light, ""); + } + @if ($dark != none) { + @include dark-only { + @content ($dark, ""); + } + } +} + +@mixin ion-color-step($name, $from, $to) { + @for $i from calc($steps-start / $steps-step) through calc($steps-end / $steps-step) { + $value: $i * $steps-step; + #{$name}-#{$value}: #{interpolate-colors($from, $to, $value, $steps-range-start, $steps-range-end)}; + } +} + +@mixin ion-color($name, $light, $dark: none) { + @include light-dark-scheme($light, $dark) using($color, $suffix) { + @include color-rgb(--ion-color-#{$name}#{$suffix}, $color); + @include color-rgb(--ion-color-#{$name}-shade#{$suffix}, toShade($color)); + @include color-rgb(--ion-color-#{$name}-tint#{$suffix}, toTint($color)); + @include color-rgb(--ion-color-#{$name}-contrast#{$suffix}, toContrast($color)); + } +} + +@mixin ion-background-color($light, $dark: none) { + @include light-dark-scheme($light, $dark) using($color, $suffix) { + $text-color: toContrast($color); + @include color-rgb(--ion-background-color#{$suffix}, $color); + @include color-rgb(--ion-text-color#{$suffix}, $text-color); + @include color-rgb(--ion-box-shadow-color#{$suffix}, fade($color, $box-shadow-fade-amount)); + @include color-rgb(--ion-placeholder-color#{$suffix}, fade($text-color, $placeholder-fade-amount)); + + @include ion-color-step(--ion-color-step#{$suffix}, $color, $text-color); + } +} + +@mixin ion-item-color($light, $dark: none) { + @include light-dark-scheme($light, $dark) using($color, $suffix) { + @include color-rgb(--ion-item-background#{$suffix}, $color); + @include color-rgb(--ion-card-background#{$suffix}, $color); + @include color-rgb(--ion-item-border-color#{$suffix}, fade($color, $item-border-color-fade-amount)); + @include color-rgb(--ion-border-color#{$suffix}, fade($color, $item-border-color-fade-amount)); + @include color-rgb(--ion-item-color#{$suffix}, toContrast($color)); + } +} diff --git a/frontend/app/src/theme/util/_dark.scss b/frontend/app/src/theme/util/_dark.scss new file mode 100644 index 00000000..12ac4a37 --- /dev/null +++ b/frontend/app/src/theme/util/_dark.scss @@ -0,0 +1,24 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +@mixin dark-only { + :root { + @media (prefers-color-scheme: dark) { + @content(); + } + } + .dark { + @content(); + } +} diff --git a/frontend/app/src/theme/variables.scss b/frontend/app/src/theme/variables.scss index bc681cc2..412cf50f 100644 --- a/frontend/app/src/theme/variables.scss +++ b/frontend/app/src/theme/variables.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -15,108 +15,10 @@ // Ionic Variables and Theming. For more info, please see: // http://ionicframework.com/docs/theming/ +@import 'colors'; /** Ionic CSS Variables **/ :root { - /** primary **/ - --ion-color-primary: #488aff; - --ion-color-primary-rgb: 72, 138, 255; - --ion-color-primary-contrast: #fff; - --ion-color-primary-contrast-rgb: 255, 255, 255; - --ion-color-primary-shade: #3f79e0; - --ion-color-primary-tint: #5a96ff; - - /** secondary **/ - --ion-color-secondary: #32db64; - --ion-color-secondary-rgb: 50, 219, 100; - --ion-color-secondary-contrast: #fff; - --ion-color-secondary-contrast-rgb: 255, 255, 255; - --ion-color-secondary-shade: #2cc158; - --ion-color-secondary-tint: #47df74; - - /** tertiary **/ - --ion-color-tertiary: #f4a942; - --ion-color-tertiary-rgb: 244, 169, 66; - --ion-color-tertiary-contrast: #fff; - --ion-color-tertiary-contrast-rgb: 255, 255, 255; - --ion-color-tertiary-shade: #d7953a; - --ion-color-tertiary-tint: #f5b255; - - /** success **/ - --ion-color-success: #10dc60; - --ion-color-success-rgb: 16, 220, 96; - --ion-color-success-contrast: #fff; - --ion-color-success-contrast-rgb: 255, 255, 255; - --ion-color-success-shade: #0ec254; - --ion-color-success-tint: #28e070; - - /** warning **/ - --ion-color-warning: #ffce00; - --ion-color-warning-rgb: 255, 206, 0; - --ion-color-warning-contrast: #000; - --ion-color-warning-contrast-rgb: 0, 0, 0; - --ion-color-warning-shade: #e0b500; - --ion-color-warning-tint: #ffd31a; - - /** danger **/ - --ion-color-danger: #f53d3d; - --ion-color-danger-rgb: 245, 61, 61; - --ion-color-danger-contrast: #fff; - --ion-color-danger-contrast-rgb: 255, 255, 255; - --ion-color-danger-shade: #d83636; - --ion-color-danger-tint: #f65050; - - /** light **/ - --ion-color-light: #f4f4f4; - --ion-color-light-rgb: 244, 244, 244; - --ion-color-light-contrast: #000; - --ion-color-light-contrast-rgb: 0, 0, 0; - --ion-color-light-shade: #d7d7d7; - --ion-color-light-tint: #f5f5f5; - - /** medium **/ - --ion-color-medium: #989aa2; - --ion-color-medium-rgb: 152, 154, 162; - --ion-color-medium-contrast: #000; - --ion-color-medium-contrast-rgb: 0, 0, 0; - --ion-color-medium-shade: #86888f; - --ion-color-medium-tint: #a2a4ab; - - /** dark **/ - --ion-color-dark: #222; - --ion-color-dark-rgb: 34, 34, 34; - --ion-color-dark-contrast: #fff; - --ion-color-dark-contrast-rgb: 255, 255, 255; - --ion-color-dark-shade: #1e1e1e; - --ion-color-dark-tint: #383838; - - /** StApps **/ - --placeholder-gray: #f1f0ed; - --calender-date-line-gray: #dbdbdb; - --calender-background-color: #fff; - --calender-background-color-rgb: 255, 255, 255; - --calender-blue-card: var(--ion-color-primary-tint); - --calender-blue-card-rgb: 26, 113, 154; - --calender-black-card: #000000; - --calender-black-card-rgb: 0, 0, 0; - --calender-default-card: var(--ion-color-light); - /** Change the colors of the toolbar and the toolbar text here **/ - --map-box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), - 0 1px 5px 0 rgba(0, 0, 0, 0.12); - - --ion-color-text: #000; - --ion-color-field-bg: #fff; - --ion-color-light-icon: #e6e6e6; - - --linear-gradient: linear-gradient(135deg, var(--ion-color-primary-shade), var(--ion-color-tertiary)); - - // Shadows - --shadow-default: 0px 0px 10px 4px #ddd; - --shadow-cards: 0 0 8px 1px #ddd; - --shadow-cards-hover: 5px 5px 8px 4px #ccc; - --shadow-profile-card: 0 2px 6px 6px rgba(0, 0, 0, 0.06), 0 4px 5px 12px rgba(0, 0, 0, 0.04), - 0 5px 6px 20px rgba(0, 0, 0, 0.02); - // Fonts --ion-font-family: 'Barlow', Helvetica, Arial, sans-serif; --headline-font-family: 'Barlow Condensed', Helvetica, Arial, sans-serif; @@ -142,7 +44,6 @@ --spacing-xl: 20px; --spacing-xxl: 24px; - --border-color-default: #dedd; --border-width-default: 1px; --border-radius-default: 8px; @@ -176,8 +77,12 @@ body { @import 'common/ion-popover'; @import 'common/ion-refresher'; @import 'common/ion-toolbar'; +@import 'common/ion-menu'; @import 'common/swiper'; @import 'common/typography'; +@import 'common/leaflet-tile'; +@import 'common/ion-searchbar'; +@import 'components/image-dark'; @import 'components/card'; @import 'components/section'; diff --git a/frontend/app/tsconfig.json b/frontend/app/tsconfig.json index 43abf762..badbdee3 100644 --- a/frontend/app/tsconfig.json +++ b/frontend/app/tsconfig.json @@ -13,5 +13,6 @@ "module": "es2020", "target": "es2017", "lib": ["es2020", "dom"] - } + }, + "exclude": ["**/*.spec.ts"] }