mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2025-12-29 17:42:49 +00:00
Compare commits
10 Commits
@openstapp
...
@openstapp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
afd1c8d87e | ||
|
|
6941f83b8f | ||
|
|
3a274a3a7f | ||
|
|
5a48342a8d | ||
|
|
6b06de4019 | ||
|
|
c5c9bcf433 | ||
|
|
b40ba7ad63 | ||
|
|
362f6adf07 | ||
|
|
bbd6b0f874 | ||
|
|
b1a9ba44d0 |
7
.vscode/launch.json
vendored
7
.vscode/launch.json
vendored
@@ -4,6 +4,13 @@
|
|||||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Launch Chrome",
|
||||||
|
"request": "launch",
|
||||||
|
"type": "chrome",
|
||||||
|
"url": "http://localhost:8100",
|
||||||
|
"webRoot": "${workspaceFolder}/frontend/app/www"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"type":"node",
|
"type":"node",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
|
|||||||
@@ -1,5 +1,31 @@
|
|||||||
# @openstapps/backend
|
# @openstapps/backend
|
||||||
|
|
||||||
|
## 4.0.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
- @openstapps/core-tools@4.0.2
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 6b06de40: Updated nodemailer dependency
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
- @openstapps/core-tools@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ const menus = [
|
|||||||
icon: 'school',
|
icon: 'school',
|
||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
icon: 'grade',
|
icon: 'star',
|
||||||
route: '/favorites',
|
route: '/favorites',
|
||||||
title: 'favorites',
|
title: 'favorites',
|
||||||
translations: {
|
translations: {
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ const userGroupSetting = {
|
|||||||
categories: ['profile'],
|
categories: ['profile'],
|
||||||
defaultValue: 'students',
|
defaultValue: 'students',
|
||||||
description:
|
description:
|
||||||
'The user group the app is going to be used.' +
|
'The user group the app is going to use primarily.' +
|
||||||
'This settings for example is getting used for the predefined price category of mensa meals.',
|
' This settings for example is getting used for the predefined price category of mensa meals.',
|
||||||
inputType: SCSettingInputType.SingleChoice,
|
inputType: SCSettingInputType.SingleChoice,
|
||||||
name: 'group',
|
name: 'group',
|
||||||
order: 1,
|
order: 1,
|
||||||
@@ -25,7 +25,7 @@ const userGroupSetting = {
|
|||||||
},
|
},
|
||||||
en: {
|
en: {
|
||||||
description:
|
description:
|
||||||
'The user group the app is going to be used.' +
|
'The user group the app is going to use primarily.' +
|
||||||
' This settings for example is getting used for the predefined price category of mensa meals.',
|
' This settings for example is getting used for the predefined price category of mensa meals.',
|
||||||
name: 'Group',
|
name: 'Group',
|
||||||
values: ['students', 'employees', 'guests'],
|
values: ['students', 'employees', 'guests'],
|
||||||
|
|||||||
@@ -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": "4.0.0",
|
"version": "4.0.3",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
@@ -43,11 +43,11 @@
|
|||||||
"test:unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 mocha --exit"
|
"test:unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 mocha --exit"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@elastic/elasticsearch": "8.4.0",
|
"@elastic/elasticsearch": "8.14.1",
|
||||||
"@openstapps/core": "workspace:*",
|
"@openstapps/core": "workspace:*",
|
||||||
"@openstapps/core-tools": "workspace:*",
|
"@openstapps/core-tools": "workspace:*",
|
||||||
"@openstapps/logger": "workspace:*",
|
"@openstapps/logger": "workspace:*",
|
||||||
"@types/body-parser": "1.19.2",
|
"@types/body-parser": "1.19.6",
|
||||||
"@types/cors": "2.8.13",
|
"@types/cors": "2.8.13",
|
||||||
"@types/express": "4.17.17",
|
"@types/express": "4.17.17",
|
||||||
"@types/geojson": "1.0.6",
|
"@types/geojson": "1.0.6",
|
||||||
@@ -56,20 +56,20 @@
|
|||||||
"@types/nodemailer": "6.4.7",
|
"@types/nodemailer": "6.4.7",
|
||||||
"@types/promise-queue": "2.2.0",
|
"@types/promise-queue": "2.2.0",
|
||||||
"@types/uuid": "8.3.4",
|
"@types/uuid": "8.3.4",
|
||||||
"body-parser": "1.20.2",
|
"body-parser": "1.20.3",
|
||||||
"cors": "2.8.5",
|
"cors": "2.8.5",
|
||||||
"cosmiconfig": "8.1.3",
|
"cosmiconfig": "8.1.3",
|
||||||
"deepmerge": "4.3.1",
|
"deepmerge": "4.3.1",
|
||||||
"express": "4.18.2",
|
"express": "4.21.2",
|
||||||
"express-prom-bundle": "6.6.0",
|
"express-prom-bundle": "6.6.0",
|
||||||
"express-promise-router": "4.1.1",
|
"express-promise-router": "4.1.1",
|
||||||
"got": "12.6.0",
|
"got": "12.6.0",
|
||||||
"moment": "2.30.1",
|
"moment": "2.30.1",
|
||||||
"morgan": "1.10.0",
|
"morgan": "1.10.1",
|
||||||
"nock": "13.3.1",
|
"nock": "13.3.1",
|
||||||
"node-cache": "5.1.2",
|
"node-cache": "5.1.2",
|
||||||
"node-cron": "3.0.2",
|
"node-cron": "3.0.2",
|
||||||
"nodemailer": "6.9.1",
|
"nodemailer": "6.9.9",
|
||||||
"prom-client": "14.1.1",
|
"prom-client": "14.1.1",
|
||||||
"promise-queue": "2.2.5",
|
"promise-queue": "2.2.5",
|
||||||
"uuid": "8.3.2"
|
"uuid": "8.3.2"
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
"@types/chai": "4.3.20",
|
"@types/chai": "4.3.20",
|
||||||
"@types/chai-as-promised": "7.1.8",
|
"@types/chai-as-promised": "7.1.8",
|
||||||
"@types/mocha": "10.0.10",
|
"@types/mocha": "10.0.10",
|
||||||
"@types/morgan": "1.9.4",
|
"@types/morgan": "1.9.10",
|
||||||
"@types/sinon": "10.0.14",
|
"@types/sinon": "10.0.14",
|
||||||
"@types/sinon-express-mock": "1.3.9",
|
"@types/sinon-express-mock": "1.3.9",
|
||||||
"@types/supertest": "2.0.12",
|
"@types/supertest": "2.0.12",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/database
|
# @openstapps/database
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM elasticsearch:8.4.2
|
FROM elasticsearch:8.14.3
|
||||||
|
|
||||||
EXPOSE 9200
|
EXPOSE 9200
|
||||||
EXPOSE 9300
|
EXPOSE 9300
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/database",
|
"name": "@openstapps/database",
|
||||||
"version": "4.0.0",
|
"version": "4.0.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"files": [
|
"files": [
|
||||||
"config",
|
"config",
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
# @openstapps/proxy
|
# @openstapps/proxy
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/proxy",
|
"name": "@openstapps/proxy",
|
||||||
"description": "NGINX proxy that is dynamically configured by a Node.js script",
|
"description": "NGINX proxy that is dynamically configured by a Node.js script",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/backend-config
|
# @openstapps/backend-config
|
||||||
|
|
||||||
|
## 4.0.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/backend-config",
|
"name": "@openstapps/backend-config",
|
||||||
"description": "Backend Configuration for OpenStApps",
|
"description": "Backend Configuration for OpenStApps",
|
||||||
"version": "4.0.0",
|
"version": "4.0.3",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
|
<group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
|
||||||
<group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>
|
<group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>
|
||||||
<group title="my app" title.de="Meine App" icon="school" route="/profile">
|
<group title="my app" title.de="Meine App" icon="school" route="/profile">
|
||||||
<item title="favorites" title.de="Favoriten" icon="grade" route="/favorites"/>
|
<item title="favorites" title.de="Favoriten" icon="star" route="/favorites"/>
|
||||||
<item title="schedule" title.de="Stundenplan" icon="calendar_today" route="/schedule"/>
|
<item title="schedule" title.de="Stundenplan" icon="calendar_today" route="/schedule"/>
|
||||||
<item title="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
|
<item title="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
|
||||||
<item title="settings" title.de="Einstellungen" icon="settings" route="/settings"/>
|
<item title="settings" title.de="Einstellungen" icon="settings" route="/settings"/>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
|
<group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
|
||||||
<group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>
|
<group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>
|
||||||
<group title="my app" title.de="Meine App" icon="school" route="/profile">
|
<group title="my app" title.de="Meine App" icon="school" route="/profile">
|
||||||
<item title="favorites" title.de="Favoriten" icon="grade" route="/favorites"/>
|
<item title="favorites" title.de="Favoriten" icon="star" route="/favorites"/>
|
||||||
<item title="schedule" title.de="Stundenplan" icon="calendar_today" route="/schedule"/>
|
<item title="schedule" title.de="Stundenplan" icon="calendar_today" route="/schedule"/>
|
||||||
<item title="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
|
<item title="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
|
||||||
<item title="settings" title.de="Einstellungen" icon="settings" route="/settings"/>
|
<item title="settings" title.de="Einstellungen" icon="settings" route="/settings"/>
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/eslint-config
|
# @openstapps/eslint-config
|
||||||
|
|
||||||
|
## 4.0.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/eslint-config",
|
"name": "@openstapps/eslint-config",
|
||||||
"description": "A collection of configuration base files for StApps projects. Just an (unused) experiment for now.",
|
"description": "A collection of configuration base files for StApps projects. Just an (unused) experiment for now.",
|
||||||
"version": "4.0.0",
|
"version": "4.0.3",
|
||||||
"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",
|
||||||
@@ -22,8 +22,8 @@
|
|||||||
"typescript": "5.4.2"
|
"typescript": "5.4.2"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@typescript-eslint/eslint-plugin": "7.2.0",
|
"@typescript-eslint/eslint-plugin": "7.11.0",
|
||||||
"@typescript-eslint/parser": "7.2.0",
|
"@typescript-eslint/parser": "7.11.0",
|
||||||
"eslint": "8.57.0",
|
"eslint": "8.57.0",
|
||||||
"eslint-config-prettier": "9.1.0",
|
"eslint-config-prettier": "9.1.0",
|
||||||
"eslint-plugin-jsdoc": "48.2.1",
|
"eslint-plugin-jsdoc": "48.2.1",
|
||||||
|
|||||||
@@ -1,5 +1,19 @@
|
|||||||
# @openstapps/projectmanagement
|
# @openstapps/projectmanagement
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
- @openstapps/gitlab-api@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/projectmanagement",
|
"name": "@openstapps/projectmanagement",
|
||||||
"description": "Main documentation and scripts for maintenance.",
|
"description": "Main documentation and scripts for maintenance.",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
@@ -41,7 +41,6 @@
|
|||||||
"@openstapps/collection-utils": "workspace:*",
|
"@openstapps/collection-utils": "workspace:*",
|
||||||
"@openstapps/gitlab-api": "workspace:*",
|
"@openstapps/gitlab-api": "workspace:*",
|
||||||
"@openstapps/logger": "workspace:*",
|
"@openstapps/logger": "workspace:*",
|
||||||
"@slack/web-api": "6.8.1",
|
|
||||||
"commander": "10.0.0",
|
"commander": "10.0.0",
|
||||||
"date-fns": "3.6.0",
|
"date-fns": "3.6.0",
|
||||||
"glob": "10.3.10",
|
"glob": "10.3.10",
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import {
|
|||||||
User,
|
User,
|
||||||
} from '@openstapps/gitlab-api';
|
} from '@openstapps/gitlab-api';
|
||||||
import {Logger} from '@openstapps/logger';
|
import {Logger} from '@openstapps/logger';
|
||||||
import {WebClient} from '@slack/web-api';
|
|
||||||
import {CONCURRENCY, GROUPS, MAX_DEPTH_FOR_REMINDER, NOTE_PREFIX, SLACK_CHANNEL} from '../configuration.js';
|
import {CONCURRENCY, GROUPS, MAX_DEPTH_FOR_REMINDER, NOTE_PREFIX, SLACK_CHANNEL} from '../configuration.js';
|
||||||
import {mapAsyncLimit} from '@openstapps/collection-utils';
|
import {mapAsyncLimit} from '@openstapps/collection-utils';
|
||||||
|
|
||||||
@@ -53,8 +52,7 @@ export async function remind(api: Api): Promise<void> {
|
|||||||
Logger.info(`Found ${mergeRequests.length} open merge requests.`);
|
Logger.info(`Found ${mergeRequests.length} open merge requests.`);
|
||||||
|
|
||||||
// instantiate slack client
|
// instantiate slack client
|
||||||
const client =
|
const client = undefined;
|
||||||
process.env.SLACK_API_TOKEN === undefined ? undefined : new WebClient(process.env.SLACK_API_TOKEN);
|
|
||||||
|
|
||||||
// get members of the main group
|
// get members of the main group
|
||||||
const members = await api.getMembers(MembershipScope.GROUPS, GROUPS[0]);
|
const members = await api.getMembers(MembershipScope.GROUPS, GROUPS[0]);
|
||||||
|
|||||||
@@ -1,5 +1,22 @@
|
|||||||
# @openstapps/minimal-connector
|
# @openstapps/minimal-connector
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
- @openstapps/api@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [b40ba7ad]
|
||||||
|
- @openstapps/api@4.0.1
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -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": "4.0.0",
|
"version": "4.0.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/minimal-deployment
|
# @openstapps/minimal-deployment
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,23 +1,21 @@
|
|||||||
version: '3.7'
|
|
||||||
|
|
||||||
x-development-variables: &development-variables
|
x-development-variables: &development-variables
|
||||||
NODE_ENV: "development"
|
NODE_ENV: "development"
|
||||||
ALLOW_NO_TRANSPORT: "true"
|
ALLOW_NO_TRANSPORT: "true"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: registry.gitlab.com/openstapps/openstapps/database:3.0.0
|
image: registry.gitlab.com/openstapps/openstapps/database:4.0.1
|
||||||
# If you need persistence for debugging purposes uncomment the following lines
|
# If you need persistence for debugging purposes uncomment the following lines
|
||||||
#volumes:
|
# volumes:
|
||||||
# - ./database:/usr/share/elasticsearch/data
|
# - ./database:/usr/share/elasticsearch/data
|
||||||
expose:
|
expose:
|
||||||
- 9200
|
- 9200
|
||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:9200:9200
|
- 127.0.0.1:9200:9200
|
||||||
environment:
|
environment:
|
||||||
- bootstrap.memory_lock=true
|
# - bootstrap.memory_lock=true
|
||||||
- "ES_JAVA_OPTS=-Xms2g -Xmx2g"
|
# - discovery.type=single-node
|
||||||
- discovery.type=single-node
|
- "ES_JAVA_OPTS=-Xms4g -Xmx4g"
|
||||||
ulimits:
|
ulimits:
|
||||||
memlock:
|
memlock:
|
||||||
soft: -1
|
soft: -1
|
||||||
@@ -25,7 +23,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
backend:
|
backend:
|
||||||
image: registry.gitlab.com/openstapps/openstapps/backend:3.1.0
|
image: registry.gitlab.com/openstapps/openstapps/backend:4.0.1
|
||||||
environment:
|
environment:
|
||||||
<<: *development-variables
|
<<: *development-variables
|
||||||
ES_ADDR: "http://database:9200"
|
ES_ADDR: "http://database:9200"
|
||||||
@@ -37,10 +35,11 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:3000:3000
|
- 127.0.0.1:3000:3000
|
||||||
labels:
|
labels:
|
||||||
- stapps.version=4.1.0
|
- stapps.version=4.0.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- database
|
database:
|
||||||
|
condition: service_healthy
|
||||||
links:
|
links:
|
||||||
- database
|
- database
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/minimal-deployment",
|
"name": "@openstapps/minimal-deployment",
|
||||||
"version": "4.0.0",
|
"version": "4.0.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"files": [
|
"files": [
|
||||||
"database",
|
"database",
|
||||||
|
|||||||
@@ -1,5 +1,26 @@
|
|||||||
# @openstapps/minimal-plugin
|
# @openstapps/minimal-plugin
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
- @openstapps/api-plugin@4.0.2
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
- @openstapps/core-tools@4.0.2
|
||||||
|
- @openstapps/api@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
- Updated dependencies [b40ba7ad]
|
||||||
|
- @openstapps/api-plugin@4.0.1
|
||||||
|
- @openstapps/api@4.0.1
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/minimal-plugin",
|
"name": "@openstapps/minimal-plugin",
|
||||||
"description": "Minimal Plugin",
|
"description": "Minimal Plugin",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
"@openstapps/core-tools": "workspace:*",
|
"@openstapps/core-tools": "workspace:*",
|
||||||
"@openstapps/logger": "workspace:*",
|
"@openstapps/logger": "workspace:*",
|
||||||
"commander": "10.0.0",
|
"commander": "10.0.0",
|
||||||
"express": "4.18.2",
|
"express": "4.21.2",
|
||||||
"ts-node": "10.9.2"
|
"ts-node": "10.9.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -1,5 +1,30 @@
|
|||||||
# @openstapps/app
|
# @openstapps/app
|
||||||
|
|
||||||
|
## 4.0.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
|
||||||
|
- @openstapps/api@4.0.2
|
||||||
|
- @openstapps/collection-utils@4.0.0
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
- @openstapps/api@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
- Updated dependencies [b40ba7ad]
|
||||||
|
- @openstapps/api@4.0.1
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_17
|
sourceCompatibility JavaVersion.VERSION_21
|
||||||
targetCompatibility JavaVersion.VERSION_17
|
targetCompatibility JavaVersion.VERSION_21
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation project(':capacitor-community-in-app-review')
|
||||||
implementation project(':capacitor-community-screen-brightness')
|
implementation project(':capacitor-community-screen-brightness')
|
||||||
implementation project(':capacitor-app')
|
implementation project(':capacitor-app')
|
||||||
implementation project(':capacitor-browser')
|
implementation project(':capacitor-browser')
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"pkg": "@capacitor-community/in-app-review",
|
||||||
|
"classpath": "com.getcapacitor.community.inappreview.InAppReviewPlugin"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"pkg": "@capacitor-community/screen-brightness",
|
"pkg": "@capacitor-community/screen-brightness",
|
||||||
"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"
|
"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.2.1'
|
classpath 'com.android.tools.build:gradle:8.7.2'
|
||||||
classpath 'com.google.gms:google-services:4.4.0'
|
classpath 'com.google.gms:google-services:4.4.2'
|
||||||
|
|
||||||
// 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,57 +1,60 @@
|
|||||||
// 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@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/android/capacitor')
|
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/android/capacitor')
|
||||||
|
|
||||||
|
include ':capacitor-community-in-app-review'
|
||||||
|
project(':capacitor-community-in-app-review').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review/android')
|
||||||
|
|
||||||
include ':capacitor-community-screen-brightness'
|
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.2.1/node_modules/@capacitor-community/screen-brightness/android')
|
project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness/android')
|
||||||
|
|
||||||
include ':capacitor-app'
|
include ':capacitor-app'
|
||||||
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/app/android')
|
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app/android')
|
||||||
|
|
||||||
include ':capacitor-browser'
|
include ':capacitor-browser'
|
||||||
project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/browser/android')
|
project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser/android')
|
||||||
|
|
||||||
include ':capacitor-clipboard'
|
include ':capacitor-clipboard'
|
||||||
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/clipboard/android')
|
project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard/android')
|
||||||
|
|
||||||
include ':capacitor-device'
|
include ':capacitor-device'
|
||||||
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/device/android')
|
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device/android')
|
||||||
|
|
||||||
include ':capacitor-dialog'
|
include ':capacitor-dialog'
|
||||||
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/dialog/android')
|
project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog/android')
|
||||||
|
|
||||||
include ':capacitor-filesystem'
|
include ':capacitor-filesystem'
|
||||||
project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/filesystem/android')
|
project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem/android')
|
||||||
|
|
||||||
include ':capacitor-geolocation'
|
include ':capacitor-geolocation'
|
||||||
project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/geolocation/android')
|
project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation/android')
|
||||||
|
|
||||||
include ':capacitor-haptics'
|
include ':capacitor-haptics'
|
||||||
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/haptics/android')
|
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics/android')
|
||||||
|
|
||||||
include ':capacitor-keyboard'
|
include ':capacitor-keyboard'
|
||||||
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/keyboard/android')
|
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/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@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/local-notifications/android')
|
project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications/android')
|
||||||
|
|
||||||
include ':capacitor-network'
|
include ':capacitor-network'
|
||||||
project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/network/android')
|
project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network/android')
|
||||||
|
|
||||||
include ':capacitor-preferences'
|
include ':capacitor-preferences'
|
||||||
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/preferences/android')
|
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences/android')
|
||||||
|
|
||||||
include ':capacitor-screen-orientation'
|
include ':capacitor-screen-orientation'
|
||||||
project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/screen-orientation/android')
|
project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation/android')
|
||||||
|
|
||||||
include ':capacitor-share'
|
include ':capacitor-share'
|
||||||
project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/share/android')
|
project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/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@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/splash-screen/android')
|
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@7.0.2_@capacitor+core@7.4.2/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@6.0.0_@capacitor+core@6.2.1/node_modules/@transistorsoft/capacitor-background-fetch/android')
|
project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@7.4.2/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.10.0_@capacitor+core@6.2.1/node_modules/capacitor-secure-storage-plugin/android')
|
project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin/android')
|
||||||
|
|||||||
Binary file not shown.
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
34
frontend/app/android/gradlew
vendored
34
frontend/app/android/gradlew
vendored
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -83,10 +85,9 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
' "$PWD" ) || exit
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -133,10 +134,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
22
frontend/app/android/gradlew.bat
vendored
22
frontend/app/android/gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
ext {
|
ext {
|
||||||
minSdkVersion = 22
|
minSdkVersion = 23
|
||||||
compileSdkVersion = 34
|
compileSdkVersion = 35
|
||||||
targetSdkVersion = 34
|
targetSdkVersion = 35
|
||||||
androidxActivityVersion = '1.8.0'
|
androidxActivityVersion = '1.9.2'
|
||||||
androidxAppCompatVersion = '1.6.1'
|
androidxAppCompatVersion = '1.7.0'
|
||||||
androidxCoordinatorLayoutVersion = '1.2.0'
|
androidxCoordinatorLayoutVersion = '1.2.0'
|
||||||
androidxCoreVersion = '1.12.0'
|
androidxCoreVersion = '1.15.0'
|
||||||
androidxFragmentVersion = '1.6.2'
|
androidxFragmentVersion = '1.8.4'
|
||||||
coreSplashScreenVersion = '1.0.1'
|
coreSplashScreenVersion = '1.0.1'
|
||||||
androidxWebkitVersion = '1.9.0'
|
androidxWebkitVersion = '1.12.1'
|
||||||
junitVersion = '4.13.2'
|
junitVersion = '4.13.2'
|
||||||
androidxJunitVersion = '1.1.5'
|
androidxJunitVersion = '1.2.1'
|
||||||
androidxEspressoCoreVersion = '3.5.1'
|
androidxEspressoCoreVersion = '3.6.1'
|
||||||
cordovaAndroidVersion = '10.1.1'
|
cordovaAndroidVersion = '10.1.1'
|
||||||
}
|
}
|
||||||
@@ -299,7 +299,7 @@
|
|||||||
"icon": "school",
|
"icon": "school",
|
||||||
"items": [
|
"items": [
|
||||||
{
|
{
|
||||||
"icon": "grade",
|
"icon": "star",
|
||||||
"route": "/favorites",
|
"route": "/favorites",
|
||||||
"title": "favorites",
|
"title": "favorites",
|
||||||
"translations": {
|
"translations": {
|
||||||
|
|||||||
@@ -14,6 +14,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
describe('context menu', function () {
|
describe('context menu', function () {
|
||||||
|
const contextMenuSelector = 'stapps-context-menu-modal';
|
||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(function () {
|
||||||
cy.interceptSearch({
|
cy.interceptSearch({
|
||||||
extends: {query: 'a'},
|
extends: {query: 'a'},
|
||||||
@@ -33,21 +35,21 @@ describe('context menu', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should sort', function () {
|
it('should sort', function () {
|
||||||
cy.get('stapps-context').within(() => {
|
cy.get(contextMenuSelector).within(() => {
|
||||||
cy.contains('ion-item', 'Name').click();
|
cy.contains('ion-item', 'Name').click();
|
||||||
cy.wait('@search');
|
cy.wait('@search');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should filter', function () {
|
it('should filter', function () {
|
||||||
cy.get('stapps-context').within(() => {
|
cy.get(contextMenuSelector).within(() => {
|
||||||
cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
|
cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
|
||||||
cy.wait('@search');
|
cy.wait('@search');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should have a working delete button', function () {
|
it('should have a working delete button', function () {
|
||||||
cy.get('stapps-context').within(() => {
|
cy.get(contextMenuSelector).within(() => {
|
||||||
cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
|
cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
|
||||||
|
|
||||||
cy.get('.checkbox-checked').should('have.length', 1);
|
cy.get('.checkbox-checked').should('have.length', 1);
|
||||||
@@ -60,7 +62,7 @@ describe('context menu', function () {
|
|||||||
it('should truncate long category items', function () {
|
it('should truncate long category items', function () {
|
||||||
cy.contains('ion-list', 'Akademische Veranstaltung / Kategorien').within(() => {
|
cy.contains('ion-list', 'Akademische Veranstaltung / Kategorien').within(() => {
|
||||||
cy.contains('ion-item', '(1) Tutorium').should('not.exist');
|
cy.contains('ion-item', '(1) Tutorium').should('not.exist');
|
||||||
cy.get('div > ion-button').click();
|
cy.get('ion-button').click();
|
||||||
cy.contains('ion-item', '(1) Tutorium').should('exist');
|
cy.contains('ion-item', '(1) Tutorium').should('exist');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -33,9 +33,9 @@ describe('dashboard', async function () {
|
|||||||
describe('schedule section', function () {
|
describe('schedule section', function () {
|
||||||
it('should lead to the week overview', function () {
|
it('should lead to the week overview', function () {
|
||||||
cy.get('.schedule')
|
cy.get('.schedule')
|
||||||
.contains('a', /Wochen.*übersicht/)
|
.contains('a', /Wochen.*ansicht/)
|
||||||
.click();
|
.click();
|
||||||
cy.url().should('include', '/schedule/week-overview');
|
cy.url().should('include', '/schedule/weekly-view');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should lead to the calendar', function () {
|
it('should lead to the calendar', function () {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ describe('schedule', function () {
|
|||||||
cy.get('ion-searchbar').click().type('a');
|
cy.get('ion-searchbar').click().type('a');
|
||||||
cy.wait('@search');
|
cy.wait('@search');
|
||||||
cy.wait('@chips');
|
cy.wait('@chips');
|
||||||
cy.wait(200);
|
cy.wait(1000);
|
||||||
cy.contains('ion-item', 'UNIcert (Test)')
|
cy.contains('ion-item', 'UNIcert (Test)')
|
||||||
.contains('stapps-add-event-action-chip', 'Termine Auswählen')
|
.contains('stapps-add-event-action-chip', 'Termine Auswählen')
|
||||||
.click();
|
.click();
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const config = {
|
|||||||
htmlGlob: 'src/**/*.html',
|
htmlGlob: 'src/**/*.html',
|
||||||
scriptGlob: 'src/**/*.ts',
|
scriptGlob: 'src/**/*.ts',
|
||||||
additionalIcons: {
|
additionalIcons: {
|
||||||
about: ['copyright', 'campaign', 'policy', 'description', 'text_snippet'],
|
about: ['copyright', 'campaign', 'policy', 'description', 'text_snippet', 'expand_more', 'expand_all'],
|
||||||
navigation: [
|
navigation: [
|
||||||
'home',
|
'home',
|
||||||
'newspaper',
|
'newspaper',
|
||||||
@@ -30,7 +30,7 @@ const config = {
|
|||||||
'local_library',
|
'local_library',
|
||||||
'inventory_2',
|
'inventory_2',
|
||||||
'map',
|
'map',
|
||||||
'grade',
|
'star',
|
||||||
'account_circle',
|
'account_circle',
|
||||||
'settings',
|
'settings',
|
||||||
'info',
|
'info',
|
||||||
|
|||||||
@@ -304,7 +304,7 @@
|
|||||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = YES;
|
MTL_ENABLE_DEBUG_INFO = YES;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
@@ -355,7 +355,7 @@
|
|||||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||||
MTL_ENABLE_DEBUG_INFO = NO;
|
MTL_ENABLE_DEBUG_INFO = NO;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
||||||
@@ -373,7 +373,7 @@
|
|||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
DEVELOPMENT_TEAM = YSGS9WV338;
|
DEVELOPMENT_TEAM = YSGS9WV338;
|
||||||
INFOPLIST_FILE = App/Info.plist;
|
INFOPLIST_FILE = App/Info.plist;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
||||||
@@ -395,7 +395,7 @@
|
|||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
DEVELOPMENT_TEAM = YSGS9WV338;
|
DEVELOPMENT_TEAM = YSGS9WV338;
|
||||||
INFOPLIST_FILE = App/Info.plist;
|
INFOPLIST_FILE = App/Info.plist;
|
||||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios/scripts/pods_helpers'
|
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios/scripts/pods_helpers'
|
||||||
|
|
||||||
platform :ios, '13.0'
|
platform :ios, '14.0'
|
||||||
use_frameworks!
|
use_frameworks!
|
||||||
|
|
||||||
# workaround to avoid Xcode caching of Pods that requires
|
# workaround to avoid Xcode caching of Pods that requires
|
||||||
@@ -9,26 +9,27 @@ 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@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios'
|
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios'
|
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor-community/screen-brightness'
|
pod 'CapacitorCommunityInAppReview', :path => '../../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review'
|
||||||
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/app'
|
pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness'
|
||||||
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/browser'
|
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app'
|
||||||
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/clipboard'
|
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser'
|
||||||
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/device'
|
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard'
|
||||||
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/dialog'
|
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device'
|
||||||
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/filesystem'
|
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog'
|
||||||
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/geolocation'
|
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem'
|
||||||
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/haptics'
|
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation'
|
||||||
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/keyboard'
|
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics'
|
||||||
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/local-notifications'
|
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/keyboard'
|
||||||
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/network'
|
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications'
|
||||||
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/preferences'
|
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network'
|
||||||
pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/screen-orientation'
|
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences'
|
||||||
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/share'
|
pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation'
|
||||||
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/splash-screen'
|
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/share'
|
||||||
pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@6.0.0_@capacitor+core@6.2.1/node_modules/@transistorsoft/capacitor-background-fetch'
|
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/splash-screen'
|
||||||
pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.10.0_@capacitor+core@6.2.1/node_modules/capacitor-secure-storage-plugin'
|
pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@7.4.2/node_modules/@transistorsoft/capacitor-background-fetch'
|
||||||
|
pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin'
|
||||||
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,143 +1,157 @@
|
|||||||
PODS:
|
PODS:
|
||||||
- Capacitor (6.2.1):
|
- Capacitor (7.4.2):
|
||||||
- CapacitorCordova
|
- CapacitorCordova
|
||||||
- CapacitorApp (6.0.0):
|
- CapacitorApp (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorBrowser (6.0.1):
|
- CapacitorBrowser (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorClipboard (6.0.0):
|
- CapacitorClipboard (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorCommunityScreenBrightness (6.0.0):
|
- CapacitorCommunityInAppReview (7.0.1):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorCordova (6.2.1)
|
- CapacitorCommunityScreenBrightness (7.0.0):
|
||||||
- CapacitorDevice (6.0.0):
|
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorDialog (6.0.0):
|
- CapacitorCordova (7.4.2)
|
||||||
|
- CapacitorDevice (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorFilesystem (6.0.0):
|
- CapacitorDialog (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorGeolocation (6.0.0):
|
- CapacitorFilesystem (7.1.4):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorHaptics (6.0.0):
|
- IONFilesystemLib (~> 1.0.1)
|
||||||
|
- CapacitorGeolocation (7.1.5):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorKeyboard (6.0.1):
|
- IONGeolocationLib (= 1.0.1)
|
||||||
|
- CapacitorHaptics (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorLocalNotifications (6.0.0):
|
- CapacitorKeyboard (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorNetwork (6.0.1):
|
- CapacitorLocalNotifications (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorPreferences (6.0.1):
|
- CapacitorNetwork (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorScreenOrientation (6.0.1):
|
- CapacitorPreferences (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorSecureStoragePlugin (0.10.0):
|
- CapacitorScreenOrientation (7.0.2):
|
||||||
|
- Capacitor
|
||||||
|
- CapacitorSecureStoragePlugin (0.11.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- SwiftKeychainWrapper
|
- SwiftKeychainWrapper
|
||||||
- CapacitorShare (6.0.1):
|
- CapacitorShare (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CapacitorSplashScreen (6.0.1):
|
- CapacitorSplashScreen (7.0.2):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
- CordovaPlugins (6.2.1):
|
- CordovaPlugins (7.4.2):
|
||||||
- CapacitorCordova
|
- CapacitorCordova
|
||||||
|
- IONFilesystemLib (1.0.1)
|
||||||
|
- IONGeolocationLib (1.0.1)
|
||||||
- SwiftKeychainWrapper (4.0.1)
|
- SwiftKeychainWrapper (4.0.1)
|
||||||
- TransistorsoftCapacitorBackgroundFetch (6.0.0):
|
- TransistorsoftCapacitorBackgroundFetch (7.1.0):
|
||||||
- Capacitor
|
- Capacitor
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios`)"
|
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios`)"
|
||||||
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/app`)"
|
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app`)"
|
||||||
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/browser`)"
|
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser`)"
|
||||||
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/clipboard`)"
|
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard`)"
|
||||||
- "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor-community/screen-brightness`)"
|
- "CapacitorCommunityInAppReview (from `../../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review`)"
|
||||||
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios`)"
|
- "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness`)"
|
||||||
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/device`)"
|
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios`)"
|
||||||
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/dialog`)"
|
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device`)"
|
||||||
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/filesystem`)"
|
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog`)"
|
||||||
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/geolocation`)"
|
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem`)"
|
||||||
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/haptics`)"
|
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation`)"
|
||||||
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/keyboard`)"
|
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics`)"
|
||||||
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/local-notifications`)"
|
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/keyboard`)"
|
||||||
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/network`)"
|
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications`)"
|
||||||
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/preferences`)"
|
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network`)"
|
||||||
- "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/screen-orientation`)"
|
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences`)"
|
||||||
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.10.0_@capacitor+core@6.2.1/node_modules/capacitor-secure-storage-plugin`)"
|
- "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation`)"
|
||||||
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/share`)"
|
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin`)"
|
||||||
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/splash-screen`)"
|
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/share`)"
|
||||||
|
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@7.0.2_@capacitor+core@7.4.2/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@6.0.0_@capacitor+core@6.2.1/node_modules/@transistorsoft/capacitor-background-fetch`)"
|
- "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@7.4.2/node_modules/@transistorsoft/capacitor-background-fetch`)"
|
||||||
|
|
||||||
SPEC REPOS:
|
SPEC REPOS:
|
||||||
trunk:
|
trunk:
|
||||||
|
- IONFilesystemLib
|
||||||
|
- IONGeolocationLib
|
||||||
- SwiftKeychainWrapper
|
- SwiftKeychainWrapper
|
||||||
|
|
||||||
EXTERNAL SOURCES:
|
EXTERNAL SOURCES:
|
||||||
Capacitor:
|
Capacitor:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios"
|
:path: "../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios"
|
||||||
CapacitorApp:
|
CapacitorApp:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/app"
|
:path: "../../../../node_modules/.pnpm/@capacitor+app@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/app"
|
||||||
CapacitorBrowser:
|
CapacitorBrowser:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/browser"
|
:path: "../../../../node_modules/.pnpm/@capacitor+browser@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/browser"
|
||||||
CapacitorClipboard:
|
CapacitorClipboard:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/clipboard"
|
:path: "../../../../node_modules/.pnpm/@capacitor+clipboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/clipboard"
|
||||||
|
CapacitorCommunityInAppReview:
|
||||||
|
:path: "../../../../node_modules/.pnpm/@capacitor-community+in-app-review@7.0.1_@capacitor+core@7.4.2/node_modules/@capacitor-community/in-app-review"
|
||||||
CapacitorCommunityScreenBrightness:
|
CapacitorCommunityScreenBrightness:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor-community/screen-brightness"
|
:path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@7.0.0_@capacitor+core@7.4.2/node_modules/@capacitor-community/screen-brightness"
|
||||||
CapacitorCordova:
|
CapacitorCordova:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios"
|
:path: "../../../../node_modules/.pnpm/@capacitor+ios@7.4.2_@capacitor+core@7.4.2/node_modules/@capacitor/ios"
|
||||||
CapacitorDevice:
|
CapacitorDevice:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/device"
|
:path: "../../../../node_modules/.pnpm/@capacitor+device@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/device"
|
||||||
CapacitorDialog:
|
CapacitorDialog:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/dialog"
|
:path: "../../../../node_modules/.pnpm/@capacitor+dialog@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/dialog"
|
||||||
CapacitorFilesystem:
|
CapacitorFilesystem:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/filesystem"
|
:path: "../../../../node_modules/.pnpm/@capacitor+filesystem@7.1.4_@capacitor+core@7.4.2/node_modules/@capacitor/filesystem"
|
||||||
CapacitorGeolocation:
|
CapacitorGeolocation:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/geolocation"
|
:path: "../../../../node_modules/.pnpm/@capacitor+geolocation@7.1.5_@capacitor+core@7.4.2/node_modules/@capacitor/geolocation"
|
||||||
CapacitorHaptics:
|
CapacitorHaptics:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/haptics"
|
:path: "../../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/haptics"
|
||||||
CapacitorKeyboard:
|
CapacitorKeyboard:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/keyboard"
|
:path: "../../../../node_modules/.pnpm/@capacitor+keyboard@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/keyboard"
|
||||||
CapacitorLocalNotifications:
|
CapacitorLocalNotifications:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/local-notifications"
|
:path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/local-notifications"
|
||||||
CapacitorNetwork:
|
CapacitorNetwork:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/network"
|
:path: "../../../../node_modules/.pnpm/@capacitor+network@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/network"
|
||||||
CapacitorPreferences:
|
CapacitorPreferences:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/preferences"
|
:path: "../../../../node_modules/.pnpm/@capacitor+preferences@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/preferences"
|
||||||
CapacitorScreenOrientation:
|
CapacitorScreenOrientation:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/screen-orientation"
|
:path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/screen-orientation"
|
||||||
CapacitorSecureStoragePlugin:
|
CapacitorSecureStoragePlugin:
|
||||||
:path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.10.0_@capacitor+core@6.2.1/node_modules/capacitor-secure-storage-plugin"
|
:path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.11.0_@capacitor+core@7.4.2/node_modules/capacitor-secure-storage-plugin"
|
||||||
CapacitorShare:
|
CapacitorShare:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/share"
|
:path: "../../../../node_modules/.pnpm/@capacitor+share@7.0.2_@capacitor+core@7.4.2/node_modules/@capacitor/share"
|
||||||
CapacitorSplashScreen:
|
CapacitorSplashScreen:
|
||||||
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/splash-screen"
|
:path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@7.0.2_@capacitor+core@7.4.2/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@6.0.0_@capacitor+core@6.2.1/node_modules/@transistorsoft/capacitor-background-fetch"
|
:path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@7.4.2/node_modules/@transistorsoft/capacitor-background-fetch"
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
Capacitor: c95400d761e376be9da6be5a05f226c0e865cebf
|
Capacitor: 9d9e481b79ffaeacaf7a85d6a11adec32bd33b59
|
||||||
CapacitorApp: 30145f2ea2311e4f3744472119ec87d2ddf4c0a7
|
CapacitorApp: 1f6922c9c5c8b1c538d7fbe92ebe44a81b34bed3
|
||||||
CapacitorBrowser: 6c0e04dc80556a966ebc2269ac72f09d83eec1ce
|
CapacitorBrowser: 22541e48442de44dc629c214388290d6eecc6ae9
|
||||||
CapacitorClipboard: c1cb27fea166aab5c99bda605d3bc768cf00eabe
|
CapacitorClipboard: 7e227702976d4435a5a40df54f65e154d0dfc1f3
|
||||||
CapacitorCommunityScreenBrightness: 95d4c839fc8e925dcf75ffee66f62a00f560f146
|
CapacitorCommunityInAppReview: a8f26c4e48a8ccc9df0acf1c7bca39844c325572
|
||||||
CapacitorCordova: 8d93e14982f440181be7304aa9559ca631d77fff
|
CapacitorCommunityScreenBrightness: 508f3d0f79024cd8da7d063f456870a4a1932723
|
||||||
CapacitorDevice: 38ad323d74e3a86b56253680538ac23a2c9b4a68
|
CapacitorCordova: 5e58d04631bc5094894ac106e2bf1da18a9e6151
|
||||||
CapacitorDialog: bd99f63c9788a137263b2d75e718b1fc4d9f70c3
|
CapacitorDevice: 81ae78d5d1942707caad79276badd458bf6ec603
|
||||||
CapacitorFilesystem: 9c2cc1e89d3b8b91503b316e9f6c2915c9bf9419
|
CapacitorDialog: 5bf72a94b747fb339df6f64ef60812e5e4630ad2
|
||||||
CapacitorGeolocation: 86f82a32b238ff79d5be6fc0943f2866965d3f1b
|
CapacitorFilesystem: f9bd850c41e048180e5dc0cbb90f2033ede9d2cc
|
||||||
CapacitorHaptics: 0cea833e6a8bf489dd6acaaebf6d953b90086c59
|
CapacitorGeolocation: 84f868bea4c2499aebc3bb3a88fd0a508f87ab87
|
||||||
CapacitorKeyboard: f38d730356be5569d72eb87ad9c8166947728c36
|
CapacitorHaptics: b3fb2869e72c4466e18ce9ccbeb60a3d8723b3d4
|
||||||
CapacitorLocalNotifications: d051c73ec8bf38807214f5b905ee6426e13756f8
|
CapacitorKeyboard: a86aa9e4741b6444a802df26440a92ae041b34a6
|
||||||
CapacitorNetwork: 7ff188197e880d8485f280492b54d3202e9f3a61
|
CapacitorLocalNotifications: 665188ae8accd40806129073896fb2b39322d858
|
||||||
CapacitorPreferences: 97d529423bb7c1196455e9a1b6dd1074625c78bd
|
CapacitorNetwork: 695069886b3c5ed514db69aa3d026b8dc3c03a6b
|
||||||
CapacitorScreenOrientation: f3a0744a56f673929d18bd0d9a5ef5f5595e7352
|
CapacitorPreferences: 65107ed7437d96ee72583df5763985e3c0ff2bc2
|
||||||
CapacitorSecureStoragePlugin: 545b51d782d35e61a39231ecf99a966b060a2cbb
|
CapacitorScreenOrientation: e0d5b9ef293b269b8f93373355d5b276f50fabea
|
||||||
CapacitorShare: ec1bcbc16696696133740ac876192c0480ca3018
|
CapacitorSecureStoragePlugin: 450d402026ee3bcc018fa206504d9c0572fee78d
|
||||||
CapacitorSplashScreen: d2d8fe9541d7bebdf735839b89edf6e762cea969
|
CapacitorShare: be166411fa995ead2d39b104aa0aae56d8615c66
|
||||||
CordovaPlugins: b40548c03c597049ef851a7014da5ac8f155d914
|
CapacitorSplashScreen: 157947576b59d913792063a8d442a79e6d283ee5
|
||||||
|
CordovaPlugins: 7b9a4f380c92ca7f28630723befaca556461f4c3
|
||||||
|
IONFilesystemLib: 89258b8e3e85465da93127d25d7ce37f977e8a6f
|
||||||
|
IONGeolocationLib: 20f9d0248a0b5264511fb57a37e25dd2badf797a
|
||||||
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
|
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
|
||||||
TransistorsoftCapacitorBackgroundFetch: dfa73a0fd038bc1986255360e4b20165a4a0f066
|
TransistorsoftCapacitorBackgroundFetch: 28e561636145a899f05025d31f627019c16791f5
|
||||||
|
|
||||||
PODFILE CHECKSUM: 601bc3c09529fe24d68110bc709379698476efe1
|
PODFILE CHECKSUM: 90bc09990a659848ea76c94331d39bad0b28024d
|
||||||
|
|
||||||
COCOAPODS: 1.16.2
|
COCOAPODS: 1.16.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": "4.0.0",
|
"version": "4.0.3",
|
||||||
"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>",
|
||||||
@@ -48,53 +48,53 @@
|
|||||||
"test:integration": "sh integration-test.sh"
|
"test:integration": "sh integration-test.sh"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "17.3.12",
|
"@angular/animations": "18.2.13",
|
||||||
"@angular/cdk": "17.3.10",
|
"@angular/cdk": "18.2.13",
|
||||||
"@angular/common": "17.3.12",
|
"@angular/common": "18.2.13",
|
||||||
"@angular/core": "17.3.12",
|
"@angular/core": "18.2.13",
|
||||||
"@angular/forms": "17.3.12",
|
"@angular/forms": "18.2.13",
|
||||||
"@angular/platform-browser": "17.3.12",
|
"@angular/platform-browser": "18.2.13",
|
||||||
"@angular/router": "17.3.12",
|
"@angular/router": "18.2.13",
|
||||||
"@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-community/screen-brightness": "6.0.0",
|
"@capacitor-community/in-app-review": "7.0.1",
|
||||||
"@capacitor/app": "6.0.0",
|
"@capacitor-community/screen-brightness": "7.0.0",
|
||||||
"@capacitor/browser": "6.0.1",
|
"@capacitor/app": "7.0.2",
|
||||||
"@capacitor/clipboard": "6.0.0",
|
"@capacitor/browser": "7.0.2",
|
||||||
"@capacitor/core": "6.2.1",
|
"@capacitor/clipboard": "7.0.2",
|
||||||
"@capacitor/device": "6.0.0",
|
"@capacitor/core": "7.4.2",
|
||||||
"@capacitor/dialog": "6.0.0",
|
"@capacitor/device": "7.0.2",
|
||||||
"@capacitor/filesystem": "6.0.0",
|
"@capacitor/dialog": "7.0.2",
|
||||||
"@capacitor/geolocation": "6.0.0",
|
"@capacitor/filesystem": "7.1.4",
|
||||||
"@capacitor/haptics": "6.0.0",
|
"@capacitor/geolocation": "7.1.5",
|
||||||
"@capacitor/keyboard": "6.0.1",
|
"@capacitor/haptics": "7.0.2",
|
||||||
"@capacitor/local-notifications": "6.0.0",
|
"@capacitor/keyboard": "7.0.2",
|
||||||
"@capacitor/network": "6.0.1",
|
"@capacitor/local-notifications": "7.0.2",
|
||||||
"@capacitor/preferences": "6.0.1",
|
"@capacitor/network": "7.0.2",
|
||||||
"@capacitor/screen-orientation": "6.0.1",
|
"@capacitor/preferences": "7.0.2",
|
||||||
"@capacitor/share": "6.0.1",
|
"@capacitor/screen-orientation": "7.0.2",
|
||||||
"@capacitor/splash-screen": "6.0.1",
|
"@capacitor/share": "7.0.2",
|
||||||
"@ionic-native/core": "5.36.0",
|
"@capacitor/splash-screen": "7.0.2",
|
||||||
"@ionic/angular": "8.6.1",
|
"@ionic/angular": "8.7.3",
|
||||||
"@ionic/angular-server": "8.6.1",
|
"@ionic/angular-server": "8.7.3",
|
||||||
"@ionic/storage-angular": "4.0.0",
|
"@ionic/storage-angular": "4.0.0",
|
||||||
"@maplibre/ngx-maplibre-gl": "17.4.1",
|
"@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.2",
|
||||||
"@openstapps/api": "workspace:*",
|
"@openstapps/api": "workspace:*",
|
||||||
"@openstapps/collection-utils": "workspace:*",
|
"@openstapps/collection-utils": "workspace:*",
|
||||||
"@openstapps/core": "workspace:*",
|
"@openstapps/core": "workspace:*",
|
||||||
"@transistorsoft/capacitor-background-fetch": "6.0.0",
|
"@transistorsoft/capacitor-background-fetch": "7.1.0",
|
||||||
"@types/dom-view-transitions": "1.0.4",
|
"@types/dom-view-transitions": "1.0.4",
|
||||||
"capacitor-secure-storage-plugin": "0.10.0",
|
"capacitor-secure-storage-plugin": "0.11.0",
|
||||||
"cordova-plugin-calendar": "5.1.6",
|
"cordova-plugin-calendar": "5.1.6",
|
||||||
"date-fns": "3.6.0",
|
"date-fns": "3.6.0",
|
||||||
"deepmerge": "4.3.1",
|
"deepmerge": "4.3.1",
|
||||||
"form-data": "4.0.0",
|
"form-data": "4.0.4",
|
||||||
"geojson": "0.5.0",
|
"geojson": "0.5.0",
|
||||||
"ionic-appauth": "0.9.0",
|
"ionic-appauth": "2.1.0",
|
||||||
"ionicons": "7.4.0",
|
"ionicons": "8.0.13",
|
||||||
"jsonpath-plus": "10.3.0",
|
"jsonpath-plus": "10.3.0",
|
||||||
"maplibre-gl": "4.0.2",
|
"maplibre-gl": "4.0.2",
|
||||||
"material-symbols": "0.17.1",
|
"material-symbols": "0.17.1",
|
||||||
@@ -110,31 +110,31 @@
|
|||||||
"semver": "7.6.0",
|
"semver": "7.6.0",
|
||||||
"swiper": "8.4.5",
|
"swiper": "8.4.5",
|
||||||
"tslib": "2.6.2",
|
"tslib": "2.6.2",
|
||||||
"zone.js": "0.14.4"
|
"zone.js": "0.14.10"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/architect": "0.1703.17",
|
"@angular-devkit/architect": "0.1802.20",
|
||||||
"@angular-devkit/build-angular": "17.3.17",
|
"@angular-devkit/build-angular": "18.2.20",
|
||||||
"@angular-devkit/core": "17.3.17",
|
"@angular-devkit/core": "18.2.20",
|
||||||
"@angular-devkit/schematics": "17.3.17",
|
"@angular-devkit/schematics": "18.2.20",
|
||||||
"@angular-eslint/builder": "17.5.3",
|
"@angular-eslint/builder": "18.4.3",
|
||||||
"@angular-eslint/eslint-plugin": "17.5.3",
|
"@angular-eslint/eslint-plugin": "18.4.3",
|
||||||
"@angular-eslint/eslint-plugin-template": "17.5.3",
|
"@angular-eslint/eslint-plugin-template": "18.4.3",
|
||||||
"@angular-eslint/schematics": "17.5.3",
|
"@angular-eslint/schematics": "18.4.1",
|
||||||
"@angular-eslint/template-parser": "17.5.3",
|
"@angular-eslint/template-parser": "18.4.3",
|
||||||
"@angular/cli": "17.3.17",
|
"@angular/cli": "18.2.20",
|
||||||
"@angular/compiler": "17.3.12",
|
"@angular/compiler": "18.2.13",
|
||||||
"@angular/compiler-cli": "17.3.12",
|
"@angular/compiler-cli": "18.2.13",
|
||||||
"@angular/language-server": "17.3.2",
|
"@angular/language-server": "18.2.0",
|
||||||
"@angular/language-service": "17.3.12",
|
"@angular/language-service": "18.2.13",
|
||||||
"@angular/platform-browser-dynamic": "17.3.12",
|
"@angular/platform-browser-dynamic": "18.2.13",
|
||||||
"@capacitor/android": "6.2.1",
|
"@capacitor/android": "7.4.2",
|
||||||
"@capacitor/assets": "3.0.4",
|
"@capacitor/assets": "3.0.5",
|
||||||
"@capacitor/cli": "6.2.1",
|
"@capacitor/cli": "7.4.2",
|
||||||
"@capacitor/ios": "6.2.1",
|
"@capacitor/ios": "7.4.2",
|
||||||
"@compodoc/compodoc": "1.1.23",
|
"@compodoc/compodoc": "1.1.23",
|
||||||
"@cypress/schematic": "3.0.0",
|
"@cypress/schematic": "4.1.1",
|
||||||
"@ionic/angular-toolkit": "11.0.1",
|
"@ionic/angular-toolkit": "12.3.0",
|
||||||
"@ionic/cli": "7.2.0",
|
"@ionic/cli": "7.2.0",
|
||||||
"@openstapps/prettier-config": "workspace:*",
|
"@openstapps/prettier-config": "workspace:*",
|
||||||
"@openstapps/tsconfig": "workspace:*",
|
"@openstapps/tsconfig": "workspace:*",
|
||||||
@@ -149,10 +149,10 @@
|
|||||||
"@types/karma-jasmine": "4.0.5",
|
"@types/karma-jasmine": "4.0.5",
|
||||||
"@types/node": "22.15.31",
|
"@types/node": "22.15.31",
|
||||||
"@types/semver": "7.5.8",
|
"@types/semver": "7.5.8",
|
||||||
"@typescript-eslint/eslint-plugin": "7.2.0",
|
"@typescript-eslint/eslint-plugin": "7.11.0",
|
||||||
"@typescript-eslint/parser": "7.2.0",
|
"@typescript-eslint/parser": "7.11.0",
|
||||||
"cordova-res": "0.15.4",
|
"cordova-res": "0.15.4",
|
||||||
"cypress": "14.5.0",
|
"cypress": "15.0.0",
|
||||||
"eslint": "8.57.0",
|
"eslint": "8.57.0",
|
||||||
"eslint-plugin-jsdoc": "48.2.1",
|
"eslint-plugin-jsdoc": "48.2.1",
|
||||||
"eslint-plugin-prettier": "5.1.3",
|
"eslint-plugin-prettier": "5.1.3",
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ import {sampleAuthConfiguration} from './_helpers/data/sample-configuration';
|
|||||||
import {StorageProvider} from './modules/storage/storage.provider';
|
import {StorageProvider} from './modules/storage/storage.provider';
|
||||||
import {SimpleBrowser} from './util/browser.factory';
|
import {SimpleBrowser} from './util/browser.factory';
|
||||||
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
||||||
|
import {InAppReviewProvider} from './modules/settings/in-app-review/in-app-review.provider';
|
||||||
|
|
||||||
describe('AppComponent', () => {
|
describe('AppComponent', () => {
|
||||||
let platformReadySpy: any;
|
let platformReadySpy: any;
|
||||||
@@ -40,6 +41,7 @@ describe('AppComponent', () => {
|
|||||||
let translateServiceSpy: jasmine.SpyObj<TranslateService>;
|
let translateServiceSpy: jasmine.SpyObj<TranslateService>;
|
||||||
let thingTranslateServiceSpy: jasmine.SpyObj<ThingTranslateService>;
|
let thingTranslateServiceSpy: jasmine.SpyObj<ThingTranslateService>;
|
||||||
let settingsProvider: jasmine.SpyObj<SettingsProvider>;
|
let settingsProvider: jasmine.SpyObj<SettingsProvider>;
|
||||||
|
let inAppReviewProvider: jasmine.SpyObj<InAppReviewProvider>;
|
||||||
let configProvider: jasmine.SpyObj<ConfigProvider>;
|
let configProvider: jasmine.SpyObj<ConfigProvider>;
|
||||||
let ngxLogger: jasmine.SpyObj<NGXLogger>;
|
let ngxLogger: jasmine.SpyObj<NGXLogger>;
|
||||||
let scheduleSyncServiceSpy: jasmine.SpyObj<ScheduleSyncService>;
|
let scheduleSyncServiceSpy: jasmine.SpyObj<ScheduleSyncService>;
|
||||||
@@ -85,6 +87,7 @@ describe('AppComponent', () => {
|
|||||||
{provide: ThingTranslateService, useValue: thingTranslateServiceSpy},
|
{provide: ThingTranslateService, useValue: thingTranslateServiceSpy},
|
||||||
{provide: ScheduleSyncService, useValue: scheduleSyncServiceSpy},
|
{provide: ScheduleSyncService, useValue: scheduleSyncServiceSpy},
|
||||||
{provide: SettingsProvider, useValue: settingsProvider},
|
{provide: SettingsProvider, useValue: settingsProvider},
|
||||||
|
{provide: InAppReviewProvider, useValue: inAppReviewProvider},
|
||||||
{provide: ConfigProvider, useValue: configProvider},
|
{provide: ConfigProvider, useValue: configProvider},
|
||||||
{provide: NGXLogger, useValue: ngxLogger},
|
{provide: NGXLogger, useValue: ngxLogger},
|
||||||
{provide: StorageProvider, useValue: storageProvider},
|
{provide: StorageProvider, useValue: storageProvider},
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import {Router} from '@angular/router';
|
|||||||
import {App, URLOpenListenerEvent} from '@capacitor/app';
|
import {App, URLOpenListenerEvent} from '@capacitor/app';
|
||||||
import {Platform, ToastController} from '@ionic/angular/standalone';
|
import {Platform, ToastController} from '@ionic/angular/standalone';
|
||||||
import {SettingsProvider} from './modules/settings/settings.provider';
|
import {SettingsProvider} from './modules/settings/settings.provider';
|
||||||
|
import {InAppReviewProvider} from './modules/settings/in-app-review/in-app-review.provider';
|
||||||
import {AuthHelperService} from './modules/auth/auth-helper.service';
|
import {AuthHelperService} from './modules/auth/auth-helper.service';
|
||||||
import {environment} from '../environments/environment';
|
import {environment} from '../environments/environment';
|
||||||
import {Capacitor} from '@capacitor/core';
|
import {Capacitor} from '@capacitor/core';
|
||||||
@@ -55,6 +56,7 @@ export class AppComponent implements AfterContentInit {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly platform: Platform,
|
private readonly platform: Platform,
|
||||||
private readonly settingsProvider: SettingsProvider,
|
private readonly settingsProvider: SettingsProvider,
|
||||||
|
private readonly inAppReviewProvider: InAppReviewProvider,
|
||||||
private readonly router: Router,
|
private readonly router: Router,
|
||||||
private readonly zone: NgZone,
|
private readonly zone: NgZone,
|
||||||
private readonly authHelper: AuthHelperService,
|
private readonly authHelper: AuthHelperService,
|
||||||
@@ -86,6 +88,8 @@ export class AppComponent implements AfterContentInit {
|
|||||||
async hideSplash() {
|
async hideSplash() {
|
||||||
if (Capacitor.isNativePlatform()) {
|
if (Capacitor.isNativePlatform()) {
|
||||||
void SplashScreen.hide();
|
void SplashScreen.hide();
|
||||||
|
await this.inAppReviewProvider.increaseSessionCount();
|
||||||
|
void this.inAppReviewProvider.startInAppReviewIfFeasible();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
<div #schedule class="schedule">
|
<div #schedule class="schedule">
|
||||||
<a [routerLink]="['/schedule/week-overview']">
|
<a [routerLink]="['/schedule/weekly-view']">
|
||||||
<ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon>
|
<ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon>
|
||||||
<ion-label [innerHTML]="'schedule.recurring' | translate"></ion-label>
|
<ion-label [innerHTML]="'schedule.recurring' | translate"></ion-label>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -127,6 +127,7 @@ export class AddEventActionChipComponent {
|
|||||||
.filter(it => it.selected)
|
.filter(it => it.selected)
|
||||||
.map(it => it.item),
|
.map(it => it.item),
|
||||||
},
|
},
|
||||||
|
mode: 'md', // TODO Remove if Issue 239 is solved.
|
||||||
});
|
});
|
||||||
|
|
||||||
await modal.present();
|
await modal.present();
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ export class ChipFilterComponent {
|
|||||||
/**
|
/**
|
||||||
* Emits when the chip has been activated/deactivated
|
* Emits when the chip has been activated/deactivated
|
||||||
*/
|
*/
|
||||||
@Output() toggle = new EventEmitter<unknown>();
|
@Output() toggled = new EventEmitter<unknown>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Value to emit when chip has been activated/deactivated
|
* Value to emit when chip has been activated/deactivated
|
||||||
@@ -47,6 +47,6 @@ export class ChipFilterComponent {
|
|||||||
* Signalize that the chip filter has been activated/deactivated
|
* Signalize that the chip filter has been activated/deactivated
|
||||||
*/
|
*/
|
||||||
emitToggle(value: unknown) {
|
emitToggle(value: unknown) {
|
||||||
this.toggle.emit(value);
|
this.toggled.emit(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,6 @@
|
|||||||
[size]="24"
|
[size]="24"
|
||||||
[fill]="(isFavorite$ | async) || false"
|
[fill]="(isFavorite$ | async) || false"
|
||||||
[class.selected]="isFavorite$ | async"
|
[class.selected]="isFavorite$ | async"
|
||||||
name="grade"
|
name="star"
|
||||||
></ion-icon>
|
></ion-icon>
|
||||||
</ion-button>
|
</ion-button>
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
slot="icon-only"
|
slot="icon-only"
|
||||||
[size]="32"
|
[size]="32"
|
||||||
color="medium"
|
color="medium"
|
||||||
name="grade"
|
name="star"
|
||||||
></ion-icon>
|
></ion-icon>
|
||||||
}
|
}
|
||||||
<label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
|
<label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
|
||||||
|
|||||||
@@ -15,7 +15,12 @@
|
|||||||
import {Component, DestroyRef, inject, Input, OnInit} from '@angular/core';
|
import {Component, DestroyRef, inject, Input, OnInit} from '@angular/core';
|
||||||
import {ActivatedRoute, Router} from '@angular/router';
|
import {ActivatedRoute, Router} from '@angular/router';
|
||||||
import {Keyboard} from '@capacitor/keyboard';
|
import {Keyboard} from '@capacitor/keyboard';
|
||||||
import {AlertController, AnimationBuilder, AnimationController} from '@ionic/angular/standalone';
|
import {
|
||||||
|
AlertController,
|
||||||
|
AnimationBuilder,
|
||||||
|
AnimationController,
|
||||||
|
ModalController,
|
||||||
|
} from '@ionic/angular/standalone';
|
||||||
import {Capacitor} from '@capacitor/core';
|
import {Capacitor} from '@capacitor/core';
|
||||||
import {
|
import {
|
||||||
SCFacet,
|
SCFacet,
|
||||||
@@ -36,6 +41,8 @@ import {PositionService} from '../../map/position.service';
|
|||||||
import {ConfigProvider} from '../../config/config.provider';
|
import {ConfigProvider} from '../../config/config.provider';
|
||||||
import {searchPageSwitchAnimation} from './search-page-switch-animation';
|
import {searchPageSwitchAnimation} from './search-page-switch-animation';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
|
import {ContextMenuModalComponent} from '../../menu/context/context-menu-modal.component';
|
||||||
|
import {enterAnimation, leaveAnimation} from '../../menu/context/context-menu-modal.animations';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SearchPageComponent queries things and shows list of things as search results and filter as context menu
|
* SearchPageComponent queries things and shows list of things as search results and filter as context menu
|
||||||
@@ -173,7 +180,8 @@ export class SearchPageComponent implements OnInit {
|
|||||||
private readonly route: ActivatedRoute,
|
private readonly route: ActivatedRoute,
|
||||||
protected positionService: PositionService,
|
protected positionService: PositionService,
|
||||||
private readonly configProvider: ConfigProvider,
|
private readonly configProvider: ConfigProvider,
|
||||||
animationController: AnimationController,
|
protected animationController: AnimationController,
|
||||||
|
protected modalController: ModalController,
|
||||||
) {
|
) {
|
||||||
this.routeAnimation = searchPageSwitchAnimation(animationController);
|
this.routeAnimation = searchPageSwitchAnimation(animationController);
|
||||||
}
|
}
|
||||||
@@ -368,4 +376,21 @@ export class SearchPageComponent implements OnInit {
|
|||||||
this.searchStringChanged(term);
|
this.searchStringChanged(term);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async openContextMenu(): Promise<void> {
|
||||||
|
const modal = await this.modalController.create({
|
||||||
|
component: ContextMenuModalComponent,
|
||||||
|
cssClass: 'context-menu-modal',
|
||||||
|
showBackdrop: true,
|
||||||
|
backdropDismiss: true,
|
||||||
|
mode: 'md', // TODO has to be fixed to md for now. ios mode is unresponsive. Remove if Issue 239 is solved
|
||||||
|
enterAnimation: (baseElement: HTMLElement) => enterAnimation(baseElement, this.animationController),
|
||||||
|
leaveAnimation: (baseElement: HTMLElement) => leaveAnimation(baseElement, this.animationController),
|
||||||
|
componentProps: {
|
||||||
|
contextMenuService: this.contextMenuService,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await modal.present();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,10 +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/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@if (showContextMenu) {
|
|
||||||
<stapps-context contentId="data-list"></stapps-context>
|
|
||||||
}
|
|
||||||
<ion-header>
|
<ion-header>
|
||||||
@if (showDrawer && showTopToolbar) {
|
@if (showDrawer && showTopToolbar) {
|
||||||
<ion-toolbar color="primary" mode="ios">
|
<ion-toolbar color="primary" mode="ios">
|
||||||
@@ -41,7 +37,8 @@
|
|||||||
>
|
>
|
||||||
</ion-searchbar>
|
</ion-searchbar>
|
||||||
@if (showContextMenu) {
|
@if (showContextMenu) {
|
||||||
<ion-menu-button menu="context" auto-hide="false" slot="end">
|
<!-- TODO has to be fixed to md for now. ios mode displays broken/missing icon -->
|
||||||
|
<ion-menu-button mode="md" menu="context" auto-hide="false" slot="end" (click)="openContextMenu()">
|
||||||
<ion-icon name="tune"></ion-icon>
|
<ion-icon name="tune"></ion-icon>
|
||||||
</ion-menu-button>
|
</ion-menu-button>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, OnInit} from '@angular/core';
|
import {Component, OnInit} from '@angular/core';
|
||||||
import {AlertController, AnimationController} from '@ionic/angular/standalone';
|
import {AlertController, AnimationController, ModalController} from '@ionic/angular/standalone';
|
||||||
import {ActivatedRoute, Router} from '@angular/router';
|
import {ActivatedRoute, Router} from '@angular/router';
|
||||||
import {NGXLogger} from 'ngx-logger';
|
import {NGXLogger} from 'ngx-logger';
|
||||||
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
|
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
|
||||||
@@ -55,6 +55,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
|||||||
private favoritesService: FavoritesService,
|
private favoritesService: FavoritesService,
|
||||||
configProvider: ConfigProvider,
|
configProvider: ConfigProvider,
|
||||||
animationController: AnimationController,
|
animationController: AnimationController,
|
||||||
|
modalController: ModalController,
|
||||||
) {
|
) {
|
||||||
super(
|
super(
|
||||||
alertController,
|
alertController,
|
||||||
@@ -68,6 +69,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
|||||||
positionService,
|
positionService,
|
||||||
configProvider,
|
configProvider,
|
||||||
animationController,
|
animationController,
|
||||||
|
modalController,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2025 StApps
|
||||||
|
* This program is free software: you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the Free
|
||||||
|
* Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with
|
||||||
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
import {Animation, AnimationController} from '@ionic/angular';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Defines the animation for showing a modal as a right-hand sidebar.
|
||||||
|
* @param baseElement The root element of the modal (including Shadow DOM).
|
||||||
|
* @param animationCtrl The Ionic AnimationController.
|
||||||
|
* @returns The configured Ionic animation.
|
||||||
|
*/
|
||||||
|
export const enterAnimation = (baseElement: HTMLElement, animationCtrl: AnimationController): Animation => {
|
||||||
|
const root = baseElement.shadowRoot;
|
||||||
|
|
||||||
|
const backdrop = root?.querySelector('ion-backdrop');
|
||||||
|
const wrapper = root?.querySelector('.modal-wrapper');
|
||||||
|
|
||||||
|
// The wrapper needs to be positioned on the right side
|
||||||
|
if (wrapper instanceof HTMLElement) {
|
||||||
|
Object.assign(wrapper.style, {
|
||||||
|
position: 'absolute',
|
||||||
|
top: '0',
|
||||||
|
right: '0',
|
||||||
|
height: '100%',
|
||||||
|
width: '304px',
|
||||||
|
maxWidth: '75%',
|
||||||
|
opacity: '1',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const backdropAnimation = animationCtrl
|
||||||
|
.create()
|
||||||
|
.addElement(backdrop!)
|
||||||
|
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
|
||||||
|
|
||||||
|
const wrapperAnimation = animationCtrl
|
||||||
|
.create()
|
||||||
|
.addElement(wrapper!)
|
||||||
|
.fromTo('transform', 'translateX(100%)', 'translateX(0)');
|
||||||
|
|
||||||
|
return animationCtrl
|
||||||
|
.create()
|
||||||
|
.addElement(baseElement)
|
||||||
|
.duration(400)
|
||||||
|
.easing('ease-out')
|
||||||
|
.addAnimation([backdropAnimation, wrapperAnimation]);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Defines the animation for hiding a modal by sliding it out to the right.
|
||||||
|
* @param baseElement The root element of the modal.
|
||||||
|
* @param animationCtrl The Ionic AnimationController.
|
||||||
|
* @returns The configured Ionic animation (reverse of enterAnimation).
|
||||||
|
*/
|
||||||
|
export const leaveAnimation = (baseElement: HTMLElement, animationCtrl: AnimationController): Animation => {
|
||||||
|
return enterAnimation(baseElement, animationCtrl).direction('reverse');
|
||||||
|
};
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2025 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/>.
|
||||||
|
*/
|
||||||
|
/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
|
||||||
|
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
||||||
|
import {FormsModule} from '@angular/forms';
|
||||||
|
import {CommonModule} from '@angular/common';
|
||||||
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
|
import {IonicModule} from '@ionic/angular';
|
||||||
|
import {SCThingType} from '@openstapps/core';
|
||||||
|
import {ContextMenuModalComponent} from './context-menu-modal.component';
|
||||||
|
import {ContextMenuService} from './context-menu.service';
|
||||||
|
import {FilterContext, SortContext} from './context-type';
|
||||||
|
import {provideIonicAngular, ModalController} from '@ionic/angular/standalone';
|
||||||
|
import {BehaviorSubject, of} from 'rxjs';
|
||||||
|
import {addIcons} from 'ionicons';
|
||||||
|
import {swapVertical, trash, menu} from 'ionicons/icons';
|
||||||
|
|
||||||
|
describe('ContextMenuModalComponent', () => {
|
||||||
|
let fixture: ComponentFixture<ContextMenuModalComponent>;
|
||||||
|
let component: ContextMenuModalComponent;
|
||||||
|
let modalControllerSpy: jasmine.SpyObj<ModalController>;
|
||||||
|
let contextMenuServiceMock: Partial<ContextMenuService>;
|
||||||
|
|
||||||
|
// Register used icons (suppress warnings)
|
||||||
|
addIcons({
|
||||||
|
delete: trash,
|
||||||
|
sort: swapVertical,
|
||||||
|
menu: menu,
|
||||||
|
});
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
modalControllerSpy = jasmine.createSpyObj<ModalController>('ModalController', ['dismiss']);
|
||||||
|
|
||||||
|
contextMenuServiceMock = {
|
||||||
|
filterOptions: new BehaviorSubject<FilterContext | undefined>(getFilterContextType()),
|
||||||
|
sortOptions: new BehaviorSubject<SortContext | undefined>(getSortContextType()),
|
||||||
|
filterContextChanged$: of(getFilterContextType()),
|
||||||
|
sortContextChanged$: of(getSortContextType()),
|
||||||
|
contextFilterChanged: jasmine.createSpy(),
|
||||||
|
contextSortChanged: jasmine.createSpy(),
|
||||||
|
};
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [ContextMenuModalComponent],
|
||||||
|
imports: [CommonModule, FormsModule, TranslateModule.forRoot(), IonicModule.forRoot()],
|
||||||
|
providers: [
|
||||||
|
provideIonicAngular(),
|
||||||
|
{
|
||||||
|
provide: ModalController,
|
||||||
|
useValue: modalControllerSpy,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: ContextMenuService,
|
||||||
|
useValue: contextMenuServiceMock,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(ContextMenuModalComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
|
||||||
|
component.contextMenuService = contextMenuServiceMock as ContextMenuService;
|
||||||
|
component.translator = {
|
||||||
|
translatedPropertyValue: () => 'translated',
|
||||||
|
} as any;
|
||||||
|
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create the component', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should load initial sort and filter context', () => {
|
||||||
|
expect(component.sortOption?.value).toBe('relevance');
|
||||||
|
expect(component.filterOption?.options?.length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should display sort items', () => {
|
||||||
|
const sortItems = fixture.nativeElement.querySelectorAll('.sort-item');
|
||||||
|
expect(sortItems.length).toBe(component.sortOption.values.length);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update and reverse sort value on click', () => {
|
||||||
|
const value = component.sortOption.values[1]; // "name", reversible
|
||||||
|
component.sortChanged(component.sortOption, value);
|
||||||
|
expect(component.sortOption.value).toBe('name');
|
||||||
|
expect(component.sortOption.reversed).toBeFalse();
|
||||||
|
|
||||||
|
component.sortChanged(component.sortOption, value);
|
||||||
|
expect(component.sortOption.reversed).toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should call contextFilterChanged when filter is reset', () => {
|
||||||
|
component.filterOption.options[0].buckets[0].checked = true;
|
||||||
|
component.resetFilter(component.filterOption);
|
||||||
|
const allUnchecked = component.filterOption.options.every(opt =>
|
||||||
|
opt.buckets.every(bucket => !bucket.checked),
|
||||||
|
);
|
||||||
|
expect(allUnchecked).toBeTrue();
|
||||||
|
expect(contextMenuServiceMock.contextFilterChanged).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should dismiss the modal', () => {
|
||||||
|
component.dismiss();
|
||||||
|
expect(modalControllerSpy.dismiss).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
function getSortContextType(): SortContext {
|
||||||
|
return {
|
||||||
|
name: 'sort',
|
||||||
|
reversed: false,
|
||||||
|
value: 'relevance',
|
||||||
|
values: [
|
||||||
|
{value: 'relevance', reversible: false},
|
||||||
|
{value: 'name', reversible: true},
|
||||||
|
{value: 'date', reversible: true},
|
||||||
|
{value: 'type', reversible: true},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
function getFilterContextType(): FilterContext {
|
||||||
|
return {
|
||||||
|
name: 'filter',
|
||||||
|
compact: false,
|
||||||
|
options: facetsMock
|
||||||
|
.filter(facet => facet.buckets.length > 0)
|
||||||
|
.map((facet, i) => ({
|
||||||
|
buckets: facet.buckets.map(bucket => ({
|
||||||
|
count: bucket.count,
|
||||||
|
key: bucket.key,
|
||||||
|
checked: false,
|
||||||
|
})),
|
||||||
|
compact: false,
|
||||||
|
field: facet.field,
|
||||||
|
onlyOnType: facet.onlyOnType,
|
||||||
|
info: {
|
||||||
|
onlyOnType: facet.onlyOnType,
|
||||||
|
field: facet.field,
|
||||||
|
sortOrder: i,
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const facetsMock = [
|
||||||
|
{
|
||||||
|
buckets: [
|
||||||
|
{count: 10, key: 'lecture'},
|
||||||
|
{count: 5, key: 'seminar'},
|
||||||
|
],
|
||||||
|
field: 'type',
|
||||||
|
onlyOnType: SCThingType.AcademicEvent,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
buckets: [{count: 7, key: 'research'}],
|
||||||
|
field: 'categories',
|
||||||
|
onlyOnType: SCThingType.AcademicEvent,
|
||||||
|
},
|
||||||
|
];
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2023 StApps
|
* Copyright (C) 2025 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,76 +12,40 @@
|
|||||||
* 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 {LangChangeEvent, TranslateService} from '@ngx-translate/core';
|
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
|
||||||
import {SCLanguage, SCThingTranslator, SCThingType, SCTranslations} from '@openstapps/core';
|
import {SCLanguage, SCThingTranslator, SCThingType, SCTranslations} from '@openstapps/core';
|
||||||
import {ContextMenuService} from './context-menu.service';
|
import {ContextMenuService} from './context-menu.service';
|
||||||
import {FilterContext, FilterFacet, SortContext, SortContextOption} from './context-type.js';
|
import {FilterContext, FilterFacet, SortContext, SortContextOption} from './context-type.js';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
|
import {ModalController} from '@ionic/angular/standalone';
|
||||||
|
import {Component, Input, OnInit, OnDestroy} from '@angular/core';
|
||||||
|
import {Subject, takeUntil} from 'rxjs';
|
||||||
|
|
||||||
/**
|
|
||||||
* The context menu
|
|
||||||
*
|
|
||||||
* It can be configured with sorting types and filtering on facets
|
|
||||||
*
|
|
||||||
* Example:<br>
|
|
||||||
* `<stapps-context (optionChange)="onOptionChange($event)" (settingChange)="onSettingChange($event)"
|
|
||||||
* [sortOption]="SortContext" [filterOption]="FilterContext"></stapps-context>`
|
|
||||||
*/
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-context',
|
selector: 'stapps-context-menu-modal',
|
||||||
templateUrl: 'context-menu.html',
|
templateUrl: './context-menu-modal.html',
|
||||||
})
|
})
|
||||||
export class ContextMenuComponent {
|
export class ContextMenuModalComponent implements OnInit, OnDestroy {
|
||||||
/**
|
@Input() contextMenuService: ContextMenuService;
|
||||||
* Id of the content the menu is used for
|
|
||||||
*/
|
|
||||||
@Input()
|
|
||||||
contentId: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Amount of filter options shown on compact view
|
|
||||||
*/
|
|
||||||
compactFilterOptionCount = 5;
|
compactFilterOptionCount = 5;
|
||||||
|
|
||||||
/**
|
|
||||||
* Container for the filter context
|
|
||||||
*/
|
|
||||||
filterOption: FilterContext;
|
filterOption: FilterContext;
|
||||||
|
|
||||||
/**
|
|
||||||
* Picks facets based on the compact filter option and sorts
|
|
||||||
* them based on
|
|
||||||
*
|
|
||||||
* No specific type => Type name alphabetically => Bucket count
|
|
||||||
*/
|
|
||||||
get facets(): FilterFacet[] {
|
|
||||||
return this.filterOption.options.filter(it => it.buckets.length > 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Possible languages to be used for translation
|
|
||||||
*/
|
|
||||||
language: keyof SCTranslations<SCLanguage>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mapping of SCThingType
|
|
||||||
*/
|
|
||||||
scThingType = SCThingType;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Container for the sort context
|
|
||||||
*/
|
|
||||||
sortOption: SortContext;
|
sortOption: SortContext;
|
||||||
|
|
||||||
/**
|
language: keyof SCTranslations<SCLanguage>;
|
||||||
* Core translator
|
|
||||||
*/
|
|
||||||
translator: SCThingTranslator;
|
translator: SCThingTranslator;
|
||||||
|
|
||||||
|
scThingType = SCThingType;
|
||||||
|
|
||||||
|
// Using a subject to manage subscriptions for clean-up
|
||||||
|
private readonly destroy$ = new Subject<void>();
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private translateService: TranslateService,
|
private translateService: TranslateService,
|
||||||
private readonly contextMenuService: ContextMenuService,
|
private readonly modalController: ModalController,
|
||||||
) {
|
) {
|
||||||
this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
|
this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
|
||||||
this.translator = new SCThingTranslator(this.language);
|
this.translator = new SCThingTranslator(this.language);
|
||||||
@@ -90,43 +54,56 @@ export class ContextMenuComponent {
|
|||||||
this.language = event.lang as keyof SCTranslations<SCLanguage>;
|
this.language = event.lang as keyof SCTranslations<SCLanguage>;
|
||||||
this.translator = new SCThingTranslator(this.language);
|
this.translator = new SCThingTranslator(this.language);
|
||||||
});
|
});
|
||||||
this.contextMenuService.filterContextChanged$.pipe(takeUntilDestroyed()).subscribe(filterContext => {
|
}
|
||||||
this.filterOption = filterContext;
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
const initialFilter = this.contextMenuService.filterOptions.getValue();
|
||||||
|
if (initialFilter) {
|
||||||
|
this.filterOption = initialFilter;
|
||||||
|
}
|
||||||
|
|
||||||
|
const initialSort = this.contextMenuService.sortOptions.getValue();
|
||||||
|
if (initialSort) {
|
||||||
|
this.sortOption = initialSort;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Move the subscription logic here. It's now safe to access this.contextMenuService.
|
||||||
|
this.contextMenuService.filterContextChanged$.pipe(takeUntil(this.destroy$)).subscribe(fc => {
|
||||||
|
if (fc) {
|
||||||
|
this.filterOption = fc;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
this.contextMenuService.sortOptions.pipe(takeUntilDestroyed()).subscribe(sortContext => {
|
|
||||||
this.sortOption = sortContext;
|
this.contextMenuService.sortContextChanged$.pipe(takeUntil(this.destroy$)).subscribe(sc => {
|
||||||
|
if (sc) {
|
||||||
|
this.sortOption = sc;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
ngOnDestroy(): void {
|
||||||
* Sets selected filter options and updates listener
|
this.destroy$.next();
|
||||||
*/
|
this.destroy$.complete();
|
||||||
|
}
|
||||||
|
|
||||||
|
get facets(): FilterFacet[] {
|
||||||
|
return this.filterOption?.options?.filter(it => it.buckets.length > 0) || [];
|
||||||
|
}
|
||||||
|
|
||||||
|
resetFilter(option: FilterContext) {
|
||||||
|
for (const facet of option.options) {
|
||||||
|
for (const bucket of facet.buckets) {
|
||||||
|
bucket.checked = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.contextMenuService.contextFilterChanged(this.filterOption);
|
||||||
|
}
|
||||||
|
|
||||||
filterChanged = () => {
|
filterChanged = () => {
|
||||||
this.contextMenuService.contextFilterChanged(this.filterOption);
|
this.contextMenuService.contextFilterChanged(this.filterOption);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
sortChanged(option: SortContext, value: SortContextOption) {
|
||||||
* Returns translated property value
|
|
||||||
*/
|
|
||||||
getTranslatedPropertyValue(onlyForType: SCThingType, field: string, key?: string): string | undefined {
|
|
||||||
return this.translator.translatedPropertyValue(onlyForType, field, key);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resets filter options
|
|
||||||
*/
|
|
||||||
resetFilter = (option: FilterContext) => {
|
|
||||||
for (const filterFacet of option.options)
|
|
||||||
for (const filterBucket of filterFacet.buckets) {
|
|
||||||
filterBucket.checked = false;
|
|
||||||
}
|
|
||||||
this.contextMenuService.contextFilterChanged(this.filterOption);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates selected sort option and updates listener
|
|
||||||
*/
|
|
||||||
sortChanged = (option: SortContext, value: SortContextOption) => {
|
|
||||||
if (option.value === value.value) {
|
if (option.value === value.value) {
|
||||||
if (value.reversible) {
|
if (value.reversible) {
|
||||||
option.reversed = !option.reversed;
|
option.reversed = !option.reversed;
|
||||||
@@ -138,5 +115,13 @@ export class ContextMenuComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.contextMenuService.contextSortChanged(option);
|
this.contextMenuService.contextSortChanged(option);
|
||||||
};
|
}
|
||||||
|
|
||||||
|
getTranslatedPropertyValue(onlyForType: SCThingType, field: string, key?: string): string | undefined {
|
||||||
|
return this.translator.translatedPropertyValue(onlyForType, field, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
dismiss() {
|
||||||
|
this.modalController.dismiss();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
<!--
|
||||||
|
~ Copyright (C) 2025 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-label class="ion-padding-horizontal">
|
||||||
|
<h1 class="ion-padding-horizontal">{{ 'menu.context.title' | translate | titlecase }}</h1>
|
||||||
|
</ion-label>
|
||||||
|
</ion-toolbar>
|
||||||
|
</ion-header>
|
||||||
|
|
||||||
|
<ion-content>
|
||||||
|
<!-- Sort Context -->
|
||||||
|
<ion-list *ngIf="sortOption">
|
||||||
|
<ion-radio-group class="context-sort" [value]="0">
|
||||||
|
<ion-list-header>
|
||||||
|
<ion-icon name="sort"></ion-icon>
|
||||||
|
<ion-title>{{ 'menu.context.sort.title' | translate | titlecase }}</ion-title>
|
||||||
|
</ion-list-header>
|
||||||
|
<ion-item
|
||||||
|
class="sort-item"
|
||||||
|
*ngFor="let value of sortOption.values; let i = index"
|
||||||
|
(click)="sortChanged(sortOption, value)"
|
||||||
|
>
|
||||||
|
<ion-radio [value]="i">
|
||||||
|
{{ 'menu.context.sort.' + value.value | translate | titlecase }}
|
||||||
|
<span *ngIf="sortOption.value === value.value && value.reversible">
|
||||||
|
<ion-icon *ngIf="sortOption.reversed" name="arrow_downward"></ion-icon>
|
||||||
|
<ion-icon *ngIf="!sortOption.reversed" name="arrow_upward"></ion-icon>
|
||||||
|
</span>
|
||||||
|
</ion-radio>
|
||||||
|
</ion-item>
|
||||||
|
</ion-radio-group>
|
||||||
|
</ion-list>
|
||||||
|
|
||||||
|
<!-- Filter Context -->
|
||||||
|
<form class="context-filter" *ngIf="filterOption">
|
||||||
|
<ion-list-header>
|
||||||
|
<ion-icon name="filter_list"></ion-icon>
|
||||||
|
<ion-title>{{ 'menu.context.filter.title' | translate | titlecase }}</ion-title>
|
||||||
|
<ion-button class="resetFilterButton" fill="clear" color="dark" (click)="resetFilter(filterOption)">
|
||||||
|
<ion-icon name="delete"></ion-icon>
|
||||||
|
</ion-button>
|
||||||
|
</ion-list-header>
|
||||||
|
|
||||||
|
<ion-list class="filter-group" *ngFor="let facet of facets">
|
||||||
|
<ion-list-header class="h3">
|
||||||
|
<ion-label>
|
||||||
|
<span *ngIf="facet.info.onlyOnType"
|
||||||
|
><b>{{ facet.info.onlyOnType | titlecase }}</b> /
|
||||||
|
</span>
|
||||||
|
{{ facet.info.field | titlecase }}
|
||||||
|
</ion-label>
|
||||||
|
</ion-list-header>
|
||||||
|
|
||||||
|
<ng-container
|
||||||
|
*ngFor="
|
||||||
|
let bucket of !facet.compact ? facet.buckets.slice(0, compactFilterOptionCount) : facet.buckets
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<ion-item>
|
||||||
|
<ion-checkbox
|
||||||
|
[(ngModel)]="bucket.checked"
|
||||||
|
(ngModelChange)="filterChanged()"
|
||||||
|
[name]="facet.onlyOnType + '-' + facet.field + '-' + bucket.key"
|
||||||
|
[value]="{
|
||||||
|
field: facet.field,
|
||||||
|
value: bucket.key,
|
||||||
|
onlyOnType: facet.onlyOnType
|
||||||
|
}"
|
||||||
|
class="filter-item-label"
|
||||||
|
>
|
||||||
|
({{ bucket.count }})
|
||||||
|
{{
|
||||||
|
facet.field === 'type'
|
||||||
|
? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase)
|
||||||
|
: (facet.onlyOnType && getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key)
|
||||||
|
| titlecase)
|
||||||
|
}}
|
||||||
|
</ion-checkbox>
|
||||||
|
</ion-item>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ion-button
|
||||||
|
*ngIf="!facet.compact && facet.buckets.length > compactFilterOptionCount"
|
||||||
|
fill="clear"
|
||||||
|
(click)="facet.compact = true"
|
||||||
|
>
|
||||||
|
{{ 'menu.context.filter.showAll' | translate }}
|
||||||
|
</ion-button>
|
||||||
|
</ion-list>
|
||||||
|
</form>
|
||||||
|
</ion-content>
|
||||||
@@ -1,303 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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/>.
|
|
||||||
*/
|
|
||||||
/* eslint-disable @typescript-eslint/no-non-null-assertion, @typescript-eslint/ban-ts-comment */
|
|
||||||
import {APP_BASE_HREF, CommonModule, Location, LocationStrategy, PathLocationStrategy} from '@angular/common';
|
|
||||||
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
|
||||||
import {FormsModule} from '@angular/forms';
|
|
||||||
import {ChildrenOutletContexts, RouterModule, UrlSerializer} from '@angular/router';
|
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
|
||||||
import {SCFacet, SCThingType} from '@openstapps/core';
|
|
||||||
import {ContextMenuComponent} from './context-menu.component';
|
|
||||||
import {SettingsModule} from '../../settings/settings.module';
|
|
||||||
import {ContextMenuService} from './context-menu.service';
|
|
||||||
import {FilterContext, SortContext} from './context-type';
|
|
||||||
import {Component} from '@angular/core';
|
|
||||||
import {By} from '@angular/platform-browser';
|
|
||||||
import {provideIonicAngular} from '@ionic/angular/standalone';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
template: `<ion-content id="foo"></ion-content><stapps-context contentId="foo"></stapps-context> `,
|
|
||||||
})
|
|
||||||
class ContextMenuContainerComponent {}
|
|
||||||
|
|
||||||
describe('ContextMenuComponent', async () => {
|
|
||||||
let fixture: ComponentFixture<ContextMenuContainerComponent>;
|
|
||||||
let instance: ContextMenuComponent;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
declarations: [ContextMenuComponent, ContextMenuContainerComponent],
|
|
||||||
providers: [
|
|
||||||
provideIonicAngular(),
|
|
||||||
ChildrenOutletContexts,
|
|
||||||
Location,
|
|
||||||
UrlSerializer,
|
|
||||||
ContextMenuService,
|
|
||||||
{provide: LocationStrategy, useClass: PathLocationStrategy},
|
|
||||||
{provide: APP_BASE_HREF, useValue: '/'},
|
|
||||||
],
|
|
||||||
imports: [
|
|
||||||
FormsModule,
|
|
||||||
TranslateModule.forRoot(),
|
|
||||||
CommonModule,
|
|
||||||
SettingsModule,
|
|
||||||
RouterModule.forRoot([]),
|
|
||||||
],
|
|
||||||
}).compileComponents();
|
|
||||||
|
|
||||||
fixture = TestBed.createComponent(ContextMenuContainerComponent);
|
|
||||||
instance = fixture.debugElement.query(By.directive(ContextMenuComponent)).componentInstance;
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should show items in sort context', () => {
|
|
||||||
instance.sortOption = getSortContextType();
|
|
||||||
fixture.detectChanges();
|
|
||||||
const sort: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-sort');
|
|
||||||
expect(sort!.querySelector('ion-radio')?.textContent).toContain('relevance');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should show items in filter context', () => {
|
|
||||||
instance.filterOption = getFilterContextType();
|
|
||||||
fixture.detectChanges();
|
|
||||||
const filter: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-filter');
|
|
||||||
const filterItem = filter.querySelector('.filter-group');
|
|
||||||
expect(filterItem!.querySelector('ion-list-header')!.textContent).toContain('Type');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should set sort context value and reverse on click', () => {
|
|
||||||
instance.sortOption = getSortContextType();
|
|
||||||
fixture.detectChanges();
|
|
||||||
const sort: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-sort');
|
|
||||||
// @ts-expect-error not relevant for this case
|
|
||||||
const sortItem: HTMLElement = sort.querySelectorAll('.sort-item')[1];
|
|
||||||
sortItem!.click();
|
|
||||||
expect(instance.sortOption.value).toEqual('name');
|
|
||||||
expect(instance.sortOption.reversed).toBe(false);
|
|
||||||
|
|
||||||
// click again for reverse
|
|
||||||
sortItem!.click();
|
|
||||||
expect(instance.sortOption.reversed).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should show all filterable facets', () => {
|
|
||||||
// get set facets with non empty buckets
|
|
||||||
const facets: SCFacet[] = getFilterContextType().options;
|
|
||||||
|
|
||||||
instance.filterOption = getFilterContextType();
|
|
||||||
fixture.detectChanges();
|
|
||||||
// get filter context div
|
|
||||||
const filter: HTMLElement = fixture.debugElement.nativeElement.querySelector('.context-filter');
|
|
||||||
// get all filter groups that represent a facet
|
|
||||||
const filterGroups = filter.querySelectorAll('.filter-group');
|
|
||||||
|
|
||||||
expect(filterGroups.length).toEqual(facets.length);
|
|
||||||
|
|
||||||
for (const facet of facets) {
|
|
||||||
let filterGroup;
|
|
||||||
|
|
||||||
// get filter option for facets field
|
|
||||||
// eslint-disable-next-line unicorn/no-array-for-each
|
|
||||||
filterGroups.forEach(element => {
|
|
||||||
if (
|
|
||||||
element
|
|
||||||
.querySelector('ion-list-header')!
|
|
||||||
.textContent!.toString()
|
|
||||||
.toLowerCase()
|
|
||||||
.includes(facet.field)
|
|
||||||
) {
|
|
||||||
filterGroup = element;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(filterGroup).toBeDefined();
|
|
||||||
|
|
||||||
const filterItems = filterGroup!.querySelectorAll('.filter-item-label');
|
|
||||||
|
|
||||||
if (filterItems.length !== facet.buckets.length) {
|
|
||||||
console.log(JSON.stringify(facet));
|
|
||||||
}
|
|
||||||
expect(filterItems.length).toEqual(facet.buckets.length);
|
|
||||||
|
|
||||||
// check all buckets are shown
|
|
||||||
for (const bucket of facet.buckets) {
|
|
||||||
let filterItem;
|
|
||||||
|
|
||||||
for (let i = 0; i < filterItems.length; i++) {
|
|
||||||
if (
|
|
||||||
filterItems.item(i).textContent!.toString().toLowerCase().indexOf(bucket.key.toLowerCase()) > 0
|
|
||||||
) {
|
|
||||||
filterItem = filterItems.item(i);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
expect(filterItem).toBeDefined();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should reset filter', () => {
|
|
||||||
instance.filterOption = getFilterContextType();
|
|
||||||
instance.filterOption.options = [
|
|
||||||
{
|
|
||||||
field: 'type',
|
|
||||||
buckets: [{count: 10, key: 'date series', checked: true}],
|
|
||||||
info: {
|
|
||||||
onlyOnType: SCThingType.AcademicEvent,
|
|
||||||
field: 'date series',
|
|
||||||
sortOrder: 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
fixture.detectChanges();
|
|
||||||
|
|
||||||
// click reset button
|
|
||||||
const resetButton: HTMLElement = fixture.debugElement.nativeElement.querySelector('.resetFilterButton');
|
|
||||||
resetButton.click();
|
|
||||||
|
|
||||||
expect(instance.filterOption.options[0].buckets[0].checked).toEqual(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
function getSortContextType(): SortContext {
|
|
||||||
return {
|
|
||||||
name: 'sort',
|
|
||||||
reversed: false,
|
|
||||||
value: 'relevance',
|
|
||||||
values: [
|
|
||||||
{
|
|
||||||
reversible: false,
|
|
||||||
value: 'relevance',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
reversible: true,
|
|
||||||
value: 'name',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
reversible: true,
|
|
||||||
value: 'date',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
reversible: true,
|
|
||||||
value: 'type',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
function getFilterContextType(): FilterContext {
|
|
||||||
return {
|
|
||||||
name: 'filter',
|
|
||||||
compact: false,
|
|
||||||
options: facetsMock
|
|
||||||
.filter(facet => facet.buckets.length > 0)
|
|
||||||
.map((facet, i) => {
|
|
||||||
return {
|
|
||||||
buckets: facet.buckets.map(bucket => {
|
|
||||||
return {
|
|
||||||
count: bucket.count,
|
|
||||||
key: bucket.key,
|
|
||||||
checked: false,
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
compact: false,
|
|
||||||
field: facet.field,
|
|
||||||
onlyOnType: facet.onlyOnType,
|
|
||||||
info: {
|
|
||||||
onlyOnType: facet.onlyOnType,
|
|
||||||
field: facet.field,
|
|
||||||
sortOrder: i,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const facetsMock: SCFacet[] = [
|
|
||||||
{
|
|
||||||
buckets: [
|
|
||||||
{
|
|
||||||
count: 60,
|
|
||||||
key: 'academic event',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
count: 160,
|
|
||||||
key: 'message',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
count: 151,
|
|
||||||
key: 'date series',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
count: 106,
|
|
||||||
key: 'dish',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
count: 20,
|
|
||||||
key: 'building',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
field: 'type',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
buckets: [
|
|
||||||
{
|
|
||||||
count: 12,
|
|
||||||
key: 'Max Mustermann',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
count: 2,
|
|
||||||
key: 'Foo Bar',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
field: 'performers',
|
|
||||||
onlyOnType: SCThingType.AcademicEvent,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
buckets: [
|
|
||||||
{
|
|
||||||
count: 5,
|
|
||||||
key: 'colloquium',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
count: 15,
|
|
||||||
key: 'course',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
field: 'categories',
|
|
||||||
onlyOnType: SCThingType.AcademicEvent,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
buckets: [
|
|
||||||
{
|
|
||||||
count: 5,
|
|
||||||
key: 'employees',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
count: 15,
|
|
||||||
key: 'students',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
field: 'audiences',
|
|
||||||
onlyOnType: SCThingType.Message,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
<!--
|
|
||||||
~ 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-menu type="overlay" menuId="context" contentId="{{ contentId }}" maxEdgeStart="0" side="end">
|
|
||||||
<ion-toolbar color="primary" mode="ios">
|
|
||||||
<ion-label class="ion-padding-horizontal">
|
|
||||||
<h1 class="ion-padding-horizontal">{{ 'menu.context.title' | translate | titlecase }}</h1>
|
|
||||||
</ion-label>
|
|
||||||
</ion-toolbar>
|
|
||||||
<ion-content>
|
|
||||||
<!-- Sort Context -->
|
|
||||||
<ion-list>
|
|
||||||
@if (sortOption) {
|
|
||||||
<ion-radio-group class="context-sort" [value]="0">
|
|
||||||
<ion-list-header>
|
|
||||||
<ion-icon name="sort"></ion-icon>
|
|
||||||
<ion-title>{{ 'menu.context.sort.title' | translate | titlecase }}</ion-title>
|
|
||||||
</ion-list-header>
|
|
||||||
@for (value of sortOption.values; track value; let i = $index) {
|
|
||||||
<ion-item class="sort-item" (click)="sortChanged(sortOption, sortOption.values[i])">
|
|
||||||
<ion-radio [value]="i">
|
|
||||||
{{ 'menu.context.sort.' + value.value | translate | titlecase }}
|
|
||||||
@if (sortOption.value === value.value && value.reversible) {
|
|
||||||
<span>
|
|
||||||
@if (sortOption.reversed) {
|
|
||||||
<ion-icon name="arrow_downward"></ion-icon>
|
|
||||||
}
|
|
||||||
@if (!sortOption.reversed) {
|
|
||||||
<ion-icon name="arrow_upward"></ion-icon>
|
|
||||||
}
|
|
||||||
</span>
|
|
||||||
}
|
|
||||||
</ion-radio>
|
|
||||||
</ion-item>
|
|
||||||
}
|
|
||||||
</ion-radio-group>
|
|
||||||
}
|
|
||||||
</ion-list>
|
|
||||||
<!-- Filter Context -->
|
|
||||||
@if (filterOption) {
|
|
||||||
<form class="context-filter">
|
|
||||||
<ion-list-header>
|
|
||||||
<ion-icon name="filter_list"></ion-icon>
|
|
||||||
<ion-title>{{ 'menu.context.filter.title' | translate | titlecase }}</ion-title>
|
|
||||||
<ion-button class="resetFilterButton" fill="clear" color="dark" (click)="resetFilter(filterOption)">
|
|
||||||
<ion-icon name="delete"></ion-icon>
|
|
||||||
</ion-button>
|
|
||||||
</ion-list-header>
|
|
||||||
@for (facet of facets; track facet) {
|
|
||||||
<ion-list class="filter-group">
|
|
||||||
<div>
|
|
||||||
<ion-list-header class="h3">
|
|
||||||
<ion-label>
|
|
||||||
@if (facet.info.onlyOnType) {
|
|
||||||
<span
|
|
||||||
><b>{{ facet.info.onlyOnType | titlecase }}</b> /
|
|
||||||
</span>
|
|
||||||
}
|
|
||||||
{{ facet.info.field | titlecase }}
|
|
||||||
</ion-label>
|
|
||||||
</ion-list-header>
|
|
||||||
<div>
|
|
||||||
@for (
|
|
||||||
bucket of !facet.compact ? facet.buckets.slice(0, compactFilterOptionCount) : facet.buckets;
|
|
||||||
track bucket
|
|
||||||
) {
|
|
||||||
<ion-item>
|
|
||||||
<ion-checkbox
|
|
||||||
[(ngModel)]="bucket.checked"
|
|
||||||
(ngModelChange)="filterChanged()"
|
|
||||||
[name]="facet.onlyOnType + '-' + facet.field + '-' + bucket.key"
|
|
||||||
[value]="{
|
|
||||||
field: facet.field,
|
|
||||||
value: bucket.key,
|
|
||||||
onlyOnType: facet.onlyOnType
|
|
||||||
}"
|
|
||||||
class="filter-item-label"
|
|
||||||
>
|
|
||||||
({{ bucket.count }})
|
|
||||||
{{
|
|
||||||
facet.field === 'type'
|
|
||||||
? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase)
|
|
||||||
: (facet.onlyOnType &&
|
|
||||||
getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key)
|
|
||||||
| titlecase)
|
|
||||||
}}
|
|
||||||
</ion-checkbox>
|
|
||||||
</ion-item>
|
|
||||||
}
|
|
||||||
@if (!facet.compact && facet.buckets.length > compactFilterOptionCount) {
|
|
||||||
<ion-button fill="clear" (click)="facet.compact = true">
|
|
||||||
{{ 'menu.context.filter.showAll' | translate }}
|
|
||||||
</ion-button>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</ion-list>
|
|
||||||
}
|
|
||||||
</form>
|
|
||||||
}
|
|
||||||
</ion-content>
|
|
||||||
</ion-menu>
|
|
||||||
@@ -12,14 +12,13 @@
|
|||||||
* 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 {TestBed} from '@angular/core/testing';
|
import {TestBed} from '@angular/core/testing';
|
||||||
|
|
||||||
import {ContextMenuService} from './context-menu.service';
|
import {ContextMenuService} from './context-menu.service';
|
||||||
import {SCFacet} from '@openstapps/core';
|
import {SCFacet} from '@openstapps/core';
|
||||||
import {FilterContext, SortContext} from './context-type';
|
import {FilterContext, SortContext} from './context-type';
|
||||||
import {ThingTranslateModule} from '../../../translation/thing-translate.module';
|
import {ThingTranslateModule} from '../../../translation/thing-translate.module';
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
|
import {firstValueFrom, filter} from 'rxjs';
|
||||||
|
|
||||||
describe('ContextMenuService', () => {
|
describe('ContextMenuService', () => {
|
||||||
let service: ContextMenuService;
|
let service: ContextMenuService;
|
||||||
@@ -36,39 +35,39 @@ describe('ContextMenuService', () => {
|
|||||||
expect(service).toBeTruthy();
|
expect(service).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update filterOptions', done => {
|
it('should update filterOptions', async () => {
|
||||||
service.filterContextChanged$.subscribe(result => {
|
|
||||||
expect(result).toBeDefined();
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
service.updateContextFilter(facetsMock);
|
service.updateContextFilter(facetsMock);
|
||||||
|
|
||||||
|
const result = await firstValueFrom(service.filterContextChanged$.pipe(filter(Boolean)));
|
||||||
|
|
||||||
|
expect(result).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update filterQuery', done => {
|
it('should update filterQuery', async () => {
|
||||||
service.filterContextChanged$.subscribe(result => {
|
|
||||||
expect(result).toBeDefined();
|
|
||||||
expect(service.contextFilter.options[0].buckets.length).toEqual(
|
|
||||||
filterContext.options[0].buckets.length,
|
|
||||||
);
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
service.updateContextFilter(facetsMock);
|
service.updateContextFilter(facetsMock);
|
||||||
|
const result = await firstValueFrom(service.filterContextChanged$.pipe(filter(Boolean)));
|
||||||
|
|
||||||
|
expect(result).toBeDefined();
|
||||||
|
|
||||||
|
const current = service.contextFilter;
|
||||||
|
|
||||||
|
expect(current.options[0].buckets.length).toEqual(filterContext.options[0].buckets.length);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update sortOptions', done => {
|
it('should update sortOptions', async () => {
|
||||||
service.sortContextChanged$.subscribe(result => {
|
|
||||||
expect(result).toBeDefined();
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
service.setContextSort(sortContext);
|
service.setContextSort(sortContext);
|
||||||
|
|
||||||
|
const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
|
||||||
|
|
||||||
|
expect(result).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update sortQuery', done => {
|
it('should update sortQuery', async () => {
|
||||||
service.sortContextChanged$.subscribe(result => {
|
|
||||||
expect(result).toBeDefined();
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
service.setContextSort(sortContext);
|
service.setContextSort(sortContext);
|
||||||
|
|
||||||
|
const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
|
||||||
|
|
||||||
|
expect(result).toBeDefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import {
|
|||||||
SCThingType,
|
SCThingType,
|
||||||
SCTranslations,
|
SCTranslations,
|
||||||
} from '@openstapps/core';
|
} from '@openstapps/core';
|
||||||
import {Subject} from 'rxjs';
|
import {BehaviorSubject} from 'rxjs';
|
||||||
import {FilterBucket, FilterContext, FilterFacet, SortContext, TransformedFacet} from './context-type';
|
import {FilterBucket, FilterContext, FilterFacet, SortContext, TransformedFacet} from './context-type';
|
||||||
import {TranslateService} from '@ngx-translate/core';
|
import {TranslateService} from '@ngx-translate/core';
|
||||||
import {ThingTranslateService} from '../../../translation/thing-translate.service';
|
import {ThingTranslateService} from '../../../translation/thing-translate.service';
|
||||||
@@ -40,7 +40,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the filter context
|
* Container for the filter context
|
||||||
*/
|
*/
|
||||||
filterOptions = new Subject<FilterContext>();
|
filterOptions = new BehaviorSubject<FilterContext | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable filterContext streams
|
* Observable filterContext streams
|
||||||
@@ -50,7 +50,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the filter query (SCSearchFilter)
|
* Container for the filter query (SCSearchFilter)
|
||||||
*/
|
*/
|
||||||
filterQuery = new Subject<SCSearchFilter | undefined>();
|
filterQuery = new BehaviorSubject<SCSearchFilter | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable filterContext streams
|
* Observable filterContext streams
|
||||||
@@ -65,7 +65,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the sort context
|
* Container for the sort context
|
||||||
*/
|
*/
|
||||||
sortOptions = new Subject<SortContext>();
|
sortOptions = new BehaviorSubject<SortContext | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable SortContext streams
|
* Observable SortContext streams
|
||||||
@@ -75,7 +75,7 @@ export class ContextMenuService {
|
|||||||
/**
|
/**
|
||||||
* Container for the sort query
|
* Container for the sort query
|
||||||
*/
|
*/
|
||||||
sortQuery = new Subject<SCSearchSort[] | undefined>();
|
sortQuery = new BehaviorSubject<SCSearchSort[] | undefined>(undefined);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Observable SortContext streams
|
* Observable SortContext streams
|
||||||
|
|||||||
@@ -19,12 +19,13 @@ import {RouterModule} from '@angular/router';
|
|||||||
import {LayoutModule} from '@angular/cdk/layout';
|
import {LayoutModule} from '@angular/cdk/layout';
|
||||||
import {TranslateModule} from '@ngx-translate/core';
|
import {TranslateModule} from '@ngx-translate/core';
|
||||||
import {SettingsModule} from '../settings/settings.module';
|
import {SettingsModule} from '../settings/settings.module';
|
||||||
import {ContextMenuComponent} from './context/context-menu.component';
|
|
||||||
import {ContextMenuService} from './context/context-menu.service';
|
import {ContextMenuService} from './context/context-menu.service';
|
||||||
import {
|
import {
|
||||||
IonButton,
|
IonButton,
|
||||||
|
IonButtons,
|
||||||
IonCheckbox,
|
IonCheckbox,
|
||||||
IonContent,
|
IonContent,
|
||||||
|
IonHeader,
|
||||||
IonItem,
|
IonItem,
|
||||||
IonLabel,
|
IonLabel,
|
||||||
IonList,
|
IonList,
|
||||||
@@ -39,13 +40,14 @@ import {
|
|||||||
IonToolbar,
|
IonToolbar,
|
||||||
} from '@ionic/angular/standalone';
|
} from '@ionic/angular/standalone';
|
||||||
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
||||||
|
import {ContextMenuModalComponent} from './context/context-menu-modal.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Menu module
|
* Menu module
|
||||||
*/
|
*/
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [ContextMenuComponent],
|
declarations: [ContextMenuModalComponent],
|
||||||
exports: [ContextMenuComponent],
|
exports: [ContextMenuModalComponent],
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
IonIconDirective,
|
IonIconDirective,
|
||||||
@@ -69,6 +71,8 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
|||||||
IonRadioGroup,
|
IonRadioGroup,
|
||||||
IonContent,
|
IonContent,
|
||||||
IonToolbar,
|
IonToolbar,
|
||||||
|
IonButtons,
|
||||||
|
IonHeader,
|
||||||
],
|
],
|
||||||
providers: [ContextMenuService],
|
providers: [ContextMenuService],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -62,7 +62,9 @@ export class TabsComponent {
|
|||||||
void this.loadMenuEntries();
|
void this.loadMenuEntries();
|
||||||
this.router.events.subscribe((event: unknown) => {
|
this.router.events.subscribe((event: unknown) => {
|
||||||
if (event instanceof NavigationEnd) {
|
if (event instanceof NavigationEnd) {
|
||||||
this.selectTab(event.url);
|
setTimeout(() => {
|
||||||
|
this.selectTab(event.url);
|
||||||
|
}, 300);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.selectTab(router.url);
|
this.selectTab(router.url);
|
||||||
|
|||||||
@@ -14,10 +14,10 @@
|
|||||||
-->
|
-->
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<ion-button fill="clear" class="left-button" (click)="mainSwiper.pageBackwards()">
|
<ion-button fill="clear" class="left-button" (click)="mainSwiper.pageBackwards()">
|
||||||
<ion-icon slot="icon-only" name="navigate_before"></ion-icon>
|
<ion-icon slot="icon-only" name="chevron_left"></ion-icon>
|
||||||
</ion-button>
|
</ion-button>
|
||||||
<ion-button fill="clear" class="right-button" (click)="mainSwiper.pageForward()">
|
<ion-button fill="clear" class="right-button" (click)="mainSwiper.pageForward()">
|
||||||
<ion-icon slot="icon-only" name="navigate_next"></ion-icon>
|
<ion-icon slot="icon-only" name="chevron_right"></ion-icon>
|
||||||
</ion-button>
|
</ion-button>
|
||||||
<infinite-swiper
|
<infinite-swiper
|
||||||
class="header-swiper"
|
class="header-swiper"
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ export class SchedulePageComponent implements OnInit, AfterViewInit {
|
|||||||
onInit() {
|
onInit() {
|
||||||
this.tabChoreographer = new SharedAxisChoreographer(this.activatedRoute.snapshot.paramMap.get('mode'), [
|
this.tabChoreographer = new SharedAxisChoreographer(this.activatedRoute.snapshot.paramMap.get('mode'), [
|
||||||
'calendar',
|
'calendar',
|
||||||
'week-overview',
|
'weekly-view',
|
||||||
'single',
|
'single',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
@if (tabChoreographer.currentValue === 'calendar') {
|
@if (tabChoreographer.currentValue === 'calendar') {
|
||||||
<ion-title [innerHTML]="'schedule.calendar' | translate | titlecase"></ion-title>
|
<ion-title [innerHTML]="'schedule.calendar' | translate | titlecase"></ion-title>
|
||||||
}
|
}
|
||||||
@if (tabChoreographer.currentValue === 'week-overview') {
|
@if (tabChoreographer.currentValue === 'weekly-view') {
|
||||||
<ion-title [innerHTML]="'schedule.recurring' | translate | titlecase"></ion-title>
|
<ion-title [innerHTML]="'schedule.recurring' | translate | titlecase"></ion-title>
|
||||||
}
|
}
|
||||||
@if (tabChoreographer.currentValue === 'single') {
|
@if (tabChoreographer.currentValue === 'single') {
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
<ion-label class="ion-text-wrap" [innerHTML]="'schedule.calendar' | translate"></ion-label>
|
<ion-label class="ion-text-wrap" [innerHTML]="'schedule.calendar' | translate"></ion-label>
|
||||||
<ion-icon name="calendar_today"></ion-icon>
|
<ion-icon name="calendar_today"></ion-icon>
|
||||||
</ion-segment-button>
|
</ion-segment-button>
|
||||||
<ion-segment-button value="week-overview" layout="icon-start">
|
<ion-segment-button value="weekly-view" layout="icon-start">
|
||||||
<ion-label class="ion-text-wrap" [innerHTML]="'schedule.recurring' | translate"></ion-label>
|
<ion-label class="ion-text-wrap" [innerHTML]="'schedule.recurring' | translate"></ion-label>
|
||||||
<ion-icon name="event_repeat"></ion-icon>
|
<ion-icon name="event_repeat"></ion-icon>
|
||||||
</ion-segment-button>
|
</ion-segment-button>
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
<stapps-calendar-view [layout]="layout"></stapps-calendar-view>
|
<stapps-calendar-view [layout]="layout"></stapps-calendar-view>
|
||||||
}
|
}
|
||||||
<!-- Schedule view needs full week -->
|
<!-- Schedule view needs full week -->
|
||||||
@case ('week-overview') {
|
@case ('weekly-view') {
|
||||||
<stapps-schedule-view [layout]="layout"></stapps-schedule-view>
|
<stapps-schedule-view [layout]="layout"></stapps-schedule-view>
|
||||||
}
|
}
|
||||||
@case ('single') {
|
@case ('single') {
|
||||||
|
|||||||
@@ -14,10 +14,10 @@
|
|||||||
-->
|
-->
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<ion-button fill="clear" class="left-button" (click)="mainSwiper.swiperRef.slidePrev()">
|
<ion-button fill="clear" class="left-button" (click)="mainSwiper.swiperRef.slidePrev()">
|
||||||
<ion-icon slot="icon-only" name="navigate_before"></ion-icon>
|
<ion-icon slot="icon-only" name="chevron_left"></ion-icon>
|
||||||
</ion-button>
|
</ion-button>
|
||||||
<ion-button fill="clear" class="right-button" (click)="mainSwiper.swiperRef.slideNext()">
|
<ion-button fill="clear" class="right-button" (click)="mainSwiper.swiperRef.slideNext()">
|
||||||
<ion-icon slot="icon-only" name="navigate_next"></ion-icon>
|
<ion-icon slot="icon-only" name="chevron_right"></ion-icon>
|
||||||
</ion-button>
|
</ion-button>
|
||||||
<swiper
|
<swiper
|
||||||
class="header-swiper"
|
class="header-swiper"
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
|||||||
const settingsRoutes: Routes = [
|
const settingsRoutes: Routes = [
|
||||||
{path: 'schedule', redirectTo: 'schedule/calendar/now'},
|
{path: 'schedule', redirectTo: 'schedule/calendar/now'},
|
||||||
{path: 'schedule/calendar', redirectTo: 'schedule/calendar/now'},
|
{path: 'schedule/calendar', redirectTo: 'schedule/calendar/now'},
|
||||||
{path: 'schedule/week-overview', redirectTo: 'schedule/week-overview/now'},
|
{path: 'schedule/weekly-view', redirectTo: 'schedule/weekly-view/now'},
|
||||||
{path: 'schedule/single', redirectTo: 'schedule/single/now'},
|
{path: 'schedule/single', redirectTo: 'schedule/single/now'},
|
||||||
// calendar | recurring | single
|
// calendar | recurring | single
|
||||||
{path: 'schedule/:mode/:date', component: SchedulePageComponent},
|
{path: 'schedule/:mode/:date', component: SchedulePageComponent},
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2022 StApps
|
||||||
|
* This program is free software: you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the Free
|
||||||
|
* Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with
|
||||||
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
/* eslint-disable unicorn/no-useless-undefined, @typescript-eslint/no-non-null-assertion */
|
||||||
|
import {TestBed} from '@angular/core/testing';
|
||||||
|
import {StorageProvider} from '../../storage/storage.provider';
|
||||||
|
import {
|
||||||
|
InAppReviewProvider,
|
||||||
|
IN_APP_REVIEW_COOLDOWN_DAYS,
|
||||||
|
IN_APP_REVIEW_NECESSARY_SESSIONS,
|
||||||
|
IN_APP_REVIEW_SETTINGS_KEY,
|
||||||
|
IN_APP_REVIEW_SESSIONS_KEY,
|
||||||
|
IN_APP_REVIEW_LAST_RATING_KEY,
|
||||||
|
} from './in-app-review.provider';
|
||||||
|
|
||||||
|
describe('InappRatingProvider', () => {
|
||||||
|
let storageProviderSpy: jasmine.SpyObj<StorageProvider>;
|
||||||
|
let inappRatingProvider: InAppReviewProvider;
|
||||||
|
const ONE_DAY_IN_MILLIS = 1000 * 3600 * 24;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
storageProviderSpy = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
|
||||||
|
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
imports: [],
|
||||||
|
providers: [
|
||||||
|
InAppReviewProvider,
|
||||||
|
{
|
||||||
|
provide: StorageProvider,
|
||||||
|
useValue: storageProviderSpy,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
// set settings returned from config
|
||||||
|
inappRatingProvider = TestBed.inject(InAppReviewProvider);
|
||||||
|
storageProviderSpy.has.and.returnValue(Promise.resolve(false));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set user sessions count starting with one', async () => {
|
||||||
|
storageProviderSpy.get.and.returnValue(Promise.resolve(0));
|
||||||
|
const sessionCount = await inappRatingProvider.increaseSessionCount();
|
||||||
|
expect(sessionCount).toEqual(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should start in app rating/review flow if contitions are met', async () => {
|
||||||
|
const nowMinusCooldownDays = Date.now() - (IN_APP_REVIEW_COOLDOWN_DAYS + 1) * ONE_DAY_IN_MILLIS;
|
||||||
|
spyOn(inappRatingProvider, 'requestReview').and.returnValue(Promise.resolve());
|
||||||
|
|
||||||
|
storageProviderSpy.get
|
||||||
|
.withArgs(`${IN_APP_REVIEW_SETTINGS_KEY}.${IN_APP_REVIEW_SESSIONS_KEY}`)
|
||||||
|
.and.returnValue(Promise.resolve(IN_APP_REVIEW_NECESSARY_SESSIONS));
|
||||||
|
storageProviderSpy.get
|
||||||
|
.withArgs(`${IN_APP_REVIEW_SETTINGS_KEY}.${IN_APP_REVIEW_LAST_RATING_KEY}`)
|
||||||
|
.and.returnValue(Promise.resolve(nowMinusCooldownDays));
|
||||||
|
await inappRatingProvider.startInAppReviewIfFeasible();
|
||||||
|
expect(inappRatingProvider.requestReview).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not start in app rating/review flow if contitions are not met', async () => {
|
||||||
|
const nowMinusCooldownDays = Date.now() - IN_APP_REVIEW_COOLDOWN_DAYS * ONE_DAY_IN_MILLIS;
|
||||||
|
spyOn(inappRatingProvider, 'requestReview').and.returnValue(Promise.resolve());
|
||||||
|
|
||||||
|
storageProviderSpy.get
|
||||||
|
.withArgs(`${IN_APP_REVIEW_SETTINGS_KEY}.${IN_APP_REVIEW_SESSIONS_KEY}`)
|
||||||
|
.and.returnValue(Promise.resolve(IN_APP_REVIEW_NECESSARY_SESSIONS - 1));
|
||||||
|
storageProviderSpy.get
|
||||||
|
.withArgs(`${IN_APP_REVIEW_SETTINGS_KEY}.${IN_APP_REVIEW_LAST_RATING_KEY}`)
|
||||||
|
.and.returnValue(Promise.resolve(nowMinusCooldownDays));
|
||||||
|
|
||||||
|
await inappRatingProvider.startInAppReviewIfFeasible();
|
||||||
|
|
||||||
|
storageProviderSpy.get
|
||||||
|
.withArgs(`${IN_APP_REVIEW_SETTINGS_KEY}.${IN_APP_REVIEW_SESSIONS_KEY}`)
|
||||||
|
.and.returnValue(Promise.resolve(IN_APP_REVIEW_NECESSARY_SESSIONS));
|
||||||
|
storageProviderSpy.get
|
||||||
|
.withArgs(`${IN_APP_REVIEW_SETTINGS_KEY}.${IN_APP_REVIEW_LAST_RATING_KEY}`)
|
||||||
|
.and.returnValue(Promise.resolve(nowMinusCooldownDays + ONE_DAY_IN_MILLIS));
|
||||||
|
|
||||||
|
await inappRatingProvider.startInAppReviewIfFeasible();
|
||||||
|
|
||||||
|
expect(inappRatingProvider.requestReview).toHaveBeenCalledTimes(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
import {Injectable} from '@angular/core';
|
||||||
|
import {InAppReview} from '@capacitor-community/in-app-review';
|
||||||
|
import {StorageProvider} from '../../storage/storage.provider';
|
||||||
|
|
||||||
|
export const IN_APP_REVIEW_COOLDOWN_DAYS = 365;
|
||||||
|
export const IN_APP_REVIEW_NECESSARY_SESSIONS = 3;
|
||||||
|
|
||||||
|
export const IN_APP_REVIEW_SETTINGS_KEY = 'inapp-rating';
|
||||||
|
export const IN_APP_REVIEW_SESSIONS_KEY = 'sessions';
|
||||||
|
export const IN_APP_REVIEW_LAST_RATING_KEY = 'last-rating';
|
||||||
|
export type IN_APP_REVIEW_KEYS = typeof IN_APP_REVIEW_SESSIONS_KEY | typeof IN_APP_REVIEW_LAST_RATING_KEY;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provider for In-App Review
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class InAppReviewProvider {
|
||||||
|
requestReview: () => Promise<void>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param storageProvider TODO
|
||||||
|
*/
|
||||||
|
constructor(private readonly storageProvider: StorageProvider) {
|
||||||
|
this.requestReview = InAppReview.requestReview;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private inappRatingSettingStorageKey(key: string): string {
|
||||||
|
return `${IN_APP_REVIEW_SETTINGS_KEY}.${key}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private async getInAppReviewSetting<T>(
|
||||||
|
key: IN_APP_REVIEW_KEYS,
|
||||||
|
defaultValue: T,
|
||||||
|
): Promise<typeof defaultValue> {
|
||||||
|
try {
|
||||||
|
return await this.storageProvider.get<typeof defaultValue>(this.inappRatingSettingStorageKey(key));
|
||||||
|
} catch {
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private async setInAppReviewSetting<T>(key: IN_APP_REVIEW_KEYS, value: T) {
|
||||||
|
return this.storageProvider.put<typeof value>(this.inappRatingSettingStorageKey(key), value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private async setInAppReviewSessions(value: number) {
|
||||||
|
return this.setInAppReviewSetting(IN_APP_REVIEW_SESSIONS_KEY, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private async getInAppReviewSessions(): Promise<number> {
|
||||||
|
return this.getInAppReviewSetting(IN_APP_REVIEW_SESSIONS_KEY, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private async setInAppReviewLastRating(value: Date) {
|
||||||
|
return this.setInAppReviewSetting(IN_APP_REVIEW_LAST_RATING_KEY, value.getTime());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private async getInAppReviewLastRating(): Promise<Date> {
|
||||||
|
return this.getInAppReviewSetting(IN_APP_REVIEW_LAST_RATING_KEY, 0).then(timestamp => {
|
||||||
|
return new Date(timestamp);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Increases session count to keep local info how often the app was used.
|
||||||
|
*/
|
||||||
|
public async increaseSessionCount(increment = 1): Promise<number> {
|
||||||
|
try {
|
||||||
|
const currentSessions = await this.getInAppReviewSessions();
|
||||||
|
await this.setInAppReviewSessions(currentSessions + increment);
|
||||||
|
return currentSessions + increment;
|
||||||
|
} catch {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invokes In App Review Flow/Views depending on the OS iff conditions are met.
|
||||||
|
*/
|
||||||
|
public async startInAppReviewIfFeasible(): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
const currentSessions = await this.getInAppReviewSessions();
|
||||||
|
const lastRating = await this.getInAppReviewLastRating();
|
||||||
|
const dateDiffMillis = Math.abs(lastRating.getTime() - Date.now());
|
||||||
|
const dateDiffDays = Math.floor(dateDiffMillis / (1000 * 3600 * 24));
|
||||||
|
|
||||||
|
if (currentSessions < IN_APP_REVIEW_NECESSARY_SESSIONS || dateDiffDays < IN_APP_REVIEW_COOLDOWN_DAYS) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.requestReview();
|
||||||
|
await this.setInAppReviewLastRating(new Date());
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
}
|
}
|
||||||
<ion-card-content>
|
<ion-card-content>
|
||||||
@if (!compactView) {
|
@if (!compactView) {
|
||||||
<ion-note>{{ 'description' | thingTranslate: setting | titlecase }}</ion-note>
|
<ion-note>{{ 'description' | thingTranslate: setting }}</ion-note>
|
||||||
}
|
}
|
||||||
@if (isVisible) {
|
@if (isVisible) {
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ import {
|
|||||||
IonToolbar,
|
IonToolbar,
|
||||||
} from '@ionic/angular/standalone';
|
} from '@ionic/angular/standalone';
|
||||||
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
||||||
|
import {InAppReviewProvider} from './in-app-review/in-app-review.provider';
|
||||||
|
|
||||||
const settingsRoutes: Routes = [{path: 'settings', component: SettingsPageComponent}];
|
const settingsRoutes: Routes = [{path: 'settings', component: SettingsPageComponent}];
|
||||||
|
|
||||||
@@ -101,6 +102,13 @@ const settingsRoutes: Routes = [{path: 'settings', component: SettingsPageCompon
|
|||||||
IonInput,
|
IonInput,
|
||||||
IonNote,
|
IonNote,
|
||||||
],
|
],
|
||||||
providers: [ScheduleSyncService, SettingsProvider, CalendarService, ScheduleProvider, ThingTranslatePipe],
|
providers: [
|
||||||
|
ScheduleSyncService,
|
||||||
|
SettingsProvider,
|
||||||
|
InAppReviewProvider,
|
||||||
|
CalendarService,
|
||||||
|
ScheduleProvider,
|
||||||
|
ThingTranslatePipe,
|
||||||
|
],
|
||||||
})
|
})
|
||||||
export class SettingsModule {}
|
export class SettingsModule {}
|
||||||
|
|||||||
@@ -304,8 +304,8 @@ describe('SettingsProvider', () => {
|
|||||||
},
|
},
|
||||||
en: {
|
en: {
|
||||||
description:
|
description:
|
||||||
'The user group the app is going to be used.' +
|
'The user group the app is going to use primarily.' +
|
||||||
'This settings for example is getting used for the predefined price category of mensa meals.',
|
' This settings for example is getting used for the predefined price category of mensa meals.',
|
||||||
name: 'Group',
|
name: 'Group',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -106,7 +106,6 @@ describe('StorageProvider', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should put multiple values into the storage', async () => {
|
it('should put multiple values into the storage', async () => {
|
||||||
// @ts-expect-error no need to return anything for this case
|
|
||||||
spyOn(storageProvider, 'put').and.callFake(() => Promise.resolve());
|
spyOn(storageProvider, 'put').and.callFake(() => Promise.resolve());
|
||||||
await storageProvider.putMultiple(sampleEntries);
|
await storageProvider.putMultiple(sampleEntries);
|
||||||
|
|
||||||
|
|||||||
@@ -120,8 +120,9 @@ export class StorageProvider {
|
|||||||
* Puts a value of type T into the storage using provided key
|
* Puts a value of type T into the storage using provided key
|
||||||
* @param key Unique identifier
|
* @param key Unique identifier
|
||||||
* @param value Resource to store under the key
|
* @param value Resource to store under the key
|
||||||
|
* @returns Returns a promise that resolves when the key and value are set
|
||||||
*/
|
*/
|
||||||
async put<T>(key: string, value: T): Promise<T> {
|
async put<T>(key: string, value: T) {
|
||||||
return this.storage.set(key, value);
|
return this.storage.set(key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ const iconMap = new Map<string, MaterialSymbol>([
|
|||||||
[menuSharp, SCIcon.menu],
|
[menuSharp, SCIcon.menu],
|
||||||
[searchOutline, SCIcon.search],
|
[searchOutline, SCIcon.search],
|
||||||
[searchSharp, SCIcon.search],
|
[searchSharp, SCIcon.search],
|
||||||
[chevronExpand, SCIcon.expand_more],
|
[chevronExpand, SCIcon.expand_all],
|
||||||
[caretDownSharp, SCIcon.expand_more],
|
[caretDownSharp, SCIcon.expand_more],
|
||||||
[close, SCIcon.close],
|
[close, SCIcon.close],
|
||||||
[closeSharp, SCIcon.close],
|
[closeSharp, SCIcon.close],
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -500,7 +500,7 @@
|
|||||||
"view": {
|
"view": {
|
||||||
"today": "Heute"
|
"today": "Heute"
|
||||||
},
|
},
|
||||||
"recurring": "Wochen­übersicht",
|
"recurring": "Wochen­ansicht",
|
||||||
"calendar": "Kalender",
|
"calendar": "Kalender",
|
||||||
"single": "Einzel­termine",
|
"single": "Einzel­termine",
|
||||||
"addEventPage": {
|
"addEventPage": {
|
||||||
|
|||||||
@@ -500,7 +500,7 @@
|
|||||||
"view": {
|
"view": {
|
||||||
"today": "Today"
|
"today": "Today"
|
||||||
},
|
},
|
||||||
"recurring": "Week Overview",
|
"recurring": "Weekly View",
|
||||||
"calendar": "Calendar",
|
"calendar": "Calendar",
|
||||||
"single": "Single Events",
|
"single": "Single Events",
|
||||||
"addEventPage": {
|
"addEventPage": {
|
||||||
|
|||||||
Binary file not shown.
@@ -62,7 +62,7 @@ export const profilePageSections: SCSection[] = [
|
|||||||
links: [
|
links: [
|
||||||
{
|
{
|
||||||
name: 'Favorites',
|
name: 'Favorites',
|
||||||
icon: SCIcon.grade,
|
icon: SCIcon.star,
|
||||||
link: ['/favorites'],
|
link: ['/favorites'],
|
||||||
translations: {
|
translations: {
|
||||||
de: {
|
de: {
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ export const environment = {
|
|||||||
backend_url: 'https://mobile.server.uni-frankfurt.de',
|
backend_url: 'https://mobile.server.uni-frankfurt.de',
|
||||||
app_host: 'mobile.app.uni-frankfurt.de',
|
app_host: 'mobile.app.uni-frankfurt.de',
|
||||||
custom_url_scheme: 'de.anyschool.app',
|
custom_url_scheme: 'de.anyschool.app',
|
||||||
backend_version: '3.3.0',
|
backend_version: '4.0.0',
|
||||||
production: true,
|
production: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -17,14 +17,13 @@ $icon-size: 22px;
|
|||||||
app-root ion-searchbar[class*='sc-ion-searchbar-'] {
|
app-root ion-searchbar[class*='sc-ion-searchbar-'] {
|
||||||
--border-radius: var(--border-radius-default);
|
--border-radius: var(--border-radius-default);
|
||||||
--background: var(--ion-item-background) !important;
|
--background: var(--ion-item-background) !important;
|
||||||
|
--box-shadow: none;
|
||||||
|
|
||||||
height: 38px;
|
height: 38px;
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
|
|
||||||
&.filterable {
|
&.filterable {
|
||||||
--box-shadow: none;
|
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/app-builder-image
|
# @openstapps/app-builder-image
|
||||||
|
|
||||||
|
## 4.0.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ ENV ANDROID_APIS="android-34" \
|
|||||||
NODE_VERSION="22.x" \
|
NODE_VERSION="22.x" \
|
||||||
NPM_VERSION="^10.0.0" \
|
NPM_VERSION="^10.0.0" \
|
||||||
IONIC_VERSION="^7.0.0" \
|
IONIC_VERSION="^7.0.0" \
|
||||||
CAPACITOR_VERSION="^6.0.0" \
|
CAPACITOR_VERSION="^7.0.0" \
|
||||||
CORDOVA_RES_VERSION="latest" \
|
CORDOVA_RES_VERSION="latest" \
|
||||||
### Configure download URLs
|
### Configure download URLs
|
||||||
ANDROID_SDK_TOOLS_DOWNLOAD_URL="https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" \
|
ANDROID_SDK_TOOLS_DOWNLOAD_URL="https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/app-builder-image",
|
"name": "@openstapps/app-builder-image",
|
||||||
"version": "4.0.0",
|
"version": "4.0.3",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
@@ -1,5 +1,23 @@
|
|||||||
# @openstapps/api-cli
|
# @openstapps/api-cli
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
- @openstapps/core-tools@4.0.2
|
||||||
|
- @openstapps/api@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [b40ba7ad]
|
||||||
|
- @openstapps/api@4.0.1
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/api-cli",
|
"name": "@openstapps/api-cli",
|
||||||
"description": "CLI client for @openstapps/api",
|
"description": "CLI client for @openstapps/api",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/api.git",
|
"repository": "git@gitlab.com:openstapps/api.git",
|
||||||
|
|||||||
@@ -1,5 +1,24 @@
|
|||||||
# @openstapps/api-plugin
|
# @openstapps/api-plugin
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
- @openstapps/core-tools@4.0.2
|
||||||
|
- @openstapps/api@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
- Updated dependencies [b40ba7ad]
|
||||||
|
- @openstapps/api@4.0.1
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/api-plugin",
|
"name": "@openstapps/api-plugin",
|
||||||
"description": "Node.js library to interact with the StApps backend service",
|
"description": "Node.js library to interact with the StApps backend service",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/api.git",
|
"repository": "git@gitlab.com:openstapps/api.git",
|
||||||
@@ -36,14 +36,14 @@
|
|||||||
"@openstapps/core": "workspace:*",
|
"@openstapps/core": "workspace:*",
|
||||||
"@openstapps/core-tools": "workspace:*",
|
"@openstapps/core-tools": "workspace:*",
|
||||||
"@openstapps/logger": "workspace:*",
|
"@openstapps/logger": "workspace:*",
|
||||||
"@types/body-parser": "1.19.2",
|
"@types/body-parser": "1.19.6",
|
||||||
"@types/express": "4.17.17",
|
"@types/express": "4.17.17",
|
||||||
"@types/json-schema": "7.0.15",
|
"@types/json-schema": "7.0.15",
|
||||||
"@types/morgan": "1.9.4",
|
"@types/morgan": "1.9.10",
|
||||||
"body-parser": "1.20.2",
|
"body-parser": "1.20.3",
|
||||||
"express": "4.18.2",
|
"express": "4.21.2",
|
||||||
"json-schema": "0.4.0",
|
"json-schema": "0.4.0",
|
||||||
"morgan": "1.10.0"
|
"morgan": "1.10.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@openstapps/eslint-config": "workspace:*",
|
"@openstapps/eslint-config": "workspace:*",
|
||||||
|
|||||||
@@ -1,5 +1,18 @@
|
|||||||
# @openstapps/api
|
# @openstapps/api
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- @openstapps/core@4.0.2
|
||||||
|
|
||||||
|
## 4.0.1
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- b40ba7ad: Updated Elasticsearch dependency
|
||||||
|
- @openstapps/core@4.0.0
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/api",
|
"name": "@openstapps/api",
|
||||||
"description": "Node.js library to interact with the StApps backend service",
|
"description": "Node.js library to interact with the StApps backend service",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/api.git",
|
"repository": "git@gitlab.com:openstapps/api.git",
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
"tsup": "8.5.0",
|
"tsup": "8.5.0",
|
||||||
"typedoc": "0.25.12",
|
"typedoc": "0.25.12",
|
||||||
"typescript": "5.4.2",
|
"typescript": "5.4.2",
|
||||||
"undici": "5.22.1"
|
"undici": "6.21.3"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@openstapps/core": "workspace:*"
|
"@openstapps/core": "workspace:*"
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
# @openstapps/core-tools
|
# @openstapps/core-tools
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
- @openstapps/easy-ast@4.0.2
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/core-tools",
|
"name": "@openstapps/core-tools",
|
||||||
"description": "Tools to convert and validate StAppsCore",
|
"description": "Tools to convert and validate StAppsCore",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/core-tools.git",
|
"repository": "git@gitlab.com:openstapps/core-tools.git",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/core
|
# @openstapps/core
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- @openstapps/core-tools@4.0.2
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/core",
|
"name": "@openstapps/core",
|
||||||
"description": "StAppsCore - Generalized model of data",
|
"description": "StAppsCore - Generalized model of data",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/core.git",
|
"repository": "git@gitlab.com:openstapps/core.git",
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
# @openstapps/easy-ast
|
# @openstapps/easy-ast
|
||||||
|
|
||||||
|
## 4.0.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- Updated dependencies [6b06de40]
|
||||||
|
- @openstapps/logger@4.0.2
|
||||||
|
|
||||||
## 4.0.0
|
## 4.0.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/easy-ast",
|
"name": "@openstapps/easy-ast",
|
||||||
"description": "Tool to easily handle TypeScript AST",
|
"description": "Tool to easily handle TypeScript AST",
|
||||||
"version": "4.0.0",
|
"version": "4.0.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/core-tools.git",
|
"repository": "git@gitlab.com:openstapps/core-tools.git",
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user