mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-24 02:22:46 +00:00
Compare commits
17 Commits
d255385f5f
...
242-capaci
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a901298c3 | ||
|
|
86004881b0 | ||
|
|
3d19fc87e3 | ||
|
|
80bcdad851 | ||
|
|
afd1c8d87e | ||
|
|
6941f83b8f | ||
|
|
3a274a3a7f | ||
|
|
5a48342a8d | ||
|
|
6b06de4019 | ||
|
|
c5c9bcf433 | ||
|
|
b40ba7ad63 | ||
|
|
362f6adf07 | ||
|
|
bbd6b0f874 | ||
|
|
b1a9ba44d0 | ||
|
|
bee38d4a59 | ||
|
|
a5c5c31d09 | ||
|
|
c8e290200f |
@@ -1,5 +0,0 @@
|
||||
---
|
||||
"@openstapps/app": patch
|
||||
---
|
||||
|
||||
Migrated IonIcons replacer to a custom component
|
||||
8
.changeset/green-hotels-itch.md
Normal file
8
.changeset/green-hotels-itch.md
Normal file
@@ -0,0 +1,8 @@
|
||||
---
|
||||
"@openstapps/projectmanagement": patch
|
||||
"@openstapps/core-tools": patch
|
||||
"@openstapps/easy-ast": patch
|
||||
"@openstapps/app": patch
|
||||
---
|
||||
|
||||
Updated node-glob dependency
|
||||
@@ -1,7 +0,0 @@
|
||||
---
|
||||
"@openstapps/app": patch
|
||||
---
|
||||
|
||||
Migrated to Ionic standalone components
|
||||
|
||||
Angular ESBuild will not work with `IonicModule` apps
|
||||
@@ -1,5 +0,0 @@
|
||||
---
|
||||
"@openstapps/app": patch
|
||||
---
|
||||
|
||||
Migrated to Angular ESBuild
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -98,7 +98,8 @@ typings/
|
||||
|
||||
# ignore ide files
|
||||
.idea
|
||||
.vscode
|
||||
.vscode?*
|
||||
!.vscode/launch.json
|
||||
|
||||
# ignore lib
|
||||
lib
|
||||
|
||||
@@ -21,25 +21,16 @@ include:
|
||||
- local: /.gitlab/publishing.gitlab-ci.yml
|
||||
|
||||
variables:
|
||||
TURBO_CACHE_BYPASS:
|
||||
value: ''
|
||||
options:
|
||||
- '--force'
|
||||
- '--no-cache'
|
||||
- ''
|
||||
description: Bypass turbo cache
|
||||
TURBO_CACHE_BYPASS: "--force --no-cache"
|
||||
|
||||
default:
|
||||
image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22
|
||||
image: registry.gitlab.com/openstapps/openstapps/node-builder
|
||||
tags:
|
||||
- saas-linux-xlarge-amd64
|
||||
interruptible: true
|
||||
before_script:
|
||||
- corepack enable
|
||||
- corepack prepare pnpm@latest-8 --activate
|
||||
- echo TURBO_API=$TURBO_API >> .env.local
|
||||
- echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local
|
||||
- echo TURBO_TEAM=$TURBO_TEAM >> .env.local
|
||||
- corepack prepare pnpm@latest-10 --activate
|
||||
- pnpm config set store-dir .pnpm-store
|
||||
cache: &pnpm_cache
|
||||
key:
|
||||
@@ -101,17 +92,11 @@ stop review:
|
||||
rules: *deploy-rules
|
||||
|
||||
unit:
|
||||
image: registry.gitlab.com/openstapps/openstapps/app-builder:node-22
|
||||
image: registry.gitlab.com/openstapps/openstapps/app-builder
|
||||
stage: test
|
||||
needs: ['build']
|
||||
script:
|
||||
# - pnpm config set recursive-install false
|
||||
# - pnpm i --prefer-offline
|
||||
# - pnpm test:skip || pnpm i -r --prefer-offline
|
||||
- pnpm install
|
||||
- cd node_modules/.pnpm/re2*/node_modules/re2
|
||||
- npm run install
|
||||
- cd $CI_PROJECT_DIR
|
||||
- pnpm test $TURBO_CACHE_BYPASS
|
||||
coverage: '/Statements[^:]*\:[^:]*\s+([\d\.]+)%/'
|
||||
artifacts:
|
||||
|
||||
@@ -27,7 +27,7 @@ publish image:
|
||||
- tags
|
||||
needs: ['deploy']
|
||||
image:
|
||||
name: gcr.io/kaniko-project/executor:v1.12.1-debug
|
||||
name: gcr.io/kaniko-project/executor:v1.24.0-debug
|
||||
entrypoint: [""]
|
||||
script:
|
||||
- >
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
.limit_scheduled_pipelines:
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ionic-8-update' && $CI_PIPELINE_SOURCE == "schedule"
|
||||
- if: $CI_COMMIT_BRANCH == 'main' && $CI_PIPELINE_SOURCE == "schedule"
|
||||
|
||||
base image:
|
||||
image: docker
|
||||
@@ -16,7 +16,8 @@ base image:
|
||||
- >
|
||||
docker login -u "${CI_REGISTRY_USER}" -p "${CI_JOB_TOKEN}" "${CI_REGISTRY}" &&
|
||||
docker build
|
||||
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:node-22" "${CI_PROJECT_DIR}/${DEPLOY_DIR}" &&
|
||||
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:$(grep -o '"version": "[^"]*' "${DEPLOY_DIR}/package.json" | cut -d'"' -f4)"
|
||||
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest" "${CI_PROJECT_DIR}/${DEPLOY_DIR}" &&
|
||||
docker push "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}" --all-tags
|
||||
cache: {} # disable irrelevant cache for this job
|
||||
before_script: [] # do not run irrelevant before script for this job
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
nodejs 22.16.0
|
||||
pnpm 8.15.9
|
||||
pnpm 10.12.3
|
||||
python 3.11.5
|
||||
|
||||
23
.vscode/launch.json
vendored
Normal file
23
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
// Use IntelliSense to learn about possible attributes.
|
||||
// Hover to view descriptions of existing attributes.
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Launch Chrome",
|
||||
"request": "launch",
|
||||
"type": "chrome",
|
||||
"url": "http://localhost:8100",
|
||||
"webRoot": "${workspaceFolder}/frontend/app/www"
|
||||
},
|
||||
{
|
||||
"type":"node",
|
||||
"request": "launch",
|
||||
"name": "Run mocha for nodejs workspace",
|
||||
"runtimeExecutable": "${fileDirname}/../node_modules/.bin/c8",
|
||||
"cwd": "${fileDirname}/../",
|
||||
"runtimeArgs": ["--config", "${workspaceFolder}/.c8rc.json", "${fileDirname}/../node_modules/.bin/mocha", "--exit", "--reporter", "spec"]
|
||||
},
|
||||
]
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
integration:
|
||||
image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22
|
||||
image: registry.gitlab.com/openstapps/openstapps/node-builder
|
||||
stage: test
|
||||
needs: ['build']
|
||||
variables:
|
||||
@@ -9,8 +9,8 @@ integration:
|
||||
- name: registry.gitlab.com/openstapps/openstapps/database:latest
|
||||
alias: elasticsearch
|
||||
script:
|
||||
- pnpm --filter=@openstapps/backend install
|
||||
- pnpm test:integration:backend
|
||||
- pnpm install
|
||||
- pnpm test:integration:backend --force --no-cache
|
||||
artifacts:
|
||||
when: on_failure
|
||||
paths:
|
||||
|
||||
@@ -1,5 +1,44 @@
|
||||
# @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
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [c8e29020]
|
||||
- @openstapps/core@4.0.0
|
||||
- @openstapps/core-tools@4.0.0
|
||||
- @openstapps/logger@4.0.0
|
||||
|
||||
## 3.3.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -112,7 +112,7 @@ const menus = [
|
||||
icon: 'school',
|
||||
items: [
|
||||
{
|
||||
icon: 'grade',
|
||||
icon: 'star',
|
||||
route: '/favorites',
|
||||
title: 'favorites',
|
||||
translations: {
|
||||
|
||||
@@ -5,8 +5,8 @@ const userGroupSetting = {
|
||||
categories: ['profile'],
|
||||
defaultValue: 'students',
|
||||
description:
|
||||
'The user group the app is going to be used.' +
|
||||
'This settings for example is getting used for the predefined price category of mensa meals.',
|
||||
'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.',
|
||||
inputType: SCSettingInputType.SingleChoice,
|
||||
name: 'group',
|
||||
order: 1,
|
||||
@@ -25,7 +25,7 @@ const userGroupSetting = {
|
||||
},
|
||||
en: {
|
||||
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.',
|
||||
name: 'Group',
|
||||
values: ['students', 'employees', 'guests'],
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/backend",
|
||||
"description": "A reference implementation for a StApps backend",
|
||||
"version": "3.3.2",
|
||||
"version": "4.0.3",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"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"
|
||||
},
|
||||
"dependencies": {
|
||||
"@elastic/elasticsearch": "8.4.0",
|
||||
"@elastic/elasticsearch": "8.14.1",
|
||||
"@openstapps/core": "workspace:*",
|
||||
"@openstapps/core-tools": "workspace:*",
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"@types/body-parser": "1.19.2",
|
||||
"@types/body-parser": "1.19.6",
|
||||
"@types/cors": "2.8.13",
|
||||
"@types/express": "4.17.17",
|
||||
"@types/geojson": "1.0.6",
|
||||
@@ -56,20 +56,20 @@
|
||||
"@types/nodemailer": "6.4.7",
|
||||
"@types/promise-queue": "2.2.0",
|
||||
"@types/uuid": "8.3.4",
|
||||
"body-parser": "1.20.2",
|
||||
"body-parser": "1.20.3",
|
||||
"cors": "2.8.5",
|
||||
"cosmiconfig": "8.1.3",
|
||||
"deepmerge": "4.3.1",
|
||||
"express": "4.18.2",
|
||||
"express": "4.21.2",
|
||||
"express-prom-bundle": "6.6.0",
|
||||
"express-promise-router": "4.1.1",
|
||||
"got": "12.6.0",
|
||||
"moment": "2.30.1",
|
||||
"morgan": "1.10.0",
|
||||
"morgan": "1.10.1",
|
||||
"nock": "13.3.1",
|
||||
"node-cache": "5.1.2",
|
||||
"node-cron": "3.0.2",
|
||||
"nodemailer": "6.9.1",
|
||||
"nodemailer": "6.9.9",
|
||||
"prom-client": "14.1.1",
|
||||
"promise-queue": "2.2.5",
|
||||
"uuid": "8.3.2"
|
||||
@@ -83,7 +83,7 @@
|
||||
"@types/chai": "4.3.20",
|
||||
"@types/chai-as-promised": "7.1.8",
|
||||
"@types/mocha": "10.0.10",
|
||||
"@types/morgan": "1.9.4",
|
||||
"@types/morgan": "1.9.10",
|
||||
"@types/sinon": "10.0.14",
|
||||
"@types/sinon-express-mock": "1.3.9",
|
||||
"@types/supertest": "2.0.12",
|
||||
@@ -99,7 +99,7 @@
|
||||
"sinon-express-mock": "2.2.1",
|
||||
"supertest": "6.3.3",
|
||||
"ts-node": "10.9.2",
|
||||
"tsup": "6.7.0",
|
||||
"tsup": "8.5.0",
|
||||
"typescript": "5.4.2"
|
||||
},
|
||||
"tsup": {
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
# @openstapps/database
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
## 3.2.0
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM elasticsearch:8.4.2
|
||||
FROM elasticsearch:8.14.3
|
||||
|
||||
EXPOSE 9200
|
||||
EXPOSE 9300
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@openstapps/database",
|
||||
"version": "3.2.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"files": [
|
||||
"config",
|
||||
|
||||
@@ -1,5 +1,23 @@
|
||||
# @openstapps/proxy
|
||||
|
||||
## 4.0.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [6b06de40]
|
||||
- @openstapps/logger@4.0.2
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [c8e29020]
|
||||
- @openstapps/logger@4.0.0
|
||||
|
||||
## 3.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/proxy",
|
||||
"description": "NGINX proxy that is dynamically configured by a Node.js script",
|
||||
"version": "3.0.0",
|
||||
"version": "4.0.2",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "AGPL-3.0-only",
|
||||
@@ -76,7 +76,7 @@
|
||||
"sinon": "15.0.4",
|
||||
"sinon-chai": "3.7.0",
|
||||
"ts-node": "10.9.2",
|
||||
"tsup": "6.7.0"
|
||||
"tsup": "8.5.0"
|
||||
},
|
||||
"tsup": {
|
||||
"entry": [
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
# @openstapps/backend-config
|
||||
|
||||
## 4.0.3
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
## 3.0.0
|
||||
|
||||
### Major Changes
|
||||
@@ -30,7 +42,7 @@
|
||||
|
||||
```js
|
||||
#!/usr/bin/env node
|
||||
import './lib/app.js';
|
||||
import "./lib/app.js";
|
||||
```
|
||||
|
||||
- 64caebaf: Migrate to ESM
|
||||
@@ -105,7 +117,7 @@
|
||||
|
||||
```js
|
||||
#!/usr/bin/env node
|
||||
import './lib/app.js';
|
||||
import "./lib/app.js";
|
||||
```
|
||||
|
||||
- 64caebaf: Migrate to ESM
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/backend-config",
|
||||
"description": "Backend Configuration for OpenStApps",
|
||||
"version": "3.0.0",
|
||||
"version": "4.0.3",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<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="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="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
|
||||
<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="campus map" title.de="Campus Karte" icon="map" route="/map"/>
|
||||
<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="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
|
||||
<item title="settings" title.de="Einstellungen" icon="settings" route="/settings"/>
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
# @openstapps/eslint-config
|
||||
|
||||
## 4.0.3
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
## 3.0.0
|
||||
|
||||
### Major Changes
|
||||
@@ -30,7 +42,7 @@
|
||||
|
||||
```js
|
||||
#!/usr/bin/env node
|
||||
import './lib/app.js';
|
||||
import "./lib/app.js";
|
||||
```
|
||||
|
||||
- 64caebaf: Migrate to ESM
|
||||
@@ -75,11 +87,14 @@
|
||||
- 64caebaf: Migrated changelogs to changeset format
|
||||
|
||||
```js
|
||||
import fs from 'fs';
|
||||
import fs from "fs";
|
||||
|
||||
const path = 'packages/logger/CHANGELOG.md';
|
||||
const path = "packages/logger/CHANGELOG.md";
|
||||
|
||||
fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
|
||||
fs.writeFileSync(
|
||||
path,
|
||||
fs.readFileSync(path, "utf8").replace(/^#+\s+\[/gm, "## ["),
|
||||
);
|
||||
```
|
||||
|
||||
- 98546a97: Migrate away from @openstapps/configuration
|
||||
@@ -122,7 +137,7 @@
|
||||
|
||||
```js
|
||||
#!/usr/bin/env node
|
||||
import './lib/app.js';
|
||||
import "./lib/app.js";
|
||||
```
|
||||
|
||||
- 64caebaf: Migrate to ESM
|
||||
@@ -167,11 +182,14 @@
|
||||
- 64caebaf: Migrated changelogs to changeset format
|
||||
|
||||
```js
|
||||
import fs from 'fs';
|
||||
import fs from "fs";
|
||||
|
||||
const path = 'packages/logger/CHANGELOG.md';
|
||||
const path = "packages/logger/CHANGELOG.md";
|
||||
|
||||
fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
|
||||
fs.writeFileSync(
|
||||
path,
|
||||
fs.readFileSync(path, "utf8").replace(/^#+\s+\[/gm, "## ["),
|
||||
);
|
||||
```
|
||||
|
||||
- 98546a97: Migrate away from @openstapps/configuration
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/eslint-config",
|
||||
"description": "A collection of configuration base files for StApps projects. Just an (unused) experiment for now.",
|
||||
"version": "3.0.0",
|
||||
"version": "4.0.3",
|
||||
"type": "commonjs",
|
||||
"license": "GPL-3.0-only",
|
||||
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
||||
@@ -22,8 +22,8 @@
|
||||
"typescript": "5.4.2"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@typescript-eslint/eslint-plugin": "7.2.0",
|
||||
"@typescript-eslint/parser": "7.2.0",
|
||||
"@typescript-eslint/eslint-plugin": "7.11.0",
|
||||
"@typescript-eslint/parser": "7.11.0",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-config-prettier": "9.1.0",
|
||||
"eslint-plugin-jsdoc": "48.2.1",
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# @openstapps/prettier-config
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
## 3.2.0
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/prettier-config",
|
||||
"description": "StApps Prettier Config",
|
||||
"version": "3.2.0",
|
||||
"version": "4.0.0",
|
||||
"type": "commonjs",
|
||||
"license": "GPL-3.0-only",
|
||||
"repository": "git@gitlab.com:openstapps/prettier-config.git",
|
||||
|
||||
@@ -1,5 +1,32 @@
|
||||
# @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
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [c8e29020]
|
||||
- @openstapps/collection-utils@4.0.0
|
||||
- @openstapps/gitlab-api@4.0.0
|
||||
- @openstapps/logger@4.0.0
|
||||
|
||||
## 3.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/projectmanagement",
|
||||
"description": "Main documentation and scripts for maintenance.",
|
||||
"version": "3.0.0",
|
||||
"version": "4.0.2",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
@@ -41,10 +41,9 @@
|
||||
"@openstapps/collection-utils": "workspace:*",
|
||||
"@openstapps/gitlab-api": "workspace:*",
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"@slack/web-api": "6.8.1",
|
||||
"commander": "10.0.0",
|
||||
"date-fns": "3.6.0",
|
||||
"glob": "10.3.10",
|
||||
"glob": "10.5.0",
|
||||
"mustache": "4.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
@@ -64,7 +63,7 @@
|
||||
"mocha": "10.8.2",
|
||||
"mocha-junit-reporter": "2.2.0",
|
||||
"ts-node": "10.9.2",
|
||||
"tsup": "6.7.0",
|
||||
"tsup": "8.5.0",
|
||||
"typescript": "5.4.2"
|
||||
},
|
||||
"tsup": {
|
||||
|
||||
@@ -22,7 +22,6 @@ import {
|
||||
User,
|
||||
} from '@openstapps/gitlab-api';
|
||||
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 {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.`);
|
||||
|
||||
// instantiate slack client
|
||||
const client =
|
||||
process.env.SLACK_API_TOKEN === undefined ? undefined : new WebClient(process.env.SLACK_API_TOKEN);
|
||||
const client = undefined;
|
||||
|
||||
// get members of the main group
|
||||
const members = await api.getMembers(MembershipScope.GROUPS, GROUPS[0]);
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# @openstapps/tsconfig
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
## 3.3.0
|
||||
|
||||
### Minor Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/tsconfig",
|
||||
"description": "The tsconfig for the openstapps project",
|
||||
"version": "3.3.0",
|
||||
"version": "4.0.0",
|
||||
"type": "commonjs",
|
||||
"license": "GPL-3.0-only",
|
||||
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
||||
|
||||
@@ -1,5 +1,35 @@
|
||||
# @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
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [c8e29020]
|
||||
- @openstapps/api@4.0.0
|
||||
- @openstapps/core@4.0.0
|
||||
- @openstapps/logger@4.0.0
|
||||
|
||||
## 3.3.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/minimal-connector",
|
||||
"description": "This is a minimal connector which serves as an example",
|
||||
"version": "3.3.2",
|
||||
"version": "4.0.2",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
@@ -54,7 +54,7 @@
|
||||
"mocha-junit-reporter": "2.2.0",
|
||||
"nock": "13.3.1",
|
||||
"ts-node": "10.9.2",
|
||||
"tsup": "6.7.0",
|
||||
"tsup": "8.5.0",
|
||||
"typescript": "5.4.2"
|
||||
},
|
||||
"tsup": {
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
# @openstapps/minimal-deployment
|
||||
|
||||
## 4.0.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b40ba7ad: Updated Elasticsearch dependency
|
||||
|
||||
## 4.0.0
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
## 3.0.0
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,23 +1,21 @@
|
||||
version: '3.7'
|
||||
|
||||
x-development-variables: &development-variables
|
||||
NODE_ENV: "development"
|
||||
ALLOW_NO_TRANSPORT: "true"
|
||||
|
||||
services:
|
||||
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
|
||||
#volumes:
|
||||
# volumes:
|
||||
# - ./database:/usr/share/elasticsearch/data
|
||||
expose:
|
||||
- 9200
|
||||
ports:
|
||||
- 127.0.0.1:9200:9200
|
||||
environment:
|
||||
- bootstrap.memory_lock=true
|
||||
- "ES_JAVA_OPTS=-Xms2g -Xmx2g"
|
||||
- discovery.type=single-node
|
||||
# - bootstrap.memory_lock=true
|
||||
# - discovery.type=single-node
|
||||
- "ES_JAVA_OPTS=-Xms4g -Xmx4g"
|
||||
ulimits:
|
||||
memlock:
|
||||
soft: -1
|
||||
@@ -25,7 +23,7 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
backend:
|
||||
image: registry.gitlab.com/openstapps/openstapps/backend:3.1.0
|
||||
image: registry.gitlab.com/openstapps/openstapps/backend:4.0.1
|
||||
environment:
|
||||
<<: *development-variables
|
||||
ES_ADDR: "http://database:9200"
|
||||
@@ -37,10 +35,11 @@ services:
|
||||
ports:
|
||||
- 127.0.0.1:3000:3000
|
||||
labels:
|
||||
- stapps.version=4.1.0
|
||||
- stapps.version=4.0.0
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- database
|
||||
database:
|
||||
condition: service_healthy
|
||||
links:
|
||||
- database
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@openstapps/minimal-deployment",
|
||||
"version": "3.0.0",
|
||||
"version": "4.0.1",
|
||||
"private": true,
|
||||
"files": [
|
||||
"database",
|
||||
|
||||
@@ -1,5 +1,41 @@
|
||||
# @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
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [c8e29020]
|
||||
- @openstapps/api@4.0.0
|
||||
- @openstapps/api-plugin@4.0.0
|
||||
- @openstapps/core@4.0.0
|
||||
- @openstapps/core-tools@4.0.0
|
||||
- @openstapps/logger@4.0.0
|
||||
|
||||
## 3.3.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/minimal-plugin",
|
||||
"description": "Minimal Plugin",
|
||||
"version": "3.3.2",
|
||||
"version": "4.0.2",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
@@ -34,7 +34,7 @@
|
||||
"@openstapps/core-tools": "workspace:*",
|
||||
"@openstapps/logger": "workspace:*",
|
||||
"commander": "10.0.0",
|
||||
"express": "4.18.2",
|
||||
"express": "4.21.2",
|
||||
"ts-node": "10.9.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
@@ -43,7 +43,7 @@
|
||||
"@openstapps/tsconfig": "workspace:*",
|
||||
"@types/express": "4.17.17",
|
||||
"@types/node": "22.15.31",
|
||||
"tsup": "6.7.0",
|
||||
"tsup": "8.5.0",
|
||||
"typescript": "5.4.2"
|
||||
},
|
||||
"tsup": {
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
e2e:
|
||||
image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-22
|
||||
image: registry.gitlab.com/openstapps/openstapps/app-cypress
|
||||
stage: test
|
||||
script:
|
||||
- pnpm --filter=@openstapps/app install
|
||||
- pnpm install
|
||||
- pnpm --filter=@openstapps/app exec cypress install
|
||||
- cd node_modules/.pnpm/re2*/node_modules/re2
|
||||
- npm run install
|
||||
- cd $CI_PROJECT_DIR
|
||||
- pnpm test:integration:app
|
||||
- pnpm test:integration:app --force --no-cache
|
||||
artifacts:
|
||||
when: on_failure
|
||||
paths:
|
||||
|
||||
@@ -1,5 +1,49 @@
|
||||
# @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
|
||||
|
||||
### Major Changes
|
||||
|
||||
- c8e29020: Update to Node 22
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- b8ac30b9: Migrated IonIcons replacer to a custom component
|
||||
- b8ac30b9: Migrated to Ionic standalone components
|
||||
|
||||
Angular ESBuild will not work with `IonicModule` apps
|
||||
|
||||
- b8ac30b9: Migrated to Angular ESBuild
|
||||
- Updated dependencies [c8e29020]
|
||||
- @openstapps/api@4.0.0
|
||||
- @openstapps/collection-utils@4.0.0
|
||||
- @openstapps/core@4.0.0
|
||||
|
||||
## 3.3.5
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
namespace "de.anyschool.app"
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
namespace = "de.anyschool.app"
|
||||
compileSdk = rootProject.ext.compileSdkVersion
|
||||
defaultConfig {
|
||||
applicationId "de.anyschool.app"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
@@ -13,7 +13,7 @@ android {
|
||||
aaptOptions {
|
||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
||||
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
|
||||
ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
|
||||
}
|
||||
}
|
||||
buildTypes {
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
|
||||
android {
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
sourceCompatibility JavaVersion.VERSION_21
|
||||
targetCompatibility JavaVersion.VERSION_21
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
||||
dependencies {
|
||||
implementation project(':capacitor-community-in-app-review')
|
||||
implementation project(':capacitor-community-screen-brightness')
|
||||
implementation project(':capacitor-app')
|
||||
implementation project(':capacitor-browser')
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
android:theme="@style/AppTheme"
|
||||
android:usesCleartextTraffic="true">
|
||||
<activity
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout"
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
|
||||
android:exported="true"
|
||||
android:label="@string/title_activity_main"
|
||||
android:launchMode="singleTask"
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
[
|
||||
{
|
||||
"pkg": "@capacitor-community/in-app-review",
|
||||
"classpath": "com.getcapacitor.community.inappreview.InAppReviewPlugin"
|
||||
},
|
||||
{
|
||||
"pkg": "@capacitor-community/screen-brightness",
|
||||
"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
<item name="android:statusBarColor">@color/colorPrimary</item>
|
||||
<item name="android:windowBackground">@color/colorPrimary</item>
|
||||
<item name="android:navigationBarColor">@color/colorBackground</item>
|
||||
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||
@@ -17,6 +18,7 @@
|
||||
<item name="android:windowBackground">@color/colorPrimary</item>
|
||||
<item name="android:navigationBarColor">@color/colorBackground</item>
|
||||
<item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
|
||||
<item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.2.1'
|
||||
classpath 'com.google.gms:google-services:4.4.0'
|
||||
classpath 'com.android.tools.build:gradle:8.13.0'
|
||||
classpath 'com.google.gms:google-services:4.4.4'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// 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
|
||||
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@8.0.0_@capacitor+core@8.0.0/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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences/android')
|
||||
|
||||
include ':capacitor-screen-orientation'
|
||||
project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/screen-orientation/android')
|
||||
project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share/android')
|
||||
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen/android')
|
||||
|
||||
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@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
|
||||
|
||||
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.12.0_@capacitor+core@8.0.0/node_modules/capacitor-secure-storage-plugin/android')
|
||||
|
||||
Binary file not shown.
@@ -1,6 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
37
frontend/app/android/gradlew
vendored
37
frontend/app/android/gradlew
vendored
@@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@@ -55,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (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.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@@ -83,10 +85,8 @@ done
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
# 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\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@@ -114,7 +114,7 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
CLASSPATH="\\\"\\\""
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@@ -133,10 +133,13 @@ location of your Java installation."
|
||||
fi
|
||||
else
|
||||
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
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
@@ -144,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# 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 ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
@@ -152,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# 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" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
@@ -197,16 +200,20 @@ if "$cygwin" || "$msys" ; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_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 -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
||||
26
frontend/app/android/gradlew.bat
vendored
26
frontend/app/android/gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
set CLASSPATH=
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
ext {
|
||||
minSdkVersion = 22
|
||||
compileSdkVersion = 34
|
||||
targetSdkVersion = 34
|
||||
androidxActivityVersion = '1.8.0'
|
||||
androidxAppCompatVersion = '1.6.1'
|
||||
androidxCoordinatorLayoutVersion = '1.2.0'
|
||||
androidxCoreVersion = '1.12.0'
|
||||
androidxFragmentVersion = '1.6.2'
|
||||
coreSplashScreenVersion = '1.0.1'
|
||||
androidxWebkitVersion = '1.9.0'
|
||||
minSdkVersion = 24
|
||||
compileSdkVersion = 36
|
||||
targetSdkVersion = 36
|
||||
androidxActivityVersion = '1.11.0'
|
||||
androidxAppCompatVersion = '1.7.1'
|
||||
androidxCoordinatorLayoutVersion = '1.3.0'
|
||||
androidxCoreVersion = '1.17.0'
|
||||
androidxFragmentVersion = '1.8.9'
|
||||
coreSplashScreenVersion = '1.2.0'
|
||||
androidxWebkitVersion = '1.14.0'
|
||||
junitVersion = '4.13.2'
|
||||
androidxJunitVersion = '1.1.5'
|
||||
androidxEspressoCoreVersion = '3.5.1'
|
||||
cordovaAndroidVersion = '10.1.1'
|
||||
androidxJunitVersion = '1.3.0'
|
||||
androidxEspressoCoreVersion = '3.7.0'
|
||||
cordovaAndroidVersion = '14.0.1'
|
||||
}
|
||||
@@ -22,6 +22,7 @@ export default defineConfig({
|
||||
mochaFile: 'coverage/integration-report-junit-[hash].xml',
|
||||
},
|
||||
baseUrl: 'http://localhost:4200',
|
||||
injectDocumentDomain: true,
|
||||
supportFile: 'cypress/support/index.ts',
|
||||
videosFolder: 'cypress/videos',
|
||||
screenshotsFolder: 'cypress/screenshots',
|
||||
|
||||
@@ -299,7 +299,7 @@
|
||||
"icon": "school",
|
||||
"items": [
|
||||
{
|
||||
"icon": "grade",
|
||||
"icon": "star",
|
||||
"route": "/favorites",
|
||||
"title": "favorites",
|
||||
"translations": {
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
*/
|
||||
|
||||
describe('context menu', function () {
|
||||
const contextMenuSelector = 'stapps-context-menu-modal';
|
||||
|
||||
beforeEach(function () {
|
||||
cy.interceptSearch({
|
||||
extends: {query: 'a'},
|
||||
@@ -33,21 +35,21 @@ describe('context menu', function () {
|
||||
});
|
||||
|
||||
it('should sort', function () {
|
||||
cy.get('stapps-context').within(() => {
|
||||
cy.get(contextMenuSelector).within(() => {
|
||||
cy.contains('ion-item', 'Name').click();
|
||||
cy.wait('@search');
|
||||
});
|
||||
});
|
||||
|
||||
it('should filter', function () {
|
||||
cy.get('stapps-context').within(() => {
|
||||
cy.get(contextMenuSelector).within(() => {
|
||||
cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
|
||||
cy.wait('@search');
|
||||
});
|
||||
});
|
||||
|
||||
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.get('.checkbox-checked').should('have.length', 1);
|
||||
@@ -60,7 +62,7 @@ describe('context menu', function () {
|
||||
it('should truncate long category items', function () {
|
||||
cy.contains('ion-list', 'Akademische Veranstaltung / Kategorien').within(() => {
|
||||
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');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -33,9 +33,9 @@ describe('dashboard', async function () {
|
||||
describe('schedule section', function () {
|
||||
it('should lead to the week overview', function () {
|
||||
cy.get('.schedule')
|
||||
.contains('a', /Wochen.*übersicht/)
|
||||
.contains('a', /Wochen.*ansicht/)
|
||||
.click();
|
||||
cy.url().should('include', '/schedule/week-overview');
|
||||
cy.url().should('include', '/schedule/weekly-view');
|
||||
});
|
||||
|
||||
it('should lead to the calendar', function () {
|
||||
|
||||
@@ -100,7 +100,7 @@ describe('schedule', function () {
|
||||
cy.get('ion-searchbar').click().type('a');
|
||||
cy.wait('@search');
|
||||
cy.wait('@chips');
|
||||
cy.wait(200);
|
||||
cy.wait(1000);
|
||||
cy.contains('ion-item', 'UNIcert (Test)')
|
||||
.contains('stapps-add-event-action-chip', 'Termine Auswählen')
|
||||
.click();
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import equal from 'fast-deep-equal';
|
||||
import {extendsDeepEqual} from '@openstapps/collection-utils';
|
||||
import {SCSearchRequest, SCSearchResponse} from '@openstapps/core';
|
||||
import {CORE_VERSION, SCIndexResponse, SCSearchRequest, SCSearchResponse} from '@openstapps/core';
|
||||
import * as defaultConfig from '../../fixtures/config/default-config.json';
|
||||
|
||||
type InterceptArguments = {
|
||||
fixture?: string | SCSearchResponse | ((request: SCSearchRequest) => SCSearchResponse);
|
||||
@@ -34,7 +35,12 @@ type InterceptArguments = {
|
||||
*
|
||||
*/
|
||||
export function interceptConfig(config?: string) {
|
||||
cy.intercept({url: '/', method: 'POST'}, {fixture: config || 'config/default-config.json'}).as('config');
|
||||
let localConfig: SCIndexResponse = defaultConfig as unknown as SCIndexResponse;
|
||||
localConfig.backend.SCVersion = CORE_VERSION;
|
||||
cy.intercept(
|
||||
{url: '/', method: 'POST'},
|
||||
config ? {fixture: config} : {body: JSON.stringify(localConfig)},
|
||||
).as('config');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,7 +20,7 @@ const config = {
|
||||
htmlGlob: 'src/**/*.html',
|
||||
scriptGlob: 'src/**/*.ts',
|
||||
additionalIcons: {
|
||||
about: ['copyright', 'campaign', 'policy', 'description', 'text_snippet'],
|
||||
about: ['copyright', 'campaign', 'policy', 'description', 'text_snippet', 'expand_more', 'expand_all'],
|
||||
navigation: [
|
||||
'home',
|
||||
'newspaper',
|
||||
@@ -30,7 +30,7 @@ const config = {
|
||||
'local_library',
|
||||
'inventory_2',
|
||||
'map',
|
||||
'grade',
|
||||
'star',
|
||||
'account_circle',
|
||||
'settings',
|
||||
'info',
|
||||
|
||||
@@ -304,7 +304,7 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
@@ -355,7 +355,7 @@
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = iphoneos;
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
|
||||
@@ -373,7 +373,7 @@
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
DEVELOPMENT_TEAM = YSGS9WV338;
|
||||
INFOPLIST_FILE = App/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
||||
@@ -395,7 +395,7 @@
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
DEVELOPMENT_TEAM = YSGS9WV338;
|
||||
INFOPLIST_FILE = App/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios/scripts/pods_helpers'
|
||||
|
||||
platform :ios, '13.0'
|
||||
platform :ios, '15.0'
|
||||
use_frameworks!
|
||||
|
||||
# workaround to avoid Xcode caching of Pods that requires
|
||||
@@ -9,26 +9,27 @@ use_frameworks!
|
||||
install! 'cocoapods', :disable_input_output_paths => true
|
||||
|
||||
def capacitor_pods
|
||||
pod 'Capacitor', :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@6.2.1_@capacitor+core@6.2.1/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 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/app'
|
||||
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/browser'
|
||||
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/clipboard'
|
||||
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/device'
|
||||
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/dialog'
|
||||
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/filesystem'
|
||||
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/geolocation'
|
||||
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/haptics'
|
||||
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/keyboard'
|
||||
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/local-notifications'
|
||||
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/network'
|
||||
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/preferences'
|
||||
pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/screen-orientation'
|
||||
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/share'
|
||||
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/splash-screen'
|
||||
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 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.10.0_@capacitor+core@6.2.1/node_modules/capacitor-secure-storage-plugin'
|
||||
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios'
|
||||
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios'
|
||||
pod 'CapacitorCommunityInAppReview', :path => '../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review'
|
||||
pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness'
|
||||
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app'
|
||||
pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser'
|
||||
pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard'
|
||||
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device'
|
||||
pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog'
|
||||
pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem'
|
||||
pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation'
|
||||
pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics'
|
||||
pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard'
|
||||
pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications'
|
||||
pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network'
|
||||
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences'
|
||||
pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation'
|
||||
pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share'
|
||||
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen'
|
||||
pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch'
|
||||
pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.0.0/node_modules/capacitor-secure-storage-plugin'
|
||||
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
|
||||
end
|
||||
|
||||
|
||||
@@ -1,143 +1,157 @@
|
||||
PODS:
|
||||
- Capacitor (6.2.1):
|
||||
- Capacitor (8.0.0):
|
||||
- CapacitorCordova
|
||||
- CapacitorApp (6.0.0):
|
||||
- CapacitorApp (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorBrowser (6.0.1):
|
||||
- CapacitorBrowser (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorClipboard (6.0.0):
|
||||
- CapacitorClipboard (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorCommunityScreenBrightness (6.0.0):
|
||||
- CapacitorCommunityInAppReview (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorCordova (6.2.1)
|
||||
- CapacitorDevice (6.0.0):
|
||||
- CapacitorCommunityScreenBrightness (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorDialog (6.0.0):
|
||||
- CapacitorCordova (8.0.0)
|
||||
- CapacitorDevice (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorFilesystem (6.0.0):
|
||||
- CapacitorDialog (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorGeolocation (6.0.0):
|
||||
- CapacitorFilesystem (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorHaptics (6.0.0):
|
||||
- IONFilesystemLib (~> 1.0.1)
|
||||
- CapacitorGeolocation (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorKeyboard (6.0.1):
|
||||
- IONGeolocationLib (= 2.0.0)
|
||||
- CapacitorHaptics (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorLocalNotifications (6.0.0):
|
||||
- CapacitorKeyboard (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorNetwork (6.0.1):
|
||||
- CapacitorLocalNotifications (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorPreferences (6.0.1):
|
||||
- CapacitorNetwork (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorScreenOrientation (6.0.1):
|
||||
- CapacitorPreferences (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorSecureStoragePlugin (0.10.0):
|
||||
- CapacitorScreenOrientation (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorSecureStoragePlugin (0.12.0):
|
||||
- Capacitor
|
||||
- SwiftKeychainWrapper
|
||||
- CapacitorShare (6.0.1):
|
||||
- CapacitorShare (8.0.0):
|
||||
- Capacitor
|
||||
- CapacitorSplashScreen (6.0.1):
|
||||
- CapacitorSplashScreen (8.0.0):
|
||||
- Capacitor
|
||||
- CordovaPlugins (6.2.1):
|
||||
- CordovaPlugins (8.0.0):
|
||||
- CapacitorCordova
|
||||
- IONFilesystemLib (1.0.1)
|
||||
- IONGeolocationLib (2.0.0)
|
||||
- SwiftKeychainWrapper (4.0.1)
|
||||
- TransistorsoftCapacitorBackgroundFetch (6.0.0):
|
||||
- TransistorsoftCapacitorBackgroundFetch (7.1.0):
|
||||
- Capacitor
|
||||
|
||||
DEPENDENCIES:
|
||||
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios`)"
|
||||
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/app`)"
|
||||
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/browser`)"
|
||||
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.2.1/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`)"
|
||||
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.2.1_@capacitor+core@6.2.1/node_modules/@capacitor/ios`)"
|
||||
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/device`)"
|
||||
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/dialog`)"
|
||||
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/filesystem`)"
|
||||
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/geolocation`)"
|
||||
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/haptics`)"
|
||||
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/keyboard`)"
|
||||
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.2.1/node_modules/@capacitor/local-notifications`)"
|
||||
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/network`)"
|
||||
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/preferences`)"
|
||||
- "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/screen-orientation`)"
|
||||
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.10.0_@capacitor+core@6.2.1/node_modules/capacitor-secure-storage-plugin`)"
|
||||
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/share`)"
|
||||
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.2.1/node_modules/@capacitor/splash-screen`)"
|
||||
- "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios`)"
|
||||
- "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app`)"
|
||||
- "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser`)"
|
||||
- "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard`)"
|
||||
- "CapacitorCommunityInAppReview (from `../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review`)"
|
||||
- "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness`)"
|
||||
- "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios`)"
|
||||
- "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device`)"
|
||||
- "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog`)"
|
||||
- "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem`)"
|
||||
- "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation`)"
|
||||
- "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics`)"
|
||||
- "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard`)"
|
||||
- "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications`)"
|
||||
- "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network`)"
|
||||
- "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences`)"
|
||||
- "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation`)"
|
||||
- "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.0.0/node_modules/capacitor-secure-storage-plugin`)"
|
||||
- "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share`)"
|
||||
- "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen`)"
|
||||
- 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@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
|
||||
|
||||
SPEC REPOS:
|
||||
trunk:
|
||||
- IONFilesystemLib
|
||||
- IONGeolocationLib
|
||||
- SwiftKeychainWrapper
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard"
|
||||
CapacitorCommunityInAppReview:
|
||||
:path: "../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation"
|
||||
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.12.0_@capacitor+core@8.0.0/node_modules/capacitor-secure-storage-plugin"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share"
|
||||
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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen"
|
||||
CordovaPlugins:
|
||||
:path: "../capacitor-cordova-ios-plugins"
|
||||
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@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch"
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
Capacitor: c95400d761e376be9da6be5a05f226c0e865cebf
|
||||
CapacitorApp: 30145f2ea2311e4f3744472119ec87d2ddf4c0a7
|
||||
CapacitorBrowser: 6c0e04dc80556a966ebc2269ac72f09d83eec1ce
|
||||
CapacitorClipboard: c1cb27fea166aab5c99bda605d3bc768cf00eabe
|
||||
CapacitorCommunityScreenBrightness: 95d4c839fc8e925dcf75ffee66f62a00f560f146
|
||||
CapacitorCordova: 8d93e14982f440181be7304aa9559ca631d77fff
|
||||
CapacitorDevice: 38ad323d74e3a86b56253680538ac23a2c9b4a68
|
||||
CapacitorDialog: bd99f63c9788a137263b2d75e718b1fc4d9f70c3
|
||||
CapacitorFilesystem: 9c2cc1e89d3b8b91503b316e9f6c2915c9bf9419
|
||||
CapacitorGeolocation: 86f82a32b238ff79d5be6fc0943f2866965d3f1b
|
||||
CapacitorHaptics: 0cea833e6a8bf489dd6acaaebf6d953b90086c59
|
||||
CapacitorKeyboard: f38d730356be5569d72eb87ad9c8166947728c36
|
||||
CapacitorLocalNotifications: d051c73ec8bf38807214f5b905ee6426e13756f8
|
||||
CapacitorNetwork: 7ff188197e880d8485f280492b54d3202e9f3a61
|
||||
CapacitorPreferences: 97d529423bb7c1196455e9a1b6dd1074625c78bd
|
||||
CapacitorScreenOrientation: f3a0744a56f673929d18bd0d9a5ef5f5595e7352
|
||||
CapacitorSecureStoragePlugin: 545b51d782d35e61a39231ecf99a966b060a2cbb
|
||||
CapacitorShare: ec1bcbc16696696133740ac876192c0480ca3018
|
||||
CapacitorSplashScreen: d2d8fe9541d7bebdf735839b89edf6e762cea969
|
||||
CordovaPlugins: b40548c03c597049ef851a7014da5ac8f155d914
|
||||
Capacitor: 341ff7cf652ec695d1a8ebf604db448ac7b6d635
|
||||
CapacitorApp: 3963a84197280757b84f126afd1520a85ae3b092
|
||||
CapacitorBrowser: b7d7f05f840fe042e46f6528bb8db853e3058fb2
|
||||
CapacitorClipboard: 61832a3722adc61afed6e0191c8a0e11ba11674d
|
||||
CapacitorCommunityInAppReview: 4492bdd34aad4d27ed87949376022cc93b294ea1
|
||||
CapacitorCommunityScreenBrightness: e4075e1181f7e88259edb8b1e3b9a209e1144d45
|
||||
CapacitorCordova: 5dc3912d25ef770a3fe0f431bb65c9fbfa2e92f9
|
||||
CapacitorDevice: 9a16fb36a19ff391bf75afbe3cf16f883b3b3aa0
|
||||
CapacitorDialog: 3721e40dd075f590328166c29b4e982dbeedeb56
|
||||
CapacitorFilesystem: 2cb7c29536024668f333266a2177f8c10bbd9c98
|
||||
CapacitorGeolocation: 8a405e707de9aff6ac9eca7f408966a370f7ca33
|
||||
CapacitorHaptics: 2079d9fa04c5a71e18663b4722323c304c58245c
|
||||
CapacitorKeyboard: d7868c079a4d5277a3deca27a10a488fcbbb8b69
|
||||
CapacitorLocalNotifications: 177cfbf8228d9bd82a147e094cb7984d7afb9e29
|
||||
CapacitorNetwork: 156f8096cbbce5337eb1769fcc0d6adc4b85d3f3
|
||||
CapacitorPreferences: 443fabe9670226200e595658a87ef0b1566716d4
|
||||
CapacitorScreenOrientation: d962f79e5bcbba4e01e9dc0cd872abf465fb943f
|
||||
CapacitorSecureStoragePlugin: 50de0808ad398aa401e00f9e58adf88c77cb3c25
|
||||
CapacitorShare: 12f1d192170cbcf9f108fd675ac8e343761a4638
|
||||
CapacitorSplashScreen: 422880d7117605c30699eb4b21644b62db42e86c
|
||||
CordovaPlugins: f37f9ada1d1f5687772ab7338ada420056bd5d72
|
||||
IONFilesystemLib: 89258b8e3e85465da93127d25d7ce37f977e8a6f
|
||||
IONGeolocationLib: a5e40b54edc2ee9902036eda5aaa41ddf07bb68d
|
||||
SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
|
||||
TransistorsoftCapacitorBackgroundFetch: dfa73a0fd038bc1986255360e4b20165a4a0f066
|
||||
TransistorsoftCapacitorBackgroundFetch: 28e561636145a899f05025d31f627019c16791f5
|
||||
|
||||
PODFILE CHECKSUM: 601bc3c09529fe24d68110bc709379698476efe1
|
||||
PODFILE CHECKSUM: 04efbf7f9f98cfcdac2ab7f4cb7f6925fd81e87e
|
||||
|
||||
COCOAPODS: 1.16.2
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@openstapps/app",
|
||||
"description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
|
||||
"version": "3.3.5",
|
||||
"version": "4.0.3",
|
||||
"private": true,
|
||||
"license": "GPL-3.0-only",
|
||||
"author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
|
||||
@@ -48,53 +48,53 @@
|
||||
"test:integration": "sh integration-test.sh"
|
||||
},
|
||||
"dependencies": {
|
||||
"@angular/animations": "17.3.12",
|
||||
"@angular/cdk": "17.3.10",
|
||||
"@angular/common": "17.3.12",
|
||||
"@angular/core": "17.3.12",
|
||||
"@angular/forms": "17.3.12",
|
||||
"@angular/platform-browser": "17.3.12",
|
||||
"@angular/router": "17.3.12",
|
||||
"@awesome-cordova-plugins/calendar": "6.6.0",
|
||||
"@awesome-cordova-plugins/core": "6.6.0",
|
||||
"@capacitor-community/screen-brightness": "6.0.0",
|
||||
"@capacitor/app": "6.0.0",
|
||||
"@capacitor/browser": "6.0.1",
|
||||
"@capacitor/clipboard": "6.0.0",
|
||||
"@capacitor/core": "6.2.1",
|
||||
"@capacitor/device": "6.0.0",
|
||||
"@capacitor/dialog": "6.0.0",
|
||||
"@capacitor/filesystem": "6.0.0",
|
||||
"@capacitor/geolocation": "6.0.0",
|
||||
"@capacitor/haptics": "6.0.0",
|
||||
"@capacitor/keyboard": "6.0.1",
|
||||
"@capacitor/local-notifications": "6.0.0",
|
||||
"@capacitor/network": "6.0.1",
|
||||
"@capacitor/preferences": "6.0.1",
|
||||
"@capacitor/screen-orientation": "6.0.1",
|
||||
"@capacitor/share": "6.0.1",
|
||||
"@capacitor/splash-screen": "6.0.1",
|
||||
"@ionic-native/core": "5.36.0",
|
||||
"@ionic/angular": "8.6.1",
|
||||
"@ionic/angular-server": "8.6.1",
|
||||
"@angular/animations": "18.2.13",
|
||||
"@angular/cdk": "18.2.13",
|
||||
"@angular/common": "18.2.13",
|
||||
"@angular/core": "18.2.13",
|
||||
"@angular/forms": "18.2.13",
|
||||
"@angular/platform-browser": "18.2.13",
|
||||
"@angular/router": "18.2.13",
|
||||
"@awesome-cordova-plugins/calendar": "8.1.0",
|
||||
"@awesome-cordova-plugins/core": "8.1.0",
|
||||
"@capacitor-community/in-app-review": "8.0.0",
|
||||
"@capacitor-community/screen-brightness": "8.0.0",
|
||||
"@capacitor/app": "8.0.0",
|
||||
"@capacitor/browser": "8.0.0",
|
||||
"@capacitor/clipboard": "8.0.0",
|
||||
"@capacitor/core": "8.0.0",
|
||||
"@capacitor/device": "8.0.0",
|
||||
"@capacitor/dialog": "8.0.0",
|
||||
"@capacitor/filesystem": "8.0.0",
|
||||
"@capacitor/geolocation": "8.0.0",
|
||||
"@capacitor/haptics": "8.0.0",
|
||||
"@capacitor/keyboard": "8.0.0",
|
||||
"@capacitor/local-notifications": "8.0.0",
|
||||
"@capacitor/network": "8.0.0",
|
||||
"@capacitor/preferences": "8.0.0",
|
||||
"@capacitor/screen-orientation": "8.0.0",
|
||||
"@capacitor/share": "8.0.0",
|
||||
"@capacitor/splash-screen": "8.0.0",
|
||||
"@ionic/angular": "8.7.16",
|
||||
"@ionic/angular-server": "8.7.16",
|
||||
"@ionic/storage-angular": "4.0.0",
|
||||
"@maplibre/ngx-maplibre-gl": "17.4.1",
|
||||
"@ngx-translate/core": "15.0.0",
|
||||
"@ngx-translate/http-loader": "8.0.0",
|
||||
"@openid/appauth": "1.3.1",
|
||||
"@openid/appauth": "1.3.2",
|
||||
"@openstapps/api": "workspace:*",
|
||||
"@openstapps/collection-utils": "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",
|
||||
"capacitor-secure-storage-plugin": "0.10.0",
|
||||
"capacitor-secure-storage-plugin": "0.12.0",
|
||||
"cordova-plugin-calendar": "5.1.6",
|
||||
"date-fns": "3.6.0",
|
||||
"deepmerge": "4.3.1",
|
||||
"form-data": "4.0.0",
|
||||
"form-data": "4.0.4",
|
||||
"geojson": "0.5.0",
|
||||
"ionic-appauth": "0.9.0",
|
||||
"ionicons": "7.4.0",
|
||||
"ionic-appauth": "2.1.0",
|
||||
"ionicons": "8.0.13",
|
||||
"jsonpath-plus": "10.3.0",
|
||||
"maplibre-gl": "4.0.2",
|
||||
"material-symbols": "0.17.1",
|
||||
@@ -110,32 +110,32 @@
|
||||
"semver": "7.6.0",
|
||||
"swiper": "8.4.5",
|
||||
"tslib": "2.6.2",
|
||||
"zone.js": "0.14.4"
|
||||
"zone.js": "0.14.10"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/architect": "0.1703.17",
|
||||
"@angular-devkit/build-angular": "17.3.17",
|
||||
"@angular-devkit/core": "17.3.17",
|
||||
"@angular-devkit/schematics": "17.3.17",
|
||||
"@angular-eslint/builder": "17.5.3",
|
||||
"@angular-eslint/eslint-plugin": "17.5.3",
|
||||
"@angular-eslint/eslint-plugin-template": "17.5.3",
|
||||
"@angular-eslint/schematics": "17.5.3",
|
||||
"@angular-eslint/template-parser": "17.5.3",
|
||||
"@angular/cli": "17.3.17",
|
||||
"@angular/compiler": "17.3.12",
|
||||
"@angular/compiler-cli": "17.3.12",
|
||||
"@angular/language-server": "17.3.2",
|
||||
"@angular/language-service": "17.3.12",
|
||||
"@angular/platform-browser-dynamic": "17.3.12",
|
||||
"@capacitor/android": "6.2.1",
|
||||
"@capacitor/assets": "3.0.4",
|
||||
"@capacitor/cli": "6.2.1",
|
||||
"@capacitor/ios": "6.2.1",
|
||||
"@angular-devkit/architect": "0.1802.20",
|
||||
"@angular-devkit/build-angular": "18.2.20",
|
||||
"@angular-devkit/core": "18.2.20",
|
||||
"@angular-devkit/schematics": "18.2.20",
|
||||
"@angular-eslint/builder": "18.4.3",
|
||||
"@angular-eslint/eslint-plugin": "18.4.3",
|
||||
"@angular-eslint/eslint-plugin-template": "18.4.3",
|
||||
"@angular-eslint/schematics": "18.4.1",
|
||||
"@angular-eslint/template-parser": "18.4.3",
|
||||
"@angular/cli": "18.2.20",
|
||||
"@angular/compiler": "18.2.13",
|
||||
"@angular/compiler-cli": "18.2.13",
|
||||
"@angular/language-server": "18.2.0",
|
||||
"@angular/language-service": "18.2.13",
|
||||
"@angular/platform-browser-dynamic": "18.2.13",
|
||||
"@capacitor/android": "8.0.0",
|
||||
"@capacitor/assets": "3.0.5",
|
||||
"@capacitor/cli": "8.0.0",
|
||||
"@capacitor/ios": "8.0.0",
|
||||
"@compodoc/compodoc": "1.1.23",
|
||||
"@cypress/schematic": "2.5.1",
|
||||
"@ionic/angular-toolkit": "11.0.1",
|
||||
"@ionic/cli": "7.2.0",
|
||||
"@cypress/schematic": "4.1.1",
|
||||
"@ionic/angular-toolkit": "12.3.0",
|
||||
"@ionic/cli": "7.2.1",
|
||||
"@openstapps/prettier-config": "workspace:*",
|
||||
"@openstapps/tsconfig": "workspace:*",
|
||||
"@types/fontkit": "2.0.7",
|
||||
@@ -149,17 +149,17 @@
|
||||
"@types/karma-jasmine": "4.0.5",
|
||||
"@types/node": "22.15.31",
|
||||
"@types/semver": "7.5.8",
|
||||
"@typescript-eslint/eslint-plugin": "7.2.0",
|
||||
"@typescript-eslint/parser": "7.2.0",
|
||||
"@typescript-eslint/eslint-plugin": "7.11.0",
|
||||
"@typescript-eslint/parser": "7.11.0",
|
||||
"cordova-res": "0.15.4",
|
||||
"cypress": "13.10.0",
|
||||
"cypress": "15.0.0",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-plugin-jsdoc": "48.2.1",
|
||||
"eslint-plugin-prettier": "5.1.3",
|
||||
"eslint-plugin-unicorn": "51.0.1",
|
||||
"fast-deep-equal": "3.1.3",
|
||||
"fontkit": "2.0.2",
|
||||
"glob": "10.3.10",
|
||||
"glob": "10.5.0",
|
||||
"http-server": "14.1.1",
|
||||
"is-docker": "2.2.1",
|
||||
"jasmine-core": "5.1.2",
|
||||
|
||||
@@ -33,6 +33,7 @@ import {sampleAuthConfiguration} from './_helpers/data/sample-configuration';
|
||||
import {StorageProvider} from './modules/storage/storage.provider';
|
||||
import {SimpleBrowser} from './util/browser.factory';
|
||||
import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
|
||||
import {InAppReviewProvider} from './modules/settings/in-app-review/in-app-review.provider';
|
||||
|
||||
describe('AppComponent', () => {
|
||||
let platformReadySpy: any;
|
||||
@@ -40,6 +41,7 @@ describe('AppComponent', () => {
|
||||
let translateServiceSpy: jasmine.SpyObj<TranslateService>;
|
||||
let thingTranslateServiceSpy: jasmine.SpyObj<ThingTranslateService>;
|
||||
let settingsProvider: jasmine.SpyObj<SettingsProvider>;
|
||||
let inAppReviewProvider: jasmine.SpyObj<InAppReviewProvider>;
|
||||
let configProvider: jasmine.SpyObj<ConfigProvider>;
|
||||
let ngxLogger: jasmine.SpyObj<NGXLogger>;
|
||||
let scheduleSyncServiceSpy: jasmine.SpyObj<ScheduleSyncService>;
|
||||
@@ -85,6 +87,7 @@ describe('AppComponent', () => {
|
||||
{provide: ThingTranslateService, useValue: thingTranslateServiceSpy},
|
||||
{provide: ScheduleSyncService, useValue: scheduleSyncServiceSpy},
|
||||
{provide: SettingsProvider, useValue: settingsProvider},
|
||||
{provide: InAppReviewProvider, useValue: inAppReviewProvider},
|
||||
{provide: ConfigProvider, useValue: configProvider},
|
||||
{provide: NGXLogger, useValue: ngxLogger},
|
||||
{provide: StorageProvider, useValue: storageProvider},
|
||||
|
||||
@@ -17,6 +17,7 @@ import {Router} from '@angular/router';
|
||||
import {App, URLOpenListenerEvent} from '@capacitor/app';
|
||||
import {Platform, ToastController} from '@ionic/angular/standalone';
|
||||
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 {environment} from '../environments/environment';
|
||||
import {Capacitor} from '@capacitor/core';
|
||||
@@ -55,6 +56,7 @@ export class AppComponent implements AfterContentInit {
|
||||
constructor(
|
||||
private readonly platform: Platform,
|
||||
private readonly settingsProvider: SettingsProvider,
|
||||
private readonly inAppReviewProvider: InAppReviewProvider,
|
||||
private readonly router: Router,
|
||||
private readonly zone: NgZone,
|
||||
private readonly authHelper: AuthHelperService,
|
||||
@@ -86,6 +88,8 @@ export class AppComponent implements AfterContentInit {
|
||||
async hideSplash() {
|
||||
if (Capacitor.isNativePlatform()) {
|
||||
void SplashScreen.hide();
|
||||
await this.inAppReviewProvider.increaseSessionCount();
|
||||
void this.inAppReviewProvider.startInAppReviewIfFeasible();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<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-label [innerHTML]="'schedule.recurring' | translate"></ion-label>
|
||||
</a>
|
||||
|
||||
@@ -127,6 +127,7 @@ export class AddEventActionChipComponent {
|
||||
.filter(it => it.selected)
|
||||
.map(it => it.item),
|
||||
},
|
||||
mode: 'md', // TODO Remove if Issue 239 is solved.
|
||||
});
|
||||
|
||||
await modal.present();
|
||||
|
||||
@@ -36,7 +36,7 @@ export class ChipFilterComponent {
|
||||
/**
|
||||
* 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
|
||||
@@ -47,6 +47,6 @@ export class ChipFilterComponent {
|
||||
* Signalize that the chip filter has been activated/deactivated
|
||||
*/
|
||||
emitToggle(value: unknown) {
|
||||
this.toggle.emit(value);
|
||||
this.toggled.emit(value);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,6 @@
|
||||
[size]="24"
|
||||
[fill]="(isFavorite$ | async) || false"
|
||||
[class.selected]="isFavorite$ | async"
|
||||
name="grade"
|
||||
name="star"
|
||||
></ion-icon>
|
||||
</ion-button>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
slot="icon-only"
|
||||
[size]="32"
|
||||
color="medium"
|
||||
name="grade"
|
||||
name="star"
|
||||
></ion-icon>
|
||||
}
|
||||
<label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
|
||||
|
||||
@@ -15,7 +15,12 @@
|
||||
import {Component, DestroyRef, inject, Input, OnInit} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
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 {
|
||||
SCFacet,
|
||||
@@ -36,6 +41,8 @@ import {PositionService} from '../../map/position.service';
|
||||
import {ConfigProvider} from '../../config/config.provider';
|
||||
import {searchPageSwitchAnimation} from './search-page-switch-animation';
|
||||
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
|
||||
@@ -173,7 +180,8 @@ export class SearchPageComponent implements OnInit {
|
||||
private readonly route: ActivatedRoute,
|
||||
protected positionService: PositionService,
|
||||
private readonly configProvider: ConfigProvider,
|
||||
animationController: AnimationController,
|
||||
protected animationController: AnimationController,
|
||||
protected modalController: ModalController,
|
||||
) {
|
||||
this.routeAnimation = searchPageSwitchAnimation(animationController);
|
||||
}
|
||||
@@ -368,4 +376,21 @@ export class SearchPageComponent implements OnInit {
|
||||
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
|
||||
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
@if (showContextMenu) {
|
||||
<stapps-context contentId="data-list"></stapps-context>
|
||||
}
|
||||
<ion-header>
|
||||
@if (showDrawer && showTopToolbar) {
|
||||
<ion-toolbar color="primary" mode="ios">
|
||||
@@ -41,7 +37,8 @@
|
||||
>
|
||||
</ion-searchbar>
|
||||
@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-menu-button>
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
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 {NGXLogger} from 'ngx-logger';
|
||||
import {debounceTime, distinctUntilChanged, startWith, take} from 'rxjs/operators';
|
||||
@@ -55,6 +55,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
||||
private favoritesService: FavoritesService,
|
||||
configProvider: ConfigProvider,
|
||||
animationController: AnimationController,
|
||||
modalController: ModalController,
|
||||
) {
|
||||
super(
|
||||
alertController,
|
||||
@@ -68,6 +69,7 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
||||
positionService,
|
||||
configProvider,
|
||||
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
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation, version 3.
|
||||
@@ -12,76 +12,40 @@
|
||||
* 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 {Component, Input} from '@angular/core';
|
||||
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
|
||||
import {SCLanguage, SCThingTranslator, SCThingType, SCTranslations} from '@openstapps/core';
|
||||
import {ContextMenuService} from './context-menu.service';
|
||||
import {FilterContext, FilterFacet, SortContext, SortContextOption} from './context-type.js';
|
||||
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({
|
||||
selector: 'stapps-context',
|
||||
templateUrl: 'context-menu.html',
|
||||
selector: 'stapps-context-menu-modal',
|
||||
templateUrl: './context-menu-modal.html',
|
||||
})
|
||||
export class ContextMenuComponent {
|
||||
/**
|
||||
* Id of the content the menu is used for
|
||||
*/
|
||||
@Input()
|
||||
contentId: string;
|
||||
export class ContextMenuModalComponent implements OnInit, OnDestroy {
|
||||
@Input() contextMenuService: ContextMenuService;
|
||||
|
||||
/**
|
||||
* Amount of filter options shown on compact view
|
||||
*/
|
||||
compactFilterOptionCount = 5;
|
||||
|
||||
/**
|
||||
* Container for the filter context
|
||||
*/
|
||||
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;
|
||||
|
||||
/**
|
||||
* Core translator
|
||||
*/
|
||||
language: keyof SCTranslations<SCLanguage>;
|
||||
|
||||
translator: SCThingTranslator;
|
||||
|
||||
scThingType = SCThingType;
|
||||
|
||||
// Using a subject to manage subscriptions for clean-up
|
||||
private readonly destroy$ = new Subject<void>();
|
||||
|
||||
constructor(
|
||||
private translateService: TranslateService,
|
||||
private readonly contextMenuService: ContextMenuService,
|
||||
private readonly modalController: ModalController,
|
||||
) {
|
||||
this.language = this.translateService.currentLang as keyof SCTranslations<SCLanguage>;
|
||||
this.translator = new SCThingTranslator(this.language);
|
||||
@@ -90,43 +54,56 @@ export class ContextMenuComponent {
|
||||
this.language = event.lang as keyof SCTranslations<SCLanguage>;
|
||||
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;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets selected filter options and updates listener
|
||||
*/
|
||||
ngOnDestroy(): void {
|
||||
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 = () => {
|
||||
this.contextMenuService.contextFilterChanged(this.filterOption);
|
||||
};
|
||||
|
||||
/**
|
||||
* 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) => {
|
||||
sortChanged(option: SortContext, value: SortContextOption) {
|
||||
if (option.value === value.value) {
|
||||
if (value.reversible) {
|
||||
option.reversed = !option.reversed;
|
||||
@@ -138,5 +115,13 @@ export class ContextMenuComponent {
|
||||
}
|
||||
}
|
||||
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
|
||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import {TestBed} from '@angular/core/testing';
|
||||
|
||||
import {ContextMenuService} from './context-menu.service';
|
||||
import {SCFacet} from '@openstapps/core';
|
||||
import {FilterContext, SortContext} from './context-type';
|
||||
import {ThingTranslateModule} from '../../../translation/thing-translate.module';
|
||||
import {TranslateModule} from '@ngx-translate/core';
|
||||
import {firstValueFrom, filter} from 'rxjs';
|
||||
|
||||
describe('ContextMenuService', () => {
|
||||
let service: ContextMenuService;
|
||||
@@ -36,39 +35,39 @@ describe('ContextMenuService', () => {
|
||||
expect(service).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should update filterOptions', done => {
|
||||
service.filterContextChanged$.subscribe(result => {
|
||||
expect(result).toBeDefined();
|
||||
done();
|
||||
});
|
||||
it('should update filterOptions', async () => {
|
||||
service.updateContextFilter(facetsMock);
|
||||
|
||||
const result = await firstValueFrom(service.filterContextChanged$.pipe(filter(Boolean)));
|
||||
|
||||
expect(result).toBeDefined();
|
||||
});
|
||||
|
||||
it('should update filterQuery', done => {
|
||||
service.filterContextChanged$.subscribe(result => {
|
||||
expect(result).toBeDefined();
|
||||
expect(service.contextFilter.options[0].buckets.length).toEqual(
|
||||
filterContext.options[0].buckets.length,
|
||||
);
|
||||
done();
|
||||
});
|
||||
it('should update filterQuery', async () => {
|
||||
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 => {
|
||||
service.sortContextChanged$.subscribe(result => {
|
||||
expect(result).toBeDefined();
|
||||
done();
|
||||
});
|
||||
it('should update sortOptions', async () => {
|
||||
service.setContextSort(sortContext);
|
||||
|
||||
const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
|
||||
|
||||
expect(result).toBeDefined();
|
||||
});
|
||||
|
||||
it('should update sortQuery', done => {
|
||||
service.sortContextChanged$.subscribe(result => {
|
||||
expect(result).toBeDefined();
|
||||
done();
|
||||
});
|
||||
it('should update sortQuery', async () => {
|
||||
service.setContextSort(sortContext);
|
||||
|
||||
const result = await firstValueFrom(service.sortContextChanged$.pipe(filter(Boolean)));
|
||||
|
||||
expect(result).toBeDefined();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
SCThingType,
|
||||
SCTranslations,
|
||||
} from '@openstapps/core';
|
||||
import {Subject} from 'rxjs';
|
||||
import {BehaviorSubject} from 'rxjs';
|
||||
import {FilterBucket, FilterContext, FilterFacet, SortContext, TransformedFacet} from './context-type';
|
||||
import {TranslateService} from '@ngx-translate/core';
|
||||
import {ThingTranslateService} from '../../../translation/thing-translate.service';
|
||||
@@ -40,7 +40,7 @@ export class ContextMenuService {
|
||||
/**
|
||||
* Container for the filter context
|
||||
*/
|
||||
filterOptions = new Subject<FilterContext>();
|
||||
filterOptions = new BehaviorSubject<FilterContext | undefined>(undefined);
|
||||
|
||||
/**
|
||||
* Observable filterContext streams
|
||||
@@ -50,7 +50,7 @@ export class ContextMenuService {
|
||||
/**
|
||||
* Container for the filter query (SCSearchFilter)
|
||||
*/
|
||||
filterQuery = new Subject<SCSearchFilter | undefined>();
|
||||
filterQuery = new BehaviorSubject<SCSearchFilter | undefined>(undefined);
|
||||
|
||||
/**
|
||||
* Observable filterContext streams
|
||||
@@ -65,7 +65,7 @@ export class ContextMenuService {
|
||||
/**
|
||||
* Container for the sort context
|
||||
*/
|
||||
sortOptions = new Subject<SortContext>();
|
||||
sortOptions = new BehaviorSubject<SortContext | undefined>(undefined);
|
||||
|
||||
/**
|
||||
* Observable SortContext streams
|
||||
@@ -75,7 +75,7 @@ export class ContextMenuService {
|
||||
/**
|
||||
* Container for the sort query
|
||||
*/
|
||||
sortQuery = new Subject<SCSearchSort[] | undefined>();
|
||||
sortQuery = new BehaviorSubject<SCSearchSort[] | undefined>(undefined);
|
||||
|
||||
/**
|
||||
* Observable SortContext streams
|
||||
|
||||
@@ -19,12 +19,13 @@ import {RouterModule} from '@angular/router';
|
||||
import {LayoutModule} from '@angular/cdk/layout';
|
||||
import {TranslateModule} from '@ngx-translate/core';
|
||||
import {SettingsModule} from '../settings/settings.module';
|
||||
import {ContextMenuComponent} from './context/context-menu.component';
|
||||
import {ContextMenuService} from './context/context-menu.service';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonCheckbox,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonList,
|
||||
@@ -39,13 +40,14 @@ import {
|
||||
IonToolbar,
|
||||
} from '@ionic/angular/standalone';
|
||||
import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
||||
import {ContextMenuModalComponent} from './context/context-menu-modal.component';
|
||||
|
||||
/**
|
||||
* Menu module
|
||||
*/
|
||||
@NgModule({
|
||||
declarations: [ContextMenuComponent],
|
||||
exports: [ContextMenuComponent],
|
||||
declarations: [ContextMenuModalComponent],
|
||||
exports: [ContextMenuModalComponent],
|
||||
imports: [
|
||||
CommonModule,
|
||||
IonIconDirective,
|
||||
@@ -69,6 +71,8 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
||||
IonRadioGroup,
|
||||
IonContent,
|
||||
IonToolbar,
|
||||
IonButtons,
|
||||
IonHeader,
|
||||
],
|
||||
providers: [ContextMenuService],
|
||||
})
|
||||
|
||||
@@ -62,7 +62,9 @@ export class TabsComponent {
|
||||
void this.loadMenuEntries();
|
||||
this.router.events.subscribe((event: unknown) => {
|
||||
if (event instanceof NavigationEnd) {
|
||||
this.selectTab(event.url);
|
||||
setTimeout(() => {
|
||||
this.selectTab(event.url);
|
||||
}, 300);
|
||||
}
|
||||
});
|
||||
this.selectTab(router.url);
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
-->
|
||||
<div class="header">
|
||||
<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 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>
|
||||
<infinite-swiper
|
||||
class="header-swiper"
|
||||
|
||||
@@ -136,7 +136,7 @@ export class SchedulePageComponent implements OnInit, AfterViewInit {
|
||||
onInit() {
|
||||
this.tabChoreographer = new SharedAxisChoreographer(this.activatedRoute.snapshot.paramMap.get('mode'), [
|
||||
'calendar',
|
||||
'week-overview',
|
||||
'weekly-view',
|
||||
'single',
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
@if (tabChoreographer.currentValue === 'calendar') {
|
||||
<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>
|
||||
}
|
||||
@if (tabChoreographer.currentValue === 'single') {
|
||||
@@ -39,7 +39,7 @@
|
||||
<ion-label class="ion-text-wrap" [innerHTML]="'schedule.calendar' | translate"></ion-label>
|
||||
<ion-icon name="calendar_today"></ion-icon>
|
||||
</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-icon name="event_repeat"></ion-icon>
|
||||
</ion-segment-button>
|
||||
@@ -61,7 +61,7 @@
|
||||
<stapps-calendar-view [layout]="layout"></stapps-calendar-view>
|
||||
}
|
||||
<!-- Schedule view needs full week -->
|
||||
@case ('week-overview') {
|
||||
@case ('weekly-view') {
|
||||
<stapps-schedule-view [layout]="layout"></stapps-schedule-view>
|
||||
}
|
||||
@case ('single') {
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
-->
|
||||
<div class="header">
|
||||
<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 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>
|
||||
<swiper
|
||||
class="header-swiper"
|
||||
|
||||
@@ -66,7 +66,7 @@ import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
|
||||
const settingsRoutes: Routes = [
|
||||
{path: 'schedule', 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'},
|
||||
// calendar | recurring | single
|
||||
{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>
|
||||
@if (!compactView) {
|
||||
<ion-note>{{ 'description' | thingTranslate: setting | titlecase }}</ion-note>
|
||||
<ion-note>{{ 'description' | thingTranslate: setting }}</ion-note>
|
||||
}
|
||||
@if (isVisible) {
|
||||
<div>
|
||||
|
||||
@@ -55,6 +55,7 @@ import {
|
||||
IonToolbar,
|
||||
} from '@ionic/angular/standalone';
|
||||
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}];
|
||||
|
||||
@@ -101,6 +102,13 @@ const settingsRoutes: Routes = [{path: 'settings', component: SettingsPageCompon
|
||||
IonInput,
|
||||
IonNote,
|
||||
],
|
||||
providers: [ScheduleSyncService, SettingsProvider, CalendarService, ScheduleProvider, ThingTranslatePipe],
|
||||
providers: [
|
||||
ScheduleSyncService,
|
||||
SettingsProvider,
|
||||
InAppReviewProvider,
|
||||
CalendarService,
|
||||
ScheduleProvider,
|
||||
ThingTranslatePipe,
|
||||
],
|
||||
})
|
||||
export class SettingsModule {}
|
||||
|
||||
@@ -304,8 +304,8 @@ describe('SettingsProvider', () => {
|
||||
},
|
||||
en: {
|
||||
description:
|
||||
'The user group the app is going to be used.' +
|
||||
'This settings for example is getting used for the predefined price category of mensa meals.',
|
||||
'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.',
|
||||
name: 'Group',
|
||||
},
|
||||
},
|
||||
|
||||
@@ -106,7 +106,6 @@ describe('StorageProvider', () => {
|
||||
});
|
||||
|
||||
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());
|
||||
await storageProvider.putMultiple(sampleEntries);
|
||||
|
||||
|
||||
@@ -120,8 +120,9 @@ export class StorageProvider {
|
||||
* Puts a value of type T into the storage using provided key
|
||||
* @param key Unique identifier
|
||||
* @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);
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ const iconMap = new Map<string, MaterialSymbol>([
|
||||
[menuSharp, SCIcon.menu],
|
||||
[searchOutline, SCIcon.search],
|
||||
[searchSharp, SCIcon.search],
|
||||
[chevronExpand, SCIcon.expand_more],
|
||||
[chevronExpand, SCIcon.expand_all],
|
||||
[caretDownSharp, SCIcon.expand_more],
|
||||
[close, SCIcon.close],
|
||||
[closeSharp, SCIcon.close],
|
||||
|
||||
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user