mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-01 02:52:51 +00:00
Compare commits
8 Commits
159-e2e-te
...
142-requir
| Author | SHA1 | Date | |
|---|---|---|---|
| 9c30211ba2 | |||
| 63a38e0077 | |||
| c8b260201c | |||
|
123c50d1af
|
|||
|
|
d65e6351e9 | ||
|
|
2c5d7403db | ||
|
6ca03f463d
|
|||
|
|
1f74a9bc82 |
@@ -1,9 +0,0 @@
|
||||
---
|
||||
"@openstapps/node-builder": patch
|
||||
"@openstapps/database": patch
|
||||
"@openstapps/node-base": patch
|
||||
"@openstapps/backend": patch
|
||||
"@openstapps/app": patch
|
||||
---
|
||||
|
||||
pin alpine version to 3.18 and add healthchecks
|
||||
@@ -1,6 +0,0 @@
|
||||
---
|
||||
"@openstapps/backend": minor
|
||||
"@openstapps/core": minor
|
||||
---
|
||||
|
||||
Add the ability to filter by existence of a field
|
||||
9
.changeset/spotty-ducks-cheer.md
Normal file
9
.changeset/spotty-ducks-cheer.md
Normal file
@@ -0,0 +1,9 @@
|
||||
---
|
||||
'@openstapps/app': minor
|
||||
---
|
||||
|
||||
Require full reload for setting & language changes
|
||||
|
||||
Setting changes are relatively rare, so it makes little sense
|
||||
going through the effort of ensuring everything is reactive to
|
||||
language changes as well as creating all the pipe bindings etc.
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -102,7 +102,6 @@ typings/
|
||||
|
||||
# ignore lib
|
||||
lib
|
||||
dist
|
||||
|
||||
# ignore docs
|
||||
docs
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
/** @type {import('syncpack').RcFile} */
|
||||
const config = {
|
||||
semverGroups: [{range: ''}],
|
||||
semverRange: '',
|
||||
source: ['package.json', '**/package.json'],
|
||||
indent: ' ',
|
||||
sortFirst: [
|
||||
@@ -49,7 +49,7 @@ const config = {
|
||||
{
|
||||
label: 'Packages should use workspace version',
|
||||
dependencies: ['@openstapps/**'],
|
||||
dependencyTypes: ['prod', 'dev', 'peer'],
|
||||
dependencyTypes: ['prod', 'dev'],
|
||||
packages: ['**'],
|
||||
pinVersion: 'workspace:*',
|
||||
},
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
nodejs 18.19.1
|
||||
pnpm 8.15.4
|
||||
nodejs 18.16.1
|
||||
pnpm 8.8.0
|
||||
python 3.11.5
|
||||
@@ -1,4 +1,4 @@
|
||||
# Open StApps Monorepo
|
||||
# <img src="logo-bg.svg" height="24"> Open StApps Monorepo
|
||||
|
||||
Refer to the [contribution guide](./CONTRIBUTING.md)
|
||||
|
||||
|
||||
@@ -9,6 +9,4 @@ ENV NODE_ENV=production
|
||||
WORKDIR /app
|
||||
|
||||
EXPOSE 3000
|
||||
HEALTHCHECK --interval=10s --timeout=10s --start-period=10s --retries=12 CMD curl -s --fail --request POST --data '{}' --header 'Content-Type: application/json' http://localhost:3000/ >/dev/null || exit 1
|
||||
|
||||
ENTRYPOINT ["node", "app.js"]
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
"express-prom-bundle": "6.6.0",
|
||||
"express-promise-router": "4.1.1",
|
||||
"got": "12.6.0",
|
||||
"moment": "2.30.1",
|
||||
"moment": "2.29.4",
|
||||
"morgan": "1.10.0",
|
||||
"nock": "13.3.1",
|
||||
"node-cache": "5.1.2",
|
||||
@@ -98,9 +98,9 @@
|
||||
"sinon": "15.0.4",
|
||||
"sinon-express-mock": "2.2.1",
|
||||
"supertest": "6.3.3",
|
||||
"ts-node": "10.9.2",
|
||||
"ts-node": "10.9.1",
|
||||
"tsup": "6.7.0",
|
||||
"typescript": "5.4.2"
|
||||
"typescript": "5.1.6"
|
||||
},
|
||||
"tsup": {
|
||||
"entry": [
|
||||
|
||||
@@ -21,31 +21,16 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
|
||||
*/
|
||||
export function buildValueFilter(
|
||||
filter: SCSearchValueFilter,
|
||||
):
|
||||
| QueryDslSpecificQueryContainer<'exists'>
|
||||
| QueryDslSpecificQueryContainer<'term'>
|
||||
| QueryDslSpecificQueryContainer<'terms'> {
|
||||
switch (typeof filter.arguments.value) {
|
||||
case 'undefined': {
|
||||
return {
|
||||
exists: {
|
||||
field: filter.arguments.field,
|
||||
): QueryDslSpecificQueryContainer<'term'> | QueryDslSpecificQueryContainer<'terms'> {
|
||||
return Array.isArray(filter.arguments.value)
|
||||
? {
|
||||
terms: {
|
||||
[`${filter.arguments.field}.raw`]: filter.arguments.value,
|
||||
},
|
||||
};
|
||||
}
|
||||
case 'string': {
|
||||
return {
|
||||
}
|
||||
: {
|
||||
term: {
|
||||
[`${filter.arguments.field}.raw`]: filter.arguments.value,
|
||||
},
|
||||
};
|
||||
}
|
||||
case 'object': {
|
||||
return {
|
||||
terms: {
|
||||
[`${filter.arguments.field}.raw`]: filter.arguments.value,
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
"extends": "@openstapps/tsconfig",
|
||||
"compilerOptions": {
|
||||
"resolveJsonModule": true,
|
||||
"useUnknownInCatchVariables": false
|
||||
"useUnknownInCatchVariables": false,
|
||||
"allowJs": true,
|
||||
"checkJs": true
|
||||
},
|
||||
"exclude": ["lib", "app.js"]
|
||||
"exclude": ["app.js", "lib/"]
|
||||
}
|
||||
|
||||
@@ -14,6 +14,4 @@ RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
|
||||
|
||||
USER elasticsearch
|
||||
|
||||
HEALTHCHECK --interval=10s --timeout=10s --start-period=60s --retries=12 CMD curl --fail -s http://localhost:9200/ >/dev/null || exit 1
|
||||
|
||||
CMD ["/usr/share/elasticsearch/bin/elasticsearch"]
|
||||
|
||||
@@ -3,4 +3,3 @@ discovery.type: "single-node"
|
||||
cluster.routing.allocation.disk.threshold_enabled: false
|
||||
network.bind_host: 0.0.0.0
|
||||
xpack.security.enabled: false
|
||||
ingest.geoip.downloader.enabled: false
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
// ESM is not supported, and cts is not detected, so we use type-checked cjs instead.
|
||||
/** @type {import('../src/common').ConfigFile} */
|
||||
module.exports = {
|
||||
const configFile = {
|
||||
activeVersions: ['1\\.0\\.\\d+', '2\\.0\\.\\d+'],
|
||||
hiddenRoutes: ['/bulk'],
|
||||
logFormat: 'default',
|
||||
@@ -31,3 +31,5 @@ module.exports = {
|
||||
dhparam: '/etc/nginx/certs/dhparam.pem',
|
||||
},
|
||||
};
|
||||
|
||||
export default configFile;
|
||||
|
||||
@@ -50,8 +50,8 @@
|
||||
"dockerode": "3.3.5",
|
||||
"is-cidr": "4.0.2",
|
||||
"mustache": "4.2.0",
|
||||
"semver": "7.6.0",
|
||||
"typescript": "5.4.2"
|
||||
"semver": "7.5.4",
|
||||
"typescript": "5.1.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@openstapps/api-cli": "workspace:*",
|
||||
@@ -65,7 +65,7 @@
|
||||
"@types/mustache": "4.2.2",
|
||||
"@types/node": "18.15.3",
|
||||
"@types/proxyquire": "1.3.28",
|
||||
"@types/semver": "7.5.8",
|
||||
"@types/semver": "7.5.6",
|
||||
"@types/sha1": "1.1.3",
|
||||
"@types/sinon": "10.0.14",
|
||||
"@types/sinon-chai": "3.2.9",
|
||||
@@ -75,7 +75,7 @@
|
||||
"mocha-junit-reporter": "2.2.0",
|
||||
"sinon": "15.0.4",
|
||||
"sinon-chai": "3.7.0",
|
||||
"ts-node": "10.9.2",
|
||||
"ts-node": "10.9.1",
|
||||
"tsup": "6.7.0"
|
||||
},
|
||||
"tsup": {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"extends": "@openstapps/tsconfig",
|
||||
"exclude": ["config", "lib", "app.js"]
|
||||
"exclude": ["./config/", "./lib/"]
|
||||
}
|
||||
|
||||
@@ -18,15 +18,16 @@
|
||||
"devDependencies": {
|
||||
"@openstapps/tsconfig": "workspace:*",
|
||||
"@types/node": "18.15.3",
|
||||
"eslint": "8.57.0",
|
||||
"typescript": "5.4.2"
|
||||
"eslint": "8.43.0",
|
||||
"typescript": "5.1.6"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "7.2.0",
|
||||
"@typescript-eslint/parser": "7.2.0",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-config-prettier": "9.1.0",
|
||||
"eslint-plugin-jsdoc": "48.2.1",
|
||||
"eslint-plugin-unicorn": "51.0.1"
|
||||
"@typescript-eslint/eslint-plugin": "5.60.1",
|
||||
"@typescript-eslint/parser": "5.60.1",
|
||||
"eslint": "8.43.0",
|
||||
"eslint-config-prettier": "8.8.0",
|
||||
"eslint-plugin-jsdoc": "46.4.2",
|
||||
"eslint-plugin-prettier": "4.2.1",
|
||||
"eslint-plugin-unicorn": "47.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,8 +43,8 @@
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"@slack/web-api": "6.8.1",
|
||||
"commander": "10.0.0",
|
||||
"date-fns": "3.6.0",
|
||||
"glob": "10.3.10",
|
||||
"date-fns": "2.30.0",
|
||||
"glob": "10.2.7",
|
||||
"mustache": "4.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
@@ -53,7 +53,7 @@
|
||||
"@openstapps/tsconfig": "workspace:*",
|
||||
"@types/chai": "4.3.5",
|
||||
"@types/chai-as-promised": "7.1.5",
|
||||
"@types/glob": "8.1.0",
|
||||
"@types/glob": "8.0.1",
|
||||
"@types/mocha": "10.0.1",
|
||||
"@types/mustache": "4.2.2",
|
||||
"@types/node": "18.15.3",
|
||||
@@ -63,9 +63,9 @@
|
||||
"chai-as-promised": "7.1.1",
|
||||
"mocha": "10.2.0",
|
||||
"mocha-junit-reporter": "2.2.0",
|
||||
"ts-node": "10.9.2",
|
||||
"ts-node": "10.9.1",
|
||||
"tsup": "6.7.0",
|
||||
"typescript": "5.4.2"
|
||||
"typescript": "5.1.6"
|
||||
},
|
||||
"tsup": {
|
||||
"entry": [
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
{
|
||||
"extends": "@openstapps/tsconfig",
|
||||
"exclude": ["lib", "app.js"]
|
||||
"extends": "@openstapps/tsconfig"
|
||||
}
|
||||
|
||||
@@ -53,9 +53,9 @@
|
||||
"mocha": "10.2.0",
|
||||
"mocha-junit-reporter": "2.2.0",
|
||||
"nock": "13.3.1",
|
||||
"ts-node": "10.9.2",
|
||||
"ts-node": "10.9.1",
|
||||
"tsup": "6.7.0",
|
||||
"typescript": "5.4.2"
|
||||
"typescript": "5.1.6"
|
||||
},
|
||||
"tsup": {
|
||||
"entry": [
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
{
|
||||
"extends": "@openstapps/tsconfig",
|
||||
"exclude": ["lib", "app.js"]
|
||||
"extends": "@openstapps/tsconfig"
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"commander": "10.0.0",
|
||||
"express": "4.18.2",
|
||||
"ts-node": "10.9.2"
|
||||
"ts-node": "10.9.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@openstapps/eslint-config": "workspace:*",
|
||||
@@ -44,7 +44,7 @@
|
||||
"@types/express": "4.17.17",
|
||||
"@types/node": "18.15.3",
|
||||
"tsup": "6.7.0",
|
||||
"typescript": "5.4.2"
|
||||
"typescript": "5.1.6"
|
||||
},
|
||||
"tsup": {
|
||||
"entry": [
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
{
|
||||
"extends": "@openstapps/tsconfig",
|
||||
"exclude": ["lib", "app.js"]
|
||||
"extends": "@openstapps/tsconfig"
|
||||
}
|
||||
|
||||
@@ -5,4 +5,10 @@
|
||||
# You can see what browsers were selected by your queries by running:
|
||||
# npx browserslist
|
||||
|
||||
> 0.5% in DE and last 2 major versions and supports es6 and not dead
|
||||
> 0.5%
|
||||
last 2 versions
|
||||
Firefox ESR
|
||||
not dead
|
||||
not kaios 2.5
|
||||
not op_mini all
|
||||
not IE 9-11
|
||||
|
||||
@@ -11,7 +11,6 @@ log.txt
|
||||
*.sublime-workspace
|
||||
.vscode/*
|
||||
npm-debug.log*
|
||||
.browser-data
|
||||
|
||||
# This file is sometimes created automatically, even though
|
||||
# we actually use the capacitor.config.ts
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Creates a docker image with only the app as an executable unit
|
||||
# Dependencies need to be installed beforehand
|
||||
# Needs to be build beforehand
|
||||
FROM node:18-alpine3.18
|
||||
FROM node:18-alpine
|
||||
|
||||
WORKDIR /app
|
||||
COPY www/ /app/www
|
||||
|
||||
@@ -21,10 +21,10 @@ as usual.
|
||||
|
||||
The modified `ion-icon` comes with a few extra features:
|
||||
|
||||
- `[style.--fill]` controls the fill color of the icon.
|
||||
- `[style.--weight]` controls the font weight of the icon.
|
||||
- `[style.--size]` controls the font size of the icon.
|
||||
- `[style.--grade]` controls the font grade of the icon.
|
||||
- `[fill]` controls the fill color of the icon.
|
||||
- `[weight]` controls the font weight of the icon.
|
||||
- `[size]` controls the font size of the icon.
|
||||
- `[grade]` controls the font grade of the icon.
|
||||
|
||||
All of these attributes are animated as described
|
||||
[here](https://developers.google.com/fonts/docs/material_symbols).
|
||||
@@ -50,10 +50,11 @@ the config file.
|
||||
Icon font minification is done automatically, but requires you to
|
||||
follow a few simple rules:
|
||||
|
||||
1. Use the Proxy object to reference icon names in TypeScript files and code
|
||||
1. Use the tagged template literal for referencing icon names in
|
||||
TypeScript files and code
|
||||
|
||||
```ts
|
||||
SCIcon.icon_name;
|
||||
SCIcon`icon_name`;
|
||||
```
|
||||
|
||||
2. When using `ion-icon` in HTML, reference either icons that went through
|
||||
|
||||
@@ -97,20 +97,20 @@
|
||||
"serve": {
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
"options": {
|
||||
"buildTarget": "app:build"
|
||||
"browserTarget": "app:build"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"buildTarget": "app:build:production"
|
||||
"browserTarget": "app:build:production"
|
||||
},
|
||||
"development": {
|
||||
"buildTarget": "app:build:development"
|
||||
"browserTarget": "app:build:development"
|
||||
},
|
||||
"ci": {
|
||||
"buildTarget": "app:build"
|
||||
"browserTarget": "app:build"
|
||||
},
|
||||
"fake": {
|
||||
"buildTarget": "app:build:fake"
|
||||
"browserTarget": "app:build:fake"
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "development"
|
||||
|
||||
@@ -173,7 +173,7 @@ describe('dashboard', async function () {
|
||||
cy.visit('/overview');
|
||||
|
||||
cy.get('ion-searchbar').click({scrollBehavior: 'center'});
|
||||
cy.url().should('include', '/search');
|
||||
cy.url().should('eq', Cypress.config().baseUrl + '/search');
|
||||
cy.get('ion-searchbar').should('not.have.value');
|
||||
cy.get('ion-searchbar input.searchbar-input').should('have.focus');
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
describe('favorites', function () {
|
||||
beforeEach(() => {
|
||||
cy.interceptSearch({
|
||||
extends: {query: 'a'},
|
||||
extends: {query: 'test'},
|
||||
fixture: 'search/generic',
|
||||
alias: 'search',
|
||||
});
|
||||
@@ -29,7 +29,7 @@ describe('favorites', function () {
|
||||
it('should add a favorite', function () {
|
||||
cy.visit('/search');
|
||||
cy.patchSearchPage();
|
||||
cy.get('ion-searchbar').type('a');
|
||||
cy.get('ion-searchbar').type('test');
|
||||
let text!: string;
|
||||
cy.get('stapps-data-list-item')
|
||||
.first()
|
||||
@@ -40,7 +40,9 @@ describe('favorites', function () {
|
||||
text = it;
|
||||
});
|
||||
cy.get('stapps-favorite-button').click();
|
||||
cy.get('stapps-favorite-button > ion-button > ion-icon').should('have.class', 'selected');
|
||||
cy.get('stapps-favorite-button > ion-button > ion-icon')
|
||||
.invoke('attr', 'ng-reflect-fill')
|
||||
.should('eq', 'true');
|
||||
});
|
||||
cy.visit('/favorites');
|
||||
cy.get('stapps-data-list-item').within(() => {
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
"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",
|
||||
"check-icons": "ts-node scripts/check-icon-correctness.ts",
|
||||
"check-icons": "ts-node-esm scripts/check-icon-correctness.ts",
|
||||
"chromium:no-cors": "chromium --disable-web-security --user-data-dir=\".browser-data/chromium\"",
|
||||
"chromium:virtual-host": "chromium --host-resolver-rules=\"MAP mobile.app.uni-frankfurt.de:* localhost:8100\" --ignore-certificate-errors",
|
||||
"cypress:open": "cypress open",
|
||||
@@ -52,34 +52,34 @@
|
||||
"test:integration": "sh integration-test.sh"
|
||||
},
|
||||
"dependencies": {
|
||||
"@angular/animations": "17.3.0",
|
||||
"@angular/cdk": "17.3.0",
|
||||
"@angular/common": "17.3.0",
|
||||
"@angular/core": "17.3.0",
|
||||
"@angular/forms": "17.3.0",
|
||||
"@angular/platform-browser": "17.3.0",
|
||||
"@angular/router": "17.3.0",
|
||||
"@asymmetrik/ngx-leaflet": "17.0.0",
|
||||
"@asymmetrik/ngx-leaflet-markercluster": "17.0.0",
|
||||
"@awesome-cordova-plugins/calendar": "6.6.0",
|
||||
"@awesome-cordova-plugins/core": "6.6.0",
|
||||
"@capacitor/app": "5.0.7",
|
||||
"@capacitor/browser": "5.2.0",
|
||||
"@capacitor/clipboard": "5.0.7",
|
||||
"@capacitor/core": "5.7.3",
|
||||
"@capacitor/device": "5.0.7",
|
||||
"@capacitor/dialog": "5.0.7",
|
||||
"@capacitor/filesystem": "5.2.1",
|
||||
"@capacitor/geolocation": "5.0.7",
|
||||
"@capacitor/haptics": "5.0.7",
|
||||
"@capacitor/keyboard": "5.0.8",
|
||||
"@capacitor/local-notifications": "5.0.7",
|
||||
"@capacitor/network": "5.0.7",
|
||||
"@capacitor/preferences": "5.0.7",
|
||||
"@capacitor/share": "5.0.7",
|
||||
"@capacitor/splash-screen": "5.0.7",
|
||||
"@angular/animations": "16.1.4",
|
||||
"@angular/cdk": "16.1.4",
|
||||
"@angular/common": "16.1.4",
|
||||
"@angular/core": "16.1.4",
|
||||
"@angular/forms": "16.1.4",
|
||||
"@angular/platform-browser": "16.1.4",
|
||||
"@angular/router": "16.1.4",
|
||||
"@asymmetrik/ngx-leaflet": "16.0.1",
|
||||
"@asymmetrik/ngx-leaflet-markercluster": "16.0.0",
|
||||
"@awesome-cordova-plugins/calendar": "5.45.0",
|
||||
"@awesome-cordova-plugins/core": "5.45.0",
|
||||
"@capacitor/app": "5.0.6",
|
||||
"@capacitor/browser": "5.1.0",
|
||||
"@capacitor/clipboard": "5.0.6",
|
||||
"@capacitor/core": "5.5.0",
|
||||
"@capacitor/device": "5.0.6",
|
||||
"@capacitor/dialog": "5.0.6",
|
||||
"@capacitor/filesystem": "5.1.4",
|
||||
"@capacitor/geolocation": "5.0.6",
|
||||
"@capacitor/haptics": "5.0.6",
|
||||
"@capacitor/keyboard": "5.0.6",
|
||||
"@capacitor/local-notifications": "5.0.6",
|
||||
"@capacitor/network": "5.0.6",
|
||||
"@capacitor/preferences": "5.0.6",
|
||||
"@capacitor/share": "5.0.6",
|
||||
"@capacitor/splash-screen": "5.0.6",
|
||||
"@ionic-native/core": "5.36.0",
|
||||
"@ionic/angular": "7.8.0",
|
||||
"@ionic/angular": "7.1.3",
|
||||
"@ionic/storage-angular": "4.0.0",
|
||||
"@ngx-translate/core": "15.0.0",
|
||||
"@ngx-translate/http-loader": "8.0.0",
|
||||
@@ -87,105 +87,105 @@
|
||||
"@openstapps/api": "workspace:*",
|
||||
"@openstapps/collection-utils": "workspace:*",
|
||||
"@openstapps/core": "workspace:*",
|
||||
"@transistorsoft/capacitor-background-fetch": "5.2.0",
|
||||
"@types/dom-view-transitions": "1.0.4",
|
||||
"@transistorsoft/capacitor-background-fetch": "5.1.1",
|
||||
"@types/dom-view-transitions": "1.0.1",
|
||||
"capacitor-secure-storage-plugin": "0.9.0",
|
||||
"cordova-plugin-calendar": "5.1.6",
|
||||
"date-fns": "3.6.0",
|
||||
"date-fns": "2.30.0",
|
||||
"deepmerge": "4.3.1",
|
||||
"fast-deep-equal": "3.1.3",
|
||||
"form-data": "4.0.0",
|
||||
"geojson": "0.5.0",
|
||||
"ionic-appauth": "0.9.0",
|
||||
"ionicons": "7.2.1",
|
||||
"jsonpath-plus": "6.0.1",
|
||||
"leaflet": "1.9.4",
|
||||
"leaflet": "1.9.3",
|
||||
"leaflet.markercluster": "1.5.3",
|
||||
"material-symbols": "0.17.0",
|
||||
"moment": "2.30.1",
|
||||
"ngx-date-fns": "11.0.0",
|
||||
"material-symbols": "0.10.0",
|
||||
"moment": "2.29.4",
|
||||
"ngx-date-fns": "10.0.1",
|
||||
"ngx-logger": "5.0.12",
|
||||
"ngx-markdown": "17.1.1",
|
||||
"ngx-markdown": "16.0.0",
|
||||
"ngx-moment": "6.0.2",
|
||||
"opening_hours": "3.8.0",
|
||||
"rxjs": "7.8.1",
|
||||
"semver": "7.6.0",
|
||||
"semver": "7.5.4",
|
||||
"swiper": "8.4.5",
|
||||
"tslib": "2.6.2",
|
||||
"zone.js": "0.14.4"
|
||||
"tslib": "2.4.1",
|
||||
"zone.js": "0.13.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/architect": "0.1703.0",
|
||||
"@angular-devkit/build-angular": "17.3.0",
|
||||
"@angular-devkit/core": "17.3.0",
|
||||
"@angular-devkit/schematics": "17.3.0",
|
||||
"@angular-eslint/builder": "17.3.0",
|
||||
"@angular-eslint/eslint-plugin": "17.3.0",
|
||||
"@angular-eslint/eslint-plugin-template": "17.3.0",
|
||||
"@angular-eslint/schematics": "17.3.0",
|
||||
"@angular-eslint/template-parser": "17.3.0",
|
||||
"@angular/cli": "17.3.0",
|
||||
"@angular/compiler": "17.3.0",
|
||||
"@angular/compiler-cli": "17.3.0",
|
||||
"@angular/language-server": "17.3.0",
|
||||
"@angular/language-service": "17.3.0",
|
||||
"@angular/platform-browser-dynamic": "17.3.0",
|
||||
"@capacitor/android": "5.7.3",
|
||||
"@capacitor/assets": "3.0.4",
|
||||
"@capacitor/cli": "5.7.3",
|
||||
"@capacitor/ios": "5.7.3",
|
||||
"@compodoc/compodoc": "1.1.23",
|
||||
"@cypress/schematic": "2.5.1",
|
||||
"@ionic/angular-toolkit": "11.0.1",
|
||||
"@ionic/cli": "7.2.0",
|
||||
"@angular-devkit/architect": "0.1601.4",
|
||||
"@angular-devkit/build-angular": "16.1.4",
|
||||
"@angular-devkit/core": "16.1.4",
|
||||
"@angular-devkit/schematics": "16.1.4",
|
||||
"@angular-eslint/builder": "16.1.0",
|
||||
"@angular-eslint/eslint-plugin": "16.1.0",
|
||||
"@angular-eslint/eslint-plugin-template": "16.1.0",
|
||||
"@angular-eslint/schematics": "16.1.0",
|
||||
"@angular-eslint/template-parser": "16.1.0",
|
||||
"@angular/cli": "16.1.4",
|
||||
"@angular/compiler": "16.1.4",
|
||||
"@angular/compiler-cli": "16.1.4",
|
||||
"@angular/language-service": "16.1.4",
|
||||
"@angular/platform-browser-dynamic": "16.1.4",
|
||||
"@capacitor/android": "5.5.0",
|
||||
"@capacitor/assets": "3.0.1",
|
||||
"@capacitor/cli": "5.5.0",
|
||||
"@capacitor/ios": "5.5.0",
|
||||
"@compodoc/compodoc": "1.1.19",
|
||||
"@cypress/schematic": "1.7.0",
|
||||
"@ionic/angular-toolkit": "10.0.0",
|
||||
"@ionic/cli": "7.1.1",
|
||||
"@openstapps/prettier-config": "workspace:*",
|
||||
"@openstapps/tsconfig": "workspace:*",
|
||||
"@types/fontkit": "2.0.7",
|
||||
"@types/fontkit": "1.8.0",
|
||||
"@types/geojson": "1.0.6",
|
||||
"@types/glob": "8.1.0",
|
||||
"@types/jasmine": "5.1.4",
|
||||
"@types/jasminewd2": "2.0.13",
|
||||
"@types/glob": "8.0.1",
|
||||
"@types/jasmine": "4.3.1",
|
||||
"@types/jasminewd2": "2.0.10",
|
||||
"@types/jsonpath": "0.2.0",
|
||||
"@types/karma": "6.3.8",
|
||||
"@types/karma-coverage": "2.0.3",
|
||||
"@types/karma-jasmine": "4.0.5",
|
||||
"@types/leaflet": "1.9.8",
|
||||
"@types/leaflet.markercluster": "1.5.4",
|
||||
"@types/karma": "6.3.4",
|
||||
"@types/karma-coverage": "2.0.1",
|
||||
"@types/karma-jasmine": "4.0.2",
|
||||
"@types/leaflet": "1.9.0",
|
||||
"@types/leaflet.markercluster": "1.5.1",
|
||||
"@types/node": "18.15.3",
|
||||
"@types/semver": "7.5.8",
|
||||
"@typescript-eslint/eslint-plugin": "7.2.0",
|
||||
"@typescript-eslint/parser": "7.2.0",
|
||||
"@types/semver": "7.5.6",
|
||||
"@typescript-eslint/eslint-plugin": "5.60.1",
|
||||
"@typescript-eslint/parser": "5.60.1",
|
||||
"cordova-res": "0.15.4",
|
||||
"cypress": "13.7.0",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-plugin-jsdoc": "48.2.1",
|
||||
"eslint-plugin-prettier": "5.1.3",
|
||||
"eslint-plugin-unicorn": "51.0.1",
|
||||
"cypress": "13.2.0",
|
||||
"eslint": "8.43.0",
|
||||
"eslint-plugin-jsdoc": "46.4.2",
|
||||
"eslint-plugin-prettier": "4.2.1",
|
||||
"eslint-plugin-unicorn": "47.0.0",
|
||||
"fast-deep-equal": "3.1.3",
|
||||
"fontkit": "2.0.2",
|
||||
"glob": "10.3.10",
|
||||
"glob": "10.2.7",
|
||||
"http-server": "14.1.1",
|
||||
"is-docker": "2.2.1",
|
||||
"jasmine-core": "5.1.2",
|
||||
"jasmine-core": "5.0.1",
|
||||
"jasmine-spec-reporter": "7.0.0",
|
||||
"jetifier": "2.0.0",
|
||||
"junit-report-merger": "6.0.3",
|
||||
"karma": "6.4.3",
|
||||
"junit-report-merger": "6.0.2",
|
||||
"karma": "6.4.2",
|
||||
"karma-chrome-launcher": "3.2.0",
|
||||
"karma-coverage": "2.2.1",
|
||||
"karma-jasmine": "5.1.0",
|
||||
"karma-junit-reporter": "2.0.1",
|
||||
"karma-mocha-reporter": "2.2.5",
|
||||
"license-checker": "25.0.1",
|
||||
"stylelint": "16.2.1",
|
||||
"stylelint-config-clean-order": "5.4.1",
|
||||
"stylelint": "15.10.1",
|
||||
"stylelint-config-clean-order": "5.0.1",
|
||||
"stylelint-config-prettier-scss": "1.0.0",
|
||||
"stylelint-config-recommended-scss": "14.0.0",
|
||||
"stylelint-config-standard-scss": "13.0.0",
|
||||
"stylelint-config-recommended-scss": "12.0.0",
|
||||
"stylelint-config-standard-scss": "10.0.0",
|
||||
"surge": "0.23.1",
|
||||
"ts-node": "10.9.2",
|
||||
"typescript": "5.4.2",
|
||||
"webpack-bundle-analyzer": "4.10.1"
|
||||
"ts-node": "10.9.1",
|
||||
"typescript": "5.1.6",
|
||||
"webpack-bundle-analyzer": "4.7.0"
|
||||
},
|
||||
"prettier": "@openstapps/prettier-config",
|
||||
"cordova": {
|
||||
"plugins": {},
|
||||
"platforms": [
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
// @ts-check
|
||||
/*
|
||||
* Copyright (C) 2022 StApps
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
@@ -26,6 +25,7 @@ const config = {
|
||||
},
|
||||
},
|
||||
],
|
||||
ignorePath: ['.prettierignore', '../../.gitignore'],
|
||||
};
|
||||
|
||||
export default config;
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
SCThingOriginType,
|
||||
SCThingType,
|
||||
} from '@openstapps/core';
|
||||
import {CORE_VERSION} from '@openstapps/core';
|
||||
import packageInfo from '@openstapps/core/package.json';
|
||||
import {Polygon} from 'geojson';
|
||||
|
||||
// provides sample aggregations to be used in tests or backendless development
|
||||
@@ -195,7 +195,7 @@ export const sampleIndexResponse: SCIndexResponse = {
|
||||
},
|
||||
auth: {},
|
||||
backend: {
|
||||
SCVersion: CORE_VERSION,
|
||||
SCVersion: packageInfo.version,
|
||||
externalRequestTimeout: 5000,
|
||||
hiddenTypes: [SCThingType.DateSeries, SCThingType.Diff, SCThingType.Floor],
|
||||
mappingIgnoredTags: [],
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
*/
|
||||
|
||||
import {AnimationBuilder, AnimationController} from '@ionic/angular';
|
||||
import {AnimationOptions} from '@ionic/angular/common/providers/nav-controller';
|
||||
import {AnimationOptions} from '@ionic/angular/providers/nav-controller';
|
||||
import {iosDuration, iosEasing, mdDuration, mdEasing} from './easings';
|
||||
|
||||
/**
|
||||
|
||||
80
frontend/app/src/app/animation/splash.ts
Normal file
80
frontend/app/src/app/animation/splash.ts
Normal file
@@ -0,0 +1,80 @@
|
||||
import {Animation, AnimationController} from '@ionic/angular';
|
||||
import {iosDuration, iosEasing, mdDuration, mdEasing} from './easings';
|
||||
|
||||
/**
|
||||
* Splash screen animation
|
||||
*/
|
||||
export function splashAnimation(animationCtl: AnimationController): Animation {
|
||||
if (matchMedia('(prefers-reduced-motion: reduce)').matches) {
|
||||
return animationCtl
|
||||
.create()
|
||||
.fromTo('opacity', 0, 1)
|
||||
.duration(150)
|
||||
.beforeClearStyles(['visibility'])
|
||||
.addElement(document.querySelector('ion-app')!);
|
||||
}
|
||||
|
||||
const isMd = document.querySelector('ion-app.md') !== null;
|
||||
const navElement = document.querySelector('stapps-navigation-tabs')!;
|
||||
const navBounds = navElement.getBoundingClientRect();
|
||||
let horizontal = navBounds.width < navBounds.height;
|
||||
if (window.getComputedStyle(navElement).display === 'none') {
|
||||
horizontal = true;
|
||||
}
|
||||
const translate = (amount: number, unit = 'px') =>
|
||||
`translate${horizontal ? 'X' : 'Y'}(${horizontal ? amount * -1 : amount}${unit})`;
|
||||
const duration = 2 * (isMd ? mdDuration : iosDuration);
|
||||
|
||||
const animation = animationCtl
|
||||
.create()
|
||||
.duration(duration)
|
||||
.easing(isMd ? mdEasing : iosEasing)
|
||||
.addAnimation(
|
||||
animationCtl.create().beforeClearStyles(['visibility']).addElement(document.querySelector('ion-app')!),
|
||||
)
|
||||
.addAnimation(
|
||||
animationCtl
|
||||
.create()
|
||||
.fromTo('transform', translate(horizontal ? 64 : 192), translate(0))
|
||||
.fromTo('opacity', 0, 1)
|
||||
.addElement(document.querySelector('stapps-navigation > ion-split-pane')!),
|
||||
)
|
||||
.addAnimation(
|
||||
animationCtl
|
||||
.create()
|
||||
.fromTo('transform', translate(64), translate(0))
|
||||
.addElement(document.querySelectorAll('ion-split-pane > ion-menu > ion-content')),
|
||||
)
|
||||
.addAnimation(
|
||||
animationCtl
|
||||
.create()
|
||||
.fromTo('transform', translate(horizontal ? 32 : -72), translate(0))
|
||||
.addElement(document.querySelectorAll('ion-router-outlet > .ion-page > ion-content')!),
|
||||
)
|
||||
.addAnimation(
|
||||
animationCtl
|
||||
.create()
|
||||
.fromTo('transform', translate(100, '%'), translate(0, '%'))
|
||||
.addElement(document.querySelector('stapps-navigation-tabs')!),
|
||||
);
|
||||
|
||||
if (!horizontal) {
|
||||
animation.addAnimation(
|
||||
animationCtl
|
||||
.create()
|
||||
.fromTo('background', 'none', 'none')
|
||||
.addElement(document.querySelector('ion-router-outlet')!),
|
||||
);
|
||||
|
||||
const parallax = document
|
||||
.querySelector('ion-router-outlet > .ion-page > ion-content')
|
||||
?.shadowRoot?.querySelector('[part=parallax]');
|
||||
if (parallax) {
|
||||
animation.addAnimation(
|
||||
animationCtl.create().fromTo('translate', '0 256px', '0 0px').addElement(parallax),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return animation;
|
||||
}
|
||||
@@ -22,28 +22,16 @@ import {environment} from '../environments/environment';
|
||||
import {Capacitor} from '@capacitor/core';
|
||||
import {ScheduleSyncService} from './modules/background/schedule/schedule-sync.service';
|
||||
import {Keyboard, KeyboardResize} from '@capacitor/keyboard';
|
||||
import {AppVersionService} from './modules/about/app-version.service';
|
||||
import {SplashScreen} from '@capacitor/splash-screen';
|
||||
import {AppVersionService} from './modules/about/app-version.service';
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
templateUrl: 'app.component.html',
|
||||
})
|
||||
export class AppComponent implements AfterContentInit {
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
pages: Array<{
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
component: unknown;
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
title: string;
|
||||
}>;
|
||||
|
||||
@@ -65,7 +53,7 @@ export class AppComponent implements AfterContentInit {
|
||||
void this.initializeApp();
|
||||
}
|
||||
|
||||
async ngAfterContentInit() {
|
||||
ngAfterContentInit() {
|
||||
this.scheduleSyncService.init();
|
||||
void this.scheduleSyncService.enable();
|
||||
this.versionService.getPendingReleaseNotes().then(notes => {
|
||||
@@ -74,24 +62,11 @@ export class AppComponent implements AfterContentInit {
|
||||
}
|
||||
});
|
||||
|
||||
if (document.readyState === 'complete') {
|
||||
this.hideSplash();
|
||||
} else {
|
||||
document.addEventListener('readystatechange', () => {
|
||||
if (document.readyState === 'complete') this.hideSplash();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async hideSplash() {
|
||||
if (Capacitor.isNativePlatform()) {
|
||||
void SplashScreen.hide();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
async initializeApp() {
|
||||
App.addListener('appUrlOpen', (event: URLOpenListenerEvent) => {
|
||||
this.zone.run(() => {
|
||||
|
||||
@@ -29,7 +29,6 @@ import {environment} from '../environments/environment';
|
||||
import {AppRoutingModule} from './app-routing.module';
|
||||
import {AppComponent} from './app.component';
|
||||
import {CatalogModule} from './modules/catalog/catalog.module';
|
||||
import {ConfigModule} from './modules/config/config.module';
|
||||
import {ConfigProvider} from './modules/config/config.provider';
|
||||
import {DashboardModule} from './modules/dashboard/dashboard.module';
|
||||
import {DataModule} from './modules/data/data.module';
|
||||
@@ -43,7 +42,6 @@ import {SettingsProvider} from './modules/settings/settings.provider';
|
||||
import {StorageModule} from './modules/storage/storage.module';
|
||||
import {ThingTranslateModule} from './translation/thing-translate.module';
|
||||
import {UtilModule} from './util/util.module';
|
||||
import {initLogger} from './_helpers/ts-logger';
|
||||
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
|
||||
import {AboutModule} from './modules/about/about.module';
|
||||
import {JobModule} from './modules/jobs/jobs.module';
|
||||
@@ -61,12 +59,12 @@ import {RoutingStackService} from './util/routing-stack.service';
|
||||
import {SCLanguageCode, SCSettingValue} from '@openstapps/core';
|
||||
import {DefaultAuthService} from './modules/auth/default-auth.service';
|
||||
import {PAIAAuthService} from './modules/auth/paia/paia-auth.service';
|
||||
import {IonIconModule} from './util/ion-icon/ion-icon.module';
|
||||
import {NavigationModule} from './modules/menu/navigation/navigation.module';
|
||||
import {browserFactory, SimpleBrowser} from './util/browser.factory';
|
||||
import {getDateFnsLocale} from './translation/dfns-locale';
|
||||
import {setDefaultOptions} from 'date-fns';
|
||||
import {DateFnsConfigurationService} from 'ngx-date-fns';
|
||||
import {SCIcon} from './util/ion-icon/icon';
|
||||
import {Capacitor} from '@capacitor/core';
|
||||
import {SplashScreen} from '@capacitor/splash-screen';
|
||||
|
||||
@@ -90,28 +88,25 @@ export function initializerFactory(
|
||||
) {
|
||||
return async () => {
|
||||
try {
|
||||
initLogger(logger);
|
||||
await storageProvider.init();
|
||||
await configProvider.init();
|
||||
await settingsProvider.init();
|
||||
if (configProvider.firstSession) {
|
||||
// set language from browser
|
||||
await settingsProvider.setSettingValue(
|
||||
'profile',
|
||||
'language',
|
||||
translateService.getBrowserLang() as SCSettingValue,
|
||||
);
|
||||
}
|
||||
const languageCode = await settingsProvider.getSetting<string>('profile', 'language');
|
||||
// this language will be used as a fallback when a translation isn't found in the current language
|
||||
translateService.setDefaultLang('en');
|
||||
translateService.use(languageCode);
|
||||
moment.locale(languageCode);
|
||||
const dateFnsLocale = await getDateFnsLocale(languageCode as SCLanguageCode);
|
||||
setDefaultOptions({locale: dateFnsLocale});
|
||||
dateFnsConfigurationService.setLocale(dateFnsLocale);
|
||||
try {
|
||||
if (configProvider.firstSession) {
|
||||
// set language from browser
|
||||
await settingsProvider.setSettingValue(
|
||||
'profile',
|
||||
'language',
|
||||
translateService.getBrowserLang() as SCSettingValue,
|
||||
);
|
||||
}
|
||||
const languageCode = (await settingsProvider.getValue('profile', 'language')) as string;
|
||||
// this language will be used as a fallback when a translation isn't found in the current language
|
||||
translateService.setDefaultLang('en');
|
||||
translateService.use(languageCode);
|
||||
moment.locale(languageCode);
|
||||
const dateFnsLocale = await getDateFnsLocale(languageCode as SCLanguageCode);
|
||||
setDefaultOptions({locale: dateFnsLocale});
|
||||
dateFnsConfigurationService.setLocale(dateFnsLocale);
|
||||
|
||||
await defaultAuthService.init();
|
||||
await paiaAuthService.init();
|
||||
} catch (error) {
|
||||
@@ -150,13 +145,13 @@ export function createTranslateLoader(http: HttpClient) {
|
||||
BrowserAnimationsModule,
|
||||
CatalogModule,
|
||||
CommonModule,
|
||||
ConfigModule,
|
||||
DashboardModule,
|
||||
DataModule,
|
||||
HebisModule,
|
||||
IonicModule.forRoot({
|
||||
backButtonIcon: SCIcon.arrow_back,
|
||||
animated: 'Cypress' in window ? false : undefined,
|
||||
}),
|
||||
IonIconModule,
|
||||
JobModule,
|
||||
FavoritesModule,
|
||||
LibraryModule,
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-header>
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
@@ -24,29 +24,28 @@
|
||||
</ion-header>
|
||||
<ion-content parallax>
|
||||
<div class="licenses-content">
|
||||
@for (license of licenses; track license) {
|
||||
<ion-card [href]="license.url || license.repository" rel="external" target="_blank">
|
||||
<ion-card-header>
|
||||
<ion-card-title>
|
||||
{{ license.name }}
|
||||
<ion-icon
|
||||
[size]="16"
|
||||
[style.--weight]="300"
|
||||
class="supertext-icon"
|
||||
name="open_in_browser"
|
||||
></ion-icon>
|
||||
</ion-card-title>
|
||||
@if (license.authors || license.publisher) {
|
||||
<ion-card-subtitle> {{ license.authors || license.publisher }} </ion-card-subtitle>
|
||||
}
|
||||
</ion-card-header>
|
||||
<ion-card-content>
|
||||
<ion-chip (click)="$event.preventDefault(); viewLicense(license)">
|
||||
<ion-icon name="copyright"></ion-icon>
|
||||
<ion-label>{{ license.licenses }} License</ion-label>
|
||||
</ion-chip>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
}
|
||||
<ion-card
|
||||
*ngFor="let license of licenses"
|
||||
[href]="license.url || license.repository"
|
||||
rel="external"
|
||||
target="_blank"
|
||||
>
|
||||
<ion-card-header>
|
||||
<ion-card-title>
|
||||
{{ license.name }}
|
||||
<ion-icon [size]="16" [weight]="300" class="supertext-icon" name="open_in_browser"></ion-icon>
|
||||
</ion-card-title>
|
||||
|
||||
<ion-card-subtitle *ngIf="license.authors || license.publisher">
|
||||
{{ license.authors || license.publisher }}
|
||||
</ion-card-subtitle>
|
||||
</ion-card-header>
|
||||
<ion-card-content>
|
||||
<ion-chip (click)="$event.preventDefault(); viewLicense(license)">
|
||||
<ion-icon name="copyright"></ion-icon>
|
||||
<ion-label>{{ license.licenses }} License</ion-label>
|
||||
</ion-chip>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
@@ -1,56 +1,41 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (content.type === 'markdown') {
|
||||
<markdown [data]="'value' | translateSimple: content"></markdown>
|
||||
}
|
||||
@if (content.type === 'section') {
|
||||
<div>
|
||||
@if (content.card) {
|
||||
<ion-card>
|
||||
<ion-card-header>
|
||||
<ion-card-title>{{ 'title' | translateSimple: content }}</ion-card-title>
|
||||
</ion-card-header>
|
||||
<ion-card-content>
|
||||
<about-page-content [content]="content.content"></about-page-content>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
} @else {
|
||||
<h2>{{ 'title' | translateSimple: content }}</h2>
|
||||
<markdown *ngIf="content.type === 'markdown'" [data]="'value' | translateSimple : content"></markdown>
|
||||
<div *ngIf="content.type ==='section'">
|
||||
<ion-card *ngIf="content.card; else noCard">
|
||||
<ion-card-header>
|
||||
<ion-card-title>{{ 'title' | translateSimple : content }}</ion-card-title>
|
||||
</ion-card-header>
|
||||
<ion-card-content>
|
||||
<about-page-content [content]="content.content"></about-page-content>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
@if (content.type === 'table') {
|
||||
<ion-grid>
|
||||
@for (row of content.rows; track row) {
|
||||
<ion-row>
|
||||
@for (col of row; track col) {
|
||||
<ion-col>
|
||||
<about-page-content [content]="col"></about-page-content>
|
||||
</ion-col>
|
||||
}
|
||||
</ion-row>
|
||||
}
|
||||
</ion-grid>
|
||||
}
|
||||
@if (content.type === 'router link') {
|
||||
<ion-item [routerLink]="content.link">
|
||||
@if (content.icon) {
|
||||
<ion-icon [name]="content.icon" slot="start"></ion-icon>
|
||||
}
|
||||
<ion-label>{{ 'title' | translateSimple: content }}</ion-label>
|
||||
</ion-item>
|
||||
}
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
<ng-template #noCard>
|
||||
<h2>{{ 'title' | translateSimple : content }}</h2>
|
||||
<about-page-content [content]="content.content"></about-page-content>
|
||||
</ng-template>
|
||||
</div>
|
||||
<ion-grid *ngIf="content.type === 'table'">
|
||||
<ion-row *ngFor="let row of content.rows">
|
||||
<ion-col *ngFor="let col of row">
|
||||
<about-page-content [content]="col"></about-page-content>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
<ion-item *ngIf="content.type === 'router link'" [routerLink]="content.link">
|
||||
<ion-icon *ngIf="content.icon" [name]="content.icon" slot="start"></ion-icon>
|
||||
<ion-label>{{ 'title' | translateSimple : content }}</ion-label>
|
||||
</ion-item>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
*/
|
||||
import {Component, OnInit} from '@angular/core';
|
||||
import {ActivatedRoute} from '@angular/router';
|
||||
import {SCAboutPage, SCAppConfiguration} from '@openstapps/core';
|
||||
import {SCAboutPage} from '@openstapps/core';
|
||||
import {ConfigProvider} from '../../config/config.provider';
|
||||
import packageJson from '../../../../../package.json';
|
||||
import config from 'capacitor.config';
|
||||
@@ -42,8 +42,7 @@ export class AboutPageComponent implements OnInit {
|
||||
|
||||
async ngOnInit() {
|
||||
const route = this.route.snapshot.url.map(it => it.path).join('/');
|
||||
this.content =
|
||||
(this.configProvider.getValue('aboutPages') as SCAppConfiguration['aboutPages'])[route] ?? {};
|
||||
this.content = this.configProvider.config.app.aboutPages[route] ?? {};
|
||||
this.version = Capacitor.getPlatform() === 'web' ? 'Web' : await App.getInfo().then(info => info.version);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,37 +1,32 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-header>
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
<ion-buttons slot="start">
|
||||
<ion-back-button></ion-back-button>
|
||||
</ion-buttons>
|
||||
@if (content) {
|
||||
<ion-title>{{ 'title' | translateSimple: content }}</ion-title>
|
||||
} @else {
|
||||
<ion-title *ngIf="content; else titleLoading">{{ 'title' | translateSimple : content }}</ion-title>
|
||||
<ng-template #titleLoading>
|
||||
<ion-title><ion-skeleton-text animated="true"></ion-skeleton-text></ion-title>
|
||||
}
|
||||
</ng-template>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
@if (content) {
|
||||
<ion-content parallax>
|
||||
<ion-text>{{ 'about.VERSION_INFO' | translate: {name, version, stappsVersion} }}</ion-text>
|
||||
<div class="page-content">
|
||||
@for (element of content.content; track element) {
|
||||
<about-page-content [content]="element"></about-page-content>
|
||||
}
|
||||
</div>
|
||||
</ion-content>
|
||||
}
|
||||
<ion-content parallax *ngIf="content">
|
||||
<ion-text>{{ 'about.VERSION_INFO' | translate: {name, version, stappsVersion} }}</ion-text>
|
||||
<div class="page-content">
|
||||
<about-page-content *ngFor="let element of content.content" [content]="element"></about-page-content>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
@@ -19,7 +19,6 @@ import {FormsModule} from '@angular/forms';
|
||||
import {IonicModule} from '@ionic/angular';
|
||||
import {TranslateModule} from '@ngx-translate/core';
|
||||
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
||||
import {ConfigProvider} from '../config/config.provider';
|
||||
import {AboutPageComponent} from './about-page/about-page.component';
|
||||
import {MarkdownModule} from 'ngx-markdown';
|
||||
import {AboutPageContentComponent} from './about-page/about-page-content.component';
|
||||
@@ -29,6 +28,7 @@ import {ScrollingModule} from '@angular/cdk/scrolling';
|
||||
import {AboutLicenseModalComponent} from './about-license-modal.component';
|
||||
import {AboutChangelogComponent} from './about-changelog.component';
|
||||
import {UtilModule} from '../../util/util.module';
|
||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||
|
||||
const settingsRoutes: Routes = [
|
||||
{path: 'about', component: AboutPageComponent},
|
||||
@@ -52,8 +52,9 @@ const settingsRoutes: Routes = [
|
||||
],
|
||||
imports: [
|
||||
CommonModule,
|
||||
IonIconModule,
|
||||
FormsModule,
|
||||
IonicModule,
|
||||
IonicModule.forRoot(),
|
||||
TranslateModule.forChild(),
|
||||
ThingTranslateModule.forChild(),
|
||||
RouterModule.forChild(settingsRoutes),
|
||||
@@ -62,6 +63,5 @@ const settingsRoutes: Routes = [
|
||||
ScrollingModule,
|
||||
UtilModule,
|
||||
],
|
||||
providers: [ConfigProvider],
|
||||
})
|
||||
export class AboutModule {}
|
||||
|
||||
@@ -5,6 +5,7 @@ import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
||||
import {IonicModule, ModalController} from '@ionic/angular';
|
||||
import {TranslateModule} from '@ngx-translate/core';
|
||||
import {UtilModule} from '../../util/util.module';
|
||||
import {CommonModule} from '@angular/common';
|
||||
|
||||
@Component({
|
||||
selector: 'stapps-release-notes',
|
||||
@@ -12,7 +13,7 @@ import {UtilModule} from '../../util/util.module';
|
||||
styleUrls: ['release-notes.scss'],
|
||||
standalone: true,
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
imports: [UtilModule, MarkdownModule, ThingTranslateModule, IonicModule, TranslateModule],
|
||||
imports: [UtilModule, MarkdownModule, ThingTranslateModule, IonicModule, TranslateModule, CommonModule],
|
||||
})
|
||||
export class ReleaseNotesComponent {
|
||||
@Input() versionInfos: SCAppVersionInfo[];
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
<ion-header>
|
||||
<ion-toolbar>
|
||||
<ion-title
|
||||
><span class="ion-text-wrap">{{ 'releaseNotes.TITLE_UPDATED' | translate }}</span></ion-title
|
||||
>
|
||||
<ion-title><span class="ion-text-wrap">{{'releaseNotes.TITLE_UPDATED' | translate}}</span></ion-title>
|
||||
<ion-buttons slot="end">
|
||||
<ion-button [strong]="true" (click)="modalController.dismiss()">{{
|
||||
'modal.DISMISS_NEUTRAL' | translate
|
||||
}}</ion-button>
|
||||
<ion-button [strong]="true" (click)="modalController.dismiss()"
|
||||
>{{'modal.DISMISS_NEUTRAL' | translate}}</ion-button
|
||||
>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<ion-content parallax>
|
||||
@for (versionInfo of versionInfos; track versionInfo) {
|
||||
<ng-container *ngFor="let versionInfo of versionInfos">
|
||||
<markdown
|
||||
class="content-card ion-padding"
|
||||
[data]="'releaseNotes' | translateSimple: versionInfo"
|
||||
></markdown>
|
||||
}
|
||||
</ng-container>
|
||||
</ion-content>
|
||||
|
||||
@@ -35,6 +35,7 @@ import {AssessmentsProvider} from './assessments.provider';
|
||||
import {AssessmentsSimpleDataListComponent} from './list/assessments-simple-data-list.component';
|
||||
import {ProtectedRoutes} from '../auth/protected.routes';
|
||||
import {AssessmentsTreeListComponent} from './list/assessments-tree-list.component';
|
||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||
import {UtilModule} from '../../util/util.module';
|
||||
|
||||
const routes: ProtectedRoutes = [
|
||||
@@ -68,6 +69,7 @@ const routes: ProtectedRoutes = [
|
||||
imports: [
|
||||
CommonModule,
|
||||
FormsModule,
|
||||
IonIconModule,
|
||||
IonicModule,
|
||||
RouterModule.forChild(routes),
|
||||
TranslateModule,
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
class="ion-text-wrap"
|
||||
*ngIf="assessments[key].courseOfStudy | async as course; else defaultLabel"
|
||||
>
|
||||
{{ 'name' | thingTranslate: course }} ({{ 'academicDegree' | thingTranslate: course }})
|
||||
{{ 'name' | thingTranslate : course }} ({{ 'academicDegree' | thingTranslate : course }})
|
||||
</ion-label>
|
||||
</div>
|
||||
<ng-template #defaultLabel>
|
||||
|
||||
@@ -14,12 +14,8 @@
|
||||
-->
|
||||
|
||||
<ion-label [color]="passed ? undefined : 'danger'"
|
||||
>{{
|
||||
(_item.grade | isNumeric)
|
||||
? (_item.grade | numberLocalized: 'minimumFractionDigits:1,maximumFractionDigits:1')
|
||||
: ''
|
||||
}}
|
||||
{{ 'status' | thingTranslate: _item | titlecase }}, {{ 'attempt' | propertyNameTranslate: _item }}
|
||||
{{ _item.attempt }}
|
||||
>{{ (_item.grade | isNumeric) ? (_item.grade | numberLocalized :
|
||||
'minimumFractionDigits:1,maximumFractionDigits:1') : '' }} {{ 'status' | thingTranslate : _item | titlecase
|
||||
}}, {{ 'attempt' | propertyNameTranslate : _item }} {{ _item.attempt }}
|
||||
</ion-label>
|
||||
<ion-note> {{ _item.ects }} {{ 'ects' | propertyNameTranslate: _item }}</ion-note>
|
||||
<ion-note> {{ _item.ects }} {{ 'ects' | propertyNameTranslate : _item }}</ion-note>
|
||||
|
||||
@@ -1,28 +1,24 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-card>
|
||||
<ion-card-content>
|
||||
@if (item.courseOfStudy; as courseOfStudy) {
|
||||
<ion-note>
|
||||
{{ $any('courseOfStudy' | propertyNameTranslate: item) | titlecase }}:
|
||||
{{ 'name' | thingTranslate: $any(courseOfStudy) }} ({{
|
||||
'academicDegree' | thingTranslate: $any(courseOfStudy)
|
||||
}})
|
||||
</ion-note>
|
||||
}
|
||||
<ion-note *ngIf="item.courseOfStudy as courseOfStudy">
|
||||
{{ $any('courseOfStudy' | propertyNameTranslate : item) | titlecase }}: {{ 'name' | thingTranslate :
|
||||
$any(courseOfStudy) }} ({{ 'academicDegree' | thingTranslate : $any(courseOfStudy) }})
|
||||
</ion-note>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
<ion-list class="container">
|
||||
|
||||
@@ -14,6 +14,6 @@
|
||||
-->
|
||||
|
||||
<div class="container">
|
||||
<h2 class="name">{{ 'name' | thingTranslate: item }} {{ item.date ? (item.date | amDateFormat) : '' }}</h2>
|
||||
<h2 class="name">{{ 'name' | thingTranslate : item }} {{ item.date ? (item.date | amDateFormat) : '' }}</h2>
|
||||
<assessment-base-info [item]="item"></assessment-base-info>
|
||||
</div>
|
||||
|
||||
@@ -18,12 +18,7 @@ import {IPAIAAuthAction} from './paia/paia-auth-action';
|
||||
import {AuthActions, IAuthAction} from 'ionic-appauth';
|
||||
import {TranslateService} from '@ngx-translate/core';
|
||||
import {JSONPath} from 'jsonpath-plus';
|
||||
import {
|
||||
SCAuthorizationProvider,
|
||||
SCAuthorizationProviderType,
|
||||
SCUserConfiguration,
|
||||
SCUserConfigurationMap,
|
||||
} from '@openstapps/core';
|
||||
import {SCAuthorizationProviderType, SCUserConfiguration} from '@openstapps/core';
|
||||
import {ConfigProvider} from '../config/config.provider';
|
||||
import {StorageProvider} from '../storage/storage.provider';
|
||||
import {DefaultAuthService} from './default-auth.service';
|
||||
@@ -37,8 +32,6 @@ const AUTH_ORIGIN_PATH = 'stapps.auth.origin_path';
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class AuthHelperService {
|
||||
userConfigurationMap: SCUserConfigurationMap;
|
||||
|
||||
constructor(
|
||||
private translateService: TranslateService,
|
||||
private configProvider: ConfigProvider,
|
||||
@@ -47,14 +40,7 @@ export class AuthHelperService {
|
||||
private paiaAuth: PAIAAuthService,
|
||||
private browser: SimpleBrowser,
|
||||
private alertController: AlertController,
|
||||
) {
|
||||
this.userConfigurationMap =
|
||||
(
|
||||
this.configProvider.getAnyValue('auth') as {
|
||||
default: SCAuthorizationProvider;
|
||||
}
|
||||
).default?.endpoints.mapping ?? {};
|
||||
}
|
||||
) {}
|
||||
|
||||
public getAuthMessage(provider: SCAuthorizationProviderType, action: IAuthAction | IPAIAAuthAction) {
|
||||
let message: string | undefined;
|
||||
@@ -77,9 +63,10 @@ export class AuthHelperService {
|
||||
name: '',
|
||||
role: 'student',
|
||||
};
|
||||
for (const key in this.userConfigurationMap) {
|
||||
const mapping = this.configProvider.config.auth.default!.endpoints.mapping;
|
||||
for (const key in mapping) {
|
||||
user[key as keyof SCUserConfiguration] = JSONPath({
|
||||
path: this.userConfigurationMap[key as keyof SCUserConfiguration] as string,
|
||||
path: mapping[key as keyof SCUserConfiguration] as string,
|
||||
json: userInfo,
|
||||
preventEval: true,
|
||||
})[0];
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import {
|
||||
AuthorizationRequestHandler,
|
||||
AuthorizationServiceConfiguration,
|
||||
@@ -24,7 +23,6 @@ import {
|
||||
} from '@openid/appauth';
|
||||
import {AuthActionBuilder, Browser, DefaultBrowser, EndSessionHandler, UserInfoHandler} from 'ionic-appauth';
|
||||
import {ConfigProvider} from '../config/config.provider';
|
||||
import {SCAuthorizationProvider} from '@openstapps/core';
|
||||
import {getClientConfig, getEndpointsConfig} from './auth.provider.methods';
|
||||
import {Injectable} from '@angular/core';
|
||||
import {AuthService} from './auth.service';
|
||||
@@ -67,12 +65,9 @@ export class DefaultAuthService extends AuthService {
|
||||
}
|
||||
|
||||
setupConfiguration() {
|
||||
const authConfig = this.configProvider.getAnyValue('auth') as {
|
||||
default: SCAuthorizationProvider;
|
||||
};
|
||||
this.authConfig = getClientConfig('default', authConfig);
|
||||
this.authConfig = getClientConfig('default', this.configProvider.config.auth);
|
||||
this.localConfiguration = new AuthorizationServiceConfiguration(
|
||||
getEndpointsConfig('default', authConfig),
|
||||
getEndpointsConfig('default', this.configProvider.config.auth),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import {
|
||||
AuthorizationError,
|
||||
AuthorizationRequest,
|
||||
@@ -47,7 +46,6 @@ import {PAIAAuthorizationResponse} from './paia-authorization-response';
|
||||
import {PAIAAuthorizationNotifier} from './paia-authorization-notifier';
|
||||
import {PAIATokenResponse} from './paia-token-response';
|
||||
import {IPAIAAuthAction, PAIAAuthActionBuilder} from './paia-auth-action';
|
||||
import {SCAuthorizationProvider} from '@openstapps/core';
|
||||
import {ConfigProvider} from '../../config/config.provider';
|
||||
import {getClientConfig, getEndpointsConfig} from '../auth.provider.methods';
|
||||
import {Injectable} from '@angular/core';
|
||||
@@ -154,11 +152,10 @@ export class PAIAAuthService {
|
||||
}
|
||||
|
||||
setupConfiguration() {
|
||||
const authConfig = this.configProvider.getAnyValue('auth') as {
|
||||
paia: SCAuthorizationProvider;
|
||||
};
|
||||
this.authConfig = getClientConfig('paia', authConfig);
|
||||
this.localConfiguration = new AuthorizationServiceConfiguration(getEndpointsConfig('paia', authConfig));
|
||||
this.authConfig = getClientConfig('paia', this.configProvider.config.auth);
|
||||
this.localConfiguration = new AuthorizationServiceConfiguration(
|
||||
getEndpointsConfig('paia', this.configProvider.config.auth),
|
||||
);
|
||||
}
|
||||
|
||||
protected notifyActionListers(action: IPAIAAuthAction) {
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<div>
|
||||
<ion-card-header>
|
||||
<ion-card-title>{{ 'schedule.toCalendar.reviewModal.TITLE' | translate }}</ion-card-title>
|
||||
@@ -22,63 +22,50 @@
|
||||
|
||||
<ion-card-content>
|
||||
<ion-list lines="none">
|
||||
@for (event of iCalEvents; track event) {
|
||||
<ion-item-group>
|
||||
<ion-item-divider>
|
||||
<ion-label>{{ event.title }}</ion-label>
|
||||
@if (event.events.length > 1) {
|
||||
<ion-note slot="start">
|
||||
<ion-icon name="insert_page_break"></ion-icon>
|
||||
</ion-note>
|
||||
}
|
||||
</ion-item-divider>
|
||||
@for (iCalEvent of event.events; track iCalEvent) {
|
||||
<ion-item>
|
||||
<ion-label>
|
||||
@if (iCalEvent.cancelled) {
|
||||
<s><ng-container [ngTemplateOutlet]="date"></ng-container> </s>
|
||||
} @else {
|
||||
{{ moment(iCalEvent.start) | amDateFormat: 'll, HH:mm' }}
|
||||
}
|
||||
<ng-template #date> {{ moment(iCalEvent.start) | amDateFormat: 'll, HH:mm' }} </ng-template>
|
||||
</ion-label>
|
||||
@if (iCalEvent.rrule) {
|
||||
<ion-note>
|
||||
{{ iCalEvent.rrule.interval }} {{ iCalEvent.rrule.freq | sentencecase }}
|
||||
</ion-note>
|
||||
}
|
||||
@if (iCalEvent.rrule) {
|
||||
<ion-icon name="event_repeat"></ion-icon>
|
||||
}
|
||||
</ion-item>
|
||||
}
|
||||
</ion-item-group>
|
||||
}
|
||||
<ion-item-group *ngFor="let event of iCalEvents">
|
||||
<ion-item-divider>
|
||||
<ion-label>{{ event.title }}</ion-label>
|
||||
<ion-note slot="start" *ngIf="event.events.length > 1">
|
||||
<ion-icon name="insert_page_break"></ion-icon>
|
||||
</ion-note>
|
||||
</ion-item-divider>
|
||||
<ion-item *ngFor="let iCalEvent of event.events">
|
||||
<ion-label>
|
||||
<s *ngIf="iCalEvent.cancelled; else date"
|
||||
><ng-container [ngTemplateOutlet]="date"></ng-container>
|
||||
</s>
|
||||
<ng-template #date> {{ moment(iCalEvent.start) | amDateFormat : 'll, HH:mm' }} </ng-template>
|
||||
</ion-label>
|
||||
<ion-note *ngIf="iCalEvent.rrule">
|
||||
{{ iCalEvent.rrule.interval }} {{ iCalEvent.rrule.freq | sentencecase }}
|
||||
</ion-note>
|
||||
<ion-icon *ngIf="iCalEvent.rrule" name="event_repeat"></ion-icon>
|
||||
</ion-item>
|
||||
</ion-item-group>
|
||||
</ion-list>
|
||||
</ion-card-content>
|
||||
|
||||
<div class="horizontal-flex">
|
||||
<ion-item lines="none">
|
||||
<ion-checkbox [(ngModel)]="includeCancelled">{{
|
||||
'schedule.toCalendar.reviewModal.INCLUDE_CANCELLED' | translate
|
||||
}}</ion-checkbox>
|
||||
<ion-checkbox [(ngModel)]="includeCancelled"
|
||||
>{{ 'schedule.toCalendar.reviewModal.INCLUDE_CANCELLED' | translate }}</ion-checkbox
|
||||
>
|
||||
</ion-item>
|
||||
</div>
|
||||
<div class="horizontal-flex">
|
||||
<ion-button fill="clear" (click)="export()">
|
||||
{{ 'share' | translate }}
|
||||
<ion-icon slot="end" name="share"></ion-icon>
|
||||
<ion-icon slot="end" md="share" ios="ios_share"></ion-icon>
|
||||
</ion-button>
|
||||
@if (isWeb) {
|
||||
<ion-button fill="outline" (click)="download()">
|
||||
{{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate }}
|
||||
<ion-icon slot="end" name="download"></ion-icon>
|
||||
</ion-button>
|
||||
} @else {
|
||||
<ion-button fill="outline" (click)="download()" *ngIf="isWeb; else exportButton">
|
||||
{{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate }}
|
||||
<ion-icon slot="end" name="download"></ion-icon>
|
||||
</ion-button>
|
||||
<ng-template #exportButton>
|
||||
<ion-button fill="outline" (click)="toCalendar()">
|
||||
{{ 'schedule.toCalendar.reviewModal.EXPORT' | translate }}
|
||||
<ion-icon slot="end" name="event_upcoming"></ion-icon>
|
||||
</ion-button>
|
||||
}
|
||||
</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -25,13 +25,15 @@ import {FormsModule} from '@angular/forms';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {MomentModule} from 'ngx-moment';
|
||||
import {UtilModule} from '../../util/util.module';
|
||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||
|
||||
@NgModule({
|
||||
declarations: [AddEventReviewModalComponent],
|
||||
imports: [
|
||||
IonicModule,
|
||||
IonicModule.forRoot(),
|
||||
TranslateModule.forChild(),
|
||||
ThingTranslateModule.forChild(),
|
||||
IonIconModule,
|
||||
FormsModule,
|
||||
CommonModule,
|
||||
MomentModule,
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import {Calendar} from '@awesome-cordova-plugins/calendar/ngx';
|
||||
import {Injectable} from '@angular/core';
|
||||
import {ICalEvent} from './ical/ical';
|
||||
@@ -35,14 +34,14 @@ export class CalendarService {
|
||||
|
||||
goToDateClicked = this.goToDate.asObservable();
|
||||
|
||||
calendarName = 'StApps';
|
||||
calendarName: string;
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
||||
constructor(
|
||||
readonly calendar: Calendar,
|
||||
private readonly configProvider: ConfigProvider,
|
||||
) {
|
||||
this.calendarName = (this.configProvider.getValue('name') as string) ?? 'StApps';
|
||||
this.calendarName = this.configProvider.config.app.name ?? 'StApps';
|
||||
}
|
||||
|
||||
async createCalendar(): Promise<CalendarInfo | undefined> {
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-header>
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
@@ -23,45 +23,33 @@
|
||||
</ion-toolbar>
|
||||
<ion-toolbar color="primary" mode="md">
|
||||
<ion-segment (ionChange)="segmentChanged($event)" [value]="selectedSemesterUID" mode="md">
|
||||
@for (semester of availableSemesters; track semester) {
|
||||
<ion-segment-button [value]="semester.uid">
|
||||
<ion-label>{{ semester.acronym }}</ion-label>
|
||||
</ion-segment-button>
|
||||
}
|
||||
<ion-segment-button *ngFor="let semester of availableSemesters" [value]="semester.uid">
|
||||
<ion-label>{{ semester.acronym }}</ion-label>
|
||||
</ion-segment-button>
|
||||
</ion-segment>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
@if (catalogs && catalogs.length > 0) {
|
||||
<ion-list>
|
||||
@for (catalog of catalogs; track catalog) {
|
||||
<ion-item button="true" lines="inset" (click)="notifySelect(catalog)">
|
||||
<ion-list *ngIf="catalogs && catalogs.length > 0">
|
||||
<ion-item *ngFor="let catalog of catalogs" button="true" lines="inset" (click)="notifySelect(catalog)">
|
||||
<ion-label>
|
||||
<h2>{{ catalog.name }}</h2>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
<ion-list *ngIf="!catalogs">
|
||||
<stapps-skeleton-list-item *ngFor="let skeleton of [].constructor(10)"> </stapps-skeleton-list-item>
|
||||
</ion-list>
|
||||
<ion-grid *ngIf="catalogs && catalogs.length === 0">
|
||||
<ion-row>
|
||||
<ion-col>
|
||||
<div class="ion-text-center margin-top">
|
||||
<ion-label>
|
||||
<h2>{{ catalog.name }}</h2>
|
||||
{{ 'catalog.detail.EMPTY_SEMESTER' | translate }}
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
}
|
||||
</ion-list>
|
||||
}
|
||||
@if (!catalogs) {
|
||||
<ion-list>
|
||||
@for (skeleton of [].constructor(10); track skeleton) {
|
||||
<stapps-skeleton-list-item> </stapps-skeleton-list-item>
|
||||
}
|
||||
</ion-list>
|
||||
}
|
||||
@if (catalogs && catalogs.length === 0) {
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col>
|
||||
<div class="ion-text-center margin-top">
|
||||
<ion-label>
|
||||
{{ 'catalog.detail.EMPTY_SEMESTER' | translate }}
|
||||
</ion-label>
|
||||
</div>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
}
|
||||
</div>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
</ion-content>
|
||||
|
||||
@@ -20,9 +20,9 @@ import {IonicModule} from '@ionic/angular';
|
||||
import {TranslateModule} from '@ngx-translate/core';
|
||||
import {MomentModule} from 'ngx-moment';
|
||||
import {DataModule} from '../data/data.module';
|
||||
import {SettingsProvider} from '../settings/settings.provider';
|
||||
import {CatalogComponent} from './catalog.component';
|
||||
import {UtilModule} from '../../util/util.module';
|
||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||
|
||||
const catalogRoutes: Routes = [
|
||||
{path: 'catalog', component: CatalogComponent},
|
||||
@@ -35,15 +35,15 @@ const catalogRoutes: Routes = [
|
||||
@NgModule({
|
||||
declarations: [CatalogComponent],
|
||||
imports: [
|
||||
IonicModule,
|
||||
IonicModule.forRoot(),
|
||||
FormsModule,
|
||||
TranslateModule.forChild(),
|
||||
RouterModule.forChild(catalogRoutes),
|
||||
IonIconModule,
|
||||
CommonModule,
|
||||
MomentModule,
|
||||
DataModule,
|
||||
UtilModule,
|
||||
],
|
||||
providers: [SettingsProvider],
|
||||
})
|
||||
export class CatalogModule {}
|
||||
|
||||
@@ -16,12 +16,6 @@ import {TestBed} from '@angular/core/testing';
|
||||
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
||||
import {StorageProvider} from '../storage/storage.provider';
|
||||
import {ConfigProvider, STORAGE_KEY_CONFIG} from './config.provider';
|
||||
import {
|
||||
ConfigFetchError,
|
||||
ConfigInitError,
|
||||
SavedConfigNotAvailable,
|
||||
WrongConfigVersionInStorage,
|
||||
} from './errors';
|
||||
import {NGXLogger} from 'ngx-logger';
|
||||
import {sampleIndexResponse} from '../../_helpers/data/sample-configuration';
|
||||
|
||||
|
||||
@@ -14,19 +14,14 @@
|
||||
*/
|
||||
import {Injectable} from '@angular/core';
|
||||
import {Client} from '@openstapps/api';
|
||||
import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core';
|
||||
import {CORE_VERSION} from '@openstapps/core';
|
||||
import {SCIndexResponse} from '@openstapps/core';
|
||||
import packageInfo from '@openstapps/core/package.json';
|
||||
import {NGXLogger} from 'ngx-logger';
|
||||
import {environment} from '../../../environments/environment';
|
||||
import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
||||
import {StorageProvider} from '../storage/storage.provider';
|
||||
import {
|
||||
ConfigFetchError,
|
||||
ConfigInitError,
|
||||
ConfigValueNotAvailable,
|
||||
SavedConfigNotAvailable,
|
||||
WrongConfigVersionInStorage,
|
||||
} from './errors';
|
||||
import equals from 'fast-deep-equal/es6';
|
||||
import {BehaviorSubject} from 'rxjs';
|
||||
|
||||
/**
|
||||
* Key to store config in storage module
|
||||
@@ -35,6 +30,17 @@ import {
|
||||
*/
|
||||
export const STORAGE_KEY_CONFIG = 'stapps.config';
|
||||
|
||||
/**
|
||||
* Makes an object deeply immutable
|
||||
*/
|
||||
function deepFreeze<T extends object>(object: T) {
|
||||
for (const key of Object.keys(object)) {
|
||||
const value = (object as Record<string, unknown>)[key];
|
||||
if (typeof value === 'object' && !Object.isFrozen(value)) deepFreeze(value!);
|
||||
}
|
||||
return Object.freeze(object);
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides configuration
|
||||
*/
|
||||
@@ -50,18 +56,23 @@ export class ConfigProvider {
|
||||
/**
|
||||
* App configuration as IndexResponse
|
||||
*/
|
||||
config: SCIndexResponse;
|
||||
config: Readonly<SCIndexResponse>;
|
||||
|
||||
/**
|
||||
* Version of the @openstapps/core package that app is using
|
||||
*/
|
||||
scVersion = CORE_VERSION;
|
||||
scVersion = packageInfo.version;
|
||||
|
||||
/**
|
||||
* First session indicator (config not found in storage)
|
||||
*/
|
||||
firstSession = true;
|
||||
|
||||
/**
|
||||
* If the config requires an update
|
||||
*/
|
||||
needsUpdate$ = new BehaviorSubject(false);
|
||||
|
||||
/**
|
||||
* Constructor, initialise api client
|
||||
* @param storageProvider StorageProvider to load persistent configuration
|
||||
@@ -76,104 +87,35 @@ export class ConfigProvider {
|
||||
this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches configuration from backend
|
||||
*/
|
||||
async fetch(): Promise<SCIndexResponse> {
|
||||
try {
|
||||
return await this.client.handshake(this.scVersion);
|
||||
} catch {
|
||||
throw new ConfigFetchError();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the value of an app configuration
|
||||
* @param attribute requested attribute from app configuration
|
||||
*/
|
||||
public getValue(attribute: keyof SCAppConfiguration) {
|
||||
if (this.config.app[attribute] !== undefined) {
|
||||
return this.config.app[attribute];
|
||||
}
|
||||
throw new ConfigValueNotAvailable(attribute);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a value of the configuration (not only app configuration)
|
||||
* @param attribute requested attribute from the configuration
|
||||
*/
|
||||
public getAnyValue(attribute: keyof SCIndexResponse) {
|
||||
if (this.config[attribute] !== undefined) {
|
||||
return this.config[attribute];
|
||||
}
|
||||
throw new ConfigValueNotAvailable(attribute);
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialises the ConfigProvider
|
||||
* @throws ConfigInitError if no configuration could be loaded.
|
||||
* @throws WrongConfigVersionInStorage if fetch failed and saved config has wrong SCVersion
|
||||
*/
|
||||
async init(): Promise<void> {
|
||||
let loadError;
|
||||
let fetchError;
|
||||
// load saved configuration
|
||||
try {
|
||||
this.config = await this.loadLocal();
|
||||
this.firstSession = false;
|
||||
this.logger.log(`initialised configuration from storage`);
|
||||
if (this.config.backend.SCVersion !== this.scVersion) {
|
||||
loadError = new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
|
||||
this.config = (await this.storageProvider.has(STORAGE_KEY_CONFIG))
|
||||
? await this.storageProvider.get<SCIndexResponse>(STORAGE_KEY_CONFIG)
|
||||
: undefined!;
|
||||
this.firstSession = !this.config;
|
||||
|
||||
const updatedConfig = this.client.handshake(this.scVersion).then(async fetchedConfig => {
|
||||
if (!equals(fetchedConfig, this.config)) {
|
||||
await this.storageProvider.put(STORAGE_KEY_CONFIG, fetchedConfig);
|
||||
this.logger.log(`Config updated`);
|
||||
this.needsUpdate$.next(true);
|
||||
this.needsUpdate$.complete();
|
||||
}
|
||||
} catch (error) {
|
||||
loadError = error;
|
||||
}
|
||||
// fetch remote configuration from backend
|
||||
try {
|
||||
const fetchedConfig: SCIndexResponse = await this.fetch();
|
||||
await this.set(fetchedConfig);
|
||||
this.logger.log(`initialised configuration from remote`);
|
||||
} catch (error) {
|
||||
fetchError = error;
|
||||
}
|
||||
// check for occurred errors and throw them
|
||||
if (loadError !== undefined && fetchError !== undefined) {
|
||||
throw new ConfigInitError();
|
||||
}
|
||||
if (loadError !== undefined) {
|
||||
this.logger.warn(loadError);
|
||||
}
|
||||
if (fetchError !== undefined) {
|
||||
this.logger.warn(fetchError);
|
||||
}
|
||||
}
|
||||
return fetchedConfig;
|
||||
});
|
||||
|
||||
/**
|
||||
* Returns saved configuration from StorageModule
|
||||
* @throws SavedConfigNotAvailable if no configuration could be loaded
|
||||
*/
|
||||
async loadLocal(): Promise<SCIndexResponse> {
|
||||
// get local configuration
|
||||
if (await this.storageProvider.has(STORAGE_KEY_CONFIG)) {
|
||||
return this.storageProvider.get<SCIndexResponse>(STORAGE_KEY_CONFIG);
|
||||
this.config ??= await updatedConfig;
|
||||
this.config = deepFreeze(this.config);
|
||||
|
||||
if (this.config.backend.SCVersion !== this.scVersion) {
|
||||
this.logger.warn(
|
||||
'Incompatible config, expected',
|
||||
this.scVersion,
|
||||
'but got',
|
||||
this.config.backend.SCVersion,
|
||||
);
|
||||
}
|
||||
throw new SavedConfigNotAvailable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves the configuration from the provider
|
||||
* @param config configuration to save
|
||||
*/
|
||||
async save(config: SCIndexResponse): Promise<void> {
|
||||
await this.storageProvider.put(STORAGE_KEY_CONFIG, config);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the configuration in the module and writes it into app storage
|
||||
* @param config SCIndexResponse to set
|
||||
*/
|
||||
async set(config: SCIndexResponse): Promise<void> {
|
||||
this.config = config;
|
||||
await this.save(this.config);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import {AppError} from '../../_helpers/errors';
|
||||
|
||||
/**
|
||||
* Error that is thrown when fetching from backend fails
|
||||
*/
|
||||
export class ConfigFetchError extends AppError {
|
||||
constructor() {
|
||||
super('ConfigFetchError', 'App configuration could not be fetched!');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Error that is thrown when the ConfigProvider could be initialised
|
||||
*/
|
||||
export class ConfigInitError extends AppError {
|
||||
constructor() {
|
||||
super('ConfigInitError', 'App configuration could not be initialised!');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Error that is thrown when the requested config value is not available
|
||||
*/
|
||||
export class ConfigValueNotAvailable extends AppError {
|
||||
constructor(valueKey: string) {
|
||||
super('ConfigValueNotAvailable', `No attribute "${valueKey}" in config available!`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Error that is thrown when no saved config is available
|
||||
*/
|
||||
export class SavedConfigNotAvailable extends AppError {
|
||||
constructor() {
|
||||
super('SavedConfigNotAvailable', 'No saved app configuration available.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Error that is thrown when the SCVersion of the saved config is not compatible with the app
|
||||
*/
|
||||
export class WrongConfigVersionInStorage extends AppError {
|
||||
constructor(correctVersion: string, savedVersion: string) {
|
||||
super(
|
||||
'WrongConfigVersionInStorage',
|
||||
`The saved configs backend version ${savedVersion} ` +
|
||||
`does not equal the configured backend version ${correctVersion} of the app.`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
</ion-header>
|
||||
<div #schedule class="schedule">
|
||||
<a [routerLink]="['/schedule/week-overview']">
|
||||
<ion-icon [size]="36" [style.--weight]="300" name="calendar_month"></ion-icon>
|
||||
<ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon>
|
||||
<ion-label [innerHTML]="'schedule.recurring' | translate"></ion-label>
|
||||
</a>
|
||||
<!-- Avoid structural directives here, they might interfere with the collapse animation -->
|
||||
|
||||
@@ -21,7 +21,6 @@ import {SwiperModule} from 'swiper/angular';
|
||||
import {TranslateModule, TranslatePipe} from '@ngx-translate/core';
|
||||
import {MomentModule} from 'ngx-moment';
|
||||
import {DataModule} from '../data/data.module';
|
||||
import {SettingsProvider} from '../settings/settings.provider';
|
||||
import {DashboardComponent} from './dashboard.component';
|
||||
import {SearchSectionComponent} from './sections/search-section/search-section.component';
|
||||
import {NewsSectionComponent} from './sections/news-section/news-section.component';
|
||||
@@ -30,6 +29,7 @@ import {MensaSectionContentComponent} from './sections/mensa-section/mensa-secti
|
||||
import {FavoritesSectionComponent} from './sections/favorites-section/favorites-section.component';
|
||||
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
||||
import {UtilModule} from '../../util/util.module';
|
||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||
import {NewsModule} from '../news/news.module';
|
||||
import {JobSectionComponent} from './sections/jobs-section/job-section.component';
|
||||
import {JobModule} from '../jobs/jobs.module';
|
||||
@@ -55,7 +55,8 @@ const catalogRoutes: Routes = [
|
||||
JobSectionComponent,
|
||||
],
|
||||
imports: [
|
||||
IonicModule,
|
||||
IonicModule.forRoot(),
|
||||
IonIconModule,
|
||||
FormsModule,
|
||||
TranslateModule.forChild(),
|
||||
RouterModule.forChild(catalogRoutes),
|
||||
@@ -68,6 +69,6 @@ const catalogRoutes: Routes = [
|
||||
NewsModule,
|
||||
JobModule,
|
||||
],
|
||||
providers: [SettingsProvider, TranslatePipe],
|
||||
providers: [TranslatePipe],
|
||||
})
|
||||
export class DashboardModule {}
|
||||
|
||||
@@ -1,34 +1,32 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<stapps-section [title]="'dashboard.favorites.title' | translate">
|
||||
<ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/favorites']">
|
||||
<ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
|
||||
</ion-button>
|
||||
@if (items | async; as items) {
|
||||
<simple-swiper @fade>
|
||||
@for (item of items; track item) {
|
||||
<stapps-data-list-item
|
||||
[hideThumbnail]="true"
|
||||
[listItemEndInteraction]="false"
|
||||
[item]="item"
|
||||
appearance="square"
|
||||
></stapps-data-list-item>
|
||||
}
|
||||
</simple-swiper>
|
||||
} @else {
|
||||
<simple-swiper *ngIf="items | async as items; else noItems" @fade>
|
||||
<stapps-data-list-item
|
||||
*ngFor="let item of items"
|
||||
[hideThumbnail]="true"
|
||||
[listItemEndInteraction]="false"
|
||||
[item]="item"
|
||||
appearance="square"
|
||||
></stapps-data-list-item>
|
||||
</simple-swiper>
|
||||
<ng-template #noItems>
|
||||
<ion-item class="nothing-selected" lines="none">
|
||||
<ion-label class="ion-text-wrap">
|
||||
{{ 'dashboard.favorites.no_favorite_prefix' | translate }}
|
||||
@@ -36,5 +34,5 @@
|
||||
{{ 'dashboard.favorites.no_favorite_suffix' | translate }}
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
}
|
||||
</ng-template>
|
||||
</stapps-section>
|
||||
|
||||
@@ -1,44 +1,43 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<stapps-section [title]="'dashboard.jobs.title' | translate">
|
||||
<ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/jobs']">
|
||||
<ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
|
||||
</ion-button>
|
||||
@if (jobs | async; as jobs) {
|
||||
<simple-swiper @fade>
|
||||
@for (item of jobs; track item) {
|
||||
<stapps-data-list-item
|
||||
[hideThumbnail]="true"
|
||||
[item]="item"
|
||||
appearance="square"
|
||||
></stapps-data-list-item>
|
||||
}
|
||||
<ion-item [routerLink]="['/jobs']" class="more-jobs" lines="none">
|
||||
<ion-label>{{ 'dashboard.jobs.title' | translate | titlecase }}</ion-label>
|
||||
<ion-icon color="medium" name="read_more" [size]="40"></ion-icon>
|
||||
</ion-item>
|
||||
</simple-swiper>
|
||||
} @else {
|
||||
<simple-swiper *ngIf="jobs | async as jobs; else noItems" @fade>
|
||||
<stapps-data-list-item
|
||||
*ngFor="let item of jobs"
|
||||
[hideThumbnail]="true"
|
||||
[item]="item"
|
||||
appearance="square"
|
||||
></stapps-data-list-item>
|
||||
<ion-item [routerLink]="['/jobs']" class="more-jobs" lines="none">
|
||||
<ion-label>{{ 'dashboard.jobs.title' | translate | titlecase }}</ion-label>
|
||||
<ion-icon color="medium" name="read_more" [size]="40"></ion-icon>
|
||||
</ion-item>
|
||||
</simple-swiper>
|
||||
<ng-template #noItems>
|
||||
<ion-item class="nothing-selected" lines="none">
|
||||
<ion-label class="ion-text-wrap">
|
||||
{{ 'dashboard.jobs.noJobs' | translate }}
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
|
||||
<ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/jobs']">
|
||||
<ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
|
||||
</ion-button>
|
||||
}
|
||||
</ng-template>
|
||||
</stapps-section>
|
||||
|
||||
@@ -1,37 +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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (dishes | async; as dishes) {
|
||||
@if (dishes.length > 0) {
|
||||
<simple-swiper @fade>
|
||||
@for (dish of dishes; track dish) {
|
||||
<stapps-data-list-item
|
||||
[hideThumbnail]="true"
|
||||
[item]="dish"
|
||||
appearance="square"
|
||||
></stapps-data-list-item>
|
||||
}
|
||||
</simple-swiper>
|
||||
}
|
||||
@if (!dishes || dishes.length === 0) {
|
||||
<ion-item class="no-dishes" lines="none">
|
||||
<ion-label>
|
||||
{{ 'dashboard.canteens.no_dishes_available' | translate }}
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
}
|
||||
} @else {
|
||||
<ng-container *ngIf="dishes | async as dishes; else loading">
|
||||
<simple-swiper *ngIf="dishes.length > 0" @fade>
|
||||
<stapps-data-list-item
|
||||
*ngFor="let dish of dishes"
|
||||
[hideThumbnail]="true"
|
||||
[item]="dish"
|
||||
appearance="square"
|
||||
></stapps-data-list-item>
|
||||
</simple-swiper>
|
||||
<ion-item class="no-dishes" *ngIf="!dishes || dishes.length === 0" lines="none">
|
||||
<ion-label>
|
||||
{{ 'dashboard.canteens.no_dishes_available' | translate }}
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ng-container>
|
||||
<ng-template #loading>
|
||||
<div class="placeholder"></div>
|
||||
}
|
||||
</ng-template>
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (items | async; as items) {
|
||||
@if (items.length !== 0) {
|
||||
@for (item of items; track item) {
|
||||
<ng-container *ngIf="items | async as items">
|
||||
<ng-container *ngIf="items.length !== 0; else nothingSelected">
|
||||
<ng-container *ngFor="let item of items">
|
||||
<stapps-section @fade [item]="item" [title]="'name' | thingTranslate: item">
|
||||
<ion-button slot="button-end" fill="clear" color="medium" (click)="favoritesService.delete(item)">
|
||||
<ion-icon slot="icon-only" name="delete" [size]="24"></ion-icon>
|
||||
@@ -23,8 +23,9 @@
|
||||
<stapps-opening-hours slot="subtitle" [openingHours]="$any(item).openingHours"></stapps-opening-hours>
|
||||
<stapps-mensa-section-content [item]="item"></stapps-mensa-section-content>
|
||||
</stapps-section>
|
||||
}
|
||||
} @else {
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
<ng-template #nothingSelected>
|
||||
<stapps-section [title]="'dashboard.canteens.title' | translate">
|
||||
<ion-item class="nothing-selected" lines="none">
|
||||
<ion-label class="ion-text-wrap">
|
||||
@@ -34,5 +35,5 @@
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</stapps-section>
|
||||
}
|
||||
}
|
||||
</ng-template>
|
||||
</ng-container>
|
||||
|
||||
@@ -1,33 +1,29 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<stapps-section [title]="'dashboard.news.title' | translate">
|
||||
<ion-button size="small" slot="button-end" fill="clear" color="medium" [routerLink]="['/news']">
|
||||
<ion-icon slot="icon-only" name="read_more"></ion-icon>
|
||||
</ion-button>
|
||||
@if (news | async; as news) {
|
||||
<simple-swiper class="news-swiper card-swiper" @fade>
|
||||
@for (newsItem of news; track newsItem) {
|
||||
<stapps-news-item [item]="newsItem"> </stapps-news-item>
|
||||
}
|
||||
<ion-item [routerLink]="['/news']" class="more-news" lines="none">
|
||||
<ion-label>{{ 'dashboard.news.moreNews' | translate | titlecase }}</ion-label>
|
||||
<ion-thumbnail class="ion-margin-end">
|
||||
<ion-icon color="medium" name="read_more" [size]="150"></ion-icon>
|
||||
</ion-thumbnail>
|
||||
</ion-item>
|
||||
</simple-swiper>
|
||||
}
|
||||
<simple-swiper class="news-swiper card-swiper" *ngIf="news | async as news" @fade>
|
||||
<stapps-news-item *ngFor="let newsItem of news" [item]="newsItem"> </stapps-news-item>
|
||||
<ion-item [routerLink]="['/news']" class="more-news" lines="none">
|
||||
<ion-label>{{ 'dashboard.news.moreNews' | translate | titlecase }}</ion-label>
|
||||
<ion-thumbnail class="ion-margin-end">
|
||||
<ion-icon color="medium" name="read_more" [size]="150"></ion-icon>
|
||||
</ion-thumbnail>
|
||||
</ion-item>
|
||||
</simple-swiper>
|
||||
</stapps-section>
|
||||
|
||||
@@ -63,10 +63,10 @@ simple-swiper {
|
||||
.title {
|
||||
overflow: hidden;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
|
||||
white-space: break-spaces;
|
||||
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 3;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
*/
|
||||
|
||||
import {AnimationController} from '@ionic/angular';
|
||||
import {AnimationOptions} from '@ionic/angular/common/providers/nav-controller';
|
||||
import {AnimationOptions} from '@ionic/angular/providers/nav-controller';
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -1,25 +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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (applicable.locate) {
|
||||
<stapps-locate-action-chip [item]="item"></stapps-locate-action-chip>
|
||||
}
|
||||
@if (applicable.navigate) {
|
||||
<stapps-navigate-action-chip [item]="$any(item)"></stapps-navigate-action-chip>
|
||||
}
|
||||
<stapps-locate-action-chip *ngIf="applicable.locate" [item]="item"></stapps-locate-action-chip>
|
||||
<stapps-navigate-action-chip *ngIf="applicable.navigate" [item]="$any(item)"></stapps-navigate-action-chip>
|
||||
<!-- Add Event Chip needs to load data and should be the last -->
|
||||
@if (applicable.event) {
|
||||
<stapps-add-event-action-chip [item]="item"></stapps-add-event-action-chip>
|
||||
}
|
||||
<stapps-add-event-action-chip *ngIf="applicable.event" [item]="item"></stapps-add-event-action-chip>
|
||||
|
||||
@@ -60,7 +60,7 @@ export class AddEventActionChipComponent {
|
||||
/**
|
||||
* Current state of icon fill
|
||||
*/
|
||||
iconFill: 1 | 0;
|
||||
iconFill: boolean;
|
||||
|
||||
/**
|
||||
* Label
|
||||
|
||||
@@ -24,31 +24,31 @@ export enum AddEventStates {
|
||||
|
||||
export const AddEventStatesMap = {
|
||||
[AddEventStates.ADDED_ALL]: {
|
||||
icon: SCIcon.event_available,
|
||||
fill: 1,
|
||||
icon: SCIcon`event_available`,
|
||||
fill: true,
|
||||
label: 'data.chips.add_events.ADDED_ALL',
|
||||
disabled: false,
|
||||
color: 'success',
|
||||
},
|
||||
[AddEventStates.ADDED_SOME]: {
|
||||
icon: SCIcon.event,
|
||||
fill: 1,
|
||||
icon: SCIcon`event`,
|
||||
fill: true,
|
||||
label: 'data.chips.add_events.ADDED_SOME',
|
||||
disabled: false,
|
||||
color: 'success',
|
||||
},
|
||||
[AddEventStates.REMOVED_ALL]: {
|
||||
icon: SCIcon.calendar_today,
|
||||
fill: 0,
|
||||
icon: SCIcon`calendar_today`,
|
||||
fill: false,
|
||||
label: 'data.chips.add_events.REMOVED_ALL',
|
||||
disabled: false,
|
||||
color: 'primary',
|
||||
},
|
||||
[AddEventStates.UNAVAILABLE]: {
|
||||
icon: SCIcon.event_busy,
|
||||
fill: 0,
|
||||
icon: SCIcon`event_busy`,
|
||||
fill: false,
|
||||
label: 'data.chips.add_events.UNAVAILABLE',
|
||||
disabled: true,
|
||||
color: 'dark',
|
||||
},
|
||||
} as const;
|
||||
};
|
||||
|
||||
@@ -1,57 +1,57 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<div class="stack-children">
|
||||
@if (associatedDateSeries | async; as associatedDateSeries) {
|
||||
<ion-chip
|
||||
@chipTransition
|
||||
[disabled]="disabled"
|
||||
(click)="$event.stopPropagation(); editModal.present()"
|
||||
[color]="color"
|
||||
[outline]="true"
|
||||
>
|
||||
<ion-icon [name]="icon" [style.--fill]="iconFill"></ion-icon>
|
||||
<ion-label>{{ label | translate }}</ion-label>
|
||||
<stapps-edit-modal #editModal (save)="selection.save()">
|
||||
<ng-template>
|
||||
<ion-content parallax [parallaxSize]="160" class="ion-padding modal-content">
|
||||
<stapps-edit-event-selection
|
||||
#selection
|
||||
[items]="associatedDateSeries"
|
||||
(modified)="editModal.pendingChanges = true"
|
||||
></stapps-edit-event-selection>
|
||||
</ion-content>
|
||||
<ion-footer mode="ios">
|
||||
<ion-toolbar color="light">
|
||||
<ion-button
|
||||
slot="end"
|
||||
fill="clear"
|
||||
(click)="export()"
|
||||
[disabled]="!(selection.selection.indeterminate || selection.selection.checked)"
|
||||
>
|
||||
{{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate | titlecase }}
|
||||
<ion-icon slot="end" name="download"></ion-icon>
|
||||
</ion-button>
|
||||
</ion-toolbar>
|
||||
</ion-footer>
|
||||
</ng-template>
|
||||
</stapps-edit-modal>
|
||||
</ion-chip>
|
||||
} @else {
|
||||
<ion-chip
|
||||
*ngIf="associatedDateSeries | async as associatedDateSeries; else loading"
|
||||
@chipTransition
|
||||
[disabled]="disabled"
|
||||
(click)="$event.stopPropagation(); editModal.present()"
|
||||
[color]="color"
|
||||
[outline]="true"
|
||||
>
|
||||
<ion-icon [name]="icon" [fill]="iconFill"></ion-icon>
|
||||
<ion-label>{{ label | translate }}</ion-label>
|
||||
<stapps-edit-modal #editModal (save)="selection.save()">
|
||||
<ng-template>
|
||||
<ion-content parallax [parallaxSize]="160" class="ion-padding modal-content">
|
||||
<stapps-edit-event-selection
|
||||
#selection
|
||||
[items]="associatedDateSeries"
|
||||
(modified)="editModal.pendingChanges = true"
|
||||
></stapps-edit-event-selection>
|
||||
</ion-content>
|
||||
<ion-footer mode="ios">
|
||||
<ion-toolbar color="light">
|
||||
<ion-button
|
||||
slot="end"
|
||||
fill="clear"
|
||||
(click)="export()"
|
||||
[disabled]="!(selection.selection.indeterminate || selection.selection.checked)"
|
||||
>
|
||||
{{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate | titlecase }}
|
||||
<ion-icon slot="end" name="download"></ion-icon>
|
||||
</ion-button>
|
||||
</ion-toolbar>
|
||||
</ion-footer>
|
||||
</ng-template>
|
||||
</stapps-edit-modal>
|
||||
</ion-chip>
|
||||
<ng-template #loading>
|
||||
<ion-chip @chipSkeletonTransition>
|
||||
<ion-skeleton-text animated="true"></ion-skeleton-text>
|
||||
</ion-chip>
|
||||
}
|
||||
</ng-template>
|
||||
</div>
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
|
||||
.stack-children {
|
||||
display: grid;
|
||||
place-items: start start;
|
||||
align-items: start;
|
||||
justify-items: start;
|
||||
}
|
||||
|
||||
.stack-children > * {
|
||||
|
||||
@@ -14,5 +14,5 @@
|
||||
-->
|
||||
<ion-chip [color]="'primary'" [outline]="true" [geoNavigation]="place">
|
||||
<ion-icon name="directions"></ion-icon>
|
||||
<ion-label>{{ 'map.directions.TITLE' | translate }}</ion-label>
|
||||
<ion-label>{{'map.directions.TITLE' | translate}}</ion-label>
|
||||
</ion-chip>
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-item class="list-header" lines="none">
|
||||
<ion-checkbox
|
||||
@@ -22,7 +22,7 @@
|
||||
<ion-list-header> {{ 'data.chips.add_events.popover.ALL' | translate }} </ion-list-header>
|
||||
</ion-checkbox>
|
||||
</ion-item>
|
||||
@for (frequency of selection.children; track frequency) {
|
||||
<ng-container *ngFor="let frequency of selection.children">
|
||||
<ion-list inset="true" lines="full">
|
||||
<ion-item lines="none" class="list-header">
|
||||
<ion-checkbox
|
||||
@@ -31,55 +31,48 @@
|
||||
(ionChange)="modified.emit(); frequency.click()"
|
||||
>
|
||||
<ion-list-header>
|
||||
{{
|
||||
frequency.children[0].item.repeatFrequency
|
||||
? (frequency.children[0].item.repeatFrequency | durationLocalized: true | sentencecase)
|
||||
: ('data.chips.add_events.popover.SINGLE' | translate | titlecase)
|
||||
}}
|
||||
{{ frequency.children[0].item.repeatFrequency ? (frequency.children[0].item.repeatFrequency |
|
||||
durationLocalized: true | sentencecase) : ('data.chips.add_events.popover.SINGLE' | translate |
|
||||
titlecase) }}
|
||||
</ion-list-header>
|
||||
</ion-checkbox>
|
||||
</ion-item>
|
||||
@for (date of frequency.children; track date) {
|
||||
<ion-item>
|
||||
<ion-checkbox
|
||||
[checked]="date.selected"
|
||||
(ionChange)="modified.emit(); date.selected = !date.selected; frequency.notifyChildChanged()"
|
||||
>
|
||||
@if (date.item.dates.length > 1) {
|
||||
<ion-text>
|
||||
{{ date.item.dates[0] | amDateFormat: 'dddd, LT' }} -
|
||||
{{ date.item.dates[0] | amAdd: date.item.duration | amDateFormat: 'LT' }}
|
||||
</ion-text>
|
||||
<ion-item *ngFor="let date of frequency.children">
|
||||
<ion-checkbox
|
||||
[checked]="date.selected"
|
||||
(ionChange)="modified.emit(); date.selected = !date.selected; frequency.notifyChildChanged()"
|
||||
>
|
||||
<ng-container *ngIf="date.item.dates.length > 1; else single_event">
|
||||
<ion-text>
|
||||
{{ date.item.dates[0] | amDateFormat: 'dddd, LT' }} - {{ date.item.dates[0] | amAdd:
|
||||
date.item.duration | amDateFormat: 'LT' }}
|
||||
</ion-text>
|
||||
<br />
|
||||
<ion-text>
|
||||
{{ date.item.dates[0] | amDateFormat: 'LL' }} - {{ date.item.dates[date.item.dates.length - 1] |
|
||||
amDateFormat: 'LL' }}
|
||||
</ion-text>
|
||||
</ng-container>
|
||||
<ng-template #single_event>
|
||||
<ion-text *ngIf="date.item.dates[0] as time; else noDates">
|
||||
{{ time | amDateFormat: 'LL, LT' }} - {{ time | amAdd: date.item.duration | amDateFormat: 'LT' }}
|
||||
</ion-text>
|
||||
<ng-template #noDates>
|
||||
<ion-text color="danger">{{ 'data.chips.add_events.popover.DATA_ERROR' | translate }}</ion-text>
|
||||
<br />
|
||||
<ion-text>
|
||||
{{ date.item.dates[0] | amDateFormat: 'LL' }} -
|
||||
{{ date.item.dates[date.item.dates.length - 1] | amDateFormat: 'LL' }}
|
||||
<ion-text *ngFor="let id of date.item.identifiers | keyvalue">
|
||||
{{ id.key }}: {{ id.value }}
|
||||
</ion-text>
|
||||
} @else {
|
||||
@if (date.item.dates[0]; as time) {
|
||||
<ion-text>
|
||||
{{ time | amDateFormat: 'LL, LT' }} -
|
||||
{{ time | amAdd: date.item.duration | amDateFormat: 'LT' }}
|
||||
</ion-text>
|
||||
} @else {
|
||||
<ion-text color="danger">{{ 'data.chips.add_events.popover.DATA_ERROR' | translate }}</ion-text>
|
||||
<br />
|
||||
@for (id of date.item.identifiers | keyvalue; track id) {
|
||||
<ion-text> {{ id.key }}: {{ id.value }} </ion-text>
|
||||
}
|
||||
}
|
||||
}
|
||||
@if (date.item.inPlace) {
|
||||
<ng-container class="ion-align-items-center">
|
||||
<br />
|
||||
<ion-text color="medium" class="place">
|
||||
<ion-icon name="pin_drop"></ion-icon>
|
||||
<span> {{ 'inPlace.name' | thingTranslate: date.item }}</span>
|
||||
</ion-text>
|
||||
</ng-container>
|
||||
}
|
||||
</ion-checkbox>
|
||||
</ion-item>
|
||||
}
|
||||
</ng-template>
|
||||
</ng-template>
|
||||
<ng-container class="ion-align-items-center" *ngIf="date.item.inPlace">
|
||||
<br />
|
||||
<ion-text color="medium" class="place">
|
||||
<ion-icon name="pin_drop"></ion-icon>
|
||||
<span> {{ 'inPlace.name' | thingTranslate: date.item }}</span>
|
||||
</ion-text>
|
||||
</ng-container>
|
||||
</ion-checkbox>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
}
|
||||
</ng-container>
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-chip *ngIf="displayValue" [class.active]="active" (click)="emitToggle(value)">
|
||||
<ion-icon class="ion-color" name="check_circle" [fill]="true" *ngIf="active"></ion-icon>
|
||||
<ion-label>{{ displayValue }}</ion-label>
|
||||
</ion-chip>
|
||||
@@ -16,35 +16,35 @@ import {SCThingType} from '@openstapps/core';
|
||||
import {SCIcon} from '../../util/ion-icon/icon';
|
||||
|
||||
export const DataIcons: Record<SCThingType, string> = {
|
||||
'academic event': SCIcon.school,
|
||||
'assessment': SCIcon.fact_check,
|
||||
'article': SCIcon.article,
|
||||
'book': SCIcon.book,
|
||||
'building': SCIcon.location_city,
|
||||
'certification': SCIcon.contract,
|
||||
'catalog': SCIcon.inventory_2,
|
||||
'contact point': SCIcon.contact_page,
|
||||
'course of study': SCIcon.school,
|
||||
'date series': SCIcon.event,
|
||||
'dish': SCIcon.lunch_dining,
|
||||
'favorite': SCIcon.favorite,
|
||||
'floor': SCIcon.foundation,
|
||||
'id card': SCIcon.badge,
|
||||
'message': SCIcon.newspaper,
|
||||
'organization': SCIcon.business_center,
|
||||
'periodical': SCIcon.feed,
|
||||
'person': SCIcon.person,
|
||||
'point of interest': SCIcon.pin_drop,
|
||||
'publication event': SCIcon.campaign,
|
||||
'room': SCIcon.meeting_room,
|
||||
'semester': SCIcon.date_range,
|
||||
'setting': SCIcon.settings,
|
||||
'sport course': SCIcon.sports_soccer,
|
||||
'study module': SCIcon.view_module,
|
||||
'ticket': SCIcon.confirmation_number,
|
||||
'todo': SCIcon.task,
|
||||
'tour': SCIcon.tour,
|
||||
'video': SCIcon.movie,
|
||||
'diff': SCIcon.difference,
|
||||
'job posting': SCIcon.work,
|
||||
'academic event': SCIcon`school`,
|
||||
'assessment': SCIcon`fact_check`,
|
||||
'article': SCIcon`article`,
|
||||
'book': SCIcon`book`,
|
||||
'building': SCIcon`location_city`,
|
||||
'certification': SCIcon`contract`,
|
||||
'catalog': SCIcon`inventory_2`,
|
||||
'contact point': SCIcon`contact_page`,
|
||||
'course of study': SCIcon`school`,
|
||||
'date series': SCIcon`event`,
|
||||
'dish': SCIcon`lunch_dining`,
|
||||
'favorite': SCIcon`favorite`,
|
||||
'floor': SCIcon`foundation`,
|
||||
'id card': SCIcon`badge`,
|
||||
'message': SCIcon`newspaper`,
|
||||
'organization': SCIcon`business_center`,
|
||||
'periodical': SCIcon`feed`,
|
||||
'person': SCIcon`person`,
|
||||
'point of interest': SCIcon`pin_drop`,
|
||||
'publication event': SCIcon`campaign`,
|
||||
'room': SCIcon`meeting_room`,
|
||||
'semester': SCIcon`date_range`,
|
||||
'setting': SCIcon`settings`,
|
||||
'sport course': SCIcon`sports_soccer`,
|
||||
'study module': SCIcon`view_module`,
|
||||
'ticket': SCIcon`confirmation_number`,
|
||||
'todo': SCIcon`task`,
|
||||
'tour': SCIcon`tour`,
|
||||
'video': SCIcon`movie`,
|
||||
'diff': SCIcon`difference`,
|
||||
'job posting': SCIcon`work`,
|
||||
};
|
||||
|
||||
@@ -24,6 +24,7 @@ import {MarkdownModule} from 'ngx-markdown';
|
||||
import {MomentModule} from 'ngx-moment';
|
||||
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
||||
import {SimpleBrowser, browserFactory} from '../../util/browser.factory';
|
||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||
import {RoutingStackService} from '../../util/routing-stack.service';
|
||||
import {UtilModule} from '../../util/util.module';
|
||||
import {CalendarService} from '../calendar/calendar.service';
|
||||
@@ -31,7 +32,6 @@ import {ScheduleProvider} from '../calendar/schedule.provider';
|
||||
import {GeoNavigationDirective} from '../map/geo-navigation.directive';
|
||||
import {MapWidgetComponent} from '../map/widget/map-widget.component';
|
||||
import {MenuModule} from '../menu/menu.module';
|
||||
import {SettingsProvider} from '../settings/settings.provider';
|
||||
import {StorageModule} from '../storage/storage.module';
|
||||
import {ActionChipListComponent} from './chips/action-chip-list.component';
|
||||
import {AddEventActionChipComponent} from './chips/data/add-event-action-chip.component';
|
||||
@@ -187,10 +187,11 @@ import {ShareButtonComponent} from './elements/share-button.component';
|
||||
DataRoutingModule,
|
||||
FormsModule,
|
||||
HttpClientModule,
|
||||
IonicModule,
|
||||
IonicModule.forRoot(),
|
||||
LeafletModule,
|
||||
MarkdownModule.forRoot(),
|
||||
MenuModule,
|
||||
IonIconModule,
|
||||
MomentModule.forRoot({
|
||||
relativeTimeThresholdOptions: {
|
||||
m: 59,
|
||||
@@ -212,7 +213,6 @@ import {ShareButtonComponent} from './elements/share-button.component';
|
||||
StAppsWebHttpClient,
|
||||
CalendarService,
|
||||
RoutingStackService,
|
||||
SettingsProvider,
|
||||
{
|
||||
provide: SimpleBrowser,
|
||||
useFactory: browserFactory,
|
||||
|
||||
@@ -1,112 +1,105 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (showModalHeader) {
|
||||
<ion-header translucent>
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
<ion-title>{{ 'name' | thingTranslate: item }}</ion-title>
|
||||
<ion-buttons slot="end">
|
||||
<ion-button (click)="modalController.dismiss()">{{ 'app.ui.CLOSE' | translate }}</ion-button>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
}
|
||||
@if (!showModalHeader) {
|
||||
<stapps-title-card [item]="item"> </stapps-title-card>
|
||||
}
|
||||
<ion-header *ngIf="showModalHeader" translucent>
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
<ion-title>{{ 'name' | thingTranslate : item }}</ion-title>
|
||||
<ion-buttons slot="end">
|
||||
<ion-button (click)="modalController.dismiss()">{{ 'app.ui.CLOSE' | translate }}</ion-button>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
|
||||
<stapps-title-card *ngIf="!showModalHeader" [item]="item"> </stapps-title-card>
|
||||
<ng-container *ngTemplateOutlet="contentTemplateRef || defaultContent; context: {$implicit: item}">
|
||||
</ng-container>
|
||||
<stapps-origin-detail [origin]="item.origin"></stapps-origin-detail>
|
||||
|
||||
<ng-template #defaultContent>
|
||||
<div class="content-switch">
|
||||
@switch (item.type) {
|
||||
@case ('article') {
|
||||
<stapps-article-detail-content [item]="$any(item)"></stapps-article-detail-content>
|
||||
}
|
||||
@case ('catalog') {
|
||||
<stapps-catalog-detail-content [item]="$any(item)"></stapps-catalog-detail-content>
|
||||
}
|
||||
@case ('date series') {
|
||||
<stapps-date-series-detail-content [item]="$any(item)"></stapps-date-series-detail-content>
|
||||
}
|
||||
@case ('dish') {
|
||||
<stapps-dish-detail-content [item]="$any(item)"></stapps-dish-detail-content>
|
||||
}
|
||||
@case ('academic event') {
|
||||
<stapps-event-detail-content [item]="$any(item)"></stapps-event-detail-content>
|
||||
}
|
||||
@case ('sport course') {
|
||||
<stapps-event-detail-content [item]="$any(item)"></stapps-event-detail-content>
|
||||
}
|
||||
@case ('favorite') {
|
||||
<stapps-favorite-detail-content [item]="$any(item)"></stapps-favorite-detail-content>
|
||||
}
|
||||
@case ('message') {
|
||||
<stapps-message-detail-content [item]="$any(item)"></stapps-message-detail-content>
|
||||
}
|
||||
@case ('job posting') {
|
||||
<stapps-job-posting-detail-content [item]="$any(item)"></stapps-job-posting-detail-content>
|
||||
}
|
||||
@case ('person') {
|
||||
<stapps-person-detail-content [item]="$any(item)"></stapps-person-detail-content>
|
||||
}
|
||||
@case ('building') {
|
||||
<stapps-place-detail-content [item]="$any(item)"></stapps-place-detail-content>
|
||||
}
|
||||
@case ('floor') {
|
||||
<stapps-place-detail-content [item]="$any(item)"></stapps-place-detail-content>
|
||||
}
|
||||
@case ('point of interest') {
|
||||
<stapps-place-detail-content [item]="$any(item)"></stapps-place-detail-content>
|
||||
}
|
||||
@case ('room') {
|
||||
<stapps-place-detail-content
|
||||
[item]="$any(item)"
|
||||
[openAsModal]="openAsModal"
|
||||
></stapps-place-detail-content>
|
||||
}
|
||||
@case ('semester') {
|
||||
<stapps-semester-detail-content [item]="$any(item)"></stapps-semester-detail-content>
|
||||
}
|
||||
@case ('video') {
|
||||
<stapps-video-detail-content [item]="$any(item)"></stapps-video-detail-content>
|
||||
}
|
||||
@default {
|
||||
<ion-item class="ion-text-wrap" lines="inset">
|
||||
<ion-thumbnail slot="start" class="ion-margin-end">
|
||||
<ion-icon [name]="item.type | dataIcon"></ion-icon>
|
||||
</ion-thumbnail>
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col>
|
||||
<div class="ion-text-wrap">
|
||||
<h2 class="name">{{ item.name }}</h2>
|
||||
<ion-note>{{ item.type }}</ion-note>
|
||||
</div>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
</ion-item>
|
||||
@if (item.description) {
|
||||
<stapps-simple-card
|
||||
[title]="$any('description' | propertyNameTranslate: item) | titlecase"
|
||||
[content]="'description' | thingTranslate: item"
|
||||
></stapps-simple-card>
|
||||
}
|
||||
}
|
||||
}
|
||||
<div [ngSwitch]="item.type" class="content-switch">
|
||||
<stapps-article-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'article'"
|
||||
></stapps-article-detail-content>
|
||||
<stapps-catalog-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'catalog'"
|
||||
></stapps-catalog-detail-content>
|
||||
<stapps-date-series-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'date series'"
|
||||
></stapps-date-series-detail-content>
|
||||
<stapps-dish-detail-content [item]="$any(item)" *ngSwitchCase="'dish'"></stapps-dish-detail-content>
|
||||
<stapps-event-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'academic event'"
|
||||
></stapps-event-detail-content>
|
||||
<stapps-event-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'sport course'"
|
||||
></stapps-event-detail-content>
|
||||
<stapps-favorite-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'favorite'"
|
||||
></stapps-favorite-detail-content>
|
||||
<stapps-message-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'message'"
|
||||
></stapps-message-detail-content>
|
||||
<stapps-job-posting-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'job posting'"
|
||||
></stapps-job-posting-detail-content>
|
||||
<stapps-person-detail-content [item]="$any(item)" *ngSwitchCase="'person'"></stapps-person-detail-content>
|
||||
<stapps-place-detail-content [item]="$any(item)" *ngSwitchCase="'building'"></stapps-place-detail-content>
|
||||
<stapps-place-detail-content [item]="$any(item)" *ngSwitchCase="'floor'"></stapps-place-detail-content>
|
||||
<stapps-place-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'point of interest'"
|
||||
></stapps-place-detail-content>
|
||||
<stapps-place-detail-content
|
||||
[item]="$any(item)"
|
||||
[openAsModal]="openAsModal"
|
||||
*ngSwitchCase="'room'"
|
||||
></stapps-place-detail-content>
|
||||
<stapps-semester-detail-content
|
||||
[item]="$any(item)"
|
||||
*ngSwitchCase="'semester'"
|
||||
></stapps-semester-detail-content>
|
||||
<stapps-video-detail-content [item]="$any(item)" *ngSwitchCase="'video'"></stapps-video-detail-content>
|
||||
<ng-container *ngSwitchDefault>
|
||||
<ion-item class="ion-text-wrap" lines="inset">
|
||||
<ion-thumbnail slot="start" class="ion-margin-end">
|
||||
<ion-icon [name]="item.type | dataIcon"></ion-icon>
|
||||
</ion-thumbnail>
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col>
|
||||
<div class="ion-text-wrap">
|
||||
<h2 class="name">{{ item.name }}</h2>
|
||||
<ion-note>{{ item.type }}</ion-note>
|
||||
</div>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
</ion-item>
|
||||
<stapps-simple-card
|
||||
*ngIf="item.description"
|
||||
[title]="$any('description' | propertyNameTranslate : item) | titlecase"
|
||||
[content]="'description' | thingTranslate : item"
|
||||
></stapps-simple-card>
|
||||
</ng-container>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
@@ -41,7 +41,8 @@ stapps-origin-detail {
|
||||
|
||||
width: 100%;
|
||||
height: fit-content;
|
||||
margin-block: calc((var(--header-spacing-bottom) - var(--spacing-xl)) * -1) var(--spacing-xl);
|
||||
margin-block-start: calc((var(--header-spacing-bottom) - var(--spacing-xl)) * -1);
|
||||
margin-block-end: var(--spacing-xl);
|
||||
|
||||
background-color: var(--ion-card-background);
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
import {Component, ContentChild, EventEmitter, Input, OnInit, Output, TemplateRef} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {ModalController} from '@ionic/angular';
|
||||
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
|
||||
import {SCLanguageCode, SCSaveableThing, SCThings, SCUuid} from '@openstapps/core';
|
||||
import {SCSaveableThing, SCThings, SCUuid} from '@openstapps/core';
|
||||
import {DataProvider, DataScope} from '../data.provider';
|
||||
import {FavoritesService} from '../../favorites/favorites.service';
|
||||
import {take} from 'rxjs/operators';
|
||||
import {Network} from '@capacitor/network';
|
||||
import {DataListContext} from '../list/data-list.component';
|
||||
import {lastValueFrom} from 'rxjs';
|
||||
|
||||
export interface ExternalDataLoadEvent {
|
||||
uid: SCUuid;
|
||||
@@ -29,6 +29,13 @@ export interface ExternalDataLoadEvent {
|
||||
resolve: (item: SCThings | null | undefined) => void;
|
||||
}
|
||||
|
||||
/**
|
||||
* Type guard for SCSavableThing
|
||||
*/
|
||||
function isSCSavableThing(thing: SCThings | SCSaveableThing): thing is SCSaveableThing {
|
||||
return (thing as SCSaveableThing).data !== undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* A Component to display an SCThing detailed
|
||||
*/
|
||||
@@ -53,11 +60,6 @@ export class DataDetailComponent implements OnInit {
|
||||
|
||||
@Input() autoRouteDataPath = true;
|
||||
|
||||
/**
|
||||
* The language of the item
|
||||
*/
|
||||
language: SCLanguageCode;
|
||||
|
||||
/**
|
||||
* Indicating wether internet connectivity is given or not
|
||||
*/
|
||||
@@ -79,20 +81,12 @@ export class DataDetailComponent implements OnInit {
|
||||
|
||||
@Output() loadItem: EventEmitter<ExternalDataLoadEvent> = new EventEmitter<ExternalDataLoadEvent>();
|
||||
|
||||
/**
|
||||
* Type guard for SCSavableThing
|
||||
*/
|
||||
static isSCSavableThing(thing: SCThings | SCSaveableThing): thing is SCSaveableThing {
|
||||
return (thing as SCSaveableThing).data !== undefined;
|
||||
}
|
||||
|
||||
constructor(
|
||||
protected readonly route: ActivatedRoute,
|
||||
router: Router,
|
||||
private readonly dataProvider: DataProvider,
|
||||
private readonly favoritesService: FavoritesService,
|
||||
readonly modalController: ModalController,
|
||||
translateService: TranslateService,
|
||||
) {
|
||||
this.inputItem = router.getCurrentNavigation()?.extras.state?.item;
|
||||
if (!this.inputItem?.origin) {
|
||||
@@ -100,10 +94,6 @@ export class DataDetailComponent implements OnInit {
|
||||
// This can happen, for example, when detail views use `inPlace` list items
|
||||
delete this.inputItem;
|
||||
}
|
||||
this.language = translateService.currentLang as SCLanguageCode;
|
||||
translateService.onLangChange.subscribe((event: LangChangeEvent) => {
|
||||
this.language = event.lang as SCLanguageCode;
|
||||
});
|
||||
|
||||
this.isDisconnected = new Promise(async resolve => {
|
||||
const isConnected = (await Network.getStatus()).connected;
|
||||
@@ -126,13 +116,8 @@ export class DataDetailComponent implements OnInit {
|
||||
)
|
||||
: this.dataProvider.get(uid, DataScope.Remote)));
|
||||
|
||||
this.item = item
|
||||
? // eslint-disable-next-line unicorn/no-null
|
||||
DataDetailComponent.isSCSavableThing(item)
|
||||
? item.data
|
||||
: item
|
||||
: // eslint-disable-next-line unicorn/no-null
|
||||
null;
|
||||
// eslint-disable-next-line unicorn/no-null
|
||||
this.item = item ? (isSCSavableThing(item) ? item.data : item) : null;
|
||||
} catch {
|
||||
// eslint-disable-next-line unicorn/no-null
|
||||
this.item = null;
|
||||
@@ -144,14 +129,10 @@ export class DataDetailComponent implements OnInit {
|
||||
await this.getItem(uid ?? '', false);
|
||||
// fallback to the saved item (from favorites)
|
||||
if (this.item === null) {
|
||||
this.favoritesService
|
||||
.get(uid)
|
||||
.pipe(take(1))
|
||||
.subscribe(item => {
|
||||
if (item !== undefined) {
|
||||
this.item = item.data;
|
||||
}
|
||||
});
|
||||
const item = await lastValueFrom(this.favoritesService.get(uid).pipe(take(1)));
|
||||
if (item) {
|
||||
this.item = item.data;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,51 +1,40 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (defaultHeader) {
|
||||
<ion-header>
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
@if (!isModal) {
|
||||
<ion-buttons slot="start">
|
||||
<ion-back-button></ion-back-button>
|
||||
</ion-buttons>
|
||||
}
|
||||
@if (item) {
|
||||
<ion-title
|
||||
[style.opacity]="(collapse ? '1' : '0') + '!important'"
|
||||
[style.translate]="collapse ? '0' : '0 10px'"
|
||||
>{{ 'name' | thingTranslate: item }}</ion-title
|
||||
>
|
||||
}
|
||||
<ion-buttons [slot]="isModal ? 'start' : 'primary'">
|
||||
@if (item) {
|
||||
<stapps-share-button [title]="'name' | thingTranslate: item"></stapps-share-button>
|
||||
}
|
||||
@if (item) {
|
||||
<stapps-favorite-button [item]="$any(item)"></stapps-favorite-button>
|
||||
}
|
||||
</ion-buttons>
|
||||
@if (isModal) {
|
||||
<ion-buttons slot="end">
|
||||
<ion-button fill="clear" (click)="modalController.dismiss()">
|
||||
<ion-label>{{ 'modal.DISMISS' | translate }}</ion-label>
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
}
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
}
|
||||
<ion-header *ngIf="defaultHeader">
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
<ion-buttons slot="start" *ngIf="!isModal">
|
||||
<ion-back-button></ion-back-button>
|
||||
</ion-buttons>
|
||||
<ion-title
|
||||
*ngIf="item"
|
||||
[style.opacity]="(collapse ? '1' : '0') + '!important'"
|
||||
[style.translate]="collapse ? '0' : '0 10px'"
|
||||
>{{ 'name' | thingTranslate: item }}</ion-title
|
||||
>
|
||||
<ion-buttons [slot]="isModal ? 'start' : 'primary'">
|
||||
<stapps-share-button *ngIf="item" [title]="'name' | thingTranslate: item"></stapps-share-button>
|
||||
<stapps-favorite-button *ngIf="item" [item]="$any(item)"></stapps-favorite-button>
|
||||
</ion-buttons>
|
||||
<ion-buttons slot="end" *ngIf="isModal">
|
||||
<ion-button fill="clear" (click)="modalController.dismiss()">
|
||||
<ion-label>{{ 'modal.DISMISS' | translate }}</ion-label>
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<ng-content select="[header]"></ng-content>
|
||||
<ion-content
|
||||
parallax
|
||||
@@ -53,31 +42,31 @@
|
||||
[scrollEvents]="true"
|
||||
(ionScroll)="collapse = $any($event).detail.scrollTop > 50"
|
||||
>
|
||||
@switch (true) {
|
||||
@case (!item && (isDisconnected | async)) {
|
||||
<ng-container [ngSwitch]="true">
|
||||
<ng-container *ngSwitchCase="!item && (isDisconnected | async)">
|
||||
<div class="centered-message-container">
|
||||
<ion-icon name="signal_disconnected"></ion-icon>
|
||||
<ion-label> {{ 'data.detail.COULD_NOT_CONNECT' | translate }} </ion-label>
|
||||
</div>
|
||||
}
|
||||
@case (item === null) {
|
||||
</ng-container>
|
||||
<ng-container *ngSwitchCase="item === null">
|
||||
<div class="centered-message-container">
|
||||
<ion-icon name="link_off"></ion-icon>
|
||||
<ion-label> {{ 'data.detail.NOT_FOUND' | translate }} </ion-label>
|
||||
</div>
|
||||
}
|
||||
@case (!item && item !== null) {
|
||||
</ng-container>
|
||||
<ng-container *ngSwitchCase="!item && item !== null">
|
||||
<stapps-skeleton-list-item></stapps-skeleton-list-item>
|
||||
<stapps-skeleton-simple-card></stapps-skeleton-simple-card>
|
||||
}
|
||||
@default {
|
||||
@if (item) {
|
||||
</ng-container>
|
||||
<ng-container *ngSwitchDefault>
|
||||
<ng-container *ngIf="item">
|
||||
<stapps-data-path [item]="item" [autoRouting]="autoRouteDataPath"></stapps-data-path>
|
||||
<stapps-data-detail-content
|
||||
[item]="item"
|
||||
[contentTemplateRef]="contentTemplateRef"
|
||||
></stapps-data-detail-content>
|
||||
}
|
||||
}
|
||||
}
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
</ion-content>
|
||||
|
||||
@@ -1,19 +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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (path | async; as stack) {
|
||||
<ng-container *ngIf="path | async as stack">
|
||||
<ion-breadcrumbs
|
||||
color="light"
|
||||
[itemsBeforeCollapse]="1"
|
||||
@@ -21,23 +21,21 @@
|
||||
[maxItems]="maxItems"
|
||||
(ionCollapsedClick)="maxItems = undefined"
|
||||
>
|
||||
@for (fragment of stack; track fragment) {
|
||||
<ion-breadcrumb>
|
||||
<ion-label
|
||||
(click)="dataRoutingService.emitPathEvent(fragment)"
|
||||
[style.max-width]="
|
||||
stack.length === 1
|
||||
? '100%'
|
||||
: stack.length === 2
|
||||
? '40vw'
|
||||
: (($width | async) ?? 0) >= 768
|
||||
? '30vw'
|
||||
: 'calc(100vw - 120px)'
|
||||
"
|
||||
class="crumb-label"
|
||||
>{{ 'name' | thingTranslate: $any(fragment) }}</ion-label
|
||||
>
|
||||
</ion-breadcrumb>
|
||||
}
|
||||
<ion-breadcrumb *ngFor="let fragment of stack">
|
||||
<ion-label
|
||||
(click)="dataRoutingService.emitPathEvent(fragment)"
|
||||
[style.max-width]="
|
||||
stack.length === 1
|
||||
? '100%'
|
||||
: stack.length === 2
|
||||
? '40vw'
|
||||
: (($width | async) ?? 0) >= 768
|
||||
? '30vw'
|
||||
: 'calc(100vw - 120px)'
|
||||
"
|
||||
class="crumb-label"
|
||||
>{{ 'name' | thingTranslate : $any(fragment) }}</ion-label
|
||||
>
|
||||
</ion-breadcrumb>
|
||||
</ion-breadcrumbs>
|
||||
}
|
||||
</ng-container>
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-card>
|
||||
<ion-card-header>{{ 'data.detail.address.TITLE' | translate | titlecase }}</ion-card-header>
|
||||
@@ -29,22 +29,18 @@
|
||||
<ion-col>{{ 'data.detail.address.CITY' | translate | titlecase }}:</ion-col>
|
||||
<ion-col width-60 text-right> {{ address.addressLocality }} </ion-col>
|
||||
</ion-row>
|
||||
@if (address.addressRegion) {
|
||||
<ion-row>
|
||||
<ion-col>{{ 'data.detail.address.REGION' | translate | titlecase }}:</ion-col>
|
||||
<ion-col width-60 text-right> {{ address.addressRegion }} </ion-col>
|
||||
</ion-row>
|
||||
}
|
||||
<ion-row *ngIf="address.addressRegion">
|
||||
<ion-col>{{ 'data.detail.address.REGION' | translate | titlecase }}:</ion-col>
|
||||
<ion-col width-60 text-right> {{ address.addressRegion }} </ion-col>
|
||||
</ion-row>
|
||||
<ion-row>
|
||||
<ion-col>{{ 'data.detail.address.COUNTRY' | translate | titlecase }}:</ion-col>
|
||||
<ion-col width-60 text-right> {{ address.addressCountry }} </ion-col>
|
||||
</ion-row>
|
||||
@if (address.postOfficeBoxNumber) {
|
||||
<ion-row>
|
||||
<ion-col>{{ 'data.detail.address.POST_OFFICE_BOX' | translate | titlecase }}</ion-col>
|
||||
<ion-col width-60 text-right> {{ address.postOfficeBoxNumber }} </ion-col>
|
||||
</ion-row>
|
||||
}
|
||||
<ion-row *ngIf="address.postOfficeBoxNumber">
|
||||
<ion-col>{{ 'data.detail.address.POST_OFFICE_BOX' | translate | titlecase }}</ion-col>
|
||||
<ion-col width-60 text-right> {{ address.postOfficeBoxNumber }} </ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<ion-card>
|
||||
<ion-card-header>{{ 'data.types.certification.TITLE' | translate }}</ion-card-header>
|
||||
<ion-card-content>
|
||||
<div class="certification-list">
|
||||
@for (cert of certifications; track cert) {
|
||||
<ng-container *ngFor="let cert of certifications">
|
||||
<img
|
||||
(click)="popover.present($event)"
|
||||
[width]="72"
|
||||
@@ -31,7 +31,7 @@
|
||||
</ion-content>
|
||||
</ng-template>
|
||||
</ion-popover>
|
||||
}
|
||||
</ng-container>
|
||||
</div>
|
||||
<ion-note>
|
||||
<stapps-external-link
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<ion-button (click)="toggle($event)" color="medium" size="small" fill="clear">
|
||||
<ion-icon
|
||||
slot="icon-only"
|
||||
[style.--fill]="(isFavorite$ | async) ? 1 : 0"
|
||||
[fill]="(isFavorite$ | async) ?? false"
|
||||
[class.selected]="isFavorite$ | async"
|
||||
name="grade"
|
||||
></ion-icon>
|
||||
|
||||
@@ -1,34 +1,28 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
@if (text !== undefined) {
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<ng-container *ngIf="text !== undefined">
|
||||
<span class="ion-hide-sm-up">
|
||||
{{ text | slice: 0 : size }}
|
||||
@if (text.length > size) {
|
||||
<span class="ion-hide-sm-up">…</span>
|
||||
}
|
||||
{{ text | slice : 0 : size }}
|
||||
<span *ngIf="text.length > size" class="ion-hide-sm-up">…</span>
|
||||
</span>
|
||||
<span class="ion-hide-sm-down ion-hide-md-up">
|
||||
{{ text | slice: 0 : size * 2 }}
|
||||
@if (text.length > size * 2) {
|
||||
<span class="ion-hide-sm-down ion-hide-md-up"> … </span>
|
||||
}
|
||||
{{ text | slice : 0 : size * 2 }}
|
||||
<span *ngIf="text.length > size * 2" class="ion-hide-sm-down ion-hide-md-up"> … </span>
|
||||
</span>
|
||||
<span class="ion-hide-md-down">
|
||||
{{ text | slice: 0 : size * 3 }}
|
||||
@if (text.length > size * 3) {
|
||||
<span class="ion-hide-md-down">…</span>
|
||||
}
|
||||
{{ text | slice : 0 : size * 3 }}
|
||||
<span *ngIf="text.length > size * 3" class="ion-hide-md-down">…</span>
|
||||
</span>
|
||||
}
|
||||
</ng-container>
|
||||
|
||||
@@ -1,74 +1,60 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-card>
|
||||
<ion-card-header>{{ 'data.detail.offers.TITLE' | translate | titlecase }}</ion-card-header>
|
||||
<ion-card-content>
|
||||
@for (offer of offers; track offer) {
|
||||
<div>
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
@if (offer.inPlace) {
|
||||
<ion-col>
|
||||
<ion-icon name="pin_drop"></ion-icon>
|
||||
<a [routerLink]="['/data-detail', offer.inPlace.uid]">
|
||||
{{ 'name' | thingTranslate: offer.inPlace }}
|
||||
</a>
|
||||
</ion-col>
|
||||
}
|
||||
@if (offer.availabilityRange) {
|
||||
<ion-col>
|
||||
@if (offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte) {
|
||||
<span>
|
||||
{{
|
||||
(offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte)
|
||||
| amDateFormat: 'll'
|
||||
}}
|
||||
</span>
|
||||
}
|
||||
</ion-col>
|
||||
}
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
@if (offer.prices && offer.availability !== 'out of stock') {
|
||||
<ion-grid>
|
||||
@for (group of $any(offer.prices) | keyvalue; track group) {
|
||||
<ion-row>
|
||||
@if (group.key !== 'default') {
|
||||
<ion-col>{{ 'data.detail.offers.' + group.key | translate }} </ion-col>
|
||||
<ion-col width-20 text-right>
|
||||
<p>{{ $any(group.value) | currency: 'EUR' : 'symbol' : undefined : 'de' }}</p>
|
||||
</ion-col>
|
||||
}
|
||||
</ion-row>
|
||||
}
|
||||
</ion-grid>
|
||||
}
|
||||
@if (offer.availability === 'out of stock') {
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col></ion-col>
|
||||
<ion-col width-20 text-right>
|
||||
<ion-text color="danger">
|
||||
<p>{{ 'data.detail.offers.sold_out' | translate }}</p>
|
||||
</ion-text>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
<div *ngFor="let offer of offers">
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col *ngIf="offer.inPlace">
|
||||
<ion-icon name="pin_drop"></ion-icon>
|
||||
<a [routerLink]="['/data-detail', offer.inPlace.uid]">
|
||||
{{ 'name' | thingTranslate : offer.inPlace }}
|
||||
</a>
|
||||
</ion-col>
|
||||
<ion-col *ngIf="offer.availabilityRange">
|
||||
<span
|
||||
*ngIf="offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte"
|
||||
>
|
||||
{{ (offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte) |
|
||||
amDateFormat : 'll' }}
|
||||
</span>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
<ion-grid *ngIf="offer.prices && offer.availability !== 'out of stock'">
|
||||
<ion-row *ngFor="let group of $any(offer.prices) | keyvalue">
|
||||
<ng-container *ngIf="group.key !== 'default'">
|
||||
<ion-col>{{ 'data.detail.offers.' + group.key | translate }} </ion-col>
|
||||
<ion-col width-20 text-right>
|
||||
<p>{{ $any(group.value) | currency : 'EUR' : 'symbol' : undefined : 'de' }}</p>
|
||||
</ion-col>
|
||||
</ng-container>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
<ion-grid *ngIf="offer.availability === 'out of stock'">
|
||||
<ion-row>
|
||||
<ion-col></ion-col>
|
||||
<ion-col width-20 text-right>
|
||||
<ion-text color="danger">
|
||||
<p>{{ 'data.detail.offers.sold_out' | translate }}</p>
|
||||
</ion-text>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
</div>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
|
||||
@@ -13,34 +13,34 @@
|
||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import {Component, Input} from '@angular/core';
|
||||
import {
|
||||
SCAcademicPriceGroup,
|
||||
SCThingThatCanBeOfferedAvailability,
|
||||
SCThingThatCanBeOfferedOffer,
|
||||
} from '@openstapps/core';
|
||||
import {SCAcademicPriceGroup, SCThingThatCanBeOfferedOffer} from '@openstapps/core';
|
||||
import {SettingsProvider} from '../../settings/settings.provider';
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
@Component({
|
||||
selector: 'stapps-offers-in-list',
|
||||
templateUrl: 'offers-in-list.html',
|
||||
styleUrls: ['offers-in-list.scss'],
|
||||
})
|
||||
export class OffersInListComponent {
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
@Input() set offers(it: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>) {
|
||||
this._offers = it;
|
||||
this.price = it[0].prices?.default;
|
||||
this.settingsProvider.getSetting('profile', 'group').then(group => {
|
||||
this.price = it[0].prices?.[(group.value as string).replace(/s$/, '') as never];
|
||||
this.settingsProvider.getSetting<string>('profile', 'group').then(group => {
|
||||
this.price = it[0].prices?.[group.replace(/s$/, '') as never];
|
||||
});
|
||||
|
||||
if (it.length === 1) {
|
||||
this.availability = it[0].availability;
|
||||
}
|
||||
const availabilities = new Set(it.map(offer => offer.availability));
|
||||
this.soldOut = availabilities.has('out of stock') && availabilities.size === 1;
|
||||
}
|
||||
|
||||
price?: number;
|
||||
|
||||
availability: SCThingThatCanBeOfferedAvailability;
|
||||
soldOut: boolean;
|
||||
|
||||
_offers: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>;
|
||||
|
||||
|
||||
@@ -1,32 +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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (price) {
|
||||
<ion-badge
|
||||
[color]="
|
||||
availability === 'out of stock'
|
||||
? 'danger'
|
||||
: availability === 'limited availability'
|
||||
? 'warning'
|
||||
: 'primary'
|
||||
"
|
||||
>
|
||||
{{
|
||||
availability === 'out of stock'
|
||||
? ('data.detail.offers.sold_out' | translate)
|
||||
: (price | currency: 'EUR' : 'symbol' : undefined : 'de')
|
||||
}}
|
||||
</ion-badge>
|
||||
}
|
||||
<div>
|
||||
<ion-text *ngIf="price && !soldOut" style="white-space: nowrap">
|
||||
<h2>{{ price | currency : 'EUR' : 'symbol' : undefined : 'de' }}</h2>
|
||||
</ion-text>
|
||||
<ion-text *ngIf="soldOut" color="danger" class="sold-out" style="white-space: nowrap">
|
||||
<h2>{{ 'data.detail.offers.sold_out' | translate }}</h2>
|
||||
</ion-text>
|
||||
<p *ngIf="_offers[0].inPlace && !soldOut" class="place" style="white-space: nowrap">
|
||||
<ion-icon name="pin_drop"></ion-icon>{{ _offers[0].inPlace.name }}<span *ngIf="_offers.length > 1"
|
||||
>...</span
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
:host {
|
||||
display: contents;
|
||||
}
|
||||
|
||||
ion-badge {
|
||||
translate: 0 0.25em;
|
||||
|
||||
display: inline-block;
|
||||
|
||||
margin-top: -0.25em;
|
||||
padding: 0.25em;
|
||||
|
||||
font-size: 0.8em;
|
||||
}
|
||||
@@ -1,84 +1,65 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (origin.type === 'user') {
|
||||
<ion-card>
|
||||
<ion-card-header
|
||||
>{{ 'data.types.origin.TITLE' | translate | titlecase }}:
|
||||
{{ 'data.types.origin.USER' | translate | titlecase }}</ion-card-header
|
||||
>
|
||||
<ion-card-content>
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.CREATED' | translate | titlecase }}:
|
||||
{{ origin.created | amDateFormat: 'll' }}
|
||||
</p>
|
||||
@if (origin.updated) {
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}:
|
||||
{{ origin.updated | amDateFormat: 'll' }}
|
||||
</p>
|
||||
}
|
||||
@if (origin.modified) {
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
|
||||
{{ origin.modified | amDateFormat: 'll' }}
|
||||
</p>
|
||||
}
|
||||
@if (origin.maintainer) {
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.MAINTAINER' | translate }}:
|
||||
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
||||
</p>
|
||||
}
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
}
|
||||
@if (origin.type === 'remote') {
|
||||
<ion-card>
|
||||
<ion-card-header
|
||||
>{{ 'data.types.origin.TITLE' | translate | titlecase }}:
|
||||
{{ 'data.types.origin.REMOTE' | translate | titlecase }}</ion-card-header
|
||||
>
|
||||
<ion-card-content>
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}:
|
||||
{{ origin.indexed | amDateFormat: 'll' }}
|
||||
</p>
|
||||
@if (origin.modified) {
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
|
||||
{{ origin.modified | amDateFormat: 'll' }}
|
||||
</p>
|
||||
}
|
||||
@if (origin.name) {
|
||||
<p>{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}</p>
|
||||
}
|
||||
@if (origin.maintainer) {
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.MAINTAINER' | translate | titlecase }}:
|
||||
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
||||
</p>
|
||||
}
|
||||
@if (origin.responsibleEntity) {
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.RESPONSIBLE' | translate | titlecase }}:
|
||||
<a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{
|
||||
origin.responsibleEntity.name
|
||||
}}</a>
|
||||
</p>
|
||||
}
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
}
|
||||
<ion-card *ngIf="origin.type === 'user'">
|
||||
<ion-card-header
|
||||
>{{ 'data.types.origin.TITLE' | translate | titlecase }}: {{ 'data.types.origin.USER' | translate |
|
||||
titlecase }}</ion-card-header
|
||||
>
|
||||
<ion-card-content>
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.CREATED' | translate | titlecase }}: {{ origin.created | amDateFormat :
|
||||
'll' }}
|
||||
</p>
|
||||
<p *ngIf="origin.updated">
|
||||
{{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}: {{ origin.updated | amDateFormat :
|
||||
'll' }}
|
||||
</p>
|
||||
<p *ngIf="origin.modified">
|
||||
{{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: {{ origin.modified | amDateFormat :
|
||||
'll' }}
|
||||
</p>
|
||||
<p *ngIf="origin.maintainer">
|
||||
{{ 'data.types.origin.detail.MAINTAINER' | translate }}:
|
||||
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
||||
</p>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
|
||||
<ion-card *ngIf="origin.type === 'remote'">
|
||||
<ion-card-header
|
||||
>{{ 'data.types.origin.TITLE' | translate | titlecase }}: {{ 'data.types.origin.REMOTE' | translate |
|
||||
titlecase }}</ion-card-header
|
||||
>
|
||||
<ion-card-content>
|
||||
<p>
|
||||
{{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}: {{ origin.indexed | amDateFormat :
|
||||
'll' }}
|
||||
</p>
|
||||
<p *ngIf="origin.modified">
|
||||
{{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: {{ origin.modified | amDateFormat :
|
||||
'll' }}
|
||||
</p>
|
||||
<p *ngIf="origin.name">{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}</p>
|
||||
<p *ngIf="origin.maintainer">
|
||||
{{ 'data.types.origin.detail.MAINTAINER' | translate | titlecase }}:
|
||||
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
||||
</p>
|
||||
<p *ngIf="origin.responsibleEntity">
|
||||
{{ 'data.types.origin.detail.RESPONSIBLE' | translate | titlecase }}:
|
||||
<a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{ origin.responsibleEntity.name }}</a>
|
||||
</p>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
@if (origin.type === 'user') {
|
||||
<div>
|
||||
<p>{{ origin.created | dateFormat }}</p>
|
||||
</div>
|
||||
}
|
||||
@if (origin.type === 'remote') {
|
||||
<div>
|
||||
<p>{{ origin.indexed | dateFormat }}</p>
|
||||
</div>
|
||||
}
|
||||
<div *ngIf="origin.type === 'user'">
|
||||
<p>{{ origin.created | dateFormat }}</p>
|
||||
</div>
|
||||
|
||||
<div *ngIf="origin.type === 'remote'">
|
||||
<p>{{ origin.indexed | dateFormat }}</p>
|
||||
</div>
|
||||
|
||||
@@ -1,39 +1,40 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (canBeRated | async) {
|
||||
<ion-button
|
||||
fill="clear"
|
||||
(click)="$event.stopPropagation(); performRating.next(true)"
|
||||
[disabled]="wasAlreadyRated | async"
|
||||
>
|
||||
<ion-icon slot="icon-only" color="medium" name="thumbs_up_down"></ion-icon>
|
||||
</ion-button>
|
||||
}
|
||||
@if ((performRating | async) && (wasAlreadyRated | async) !== true) {
|
||||
<div class="rating-stars" [@rating]="(userRating | async) === undefined ? 'abandoned' : 'rated'">
|
||||
@for (i of [5, 4, 3, 2, 1]; track i) {
|
||||
<ion-icon
|
||||
[class.rated-value]="(userRating | async) === i"
|
||||
(click)="$event.stopPropagation(); userRating.next(i)"
|
||||
slot="icon-only"
|
||||
[size]="32"
|
||||
color="medium"
|
||||
name="grade"
|
||||
></ion-icon>
|
||||
}
|
||||
<label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
|
||||
</div>
|
||||
}
|
||||
<ion-button
|
||||
*ngIf="canBeRated | async"
|
||||
fill="clear"
|
||||
(click)="$event.stopPropagation(); performRating.next(true)"
|
||||
[disabled]="wasAlreadyRated | async"
|
||||
>
|
||||
<ion-icon slot="icon-only" color="medium" name="thumbs_up_down"></ion-icon>
|
||||
</ion-button>
|
||||
|
||||
<div
|
||||
class="rating-stars"
|
||||
*ngIf="(performRating | async) && (wasAlreadyRated | async) !== true"
|
||||
[@rating]="(userRating | async) === undefined ? 'abandoned' : 'rated'"
|
||||
>
|
||||
<ion-icon
|
||||
[class.rated-value]="(userRating | async) === i"
|
||||
*ngFor="let i of [5, 4, 3, 2, 1]"
|
||||
(click)="$event.stopPropagation(); userRating.next(i)"
|
||||
slot="icon-only"
|
||||
[size]="32"
|
||||
color="medium"
|
||||
name="grade"
|
||||
></ion-icon>
|
||||
<label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<ion-button size="small" fill="clear" (click)="share() && toast.present()">
|
||||
<ion-icon [size]="24" slot="icon-only" name="share"></ion-icon>
|
||||
<ion-icon [size]="24" slot="icon-only" name="share" ios="ios_share"></ion-icon>
|
||||
</ion-button>
|
||||
<ion-toast [message]="'toast.TITLE_COPIED' | translate" #toast [duration]="2000"></ion-toast>
|
||||
|
||||
@@ -1,39 +1,38 @@
|
||||
<!--
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<ion-card>
|
||||
<ion-card-header>{{ title }}</ion-card-header>
|
||||
<ion-card-content>
|
||||
@if (isString(content)) {
|
||||
@if (isMarkdown) {
|
||||
<ng-container *ngIf="isString(content); else list">
|
||||
<ng-container *ngIf="isMarkdown; else plainText">
|
||||
<markdown [data]="content"></markdown>
|
||||
} @else {
|
||||
</ng-container>
|
||||
<ng-template #plainText>
|
||||
<p>{{ content }}</p>
|
||||
}
|
||||
} @else {
|
||||
@if (content && isThing(content[0])) {
|
||||
@for (thing of $any(content); track thing) {
|
||||
<a [routerLink]="['/data-detail', thing.uid]">
|
||||
<p>{{ 'name' | thingTranslate: thing }}</p>
|
||||
</a>
|
||||
}
|
||||
} @else {
|
||||
@for (text of $any(content); track text) {
|
||||
<p>{{ text }}</p>
|
||||
}
|
||||
}
|
||||
}
|
||||
</ng-template>
|
||||
</ng-container>
|
||||
<ng-template #list>
|
||||
<ng-container *ngIf="content && isThing(content[0]); else textList">
|
||||
<a [routerLink]="['/data-detail', thing.uid]" *ngFor="let thing of $any(content)">
|
||||
<p>{{ 'name' | thingTranslate : thing }}</p>
|
||||
</a>
|
||||
</ng-container>
|
||||
<ng-template #textList>
|
||||
<p *ngFor="let text of $any(content)">{{ text }}</p>
|
||||
</ng-template>
|
||||
</ng-template>
|
||||
</ion-card-content>
|
||||
</ion-card>
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<ion-item>
|
||||
@if (!hideThumbnail) {
|
||||
<ion-thumbnail slot="start" class="ion-margin-end">
|
||||
<ion-skeleton-text animated></ion-skeleton-text>
|
||||
</ion-thumbnail>
|
||||
}
|
||||
<ion-thumbnail *ngIf="!hideThumbnail" slot="start" class="ion-margin-end">
|
||||
<ion-skeleton-text animated></ion-skeleton-text>
|
||||
</ion-thumbnail>
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user