mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2025-12-27 08:36:14 +00:00
Compare commits
41 Commits
@openstapp
...
@openstapp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07e5c80223 | ||
|
|
2ac840d845 | ||
|
|
8b581ef9ca | ||
|
|
e2d5d4f187 | ||
|
|
496b50d892 | ||
|
e6c17c860b
|
|||
|
|
bb1f596bfc | ||
|
0c49fd8c34
|
|||
|
|
ce5016a992 | ||
|
3ac8c04765
|
|||
|
|
5c260dd26b | ||
|
|
f2e1a6ddd5 | ||
|
|
ccacfbf710 | ||
|
|
b249b329f7 | ||
|
|
7afc24f1bc | ||
|
|
7276525dfa | ||
|
|
c9e881582f | ||
|
|
df681de083 | ||
| 802a7a3fa7 | |||
|
|
343d03e647 | ||
| 727b92911e | |||
| 11bc987807 | |||
|
|
b8faae5988 | ||
| 67ab1fd613 | |||
|
|
142079bf0e | ||
|
|
5050ac90eb | ||
|
|
688bc5f2e7 | ||
|
|
ad174dd7d7 | ||
|
|
26e654f5b8 | ||
|
|
5439484a90 | ||
|
|
68f3366a27 | ||
|
|
dea9a82105 | ||
|
39d2801114
|
|||
|
|
341b209092 | ||
|
|
a6b88d3534 | ||
|
|
be863daaef | ||
| 2f64d69693 | |||
| 964516d3cf | |||
| 71ff9fd960 | |||
| abf9999461 | |||
| 53c3d0ba0c |
@@ -2,7 +2,13 @@
|
|||||||
|
|
||||||
/** @type {import('syncpack').RcFile} */
|
/** @type {import('syncpack').RcFile} */
|
||||||
const config = {
|
const config = {
|
||||||
semverGroups: [{range: ''}],
|
semverGroups: [
|
||||||
|
{
|
||||||
|
range: '',
|
||||||
|
dependencies: ['**'],
|
||||||
|
packages: ['**'],
|
||||||
|
}
|
||||||
|
],
|
||||||
source: ['package.json', '**/package.json'],
|
source: ['package.json', '**/package.json'],
|
||||||
indent: ' ',
|
indent: ' ',
|
||||||
sortFirst: [
|
sortFirst: [
|
||||||
|
|||||||
@@ -1,5 +1,31 @@
|
|||||||
# @openstapps/backend
|
# @openstapps/backend
|
||||||
|
|
||||||
|
## 3.3.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- @openstapps/core@3.3.2
|
||||||
|
- @openstapps/core-tools@3.3.2
|
||||||
|
|
||||||
|
## 3.3.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 67ab1fd6: fix for geo.point mapping
|
||||||
|
|
||||||
|
## 3.3.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 688bc5f2: v3.3.0 changes
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [688bc5f2]
|
||||||
|
- @openstapps/core@3.3.0
|
||||||
|
- @openstapps/core-tools@3.3.0
|
||||||
|
- @openstapps/logger@3.0.0
|
||||||
|
|
||||||
## 3.2.0
|
## 3.2.0
|
||||||
|
|
||||||
### Minor Changes
|
### Minor Changes
|
||||||
|
|||||||
15
backend/backend/config/f-u/version-history/2.5.0.de.md
Normal file
15
backend/backend/config/f-u/version-history/2.5.0.de.md
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# Goethe-Uni App 2.5
|
||||||
|
|
||||||
|
Die Goethe-Uni App ist noch besser geworden!
|
||||||
|
|
||||||
|
## Komplett neue Kartenansicht
|
||||||
|
|
||||||
|
Wir haben die Karte überarbeitet, um eine klarere und schnellere Übersicht zu bieten.
|
||||||
|
|
||||||
|
## Deutschlandticket mit an Bord
|
||||||
|
|
||||||
|
Wenn du das Upgrade des Semesterticket zum Deutschlandticket gemacht hast und eingeloggt bist, findet es sich jetzt auch in der App.
|
||||||
|
|
||||||
|
## Bibliotheksdienste sind wieder voll funktionsfähig
|
||||||
|
|
||||||
|
Aufgrund einiger Adhoc-Änderungen im Bibliothekssystem haben wir die App so angepasst, dass sie damit umgehen kann.
|
||||||
15
backend/backend/config/f-u/version-history/2.5.0.en.md
Normal file
15
backend/backend/config/f-u/version-history/2.5.0.en.md
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# Goethe-Uni App 2.5
|
||||||
|
|
||||||
|
The Goethe-Uni App got even better!
|
||||||
|
|
||||||
|
## Completely new map view
|
||||||
|
|
||||||
|
We overhauled the map to offer you a clearer and faster and overview.
|
||||||
|
|
||||||
|
## Deutschlandticket included
|
||||||
|
|
||||||
|
If you upgraded your Semesterticket to a Deutschlandticket it will now reside in the App if you are logged in.
|
||||||
|
|
||||||
|
## Library services are fully functional again
|
||||||
|
|
||||||
|
Due to some adhoc changes in the library system we adjusted the app to handle them properly.
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/backend",
|
"name": "@openstapps/backend",
|
||||||
"description": "A reference implementation for a StApps backend",
|
"description": "A reference implementation for a StApps backend",
|
||||||
"version": "3.2.0",
|
"version": "3.3.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
|
|||||||
@@ -13,15 +13,34 @@
|
|||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
|
import {
|
||||||
|
SCConfigFile,
|
||||||
|
SCPlace,
|
||||||
|
SCPlaceWithoutReferences,
|
||||||
|
SCSearchQuery,
|
||||||
|
SCSearchResponse,
|
||||||
|
SCThingWithCategoriesWithoutReferences,
|
||||||
|
SCThings,
|
||||||
|
SCUuid,
|
||||||
|
} from '@openstapps/core';
|
||||||
import {MailQueue} from '../notification/mail-queue.js';
|
import {MailQueue} from '../notification/mail-queue.js';
|
||||||
import {Bulk} from './bulk-storage.js';
|
import {Bulk} from './bulk-storage.js';
|
||||||
|
import {FeatureCollection, Point, Polygon} from 'geojson';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an instance of a database
|
* Creates an instance of a database
|
||||||
*/
|
*/
|
||||||
export type DatabaseConstructor = new (config: SCConfigFile, mailQueue?: MailQueue) => Database;
|
export type DatabaseConstructor = new (config: SCConfigFile, mailQueue?: MailQueue) => Database;
|
||||||
|
|
||||||
|
export type SupplementaryGeoJSON = FeatureCollection<Point | Polygon, SupplementaryGeoJSONThing>;
|
||||||
|
export type SupplementaryGeoJSONThing = Pick<
|
||||||
|
Extract<SCThings, SCPlace>,
|
||||||
|
Exclude<
|
||||||
|
keyof SCPlaceWithoutReferences | keyof SCThingWithCategoriesWithoutReferences<never, never>,
|
||||||
|
'geo' | 'origin' | 'translations'
|
||||||
|
>
|
||||||
|
>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines what one database class needs to have defined
|
* Defines what one database class needs to have defined
|
||||||
*/
|
*/
|
||||||
@@ -82,4 +101,9 @@ export interface Database {
|
|||||||
* @param params Parameters which form a search query to search the backend data
|
* @param params Parameters which form a search query to search the backend data
|
||||||
*/
|
*/
|
||||||
search(parameters: SCSearchQuery): Promise<SCSearchResponse>;
|
search(parameters: SCSearchQuery): Promise<SCSearchResponse>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get geo info for display on a map
|
||||||
|
*/
|
||||||
|
geo(): Promise<SupplementaryGeoJSON>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import {Logger} from '@openstapps/logger';
|
|||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import {MailQueue} from '../../notification/mail-queue.js';
|
import {MailQueue} from '../../notification/mail-queue.js';
|
||||||
import {Bulk} from '../bulk-storage.js';
|
import {Bulk} from '../bulk-storage.js';
|
||||||
import {Database} from '../database.js';
|
import {Database, SupplementaryGeoJSON, SupplementaryGeoJSONThing} from '../database.js';
|
||||||
import {parseAggregations} from './aggregations.js';
|
import {parseAggregations} from './aggregations.js';
|
||||||
import * as Monitoring from './monitoring.js';
|
import * as Monitoring from './monitoring.js';
|
||||||
import {buildQuery} from './query/query.js';
|
import {buildQuery} from './query/query.js';
|
||||||
@@ -46,6 +46,7 @@ import {
|
|||||||
} from './util/index.js';
|
} from './util/index.js';
|
||||||
import {noUndefined} from './util/no-undefined.js';
|
import {noUndefined} from './util/no-undefined.js';
|
||||||
import {retryCatch, RetryOptions} from './util/retry.js';
|
import {retryCatch, RetryOptions} from './util/retry.js';
|
||||||
|
import {Feature, Point, Polygon} from 'geojson';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A database interface for elasticsearch
|
* A database interface for elasticsearch
|
||||||
@@ -405,4 +406,49 @@ export class Elasticsearch implements Database {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async geo(): Promise<SupplementaryGeoJSON> {
|
||||||
|
const searchResponse = await this.client.search<Extract<SCThings, {geo: unknown}>>({
|
||||||
|
body: {
|
||||||
|
query: {
|
||||||
|
exists: {
|
||||||
|
field: 'geo',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
from: 0,
|
||||||
|
allow_no_indices: true,
|
||||||
|
index: ACTIVE_INDICES_ALIAS,
|
||||||
|
size: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
type: 'FeatureCollection',
|
||||||
|
features: searchResponse.hits.hits
|
||||||
|
.map(thing => {
|
||||||
|
return thing._source?.geo
|
||||||
|
? ({
|
||||||
|
id: Number(thing._source.identifiers?.['OSM']) || undefined,
|
||||||
|
type: 'Feature',
|
||||||
|
geometry: thing._source.geo.polygon ?? thing._source.geo.point,
|
||||||
|
properties: {
|
||||||
|
name: thing._source.name,
|
||||||
|
sameAs: thing._source.sameAs,
|
||||||
|
image: thing._source.image,
|
||||||
|
alternateNames: thing._source.alternateNames,
|
||||||
|
description: thing._source.description,
|
||||||
|
identifiers: thing._source.identifiers,
|
||||||
|
categories: thing._source.categories,
|
||||||
|
categorySpecificValues: thing._source.categorySpecificValues,
|
||||||
|
openingHours: thing._source.openingHours,
|
||||||
|
address: thing._source.address,
|
||||||
|
uid: thing._source.uid,
|
||||||
|
type: thing._source.type,
|
||||||
|
},
|
||||||
|
} satisfies Feature<Polygon | Point, SupplementaryGeoJSONThing>)
|
||||||
|
: undefined;
|
||||||
|
})
|
||||||
|
.filter(noUndefined),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export function buildDistanceFilter(
|
|||||||
): QueryDslSpecificQueryContainer<'geo_distance'> {
|
): QueryDslSpecificQueryContainer<'geo_distance'> {
|
||||||
const geoObject: QueryDslGeoDistanceQuery = {
|
const geoObject: QueryDslGeoDistanceQuery = {
|
||||||
distance: `${filter.arguments.distance}m`,
|
distance: `${filter.arguments.distance}m`,
|
||||||
[`${filter.arguments.field}.point.coordinates`]: {
|
[`${filter.arguments.field}.point`]: {
|
||||||
lat: filter.arguments.position[1],
|
lat: filter.arguments.position[1],
|
||||||
lon: filter.arguments.position[0],
|
lon: filter.arguments.position[0],
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -19,8 +19,11 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
|
|||||||
* Converts a geo filter to elasticsearch syntax
|
* Converts a geo filter to elasticsearch syntax
|
||||||
* @param filter A search filter for the retrieval of the data
|
* @param filter A search filter for the retrieval of the data
|
||||||
*/
|
*/
|
||||||
export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'geo_shape'> {
|
export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'bool'> {
|
||||||
return {
|
return {
|
||||||
|
bool: {
|
||||||
|
should: [
|
||||||
|
{
|
||||||
geo_shape: {
|
geo_shape: {
|
||||||
ignore_unmapped: true,
|
ignore_unmapped: true,
|
||||||
[`${filter.arguments.field}.polygon`]: {
|
[`${filter.arguments.field}.polygon`]: {
|
||||||
@@ -28,5 +31,17 @@ export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContai
|
|||||||
relation: filter.arguments.spatialRelation,
|
relation: filter.arguments.spatialRelation,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
} satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
|
||||||
|
{
|
||||||
|
geo_shape: {
|
||||||
|
ignore_unmapped: true,
|
||||||
|
[`${filter.arguments.field}.point`]: {
|
||||||
|
shape: filter.arguments.shape,
|
||||||
|
relation: filter.arguments.spatialRelation,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
|
||||||
|
],
|
||||||
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export function buildDistanceSort(sort: SCDistanceSort): SortOptions {
|
|||||||
mode: 'avg',
|
mode: 'avg',
|
||||||
order: sort.order,
|
order: sort.order,
|
||||||
unit: 'm',
|
unit: 'm',
|
||||||
[`${sort.arguments.field}.point.coordinates`]: {
|
[`${sort.arguments.field}.point`]: {
|
||||||
lat: sort.arguments.position[1],
|
lat: sort.arguments.position[1],
|
||||||
lon: sort.arguments.position[0],
|
lon: sort.arguments.position[0],
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import http from 'http';
|
|||||||
import {MailQueue} from '../src/notification/mail-queue.js';
|
import {MailQueue} from '../src/notification/mail-queue.js';
|
||||||
import {Bulk, BulkStorage} from '../src/storage/bulk-storage.js';
|
import {Bulk, BulkStorage} from '../src/storage/bulk-storage.js';
|
||||||
import getPort from 'get-port';
|
import getPort from 'get-port';
|
||||||
import {Database} from '../src/storage/database.js';
|
import {Database, SupplementaryGeoJSON} from '../src/storage/database.js';
|
||||||
import {v4} from 'uuid';
|
import {v4} from 'uuid';
|
||||||
import {backendConfig} from '../src/config.js';
|
import {backendConfig} from '../src/config.js';
|
||||||
import {getIndexUID} from '../src/storage/elasticsearch/util/index.js';
|
import {getIndexUID} from '../src/storage/elasticsearch/util/index.js';
|
||||||
@@ -58,7 +58,6 @@ export async function startApp(): Promise<Express> {
|
|||||||
* An elasticsearch mock
|
* An elasticsearch mock
|
||||||
*/
|
*/
|
||||||
export class ElasticsearchMock implements Database {
|
export class ElasticsearchMock implements Database {
|
||||||
// @ts-expect-error never read
|
|
||||||
private bulk: Bulk | undefined;
|
private bulk: Bulk | undefined;
|
||||||
|
|
||||||
private storageMock = new Map<string, SCThings>();
|
private storageMock = new Map<string, SCThings>();
|
||||||
@@ -67,6 +66,10 @@ export class ElasticsearchMock implements Database {
|
|||||||
// Nothing to do here
|
// Nothing to do here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
geo(): Promise<SupplementaryGeoJSON> {
|
||||||
|
throw new Error('Method not implemented.');
|
||||||
|
}
|
||||||
|
|
||||||
bulkCreated(bulk: Bulk): Promise<void> {
|
bulkCreated(bulk: Bulk): Promise<void> {
|
||||||
this.bulk = bulk;
|
this.bulk = bulk;
|
||||||
return Promise.resolve(undefined);
|
return Promise.resolve(undefined);
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ describe('Search route', async function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should reject GET, PUT with a valid search query', async function () {
|
it('should reject GET, PUT with a valid search query', async function () {
|
||||||
// const expectedParams = JSON.parse(JSON.stringify(defaultParams));
|
|
||||||
const {status} = await testApp.get('/search').set('Accept', 'application/json').send({
|
const {status} = await testApp.get('/search').set('Accept', 'application/json').send({
|
||||||
query: 'Some search terms',
|
query: 'Some search terms',
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -466,7 +466,7 @@ describe('Query', function () {
|
|||||||
const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = {
|
const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = {
|
||||||
geo_distance: {
|
geo_distance: {
|
||||||
'distance': '1000m',
|
'distance': '1000m',
|
||||||
'geo.point.coordinates': {
|
'geo.point': {
|
||||||
lat: 8.123,
|
lat: 8.123,
|
||||||
lon: 50.123,
|
lon: 50.123,
|
||||||
},
|
},
|
||||||
@@ -479,19 +479,40 @@ describe('Query', function () {
|
|||||||
it('should build geo filter for shapes and points', function () {
|
it('should build geo filter for shapes and points', function () {
|
||||||
const filter = buildFilter(searchFilters.geoPoint);
|
const filter = buildFilter(searchFilters.geoPoint);
|
||||||
const expectedFilter = {
|
const expectedFilter = {
|
||||||
|
bool: {
|
||||||
|
should: [
|
||||||
|
{
|
||||||
geo_shape: {
|
geo_shape: {
|
||||||
'geo.polygon': {
|
'geo.polygon': {
|
||||||
relation: undefined,
|
relation: undefined,
|
||||||
shape: {
|
shape: {
|
||||||
type: 'envelope',
|
|
||||||
coordinates: [
|
coordinates: [
|
||||||
[50.123, 8.123],
|
[50.123, 8.123],
|
||||||
[50.123, 8.123],
|
[50.123, 8.123],
|
||||||
],
|
],
|
||||||
|
type: 'envelope',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'ignore_unmapped': true,
|
'ignore_unmapped': true,
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
geo_shape: {
|
||||||
|
'geo.point': {
|
||||||
|
relation: undefined,
|
||||||
|
shape: {
|
||||||
|
coordinates: [
|
||||||
|
[50.123, 8.123],
|
||||||
|
[50.123, 8.123],
|
||||||
|
],
|
||||||
|
type: 'envelope',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
'ignore_unmapped': true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(filter).to.be.eql(expectedFilter);
|
expect(filter).to.be.eql(expectedFilter);
|
||||||
@@ -500,19 +521,40 @@ describe('Query', function () {
|
|||||||
it('should build geo filter for shapes only', function () {
|
it('should build geo filter for shapes only', function () {
|
||||||
const filter = buildFilter(searchFilters.geoShape);
|
const filter = buildFilter(searchFilters.geoShape);
|
||||||
const expectedFilter = {
|
const expectedFilter = {
|
||||||
|
bool: {
|
||||||
|
should: [
|
||||||
|
{
|
||||||
geo_shape: {
|
geo_shape: {
|
||||||
'geo.polygon': {
|
'geo.polygon': {
|
||||||
relation: 'contains',
|
relation: 'contains',
|
||||||
shape: {
|
shape: {
|
||||||
type: 'envelope',
|
|
||||||
coordinates: [
|
coordinates: [
|
||||||
[50.123, 8.123],
|
[50.123, 8.123],
|
||||||
[50.123, 8.123],
|
[50.123, 8.123],
|
||||||
],
|
],
|
||||||
|
type: 'envelope',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'ignore_unmapped': true,
|
'ignore_unmapped': true,
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
geo_shape: {
|
||||||
|
'geo.point': {
|
||||||
|
relation: 'contains',
|
||||||
|
shape: {
|
||||||
|
coordinates: [
|
||||||
|
[50.123, 8.123],
|
||||||
|
[50.123, 8.123],
|
||||||
|
],
|
||||||
|
type: 'envelope',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
'ignore_unmapped': true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(filter).to.be.eql(expectedFilter);
|
expect(filter).to.be.eql(expectedFilter);
|
||||||
@@ -594,7 +636,7 @@ describe('Query', function () {
|
|||||||
'mode': 'avg',
|
'mode': 'avg',
|
||||||
'order': 'desc',
|
'order': 'desc',
|
||||||
'unit': 'm',
|
'unit': 'm',
|
||||||
'geo.point.coordinates': {
|
'geo.point': {
|
||||||
lat: 50.123,
|
lat: 50.123,
|
||||||
lon: 8.123,
|
lon: 8.123,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/tsconfig
|
# @openstapps/tsconfig
|
||||||
|
|
||||||
|
## 3.3.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 688bc5f2: v3.3.0 changes
|
||||||
|
|
||||||
## 3.0.0
|
## 3.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
@@ -30,7 +36,7 @@
|
|||||||
|
|
||||||
```js
|
```js
|
||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
import './lib/app.js';
|
import "./lib/app.js";
|
||||||
```
|
```
|
||||||
|
|
||||||
- 64caebaf: Migrate to ESM
|
- 64caebaf: Migrate to ESM
|
||||||
@@ -105,7 +111,7 @@
|
|||||||
|
|
||||||
```js
|
```js
|
||||||
#!/usr/bin/env node
|
#!/usr/bin/env node
|
||||||
import './lib/app.js';
|
import "./lib/app.js";
|
||||||
```
|
```
|
||||||
|
|
||||||
- 64caebaf: Migrate to ESM
|
- 64caebaf: Migrate to ESM
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/tsconfig",
|
"name": "@openstapps/tsconfig",
|
||||||
"description": "The tsconfig for the openstapps project",
|
"description": "The tsconfig for the openstapps project",
|
||||||
"version": "3.0.0",
|
"version": "3.3.0",
|
||||||
"type": "commonjs",
|
"type": "commonjs",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
||||||
|
|||||||
@@ -19,15 +19,21 @@
|
|||||||
"allowSyntheticDefaultImports": true,
|
"allowSyntheticDefaultImports": true,
|
||||||
"noImplicitAny": true,
|
"noImplicitAny": true,
|
||||||
"noImplicitReturns": true,
|
"noImplicitReturns": true,
|
||||||
"noUnusedLocals": true,
|
"noUnusedLocals": false,
|
||||||
"noUnusedParameters": true,
|
"noUnusedParameters": false,
|
||||||
"outDir": "../../../lib/",
|
"outDir": "../../../lib/",
|
||||||
"lib": ["ES2022", "DOM"],
|
"lib": [
|
||||||
|
"ES2022",
|
||||||
|
"DOM"
|
||||||
|
],
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"target": "ES2022"
|
"target": "ES2022"
|
||||||
},
|
},
|
||||||
"ts-node": {
|
"ts-node": {
|
||||||
"transpileOnly": true
|
"transpileOnly": true
|
||||||
},
|
},
|
||||||
"exclude": ["../../../app.js", "../../../lib/"]
|
"exclude": [
|
||||||
|
"../../../app.js",
|
||||||
|
"../../../lib/"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,28 @@
|
|||||||
# @openstapps/minimal-connector
|
# @openstapps/minimal-connector
|
||||||
|
|
||||||
|
## 3.3.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- @openstapps/core@3.3.2
|
||||||
|
- @openstapps/api@3.3.2
|
||||||
|
|
||||||
|
## 3.3.0
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [688bc5f2]
|
||||||
|
- @openstapps/api@3.3.0
|
||||||
|
- @openstapps/core@3.3.0
|
||||||
|
- @openstapps/logger@3.0.0
|
||||||
|
|
||||||
## 3.2.0
|
## 3.2.0
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|
||||||
- Updated dependencies [912ae422]
|
- Updated dependencies [912ae422]
|
||||||
- @openstapps/core@4.0.0
|
- @openstapps/core@3.2.0
|
||||||
- @openstapps/api@4.0.0
|
- @openstapps/api@3.2.0
|
||||||
- @openstapps/logger@3.0.0
|
- @openstapps/logger@3.0.0
|
||||||
|
|
||||||
## 3.1.1
|
## 3.1.1
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/minimal-connector",
|
"name": "@openstapps/minimal-connector",
|
||||||
"description": "This is a minimal connector which serves as an example",
|
"description": "This is a minimal connector which serves as an example",
|
||||||
"version": "3.2.0",
|
"version": "3.3.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
@@ -1,13 +1,33 @@
|
|||||||
# @openstapps/minimal-plugin
|
# @openstapps/minimal-plugin
|
||||||
|
|
||||||
|
## 3.3.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- @openstapps/core@3.3.2
|
||||||
|
- @openstapps/core-tools@3.3.2
|
||||||
|
- @openstapps/api-plugin@3.3.2
|
||||||
|
- @openstapps/api@3.3.2
|
||||||
|
|
||||||
|
## 3.3.0
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [688bc5f2]
|
||||||
|
- @openstapps/api@3.3.0
|
||||||
|
- @openstapps/core@3.3.0
|
||||||
|
- @openstapps/api-plugin@3.3.0
|
||||||
|
- @openstapps/core-tools@3.3.0
|
||||||
|
- @openstapps/logger@3.0.0
|
||||||
|
|
||||||
## 3.2.0
|
## 3.2.0
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|
||||||
- Updated dependencies [912ae422]
|
- Updated dependencies [912ae422]
|
||||||
- @openstapps/core@4.0.0
|
- @openstapps/core@3.2.0
|
||||||
- @openstapps/api@4.0.0
|
- @openstapps/api@3.2.0
|
||||||
- @openstapps/api-plugin@4.0.0
|
- @openstapps/api-plugin@3.2.0
|
||||||
- @openstapps/core-tools@3.0.0
|
- @openstapps/core-tools@3.0.0
|
||||||
- @openstapps/logger@3.0.0
|
- @openstapps/logger@3.0.0
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/minimal-plugin",
|
"name": "@openstapps/minimal-plugin",
|
||||||
"description": "Minimal Plugin",
|
"description": "Minimal Plugin",
|
||||||
"version": "3.2.0",
|
"version": "3.3.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
12
flake.lock
generated
12
flake.lock
generated
@@ -5,11 +5,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701680307,
|
"lastModified": 1709126324,
|
||||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701626906,
|
"lastModified": 1709747860,
|
||||||
"narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=",
|
"narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361",
|
"rev": "58ae79ea707579c40102ddf62d84b902a987c58b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
48
flake.nix
48
flake.nix
@@ -4,22 +4,37 @@
|
|||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
};
|
};
|
||||||
outputs = {
|
outputs =
|
||||||
|
{
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
flake-utils,
|
flake-utils,
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
aapt2buildToolsVersion = "33.0.2";
|
aapt2buildToolsVersion = "33.0.2";
|
||||||
in
|
in
|
||||||
flake-utils.lib.eachDefaultSystem (system: let
|
flake-utils.lib.eachDefaultSystem (
|
||||||
|
system:
|
||||||
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [
|
overlays = [
|
||||||
(final: prev: rec {
|
(final: prev: rec {
|
||||||
fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff]));
|
fontMin = prev.python311.withPackages (
|
||||||
|
ps:
|
||||||
|
with ps;
|
||||||
|
[
|
||||||
|
brotli
|
||||||
|
fonttools
|
||||||
|
]
|
||||||
|
++ (with fonttools.optional-dependencies; [ woff ])
|
||||||
|
);
|
||||||
android = prev.androidenv.composeAndroidPackages {
|
android = prev.androidenv.composeAndroidPackages {
|
||||||
buildToolsVersions = ["30.0.3" aapt2buildToolsVersion];
|
buildToolsVersions = [
|
||||||
platformVersions = ["33"];
|
"34.0.0"
|
||||||
|
aapt2buildToolsVersion
|
||||||
|
];
|
||||||
|
platformVersions = [ "34" ];
|
||||||
};
|
};
|
||||||
cypress = prev.cypress.overrideAttrs (cyPrev: rec {
|
cypress = prev.cypress.overrideAttrs (cyPrev: rec {
|
||||||
version = "13.2.0";
|
version = "13.2.0";
|
||||||
@@ -28,6 +43,8 @@
|
|||||||
hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
|
hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
nodejs = prev.nodejs_18;
|
||||||
|
corepack = prev.corepack_18;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
config = {
|
config = {
|
||||||
@@ -37,7 +54,7 @@
|
|||||||
};
|
};
|
||||||
androidFhs = pkgs.buildFHSUserEnv {
|
androidFhs = pkgs.buildFHSUserEnv {
|
||||||
name = "android-env";
|
name = "android-env";
|
||||||
targetPkgs = pkgs: with pkgs; [];
|
targetPkgs = pkgs: with pkgs; [ ];
|
||||||
runScript = "bash";
|
runScript = "bash";
|
||||||
profile = ''
|
profile = ''
|
||||||
export ALLOW_NINJA_ENV=true
|
export ALLOW_NINJA_ENV=true
|
||||||
@@ -45,25 +62,21 @@
|
|||||||
export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
|
export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
devShell = pkgs.mkShell rec {
|
devShell = pkgs.mkShell rec {
|
||||||
nativeBuildInputs = [androidFhs];
|
nativeBuildInputs = [ androidFhs ];
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
nodejs-18_x
|
nodejs
|
||||||
nodePackages.pnpm
|
corepack
|
||||||
# tools
|
# tools
|
||||||
curl
|
curl
|
||||||
jq
|
jq
|
||||||
fontMin
|
fontMin
|
||||||
# browsers
|
|
||||||
firefox
|
|
||||||
google-chrome
|
|
||||||
epiphany # Safari-ish browser
|
|
||||||
cypress
|
cypress
|
||||||
# android
|
# android
|
||||||
jdk17
|
jdk17
|
||||||
android.androidsdk
|
android.androidsdk
|
||||||
musl
|
|
||||||
];
|
];
|
||||||
ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
|
ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
|
||||||
ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
|
ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
|
||||||
@@ -71,5 +84,6 @@
|
|||||||
CYPRESS_INSTALL_BINARY = "0";
|
CYPRESS_INSTALL_BINARY = "0";
|
||||||
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
|
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
|
||||||
};
|
};
|
||||||
});
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,38 @@
|
|||||||
# @openstapps/app
|
# @openstapps/app
|
||||||
|
|
||||||
|
## 3.3.4
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 8b581ef9: Use user facing changelogs in the about pages as the primary source, with the technical changes accessible through a sub menu.
|
||||||
|
|
||||||
|
## 3.3.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 496b50d8: Bug fixes and Android target sdk version is now 34
|
||||||
|
|
||||||
|
## 3.3.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 7afc24f1: fixed config version comparison
|
||||||
|
- @openstapps/core@3.3.2
|
||||||
|
- @openstapps/api@3.3.2
|
||||||
|
|
||||||
|
## 3.3.0
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 688bc5f2: v3.3.0 changes
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [688bc5f2]
|
||||||
|
- @openstapps/api@3.2.0
|
||||||
|
- @openstapps/core@3.2.0
|
||||||
|
- @openstapps/collection-utils@3.0.0
|
||||||
|
|
||||||
## 3.2.0
|
## 3.2.0
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
@@ -295,3 +328,225 @@
|
|||||||
- Updated dependencies [64caebaf]
|
- Updated dependencies [64caebaf]
|
||||||
- @openstapps/api@3.0.0-next.0
|
- @openstapps/api@3.0.0-next.0
|
||||||
- @openstapps/core@3.0.0-next.0
|
- @openstapps/core@3.0.0-next.0
|
||||||
|
|
||||||
|
## 2.1.1
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- autofocus searchbar only when no default data is displayed ([e90286f](https://gitlab.com/openstapps/app/commit/e90286fc6814f5c40af3e297be42f23128b991be))
|
||||||
|
- breadcrumbs are under parallax ([9e160e8](https://gitlab.com/openstapps/app/commit/9e160e8d1ee9409e4fbe518c9dd9748705e680e1))
|
||||||
|
- browser logout only if endSession url defined ([7f6de94](https://gitlab.com/openstapps/app/commit/7f6de94ab572be66d7f10758c37dcf10af46b4e0)), closes [#395](https://gitlab.com/openstapps/app/issues/395)
|
||||||
|
- can't select some list elements on safari 16.4 ([3e99d7f](https://gitlab.com/openstapps/app/commit/3e99d7fa8fcae4538e1afe6a017570b0cb6ff45e))
|
||||||
|
- canteen view removes item select listener on view exit ([05e996a](https://gitlab.com/openstapps/app/commit/05e996ae9052b11c23dc1093ef526f08e3e2e6b6))
|
||||||
|
- catalog module semester selection ([afbd1fc](https://gitlab.com/openstapps/app/commit/afbd1fc048997acbc0113f8957016f8947b58626))
|
||||||
|
- catalog semester selection ([a8c7d5a](https://gitlab.com/openstapps/app/commit/a8c7d5ab5934adf853cc40c1df311178df54057e))
|
||||||
|
- data detail local favorite fallback causing duplicate nested favorite view ([dff4a95](https://gitlab.com/openstapps/app/commit/dff4a95acc55574b4872b0e4e39555cce0b2fd60))
|
||||||
|
- data-detail favorite button color leaking to list items ([95f2da2](https://gitlab.com/openstapps/app/commit/95f2da2def39ec56f40a660a63e5f7fddb4b3d53))
|
||||||
|
- location flow on iOS devices ([f207e02](https://gitlab.com/openstapps/app/commit/f207e029f1b30624bf411a57b3c552ef259e13ed))
|
||||||
|
- parallax broken since safari 16.4 ([0f970fa](https://gitlab.com/openstapps/app/commit/0f970fa1f164a310e24a85140d8bf0da21e5a5f1))
|
||||||
|
- remove infinite scroll e2e test ([47565e5](https://gitlab.com/openstapps/app/commit/47565e51b0dda5c8227238b6dc19f0d277408429))
|
||||||
|
- replace breadcrumb popover with simply expanding the breadcrumbs ([1318cbc](https://gitlab.com/openstapps/app/commit/1318cbca7f0cf72e10d96fff1a1116ba073fe8dc))
|
||||||
|
- schedule tabs navigating to the wrong url ([abf2ab6](https://gitlab.com/openstapps/app/commit/abf2ab6a5a94941d439adf54ec677332823892db))
|
||||||
|
- translate simple pipe doesn't update on language changes ([f5ca150](https://gitlab.com/openstapps/app/commit/f5ca1508fb9d95693615bfb9e03bc127bd83be00))
|
||||||
|
- typo in catalog provider query ([f49c44f](https://gitlab.com/openstapps/app/commit/f49c44f5c53780e4794dc1ef4cbacfb20cabbd97))
|
||||||
|
- workaround for side menu items not being active on page load ([947cab4](https://gitlab.com/openstapps/app/commit/947cab458ca770f116d28a1f22687ae620e71b59))
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- add content to empty catalogs ([982fb16](https://gitlab.com/openstapps/app/commit/982fb1653b3c1253aac9366733f14c22c94d2537))
|
||||||
|
- add easy way to configure search filtering for nested properties ([2220ab2](https://gitlab.com/openstapps/app/commit/2220ab24b385188515da7c176bf9c1ac72651fd9))
|
||||||
|
- dark theme ([e75a466](https://gitlab.com/openstapps/app/commit/e75a46633ca3685d6044eb9a8b2fd670f2cd030f))
|
||||||
|
- dashboard search rework ([8c30a47](https://gitlab.com/openstapps/app/commit/8c30a47706f07eb222fac47ad7fed61f9044328a))
|
||||||
|
- implement custom cdk virtual scroll behavior ([968cb72](https://gitlab.com/openstapps/app/commit/968cb729575c529fd6d1d35da1b50a8689057c46))
|
||||||
|
- optional logout from identity provider ([8cd2d77](https://gitlab.com/openstapps/app/commit/8cd2d777ab3a67b1ab24f03aa50a3ff73550c3d2)), closes [#372](https://gitlab.com/openstapps/app/issues/372)
|
||||||
|
- revamp dashboard mensa section ([33a74d9](https://gitlab.com/openstapps/app/commit/33a74d96ae92137f53a775e90bff99e5f2d41f6a))
|
||||||
|
- rework settings page design ([2f1298c](https://gitlab.com/openstapps/app/commit/2f1298c9d7df25d2a16576245ea62c1b6094e507))
|
||||||
|
- show in-place in date series modal, resolves [#385](https://gitlab.com/openstapps/app/issues/385) ([22e70ae](https://gitlab.com/openstapps/app/commit/22e70ae92b35578b559e6644dccb8d4bfd06af1e)), closes [#386](https://gitlab.com/openstapps/app/issues/386) [#388](https://gitlab.com/openstapps/app/issues/388)
|
||||||
|
- transition to full sidebar at xl instead of lg ([cc939f3](https://gitlab.com/openstapps/app/commit/cc939f38873833b7cc0260525a2ecd536f27bfa5))
|
||||||
|
|
||||||
|
## 2.0.1
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- assessment segments can become unreadable ([939fb6e](https://gitlab.com/openstapps/app/commit/939fb6ef0f11b40cb71fbe61da90f50b1f75c3f7))
|
||||||
|
- login button not easily found ([11d1ac3](https://gitlab.com/openstapps/app/commit/11d1ac3f7ce27c2822ea8f839df3f3dffbd6c020))
|
||||||
|
- remove misleading assessment calculations ([aefae33](https://gitlab.com/openstapps/app/commit/aefae33d5c9fa9ee3efe346e45429aca79ae3c48))
|
||||||
|
- right-align add event detail chip ([1eee652](https://gitlab.com/openstapps/app/commit/1eee652533c6b8f613ce09df9c3421f89209419a))
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- offline notice ([9b4caf5](https://gitlab.com/openstapps/app/commit/9b4caf526ffb53ec8d8885342323fcc52fd9fc09))
|
||||||
|
- separate prettier from eslint ([a88d000](https://gitlab.com/openstapps/app/commit/a88d000ccd6cbdeb5fbb07d209f2491023f9d76c))
|
||||||
|
|
||||||
|
# 2.0.0
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- daia_url missing in environment configs ([863a3ff](https://gitlab.com/openstapps/app/commit/863a3ffd488425e3313ab9b812c4b6d50c68a244))
|
||||||
|
- 404 on all surge links ([f1b4930](https://gitlab.com/openstapps/app/commit/f1b4930a3068e73aee20b4c3d71dac551ab60c35))
|
||||||
|
- add areaServed to person detail ([488150f](https://gitlab.com/openstapps/app/commit/488150f7f5558c05c1ec8a71afcb9f9a37e68a37))
|
||||||
|
- add event popover expanding beyond screen width ([046a95b](https://gitlab.com/openstapps/app/commit/046a95ba1dca3f5ded7e5555d3167f52f95be107))
|
||||||
|
- add location info to dates from timetable ([92adb9d](https://gitlab.com/openstapps/app/commit/92adb9dd2db18027dcc327433027e28c81ecbd4b)), closes [#344](https://gitlab.com/openstapps/app/issues/344)
|
||||||
|
- add missing profile translation ([cdb6ac4](https://gitlab.com/openstapps/app/commit/cdb6ac4084f8704d7f2336387a837b86f78c062b))
|
||||||
|
- add nav button to schedule page ([e628f39](https://gitlab.com/openstapps/app/commit/e628f396e22e51da2c9f2489fe89e42ccf474e2b))
|
||||||
|
- add openingHours config and catch its errors ([6125d43](https://gitlab.com/openstapps/app/commit/6125d43e8c18f2bf2afda67c0ff72e00d98ab34f))
|
||||||
|
- add PKCE parameters for PAIA auth ([f3e83bf](https://gitlab.com/openstapps/app/commit/f3e83bfcc88423f0935a060ccd0bf6198da58351))
|
||||||
|
- address late init from ionic components ([0bce9e5](https://gitlab.com/openstapps/app/commit/0bce9e5452fc5d05123756348dc30308de675bfa))
|
||||||
|
- adjust code to overcome the breaking changes (ionic 4 to 5) ([f779042](https://gitlab.com/openstapps/app/commit/f7790426cd2da4a6b33e2aa73783943f45b3de02)), closes [#70](https://gitlab.com/openstapps/app/issues/70)
|
||||||
|
- adjust hebis catalog templates ([83d9a4a](https://gitlab.com/openstapps/app/commit/83d9a4a8b8fe5b8687c72a717b3a2964524006e0))
|
||||||
|
- adjust library account user info ([bafabb1](https://gitlab.com/openstapps/app/commit/bafabb1d4ec299e2bea43cd4b8442ef33be2329a)), closes [#331](https://gitlab.com/openstapps/app/issues/331)
|
||||||
|
- adjust npm docker scripts and typos ([82bb15b](https://gitlab.com/openstapps/app/commit/82bb15b863e2d2e4df20244fda2f2e0d049ff43f))
|
||||||
|
- angular1 ng-if leftover ([25434d5](https://gitlab.com/openstapps/app/commit/25434d54e3800fd72a6c5d9188fb11f441d73aa9))
|
||||||
|
- assign navigation app name dynamically ([90b9733](https://gitlab.com/openstapps/app/commit/90b97339d3948b0864f634519416fe4a458b459f))
|
||||||
|
- background fetch crashing android app ([3316ad9](https://gitlab.com/openstapps/app/commit/3316ad9169ed2b29a2755405589213f824aec9d1))
|
||||||
|
- calculating SCDateSeries for next unit view ([82ba5f8](https://gitlab.com/openstapps/app/commit/82ba5f81211fb10cc5fde04991856567c4ac9680))
|
||||||
|
- canteen module layout ([b89f5c4](https://gitlab.com/openstapps/app/commit/b89f5c4edd1ed14f7529edc4e4ea54f9d98fda7c))
|
||||||
|
- canteen module layout ([6f7c680](https://gitlab.com/openstapps/app/commit/6f7c680ed89f027d863ebc02f5b24895d84f32e4))
|
||||||
|
- cards not having rounded corners in safari ([8a04a43](https://gitlab.com/openstapps/app/commit/8a04a439032920ead799f8b7483f29b896797c37))
|
||||||
|
- catch error `Setting "language" not provided` ([584878d](https://gitlab.com/openstapps/app/commit/584878d9503b8406b6ee7ec69dde5b8b3c4fd954))
|
||||||
|
- CI stage/job setup ([ae429ca](https://gitlab.com/openstapps/app/commit/ae429ca5fb3b5f10cad377d37b251806b3dabf6c))
|
||||||
|
- config.get issue by updating ionic ([9386351](https://gitlab.com/openstapps/app/commit/93863510fac32ed5b887011175a4807df3f522b8))
|
||||||
|
- **config:** fix catch ConfigFetchError in getValue ([161da63](https://gitlab.com/openstapps/app/commit/161da630ea59f6205ee53dece950972d4f36ada5)), closes [#46](https://gitlab.com/openstapps/app/issues/46)
|
||||||
|
- correct data path color ([0d755bc](https://gitlab.com/openstapps/app/commit/0d755bcbd3d6fea59a4f7a59981fd28844ff90d5))
|
||||||
|
- correct html whitespace handling for icon detection ([9bc3642](https://gitlab.com/openstapps/app/commit/9bc3642990b687dd524470fd26df80351aa85f1e))
|
||||||
|
- daia availability ([13cee2d](https://gitlab.com/openstapps/app/commit/13cee2d4261c7301c1c763446ae44dcdd005172d))
|
||||||
|
- dashboard next unit structural directive causing animation issues ([c8f6a27](https://gitlab.com/openstapps/app/commit/c8f6a27c571e51bcc0ac0120968e6bc9a20c8dd7))
|
||||||
|
- **data:** fix and adjust detail test using translation ([478f49a](https://gitlab.com/openstapps/app/commit/478f49a8744211b3c9458b3dadc791d62a46ae46)), closes [#50](https://gitlab.com/openstapps/app/issues/50)
|
||||||
|
- **data:** fix template and other consistency issues ([c3bc227](https://gitlab.com/openstapps/app/commit/c3bc227a3ca4a295b2b31bfe7fd34830b33c9f05))
|
||||||
|
- detail page when dish of mensa selected ([e5c2270](https://gitlab.com/openstapps/app/commit/e5c227073a183a1c562e17f3fe14a51048d01637)), closes [#140](https://gitlab.com/openstapps/app/issues/140)
|
||||||
|
- download events should respect selection ([28fbfef](https://gitlab.com/openstapps/app/commit/28fbfef18cc3b457f7020a70157ea7a4fff345d0))
|
||||||
|
- enable background fetch on iOS ([a1592f8](https://gitlab.com/openstapps/app/commit/a1592f84cc48f7cae8c55ef806cddbe806034bb5))
|
||||||
|
- enable overflow for day labels in schedule ([1195c5f](https://gitlab.com/openstapps/app/commit/1195c5ffc8cea07f1e224d92a7fb25aa5858bf0a))
|
||||||
|
- encode URI parameter to proxy URI ([bc13cc5](https://gitlab.com/openstapps/app/commit/bc13cc5e1fe6144fe0a0e53c0748a154844a5c29)), closes [#326](https://gitlab.com/openstapps/app/issues/326)
|
||||||
|
- extend landing period button not working on android ([0caa69c](https://gitlab.com/openstapps/app/commit/0caa69c28cbb2f962b70a1da13659739c1c6dd3e)), closes [#333](https://gitlab.com/openstapps/app/issues/333)
|
||||||
|
- failing native http requests with body ([fed4f20](https://gitlab.com/openstapps/app/commit/fed4f20c3cf43221512f3d2b6dd3c3fe7a4cf43a))
|
||||||
|
- feedback not allowing valid emails ([cf74c8e](https://gitlab.com/openstapps/app/commit/cf74c8e19f8bd34a31d5af931781e84be2c04dea)), closes [#349](https://gitlab.com/openstapps/app/issues/349)
|
||||||
|
- fix issues found by ng build for production ([a503811](https://gitlab.com/openstapps/app/commit/a503811c1cfcf909571af766ccd884856aad8ec9)), closes [#48](https://gitlab.com/openstapps/app/issues/48)
|
||||||
|
- fix various typos ([ad0dae4](https://gitlab.com/openstapps/app/commit/ad0dae46ff04d28551d2ece950d9a4d3442541d2))
|
||||||
|
- fixate webdriver to match used chrome version ([24dbb42](https://gitlab.com/openstapps/app/commit/24dbb42b345458b7dbdd17b2759824b3b68cb0e4))
|
||||||
|
- generate library online links properly ([9854541](https://gitlab.com/openstapps/app/commit/9854541a0c062c31bce167673586dccc8af81785)), closes [#340](https://gitlab.com/openstapps/app/issues/340)
|
||||||
|
- handle prices as an optional property ([9e71efc](https://gitlab.com/openstapps/app/commit/9e71efca9f7b1086db26f580192d6b349bdcb964)), closes [#219](https://gitlab.com/openstapps/app/issues/219)
|
||||||
|
- header logo changing size on ios navigate ([38f0a30](https://gitlab.com/openstapps/app/commit/38f0a300769a5b7cda35af0927c17099f93981b8))
|
||||||
|
- ignore null-island location ([d3188f5](https://gitlab.com/openstapps/app/commit/d3188f50905d610097de6c90bc58e6373d30e0dc)), closes [#149](https://gitlab.com/openstapps/app/issues/149)
|
||||||
|
- item not available in offer template ([7b402d6](https://gitlab.com/openstapps/app/commit/7b402d61c30aed81a5671d778a38c8393a5bc7c8)), closes [#110](https://gitlab.com/openstapps/app/issues/110)
|
||||||
|
- library account missing ready for pickup ([e504d8c](https://gitlab.com/openstapps/app/commit/e504d8cf6dd1c12fcb8f6a315527337313662385)), closes [#330](https://gitlab.com/openstapps/app/issues/330)
|
||||||
|
- library fines should load item title only if needed ([cbb949e](https://gitlab.com/openstapps/app/commit/cbb949e3977a5821e6bd1b654dec66a82e4d8c81)), closes [#342](https://gitlab.com/openstapps/app/issues/342)
|
||||||
|
- links of timetable tabs ([837c69b](https://gitlab.com/openstapps/app/commit/837c69bb21c92a91259051d5680e1073b390fc0e)), closes [#144](https://gitlab.com/openstapps/app/issues/144)
|
||||||
|
- logged out button not showing on profile ([ebdc14d](https://gitlab.com/openstapps/app/commit/ebdc14d3c398ac7564c077757c564f4e414fe244)), closes [#239](https://gitlab.com/openstapps/app/issues/239)
|
||||||
|
- make action chips react to changes of their item ([c0d0b1b](https://gitlab.com/openstapps/app/commit/c0d0b1bd9934e8d9e23f47825cae6a5d8ea2f38a))
|
||||||
|
- make keyboard dismissable on mobile devices ([b2cc1fd](https://gitlab.com/openstapps/app/commit/b2cc1fd91fc5bd66c994dcbe10771a22d91a1b3e))
|
||||||
|
- map search on iOS ([7d449b4](https://gitlab.com/openstapps/app/commit/7d449b43d0d86825f711848110ac6f044084eba0)), closes [#148](https://gitlab.com/openstapps/app/issues/148)
|
||||||
|
- map widget not loading tiles properly ([09aa7bb](https://gitlab.com/openstapps/app/commit/09aa7bb5c59e8d167fa91c69745f5f80229094d7)), closes [#127](https://gitlab.com/openstapps/app/issues/127)
|
||||||
|
- missing init (config setup) in default auth service ([f16e539](https://gitlab.com/openstapps/app/commit/f16e5394cce5a8019f4dfe367e5e0a2f0cca4ce2)), closes [#227](https://gitlab.com/openstapps/app/issues/227)
|
||||||
|
- missing translations ([30d801a](https://gitlab.com/openstapps/app/commit/30d801a3b419b382d40d96dda995bd35e493523d))
|
||||||
|
- modals not reacting after several uses ([f39c29f](https://gitlab.com/openstapps/app/commit/f39c29f10bc05ab986b74dfa8a8648df5fb307b4))
|
||||||
|
- news module not scrollable on large screens ([44b6a4a](https://gitlab.com/openstapps/app/commit/44b6a4aea008ca6c89f6cb289467429fb3f8c1fa))
|
||||||
|
- ngx-translate defaultLanguage not set ([581a5b2](https://gitlab.com/openstapps/app/commit/581a5b2e55ceda99cf7c41200366c3c5e09f1c63))
|
||||||
|
- omit sync native calendar when no uuids ([c9720dc](https://gitlab.com/openstapps/app/commit/c9720dc104cce78ae1a422d5efed7b8a58946836)), closes [#177](https://gitlab.com/openstapps/app/issues/177)
|
||||||
|
- opening hours pipe refreshing too often ([95e1734](https://gitlab.com/openstapps/app/commit/95e1734d26b175d8d1156abb10863155fed89ec0))
|
||||||
|
- overhaul auth to avoid issues ([99e8d6c](https://gitlab.com/openstapps/app/commit/99e8d6c9bcbc68b639b035af36bc05de0237b1f9)), closes [#336](https://gitlab.com/openstapps/app/issues/336)
|
||||||
|
- overview search bar scrolling behind header ([a037090](https://gitlab.com/openstapps/app/commit/a037090eec06e867a703b88a43620a74770287fe))
|
||||||
|
- performance degradation when scrolling ([f0a45d1](https://gitlab.com/openstapps/app/commit/f0a45d1b8eb2b33a6c68b94ed7f96f81db3a728b))
|
||||||
|
- person list should use long-inline-text ([8b2b853](https://gitlab.com/openstapps/app/commit/8b2b853942ac76904ff49d940dfef625b0397150))
|
||||||
|
- prevent multiple heavy setting inits ([f772637](https://gitlab.com/openstapps/app/commit/f7726378f443d9809a6174411d25a811e1d0b5e9))
|
||||||
|
- prevent opening invalid links ([fdee2db](https://gitlab.com/openstapps/app/commit/fdee2db8a42b8f6c99c4a72b3104ae0ba1a41c5a)), closes [#328](https://gitlab.com/openstapps/app/issues/328)
|
||||||
|
- profile module items show click effect on scroll ([8b2f2c0](https://gitlab.com/openstapps/app/commit/8b2f2c063c65278580d9469b00d9e67f01caaffb))
|
||||||
|
- recurring schedule offset and event limit ([9c6b513](https://gitlab.com/openstapps/app/commit/9c6b5131cd4cadb2572769d368b346054f19de1c))
|
||||||
|
- refresh token not used by default auth provider ([15ccbe4](https://gitlab.com/openstapps/app/commit/15ccbe4c1879417f2fc5849204fa9f6bdcce87fc)), closes [#311](https://gitlab.com/openstapps/app/issues/311)
|
||||||
|
- remove "extend landing" button when renewal not possible ([f60a228](https://gitlab.com/openstapps/app/commit/f60a22839200019a38586a14a0cce32e2c0029e7)), closes [#338](https://gitlab.com/openstapps/app/issues/338)
|
||||||
|
- remove item before adding it to secure storage ([ec511fb](https://gitlab.com/openstapps/app/commit/ec511fb8f40219e2559b08c62bd915d773d2a36f))
|
||||||
|
- schedule navigation bar layout ([e7d5f83](https://gitlab.com/openstapps/app/commit/e7d5f83100f43564b55249909a6658e583e3a9b2))
|
||||||
|
- set android status bar color correctly ([b38a969](https://gitlab.com/openstapps/app/commit/b38a96996a10e4e43ff1b06ecd2235a0e3bdfa1c))
|
||||||
|
- setting of default language ([ccf8b1a](https://gitlab.com/openstapps/app/commit/ccf8b1a5cc9fe834ba3e04a1ed67b2d082004403))
|
||||||
|
- show nothing for empty array properties ([1c56c89](https://gitlab.com/openstapps/app/commit/1c56c891e15b034826b5d6b2b35141fc872c922d)), closes [#154](https://gitlab.com/openstapps/app/issues/154)
|
||||||
|
- single map place width ([88684f0](https://gitlab.com/openstapps/app/commit/88684f068ab130f43e520c87f1d7383e0ae43944)), closes [#147](https://gitlab.com/openstapps/app/issues/147)
|
||||||
|
- some android devices don't support implied css animation units ([54cc883](https://gitlab.com/openstapps/app/commit/54cc8838aefe8f8c2d25d9228a136ef727a08230))
|
||||||
|
- status bar being black on Android 13 devices ([feee9e8](https://gitlab.com/openstapps/app/commit/feee9e8db90e66cf2346f7c5cc24f075eb70676c))
|
||||||
|
- suppress router event logs in console ([28caaf1](https://gitlab.com/openstapps/app/commit/28caaf1d21f7961b678cf339a712abf860ade5e7)), closes [#207](https://gitlab.com/openstapps/app/issues/207)
|
||||||
|
- swap missing icon after ionic update ([643b6c9](https://gitlab.com/openstapps/app/commit/643b6c967f3268cb305a24d614c3bc91275b0ac3))
|
||||||
|
- temporary disable flaky ui test ([6b9b1fa](https://gitlab.com/openstapps/app/commit/6b9b1fa8548d5c5fca04b2c1d63e893de39278a2))
|
||||||
|
- timetable dates cannot be removed ([9242438](https://gitlab.com/openstapps/app/commit/924243813207fa791d3c4938f8653a999b6382ff))
|
||||||
|
- translate back button title ([b8db0f3](https://gitlab.com/openstapps/app/commit/b8db0f3e70a46f2b493e183a244cb29d1954c257))
|
||||||
|
- translations ([5e1a902](https://gitlab.com/openstapps/app/commit/5e1a902d4c0d2345f21500fba5394c1907e04eb8))
|
||||||
|
- typo in translation ([7928534](https://gitlab.com/openstapps/app/commit/7928534d88a26db28b098bbceb47bc1103022a57))
|
||||||
|
- update core and apply stricter tslint rules ([911492d](https://gitlab.com/openstapps/app/commit/911492d064ff0280dd6626244cd8038cbfc0f408))
|
||||||
|
- use HashLocationStrategy for routes ([9d68212](https://gitlab.com/openstapps/app/commit/9d682125db55c87cab2b33c7633bfa133d2fc5a9)), closes [#54](https://gitlab.com/openstapps/app/issues/54)
|
||||||
|
- use localized date and time ([6ca0b97](https://gitlab.com/openstapps/app/commit/6ca0b9763761c5204a757a243056a087c5f35fd9))
|
||||||
|
- use stapps core version to compare with backends' core version ([66b8720](https://gitlab.com/openstapps/app/commit/66b8720da0f264824a396f2d9e598b0e48c8e3d1)), closes [#77](https://gitlab.com/openstapps/app/issues/77)
|
||||||
|
- user info card ([998edcb](https://gitlab.com/openstapps/app/commit/998edcb5cdfb588c2986f466f4a2951f172a8bb4)), closes [#305](https://gitlab.com/openstapps/app/issues/305)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- add "no results" screen to search ([c75ca68](https://gitlab.com/openstapps/app/commit/c75ca68c440a20e197213ecbb47d05fc293afd9c))
|
||||||
|
- add about module ([d420008](https://gitlab.com/openstapps/app/commit/d42000892694f4a3b29fa623c43fb45f8ba54687))
|
||||||
|
- add action chips to search results ([67fb4a4](https://gitlab.com/openstapps/app/commit/67fb4a43c95043caba50d43ace2ab276f3319b81))
|
||||||
|
- add auth support (default and paia) ([b5f239e](https://gitlab.com/openstapps/app/commit/b5f239ea4edebd0d27b1cdaad4a830998ce2f681))
|
||||||
|
- add backend toggle ([c1d3330](https://gitlab.com/openstapps/app/commit/c1d33303aa11da3b3e150c6717d77ef484a16ac1))
|
||||||
|
- add basic templates for data list items ([3e697b1](https://gitlab.com/openstapps/app/commit/3e697b17b4448c15781d0f6dd55577b638e9d974))
|
||||||
|
- add catalog module ([03084b1](https://gitlab.com/openstapps/app/commit/03084b1c966de98b3723d0bee2b2475589393c59))
|
||||||
|
- add ConfigModule and FakeBackendInterceptor ([406f400](https://gitlab.com/openstapps/app/commit/406f40055567bfde4ec5edf26cff942411bd073e)), closes [#34](https://gitlab.com/openstapps/app/issues/34) [#37](https://gitlab.com/openstapps/app/issues/37)
|
||||||
|
- add detail view for news ([2566a71](https://gitlab.com/openstapps/app/commit/2566a71a81a3408dbb16b97d3a453d95e25d1f00))
|
||||||
|
- add duration pipe with frequency capabilites ([49a1758](https://gitlab.com/openstapps/app/commit/49a1758da358958ffe590700c19aaf90ec748ee5))
|
||||||
|
- add favorites support ([e9452d6](https://gitlab.com/openstapps/app/commit/e9452d6520c34f6513623c16e291dc23d6ea9757))
|
||||||
|
- add feedback module ([867f9e9](https://gitlab.com/openstapps/app/commit/867f9e9b832e3bd54c04801fef63a11543e8f3dd))
|
||||||
|
- add filter chips for news ([5435f85](https://gitlab.com/openstapps/app/commit/5435f85cc43dc3baa774a5008d2920ac7b3783f6))
|
||||||
|
- add formatting pipes basted on Intl ([4b932af](https://gitlab.com/openstapps/app/commit/4b932af1c07e1af4369414667a987d31181c073c))
|
||||||
|
- add HeBIS HDS search ([9a3241c](https://gitlab.com/openstapps/app/commit/9a3241c42ab59e15c0084178f76dc4a2450a2bb8))
|
||||||
|
- add library account screens ([080e6fa](https://gitlab.com/openstapps/app/commit/080e6fa3e8c18e9608d7fa2efc95e4fd65c43a15))
|
||||||
|
- add library action confirmations ([42b860e](https://gitlab.com/openstapps/app/commit/42b860e41793fc3983a39237a4f7128416485fae)), closes [#334](https://gitlab.com/openstapps/app/issues/334)
|
||||||
|
- add logger ([a0c798f](https://gitlab.com/openstapps/app/commit/a0c798f765d87c5eebcbed65b70f3b05f285d0ce))
|
||||||
|
- add map module ([c1c9a92](https://gitlab.com/openstapps/app/commit/c1c9a92ec900403218b887fdebfe5132b232e1e0))
|
||||||
|
- add new font and new icons ([915fd72](https://gitlab.com/openstapps/app/commit/915fd72bd4bfed16e15fcc3c57879db0ec0379e2))
|
||||||
|
- add not found screen ([e3d9ef4](https://gitlab.com/openstapps/app/commit/e3d9ef40ccd626c81c67ea2d790eecbe6e025780))
|
||||||
|
- add permission check for geoLocation setting ([d5fa2fd](https://gitlab.com/openstapps/app/commit/d5fa2fd9a578d48cd2513eeb1380f1d2bc4d3754))
|
||||||
|
- add service and pipe for core translator ([4565600](https://gitlab.com/openstapps/app/commit/456560026cc9550a10a9f42657d942122be34d53))
|
||||||
|
- apply new layout overhaul ([7bbdba5](https://gitlab.com/openstapps/app/commit/7bbdba5c0b886e2789d2a603c4be627dfd16b60e))
|
||||||
|
- assessment tree view ([0b037f9](https://gitlab.com/openstapps/app/commit/0b037f96e634b412fbaaee24747df08afdc0e565))
|
||||||
|
- assessments module ([e68d1b7](https://gitlab.com/openstapps/app/commit/e68d1b73f94b36abcefe9b2bf42e98de00b69188))
|
||||||
|
- calendar plugin ([a57c302](https://gitlab.com/openstapps/app/commit/a57c3029df61ac3157c856744380a85dc001abc6))
|
||||||
|
- dashboard ui tests ([9f8ab5c](https://gitlab.com/openstapps/app/commit/9f8ab5c7a15a918f7bd05423f0a43f22a33d9228))
|
||||||
|
- **data:** add basic methods of data provider ([ffe05e4](https://gitlab.com/openstapps/app/commit/ffe05e4548fc399183ef651047cb02a3cdc80c67)), closes [#1](https://gitlab.com/openstapps/app/issues/1)
|
||||||
|
- **data:** add data detail templates ([5855acc](https://gitlab.com/openstapps/app/commit/5855accc169579d87f5779fd602d4f00f2b479a1))
|
||||||
|
- **data:** add method that checks if data item has been saved ([017fc67](https://gitlab.com/openstapps/app/commit/017fc67765bdb75542045830fb85f8eb4b899485))
|
||||||
|
- **data:** implement basic facets handling ([b6f92a7](https://gitlab.com/openstapps/app/commit/b6f92a74494e1a39d5c828d593eb70c7002bb0f6)), closes [#1](https://gitlab.com/openstapps/app/issues/1)
|
||||||
|
- **data:** show skeleton screens before data is loaded ([e1039aa](https://gitlab.com/openstapps/app/commit/e1039aa2260a0e9d8ccca5a18ded480bf2f12530)), closes [#4](https://gitlab.com/openstapps/app/issues/4)
|
||||||
|
- **data:** use data provider for list and detail view ([7caaa18](https://gitlab.com/openstapps/app/commit/7caaa18b7eb94ed8e4ff4e54d760ba1dba3ae3be))
|
||||||
|
- **data:** use general template for all offers ([58960a2](https://gitlab.com/openstapps/app/commit/58960a29ea0cd73f26a43186b41f5b53864810e0))
|
||||||
|
- display availability and item data for library items ([d571b1d](https://gitlab.com/openstapps/app/commit/d571b1dbe59f8e2270d88dd050b94283bf0a7056))
|
||||||
|
- dynamic news page rows ([848d257](https://gitlab.com/openstapps/app/commit/848d2574c7046d6f84b91e32aa83ca57fca8ad2e))
|
||||||
|
- expandable accordion in grades module ([3f81afd](https://gitlab.com/openstapps/app/commit/3f81afda82cf87bb393fbb3b71d27eee77ae42d9))
|
||||||
|
- get tab navigation items from config ([c3130a3](https://gitlab.com/openstapps/app/commit/c3130a392a53c9ec3657e24a53ed0b3333ba162b))
|
||||||
|
- Implement variable for styling ([8ecf347](https://gitlab.com/openstapps/app/commit/8ecf347c9a8abac9347dca45e99ebe35eca8f252))
|
||||||
|
- include font licenses in the licenses section ([82479f4](https://gitlab.com/openstapps/app/commit/82479f463cbee834507a0c8faf895a729631eb06))
|
||||||
|
- Ionic v6 breadcrumbs in catalog module ([7b491ed](https://gitlab.com/openstapps/app/commit/7b491ed3bb5466a845493bd8ea0bbb836a4f03d2))
|
||||||
|
- lazy load all news ([e48134e](https://gitlab.com/openstapps/app/commit/e48134eddcd1ca4d5ec5dbf910571e33a3311ba1))
|
||||||
|
- **menu:** add context menu ([1dbf451](https://gitlab.com/openstapps/app/commit/1dbf4515fe57cc8250a7fa2213ced682e3e5e0fc)), closes [#3](https://gitlab.com/openstapps/app/issues/3)
|
||||||
|
- navigation rail ([6b08af6](https://gitlab.com/openstapps/app/commit/6b08af6a746bf12005d3297ec97c130e84477615))
|
||||||
|
- news module ([22cd0af](https://gitlab.com/openstapps/app/commit/22cd0af1bf92a4576316f5510c22f012e085a237))
|
||||||
|
- profile page sections ([e395e9d](https://gitlab.com/openstapps/app/commit/e395e9d270f41bd4f6e5ecd88e438a28dde92465)), closes [#233](https://gitlab.com/openstapps/app/issues/233) [#261](https://gitlab.com/openstapps/app/issues/261) [#267](https://gitlab.com/openstapps/app/issues/267)
|
||||||
|
- refresh on pull for news module ([1f3d9ad](https://gitlab.com/openstapps/app/commit/1f3d9ad5f0c0557add2dcf242cf0b7dd7685bb1b))
|
||||||
|
- resume at origin path after login ([a5e5a5b](https://gitlab.com/openstapps/app/commit/a5e5a5b40799e7505557f7ebd764b9c563be0f4b)), closes [#168](https://gitlab.com/openstapps/app/issues/168)
|
||||||
|
- schedule layout ([e416590](https://gitlab.com/openstapps/app/commit/e4165901bb5efa6b38e397cdf5d66138e396d7f2))
|
||||||
|
- scroll schedule cursor into view ([bc4c3d7](https://gitlab.com/openstapps/app/commit/bc4c3d78dbd906243dcddac4db9ac8ccaca79056))
|
||||||
|
- search url query param handling ([f349bd7](https://gitlab.com/openstapps/app/commit/f349bd72335c47d292d0a007b1a4ce7f5c694a61))
|
||||||
|
- seperate dishes by menu sections ([400c6b8](https://gitlab.com/openstapps/app/commit/400c6b8d8c5300035862186096e38883f781d297))
|
||||||
|
- show availability in offers ([5fdef95](https://gitlab.com/openstapps/app/commit/5fdef95c065e7b467a13045adbb56a641cb2dc12))
|
||||||
|
- show feedback when map search yields no results ([c54ea86](https://gitlab.com/openstapps/app/commit/c54ea867bd64af187446dbf8dc03967aae600961))
|
||||||
|
- show menu for multiple days for canteens and cafes ([3c079cd](https://gitlab.com/openstapps/app/commit/3c079cd189e3b75d3b203bd46ab57378f99e88cc)), closes [#19](https://gitlab.com/openstapps/app/issues/19) [#79](https://gitlab.com/openstapps/app/issues/79)
|
||||||
|
- **storage:** add search using regex ([86b9bff](https://gitlab.com/openstapps/app/commit/86b9bff09a51b17151efa5ec322cddcc50a54cb2))
|
||||||
|
- **storage:** support deletion of multiple entries ([63266f5](https://gitlab.com/openstapps/app/commit/63266f588f6ddb2476e2cea4bab42a3864f77470))
|
||||||
|
- **storage:** support search using a string ([4334cad](https://gitlab.com/openstapps/app/commit/4334cad68c7d0abb7443e245b6eb983804547925))
|
||||||
|
- support deep links ([2e3f668](https://gitlab.com/openstapps/app/commit/2e3f6684ef5fbac8e4fb127c536b2b438399ce37))
|
||||||
|
- support overlapping timetable dates ([93c37b2](https://gitlab.com/openstapps/app/commit/93c37b26cca7764dea66fb12c0e53acc8fd78d2b))
|
||||||
|
- tab navigation bar animations and state ([7ecba0b](https://gitlab.com/openstapps/app/commit/7ecba0b7819ae5a7ab32d86f6049de0ab6c68e55))
|
||||||
|
- timetable module - schedule and calendar ([d8ede00](https://gitlab.com/openstapps/app/commit/d8ede006dfbd613dfbc752eb6de80db2e7e84531))
|
||||||
|
- turn on oauth2 state check for PAIA ([5bd0b50](https://gitlab.com/openstapps/app/commit/5bd0b50816973548a0a4aa5dbed3f2d0902590dd)), closes [#172](https://gitlab.com/openstapps/app/issues/172)
|
||||||
|
- use http interceptor for backendless development ([2558163](https://gitlab.com/openstapps/app/commit/2558163ad6c3038445a79e6338f1827cb1e6510e)), closes [#37](https://gitlab.com/openstapps/app/issues/37)
|
||||||
|
- use school-neutral news image fallback via css ([bb94c71](https://gitlab.com/openstapps/app/commit/bb94c71761ca5d3bf6639476ba0c143678cfabbd))
|
||||||
|
- webpack bundle analyzer ([552911c](https://gitlab.com/openstapps/app/commit/552911cfcfecec8d9be8b8bbb155b597d1f70fa2))
|
||||||
|
|
||||||
|
## 0.0.1
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- add the app ([8b23159](https://gitlab.com/openstapps/app/commit/8b23159e678773b08252bc5826510de2a302fa1d))
|
||||||
|
|||||||
@@ -50,11 +50,11 @@ the config file.
|
|||||||
Icon font minification is done automatically, but requires you to
|
Icon font minification is done automatically, but requires you to
|
||||||
follow a few simple rules:
|
follow a few simple rules:
|
||||||
|
|
||||||
1. Use the tagged template literal for referencing icon names in
|
1. Use the type-safe proxy for referencing icon names in
|
||||||
TypeScript files and code
|
TypeScript files and code
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
SCIcon`icon_name`;
|
SCIcon.icon_name;
|
||||||
```
|
```
|
||||||
|
|
||||||
2. When using `ion-icon` in HTML, reference either icons that went through
|
2. When using `ion-icon` in HTML, reference either icons that went through
|
||||||
|
|||||||
@@ -13,25 +13,25 @@ The StApps 1.x.x (legacy app, but current app in stores) is written using Ionic
|
|||||||
|
|
||||||
There are (`npm`) scripts defined to get the app running as quickly as possible. Those scripts (shortcuts for docker commands) are called using the syntax `npm run + <script-name>`. So we have the following commands available:
|
There are (`npm`) scripts defined to get the app running as quickly as possible. Those scripts (shortcuts for docker commands) are called using the syntax `npm run + <script-name>`. So we have the following commands available:
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run docker:pull
|
npm run docker:pull
|
||||||
```
|
```
|
||||||
|
|
||||||
which pulls the up-to-date image ([Dockerfile](Dockerfile)) which contains all the tools needed for building, serving and deploying the app.
|
which pulls the up-to-date image ([Dockerfile](Dockerfile)) which contains all the tools needed for building, serving and deploying the app.
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run docker:enter
|
npm run docker:enter
|
||||||
```
|
```
|
||||||
|
|
||||||
which enters the container on docker builder image, where we can run `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files), but also any other arbitrary commands with the tools available in the docker image.
|
which enters the container on docker builder image, where we can run `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files), but also any other arbitrary commands with the tools available in the docker image.
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run docker:build
|
npm run docker:build
|
||||||
```
|
```
|
||||||
|
|
||||||
which runs `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files) in the docker container which runs on the docker builder image.
|
which runs `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files) in the docker container which runs on the docker builder image.
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run docker:serve
|
npm run docker:serve
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ which serves the app for running it in the browser. It basically runs `ionic ser
|
|||||||
|
|
||||||
## How to build and start the app using the default backend?
|
## How to build and start the app using the default backend?
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run build
|
npm run build
|
||||||
npm run start
|
npm run start
|
||||||
```
|
```
|
||||||
@@ -86,52 +86,98 @@ addToIonicDB(
|
|||||||
|
|
||||||
You'll need to run _Chromium_ using
|
You'll need to run _Chromium_ using
|
||||||
|
|
||||||
```shell
|
```sh
|
||||||
pnpm chromium:no-cors
|
pnpm chromium:no-cors
|
||||||
```
|
```
|
||||||
|
|
||||||
### Help, I can't log in!
|
### Help, I can't log in!
|
||||||
|
|
||||||
Login services will often block hosts not coming from the production
|
Login services will often block hosts not coming from the production
|
||||||
server. You can circumvent this locally by using the `:virtual-host`
|
server.
|
||||||
scripts:
|
|
||||||
|
|
||||||
```shell
|
#### Web
|
||||||
|
|
||||||
|
On the web you can circumvent this locally by using the `:virtual-host` scripts:
|
||||||
|
|
||||||
|
```sh
|
||||||
# Start the dev server on mobile.app.uni-frankfurt.de
|
# Start the dev server on mobile.app.uni-frankfurt.de
|
||||||
pnpm start:virtual-host
|
pnpm start:virtual-host
|
||||||
# Run chromium with flags that redirect mobile.app.uni-frankfurt.de to localhost:8100
|
# Run chromium with flags that redirect mobile.app.uni-frankfurt.de to localhost:8100
|
||||||
pnpm chromium:virtual-host
|
pnpm chromium:virtual-host
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### Android
|
||||||
|
|
||||||
|
On Android you will need to change the `custom_url_scheme` values
|
||||||
|
to `de.unifrankfurt.app` in the following files:
|
||||||
|
|
||||||
|
- `android/app/src/main/res/values/strings.xml`
|
||||||
|
- `src/environment/environment.ts`
|
||||||
|
|
||||||
|
Then start the app normally as you would
|
||||||
|
|
||||||
|
```sh
|
||||||
|
pnpm run:android
|
||||||
|
```
|
||||||
|
|
||||||
|
**This alone will not make auth work**, only the login flow.
|
||||||
|
|
||||||
|
If you need to test login, you have to disable live reload:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
pnpm ionic capacitor run android
|
||||||
|
```
|
||||||
|
|
||||||
|
_**CAUTION:** a remote chrome debugging session can in some
|
||||||
|
cases hijack the device's ADB connection. If the connection
|
||||||
|
fails for no obvious reason, close chrome and uninstall the
|
||||||
|
app, then try again._
|
||||||
|
|
||||||
|
#### iOS
|
||||||
|
|
||||||
|
On Android you will need to change the `custom_url_scheme` value in
|
||||||
|
`src/environment/environment.ts` as well as the `CFBundleURLTypes`
|
||||||
|
in `ios/App/App/Info.plist`.
|
||||||
|
|
||||||
|
- make sure to remove any `Info.plist.orig` as capacitor might override
|
||||||
|
the modified `Info.plist` with that.
|
||||||
|
- make sure you have a valid device in XCode (Simulator or real device).
|
||||||
|
|
||||||
|
After that, run
|
||||||
|
|
||||||
|
```sh
|
||||||
|
pnpm run:ios
|
||||||
|
```
|
||||||
|
|
||||||
### Running the app
|
### Running the app
|
||||||
|
|
||||||
Install the npm packages needed for running the app (as for any other node project which uses npm):
|
Install the npm packages needed for running the app (as for any other node project which uses npm):
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm install
|
npm install
|
||||||
```
|
```
|
||||||
|
|
||||||
Check the code for linter issues:
|
Check the code for linter issues:
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run lint
|
npm run lint
|
||||||
```
|
```
|
||||||
|
|
||||||
Automatically fix linter issues (those where autofix is possible):
|
Automatically fix linter issues (those where autofix is possible):
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run lint:fix
|
npm run lint:fix
|
||||||
```
|
```
|
||||||
|
|
||||||
Build the app (transpile etc.):
|
Build the app (transpile etc.):
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run build
|
npm run build
|
||||||
```
|
```
|
||||||
|
|
||||||
Open the app in the browser:
|
Open the app in the browser:
|
||||||
|
|
||||||
```
|
```sh
|
||||||
ionic serve
|
ionic serve
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -139,7 +185,7 @@ ionic serve
|
|||||||
|
|
||||||
Run the app for testing on an android device (with live reload in the webview / device, when files are changed):
|
Run the app for testing on an android device (with live reload in the webview / device, when files are changed):
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run build # if needed
|
npm run build # if needed
|
||||||
npm run resources:android # generate needed resources (icons and splashscreens)
|
npm run resources:android # generate needed resources (icons and splashscreens)
|
||||||
npm run docker:run:android # runs "ionic capacitor run android --livereload --external" on a selected device
|
npm run docker:run:android # runs "ionic capacitor run android --livereload --external" on a selected device
|
||||||
@@ -159,7 +205,7 @@ Besides that, it is possible to monitor processes (and so the processes related
|
|||||||
|
|
||||||
Build the (debug) app for testing on an android device (creates an APK file in the android's build outputs path):
|
Build the (debug) app for testing on an android device (creates an APK file in the android's build outputs path):
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run docker:build:android
|
npm run docker:build:android
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -169,13 +215,13 @@ The mentioned `docker:*:android` npm commands are executed in a docker container
|
|||||||
|
|
||||||
Execute unit tests:
|
Execute unit tests:
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm test
|
npm test
|
||||||
```
|
```
|
||||||
|
|
||||||
Execute e2e tests:
|
Execute e2e tests:
|
||||||
|
|
||||||
```
|
```sh
|
||||||
npm run e2e
|
npm run e2e
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace "de.anyschool.app"
|
namespace "de.anyschool.app"
|
||||||
compileSdkVersion rootProject.ext.compileSdkVersion
|
compileSdk rootProject.ext.compileSdkVersion
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "de.anyschool.app"
|
applicationId "de.anyschool.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ android {
|
|||||||
|
|
||||||
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation project(':capacitor-community-screen-brightness')
|
||||||
implementation project(':capacitor-app')
|
implementation project(':capacitor-app')
|
||||||
implementation project(':capacitor-browser')
|
implementation project(':capacitor-browser')
|
||||||
implementation project(':capacitor-clipboard')
|
implementation project(':capacitor-clipboard')
|
||||||
@@ -21,6 +22,7 @@ dependencies {
|
|||||||
implementation project(':capacitor-local-notifications')
|
implementation project(':capacitor-local-notifications')
|
||||||
implementation project(':capacitor-network')
|
implementation project(':capacitor-network')
|
||||||
implementation project(':capacitor-preferences')
|
implementation project(':capacitor-preferences')
|
||||||
|
implementation project(':capacitor-screen-orientation')
|
||||||
implementation project(':capacitor-share')
|
implementation project(':capacitor-share')
|
||||||
implementation project(':capacitor-splash-screen')
|
implementation project(':capacitor-splash-screen')
|
||||||
implementation project(':transistorsoft-capacitor-background-fetch')
|
implementation project(':transistorsoft-capacitor-background-fetch')
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"pkg": "@capacitor-community/screen-brightness",
|
||||||
|
"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"pkg": "@capacitor/app",
|
"pkg": "@capacitor/app",
|
||||||
"classpath": "com.capacitorjs.plugins.app.AppPlugin"
|
"classpath": "com.capacitorjs.plugins.app.AppPlugin"
|
||||||
@@ -47,6 +51,10 @@
|
|||||||
"pkg": "@capacitor/preferences",
|
"pkg": "@capacitor/preferences",
|
||||||
"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"
|
"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"pkg": "@capacitor/screen-orientation",
|
||||||
|
"classpath": "com.capacitorjs.plugins.screenorientation.ScreenOrientationPlugin"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"pkg": "@capacitor/share",
|
"pkg": "@capacitor/share",
|
||||||
"classpath": "com.capacitorjs.plugins.share.SharePlugin"
|
"classpath": "com.capacitorjs.plugins.share.SharePlugin"
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.0.0'
|
classpath 'com.android.tools.build:gradle:8.2.1'
|
||||||
classpath 'com.google.gms:google-services:4.3.15'
|
classpath 'com.google.gms:google-services:4.4.0'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
@@ -1,51 +1,57 @@
|
|||||||
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
||||||
include ':capacitor-android'
|
include ':capacitor-android'
|
||||||
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/android/capacitor')
|
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/android/capacitor')
|
||||||
|
|
||||||
|
include ':capacitor-community-screen-brightness'
|
||||||
|
project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness/android')
|
||||||
|
|
||||||
include ':capacitor-app'
|
include ':capacitor-app'
|
||||||
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app/android')
|
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app/android')
|
||||||
|
|
||||||
include ':capacitor-browser'
|
include ':capacitor-browser'
|
||||||
project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser/android')
|
project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser/android')
|
||||||
|
|
||||||
include ':capacitor-clipboard'
|
include ':capacitor-clipboard'
|
||||||
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard/android')
|
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard/android')
|
||||||
|
|
||||||
include ':capacitor-device'
|
include ':capacitor-device'
|
||||||
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device/android')
|
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device/android')
|
||||||
|
|
||||||
include ':capacitor-dialog'
|
include ':capacitor-dialog'
|
||||||
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog/android')
|
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog/android')
|
||||||
|
|
||||||
include ':capacitor-filesystem'
|
include ':capacitor-filesystem'
|
||||||
project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem/android')
|
project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem/android')
|
||||||
|
|
||||||
include ':capacitor-geolocation'
|
include ':capacitor-geolocation'
|
||||||
project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation/android')
|
project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation/android')
|
||||||
|
|
||||||
include ':capacitor-haptics'
|
include ':capacitor-haptics'
|
||||||
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics/android')
|
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics/android')
|
||||||
|
|
||||||
include ':capacitor-keyboard'
|
include ':capacitor-keyboard'
|
||||||
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard/android')
|
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard/android')
|
||||||
|
|
||||||
include ':capacitor-local-notifications'
|
include ':capacitor-local-notifications'
|
||||||
project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications/android')
|
project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications/android')
|
||||||
|
|
||||||
include ':capacitor-network'
|
include ':capacitor-network'
|
||||||
project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network/android')
|
project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network/android')
|
||||||
|
|
||||||
include ':capacitor-preferences'
|
include ':capacitor-preferences'
|
||||||
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences/android')
|
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences/android')
|
||||||
|
|
||||||
|
include ':capacitor-screen-orientation'
|
||||||
|
project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation/android')
|
||||||
|
|
||||||
include ':capacitor-share'
|
include ':capacitor-share'
|
||||||
project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share/android')
|
project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share/android')
|
||||||
|
|
||||||
include ':capacitor-splash-screen'
|
include ':capacitor-splash-screen'
|
||||||
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen/android')
|
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen/android')
|
||||||
|
|
||||||
include ':transistorsoft-capacitor-background-fetch'
|
include ':transistorsoft-capacitor-background-fetch'
|
||||||
project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
|
project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch/android')
|
||||||
|
|
||||||
include ':capacitor-secure-storage-plugin'
|
include ':capacitor-secure-storage-plugin'
|
||||||
project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin/android')
|
project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin/android')
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
ext {
|
ext {
|
||||||
minSdkVersion = 22
|
minSdkVersion = 22
|
||||||
compileSdkVersion = 33
|
compileSdkVersion = 34
|
||||||
targetSdkVersion = 33
|
targetSdkVersion = 34
|
||||||
androidxActivityVersion = '1.7.0'
|
androidxActivityVersion = '1.8.0'
|
||||||
androidxAppCompatVersion = '1.6.1'
|
androidxAppCompatVersion = '1.6.1'
|
||||||
androidxCoordinatorLayoutVersion = '1.2.0'
|
androidxCoordinatorLayoutVersion = '1.2.0'
|
||||||
androidxCoreVersion = '1.10.0'
|
androidxCoreVersion = '1.12.0'
|
||||||
androidxFragmentVersion = '1.5.6'
|
androidxFragmentVersion = '1.6.2'
|
||||||
coreSplashScreenVersion = '1.0.0'
|
coreSplashScreenVersion = '1.0.1'
|
||||||
androidxWebkitVersion = '1.6.1'
|
androidxWebkitVersion = '1.9.0'
|
||||||
junitVersion = '4.13.2'
|
junitVersion = '4.13.2'
|
||||||
androidxJunitVersion = '1.1.5'
|
androidxJunitVersion = '1.1.5'
|
||||||
androidxEspressoCoreVersion = '3.5.1'
|
androidxEspressoCoreVersion = '3.5.1'
|
||||||
|
|||||||
@@ -21,10 +21,13 @@
|
|||||||
"allowedCommonJsDependencies": [
|
"allowedCommonJsDependencies": [
|
||||||
"moment",
|
"moment",
|
||||||
"opening_hours",
|
"opening_hours",
|
||||||
"leaflet",
|
"localforage",
|
||||||
"leaflet.markercluster",
|
"i18next",
|
||||||
"localforge",
|
"semver",
|
||||||
"guid-typescript"
|
"suncalc",
|
||||||
|
"guid-typescript",
|
||||||
|
"fast-deep-equal",
|
||||||
|
"maplibre-gl"
|
||||||
],
|
],
|
||||||
"aot": true,
|
"aot": true,
|
||||||
"assets": [
|
"assets": [
|
||||||
@@ -34,22 +37,16 @@
|
|||||||
"output": "assets"
|
"output": "assets"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"glob": "**/*",
|
"glob": "CHANGELOG.md",
|
||||||
"input": "./node_modules/leaflet/dist/images",
|
"input": ".",
|
||||||
"output": "assets/"
|
"output": "assets"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
{
|
|
||||||
"input": "src/theme/variables.scss",
|
|
||||||
"inject": true
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"input": "src/global.scss",
|
"input": "src/global.scss",
|
||||||
"inject": true
|
"inject": true
|
||||||
},
|
}
|
||||||
"./node_modules/leaflet/dist/leaflet.css",
|
|
||||||
"./node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
@@ -132,11 +129,6 @@
|
|||||||
"glob": "**/*",
|
"glob": "**/*",
|
||||||
"input": "src/assets",
|
"input": "src/assets",
|
||||||
"output": "/assets"
|
"output": "/assets"
|
||||||
},
|
|
||||||
{
|
|
||||||
"glob": "**/*",
|
|
||||||
"input": "./node_modules/leaflet/dist/images",
|
|
||||||
"output": "assets/"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,9 +12,9 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import type {IconConfig} from './scripts/icon-config';
|
|
||||||
|
|
||||||
const config: IconConfig = {
|
/** @type {import('./scripts/icon-config').IconConfig} */
|
||||||
|
const config = {
|
||||||
inputPath: 'node_modules/material-symbols/material-symbols-rounded.woff2',
|
inputPath: 'node_modules/material-symbols/material-symbols-rounded.woff2',
|
||||||
outputPath: 'src/assets/icons.min.woff2',
|
outputPath: 'src/assets/icons.min.woff2',
|
||||||
htmlGlob: 'src/**/*.html',
|
htmlGlob: 'src/**/*.html',
|
||||||
@@ -38,10 +38,6 @@ const config: IconConfig = {
|
|||||||
'work',
|
'work',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
codePoints: {
|
|
||||||
ios_share: 'e6b8',
|
|
||||||
fact_check: 'f0c5',
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default config;
|
export default config;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios/scripts/pods_helpers'
|
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios/scripts/pods_helpers'
|
||||||
|
|
||||||
platform :ios, '13.0'
|
platform :ios, '13.0'
|
||||||
use_frameworks!
|
use_frameworks!
|
||||||
@@ -9,24 +9,26 @@ use_frameworks!
|
|||||||
install! 'cocoapods', :disable_input_output_paths => true
|
install! 'cocoapods', :disable_input_output_paths => true
|
||||||
|
|
||||||
def capacitor_pods
|
def capacitor_pods
|
||||||
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios'
|
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios'
|
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app'
|
pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness'
|
||||||
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser'
|
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app'
|
||||||
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard'
|
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser'
|
||||||
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device'
|
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard'
|
||||||
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog'
|
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device'
|
||||||
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem'
|
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog'
|
||||||
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation'
|
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem'
|
||||||
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics'
|
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation'
|
||||||
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard'
|
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics'
|
||||||
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications'
|
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard'
|
||||||
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network'
|
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications'
|
||||||
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences'
|
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network'
|
||||||
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share'
|
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences'
|
||||||
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen'
|
pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation'
|
||||||
pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch'
|
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share'
|
||||||
pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin'
|
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen'
|
||||||
|
pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch'
|
||||||
|
pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin'
|
||||||
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,64 +1,70 @@
|
|||||||
PODS:
|
PODS:
|
||||||
- Capacitor (5.5.0):
|
- Capacitor (6.1.1):
|
||||||
- CapacitorCordova
|
- CapacitorCordova
|
||||||
- CapacitorApp (5.0.6):
|
- CapacitorApp (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorBrowser (5.1.0):
|
- CapacitorBrowser (6.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorClipboard (5.0.6):
|
- CapacitorClipboard (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorCordova (5.5.0)
|
- CapacitorCommunityScreenBrightness (6.0.0):
|
||||||
- CapacitorDevice (5.0.6):
|
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorDialog (5.0.6):
|
- CapacitorCordova (6.1.1)
|
||||||
|
- CapacitorDevice (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorFilesystem (5.1.4):
|
- CapacitorDialog (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorGeolocation (5.0.6):
|
- CapacitorFilesystem (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorHaptics (5.0.6):
|
- CapacitorGeolocation (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorKeyboard (5.0.6):
|
- CapacitorHaptics (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorLocalNotifications (5.0.6):
|
- CapacitorKeyboard (6.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorNetwork (5.0.6):
|
- CapacitorLocalNotifications (6.0.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorPreferences (5.0.6):
|
- CapacitorNetwork (6.0.1):
|
||||||
|
- Capacitor
|
||||||
|
- CapacitorPreferences (6.0.1):
|
||||||
|
- Capacitor
|
||||||
|
- CapacitorScreenOrientation (6.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorSecureStoragePlugin (0.9.0):
|
- CapacitorSecureStoragePlugin (0.9.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- SwiftKeychainWrapper
|
- SwiftKeychainWrapper
|
||||||
- CapacitorShare (5.0.6):
|
- CapacitorShare (6.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorSplashScreen (5.0.6):
|
- CapacitorSplashScreen (6.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CordovaPlugins (5.5.0):
|
- CordovaPlugins (6.1.1):
|
||||||
- CapacitorCordova
|
- CapacitorCordova
|
||||||
- SwiftKeychainWrapper (4.0.1)
|
- SwiftKeychainWrapper (4.0.1)
|
||||||
- TransistorsoftCapacitorBackgroundFetch (5.1.1):
|
- TransistorsoftCapacitorBackgroundFetch (5.2.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios`)"
|
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios`)"
|
||||||
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app`)"
|
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app`)"
|
||||||
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser`)"
|
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser`)"
|
||||||
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard`)"
|
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard`)"
|
||||||
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios`)"
|
- "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness`)"
|
||||||
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device`)"
|
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios`)"
|
||||||
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog`)"
|
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device`)"
|
||||||
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem`)"
|
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog`)"
|
||||||
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation`)"
|
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem`)"
|
||||||
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics`)"
|
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation`)"
|
||||||
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard`)"
|
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics`)"
|
||||||
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications`)"
|
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard`)"
|
||||||
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network`)"
|
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications`)"
|
||||||
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences`)"
|
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network`)"
|
||||||
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin`)"
|
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences`)"
|
||||||
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share`)"
|
- "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation`)"
|
||||||
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen`)"
|
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin`)"
|
||||||
|
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share`)"
|
||||||
|
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen`)"
|
||||||
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
|
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
|
||||||
- "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
|
- "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch`)"
|
||||||
|
|
||||||
SPEC REPOS:
|
SPEC REPOS:
|
||||||
trunk:
|
trunk:
|
||||||
@@ -66,66 +72,72 @@ SPEC REPOS:
|
|||||||
|
|
||||||
EXTERNAL SOURCES:
|
EXTERNAL SOURCES:
|
||||||
Capacitor:
|
Capacitor:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios"
|
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios"
|
||||||
CapacitorApp:
|
CapacitorApp:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app"
|
:path: "../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app"
|
||||||
CapacitorBrowser:
|
CapacitorBrowser:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser"
|
:path: "../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser"
|
||||||
CapacitorClipboard:
|
CapacitorClipboard:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard"
|
:path: "../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard"
|
||||||
|
CapacitorCommunityScreenBrightness:
|
||||||
|
:path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness"
|
||||||
CapacitorCordova:
|
CapacitorCordova:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios"
|
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios"
|
||||||
CapacitorDevice:
|
CapacitorDevice:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device"
|
:path: "../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device"
|
||||||
CapacitorDialog:
|
CapacitorDialog:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog"
|
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog"
|
||||||
CapacitorFilesystem:
|
CapacitorFilesystem:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem"
|
:path: "../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem"
|
||||||
CapacitorGeolocation:
|
CapacitorGeolocation:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation"
|
:path: "../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation"
|
||||||
CapacitorHaptics:
|
CapacitorHaptics:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics"
|
:path: "../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics"
|
||||||
CapacitorKeyboard:
|
CapacitorKeyboard:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard"
|
:path: "../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard"
|
||||||
CapacitorLocalNotifications:
|
CapacitorLocalNotifications:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications"
|
:path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications"
|
||||||
CapacitorNetwork:
|
CapacitorNetwork:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network"
|
:path: "../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network"
|
||||||
CapacitorPreferences:
|
CapacitorPreferences:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences"
|
:path: "../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences"
|
||||||
|
CapacitorScreenOrientation:
|
||||||
|
:path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation"
|
||||||
CapacitorSecureStoragePlugin:
|
CapacitorSecureStoragePlugin:
|
||||||
:path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin"
|
:path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin"
|
||||||
CapacitorShare:
|
CapacitorShare:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share"
|
:path: "../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share"
|
||||||
CapacitorSplashScreen:
|
CapacitorSplashScreen:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen"
|
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen"
|
||||||
CordovaPlugins:
|
CordovaPlugins:
|
||||||
:path: "../capacitor-cordova-ios-plugins"
|
:path: "../capacitor-cordova-ios-plugins"
|
||||||
TransistorsoftCapacitorBackgroundFetch:
|
TransistorsoftCapacitorBackgroundFetch:
|
||||||
:path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch"
|
:path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch"
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
Capacitor: 57890b363df14d5d2d5d8461aa23e886cb34da2a
|
Capacitor: 8941aba4364ba9d1b22188569001f2ce45cc2b00
|
||||||
CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
|
CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
|
||||||
CapacitorBrowser: 7a0fb6a1011abfaaf2dfedfd8248f942a8eda3d6
|
CapacitorBrowser: 473c7fd70ddbe541608ff09ec1be14da0078279e
|
||||||
CapacitorClipboard: 77edf49827ea21da2a9c05c690a4a6a4d07199c4
|
CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
|
||||||
CapacitorCordova: 3d3908a3d208a11a75f9df3b18c4405c4de76e1d
|
CapacitorCommunityScreenBrightness: 250184917bd0738a681c026a9513e18ddb0cb49b
|
||||||
CapacitorDevice: 2c968f98a1ec4d22357418c1521e7ddc46c675e6
|
CapacitorCordova: 8f2cc8d8d3619c566e9418fe8772064a94266106
|
||||||
CapacitorDialog: 0f3c15dfe9414b83bc64aef4078f1b92bcfead26
|
CapacitorDevice: f8fd88f9edd1261c55a109f32015b09bbbfdc4a0
|
||||||
CapacitorFilesystem: af704badfbc69f6f8623d9ed313e5490e3723dcb
|
CapacitorDialog: 64aa82840ee5e9c066f9e1a49c1e186afd3f24d2
|
||||||
CapacitorGeolocation: 7be5f77abc205c0efe319fff8587a7183e7b0240
|
CapacitorFilesystem: 60e59ba274c234a979e7a3be2552feaadcee4263
|
||||||
CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c
|
CapacitorGeolocation: 1f12bbe372b65116e851bd8e3a94cf0ef9bacebb
|
||||||
CapacitorKeyboard: b978154b024a5f65e044908e37d15b7de58b9d12
|
CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
|
||||||
CapacitorLocalNotifications: c2d8b14794064fd4814b1d6c4ddbac8029afa295
|
CapacitorKeyboard: 5f32a712adf41e07a61caafb82cf29fb6d8ba123
|
||||||
CapacitorNetwork: d80b3e79bef6ec37640ee2806c19771f07ff2d0c
|
CapacitorLocalNotifications: 4ab68f0be5f697a579558fadd307d823a9ec1c26
|
||||||
CapacitorPreferences: f03954bcb0ff09c792909e46bff88e3183c16b10
|
CapacitorNetwork: 5c94acfdddc22043f2ffaff224ce9b4aa5a179f0
|
||||||
|
CapacitorPreferences: 72909b165bc7807103778ddbb86d5d8ce06abf71
|
||||||
|
CapacitorScreenOrientation: 3d4965dcbda5d901b6a48350a5d270ad7d404e05
|
||||||
CapacitorSecureStoragePlugin: e91d7df060f2495a1acff9583641a6953e3aacba
|
CapacitorSecureStoragePlugin: e91d7df060f2495a1acff9583641a6953e3aacba
|
||||||
CapacitorShare: cd41743331cb71d217c029de54b681cbd91e0fcc
|
CapacitorShare: 02222f2457ff003e642370a9c1ecd101baaa27c8
|
||||||
CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
|
CapacitorSplashScreen: 61645214e8f955ff2b80f16a6a3648960fe4c89f
|
||||||
CordovaPlugins: de5669381702d76ed5b1d442177a6a5fc3252a9d
|
CordovaPlugins: 1078156cfc354dd440b38ce4062e69fd9b07033c
|
||||||
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
|
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
|
||||||
TransistorsoftCapacitorBackgroundFetch: ce4b3e01b898cef516e68485d2160a078016ee97
|
TransistorsoftCapacitorBackgroundFetch: f130c5dcb6048401e74cc531e691e1d513045366
|
||||||
|
|
||||||
PODFILE CHECKSUM: 229278f2c257e8ab555325c7115b2e187e8e628d
|
PODFILE CHECKSUM: d0561b89b66368df409c77587e3e02b48e737203
|
||||||
|
|
||||||
COCOAPODS: 1.13.0
|
COCOAPODS: 1.15.2
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/app",
|
"name": "@openstapps/app",
|
||||||
"description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
|
"description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
|
||||||
"version": "3.2.0",
|
"version": "3.3.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
|
"author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
"build:prod": "ng build --configuration=production",
|
"build:prod": "ng build --configuration=production",
|
||||||
"build:stats": "ng build --configuration=production --stats-json",
|
"build:stats": "ng build --configuration=production --stats-json",
|
||||||
"changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0",
|
"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": "node scripts/check-icon-correctness.mjs",
|
||||||
"chromium:no-cors": "chromium --disable-web-security --user-data-dir=\".browser-data/chromium\"",
|
"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",
|
"chromium:virtual-host": "chromium --host-resolver-rules=\"MAP mobile.app.uni-frankfurt.de:* localhost:8100\" --ignore-certificate-errors",
|
||||||
"cypress:open": "cypress open",
|
"cypress:open": "cypress open",
|
||||||
@@ -35,10 +35,10 @@
|
|||||||
"e2e": "ng e2e",
|
"e2e": "ng e2e",
|
||||||
"format": "prettier . -c",
|
"format": "prettier . -c",
|
||||||
"format:fix": "prettier --write .",
|
"format:fix": "prettier --write .",
|
||||||
"licenses": "license-checker --json > src/assets/about/licenses.json && ts-node ./scripts/accumulate-licenses.ts && git add src/assets/about/licenses.json",
|
"licenses": "license-checker --json > src/assets/about/licenses.json && node ./scripts/accumulate-licenses.mjs && git add src/assets/about/licenses.json",
|
||||||
"lint": "ng lint && stylelint \"**/*.scss\"",
|
"lint": "ng lint && stylelint \"**/*.scss\"",
|
||||||
"lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts,.html src/ && stylelint --fix \"**/*.scss\"",
|
"lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts,.html src/ && stylelint --fix \"**/*.scss\"",
|
||||||
"minify-icons": "ts-node-esm scripts/minify-icon-font.ts",
|
"minify-icons": "node scripts/minify-icon-font.mjs",
|
||||||
"postinstall": "jetify && echo \"skipping jetify in production mode\"",
|
"postinstall": "jetify && echo \"skipping jetify in production mode\"",
|
||||||
"preview": "http-server www --p 8101 -o",
|
"preview": "http-server www --p 8101 -o",
|
||||||
"push": "git push && git push origin \"v$npm_package_version\"",
|
"push": "git push && git push origin \"v$npm_package_version\"",
|
||||||
@@ -59,28 +59,29 @@
|
|||||||
"@angular/forms": "17.3.0",
|
"@angular/forms": "17.3.0",
|
||||||
"@angular/platform-browser": "17.3.0",
|
"@angular/platform-browser": "17.3.0",
|
||||||
"@angular/router": "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/calendar": "6.6.0",
|
||||||
"@awesome-cordova-plugins/core": "6.6.0",
|
"@awesome-cordova-plugins/core": "6.6.0",
|
||||||
"@capacitor/app": "5.0.7",
|
"@capacitor-community/screen-brightness": "6.0.0",
|
||||||
"@capacitor/browser": "5.2.0",
|
"@capacitor/app": "6.0.0",
|
||||||
"@capacitor/clipboard": "5.0.7",
|
"@capacitor/browser": "6.0.1",
|
||||||
"@capacitor/core": "5.7.3",
|
"@capacitor/clipboard": "6.0.0",
|
||||||
"@capacitor/device": "5.0.7",
|
"@capacitor/core": "6.1.1",
|
||||||
"@capacitor/dialog": "5.0.7",
|
"@capacitor/device": "6.0.0",
|
||||||
"@capacitor/filesystem": "5.2.1",
|
"@capacitor/dialog": "6.0.0",
|
||||||
"@capacitor/geolocation": "5.0.7",
|
"@capacitor/filesystem": "6.0.0",
|
||||||
"@capacitor/haptics": "5.0.7",
|
"@capacitor/geolocation": "6.0.0",
|
||||||
"@capacitor/keyboard": "5.0.8",
|
"@capacitor/haptics": "6.0.0",
|
||||||
"@capacitor/local-notifications": "5.0.7",
|
"@capacitor/keyboard": "6.0.1",
|
||||||
"@capacitor/network": "5.0.7",
|
"@capacitor/local-notifications": "6.0.0",
|
||||||
"@capacitor/preferences": "5.0.7",
|
"@capacitor/network": "6.0.1",
|
||||||
"@capacitor/share": "5.0.7",
|
"@capacitor/preferences": "6.0.1",
|
||||||
"@capacitor/splash-screen": "5.0.7",
|
"@capacitor/screen-orientation": "6.0.1",
|
||||||
|
"@capacitor/share": "6.0.1",
|
||||||
|
"@capacitor/splash-screen": "6.0.1",
|
||||||
"@ionic-native/core": "5.36.0",
|
"@ionic-native/core": "5.36.0",
|
||||||
"@ionic/angular": "7.8.0",
|
"@ionic/angular": "7.8.0",
|
||||||
"@ionic/storage-angular": "4.0.0",
|
"@ionic/storage-angular": "4.0.0",
|
||||||
|
"@maplibre/ngx-maplibre-gl": "17.4.1",
|
||||||
"@ngx-translate/core": "15.0.0",
|
"@ngx-translate/core": "15.0.0",
|
||||||
"@ngx-translate/http-loader": "8.0.0",
|
"@ngx-translate/http-loader": "8.0.0",
|
||||||
"@openid/appauth": "1.3.1",
|
"@openid/appauth": "1.3.1",
|
||||||
@@ -96,16 +97,16 @@
|
|||||||
"form-data": "4.0.0",
|
"form-data": "4.0.0",
|
||||||
"geojson": "0.5.0",
|
"geojson": "0.5.0",
|
||||||
"ionic-appauth": "0.9.0",
|
"ionic-appauth": "0.9.0",
|
||||||
"jsonpath-plus": "6.0.1",
|
"jsonpath-plus": "10.0.6",
|
||||||
"leaflet": "1.9.4",
|
"maplibre-gl": "4.0.2",
|
||||||
"leaflet.markercluster": "1.5.3",
|
"material-symbols": "0.17.1",
|
||||||
"material-symbols": "0.17.0",
|
|
||||||
"moment": "2.30.1",
|
"moment": "2.30.1",
|
||||||
"ngx-date-fns": "11.0.0",
|
"ngx-date-fns": "11.0.0",
|
||||||
"ngx-logger": "5.0.12",
|
"ngx-logger": "5.0.12",
|
||||||
"ngx-markdown": "17.1.1",
|
"ngx-markdown": "17.1.1",
|
||||||
"ngx-moment": "6.0.2",
|
"ngx-moment": "6.0.2",
|
||||||
"opening_hours": "3.8.0",
|
"opening_hours": "3.8.0",
|
||||||
|
"pmtiles": "3.0.3",
|
||||||
"rxjs": "7.8.1",
|
"rxjs": "7.8.1",
|
||||||
"semver": "7.6.0",
|
"semver": "7.6.0",
|
||||||
"swiper": "8.4.5",
|
"swiper": "8.4.5",
|
||||||
@@ -128,10 +129,10 @@
|
|||||||
"@angular/language-server": "17.3.0",
|
"@angular/language-server": "17.3.0",
|
||||||
"@angular/language-service": "17.3.0",
|
"@angular/language-service": "17.3.0",
|
||||||
"@angular/platform-browser-dynamic": "17.3.0",
|
"@angular/platform-browser-dynamic": "17.3.0",
|
||||||
"@capacitor/android": "5.7.3",
|
"@capacitor/android": "6.1.1",
|
||||||
"@capacitor/assets": "3.0.4",
|
"@capacitor/assets": "3.0.4",
|
||||||
"@capacitor/cli": "5.7.3",
|
"@capacitor/cli": "6.1.1",
|
||||||
"@capacitor/ios": "5.7.3",
|
"@capacitor/ios": "6.1.1",
|
||||||
"@compodoc/compodoc": "1.1.23",
|
"@compodoc/compodoc": "1.1.23",
|
||||||
"@cypress/schematic": "2.5.1",
|
"@cypress/schematic": "2.5.1",
|
||||||
"@ionic/angular-toolkit": "11.0.1",
|
"@ionic/angular-toolkit": "11.0.1",
|
||||||
@@ -147,8 +148,6 @@
|
|||||||
"@types/karma": "6.3.8",
|
"@types/karma": "6.3.8",
|
||||||
"@types/karma-coverage": "2.0.3",
|
"@types/karma-coverage": "2.0.3",
|
||||||
"@types/karma-jasmine": "4.0.5",
|
"@types/karma-jasmine": "4.0.5",
|
||||||
"@types/leaflet": "1.9.8",
|
|
||||||
"@types/leaflet.markercluster": "1.5.4",
|
|
||||||
"@types/node": "18.15.3",
|
"@types/node": "18.15.3",
|
||||||
"@types/semver": "7.5.8",
|
"@types/semver": "7.5.8",
|
||||||
"@typescript-eslint/eslint-plugin": "7.2.0",
|
"@typescript-eslint/eslint-plugin": "7.2.0",
|
||||||
@@ -175,7 +174,7 @@
|
|||||||
"karma-junit-reporter": "2.0.1",
|
"karma-junit-reporter": "2.0.1",
|
||||||
"karma-mocha-reporter": "2.2.5",
|
"karma-mocha-reporter": "2.2.5",
|
||||||
"license-checker": "25.0.1",
|
"license-checker": "25.0.1",
|
||||||
"stylelint": "16.2.1",
|
"stylelint": "16.3.1",
|
||||||
"stylelint-config-clean-order": "5.4.1",
|
"stylelint-config-clean-order": "5.4.1",
|
||||||
"stylelint-config-prettier-scss": "1.0.0",
|
"stylelint-config-prettier-scss": "1.0.0",
|
||||||
"stylelint-config-recommended-scss": "14.0.0",
|
"stylelint-config-recommended-scss": "14.0.0",
|
||||||
|
|||||||
@@ -12,33 +12,34 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import fs from 'fs';
|
import {readFileSync, writeFileSync} from 'fs';
|
||||||
import {omit} from '../src/app/_helpers/collections/omit';
|
import {omit, pickBy} from '@openstapps/collection-utils';
|
||||||
import {pickBy} from '../src/app/_helpers/collections/pick';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* accumulate and transform licenses based on two license files
|
* accumulate and transform licenses based on two license files
|
||||||
|
* @param {string} path
|
||||||
|
* @param {string} additionalLicensesPath
|
||||||
*/
|
*/
|
||||||
function accumulateFile(path: string, additionalLicensesPath: string) {
|
function accumulateFile(path, additionalLicensesPath) {
|
||||||
const packageJson = JSON.parse(fs.readFileSync('./package.json').toString());
|
const packageJson = JSON.parse(readFileSync('./package.json').toString());
|
||||||
const dependencies = packageJson.dependencies;
|
const dependencies = packageJson.dependencies;
|
||||||
|
|
||||||
console.log(`Accumulating licenses from ${path}`);
|
console.log(`Accumulating licenses from ${path}`);
|
||||||
|
|
||||||
fs.writeFileSync(
|
writeFileSync(
|
||||||
path,
|
path,
|
||||||
JSON.stringify(
|
JSON.stringify(
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
Object.entries<any>({
|
Object.entries({
|
||||||
...pickBy(JSON.parse(fs.readFileSync(path).toString()), (_, key: string) => {
|
...pickBy(JSON.parse(readFileSync(path).toString()), (_, key) => {
|
||||||
const parts = key.split('@');
|
const parts = /** @type {string} */ (key).split('@');
|
||||||
|
|
||||||
return dependencies[parts.slice(0, -1).join('@')] === parts[parts.length - 1];
|
return dependencies[parts.slice(0, -1).join('@')] === parts[parts.length - 1];
|
||||||
}),
|
}),
|
||||||
...JSON.parse(fs.readFileSync(additionalLicensesPath).toString()),
|
...JSON.parse(readFileSync(additionalLicensesPath).toString()),
|
||||||
})
|
})
|
||||||
.map(([key, value]) => ({
|
.map(([key, value]) => ({
|
||||||
licenseText: value.licenseFile && fs.readFileSync(value.licenseFile, 'utf8'),
|
licenseText: value.licenseFile && readFileSync(value.licenseFile, 'utf8'),
|
||||||
name: key,
|
name: key,
|
||||||
...omit(value, 'licenseFile', 'path'),
|
...omit(value, 'licenseFile', 'path'),
|
||||||
}))
|
}))
|
||||||
@@ -12,18 +12,20 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import fontkit, {Font} from 'fontkit';
|
import {openSync} from 'fontkit';
|
||||||
import config from '../icons.config';
|
import config from '../icons.config.mjs';
|
||||||
import {existsSync} from 'fs';
|
import {existsSync} from 'fs';
|
||||||
import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons';
|
import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.mjs';
|
||||||
|
import {fetchCodePointMap} from './get-code-points.mjs';
|
||||||
|
|
||||||
const commandName = '"npm run minify-icons"';
|
const commandName = '"npm run minify-icons"';
|
||||||
const originalFont = fontkit.openSync(config.inputPath);
|
|
||||||
if (!existsSync(config.outputPath)) {
|
if (!existsSync(config.outputPath)) {
|
||||||
console.error(`Minified font not found. Run ${commandName} first.`);
|
console.error(`Minified font not found. Run ${commandName} first.`);
|
||||||
process.exit(-1);
|
process.exit(-1);
|
||||||
}
|
}
|
||||||
const modifiedFont = fontkit.openSync(config.outputPath);
|
|
||||||
|
/** @type {import('fontkit').Font} */
|
||||||
|
const modifiedFont = openSync(config.outputPath);
|
||||||
|
|
||||||
let success = true;
|
let success = true;
|
||||||
|
|
||||||
@@ -48,25 +50,16 @@ async function checkAll() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* @param {Record<string, string[]>} icons
|
||||||
*/
|
*/
|
||||||
function check(icons: Record<string, string[]>) {
|
async function check(icons) {
|
||||||
for (const [purpose, iconSet] of Object.entries(icons)) {
|
const codePoints = await fetchCodePointMap();
|
||||||
for (const icon of iconSet) {
|
|
||||||
if (!hasIcon(originalFont, icon)) {
|
|
||||||
success = false;
|
|
||||||
console.error(`${purpose}: ${icon} does not exist. Typo?`);
|
|
||||||
} else if (!hasIcon(modifiedFont, icon)) {
|
|
||||||
success = false;
|
|
||||||
console.error(`${purpose}: ${icon} not found in minified font. Run ${commandName} to regenerate it.`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
for (const icon of Object.values(icons).flat()) {
|
||||||
*
|
const codePoint = codePoints.get(icon);
|
||||||
*/
|
if (!codePoint) throw new Error(`"${icon}" is not a valid icon`);
|
||||||
function hasIcon(font: Font, icon: string) {
|
if (!modifiedFont.getGlyph(Number.parseInt(codePoint, 16))) {
|
||||||
return font.layout(icon).glyphs.some(it => it.isLigature);
|
throw new Error(`"${icon}" (code point ${codePoint}) is missing`);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -14,34 +14,39 @@
|
|||||||
*/
|
*/
|
||||||
import {glob} from 'glob';
|
import {glob} from 'glob';
|
||||||
import {readFileSync} from 'fs';
|
import {readFileSync} from 'fs';
|
||||||
import {matchPropertyContent, matchTagProperties} from '../src/app/util/ion-icon/icon-match';
|
import {
|
||||||
|
matchPropertyAccess,
|
||||||
|
matchPropertyContent,
|
||||||
|
matchTagProperties,
|
||||||
|
} from '../src/app/util/ion-icon/icon-match.mjs';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* @returns {Promise<Record<string, string[]>>}
|
||||||
*/
|
*/
|
||||||
export async function getUsedIconsHtml(pattern = 'src/**/*.html'): Promise<Record<string, string[]>> {
|
export async function getUsedIconsHtml(pattern = 'src/**/*.html') {
|
||||||
return Object.fromEntries(
|
return Object.fromEntries(
|
||||||
(await glob(pattern))
|
(await glob(pattern))
|
||||||
.map(file => [
|
.map(file => [
|
||||||
file,
|
file,
|
||||||
(readFileSync(file, 'utf8')
|
readFileSync(file, 'utf8')
|
||||||
.match(matchTagProperties('ion-icon'))
|
.match(matchTagProperties('ion-icon'))
|
||||||
?.flatMap(match => {
|
?.flatMap(match => {
|
||||||
return match.match(matchPropertyContent(['name', 'md', 'ios']));
|
return match.match(matchPropertyContent(['name', 'md', 'ios']));
|
||||||
})
|
})
|
||||||
.filter(it => !!it) as string[]) || [],
|
.filter(it => !!it) || [],
|
||||||
])
|
])
|
||||||
.filter(([, values]) => values.length > 0),
|
.filter(([, values]) => values && values.length > 0),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* @returns {Promise<Record<string, string[]>>}
|
||||||
*/
|
*/
|
||||||
export async function getUsedIconsTS(pattern = 'src/**/*.ts'): Promise<Record<string, string[]>> {
|
export async function getUsedIconsTS(pattern = 'src/**/*.ts') {
|
||||||
|
const regex = matchPropertyAccess('SCIcon');
|
||||||
return Object.fromEntries(
|
return Object.fromEntries(
|
||||||
(await glob(pattern))
|
(await glob(pattern))
|
||||||
.map(file => [file, readFileSync(file, 'utf8').match(/(?<=Icon`)[\w-]+(?=`)/g) || []])
|
.map(file => [file, readFileSync(file, 'utf8').match(regex) || []])
|
||||||
.filter(([, values]) => values.length > 0),
|
.filter(([, values]) => values && values.length > 0),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
23
frontend/app/scripts/get-code-points.mjs
Normal file
23
frontend/app/scripts/get-code-points.mjs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
const url =
|
||||||
|
'https://raw.githubusercontent.com/google/material-design-icons/master/' +
|
||||||
|
'variablefont/MaterialSymbolsRounded%5BFILL%2CGRAD%2Copsz%2Cwght%5D.codepoints';
|
||||||
|
|
||||||
|
export async function fetchCodePointMap() {
|
||||||
|
const icons = await fetch(url)
|
||||||
|
.then(it => it.text())
|
||||||
|
.then(it => new Map(it.split('\n').map(it => /** @type {[string, string]} */ (it.split(' ')))));
|
||||||
|
if (icons.size < 100) throw new Error(`Code point map is very small, is the URL incorrect? ${url}`);
|
||||||
|
return icons;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string[]} icons
|
||||||
|
*/
|
||||||
|
export async function getCodePoints(icons) {
|
||||||
|
const codePoints = await fetchCodePointMap();
|
||||||
|
return icons.map(icon => {
|
||||||
|
const code = codePoints.get(icon);
|
||||||
|
if (!code) throw new Error(`Code point for icon ${icon} not found`);
|
||||||
|
return code;
|
||||||
|
});
|
||||||
|
}
|
||||||
8
frontend/app/scripts/get-ip.mjs
Normal file
8
frontend/app/scripts/get-ip.mjs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import {networkInterfaces} from 'os';
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
Object.entries(networkInterfaces())
|
||||||
|
.map(([, info]) => info)
|
||||||
|
.flat()
|
||||||
|
.find(info => info && !info.internal && info.family === 'IPv4')?.address,
|
||||||
|
);
|
||||||
@@ -19,5 +19,4 @@ export interface IconConfig {
|
|||||||
inputPath: string;
|
inputPath: string;
|
||||||
outputPath: string;
|
outputPath: string;
|
||||||
additionalIcons?: {[purpose: string]: string[]};
|
additionalIcons?: {[purpose: string]: string[]};
|
||||||
codePoints?: {[name: string]: string};
|
|
||||||
}
|
}
|
||||||
@@ -14,16 +14,17 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||||
import fontkit from 'fontkit';
|
|
||||||
import {exec} from 'child_process';
|
import {exec} from 'child_process';
|
||||||
import config from '../icons.config';
|
import config from '../icons.config.mjs';
|
||||||
import {statSync} from 'fs';
|
import {statSync} from 'fs';
|
||||||
import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons';
|
import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.mjs';
|
||||||
|
import {getCodePoints} from './get-code-points.mjs';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
* @param {string[] | string} command
|
||||||
|
* @returns {Promise<string>}
|
||||||
*/
|
*/
|
||||||
async function run(command: string[] | string): Promise<string> {
|
async function run(command) {
|
||||||
const fullCommand = Array.isArray(command) ? command.join(' ') : command;
|
const fullCommand = Array.isArray(command) ? command.join(' ') : command;
|
||||||
console.log(`>> ${fullCommand}`);
|
console.log(`>> ${fullCommand}`);
|
||||||
|
|
||||||
@@ -44,7 +45,8 @@ async function run(command: string[] | string): Promise<string> {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
async function minifyIconFont() {
|
async function minifyIconFont() {
|
||||||
const icons = new Set<string>();
|
/** @type {Set<string>} */
|
||||||
|
const icons = new Set();
|
||||||
|
|
||||||
for (const iconSet of [
|
for (const iconSet of [
|
||||||
...Object.values(config.additionalIcons || []),
|
...Object.values(config.additionalIcons || []),
|
||||||
@@ -56,35 +58,7 @@ async function minifyIconFont() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('Icons used:', [...icons.values()].sort());
|
const glyphs = ['5f-7a', '30-39', ...(await getCodePoints([...icons]))].sort();
|
||||||
const font = fontkit.openSync(config.inputPath);
|
|
||||||
|
|
||||||
const glyphs: string[] = ['5f-7a', '30-39'];
|
|
||||||
for (const icon of icons) {
|
|
||||||
const iconGlyphs = font.layout(icon).glyphs;
|
|
||||||
if (iconGlyphs.length === 0) {
|
|
||||||
console.error(`${icon} not found in font. Typo?`);
|
|
||||||
process.exit(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
const codePoints = iconGlyphs
|
|
||||||
.flatMap(it => font.stringsForGlyph(it.id))
|
|
||||||
.flatMap(it => [...it])
|
|
||||||
.map(it => it.codePointAt(0)!.toString(16));
|
|
||||||
|
|
||||||
if (codePoints.length === 0) {
|
|
||||||
if (config.codePoints?.[icon]) {
|
|
||||||
glyphs.push(config.codePoints[icon]);
|
|
||||||
} else {
|
|
||||||
console.log();
|
|
||||||
console.error(`${icon} code point could not be determined. Add it to config.codePoints.`);
|
|
||||||
process.exit(-1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
glyphs.push(...codePoints);
|
|
||||||
}
|
|
||||||
glyphs.sort();
|
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
await run([
|
await run([
|
||||||
@@ -114,8 +88,10 @@ minifyIconFont();
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Bytes to respective units
|
* Bytes to respective units
|
||||||
|
* @param {number} value
|
||||||
|
* @returns {string}
|
||||||
*/
|
*/
|
||||||
function toByteUnit(value: number): string {
|
function toByteUnit(value) {
|
||||||
if (value < 1024) {
|
if (value < 1024) {
|
||||||
return `${value}B`;
|
return `${value}B`;
|
||||||
} else if (value < 1024 * 1024) {
|
} else if (value < 1024 * 1024) {
|
||||||
@@ -30,7 +30,6 @@ import {environment} from '../environments/environment';
|
|||||||
import {AppRoutingModule} from './app-routing.module';
|
import {AppRoutingModule} from './app-routing.module';
|
||||||
import {AppComponent} from './app.component';
|
import {AppComponent} from './app.component';
|
||||||
import {CatalogModule} from './modules/catalog/catalog.module';
|
import {CatalogModule} from './modules/catalog/catalog.module';
|
||||||
import {ConfigModule} from './modules/config/config.module';
|
|
||||||
import {ConfigProvider} from './modules/config/config.provider';
|
import {ConfigProvider} from './modules/config/config.provider';
|
||||||
import {DashboardModule} from './modules/dashboard/dashboard.module';
|
import {DashboardModule} from './modules/dashboard/dashboard.module';
|
||||||
import {DataModule} from './modules/data/data.module';
|
import {DataModule} from './modules/data/data.module';
|
||||||
@@ -70,6 +69,8 @@ import {setDefaultOptions} from 'date-fns';
|
|||||||
import {DateFnsConfigurationService} from 'ngx-date-fns';
|
import {DateFnsConfigurationService} from 'ngx-date-fns';
|
||||||
import {Capacitor} from '@capacitor/core';
|
import {Capacitor} from '@capacitor/core';
|
||||||
import {SplashScreen} from '@capacitor/splash-screen';
|
import {SplashScreen} from '@capacitor/splash-screen';
|
||||||
|
import maplibregl from 'maplibre-gl';
|
||||||
|
import {Protocol} from 'pmtiles';
|
||||||
|
|
||||||
registerLocaleData(localeDe);
|
registerLocaleData(localeDe);
|
||||||
|
|
||||||
@@ -91,6 +92,7 @@ export function initializerFactory(
|
|||||||
) {
|
) {
|
||||||
return async () => {
|
return async () => {
|
||||||
try {
|
try {
|
||||||
|
maplibregl.addProtocol('pmtiles', new Protocol().tile);
|
||||||
initLogger(logger);
|
initLogger(logger);
|
||||||
await storageProvider.init();
|
await storageProvider.init();
|
||||||
await configProvider.init();
|
await configProvider.init();
|
||||||
@@ -151,7 +153,6 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
BrowserAnimationsModule,
|
BrowserAnimationsModule,
|
||||||
CatalogModule,
|
CatalogModule,
|
||||||
CommonModule,
|
CommonModule,
|
||||||
ConfigModule,
|
|
||||||
DashboardModule,
|
DashboardModule,
|
||||||
DataModule,
|
DataModule,
|
||||||
HebisModule,
|
HebisModule,
|
||||||
|
|||||||
@@ -13,11 +13,15 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {Component} from '@angular/core';
|
import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
|
||||||
|
import {ConfigProvider} from '../config/config.provider';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'about-changelog',
|
selector: 'about-changelog',
|
||||||
templateUrl: 'about-changelog.html',
|
templateUrl: 'about-changelog.html',
|
||||||
styleUrls: ['about-changelog.scss', './about-page/about-page.scss'],
|
styleUrls: ['about-changelog.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class AboutChangelogComponent {}
|
export class AboutChangelogComponent {
|
||||||
|
config = inject(ConfigProvider);
|
||||||
|
}
|
||||||
|
|||||||
@@ -16,14 +16,14 @@
|
|||||||
<ion-header>
|
<ion-header>
|
||||||
<ion-toolbar color="primary" mode="ios">
|
<ion-toolbar color="primary" mode="ios">
|
||||||
<ion-buttons slot="start">
|
<ion-buttons slot="start">
|
||||||
<ion-back-button></ion-back-button>
|
<ion-back-button defaultHref="/about/changelog"></ion-back-button>
|
||||||
</ion-buttons>
|
</ion-buttons>
|
||||||
<ion-title>Changelog</ion-title>
|
<ion-title>{{ 'about.TECHNICAL_CHANGELOG' | translate }}</ion-title>
|
||||||
<!-- TODO: translation -->
|
|
||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
<ion-content parallax>
|
<ion-content parallax>
|
||||||
|
<p class="disclaimer">{{ 'about.TECHNICAL_CHANGELOG_DISCLAIMER' | translate }}</p>
|
||||||
<div class="about-changelog">
|
<div class="about-changelog">
|
||||||
<markdown src="assets/about/CHANGELOG.md"></markdown>
|
<markdown class="release-notes" src="assets/CHANGELOG.md"></markdown>
|
||||||
</div>
|
</div>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
|
|||||||
@@ -13,6 +13,13 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ion-content {
|
ion-toggle {
|
||||||
--padding-start: 16px;
|
width: fit-content;
|
||||||
|
padding-inline: var(--spacing-md);
|
||||||
|
color: var(--ion-color-primary-contrast);
|
||||||
|
}
|
||||||
|
|
||||||
|
.disclaimer {
|
||||||
|
margin-block: var(--spacing-xs);
|
||||||
|
color: var(--ion-color-primary-contrast);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,24 +12,6 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
ion-content > div {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
cdk-virtual-scroll-viewport {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
:host ::ng-deep {
|
|
||||||
.cdk-virtual-scroll-content-wrapper {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.virtual-scroll-expander {
|
|
||||||
clear: both;
|
|
||||||
}
|
|
||||||
|
|
||||||
.supertext-icon {
|
.supertext-icon {
|
||||||
height: 14px;
|
height: 14px;
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
@if (content.type === 'router link') {
|
@if (content.type === 'router link') {
|
||||||
<ion-item [routerLink]="content.link">
|
<ion-item [routerLink]="content.link">
|
||||||
@if (content.icon) {
|
@if (content.icon) {
|
||||||
<ion-icon [name]="content.icon" slot="start"></ion-icon>
|
<ion-icon [name]="$any(content.icon)" slot="start"></ion-icon>
|
||||||
}
|
}
|
||||||
<ion-label>{{ 'title' | translateSimple: content }}</ion-label>
|
<ion-label>{{ 'title' | translateSimple: content }}</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 StApps
|
* Copyright (C) 2023 StApps
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
* 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
|
* under the terms of the GNU General Public License as published by the Free
|
||||||
* Software Foundation, version 3.
|
* Software Foundation, version 3.
|
||||||
@@ -12,16 +12,16 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {NgModule} from '@angular/core';
|
|
||||||
import {DataModule} from '../data/data.module';
|
|
||||||
import {StorageModule} from '../storage/storage.module';
|
|
||||||
import {ConfigProvider} from './config.provider';
|
|
||||||
|
|
||||||
/**
|
import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
|
||||||
* TODO
|
import {ConfigProvider} from '../config/config.provider';
|
||||||
*/
|
|
||||||
@NgModule({
|
@Component({
|
||||||
imports: [StorageModule, DataModule],
|
selector: 'about-changelog',
|
||||||
providers: [ConfigProvider],
|
templateUrl: 'about-release-notes.html',
|
||||||
|
styleUrls: ['about-release-notes.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class ConfigModule {}
|
export class AboutReleaseNotesComponent {
|
||||||
|
config = inject(ConfigProvider);
|
||||||
|
}
|
||||||
32
frontend/app/src/app/modules/about/about-release-notes.html
Normal file
32
frontend/app/src/app/modules/about/about-release-notes.html
Normal file
@@ -0,0 +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/>.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<ion-header>
|
||||||
|
<ion-toolbar color="primary" mode="ios">
|
||||||
|
<ion-buttons slot="start">
|
||||||
|
<ion-back-button defaultHref="/about"></ion-back-button>
|
||||||
|
</ion-buttons>
|
||||||
|
<ion-title>{{ 'about.CHANGELOG' | translate }}</ion-title>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
<ion-content parallax>
|
||||||
|
<ion-button fill="clear" [routerLink]="['/about', 'stapps-changelog']"
|
||||||
|
>{{ 'about.TECHNICAL_CHANGELOG' | translate
|
||||||
|
}}<ion-icon slot="end" name="arrow_forward" ios="arrow_forward_ios"></ion-icon
|
||||||
|
></ion-button>
|
||||||
|
@for (version of config.config.app.versionHistory; track version) {
|
||||||
|
<markdown class="release-notes" [data]="'releaseNotes' | translateSimple: version"></markdown>
|
||||||
|
}
|
||||||
|
</ion-content>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*!
|
/*!
|
||||||
* Copyright (C) 2023 StApps
|
* Copyright (C) 2021 StApps
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
* 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
|
* under the terms of the GNU General Public License as published by the Free
|
||||||
* Software Foundation, version 3.
|
* Software Foundation, version 3.
|
||||||
@@ -12,14 +12,20 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
@import '../util/dark';
|
@import '../../../theme/util/mixins';
|
||||||
|
|
||||||
@include dark-only {
|
ion-button {
|
||||||
.leaflet-tile-pane {
|
--color: var(--ion-color-primary-contrast);
|
||||||
filter: invert(1);
|
|
||||||
}
|
width: fit-content;
|
||||||
|
margin-block: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.map-container.leaflet-container {
|
.release-notes {
|
||||||
background: var(--ion-background-color);
|
@include border-radius-in-parallax(var(--border-radius-default));
|
||||||
|
|
||||||
|
display: block;
|
||||||
|
margin: var(--spacing-md);
|
||||||
|
margin-block-start: 0;
|
||||||
|
background: var(--ion-item-background);
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,6 @@ import {FormsModule} from '@angular/forms';
|
|||||||
import {IonicModule} from '@ionic/angular';
|
import {IonicModule} from '@ionic/angular';
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
||||||
import {ConfigProvider} from '../config/config.provider';
|
|
||||||
import {AboutPageComponent} from './about-page/about-page.component';
|
import {AboutPageComponent} from './about-page/about-page.component';
|
||||||
import {MarkdownModule} from 'ngx-markdown';
|
import {MarkdownModule} from 'ngx-markdown';
|
||||||
import {AboutPageContentComponent} from './about-page/about-page-content.component';
|
import {AboutPageContentComponent} from './about-page/about-page-content.component';
|
||||||
@@ -30,10 +29,12 @@ import {AboutLicenseModalComponent} from './about-license-modal.component';
|
|||||||
import {AboutChangelogComponent} from './about-changelog.component';
|
import {AboutChangelogComponent} from './about-changelog.component';
|
||||||
import {UtilModule} from '../../util/util.module';
|
import {UtilModule} from '../../util/util.module';
|
||||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||||
|
import {AboutReleaseNotesComponent} from './about-release-notes.component';
|
||||||
|
|
||||||
const settingsRoutes: Routes = [
|
const settingsRoutes: Routes = [
|
||||||
{path: 'about', component: AboutPageComponent},
|
{path: 'about', component: AboutPageComponent},
|
||||||
{path: 'about/changelog', component: AboutChangelogComponent},
|
{path: 'about/changelog', component: AboutReleaseNotesComponent},
|
||||||
|
{path: 'about/stapps-changelog', component: AboutChangelogComponent},
|
||||||
{path: 'about/imprint', component: AboutPageComponent},
|
{path: 'about/imprint', component: AboutPageComponent},
|
||||||
{path: 'about/privacy', component: AboutPageComponent},
|
{path: 'about/privacy', component: AboutPageComponent},
|
||||||
{path: 'about/terms', component: AboutPageComponent},
|
{path: 'about/terms', component: AboutPageComponent},
|
||||||
@@ -50,6 +51,7 @@ const settingsRoutes: Routes = [
|
|||||||
AboutLicensesComponent,
|
AboutLicensesComponent,
|
||||||
AboutLicenseModalComponent,
|
AboutLicenseModalComponent,
|
||||||
AboutChangelogComponent,
|
AboutChangelogComponent,
|
||||||
|
AboutReleaseNotesComponent,
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
@@ -64,6 +66,5 @@ const settingsRoutes: Routes = [
|
|||||||
ScrollingModule,
|
ScrollingModule,
|
||||||
UtilModule,
|
UtilModule,
|
||||||
],
|
],
|
||||||
providers: [ConfigProvider],
|
|
||||||
})
|
})
|
||||||
export class AboutModule {}
|
export class AboutModule {}
|
||||||
|
|||||||
@@ -2,11 +2,11 @@ import {Injectable} from '@angular/core';
|
|||||||
import {StorageProvider} from '../storage/storage.provider';
|
import {StorageProvider} from '../storage/storage.provider';
|
||||||
import {ConfigProvider} from '../config/config.provider';
|
import {ConfigProvider} from '../config/config.provider';
|
||||||
import {ModalController} from '@ionic/angular';
|
import {ModalController} from '@ionic/angular';
|
||||||
import {Capacitor} from '@capacitor/core';
|
|
||||||
import {ReleaseNotesComponent} from './release-notes.component';
|
import {ReleaseNotesComponent} from './release-notes.component';
|
||||||
import {SCAppVersionInfo} from '@openstapps/core';
|
import {SCAppVersionInfo} from '@openstapps/core';
|
||||||
import {App} from '@capacitor/app';
|
import {App} from '@capacitor/app';
|
||||||
import {coerce} from 'semver';
|
import {coerce} from 'semver';
|
||||||
|
import {Capacitor} from '@capacitor/core';
|
||||||
|
|
||||||
export const RELEASE_NOTES_SHOWN_KEY = 'release_notes_shown';
|
export const RELEASE_NOTES_SHOWN_KEY = 'release_notes_shown';
|
||||||
|
|
||||||
@@ -25,12 +25,11 @@ export class AppVersionService {
|
|||||||
if (Capacitor.getPlatform() === 'web') {
|
if (Capacitor.getPlatform() === 'web') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const storedVersion = coerce(
|
|
||||||
(await this.storage.has(RELEASE_NOTES_SHOWN_KEY))
|
|
||||||
? await this.storage.get<string>(RELEASE_NOTES_SHOWN_KEY)
|
|
||||||
: '0.0.0',
|
|
||||||
)!;
|
|
||||||
const currentVersion = coerce(await App.getInfo().then(info => info.version))!;
|
const currentVersion = coerce(await App.getInfo().then(info => info.version))!;
|
||||||
|
if (!(await this.storage.has(RELEASE_NOTES_SHOWN_KEY))) {
|
||||||
|
await this.storage.put(RELEASE_NOTES_SHOWN_KEY, currentVersion);
|
||||||
|
}
|
||||||
|
const storedVersion = coerce(await this.storage.get<string>(RELEASE_NOTES_SHOWN_KEY))!;
|
||||||
|
|
||||||
return this.config.config.app.versionHistory
|
return this.config.config.app.versionHistory
|
||||||
?.filter(({version}) => {
|
?.filter(({version}) => {
|
||||||
@@ -39,7 +38,7 @@ export class AppVersionService {
|
|||||||
const isNotFutureVersion = semanticVersion.compare(currentVersion) <= 0;
|
const isNotFutureVersion = semanticVersion.compare(currentVersion) <= 0;
|
||||||
return wasNotShown && isNotFutureVersion;
|
return wasNotShown && isNotFutureVersion;
|
||||||
})
|
})
|
||||||
?.sort((a, b) => coerce(a.version)!.compare(b.version));
|
?.sort((a, b) => -coerce(a.version)!.compare(b.version));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
.release-notes {
|
||||||
|
max-width: 16cm;
|
||||||
|
}
|
||||||
|
|
||||||
|
.release-notes ::ng-deep {
|
||||||
|
h1 {
|
||||||
|
font-size: 1.5em;
|
||||||
|
font-weight: bold;
|
||||||
|
color: var(--ion-color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
font-size: 1.2em;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
font-size: 1.1em;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
blockquote {
|
||||||
|
background: var(--ion-item-background);
|
||||||
|
border-left: 0.25em solid var(--ion-color-medium);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,7 +9,7 @@ import {UtilModule} from '../../util/util.module';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-release-notes',
|
selector: 'stapps-release-notes',
|
||||||
templateUrl: 'release-notes.html',
|
templateUrl: 'release-notes.html',
|
||||||
styleUrls: ['release-notes.scss'],
|
styleUrls: ['release-notes.scss', 'release-notes-markdown.scss'],
|
||||||
standalone: true,
|
standalone: true,
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
imports: [UtilModule, MarkdownModule, ThingTranslateModule, IonicModule, TranslateModule],
|
imports: [UtilModule, MarkdownModule, ThingTranslateModule, IonicModule, TranslateModule],
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<ion-content parallax>
|
<ion-content parallax>
|
||||||
@for (versionInfo of versionInfos; track versionInfo) {
|
@for (versionInfo of versionInfos; track versionInfo) {
|
||||||
<markdown
|
<markdown
|
||||||
class="content-card ion-padding"
|
class="content-card ion-padding release-notes"
|
||||||
[data]="'releaseNotes' | translateSimple: versionInfo"
|
[data]="'releaseNotes' | translateSimple: versionInfo"
|
||||||
></markdown>
|
></markdown>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,5 +9,6 @@ ion-title {
|
|||||||
|
|
||||||
display: block;
|
display: block;
|
||||||
margin: var(--spacing-md);
|
margin: var(--spacing-md);
|
||||||
|
margin-block-start: 0;
|
||||||
background: var(--ion-item-background);
|
background: var(--ion-item-background);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ export class AuthHelperService {
|
|||||||
user[key as keyof SCUserConfiguration] = JSONPath({
|
user[key as keyof SCUserConfiguration] = JSONPath({
|
||||||
path: this.userConfigurationMap[key as keyof SCUserConfiguration] as string,
|
path: this.userConfigurationMap[key as keyof SCUserConfiguration] as string,
|
||||||
json: userInfo,
|
json: userInfo,
|
||||||
preventEval: true,
|
|
||||||
})[0];
|
})[0];
|
||||||
}
|
}
|
||||||
if (user.givenName && user.givenName.length > 0 && user.familyName && user.familyName.length > 0) {
|
if (user.givenName && user.givenName.length > 0 && user.familyName && user.familyName.length > 0) {
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
ion-segment-button {
|
ion-segment-button {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
text-transform: none;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.margin-top {
|
.margin-top {
|
||||||
|
|||||||
@@ -24,13 +24,17 @@ import {
|
|||||||
} from './errors';
|
} from './errors';
|
||||||
import {NGXLogger} from 'ngx-logger';
|
import {NGXLogger} from 'ngx-logger';
|
||||||
import {sampleIndexResponse} from '../../_helpers/data/sample-configuration';
|
import {sampleIndexResponse} from '../../_helpers/data/sample-configuration';
|
||||||
|
import {BehaviorSubject} from 'rxjs';
|
||||||
|
import {InternetConnectionService} from '../../util/internet-connection.service';
|
||||||
|
|
||||||
describe('ConfigProvider', () => {
|
describe('ConfigProvider', () => {
|
||||||
|
let internetConnectionServiceMock: {offline$: BehaviorSubject<boolean>};
|
||||||
let configProvider: ConfigProvider;
|
let configProvider: ConfigProvider;
|
||||||
let storageProviderSpy: jasmine.SpyObj<StorageProvider>;
|
let storageProviderSpy: jasmine.SpyObj<StorageProvider>;
|
||||||
let ngxLogger: jasmine.SpyObj<NGXLogger>;
|
let ngxLogger: jasmine.SpyObj<NGXLogger>;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
|
internetConnectionServiceMock = {offline$: new BehaviorSubject<boolean>(false)};
|
||||||
storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
|
storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
|
||||||
const webHttpClientMethodSpy = jasmine.createSpyObj('StAppsWebHttpClient', ['request']);
|
const webHttpClientMethodSpy = jasmine.createSpyObj('StAppsWebHttpClient', ['request']);
|
||||||
ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']);
|
ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']);
|
||||||
@@ -51,6 +55,10 @@ describe('ConfigProvider', () => {
|
|||||||
provide: NGXLogger,
|
provide: NGXLogger,
|
||||||
useValue: ngxLogger,
|
useValue: ngxLogger,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
provide: InternetConnectionService,
|
||||||
|
useValue: internetConnectionServiceMock,
|
||||||
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -59,7 +67,8 @@ describe('ConfigProvider', () => {
|
|||||||
|
|
||||||
it('should fetch app configuration', async () => {
|
it('should fetch app configuration', async () => {
|
||||||
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
|
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
|
||||||
const result = await configProvider.fetch();
|
await configProvider.fetch();
|
||||||
|
const result = configProvider.config;
|
||||||
expect(result).toEqual(sampleIndexResponse);
|
expect(result).toEqual(sampleIndexResponse);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -75,6 +84,22 @@ describe('ConfigProvider', () => {
|
|||||||
expect(error).toEqual(new ConfigFetchError());
|
expect(error).toEqual(new ConfigFetchError());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should throw device offline error when offline', async () => {
|
||||||
|
// eslint-disable-next-line unicorn/error-message
|
||||||
|
let error = new Error('');
|
||||||
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
|
// @ts-ignore
|
||||||
|
internetConnectionServiceMock.offline$ = new BehaviorSubject<boolean>(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await configProvider.fetch();
|
||||||
|
} catch (error_) {
|
||||||
|
error = error_ as Error;
|
||||||
|
expect(error).toBeInstanceOf(ConfigFetchError);
|
||||||
|
expect(error.message).toContain('Device is offline.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it('should init from remote and saved config not available', async () => {
|
it('should init from remote and saved config not available', async () => {
|
||||||
storageProviderSpy.has.and.returnValue(Promise.resolve(false));
|
storageProviderSpy.has.and.returnValue(Promise.resolve(false));
|
||||||
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
|
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
|
||||||
@@ -86,7 +111,7 @@ describe('ConfigProvider', () => {
|
|||||||
expect(storageProviderSpy.has).toHaveBeenCalled();
|
expect(storageProviderSpy.has).toHaveBeenCalled();
|
||||||
expect(storageProviderSpy.get).toHaveBeenCalledTimes(0);
|
expect(storageProviderSpy.get).toHaveBeenCalledTimes(0);
|
||||||
expect(configProvider.client.handshake).toHaveBeenCalled();
|
expect(configProvider.client.handshake).toHaveBeenCalled();
|
||||||
expect(await configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
|
expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should throw error on failed initialisation', async () => {
|
it('should throw error on failed initialisation', async () => {
|
||||||
@@ -104,10 +129,12 @@ describe('ConfigProvider', () => {
|
|||||||
|
|
||||||
it('should throw error on wrong config version in storage', async () => {
|
it('should throw error on wrong config version in storage', async () => {
|
||||||
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
|
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
|
||||||
const wrongConfig = JSON.parse(JSON.stringify(sampleIndexResponse));
|
const wrongConfig = structuredClone(sampleIndexResponse);
|
||||||
wrongConfig.backend.SCVersion = '0.1.0';
|
wrongConfig.backend.SCVersion = '0.1.0';
|
||||||
storageProviderSpy.get.and.returnValue(wrongConfig);
|
storageProviderSpy.get.and.returnValue(Promise.resolve(wrongConfig));
|
||||||
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
|
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
|
||||||
|
// sets StApps core version which has a different major version
|
||||||
|
configProvider.scVersion = '1.0.0';
|
||||||
await configProvider.init();
|
await configProvider.init();
|
||||||
|
|
||||||
expect(ngxLogger.warn).toHaveBeenCalledWith(
|
expect(ngxLogger.warn).toHaveBeenCalledWith(
|
||||||
@@ -115,6 +142,19 @@ describe('ConfigProvider', () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should load from storage if offline and same major version stored', async () => {
|
||||||
|
internetConnectionServiceMock = {offline$: new BehaviorSubject<boolean>(true)};
|
||||||
|
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
|
||||||
|
const configInStorage = structuredClone(sampleIndexResponse);
|
||||||
|
configInStorage.backend.SCVersion = '1.0.0';
|
||||||
|
storageProviderSpy.get.and.returnValue(Promise.resolve(configInStorage));
|
||||||
|
// sets StApps core version which has the same major version
|
||||||
|
configProvider.scVersion = '1.1.1';
|
||||||
|
await configProvider.init();
|
||||||
|
|
||||||
|
expect(configProvider.getAnyValue('app')).toEqual(configInStorage.app);
|
||||||
|
});
|
||||||
|
|
||||||
it('should throw error on saved app configuration not available', async () => {
|
it('should throw error on saved app configuration not available', async () => {
|
||||||
storageProviderSpy.has.and.returnValue(Promise.resolve(false));
|
storageProviderSpy.has.and.returnValue(Promise.resolve(false));
|
||||||
// eslint-disable-next-line unicorn/error-message
|
// eslint-disable-next-line unicorn/error-message
|
||||||
@@ -153,4 +193,31 @@ describe('ConfigProvider', () => {
|
|||||||
|
|
||||||
expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
|
expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should fetch new config from remote on init', async () => {
|
||||||
|
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
|
||||||
|
storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
|
||||||
|
spyOn(configProvider, 'fetch');
|
||||||
|
await configProvider.init();
|
||||||
|
|
||||||
|
expect(configProvider.fetch).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update the local config with the one from remote', async () => {
|
||||||
|
storageProviderSpy.has.and.returnValue(Promise.resolve(true));
|
||||||
|
storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
|
||||||
|
const newConfig = structuredClone(sampleIndexResponse);
|
||||||
|
newConfig.app.name = 'New app name';
|
||||||
|
spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(newConfig));
|
||||||
|
await configProvider.init();
|
||||||
|
|
||||||
|
// Validate that the initial configuration is loaded
|
||||||
|
expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
|
||||||
|
|
||||||
|
// Fetch the new configuration from the remote
|
||||||
|
await configProvider.fetch();
|
||||||
|
|
||||||
|
// Validate that the new configuration is now set
|
||||||
|
expect(configProvider.getValue('name')).toEqual(newConfig.app.name);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ import {
|
|||||||
SavedConfigNotAvailable,
|
SavedConfigNotAvailable,
|
||||||
WrongConfigVersionInStorage,
|
WrongConfigVersionInStorage,
|
||||||
} from './errors';
|
} from './errors';
|
||||||
|
import {InternetConnectionService} from '../../util/internet-connection.service';
|
||||||
|
import {firstValueFrom} from 'rxjs';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Key to store config in storage module
|
* Key to store config in storage module
|
||||||
@@ -72,18 +74,29 @@ export class ConfigProvider {
|
|||||||
private readonly storageProvider: StorageProvider,
|
private readonly storageProvider: StorageProvider,
|
||||||
swHttpClient: StAppsWebHttpClient,
|
swHttpClient: StAppsWebHttpClient,
|
||||||
private readonly logger: NGXLogger,
|
private readonly logger: NGXLogger,
|
||||||
|
private readonly internetConnectionService: InternetConnectionService,
|
||||||
) {
|
) {
|
||||||
|
console.log('config init');
|
||||||
this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
|
this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetches configuration from backend
|
* Fetches configuration from backend
|
||||||
*/
|
*/
|
||||||
async fetch(): Promise<SCIndexResponse> {
|
async fetch(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
return await this.client.handshake(this.scVersion);
|
const isOffline = await firstValueFrom(this.internetConnectionService.offline$);
|
||||||
} catch {
|
if (isOffline) {
|
||||||
throw new ConfigFetchError();
|
throw new Error('Device is offline.');
|
||||||
|
} else {
|
||||||
|
const fetchedConfig: SCIndexResponse = await this.client.handshake(this.scVersion);
|
||||||
|
await this.set(fetchedConfig);
|
||||||
|
this.logger.log(`Configuration updated from remote`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
const error_ = error instanceof Error ? new ConfigFetchError(error.message) : new ConfigFetchError();
|
||||||
|
this.logger.warn(`Failed to fetch remote configuration:`, error_);
|
||||||
|
throw error_; // Rethrow the error to handle it in init()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,40 +124,33 @@ export class ConfigProvider {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialises the ConfigProvider
|
* Initialises the ConfigProvider
|
||||||
* @throws ConfigInitError if no configuration could be loaded.
|
* @throws ConfigInitError if no configuration could be loaded both locally and remote.
|
||||||
* @throws WrongConfigVersionInStorage if fetch failed and saved config has wrong SCVersion
|
|
||||||
*/
|
*/
|
||||||
async init(): Promise<void> {
|
async init(): Promise<void> {
|
||||||
let loadError;
|
|
||||||
let fetchError;
|
|
||||||
// load saved configuration
|
|
||||||
try {
|
try {
|
||||||
|
// Attempt to load the configuration from local storage
|
||||||
this.config = await this.loadLocal();
|
this.config = await this.loadLocal();
|
||||||
this.firstSession = false;
|
this.firstSession = false;
|
||||||
this.logger.log(`initialised configuration from storage`);
|
this.logger.log(`initialised configuration from storage`);
|
||||||
if (this.config.backend.SCVersion !== this.scVersion) {
|
|
||||||
loadError = new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
|
// Check if the stored configuration has the correct version
|
||||||
|
if (this.config.backend.SCVersion.split('.')[0] !== this.scVersion.split('.')[0]) {
|
||||||
|
throw new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
|
||||||
loadError = error;
|
// Fetch the remote configuration in a non-blocking manner
|
||||||
}
|
void this.fetch();
|
||||||
// fetch remote configuration from backend
|
} catch (loadError) {
|
||||||
|
this.logger.warn(loadError);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const fetchedConfig: SCIndexResponse = await this.fetch();
|
// If local loading fails, immediately try to fetch the configuration from remote
|
||||||
await this.set(fetchedConfig);
|
await this.fetch();
|
||||||
this.logger.log(`initialised configuration from remote`);
|
} catch (fetchError) {
|
||||||
} catch (error) {
|
this.logger.warn(`Failed to fetch remote configuration:`, fetchError);
|
||||||
fetchError = error;
|
// If both local loading and remote fetching fail, throw ConfigInitError
|
||||||
}
|
|
||||||
// check for occurred errors and throw them
|
|
||||||
if (loadError !== undefined && fetchError !== undefined) {
|
|
||||||
throw new ConfigInitError();
|
throw new ConfigInitError();
|
||||||
}
|
}
|
||||||
if (loadError !== undefined) {
|
|
||||||
this.logger.warn(loadError);
|
|
||||||
}
|
|
||||||
if (fetchError !== undefined) {
|
|
||||||
this.logger.warn(fetchError);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,10 @@ import {AppError} from '../../_helpers/errors';
|
|||||||
* Error that is thrown when fetching from backend fails
|
* Error that is thrown when fetching from backend fails
|
||||||
*/
|
*/
|
||||||
export class ConfigFetchError extends AppError {
|
export class ConfigFetchError extends AppError {
|
||||||
constructor() {
|
constructor(reason?: string) {
|
||||||
super('ConfigFetchError', 'App configuration could not be fetched!');
|
const defaultMessage = 'App configuration could not be fetched!';
|
||||||
|
const message = reason ? `${defaultMessage} ${reason}` : defaultMessage;
|
||||||
|
super('ConfigFetchError', message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import {AddEventStates, AddEventStatesMap} from './add-event-action-chip.config'
|
|||||||
import {EditEventSelectionComponent} from '../edit-event-selection.component';
|
import {EditEventSelectionComponent} from '../edit-event-selection.component';
|
||||||
import {AddEventReviewModalComponent} from '../../../calendar/add-event-review-modal.component';
|
import {AddEventReviewModalComponent} from '../../../calendar/add-event-review-modal.component';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
|
import {MaterialSymbol} from 'material-symbols';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Shows a horizontal list of action chips
|
* Shows a horizontal list of action chips
|
||||||
@@ -55,7 +56,7 @@ export class AddEventActionChipComponent {
|
|||||||
/**
|
/**
|
||||||
* Icon
|
* Icon
|
||||||
*/
|
*/
|
||||||
icon: string;
|
icon: MaterialSymbol;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Current state of icon fill
|
* Current state of icon fill
|
||||||
|
|||||||
@@ -24,28 +24,28 @@ export enum AddEventStates {
|
|||||||
|
|
||||||
export const AddEventStatesMap = {
|
export const AddEventStatesMap = {
|
||||||
[AddEventStates.ADDED_ALL]: {
|
[AddEventStates.ADDED_ALL]: {
|
||||||
icon: SCIcon`event_available`,
|
icon: SCIcon.event_available,
|
||||||
fill: true,
|
fill: true,
|
||||||
label: 'data.chips.add_events.ADDED_ALL',
|
label: 'data.chips.add_events.ADDED_ALL',
|
||||||
disabled: false,
|
disabled: false,
|
||||||
color: 'success',
|
color: 'success',
|
||||||
},
|
},
|
||||||
[AddEventStates.ADDED_SOME]: {
|
[AddEventStates.ADDED_SOME]: {
|
||||||
icon: SCIcon`event`,
|
icon: SCIcon.event,
|
||||||
fill: true,
|
fill: true,
|
||||||
label: 'data.chips.add_events.ADDED_SOME',
|
label: 'data.chips.add_events.ADDED_SOME',
|
||||||
disabled: false,
|
disabled: false,
|
||||||
color: 'success',
|
color: 'success',
|
||||||
},
|
},
|
||||||
[AddEventStates.REMOVED_ALL]: {
|
[AddEventStates.REMOVED_ALL]: {
|
||||||
icon: SCIcon`calendar_today`,
|
icon: SCIcon.calendar_today,
|
||||||
fill: false,
|
fill: false,
|
||||||
label: 'data.chips.add_events.REMOVED_ALL',
|
label: 'data.chips.add_events.REMOVED_ALL',
|
||||||
disabled: false,
|
disabled: false,
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
[AddEventStates.UNAVAILABLE]: {
|
[AddEventStates.UNAVAILABLE]: {
|
||||||
icon: SCIcon`event_busy`,
|
icon: SCIcon.event_busy,
|
||||||
fill: false,
|
fill: false,
|
||||||
label: 'data.chips.add_events.UNAVAILABLE',
|
label: 'data.chips.add_events.UNAVAILABLE',
|
||||||
disabled: true,
|
disabled: true,
|
||||||
|
|||||||
@@ -14,37 +14,38 @@
|
|||||||
*/
|
*/
|
||||||
import {SCThingType} from '@openstapps/core';
|
import {SCThingType} from '@openstapps/core';
|
||||||
import {SCIcon} from '../../util/ion-icon/icon';
|
import {SCIcon} from '../../util/ion-icon/icon';
|
||||||
|
import {MaterialSymbol} from 'material-symbols';
|
||||||
|
|
||||||
export const DataIcons: Record<SCThingType, string> = {
|
export const DataIcons = {
|
||||||
'academic event': SCIcon`school`,
|
'academic event': SCIcon.school,
|
||||||
'assessment': SCIcon`fact_check`,
|
'assessment': SCIcon.fact_check,
|
||||||
'article': SCIcon`article`,
|
'article': SCIcon.article,
|
||||||
'book': SCIcon`book`,
|
'book': SCIcon.book,
|
||||||
'building': SCIcon`location_city`,
|
'building': SCIcon.location_city,
|
||||||
'certification': SCIcon`contract`,
|
'certification': SCIcon.contract,
|
||||||
'catalog': SCIcon`inventory_2`,
|
'catalog': SCIcon.inventory_2,
|
||||||
'contact point': SCIcon`contact_page`,
|
'contact point': SCIcon.contact_page,
|
||||||
'course of study': SCIcon`school`,
|
'course of study': SCIcon.school,
|
||||||
'date series': SCIcon`event`,
|
'date series': SCIcon.event,
|
||||||
'dish': SCIcon`lunch_dining`,
|
'dish': SCIcon.lunch_dining,
|
||||||
'favorite': SCIcon`favorite`,
|
'favorite': SCIcon.favorite,
|
||||||
'floor': SCIcon`foundation`,
|
'floor': SCIcon.foundation,
|
||||||
'id card': SCIcon`badge`,
|
'id card': SCIcon.badge,
|
||||||
'message': SCIcon`newspaper`,
|
'message': SCIcon.newspaper,
|
||||||
'organization': SCIcon`business_center`,
|
'organization': SCIcon.business_center,
|
||||||
'periodical': SCIcon`feed`,
|
'periodical': SCIcon.feed,
|
||||||
'person': SCIcon`person`,
|
'person': SCIcon.person,
|
||||||
'point of interest': SCIcon`pin_drop`,
|
'point of interest': SCIcon.pin_drop,
|
||||||
'publication event': SCIcon`campaign`,
|
'publication event': SCIcon.campaign,
|
||||||
'room': SCIcon`meeting_room`,
|
'room': SCIcon.meeting_room,
|
||||||
'semester': SCIcon`date_range`,
|
'semester': SCIcon.date_range,
|
||||||
'setting': SCIcon`settings`,
|
'setting': SCIcon.settings,
|
||||||
'sport course': SCIcon`sports_soccer`,
|
'sport course': SCIcon.sports_soccer,
|
||||||
'study module': SCIcon`view_module`,
|
'study module': SCIcon.view_module,
|
||||||
'ticket': SCIcon`confirmation_number`,
|
'ticket': SCIcon.confirmation_number,
|
||||||
'todo': SCIcon`task`,
|
'todo': SCIcon.task,
|
||||||
'tour': SCIcon`tour`,
|
'tour': SCIcon.tour,
|
||||||
'video': SCIcon`movie`,
|
'video': SCIcon.movie,
|
||||||
'diff': SCIcon`difference`,
|
'diff': SCIcon.difference,
|
||||||
'job posting': SCIcon`work`,
|
'job posting': SCIcon.work,
|
||||||
};
|
} satisfies Record<SCThingType, MaterialSymbol>;
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ export class DataIconPipe implements PipeTransform {
|
|||||||
/**
|
/**
|
||||||
* Provide the icon name from the data type
|
* Provide the icon name from the data type
|
||||||
*/
|
*/
|
||||||
transform(type: SCThingType): string {
|
transform(type: SCThingType) {
|
||||||
return this.typeIconMap[type];
|
return this.typeIconMap[type];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import {CommonModule} from '@angular/common';
|
|||||||
import {HttpClientModule} from '@angular/common/http';
|
import {HttpClientModule} from '@angular/common/http';
|
||||||
import {NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import {FormsModule} from '@angular/forms';
|
import {FormsModule} from '@angular/forms';
|
||||||
import {LeafletModule} from '@asymmetrik/ngx-leaflet';
|
|
||||||
import {IonicModule, Platform} from '@ionic/angular';
|
import {IonicModule, Platform} from '@ionic/angular';
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
import {MarkdownModule} from 'ngx-markdown';
|
import {MarkdownModule} from 'ngx-markdown';
|
||||||
@@ -30,7 +29,7 @@ import {UtilModule} from '../../util/util.module';
|
|||||||
import {CalendarService} from '../calendar/calendar.service';
|
import {CalendarService} from '../calendar/calendar.service';
|
||||||
import {ScheduleProvider} from '../calendar/schedule.provider';
|
import {ScheduleProvider} from '../calendar/schedule.provider';
|
||||||
import {GeoNavigationDirective} from '../map/geo-navigation.directive';
|
import {GeoNavigationDirective} from '../map/geo-navigation.directive';
|
||||||
import {MapWidgetComponent} from '../map/widget/map-widget.component';
|
import {MapWidgetComponent} from '../map/map-widget.component';
|
||||||
import {MenuModule} from '../menu/menu.module';
|
import {MenuModule} from '../menu/menu.module';
|
||||||
import {SettingsProvider} from '../settings/settings.provider';
|
import {SettingsProvider} from '../settings/settings.provider';
|
||||||
import {StorageModule} from '../storage/storage.module';
|
import {StorageModule} from '../storage/storage.module';
|
||||||
@@ -142,7 +141,6 @@ import {ShareButtonComponent} from './elements/share-button.component';
|
|||||||
FoodDataListComponent,
|
FoodDataListComponent,
|
||||||
LocateActionChipComponent,
|
LocateActionChipComponent,
|
||||||
LongInlineTextComponent,
|
LongInlineTextComponent,
|
||||||
MapWidgetComponent,
|
|
||||||
MessageDetailContentComponent,
|
MessageDetailContentComponent,
|
||||||
MessageListItemComponent,
|
MessageListItemComponent,
|
||||||
JobPostingDetailContentComponent,
|
JobPostingDetailContentComponent,
|
||||||
@@ -187,9 +185,9 @@ import {ShareButtonComponent} from './elements/share-button.component';
|
|||||||
CommonModule,
|
CommonModule,
|
||||||
DataRoutingModule,
|
DataRoutingModule,
|
||||||
FormsModule,
|
FormsModule,
|
||||||
|
MapWidgetComponent,
|
||||||
HttpClientModule,
|
HttpClientModule,
|
||||||
IonicModule.forRoot(),
|
IonicModule.forRoot(),
|
||||||
LeafletModule,
|
|
||||||
MarkdownModule.forRoot(),
|
MarkdownModule.forRoot(),
|
||||||
MenuModule,
|
MenuModule,
|
||||||
IonIconModule,
|
IonIconModule,
|
||||||
|
|||||||
@@ -14,6 +14,10 @@
|
|||||||
*/
|
*/
|
||||||
@import '../../../../theme/util/mixins';
|
@import '../../../../theme/util/mixins';
|
||||||
|
|
||||||
|
:host {
|
||||||
|
display: contents;
|
||||||
|
}
|
||||||
|
|
||||||
stapps-origin-detail {
|
stapps-origin-detail {
|
||||||
// css hack to make the element stick to the bottom of the scroll container even
|
// css hack to make the element stick to the bottom of the scroll container even
|
||||||
// when the content is not filling it
|
// when the content is not filling it
|
||||||
@@ -49,15 +53,12 @@ stapps-origin-detail {
|
|||||||
background: var(--ion-color-primary);
|
background: var(--ion-color-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Firefox doesn't support this yet...
|
|
||||||
@supports selector(:has(*)) {
|
|
||||||
& > .expand-when-space,
|
& > .expand-when-space,
|
||||||
&:has(> .expand-when-space) {
|
&:has(> .expand-when-space) {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
height: unset;
|
height: unset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
:host ::ng-deep {
|
:host ::ng-deep {
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ ion-content > div {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
min-height: 100%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ion-title {
|
ion-title {
|
||||||
|
|||||||
@@ -13,10 +13,11 @@
|
|||||||
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<ion-button (click)="toggle($event)" color="medium" size="small" fill="clear">
|
<ion-button (click)="toggle($event)" fill="clear" shape="round">
|
||||||
<ion-icon
|
<ion-icon
|
||||||
slot="icon-only"
|
slot="icon-only"
|
||||||
[fill]="(isFavorite$ | async) ?? false"
|
[size]="24"
|
||||||
|
[fill]="(isFavorite$ | async) || false"
|
||||||
[class.selected]="isFavorite$ | async"
|
[class.selected]="isFavorite$ | async"
|
||||||
name="grade"
|
name="grade"
|
||||||
></ion-icon>
|
></ion-icon>
|
||||||
|
|||||||
@@ -13,22 +13,25 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
:host {
|
ion-button {
|
||||||
ion-button {
|
--background-activated: currentcolor;
|
||||||
--border-radius: 50%;
|
--background-hover: currentcolor;
|
||||||
|
--background-focused: currentcolor;
|
||||||
|
|
||||||
width: 50px;
|
aspect-ratio: 1;
|
||||||
height: 50px;
|
color: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.selected {
|
.selected {
|
||||||
// TODO
|
|
||||||
color: #fbc02d;
|
color: #fbc02d;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (hover: hover) {
|
@media (hover: hover) {
|
||||||
ion-button:hover ::ng-deep stapps-icon {
|
ion-button:hover ::ng-deep stapps-icon {
|
||||||
--fill: 1;
|
--fill: 1 !important;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
::ng-deep ion-item stapps-favorite-button ion-button {
|
||||||
|
color: var(--ion-color-medium) !important;
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, Input} from '@angular/core';
|
import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
|
||||||
import {SCIndexableThings} from '@openstapps/core';
|
import {SCIndexableThings} from '@openstapps/core';
|
||||||
import {FavoritesService} from '../../favorites/favorites.service';
|
import {FavoritesService} from '../../favorites/favorites.service';
|
||||||
import {Observable} from 'rxjs';
|
import {Observable} from 'rxjs';
|
||||||
@@ -25,6 +25,7 @@ import {map, take} from 'rxjs/operators';
|
|||||||
selector: 'stapps-favorite-button',
|
selector: 'stapps-favorite-button',
|
||||||
templateUrl: './favorite-button.component.html',
|
templateUrl: './favorite-button.component.html',
|
||||||
styleUrls: ['./favorite-button.component.scss'],
|
styleUrls: ['./favorite-button.component.scss'],
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class FavoriteButtonComponent {
|
export class FavoriteButtonComponent {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import {SCThingUserOrigin, SCThingRemoteOrigin} from '@openstapps/core';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-origin-detail',
|
selector: 'stapps-origin-detail',
|
||||||
templateUrl: 'origin-detail.html',
|
templateUrl: 'origin-detail.html',
|
||||||
|
styleUrl: 'origin-detail.scss',
|
||||||
})
|
})
|
||||||
export class OriginDetailComponent {
|
export class OriginDetailComponent {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -14,71 +14,61 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
@if (origin.type === 'user') {
|
@if (origin.type === 'user') {
|
||||||
<ion-card>
|
<h3>
|
||||||
<ion-card-header
|
{{ 'data.types.origin.TITLE' | translate | sentencecase }}:
|
||||||
>{{ 'data.types.origin.TITLE' | translate | titlecase }}:
|
{{ 'data.types.origin.USER' | translate | sentencecase }}
|
||||||
{{ 'data.types.origin.USER' | translate | titlecase }}</ion-card-header
|
</h3>
|
||||||
>
|
|
||||||
<ion-card-content>
|
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.CREATED' | translate | titlecase }}:
|
{{ 'data.types.origin.detail.CREATED' | translate | sentencecase }}:
|
||||||
{{ origin.created | amDateFormat: 'll' }}
|
{{ origin.created | amDateFormat: 'll' }}
|
||||||
</p>
|
</p>
|
||||||
@if (origin.updated) {
|
@if (origin.updated) {
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}:
|
{{ 'data.types.origin.detail.UPDATED' | translate | sentencecase }}:
|
||||||
{{ origin.updated | amDateFormat: 'll' }}
|
{{ origin.updated | amDateFormat: 'll' }}
|
||||||
</p>
|
</p>
|
||||||
}
|
}
|
||||||
@if (origin.modified) {
|
@if (origin.modified) {
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
|
{{ 'data.types.origin.detail.MODIFIED' | translate | sentencecase }}:
|
||||||
{{ origin.modified | amDateFormat: 'll' }}
|
{{ origin.modified | amDateFormat: 'll' }}
|
||||||
</p>
|
</p>
|
||||||
}
|
}
|
||||||
@if (origin.maintainer) {
|
@if (origin.maintainer) {
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.MAINTAINER' | translate }}:
|
{{ 'data.types.origin.detail.MAINTAINER' | translate | sentencecase }}:
|
||||||
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
||||||
</p>
|
</p>
|
||||||
}
|
}
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
}
|
||||||
@if (origin.type === 'remote') {
|
@if (origin.type === 'remote') {
|
||||||
<ion-card>
|
<h3>
|
||||||
<ion-card-header
|
{{ 'data.types.origin.TITLE' | translate | sentencecase }}:
|
||||||
>{{ 'data.types.origin.TITLE' | translate | titlecase }}:
|
{{ 'data.types.origin.REMOTE' | translate | sentencecase }}
|
||||||
{{ 'data.types.origin.REMOTE' | translate | titlecase }}</ion-card-header
|
</h3>
|
||||||
>
|
|
||||||
<ion-card-content>
|
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}:
|
{{ 'data.types.origin.detail.INDEXED' | translate | sentencecase }}:
|
||||||
{{ origin.indexed | amDateFormat: 'll' }}
|
{{ origin.indexed | amDateFormat: 'll' }}
|
||||||
</p>
|
</p>
|
||||||
@if (origin.modified) {
|
@if (origin.modified) {
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
|
{{ 'data.types.origin.detail.MODIFIED' | translate | sentencecase }}:
|
||||||
{{ origin.modified | amDateFormat: 'll' }}
|
{{ origin.modified | amDateFormat: 'll' }}
|
||||||
</p>
|
</p>
|
||||||
}
|
}
|
||||||
@if (origin.name) {
|
@if (origin.name) {
|
||||||
<p>{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}</p>
|
<p>{{ 'data.types.origin.detail.MAINTAINER' | translate | sentencecase }}: {{ origin.name }}</p>
|
||||||
}
|
}
|
||||||
@if (origin.maintainer) {
|
@if (origin.maintainer) {
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.MAINTAINER' | translate | titlecase }}:
|
{{ 'data.types.origin.detail.MAINTAINER' | translate | sentencecase }}:
|
||||||
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
<a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
|
||||||
</p>
|
</p>
|
||||||
}
|
}
|
||||||
@if (origin.responsibleEntity) {
|
@if (origin.responsibleEntity) {
|
||||||
<p>
|
<p>
|
||||||
{{ 'data.types.origin.detail.RESPONSIBLE' | translate | titlecase }}:
|
{{ 'data.types.origin.detail.RESPONSIBLE' | translate | sentencecase }}:
|
||||||
<a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{
|
<a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{ origin.responsibleEntity.name }}</a>
|
||||||
origin.responsibleEntity.name
|
|
||||||
}}</a>
|
|
||||||
</p>
|
</p>
|
||||||
}
|
}
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
:host {
|
||||||
|
padding: var(--spacing-lg);
|
||||||
|
padding-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
h3,
|
||||||
|
p {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 0.8em;
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
@@ -18,8 +18,8 @@ import {SCThings} from '@openstapps/core';
|
|||||||
import {SCIcon} from '../../../util/ion-icon/icon';
|
import {SCIcon} from '../../../util/ion-icon/icon';
|
||||||
|
|
||||||
const AccordionButtonState = {
|
const AccordionButtonState = {
|
||||||
collapsed: SCIcon`expand_more`,
|
collapsed: SCIcon.expand_more,
|
||||||
expanded: SCIcon`expand_less`,
|
expanded: SCIcon.expand_less,
|
||||||
};
|
};
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -35,7 +35,8 @@ export class TitleCardComponent implements OnInit, OnChanges {
|
|||||||
|
|
||||||
@ViewChild('accordionTextArea') accordionTextArea: ElementRef;
|
@ViewChild('accordionTextArea') accordionTextArea: ElementRef;
|
||||||
|
|
||||||
buttonState = AccordionButtonState.collapsed;
|
buttonState: (typeof AccordionButtonState)[keyof typeof AccordionButtonState] =
|
||||||
|
AccordionButtonState.collapsed;
|
||||||
|
|
||||||
buttonShown = true;
|
buttonShown = true;
|
||||||
|
|
||||||
|
|||||||
@@ -33,9 +33,9 @@ ion-item {
|
|||||||
margin: var(--spacing-sm);
|
margin: var(--spacing-sm);
|
||||||
|
|
||||||
ion-thumbnail {
|
ion-thumbnail {
|
||||||
--ion-margin: var(--spacing-xs);
|
--size: 36px;
|
||||||
|
|
||||||
margin-block: auto;
|
margin: 0;
|
||||||
margin-inline: var(--spacing-md);
|
margin-inline: var(--spacing-md);
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ ion-toolbar:first-of-type {
|
|||||||
ion-button {
|
ion-button {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
text-transform: none;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,5 +68,5 @@
|
|||||||
</ion-card>
|
</ion-card>
|
||||||
}
|
}
|
||||||
@if (item.inPlace && item.inPlace.geo) {
|
@if (item.inPlace && item.inPlace.geo) {
|
||||||
<stapps-map-widget [place]="item.inPlace"></stapps-map-widget>
|
<stapps-map-widget [place]="$any(item.inPlace)"></stapps-map-widget>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import {PositionService} from '../../../map/position.service';
|
|||||||
import {filter, Observable} from 'rxjs';
|
import {filter, Observable} from 'rxjs';
|
||||||
import {hasValidLocation, isSCFloor, PlaceTypes, PlaceTypesWithDistance} from './place-types';
|
import {hasValidLocation, isSCFloor, PlaceTypes, PlaceTypesWithDistance} from './place-types';
|
||||||
import {map} from 'rxjs/operators';
|
import {map} from 'rxjs/operators';
|
||||||
import {LatLng, geoJSON} from 'leaflet';
|
|
||||||
import {trigger, transition, style, animate} from '@angular/animations';
|
import {trigger, transition, style, animate} from '@angular/animations';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,13 +38,14 @@ export class PlaceListItemComponent {
|
|||||||
@Input() set item(item: PlaceTypes) {
|
@Input() set item(item: PlaceTypes) {
|
||||||
this._item = item;
|
this._item = item;
|
||||||
if (!isSCFloor(item) && hasValidLocation(item)) {
|
if (!isSCFloor(item) && hasValidLocation(item)) {
|
||||||
this.distance = this.positionService.watchCurrentLocation().pipe(
|
this.distance = this.positionService.geoLocation.pipe(
|
||||||
map(position =>
|
map(
|
||||||
new LatLng(position.latitude, position.longitude).distanceTo(
|
position =>
|
||||||
geoJSON(item.geo.point).getBounds().getCenter(),
|
Math.hypot(
|
||||||
|
position.coords.latitude - item.geo.point.coordinates[1],
|
||||||
|
position.coords.longitude - item.geo.point.coordinates[0],
|
||||||
|
) * 111_139,
|
||||||
),
|
),
|
||||||
),
|
|
||||||
|
|
||||||
filter(it => it !== undefined),
|
filter(it => it !== undefined),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import moment, {Moment} from 'moment';
|
|
||||||
import {AfterViewInit, Component, DestroyRef, inject, Input} from '@angular/core';
|
import {AfterViewInit, Component, DestroyRef, inject, Input} from '@angular/core';
|
||||||
import {SCDish, SCISO8601Date, SCPlace} from '@openstapps/core';
|
import {SCDish, SCISO8601Date, SCPlace} from '@openstapps/core';
|
||||||
import {PlaceMensaService} from './place-mensa-service';
|
import {PlaceMensaService} from './place-mensa-service';
|
||||||
@@ -53,11 +52,6 @@ export class PlaceMensaDetailComponent implements AfterViewInit {
|
|||||||
*/
|
*/
|
||||||
selectedDay: string;
|
selectedDay: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* First day to display menu items for
|
|
||||||
*/
|
|
||||||
startingDay: Moment;
|
|
||||||
|
|
||||||
destroy$ = inject(DestroyRef);
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@@ -65,9 +59,7 @@ export class PlaceMensaDetailComponent implements AfterViewInit {
|
|||||||
protected router: Router,
|
protected router: Router,
|
||||||
readonly routerOutlet: IonRouterOutlet,
|
readonly routerOutlet: IonRouterOutlet,
|
||||||
private readonly dataRoutingService: DataRoutingService,
|
private readonly dataRoutingService: DataRoutingService,
|
||||||
) {
|
) {}
|
||||||
this.startingDay = moment().startOf('day');
|
|
||||||
}
|
|
||||||
|
|
||||||
ngAfterViewInit() {
|
ngAfterViewInit() {
|
||||||
if (!this.openAsModal) {
|
if (!this.openAsModal) {
|
||||||
|
|||||||
@@ -13,10 +13,6 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ion-segment-button {
|
|
||||||
text-transform: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-segment {
|
ion-segment {
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|||||||
@@ -80,13 +80,12 @@
|
|||||||
</ion-item>
|
</ion-item>
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-checkbox
|
<ion-checkbox
|
||||||
class="ion-text-wrap"
|
|
||||||
color="primary"
|
color="primary"
|
||||||
label-placement="end"
|
label-placement="end"
|
||||||
justify="start"
|
justify="start"
|
||||||
[(ngModel)]="termsAgree"
|
[(ngModel)]="termsAgree"
|
||||||
name="termsAgree"
|
name="termsAgree"
|
||||||
>{{ 'feedback.form.termsAgree.0' | translate }}</ion-checkbox
|
><span class="ion-text-wrap">{{ 'feedback.form.termsAgree.0' | translate }}</span></ion-checkbox
|
||||||
>
|
>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
<ion-item lines="none">
|
<ion-item lines="none">
|
||||||
@@ -104,7 +103,9 @@
|
|||||||
justify="start"
|
justify="start"
|
||||||
[(ngModel)]="protocolDataAgree"
|
[(ngModel)]="protocolDataAgree"
|
||||||
name="protocolDataAgree"
|
name="protocolDataAgree"
|
||||||
>{{ 'feedback.form.protocolDataAgree' | translate }}</ion-checkbox
|
><span class="ion-text-wrap">{{
|
||||||
|
'feedback.form.protocolDataAgree' | translate
|
||||||
|
}}</span></ion-checkbox
|
||||||
>
|
>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
<ion-card>
|
<ion-card>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import {MomentModule} from 'ngx-moment';
|
|||||||
import {DataModule} from '../data/data.module';
|
import {DataModule} from '../data/data.module';
|
||||||
import {UtilModule} from '../../util/util.module';
|
import {UtilModule} from '../../util/util.module';
|
||||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||||
import {ConfigProvider} from '../config/config.provider';
|
|
||||||
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
import {ThingTranslateModule} from '../../translation/thing-translate.module';
|
||||||
import {RouterModule, Routes} from '@angular/router';
|
import {RouterModule, Routes} from '@angular/router';
|
||||||
import {JobsPageComponent} from './page/jobs-page.component';
|
import {JobsPageComponent} from './page/jobs-page.component';
|
||||||
@@ -26,6 +25,5 @@ const jobsRoutes: Routes = [{path: 'jobs', component: JobsPageComponent}];
|
|||||||
DataModule,
|
DataModule,
|
||||||
UtilModule,
|
UtilModule,
|
||||||
],
|
],
|
||||||
providers: [ConfigProvider],
|
|
||||||
})
|
})
|
||||||
export class JobModule {}
|
export class JobModule {}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export class LibraryAccountPageComponent {
|
|||||||
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
||||||
|
|
||||||
async ionViewWillEnter(): Promise<void> {
|
async ionViewWillEnter(): Promise<void> {
|
||||||
const patron = await this.libraryAccountService.getProfile();
|
const patron = await this.libraryAccountService.getPatron();
|
||||||
this.name = patron?.name;
|
this.name = patron?.name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ export class CheckedOutPageComponent {
|
|||||||
|
|
||||||
async fetchItems() {
|
async fetchItems() {
|
||||||
try {
|
try {
|
||||||
|
// Prepare patron (status) for the items
|
||||||
|
await this.libraryAccountService.getPatron();
|
||||||
this.checkedOutItems = undefined;
|
this.checkedOutItems = undefined;
|
||||||
this.checkedOutItems = await this.libraryAccountService.getFilteredItems([PAIADocumentStatus.Held]);
|
this.checkedOutItems = await this.libraryAccountService.getFilteredItems([PAIADocumentStatus.Held]);
|
||||||
} catch {
|
} catch {
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
@for (checkedOutItem of checkedOutItems; track checkedOutItem) {
|
@for (checkedOutItem of checkedOutItems; track checkedOutItem) {
|
||||||
<stapps-paia-item
|
<stapps-paia-item
|
||||||
[item]="checkedOutItem"
|
[item]="checkedOutItem"
|
||||||
[propertiesToShow]="['label', 'renewals', 'endtime']"
|
[propertiesToShow]="['label', 'renewals', 'duedate']"
|
||||||
(documentAction)="onDocumentAction($event)"
|
(documentAction)="onDocumentAction($event)"
|
||||||
listName="checked_out"
|
listName="checked_out"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -14,7 +14,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import {Component, EventEmitter, Input, Output} from '@angular/core';
|
import {Component, EventEmitter, Input, Output} from '@angular/core';
|
||||||
import {DocumentAction, PAIADocument} from '../../../types';
|
import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIADocumentVisualStatus} from '../../../types';
|
||||||
|
import {LibraryAccountService} from '../../library-account.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-paia-item',
|
selector: 'stapps-paia-item',
|
||||||
@@ -22,7 +23,24 @@ import {DocumentAction, PAIADocument} from '../../../types';
|
|||||||
styleUrls: ['./paiaitem.scss'],
|
styleUrls: ['./paiaitem.scss'],
|
||||||
})
|
})
|
||||||
export class PAIAItemComponent {
|
export class PAIAItemComponent {
|
||||||
@Input() item: PAIADocument;
|
private _item: PAIADocument;
|
||||||
|
|
||||||
|
renewable: boolean;
|
||||||
|
|
||||||
|
visualStatus?: PAIADocumentVisualStatus;
|
||||||
|
|
||||||
|
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
set item(value: PAIADocument) {
|
||||||
|
this._item = value;
|
||||||
|
void this.setRenewable();
|
||||||
|
this.visualStatus = this.getVisualStatus(Number(this.item.status));
|
||||||
|
}
|
||||||
|
|
||||||
|
get item(): PAIADocument {
|
||||||
|
return this._item;
|
||||||
|
}
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
propertiesToShow: (keyof PAIADocument)[];
|
propertiesToShow: (keyof PAIADocument)[];
|
||||||
@@ -36,4 +54,23 @@ export class PAIAItemComponent {
|
|||||||
async onClick(action: DocumentAction['action']) {
|
async onClick(action: DocumentAction['action']) {
|
||||||
this.documentAction.emit({doc: this.item, action});
|
this.documentAction.emit({doc: this.item, action});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async setRenewable() {
|
||||||
|
const isActive = await this.libraryAccountService.isActivePatron();
|
||||||
|
this.renewable = isActive && Number(this.item.status) === PAIADocumentStatus.Held;
|
||||||
|
}
|
||||||
|
|
||||||
|
private getVisualStatus(status: PAIADocumentStatus): PAIADocumentVisualStatus | undefined {
|
||||||
|
switch (status) {
|
||||||
|
case PAIADocumentStatus.Ordered: {
|
||||||
|
return {color: 'warning', status: status, statusText: 'ordered'};
|
||||||
|
}
|
||||||
|
case PAIADocumentStatus.Provided: {
|
||||||
|
return {color: 'success', status: status, statusText: 'ready'};
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,16 +14,22 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<!-- TODO: text not selectable in Chrome, bugfix needed https://github.com/ionic-team/ionic-framework/issues/24956 -->
|
|
||||||
<ion-label class="ion-text-wrap">
|
<ion-label class="ion-text-wrap">
|
||||||
@if (item.about) {
|
@if (item.about) {
|
||||||
<h2 class="name">{{ item.about }}</h2>
|
<h2 class="name">
|
||||||
|
@if (visualStatus) {
|
||||||
|
<ion-badge [color]="visualStatus.color" slot="start">
|
||||||
|
{{ 'library.account.pages' + '.' + listName + '.' + visualStatus.statusText | translate }}
|
||||||
|
</ion-badge>
|
||||||
|
}
|
||||||
|
{{ item.about }}
|
||||||
|
</h2>
|
||||||
}
|
}
|
||||||
@for (property of propertiesToShow; track property) {
|
@for (property of propertiesToShow; track property) {
|
||||||
@if (item[property]) {
|
@if (item[property]) {
|
||||||
<p>
|
<p>
|
||||||
{{ 'library.account.pages' + '.' + listName + '.' + 'labels' + '.' + property | translate }}:
|
{{ 'library.account.pages' + '.' + listName + '.' + 'labels' + '.' + property | translate }}:
|
||||||
@if (!['endtime', 'duedate'].includes(property)) {
|
@if (!['starttime', 'duedate'].includes(property)) {
|
||||||
{{ item[property] }}
|
{{ item[property] }}
|
||||||
} @else {
|
} @else {
|
||||||
{{ $any(item[property]) | amDateFormat: 'll' }}
|
{{ $any(item[property]) | amDateFormat: 'll' }}
|
||||||
@@ -40,7 +46,7 @@
|
|||||||
<!-- >-->
|
<!-- >-->
|
||||||
<!-- {{ 'library.account.actions.cancel.header' | translate }}</ion-button-->
|
<!-- {{ 'library.account.actions.cancel.header' | translate }}</ion-button-->
|
||||||
<!-- >-->
|
<!-- >-->
|
||||||
@if (item.canrenew) {
|
@if (renewable && item.canrenew) {
|
||||||
<ion-button color="primary" (click)="onClick('renew')">
|
<ion-button color="primary" (click)="onClick('renew')">
|
||||||
{{ 'library.account.actions.renew.header' | translate }}</ion-button
|
{{ 'library.account.actions.renew.header' | translate }}</ion-button
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -12,3 +12,6 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
ion-badge {
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
|
|||||||
@@ -45,6 +45,8 @@ export class HoldsPageComponent {
|
|||||||
? [PAIADocumentStatus.Reserved]
|
? [PAIADocumentStatus.Reserved]
|
||||||
: [PAIADocumentStatus.Ordered, PAIADocumentStatus.Provided];
|
: [PAIADocumentStatus.Ordered, PAIADocumentStatus.Provided];
|
||||||
try {
|
try {
|
||||||
|
// Prepare patron (status) for the items
|
||||||
|
await this.libraryAccountService.getPatron();
|
||||||
this.paiaDocuments = await this.libraryAccountService.getFilteredItems(itemsStatus);
|
this.paiaDocuments = await this.libraryAccountService.getFilteredItems(itemsStatus);
|
||||||
} catch {
|
} catch {
|
||||||
await this.libraryAccountService.handleError();
|
await this.libraryAccountService.handleError();
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
@switch (activeSegment) {
|
@switch (activeSegment) {
|
||||||
@case ('orders') {
|
@case ('orders') {
|
||||||
@for (hold of paiaDocuments; track hold) {
|
@for (hold of paiaDocuments; track hold) {
|
||||||
@if (toNumber(hold.status) === paiaDocumentStatus.Provided) {
|
|
||||||
<stapps-paia-item
|
<stapps-paia-item
|
||||||
[item]="hold"
|
[item]="hold"
|
||||||
[propertiesToShow]="['label', 'storage']"
|
[propertiesToShow]="['label', 'storage']"
|
||||||
@@ -43,22 +42,13 @@
|
|||||||
listName="holds"
|
listName="holds"
|
||||||
>
|
>
|
||||||
</stapps-paia-item>
|
</stapps-paia-item>
|
||||||
} @else {
|
|
||||||
<stapps-paia-item
|
|
||||||
[item]="hold"
|
|
||||||
[propertiesToShow]="['label']"
|
|
||||||
(documentAction)="onDocumentAction($event)"
|
|
||||||
listName="holds"
|
|
||||||
>
|
|
||||||
</stapps-paia-item>
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@case ('reservations') {
|
@case ('reservations') {
|
||||||
@for (hold of paiaDocuments; track hold) {
|
@for (hold of paiaDocuments; track hold) {
|
||||||
<stapps-paia-item
|
<stapps-paia-item
|
||||||
[item]="hold"
|
[item]="hold"
|
||||||
[propertiesToShow]="['label']"
|
[propertiesToShow]="['label', 'starttime', 'storage', 'queue']"
|
||||||
(documentAction)="onDocumentAction($event)"
|
(documentAction)="onDocumentAction($event)"
|
||||||
listName="holds"
|
listName="holds"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -20,7 +20,15 @@ import {
|
|||||||
SCFeatureConfiguration,
|
SCFeatureConfiguration,
|
||||||
SCFeatureConfigurationExtern,
|
SCFeatureConfigurationExtern,
|
||||||
} from '@openstapps/core';
|
} from '@openstapps/core';
|
||||||
import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIAFees, PAIAItems, PAIAPatron} from '../types';
|
import {
|
||||||
|
DocumentAction,
|
||||||
|
PAIADocument,
|
||||||
|
PAIADocumentStatus,
|
||||||
|
PAIAFees,
|
||||||
|
PAIAItems,
|
||||||
|
PAIAPatron,
|
||||||
|
PAIAPatronStatus,
|
||||||
|
} from '../types';
|
||||||
import {HebisDataProvider} from '../../hebis/hebis-data.provider';
|
import {HebisDataProvider} from '../../hebis/hebis-data.provider';
|
||||||
import {PAIATokenResponse} from '../../auth/paia/paia-token-response';
|
import {PAIATokenResponse} from '../../auth/paia/paia-token-response';
|
||||||
import {AuthHelperService} from '../../auth/auth-helper.service';
|
import {AuthHelperService} from '../../auth/auth-helper.service';
|
||||||
@@ -43,6 +51,11 @@ export class LibraryAccountService {
|
|||||||
*/
|
*/
|
||||||
authType: SCAuthorizationProviderType;
|
authType: SCAuthorizationProviderType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Account (Patron) status
|
||||||
|
*/
|
||||||
|
private status?: PAIAPatronStatus;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
protected requestor: Requestor = new JQueryRequestor(),
|
protected requestor: Requestor = new JQueryRequestor(),
|
||||||
private readonly hebisDataProvider: HebisDataProvider,
|
private readonly hebisDataProvider: HebisDataProvider,
|
||||||
@@ -60,12 +73,23 @@ export class LibraryAccountService {
|
|||||||
this.authType = config.authProvider as SCAuthorizationProviderType;
|
this.authType = config.authProvider as SCAuthorizationProviderType;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getProfile() {
|
async getPatron() {
|
||||||
const patron = ((await this.getValidToken()) as PAIATokenResponse).patron;
|
const patronId = ((await this.getValidToken()) as PAIATokenResponse).patron;
|
||||||
return {
|
const patron = {
|
||||||
...(await this.performRequest<PAIAPatron>(`${this.baseUrl}/{patron}`)),
|
...(await this.performRequest<PAIAPatron>(`${this.baseUrl}/{patron}`)),
|
||||||
id: patron,
|
id: patronId,
|
||||||
} as PAIAPatron;
|
} as PAIAPatron;
|
||||||
|
// Refresh the status
|
||||||
|
this.status = Number(patron.status);
|
||||||
|
return patron;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getPatronStatus() {
|
||||||
|
return this.status ?? (this.status = Number((await this.getPatron()).status) as PAIAPatronStatus);
|
||||||
|
}
|
||||||
|
|
||||||
|
async isActivePatron() {
|
||||||
|
return (await this.getPatronStatus()) === PAIAPatronStatus.Active;
|
||||||
}
|
}
|
||||||
|
|
||||||
async getItems() {
|
async getItems() {
|
||||||
|
|||||||
@@ -25,15 +25,17 @@ import {PAIAPatron} from '../../types';
|
|||||||
export class ProfilePageComponent {
|
export class ProfilePageComponent {
|
||||||
patron?: PAIAPatron;
|
patron?: PAIAPatron;
|
||||||
|
|
||||||
propertiesToShow: (keyof PAIAPatron)[] = ['id', 'name', 'email', 'address', 'expires', 'note'];
|
|
||||||
|
|
||||||
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
constructor(private readonly libraryAccountService: LibraryAccountService) {}
|
||||||
|
|
||||||
async ionViewWillEnter(): Promise<void> {
|
async ionViewWillEnter(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
this.patron = await this.libraryAccountService.getProfile();
|
this.patron = await this.libraryAccountService.getPatron();
|
||||||
} catch {
|
} catch {
|
||||||
await this.libraryAccountService.handleError();
|
await this.libraryAccountService.handleError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isUnlimitedExpiry(date = ''): boolean {
|
||||||
|
return new Date(date).getFullYear() === 9999;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,27 +26,45 @@
|
|||||||
<ion-card>
|
<ion-card>
|
||||||
<ion-card-content>
|
<ion-card-content>
|
||||||
<ion-grid>
|
<ion-grid>
|
||||||
@for (property of propertiesToShow; track property) {
|
|
||||||
@if (patron[property]) {
|
|
||||||
<ion-row>
|
<ion-row>
|
||||||
|
<ion-col> {{ 'library.account.pages.profile.labels.id' | translate }}: </ion-col>
|
||||||
<ion-col>
|
<ion-col>
|
||||||
{{ 'library.account.pages.profile.labels' + '.' + property | translate }}:
|
{{ patron.id }}
|
||||||
</ion-col>
|
</ion-col>
|
||||||
|
</ion-row>
|
||||||
|
<ion-row>
|
||||||
|
<ion-col> {{ 'library.account.pages.profile.labels.name' | translate }}: </ion-col>
|
||||||
|
<ion-col> {{ patron.name_details?.title ?? '' }} {{ patron.name }} </ion-col>
|
||||||
|
</ion-row>
|
||||||
|
@if (patron.email) {
|
||||||
|
<ion-row>
|
||||||
|
<ion-col> {{ 'library.account.pages.profile.labels.email' | translate }}: </ion-col>
|
||||||
<ion-col>
|
<ion-col>
|
||||||
@if (!['expires'].includes(property)) {
|
{{ patron.email }}
|
||||||
{{ patron[property] }}
|
|
||||||
} @else {
|
|
||||||
@if (patron[property] === '9999-12-31') {
|
|
||||||
{{ 'library.account.pages.profile.values.unlimited' | translate }}
|
|
||||||
} @else {
|
|
||||||
{{ 'library.account.pages.profile.values.expires' | translate }}: {{
|
|
||||||
patron[property] | amDateFormat: 'll'
|
|
||||||
}}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</ion-col>
|
</ion-col>
|
||||||
</ion-row>
|
</ion-row>
|
||||||
}
|
}
|
||||||
|
@if (patron.address) {
|
||||||
|
<ion-row>
|
||||||
|
<ion-col> {{ 'library.account.pages.profile.labels.address' | translate }}: </ion-col>
|
||||||
|
<ion-col>
|
||||||
|
{{ patron.address }}
|
||||||
|
</ion-col>
|
||||||
|
</ion-row>
|
||||||
|
}
|
||||||
|
@if (patron.expires) {
|
||||||
|
<ion-row>
|
||||||
|
<ion-col> {{ 'library.account.pages.profile.labels.expires' | translate }}: </ion-col>
|
||||||
|
<ion-col>
|
||||||
|
@if (isUnlimitedExpiry(patron.expires)) {
|
||||||
|
{{ 'library.account.pages.profile.values.unlimited' | translate }}
|
||||||
|
} @else {
|
||||||
|
{{ 'library.account.pages.profile.values.expires' | translate }}: {{
|
||||||
|
patron.expires | amDateFormat: 'll'
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
</ion-col>
|
||||||
|
</ion-row>
|
||||||
}
|
}
|
||||||
</ion-grid>
|
</ion-grid>
|
||||||
</ion-card-content>
|
</ion-card-content>
|
||||||
|
|||||||
@@ -19,9 +19,24 @@ export interface PAIAPatron {
|
|||||||
email?: string;
|
email?: string;
|
||||||
address?: string;
|
address?: string;
|
||||||
expires?: string;
|
expires?: string;
|
||||||
status?: string;
|
status?: PAIAPatronStatus;
|
||||||
type?: string;
|
type?: string;
|
||||||
note?: string;
|
note?: string;
|
||||||
|
// HeBIS specific property (not in PAIA documentation)
|
||||||
|
name_details?: {
|
||||||
|
firstname?: string;
|
||||||
|
lastname?: string;
|
||||||
|
gender?: string;
|
||||||
|
title?: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum PAIAPatronStatus {
|
||||||
|
Active = 0,
|
||||||
|
Inactive = 1,
|
||||||
|
InactiveExpired = 2,
|
||||||
|
InactiveOutstandingFees = 3,
|
||||||
|
InactiveExpiredOutstandingFees = 4,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -39,7 +54,7 @@ export interface PAIADocument {
|
|||||||
queue?: string;
|
queue?: string;
|
||||||
renewals?: string;
|
renewals?: string;
|
||||||
reminder?: string;
|
reminder?: string;
|
||||||
endtime?: string;
|
starttime?: string;
|
||||||
duedate?: string;
|
duedate?: string;
|
||||||
cancancel?: boolean;
|
cancancel?: boolean;
|
||||||
canrenew?: boolean;
|
canrenew?: boolean;
|
||||||
@@ -80,3 +95,9 @@ export interface DocumentAction {
|
|||||||
action: 'cancel' | 'renew';
|
action: 'cancel' | 'renew';
|
||||||
doc: PAIADocument;
|
doc: PAIADocument;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface PAIADocumentVisualStatus {
|
||||||
|
color: 'warning' | 'success';
|
||||||
|
status: PAIADocumentStatus;
|
||||||
|
statusText: 'ordered' | 'ready';
|
||||||
|
}
|
||||||
|
|||||||
51
frontend/app/src/app/modules/map/cluster-leaves.pipe.ts
Normal file
51
frontend/app/src/app/modules/map/cluster-leaves.pipe.ts
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
import {Pipe, PipeTransform} from '@angular/core';
|
||||||
|
import {MapService} from '@maplibre/ngx-maplibre-gl';
|
||||||
|
import {Feature, Point} from 'geojson';
|
||||||
|
import {MapGeoJSONFeature, type GeoJSONSource} from 'maplibre-gl';
|
||||||
|
import {combineLatest, distinctUntilChanged, map, mergeMap, from, Observable, ReplaySubject} from 'rxjs';
|
||||||
|
import {SCFeatureProperties} from './feature-collection.pipe';
|
||||||
|
|
||||||
|
@Pipe({
|
||||||
|
name: 'mglClusterLeaves',
|
||||||
|
standalone: true,
|
||||||
|
pure: true,
|
||||||
|
})
|
||||||
|
export class MglClusterLeavesPipe implements PipeTransform {
|
||||||
|
source = new ReplaySubject<string>(1);
|
||||||
|
|
||||||
|
feature = new ReplaySubject<MapGeoJSONFeature>(1);
|
||||||
|
|
||||||
|
limit = new ReplaySubject<number>(1);
|
||||||
|
|
||||||
|
offset = new ReplaySubject<number>(1);
|
||||||
|
|
||||||
|
leaves: Observable<Feature<Point, SCFeatureProperties>[]> = combineLatest([
|
||||||
|
this.source.pipe(
|
||||||
|
distinctUntilChanged(),
|
||||||
|
map(source => this.mapService.getSource(source) as GeoJSONSource),
|
||||||
|
),
|
||||||
|
this.feature.pipe(distinctUntilChanged(it => it.properties.cluster_id)),
|
||||||
|
this.limit.pipe(distinctUntilChanged()),
|
||||||
|
this.offset.pipe(distinctUntilChanged()),
|
||||||
|
]).pipe(
|
||||||
|
mergeMap(([source, feature, limit, offset]) =>
|
||||||
|
from(source.getClusterLeaves(feature.properties.cluster_id, limit, offset)),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
constructor(private mapService: MapService) {}
|
||||||
|
|
||||||
|
transform(
|
||||||
|
source: string,
|
||||||
|
feature: MapGeoJSONFeature,
|
||||||
|
limit = 0,
|
||||||
|
offset = 0,
|
||||||
|
): Observable<Feature<Point, SCFeatureProperties>[]> {
|
||||||
|
// MapLibre triggers change detection when the map moves, so this is to prevent flicker
|
||||||
|
this.source.next(source);
|
||||||
|
this.feature.next(feature);
|
||||||
|
this.limit.next(limit);
|
||||||
|
this.offset.next(offset);
|
||||||
|
return this.leaves;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import {animate, style, transition, trigger} from '@angular/animations';
|
||||||
|
import {AsyncPipe} from '@angular/common';
|
||||||
|
import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
|
||||||
|
import {IonicModule} from '@ionic/angular';
|
||||||
|
import {MapService} from '@maplibre/ngx-maplibre-gl';
|
||||||
|
import {map, delay, Subject, race, mergeWith} from 'rxjs';
|
||||||
|
import {IonIconModule} from 'src/app/util/ion-icon/ion-icon.module';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'stapps-map-attribution',
|
||||||
|
templateUrl: './attribution.html',
|
||||||
|
styleUrl: './attribution.scss',
|
||||||
|
standalone: true,
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
imports: [IonicModule, IonIconModule, AsyncPipe],
|
||||||
|
animations: [
|
||||||
|
trigger('fade', [
|
||||||
|
transition(':enter', [
|
||||||
|
style({opacity: 0, scale: '0.8 1'}),
|
||||||
|
animate('0.2s ease', style({opacity: 1, scale: 1})),
|
||||||
|
]),
|
||||||
|
transition(':leave', [
|
||||||
|
style({opacity: 1, scale: 1}),
|
||||||
|
animate('0.2s ease', style({opacity: 0, scale: '0.8 1'})),
|
||||||
|
]),
|
||||||
|
]),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
export class AttributionComponent {
|
||||||
|
@Input() direction: 'left' | 'right' = 'right';
|
||||||
|
|
||||||
|
manualVisible = new Subject<void>();
|
||||||
|
|
||||||
|
hideAttribution = race(
|
||||||
|
this.manualVisible,
|
||||||
|
inject(MapService).mapCreated$.pipe(delay(5000), mergeWith(this.manualVisible)),
|
||||||
|
).pipe(map((_, i) => i % 2 === 0));
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user