Compare commits

...
273 changed files with 6442 additions and 4885 deletions
+1 -1
View File
@@ -100,7 +100,7 @@
"supertest": "6.3.3", "supertest": "6.3.3",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"tsup": "8.5.0", "tsup": "8.5.0",
"typescript": "5.4.2" "typescript": "5.5.4"
}, },
"tsup": { "tsup": {
"entry": [ "entry": [
+1 -1
View File
@@ -51,7 +51,7 @@
"is-cidr": "4.0.2", "is-cidr": "4.0.2",
"mustache": "4.2.0", "mustache": "4.2.0",
"semver": "7.6.0", "semver": "7.6.0",
"typescript": "5.4.2" "typescript": "5.5.4"
}, },
"devDependencies": { "devDependencies": {
"@openstapps/api-cli": "workspace:*", "@openstapps/api-cli": "workspace:*",
+3 -3
View File
@@ -19,11 +19,11 @@
"@openstapps/tsconfig": "workspace:*", "@openstapps/tsconfig": "workspace:*",
"@types/node": "22.15.31", "@types/node": "22.15.31",
"eslint": "8.57.0", "eslint": "8.57.0",
"typescript": "5.4.2" "typescript": "5.5.4"
}, },
"peerDependencies": { "peerDependencies": {
"@typescript-eslint/eslint-plugin": "7.11.0", "@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.11.0", "@typescript-eslint/parser": "7.18.0",
"eslint": "8.57.0", "eslint": "8.57.0",
"eslint-config-prettier": "9.1.0", "eslint-config-prettier": "9.1.0",
"eslint-plugin-jsdoc": "48.2.1", "eslint-plugin-jsdoc": "48.2.1",
+2 -1
View File
@@ -9,7 +9,8 @@ const config = {
trailingComma: 'all', trailingComma: 'all',
bracketSpacing: false, bracketSpacing: false,
arrowParens: 'avoid', arrowParens: 'avoid',
endOfLine: 'lf' endOfLine: 'lf',
htmlWhitespaceSensitivity: 'strict'
} }
module.exports = config; module.exports = config;
+1 -1
View File
@@ -64,7 +64,7 @@
"mocha-junit-reporter": "2.2.0", "mocha-junit-reporter": "2.2.0",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"tsup": "8.5.0", "tsup": "8.5.0",
"typescript": "5.4.2" "typescript": "5.5.4"
}, },
"tsup": { "tsup": {
"entry": [ "entry": [
+1 -1
View File
@@ -55,7 +55,7 @@
"nock": "13.3.1", "nock": "13.3.1",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"tsup": "8.5.0", "tsup": "8.5.0",
"typescript": "5.4.2" "typescript": "5.5.4"
}, },
"tsup": { "tsup": {
"entry": [ "entry": [
+1 -1
View File
@@ -44,7 +44,7 @@
"@types/express": "4.17.17", "@types/express": "4.17.17",
"@types/node": "22.15.31", "@types/node": "22.15.31",
"tsup": "8.5.0", "tsup": "8.5.0",
"typescript": "5.4.2" "typescript": "5.5.4"
}, },
"tsup": { "tsup": {
"entry": [ "entry": [
+2 -1
View File
@@ -65,7 +65,8 @@
], ],
"@typescript-eslint/lines-between-class-members": ["error", "always"], "@typescript-eslint/lines-between-class-members": ["error", "always"],
"@typescript-eslint/no-explicit-any": "error", "@typescript-eslint/no-explicit-any": "error",
"@angular-eslint/use-lifecycle-interface": "error" "@angular-eslint/use-lifecycle-interface": "error",
"@angular-eslint/prefer-standalone": "off"
} }
}, },
{ {
+34
View File
@@ -40,6 +40,16 @@
"glob": "CHANGELOG.md", "glob": "CHANGELOG.md",
"input": ".", "input": ".",
"output": "assets" "output": "assets"
},
{
"glob": "maplibre-gl-worker.mjs",
"input": "node_modules/maplibre-gl/dist",
"output": "/"
},
{
"glob": "maplibre-gl-shared.mjs",
"input": "node_modules/maplibre-gl/dist",
"output": "/"
} }
], ],
"styles": [ "styles": [
@@ -195,6 +205,30 @@
}, },
"@ionic/angular-toolkit:page": { "@ionic/angular-toolkit:page": {
"styleext": "scss" "styleext": "scss"
},
"@schematics/angular:component": {
"type": "component"
},
"@schematics/angular:directive": {
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
} }
} }
} }
+51 -51
View File
@@ -48,37 +48,37 @@
"test:integration": "sh integration-test.sh" "test:integration": "sh integration-test.sh"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "18.2.13", "@angular/animations": "20.3.31",
"@angular/cdk": "18.2.13", "@angular/cdk": "20.2.14",
"@angular/common": "18.2.13", "@angular/common": "20.3.31",
"@angular/core": "18.2.13", "@angular/core": "20.3.31",
"@angular/forms": "18.2.13", "@angular/forms": "20.3.31",
"@angular/platform-browser": "18.2.13", "@angular/platform-browser": "20.3.31",
"@angular/router": "18.2.13", "@angular/router": "20.3.31",
"@awesome-cordova-plugins/calendar": "8.1.0", "@awesome-cordova-plugins/calendar": "8.1.0",
"@awesome-cordova-plugins/core": "8.1.0", "@awesome-cordova-plugins/core": "8.1.0",
"@capacitor-community/in-app-review": "8.0.0", "@capacitor-community/in-app-review": "8.0.0",
"@capacitor-community/screen-brightness": "8.0.0", "@capacitor-community/screen-brightness": "8.0.0",
"@capacitor/app": "8.0.1", "@capacitor/app": "8.0.1",
"@capacitor/browser": "8.0.2", "@capacitor/browser": "8.0.4",
"@capacitor/clipboard": "8.0.1", "@capacitor/clipboard": "8.0.1",
"@capacitor/core": "8.2.0", "@capacitor/core": "8.2.0",
"@capacitor/device": "8.0.1", "@capacitor/device": "8.0.3",
"@capacitor/dialog": "8.0.1", "@capacitor/dialog": "8.0.1",
"@capacitor/filesystem": "8.1.2", "@capacitor/filesystem": "8.1.3",
"@capacitor/geolocation": "8.1.0", "@capacitor/geolocation": "8.1.0",
"@capacitor/haptics": "8.0.1", "@capacitor/haptics": "8.0.2",
"@capacitor/keyboard": "8.0.1", "@capacitor/keyboard": "8.0.5",
"@capacitor/local-notifications": "8.0.2", "@capacitor/local-notifications": "8.0.2",
"@capacitor/network": "8.0.1", "@capacitor/network": "8.0.1",
"@capacitor/preferences": "8.0.1", "@capacitor/preferences": "8.0.1",
"@capacitor/screen-orientation": "8.0.1", "@capacitor/screen-orientation": "8.0.1",
"@capacitor/share": "8.0.1", "@capacitor/share": "8.0.1",
"@capacitor/splash-screen": "8.0.1", "@capacitor/splash-screen": "8.0.2",
"@ionic/angular": "8.7.16", "@ionic/angular": "8.8.19",
"@ionic/angular-server": "8.7.16", "@ionic/angular-server": "8.8.19",
"@ionic/storage-angular": "4.0.0", "@ionic/storage-angular": "4.0.0",
"@maplibre/ngx-maplibre-gl": "17.4.1", "@maplibre/ngx-maplibre-gl": "22.1.0",
"@ngx-translate/core": "15.0.0", "@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0", "@ngx-translate/http-loader": "8.0.0",
"@openid/appauth": "1.3.2", "@openid/appauth": "1.3.2",
@@ -86,71 +86,71 @@
"@openstapps/collection-utils": "workspace:*", "@openstapps/collection-utils": "workspace:*",
"@openstapps/core": "workspace:*", "@openstapps/core": "workspace:*",
"@transistorsoft/capacitor-background-fetch": "8.0.0", "@transistorsoft/capacitor-background-fetch": "8.0.0",
"@types/dom-view-transitions": "1.0.4", "@types/dom-view-transitions": "1.0.6",
"capacitor-secure-storage-plugin": "0.12.0", "capacitor-secure-storage-plugin": "0.13.0",
"cordova-plugin-calendar": "5.1.6", "cordova-plugin-calendar": "5.1.6",
"date-fns": "3.6.0", "date-fns": "3.6.0",
"deepmerge": "4.3.1", "deepmerge": "4.3.1",
"form-data": "4.0.4", "form-data": "4.0.6",
"geojson": "0.5.0", "geojson": "0.5.0",
"ionic-appauth": "2.1.0", "ionic-appauth": "2.1.0",
"ionicons": "8.0.13", "ionicons": "8.1.0",
"jsonpath-plus": "10.3.0", "jsonpath-plus": "10.3.0",
"maplibre-gl": "4.0.2", "maplibre-gl": "6.4.1",
"material-symbols": "0.17.1", "material-symbols": "0.17.1",
"moment": "2.30.1", "moment": "2.30.1",
"ngx-date-fns": "11.0.0", "ngx-date-fns": "11.0.0",
"ngx-logger": "5.0.12", "ngx-logger": "5.0.12",
"ngx-markdown": "17.2.1", "ngx-markdown": "18.1.0",
"ngx-moment": "6.0.2", "ngx-moment": "6.0.2",
"opening_hours": "3.8.0", "opening_hours": "3.8.0",
"pmtiles": "3.0.3", "pmtiles": "3.0.3",
"prettier": "3.1.1", "prettier": "3.1.1",
"rxjs": "7.8.1", "rxjs": "7.8.2",
"semver": "7.6.0", "semver": "7.6.0",
"swiper": "8.4.5", "swiper": "8.4.5",
"tslib": "2.6.2", "tslib": "2.6.2",
"zone.js": "0.14.10" "zone.js": "0.16.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/architect": "0.1802.20", "@angular-devkit/architect": "0.2003.37",
"@angular-devkit/build-angular": "18.2.20", "@angular-devkit/build-angular": "20.3.37",
"@angular-devkit/core": "18.2.20", "@angular-devkit/core": "20.3.37",
"@angular-devkit/schematics": "18.2.20", "@angular-devkit/schematics": "20.3.37",
"@angular-eslint/builder": "18.4.3", "@angular-eslint/builder": "20.7.0",
"@angular-eslint/eslint-plugin": "18.4.3", "@angular-eslint/eslint-plugin": "20.7.0",
"@angular-eslint/eslint-plugin-template": "18.4.3", "@angular-eslint/eslint-plugin-template": "20.7.0",
"@angular-eslint/schematics": "18.4.1", "@angular-eslint/schematics": "20.7.0",
"@angular-eslint/template-parser": "18.4.3", "@angular-eslint/template-parser": "20.7.0",
"@angular/cli": "18.2.20", "@angular/cli": "20.3.37",
"@angular/compiler": "18.2.13", "@angular/compiler": "20.3.31",
"@angular/compiler-cli": "18.2.13", "@angular/compiler-cli": "20.3.31",
"@angular/language-server": "18.2.0", "@angular/language-server": "20.3.0",
"@angular/language-service": "18.2.13", "@angular/language-service": "20.3.31",
"@angular/platform-browser-dynamic": "18.2.13", "@angular/platform-browser-dynamic": "20.3.31",
"@capacitor/android": "8.2.0", "@capacitor/android": "8.2.0",
"@capacitor/assets": "3.0.5", "@capacitor/assets": "3.0.5",
"@capacitor/cli": "8.2.0", "@capacitor/cli": "8.2.0",
"@capacitor/ios": "8.2.0", "@capacitor/ios": "8.2.0",
"@compodoc/compodoc": "1.1.23", "@compodoc/compodoc": "1.2.1",
"@cypress/schematic": "4.1.1", "@cypress/schematic": "4.1.1",
"@ionic/angular-toolkit": "12.3.0", "@ionic/angular-toolkit": "12.3.0",
"@ionic/cli": "7.2.1", "@ionic/cli": "7.2.1",
"@openstapps/prettier-config": "workspace:*", "@openstapps/prettier-config": "workspace:*",
"@openstapps/tsconfig": "workspace:*", "@openstapps/tsconfig": "workspace:*",
"@types/fontkit": "2.0.7", "@types/fontkit": "2.0.9",
"@types/geojson": "1.0.6", "@types/geojson": "1.0.6",
"@types/glob": "8.1.0", "@types/glob": "8.1.0",
"@types/jasmine": "5.1.4", "@types/jasmine": "5.1.4",
"@types/jasminewd2": "2.0.13", "@types/jasminewd2": "2.0.13",
"@types/jsonpath": "0.2.0", "@types/jsonpath": "0.2.0",
"@types/karma": "6.3.8", "@types/karma": "6.3.9",
"@types/karma-coverage": "2.0.3", "@types/karma-coverage": "2.0.3",
"@types/karma-jasmine": "4.0.5", "@types/karma-jasmine": "4.0.5",
"@types/node": "22.15.31", "@types/node": "22.15.31",
"@types/semver": "7.5.8", "@types/semver": "7.5.8",
"@typescript-eslint/eslint-plugin": "7.11.0", "@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.11.0", "@typescript-eslint/parser": "7.18.0",
"cordova-res": "0.15.4", "cordova-res": "0.15.4",
"cypress": "15.0.0", "cypress": "15.0.0",
"eslint": "8.57.0", "eslint": "8.57.0",
@@ -158,28 +158,28 @@
"eslint-plugin-prettier": "5.1.3", "eslint-plugin-prettier": "5.1.3",
"eslint-plugin-unicorn": "51.0.1", "eslint-plugin-unicorn": "51.0.1",
"fast-deep-equal": "3.1.3", "fast-deep-equal": "3.1.3",
"fontkit": "2.0.2", "fontkit": "2.0.4",
"glob": "10.5.0", "glob": "10.5.0",
"http-server": "14.1.1", "http-server": "14.1.1",
"is-docker": "2.2.1", "is-docker": "2.2.1",
"jasmine-core": "5.1.2", "jasmine-core": "5.1.2",
"jasmine-spec-reporter": "7.0.0", "jasmine-spec-reporter": "7.0.0",
"junit-report-merger": "6.0.3", "junit-report-merger": "6.0.3",
"karma": "6.4.3", "karma": "6.4.4",
"karma-chrome-launcher": "3.2.0", "karma-chrome-launcher": "3.2.0",
"karma-coverage": "2.2.1", "karma-coverage": "2.2.1",
"karma-jasmine": "5.1.0", "karma-jasmine": "5.1.0",
"karma-junit-reporter": "2.0.1", "karma-junit-reporter": "2.0.1",
"karma-mocha-reporter": "2.2.5", "karma-mocha-reporter": "2.2.5",
"license-checker": "25.0.1", "license-checker": "25.0.1",
"stylelint": "16.3.1", "stylelint": "17.14.1",
"stylelint-config-clean-order": "5.4.1", "stylelint-config-clean-order": "10.0.0",
"stylelint-config-prettier-scss": "1.0.0", "stylelint-config-prettier-scss": "1.0.0",
"stylelint-config-recommended-scss": "14.0.0", "stylelint-config-recommended-scss": "17.0.1",
"stylelint-config-standard-scss": "13.0.0", "stylelint-config-standard-scss": "17.0.0",
"surge": "0.23.1", "surge": "0.23.1",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"typescript": "5.4.2" "typescript": "5.9.3"
}, },
"cordova": { "cordova": {
"plugins": {}, "plugins": {},
@@ -13,7 +13,7 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import { import {
SCAcademicEvent, SCAcademicEvent,
SCArticle, SCArticle,
@@ -395,7 +395,9 @@ export class SampleThings {
*/ */
http: HttpClient; http: HttpClient;
constructor(http: HttpClient) { constructor() {
const http = inject(HttpClient);
this.http = http; this.http = http;
} }
@@ -13,7 +13,7 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor, HttpErrorResponse} from '@angular/common/http'; import {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor, HttpErrorResponse} from '@angular/common/http';
import {Observable, throwError} from 'rxjs'; import {Observable, throwError} from 'rxjs';
import {NGXLogger} from 'ngx-logger'; import {NGXLogger} from 'ngx-logger';
@@ -21,7 +21,7 @@ import {catchError} from 'rxjs/operators';
@Injectable() @Injectable()
export class ServiceHandlerInterceptor implements HttpInterceptor { export class ServiceHandlerInterceptor implements HttpInterceptor {
constructor(private readonly logger: NGXLogger) {} private readonly logger = inject(NGXLogger);
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> { intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
return next.handle(request).pipe( return next.handle(request).pipe(
@@ -26,6 +26,7 @@ const routes: Routes = [{path: '', redirectTo: '/overview', pathMatch: 'full'}];
RouterModule.forRoot(routes, { RouterModule.forRoot(routes, {
preloadingStrategy: PreloadAllModules, preloadingStrategy: PreloadAllModules,
errorHandler: error => { errorHandler: error => {
console.error(error);
// Handle unknown routes, at the moment this can only be done via window.location // Handle unknown routes, at the moment this can only be done via window.location
if (error.message.includes('Cannot match any routes')) { if (error.message.includes('Cannot match any routes')) {
window.location.href = '/overview'; window.location.href = '/overview';
+1 -6
View File
@@ -72,6 +72,7 @@ describe('AppComponent', () => {
configProvider.getAnyValue = jasmine.createSpy().and.callFake(function () { configProvider.getAnyValue = jasmine.createSpy().and.callFake(function () {
return sampleAuthConfiguration; return sampleAuthConfiguration;
}); });
inAppReviewProvider = jasmine.createSpyObj('InAppReviewProvider', ['init']);
ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']); ngxLogger = jasmine.createSpyObj('NGXLogger', ['log', 'error', 'warn']);
storageProvider = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']); storageProvider = jasmine.createSpyObj('StorageProvider', ['init', 'get', 'has', 'put']);
simpleBrowser = jasmine.createSpyObj('SimpleBrowser', ['open']); simpleBrowser = jasmine.createSpyObj('SimpleBrowser', ['open']);
@@ -108,11 +109,5 @@ describe('AppComponent', () => {
it('should initialize the app', async () => { it('should initialize the app', async () => {
TestBed.createComponent(AppComponent); TestBed.createComponent(AppComponent);
expect(platformSpy.ready).toHaveBeenCalled(); expect(platformSpy.ready).toHaveBeenCalled();
// await platformReadySpy;
// TODO: https://capacitorjs.com/docs/guides/mocking-plugins
// expect(splashScreenSpy.hide).toHaveBeenCalled();
}); });
// TODO: add more tests!
}); });
+21 -12
View File
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {AfterContentInit, Component, NgZone} from '@angular/core'; import {AfterContentInit, Component, NgZone, inject} from '@angular/core';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {App, URLOpenListenerEvent} from '@capacitor/app'; import {App, URLOpenListenerEvent} from '@capacitor/app';
import {Platform, ToastController} from '@ionic/angular/standalone'; import {Platform, ToastController} from '@ionic/angular/standalone';
@@ -32,8 +32,27 @@ import {SplashScreen} from '@capacitor/splash-screen';
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
templateUrl: 'app.component.html', templateUrl: 'app.component.html',
standalone: false,
}) })
export class AppComponent implements AfterContentInit { export class AppComponent implements AfterContentInit {
private readonly platform = inject(Platform);
private readonly settingsProvider = inject(SettingsProvider);
private readonly inAppReviewProvider = inject(InAppReviewProvider);
private readonly router = inject(Router);
private readonly zone = inject(NgZone);
private readonly authHelper = inject(AuthHelperService);
private readonly toastController = inject(ToastController);
private readonly scheduleSyncService = inject(ScheduleSyncService);
private readonly versionService = inject(AppVersionService);
/** /**
* TODO * TODO
*/ */
@@ -53,17 +72,7 @@ export class AppComponent implements AfterContentInit {
*/ */
ommitedEventSources = ['ion-input', 'ion-searchbar']; ommitedEventSources = ['ion-input', 'ion-searchbar'];
constructor( 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,
private readonly toastController: ToastController,
private readonly scheduleSyncService: ScheduleSyncService,
private readonly versionService: AppVersionService,
) {
void this.initializeApp(); void this.initializeApp();
} }
+4 -3
View File
@@ -15,7 +15,7 @@
import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common'; import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
import localeDe from '@angular/common/locales/de'; import localeDe from '@angular/common/locales/de';
import {APP_INITIALIZER, NgModule} from '@angular/core'; import {APP_INITIALIZER, NgModule, inject} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import {RouteReuseStrategy} from '@angular/router'; import {RouteReuseStrategy} from '@angular/router';
import {IonicRouteStrategy, Platform, provideIonicAngular, IonApp} from '@ionic/angular/standalone'; import {IonicRouteStrategy, Platform, provideIonicAngular, IonApp} from '@ionic/angular/standalone';
@@ -65,7 +65,7 @@ import {setDefaultOptions} from 'date-fns';
import {DateFnsConfigurationService} from 'ngx-date-fns'; import {DateFnsConfigurationService} from 'ngx-date-fns';
import {Capacitor} from '@capacitor/core'; import {Capacitor} from '@capacitor/core';
import {SplashScreen} from '@capacitor/splash-screen'; import {SplashScreen} from '@capacitor/splash-screen';
import maplibregl from 'maplibre-gl'; import * as maplibregl from 'maplibre-gl';
import {Protocol} from 'pmtiles'; import {Protocol} from 'pmtiles';
registerLocaleData(localeDe); registerLocaleData(localeDe);
@@ -87,6 +87,7 @@ export function initializerFactory(
) { ) {
return async () => { return async () => {
try { try {
maplibregl.setWorkerUrl(new URL('maplibre-gl-worker.mjs', document.baseURI).href);
maplibregl.addProtocol('pmtiles', new Protocol().tile); maplibregl.addProtocol('pmtiles', new Protocol().tile);
initLogger(logger); initLogger(logger);
await storageProvider.init(); await storageProvider.init();
@@ -215,5 +216,5 @@ export function createTranslateLoader(http: HttpClient) {
], ],
}) })
export class AppModule { export class AppModule {
constructor(public debugDataCollectorService: DebugDataCollectorService) {} debugDataCollectorService = inject(DebugDataCollectorService);
} }
@@ -21,6 +21,7 @@ import {ConfigProvider} from '../config/config.provider';
templateUrl: 'about-changelog.html', templateUrl: 'about-changelog.html',
styleUrls: ['about-changelog.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'], styleUrls: ['about-changelog.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class AboutChangelogComponent { export class AboutChangelogComponent {
config = inject(ConfigProvider); config = inject(ConfigProvider);
@@ -20,6 +20,7 @@ import {License} from './about-licenses.component';
selector: 'about-license-modal', selector: 'about-license-modal',
templateUrl: 'about-license-modal.html', templateUrl: 'about-license-modal.html',
styleUrls: ['about-license-modal.scss'], styleUrls: ['about-license-modal.scss'],
standalone: false,
}) })
export class AboutLicenseModalComponent { export class AboutLicenseModalComponent {
@Input() license: License; @Input() license: License;
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, OnInit} from '@angular/core'; import {Component, OnInit, inject} from '@angular/core';
import {ModalController} from '@ionic/angular/standalone'; import {ModalController} from '@ionic/angular/standalone';
import {AboutLicenseModalComponent} from './about-license-modal.component'; import {AboutLicenseModalComponent} from './about-license-modal.component';
import licensesFile from 'src/assets/about/licenses.json'; import licensesFile from 'src/assets/about/licenses.json';
@@ -32,11 +32,12 @@ export interface License {
selector: 'about-changelog', selector: 'about-changelog',
templateUrl: 'about-licenses.html', templateUrl: 'about-licenses.html',
styleUrls: ['about-licenses.scss', './about-page/about-page.scss'], styleUrls: ['about-licenses.scss', './about-page/about-page.scss'],
standalone: false,
}) })
export class AboutLicensesComponent implements OnInit { export class AboutLicensesComponent implements OnInit {
licenses: License[]; private modalController = inject(ModalController);
constructor(private modalController: ModalController) {} licenses: License[];
ngOnInit() { ngOnInit() {
this.licenses = this.loadLicenses(); this.licenses = this.loadLicenses();
@@ -19,6 +19,7 @@ import {SCAboutPageContent} from '@openstapps/core';
selector: 'about-page-content', selector: 'about-page-content',
templateUrl: 'about-page-content.html', templateUrl: 'about-page-content.html',
styleUrls: ['about-page-content.scss'], styleUrls: ['about-page-content.scss'],
standalone: false,
}) })
export class AboutPageContentComponent { export class AboutPageContentComponent {
@Input() content: SCAboutPageContent; @Input() content: SCAboutPageContent;
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, OnInit} from '@angular/core'; import {Component, OnInit, inject} from '@angular/core';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {SCAboutPage, SCAppConfiguration} from '@openstapps/core'; import {SCAboutPage, SCAppConfiguration} from '@openstapps/core';
import {ConfigProvider} from '../../config/config.provider'; import {ConfigProvider} from '../../config/config.provider';
@@ -25,8 +25,13 @@ import {Capacitor} from '@capacitor/core';
selector: 'about-page', selector: 'about-page',
templateUrl: 'about-page.html', templateUrl: 'about-page.html',
styleUrls: ['about-page.scss'], styleUrls: ['about-page.scss'],
standalone: false,
}) })
export class AboutPageComponent implements OnInit { export class AboutPageComponent implements OnInit {
private readonly route = inject(ActivatedRoute);
private readonly configProvider = inject(ConfigProvider);
content: SCAboutPage; content: SCAboutPage;
name = config.appName; name = config.appName;
@@ -35,11 +40,6 @@ export class AboutPageComponent implements OnInit {
version: string; version: string;
constructor(
private readonly route: ActivatedRoute,
private readonly configProvider: ConfigProvider,
) {}
async ngOnInit() { async ngOnInit() {
const route = this.route.snapshot.url.map(it => it.path).join('/'); const route = this.route.snapshot.url.map(it => it.path).join('/');
this.content = this.content =
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
@import '../../../../theme/util/mixins'; @use '../../../../theme/util/mixins';
ion-text { ion-text {
margin-inline: var(--spacing-md); margin-inline: var(--spacing-md);
@@ -64,7 +64,7 @@ ion-text {
.about-changelog, .about-changelog,
.licenses-content, .licenses-content,
.page-content { .page-content {
@include border-radius-in-parallax(var(--border-radius-default)); @include mixins.border-radius-in-parallax(var(--border-radius-default));
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -76,7 +76,7 @@ ion-text {
background: var(--ion-item-background); background: var(--ion-item-background);
& > * { & > * {
@include border-radius-in-parallax(var(--border-radius-default)); @include mixins.border-radius-in-parallax(var(--border-radius-default));
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@@ -21,6 +21,7 @@ import {ConfigProvider} from '../config/config.provider';
templateUrl: 'about-release-notes.html', templateUrl: 'about-release-notes.html',
styleUrls: ['about-release-notes.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'], styleUrls: ['about-release-notes.scss', './about-page/about-page.scss', 'release-notes-markdown.scss'],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class AboutReleaseNotesComponent { export class AboutReleaseNotesComponent {
config = inject(ConfigProvider); config = inject(ConfigProvider);
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
@import '../../../theme/util/mixins'; @use '../../../theme/util/mixins';
ion-button { ion-button {
--color: var(--ion-color-primary-contrast); --color: var(--ion-color-primary-contrast);
@@ -22,7 +22,7 @@ ion-button {
} }
.release-notes { .release-notes {
@include border-radius-in-parallax(var(--border-radius-default)); @include mixins.border-radius-in-parallax(var(--border-radius-default));
display: block; display: block;
margin: var(--spacing-md); margin: var(--spacing-md);
@@ -1,4 +1,4 @@
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {StorageProvider} from '../storage/storage.provider'; import {StorageProvider} from '../storage/storage.provider';
import {ConfigProvider} from '../config/config.provider'; import {ConfigProvider} from '../config/config.provider';
import {ModalController} from '@ionic/angular/standalone'; import {ModalController} from '@ionic/angular/standalone';
@@ -12,11 +12,11 @@ export const RELEASE_NOTES_SHOWN_KEY = 'release_notes_shown';
@Injectable({providedIn: 'root'}) @Injectable({providedIn: 'root'})
export class AppVersionService { export class AppVersionService {
constructor( private storage = inject(StorageProvider);
private storage: StorageProvider,
private config: ConfigProvider, private config = inject(ConfigProvider);
private modalController: ModalController,
) {} private modalController = inject(ModalController);
/** /**
* Get the latest release notes that have not been presented yet * Get the latest release notes that have not been presented yet
@@ -20,7 +20,7 @@
} }
blockquote { blockquote {
background: var(--ion-item-background);
border-left: 0.25em solid var(--ion-color-medium); border-left: 0.25em solid var(--ion-color-medium);
background: var(--ion-item-background);
} }
} }
@@ -1,4 +1,4 @@
import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
import {SCAppVersionInfo} from '@openstapps/core'; import {SCAppVersionInfo} from '@openstapps/core';
import {MarkdownModule} from 'ngx-markdown'; import {MarkdownModule} from 'ngx-markdown';
import {ThingTranslateModule} from '../../translation/thing-translate.module'; import {ThingTranslateModule} from '../../translation/thing-translate.module';
@@ -17,7 +17,6 @@ import {UtilModule} from '../../util/util.module';
selector: 'stapps-release-notes', selector: 'stapps-release-notes',
templateUrl: 'release-notes.html', templateUrl: 'release-notes.html',
styleUrls: ['release-notes.scss', 'release-notes-markdown.scss'], styleUrls: ['release-notes.scss', 'release-notes-markdown.scss'],
standalone: true,
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
imports: [ imports: [
UtilModule, UtilModule,
@@ -32,7 +31,7 @@ import {UtilModule} from '../../util/util.module';
], ],
}) })
export class ReleaseNotesComponent { export class ReleaseNotesComponent {
@Input() versionInfos: SCAppVersionInfo[]; readonly modalController = inject(ModalController);
constructor(readonly modalController: ModalController) {} @Input() versionInfos: SCAppVersionInfo[];
} }
@@ -1,11 +1,11 @@
@import '../../../theme/util/mixins'; @use '../../../theme/util/mixins';
ion-title { ion-title {
padding-block: var(--spacing-md); padding-block: var(--spacing-md);
} }
.content-card { .content-card {
@include border-radius-in-parallax(var(--border-radius-default)); @include mixins.border-radius-in-parallax(var(--border-radius-default));
display: block; display: block;
margin: var(--spacing-md); margin: var(--spacing-md);
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {ConfigProvider} from '../config/config.provider'; import {ConfigProvider} from '../config/config.provider';
import {SCAssessment, SCUuid} from '@openstapps/core'; import {SCAssessment, SCUuid} from '@openstapps/core';
import {DefaultAuthService} from '../auth/default-auth.service'; import {DefaultAuthService} from '../auth/default-auth.service';
@@ -51,6 +51,12 @@ export function toAssessmentMap(data: SCAssessment[]): Record<SCUuid, SCAssessme
providedIn: 'root', providedIn: 'root',
}) })
export class AssessmentsProvider { export class AssessmentsProvider {
readonly configProvider = inject(ConfigProvider);
readonly defaultAuth = inject(DefaultAuthService);
readonly http = inject(HttpClient);
assessmentPath = 'assessments'; assessmentPath = 'assessments';
// usually this wouldn't be necessary, but the assessment service // usually this wouldn't be necessary, but the assessment service
@@ -64,12 +70,6 @@ export class AssessmentsProvider {
// 15 minutes // 15 minutes
cacheMaxAge = 15 * 60 * 1000; cacheMaxAge = 15 * 60 * 1000;
constructor(
readonly configProvider: ConfigProvider,
readonly defaultAuth: DefaultAuthService,
readonly http: HttpClient,
) {}
async getAssessment(uid: SCUuid, accessToken?: string | null, forceFetch = false): Promise<SCAssessment> { async getAssessment(uid: SCUuid, accessToken?: string | null, forceFetch = false): Promise<SCAssessment> {
await this.getAssessments(accessToken, forceFetch); await this.getAssessments(accessToken, forceFetch);
@@ -26,17 +26,20 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
selector: 'assessments-detail', selector: 'assessments-detail',
templateUrl: 'assessments-detail.html', templateUrl: 'assessments-detail.html',
styleUrls: ['assessments-detail.scss'], styleUrls: ['assessments-detail.scss'],
standalone: false,
}) })
export class AssessmentsDetailComponent implements OnInit { export class AssessmentsDetailComponent implements OnInit {
destroy$ = inject(DestroyRef); readonly route = inject(ActivatedRoute);
constructor( readonly assessmentsProvider = inject(AssessmentsProvider);
readonly route: ActivatedRoute,
readonly assessmentsProvider: AssessmentsProvider, readonly dataRoutingService = inject(DataRoutingService);
readonly dataRoutingService: DataRoutingService,
readonly navController: NavController, readonly navController = inject(NavController);
readonly activatedRoute: ActivatedRoute,
) {} readonly activatedRoute = inject(ActivatedRoute);
destroy$ = inject(DestroyRef);
@Input() dataPathAutoRouting = true; @Input() dataPathAutoRouting = true;
@@ -21,6 +21,7 @@ import {Observable} from 'rxjs';
selector: 'assessments-data-list', selector: 'assessments-data-list',
templateUrl: './assessments-data-list.html', templateUrl: './assessments-data-list.html',
styleUrls: ['./assessments-data-list.scss'], styleUrls: ['./assessments-data-list.scss'],
standalone: false,
}) })
export class AssessmentsDataListComponent { export class AssessmentsDataListComponent {
/** /**
@@ -20,6 +20,7 @@ import {SCThings} from '@openstapps/core';
selector: 'assessments-list-item', selector: 'assessments-list-item',
templateUrl: 'assessments-list-item.html', templateUrl: 'assessments-list-item.html',
styleUrls: ['assessments-list-item.scss'], styleUrls: ['assessments-list-item.scss'],
standalone: false,
}) })
export class AssessmentsListItemComponent { export class AssessmentsListItemComponent {
/** /**
@@ -23,8 +23,15 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
selector: 'assessments-simple-data-list', selector: 'assessments-simple-data-list',
templateUrl: 'assessments-simple-data-list.html', templateUrl: 'assessments-simple-data-list.html',
styleUrls: ['assessments-simple-data-list.scss'], styleUrls: ['assessments-simple-data-list.scss'],
standalone: false,
}) })
export class AssessmentsSimpleDataListComponent implements OnInit { export class AssessmentsSimpleDataListComponent implements OnInit {
readonly dataRoutingService = inject(DataRoutingService);
readonly router = inject(Router);
readonly activatedRoute = inject(ActivatedRoute);
/** /**
* All SCThings to display * All SCThings to display
*/ */
@@ -46,12 +53,6 @@ export class AssessmentsSimpleDataListComponent implements OnInit {
destroy$ = inject(DestroyRef); destroy$ = inject(DestroyRef);
constructor(
readonly dataRoutingService: DataRoutingService,
readonly router: Router,
readonly activatedRoute: ActivatedRoute,
) {}
ngOnInit() { ngOnInit() {
this.dataRoutingService this.dataRoutingService
.itemSelectListener() .itemSelectListener()
@@ -20,6 +20,7 @@ import {SCThings} from '@openstapps/core';
selector: 'assessments-tree-list', selector: 'assessments-tree-list',
templateUrl: 'assessments-tree-list.html', templateUrl: 'assessments-tree-list.html',
styleUrls: ['assessments-tree-list.scss'], styleUrls: ['assessments-tree-list.scss'],
standalone: false,
}) })
export class AssessmentsTreeListComponent { export class AssessmentsTreeListComponent {
@Input() items?: Promise<SCThings[] | undefined>; @Input() items?: Promise<SCThings[] | undefined>;
@@ -29,8 +29,21 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
templateUrl: 'assessments-page.html', templateUrl: 'assessments-page.html',
styleUrls: ['assessments-page.scss'], styleUrls: ['assessments-page.scss'],
animations: [materialSharedAxisX], animations: [materialSharedAxisX],
standalone: false,
}) })
export class AssessmentsPageComponent implements OnInit, AfterViewInit { export class AssessmentsPageComponent implements OnInit, AfterViewInit {
readonly logger = inject(NGXLogger);
readonly assessmentsProvider = inject(AssessmentsProvider);
readonly dataProvider = inject(DataProvider);
readonly activatedRoute = inject(ActivatedRoute);
readonly dataRoutingService = inject(DataRoutingService);
readonly router = inject(Router);
assessments: Promise< assessments: Promise<
Record< Record<
string, string,
@@ -49,15 +62,6 @@ export class AssessmentsPageComponent implements OnInit, AfterViewInit {
destroy$ = inject(DestroyRef); destroy$ = inject(DestroyRef);
constructor(
readonly logger: NGXLogger,
readonly assessmentsProvider: AssessmentsProvider,
readonly dataProvider: DataProvider,
readonly activatedRoute: ActivatedRoute,
readonly dataRoutingService: DataRoutingService,
readonly router: Router,
) {}
ngAfterViewInit() { ngAfterViewInit() {
this.segmentView.value = this.sharedAxisChoreographer.currentValue; this.segmentView.value = this.sharedAxisChoreographer.currentValue;
} }
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
selector: 'assessment-base-info', selector: 'assessment-base-info',
templateUrl: 'assessment-base-info.html', templateUrl: 'assessment-base-info.html',
styleUrls: ['assessment-base-info.scss'], styleUrls: ['assessment-base-info.scss'],
standalone: false,
}) })
export class AssessmentBaseInfoComponent { export class AssessmentBaseInfoComponent {
_item: SCAssessment; _item: SCAssessment;
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
selector: 'assessment-detail', selector: 'assessment-detail',
templateUrl: 'assessment-detail.html', templateUrl: 'assessment-detail.html',
styleUrls: ['assessment-detail.scss'], styleUrls: ['assessment-detail.scss'],
standalone: false,
}) })
export class AssessmentDetailComponent { export class AssessmentDetailComponent {
@Input() item: SCAssessment; @Input() item: SCAssessment;
@@ -20,6 +20,7 @@ import {SCAssessment} from '@openstapps/core';
selector: 'stapps-assessment-list-item', selector: 'stapps-assessment-list-item',
templateUrl: './assessment-list-item.html', templateUrl: './assessment-list-item.html',
styleUrls: ['./assessment-list-item.scss'], styleUrls: ['./assessment-list-item.scss'],
standalone: false,
}) })
export class AssessmentListItemComponent { export class AssessmentListItemComponent {
@Input() item: SCAssessment; @Input() item: SCAssessment;
@@ -20,6 +20,7 @@ import {SCAssessment, SCCourseOfStudyWithoutReferences} from '@openstapps/core';
selector: 'course-of-study-assessment', selector: 'course-of-study-assessment',
templateUrl: 'course-of-study-assessment.html', templateUrl: 'course-of-study-assessment.html',
styleUrls: ['course-of-study-assessment.scss'], styleUrls: ['course-of-study-assessment.scss'],
standalone: false,
}) })
export class CourseOfStudyAssessmentComponent { export class CourseOfStudyAssessmentComponent {
@Input() courseOfStudy?: SCCourseOfStudyWithoutReferences | null; @Input() courseOfStudy?: SCCourseOfStudyWithoutReferences | null;
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component} from '@angular/core'; import {Component, inject} from '@angular/core';
import {NavController} from '@ionic/angular/standalone'; import {NavController} from '@ionic/angular/standalone';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {AuthActions, IAuthAction} from 'ionic-appauth'; import {AuthActions, IAuthAction} from 'ionic-appauth';
@@ -24,14 +24,18 @@ import {DefaultAuthService} from '../../default-auth.service';
@Component({ @Component({
templateUrl: 'auth-callback-page.component.html', templateUrl: 'auth-callback-page.component.html',
styleUrls: ['auth-callback-page.component.scss'], styleUrls: ['auth-callback-page.component.scss'],
standalone: false,
}) })
export class AuthCallbackPageComponent { export class AuthCallbackPageComponent {
constructor( private navCtrl = inject(NavController);
private navCtrl: NavController,
private router: Router, private router = inject(Router);
private authHelper: AuthHelperService,
private auth: DefaultAuthService, private authHelper = inject(AuthHelperService);
) {
private auth = inject(DefaultAuthService);
constructor() {
const events: Observable<IAuthAction> = this.auth.events$; const events: Observable<IAuthAction> = this.auth.events$;
events.pipe(takeUntilDestroyed()).subscribe((action: IAuthAction) => this.postCallback(action)); events.pipe(takeUntilDestroyed()).subscribe((action: IAuthAction) => this.postCallback(action));
@@ -13,7 +13,7 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {CanActivate, NavigationExtras, Router, RouterStateSnapshot} from '@angular/router'; import {CanActivate, NavigationExtras, Router, RouterStateSnapshot} from '@angular/router';
import {ActivatedProtectedRouteSnapshot} from './protected.routes'; import {ActivatedProtectedRouteSnapshot} from './protected.routes';
import {AuthHelperService} from './auth-helper.service'; import {AuthHelperService} from './auth-helper.service';
@@ -22,10 +22,9 @@ import {AuthHelperService} from './auth-helper.service';
providedIn: 'root', providedIn: 'root',
}) })
export class AuthGuardService implements CanActivate { export class AuthGuardService implements CanActivate {
constructor( private authHelper = inject(AuthHelperService);
private authHelper: AuthHelperService,
private router: Router, private router = inject(Router);
) {}
public async canActivate(route: ActivatedProtectedRouteSnapshot, _state: RouterStateSnapshot) { public async canActivate(route: ActivatedProtectedRouteSnapshot, _state: RouterStateSnapshot) {
if (route.queryParamMap.get('token')) { if (route.queryParamMap.get('token')) {
@@ -35,7 +34,7 @@ export class AuthGuardService implements CanActivate {
try { try {
await this.authHelper.getProvider().getValidToken(); await this.authHelper.getProvider().getValidToken();
} catch { } catch {
const originNavigation = this.router.getCurrentNavigation(); const originNavigation = this.router.currentNavigation();
let extras: NavigationExtras = {}; let extras: NavigationExtras = {};
if (originNavigation) { if (originNavigation) {
const url = originNavigation.extractedUrl.toString(); const url = originNavigation.extractedUrl.toString();
@@ -13,7 +13,7 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {AuthActions, IAuthAction} from 'ionic-appauth'; import {AuthActions, IAuthAction} from 'ionic-appauth';
import {TranslateService} from '@ngx-translate/core'; import {TranslateService} from '@ngx-translate/core';
import {JSONPath} from 'jsonpath-plus'; import {JSONPath} from 'jsonpath-plus';
@@ -35,16 +35,21 @@ const AUTH_ORIGIN_PATH = 'stapps.auth.origin_path';
providedIn: 'root', providedIn: 'root',
}) })
export class AuthHelperService { export class AuthHelperService {
private translateService = inject(TranslateService);
private configProvider = inject(ConfigProvider);
private storageProvider = inject(StorageProvider);
private defaultAuth = inject(DefaultAuthService);
private browser = inject(SimpleBrowser);
private alertController = inject(AlertController);
userConfigurationMap: SCUserConfigurationMap; userConfigurationMap: SCUserConfigurationMap;
constructor( constructor() {
private translateService: TranslateService,
private configProvider: ConfigProvider,
private storageProvider: StorageProvider,
private defaultAuth: DefaultAuthService,
private browser: SimpleBrowser,
private alertController: AlertController,
) {
this.userConfigurationMap = this.userConfigurationMap =
( (
this.configProvider.getAnyValue('auth') as { this.configProvider.getAnyValue('auth') as {
@@ -26,7 +26,7 @@ import {AuthActionBuilder, Browser, DefaultBrowser, EndSessionHandler, UserInfoH
import {ConfigProvider} from '../config/config.provider'; import {ConfigProvider} from '../config/config.provider';
import {SCAuthorizationProvider} from '@openstapps/core'; import {SCAuthorizationProvider} from '@openstapps/core';
import {getClientConfig, getEndpointsConfig} from './auth.provider.methods'; import {getClientConfig, getEndpointsConfig} from './auth.provider.methods';
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {AuthService} from './auth.service'; import {AuthService} from './auth.service';
const TOKEN_RESPONSE_KEY = 'token_response'; const TOKEN_RESPONSE_KEY = 'token_response';
@@ -35,6 +35,14 @@ const TOKEN_RESPONSE_KEY = 'token_response';
providedIn: 'root', providedIn: 'root',
}) })
export class DefaultAuthService extends AuthService { export class DefaultAuthService extends AuthService {
protected browser: Browser;
protected storage: StorageBackend;
protected requestor: Requestor;
private readonly configProvider = inject(ConfigProvider);
public localConfiguration: AuthorizationServiceConfiguration; public localConfiguration: AuthorizationServiceConfiguration;
protected tokenHandler: TokenRequestHandler; protected tokenHandler: TokenRequestHandler;
@@ -45,13 +53,16 @@ export class DefaultAuthService extends AuthService {
protected endSessionHandler: EndSessionHandler; protected endSessionHandler: EndSessionHandler;
constructor( constructor() {
protected browser: Browser = new DefaultBrowser(), const browser = inject(Browser) ?? new DefaultBrowser();
protected storage: StorageBackend = new LocalStorageBackend(), const storage = inject(StorageBackend) ?? new LocalStorageBackend();
protected requestor: Requestor = new JQueryRequestor(), const requestor = inject(Requestor) ?? new JQueryRequestor();
private readonly configProvider: ConfigProvider,
) {
super(browser, storage, requestor); super(browser, storage, requestor);
this.browser = browser;
this.storage = storage;
this.requestor = requestor;
} }
get configuration(): Promise<AuthorizationServiceConfiguration> { get configuration(): Promise<AuthorizationServiceConfiguration> {
@@ -13,11 +13,10 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {HttpClient} from '@angular/common/http';
import {Platform} from '@ionic/angular/standalone'; import {Platform} from '@ionic/angular/standalone';
import {CapacitorRequestor} from '../capacitor-requestor'; import {CapacitorRequestor} from '../capacitor-requestor';
import {NgHttpService} from '../ng-http.service'; import {NgHttpService} from '../ng-http.service';
export const httpFactory = (platform: Platform, httpClient: HttpClient) => { export const httpFactory = (platform: Platform) => {
return platform.is('capacitor') ? new CapacitorRequestor() : new NgHttpService(httpClient); return platform.is('capacitor') ? new CapacitorRequestor() : new NgHttpService();
}; };
@@ -13,7 +13,7 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {Requestor} from '@openid/appauth'; import {Requestor} from '@openid/appauth';
import {HttpClient, HttpHeaders} from '@angular/common/http'; import {HttpClient, HttpHeaders} from '@angular/common/http';
import {XhrSettings} from 'ionic-appauth/lib/cordova'; import {XhrSettings} from 'ionic-appauth/lib/cordova';
@@ -23,7 +23,7 @@ import {firstValueFrom, Observable} from 'rxjs';
providedIn: 'root', providedIn: 'root',
}) })
export class NgHttpService implements Requestor { export class NgHttpService implements Requestor {
constructor(private http: HttpClient) {} private http = inject(HttpClient);
public async xhr<T>(settings: XhrSettings): Promise<T> { public async xhr<T>(settings: XhrSettings): Promise<T> {
if (!settings.method) { if (!settings.method) {
@@ -40,16 +40,19 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
@Injectable() @Injectable()
export class ScheduleSyncService { export class ScheduleSyncService {
destroy$ = inject(DestroyRef); private scheduleProvider = inject(ScheduleProvider);
constructor( private storageProvider = inject(StorageProvider);
private scheduleProvider: ScheduleProvider,
private storageProvider: StorageProvider, private translator = inject(ThingTranslateService);
private translator: ThingTranslateService,
private dateFormatPipe: DateFormatPipe, private dateFormatPipe = inject(DateFormatPipe);
private durationFormatPipe: DurationPipe,
private calendar: CalendarService, private durationFormatPipe = inject(DurationPipe);
) {}
private calendar = inject(CalendarService);
destroy$ = inject(DestroyRef);
init() { init() {
this.scheduleProvider.uuids$ this.scheduleProvider.uuids$
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, Input, OnInit} from '@angular/core'; import {Component, Input, OnInit, inject} from '@angular/core';
import { import {
getICalExport, getICalExport,
getNativeCalendarExport, getNativeCalendarExport,
@@ -42,8 +42,15 @@ interface ICalInfo {
selector: 'add-event-review-modal', selector: 'add-event-review-modal',
templateUrl: 'add-event-review-modal.html', templateUrl: 'add-event-review-modal.html',
styleUrls: ['add-event-review-modal.scss'], styleUrls: ['add-event-review-modal.scss'],
standalone: false,
}) })
export class AddEventReviewModalComponent implements OnInit { export class AddEventReviewModalComponent implements OnInit {
readonly calendarService = inject(CalendarService);
readonly translator = inject(ThingTranslateService);
readonly translateService = inject(TranslateService);
moment = moment; moment = moment;
@Input() dismissAction: () => void; @Input() dismissAction: () => void;
@@ -56,12 +63,6 @@ export class AddEventReviewModalComponent implements OnInit {
isWeb = true; isWeb = true;
constructor(
readonly calendarService: CalendarService,
readonly translator: ThingTranslateService,
readonly translateService: TranslateService,
) {}
ngOnInit() { ngOnInit() {
Device.getInfo().then(it => { Device.getInfo().then(it => {
this.isWeb = it.platform === 'web'; this.isWeb = it.platform === 'web';
@@ -14,7 +14,7 @@
*/ */
import {Calendar} from '@awesome-cordova-plugins/calendar/ngx'; import {Calendar} from '@awesome-cordova-plugins/calendar/ngx';
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {ICalEvent} from './ical/ical'; import {ICalEvent} from './ical/ical';
import moment, {duration, Moment, unitOfTime} from 'moment'; import moment, {duration, Moment, unitOfTime} from 'moment';
import {Dialog} from '@capacitor/dialog'; import {Dialog} from '@capacitor/dialog';
@@ -31,6 +31,10 @@ const RECURRENCE_PATTERNS: Partial<Record<unitOfTime.Diff, string | undefined>>
@Injectable() @Injectable()
export class CalendarService { export class CalendarService {
readonly calendar = inject(Calendar);
private readonly configProvider = inject(ConfigProvider);
goToDate = new Subject<number>(); goToDate = new Subject<number>();
goToDateClicked = this.goToDate.asObservable(); goToDateClicked = this.goToDate.asObservable();
@@ -38,10 +42,7 @@ export class CalendarService {
calendarName = 'StApps'; calendarName = 'StApps';
// eslint-disable-next-line @typescript-eslint/no-empty-function // eslint-disable-next-line @typescript-eslint/no-empty-function
constructor( constructor() {
readonly calendar: Calendar,
private readonly configProvider: ConfigProvider,
) {
this.calendarName = (this.configProvider.getValue('name') as string) ?? 'StApps'; this.calendarName = (this.configProvider.getValue('name') as string) ?? 'StApps';
} }
@@ -68,6 +68,8 @@ export type DateSeriesRelevantData = Pick<SCDateSeries, DateSeriesRelevantKeys>;
*/ */
@Injectable() @Injectable()
export class ScheduleProvider implements OnDestroy { export class ScheduleProvider implements OnDestroy {
private readonly dataProvider = inject(DataProvider);
// tslint:disable:prefer-function-over-method // tslint:disable:prefer-function-over-method
private static partialEventsStorageKey = 'schedule::partial_events'; private static partialEventsStorageKey = 'schedule::partial_events';
@@ -76,7 +78,7 @@ export class ScheduleProvider implements OnDestroy {
destroy$ = inject(DestroyRef); destroy$ = inject(DestroyRef);
constructor(private readonly dataProvider: DataProvider) { constructor() {
window.addEventListener('storage', this.storageListener); window.addEventListener('storage', this.storageListener);
} }
@@ -23,7 +23,7 @@
</ion-toolbar> </ion-toolbar>
<ion-toolbar color="primary" mode="md"> <ion-toolbar color="primary" mode="md">
<ion-segment (ionChange)="segmentChanged($event)" [value]="selectedSemesterUID" mode="md"> <ion-segment (ionChange)="segmentChanged($event)" [value]="selectedSemesterUID" mode="md">
@for (semester of availableSemesters; track semester) { @for (semester of availableSemesters; track semester.uid) {
<ion-segment-button [value]="semester.uid"> <ion-segment-button [value]="semester.uid">
<ion-label>{{ semester.acronym }}</ion-label> <ion-label>{{ semester.acronym }}</ion-label>
</ion-segment-button> </ion-segment-button>
@@ -35,7 +35,7 @@
<ion-content> <ion-content>
@if (catalogs && catalogs.length > 0) { @if (catalogs && catalogs.length > 0) {
<ion-list> <ion-list>
@for (catalog of catalogs; track catalog) { @for (catalog of catalogs; track catalog.uid) {
<ion-item button="true" lines="inset" (click)="notifySelect(catalog)"> <ion-item button="true" lines="inset" (click)="notifySelect(catalog)">
<ion-label> <ion-label>
<h2>{{ catalog.name }}</h2> <h2>{{ catalog.name }}</h2>
@@ -46,7 +46,7 @@
} }
@if (!catalogs) { @if (!catalogs) {
<ion-list> <ion-list>
@for (skeleton of [].constructor(10); track skeleton) { @for (skeleton of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; track skeleton) {
<stapps-skeleton-list-item> </stapps-skeleton-list-item> <stapps-skeleton-list-item> </stapps-skeleton-list-item>
} }
</ion-list> </ion-list>
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, OnInit} from '@angular/core'; import {Component, OnInit, inject} from '@angular/core';
import {Router, ActivatedRoute} from '@angular/router'; import {Router, ActivatedRoute} from '@angular/router';
import {SCCatalog, SCSemester} from '@openstapps/core'; import {SCCatalog, SCSemester} from '@openstapps/core';
import moment from 'moment'; import moment from 'moment';
@@ -26,8 +26,21 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
selector: 'app-catalog', selector: 'app-catalog',
templateUrl: './catalog.component.html', templateUrl: './catalog.component.html',
styleUrls: ['./catalog.component.scss'], styleUrls: ['./catalog.component.scss'],
standalone: false,
}) })
export class CatalogComponent implements OnInit { export class CatalogComponent implements OnInit {
private readonly route = inject(ActivatedRoute);
private readonly catalogProvider = inject(CatalogProvider);
private readonly dataRoutingService = inject(DataRoutingService);
private readonly logger = inject(NGXLogger);
protected router = inject(Router);
location = inject(Location);
/** /**
* SCSemester to show * SCSemester to show
*/ */
@@ -53,14 +66,7 @@ export class CatalogComponent implements OnInit {
*/ */
superCatalog: SCCatalog; superCatalog: SCCatalog;
constructor( constructor() {
private readonly route: ActivatedRoute,
private readonly catalogProvider: CatalogProvider,
private readonly dataRoutingService: DataRoutingService,
private readonly logger: NGXLogger,
protected router: Router,
public location: Location,
) {
this.dataRoutingService this.dataRoutingService
.itemSelectListener() .itemSelectListener()
.pipe(takeUntilDestroyed()) .pipe(takeUntilDestroyed())
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import { import {
SCCatalogWithoutReferences, SCCatalogWithoutReferences,
SCSearchFilter, SCSearchFilter,
@@ -28,7 +28,7 @@ import {DataProvider} from '../data/data.provider';
providedIn: 'root', providedIn: 'root',
}) })
export class CatalogProvider { export class CatalogProvider {
constructor(private readonly dataProvider: DataProvider) {} private readonly dataProvider = inject(DataProvider);
/** /**
* Get news messages * Get news messages
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {Client} from '@openstapps/api'; import {Client} from '@openstapps/api';
import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core'; import {SCAppConfiguration, SCIndexResponse} from '@openstapps/core';
import {CORE_VERSION} from '@openstapps/core'; import {CORE_VERSION} from '@openstapps/core';
@@ -44,6 +44,12 @@ export const STORAGE_KEY_CONFIG = 'stapps.config';
providedIn: 'root', providedIn: 'root',
}) })
export class ConfigProvider { export class ConfigProvider {
private readonly storageProvider = inject(StorageProvider);
private readonly logger = inject(NGXLogger);
private readonly internetConnectionService = inject(InternetConnectionService);
/** /**
* Api client * Api client
*/ */
@@ -66,16 +72,10 @@ export class ConfigProvider {
/** /**
* Constructor, initialise api client * Constructor, initialise api client
* @param storageProvider StorageProvider to load persistent configuration
* @param swHttpClient Api client
* @param logger An angular logger
*/ */
constructor( constructor() {
private readonly storageProvider: StorageProvider, const swHttpClient = inject(StAppsWebHttpClient);
swHttpClient: StAppsWebHttpClient,
private readonly logger: NGXLogger,
private readonly internetConnectionService: InternetConnectionService,
) {
console.log('config init'); console.log('config init');
this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version); this.client = new Client(swHttpClient, environment.backend_url, environment.backend_version);
} }
@@ -13,9 +13,9 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
@import '../../../theme/util/mixins'; @use '../../../theme/util/mixins';
@include ion-md-down { @include mixins.ion-md-down {
ion-toolbar, ion-toolbar,
.logo, .logo,
.schedule, .schedule,
@@ -21,7 +21,7 @@
<div #schedule class="schedule"> <div #schedule class="schedule">
<a [routerLink]="['/schedule/weekly-view']"> <a [routerLink]="['/schedule/weekly-view']">
<ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon> <ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon>
<ion-label [innerHTML]="'schedule.recurring' | translate"></ion-label> <ion-label>{{ 'schedule.recurring' | translate }}</ion-label>
</a> </a>
<!-- Avoid structural directives here, they might interfere with the collapse animation --> <!-- Avoid structural directives here, they might interfere with the collapse animation -->
<a <a
@@ -13,7 +13,7 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
@import '../../../theme/util/mixins'; @use '../../../theme/util/mixins';
:host ion-header { :host ion-header {
z-index: 1; z-index: 1;
@@ -59,15 +59,6 @@ ion-content {
} }
.schedule { .schedule {
@include ion-md-up {
position: unset;
width: unset;
height: calc(var(--tablet-top-bar-height) + (2 * var(--spacing-xl)));
margin: 0;
padding: var(--spacing-xl);
}
z-index: 3; z-index: 3;
display: flex; display: flex;
@@ -82,6 +73,15 @@ ion-content {
background: var(--ion-color-primary); background: var(--ion-color-primary);
@include mixins.ion-md-up {
position: unset;
width: unset;
height: calc(var(--tablet-top-bar-height) + (2 * var(--spacing-xl)));
margin: 0;
padding: var(--spacing-xl);
}
a { a {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -89,18 +89,13 @@ ion-content {
height: auto; height: auto;
min-height: 80px; min-height: 80px;
padding: var(--spacing-sm); padding: var(--spacing-sm);
border-radius: var(--border-radius-default);
color: var(--ion-color-primary-contrast); color: var(--ion-color-primary-contrast);
text-decoration: none; text-decoration: none;
border-radius: var(--border-radius-default);
} }
a:first-child { a:first-child {
@include phone-landscape {
height: auto;
}
overflow: hidden; overflow: hidden;
flex: 0 0 auto; flex: 0 0 auto;
gap: var(--spacing-sm); gap: var(--spacing-sm);
@@ -108,27 +103,22 @@ ion-content {
justify-content: center; justify-content: center;
height: 100%; height: 100%;
border: 2px solid var(--ion-color-primary-tint);
text-align: center; text-align: center;
border: 2px solid var(--ion-color-primary-tint); @include mixins.phone-landscape {
height: auto;
}
ion-label { ion-label {
font-size: var(--font-size-xxs); font-size: var(--font-size-xxs);
font-weight: var(--font-weight-semi-bold); font-weight: var(--font-weight-semi-bold);
word-break: break-word; word-break: overflow-wrap;
} }
} }
a:last-child { a:last-child {
@include ion-md-up {
flex: 1 1 100%;
}
@include phone-landscape {
flex: 1 1 85%;
}
z-index: 1; z-index: 1;
flex: 1 1 65%; flex: 1 1 65%;
@@ -138,6 +128,14 @@ ion-content {
background: var(--linear-gradient); background: var(--linear-gradient);
@include mixins.ion-md-up {
flex: 1 1 100%;
}
@include mixins.phone-landscape {
flex: 1 1 85%;
}
ion-label { ion-label {
font-size: var(--font-size-xxs); font-size: var(--font-size-xxs);
font-weight: var(--font-weight-bold); font-weight: var(--font-weight-bold);
@@ -38,8 +38,23 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
selector: 'app-dashboard', selector: 'app-dashboard',
templateUrl: './dashboard.component.html', templateUrl: './dashboard.component.html',
styleUrls: ['./dashboard.component.scss', './dashboard.collapse.component.scss'], styleUrls: ['./dashboard.component.scss', './dashboard.collapse.component.scss'],
standalone: false,
}) })
export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit { export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
private readonly dataRoutingService = inject(DataRoutingService);
private scheduleProvider = inject(ScheduleProvider);
protected router = inject(Router);
location = inject(Location);
private animationControl = inject(AnimationController);
private breakpointObserver = inject(BreakpointObserver);
private zone = inject(NgZone);
@ViewChild('toolbar', {read: ElementRef}) toolbarRef: ElementRef; @ViewChild('toolbar', {read: ElementRef}) toolbarRef: ElementRef;
@ViewChild('schedule', {read: ElementRef}) scheduleRef: ElementRef; @ViewChild('schedule', {read: ElementRef}) scheduleRef: ElementRef;
@@ -60,15 +75,7 @@ export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
destroy$ = inject(DestroyRef); destroy$ = inject(DestroyRef);
constructor( constructor() {
private readonly dataRoutingService: DataRoutingService,
private scheduleProvider: ScheduleProvider,
protected router: Router,
public location: Location,
private animationControl: AnimationController,
private breakpointObserver: BreakpointObserver,
private zone: NgZone,
) {
this.dataRoutingService this.dataRoutingService
.itemSelectListener() .itemSelectListener()
.pipe(takeUntilDestroyed()) .pipe(takeUntilDestroyed())
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {inject, Injectable} from '@angular/core';
import { import {
SCBooleanFilterArguments, SCBooleanFilterArguments,
SCMessage, SCMessage,
@@ -28,7 +28,9 @@ import {DataProvider} from '../data/data.provider';
providedIn: 'root', providedIn: 'root',
}) })
export class DashboardProvider { export class DashboardProvider {
constructor(private readonly dataProvider: DataProvider) {} private readonly dataProvider = inject(DataProvider);
constructor() {}
/** /**
* Get news messages * Get news messages
@@ -19,7 +19,7 @@
</ion-button> </ion-button>
@if (items | async; as items) { @if (items | async; as items) {
<simple-swiper @fade> <simple-swiper @fade>
@for (item of items; track item) { @for (item of items; track item.uid) {
<stapps-data-list-item <stapps-data-list-item
[hideThumbnail]="true" [hideThumbnail]="true"
[listItemEndInteraction]="false" [listItemEndInteraction]="false"
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {ChangeDetectionStrategy, Component} from '@angular/core'; import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
import {filter, map} from 'rxjs/operators'; import {filter, map} from 'rxjs/operators';
import {FavoritesService} from '../../../favorites/favorites.service'; import {FavoritesService} from '../../../favorites/favorites.service';
import {fadeAnimation} from '../../fade.animation'; import {fadeAnimation} from '../../fade.animation';
@@ -27,12 +27,13 @@ import {isMensaThing} from '../../mensa-filters';
styleUrls: ['favorites-section.component.scss'], styleUrls: ['favorites-section.component.scss'],
animations: [fadeAnimation], animations: [fadeAnimation],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class FavoritesSectionComponent { export class FavoritesSectionComponent {
private favoritesService = inject(FavoritesService);
items = this.favoritesService.favoriteThings$.pipe( items = this.favoritesService.favoriteThings$.pipe(
map(favorites => favorites.filter(it => !isMensaThing(it))), map(favorites => favorites.filter(it => !isMensaThing(it))),
filter(favorites => favorites.length > 0), filter(favorites => favorites.length > 0),
); );
constructor(private favoritesService: FavoritesService) {}
} }
@@ -19,7 +19,7 @@
</ion-button> </ion-button>
@if (jobs | async; as jobs) { @if (jobs | async; as jobs) {
<simple-swiper @fade> <simple-swiper @fade>
@for (item of jobs; track item) { @for (item of jobs; track item.uid) {
<stapps-data-list-item <stapps-data-list-item
[hideThumbnail]="true" [hideThumbnail]="true"
[item]="item" [item]="item"
@@ -29,8 +29,8 @@ simple-swiper {
&::part(native) { &::part(native) {
height: 100%; height: 100%;
background: none;
border-radius: var(--border-radius-default); border-radius: var(--border-radius-default);
background: none;
} }
ion-label { ion-label {
@@ -26,6 +26,7 @@ import {fadeAnimation} from '../../fade.animation';
styleUrls: ['job-section.component.scss'], styleUrls: ['job-section.component.scss'],
animations: [fadeAnimation], animations: [fadeAnimation],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class JobSectionComponent { export class JobSectionComponent {
jobs = inject(DataProvider) jobs = inject(DataProvider)
@@ -16,7 +16,7 @@
@if (dishes | async; as dishes) { @if (dishes | async; as dishes) {
@if (dishes.length > 0) { @if (dishes.length > 0) {
<simple-swiper @fade> <simple-swiper @fade>
@for (dish of dishes; track dish) { @for (dish of dishes; track dish.uid) {
<stapps-data-list-item <stapps-data-list-item
[hideThumbnail]="true" [hideThumbnail]="true"
[item]="dish" [item]="dish"
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
import {SCDish, SCPlace, SCThings} from '@openstapps/core'; import {SCDish, SCPlace, SCThings} from '@openstapps/core';
import {PlaceMensaService} from '../../../data/types/place/special/mensa/place-mensa-service'; import {PlaceMensaService} from '../../../data/types/place/special/mensa/place-mensa-service';
import {fadeAnimation} from '../../fade.animation'; import {fadeAnimation} from '../../fade.animation';
@@ -27,8 +27,11 @@ import {isToday} from 'date-fns';
styleUrls: ['mensa-section-content.component.scss'], styleUrls: ['mensa-section-content.component.scss'],
animations: [fadeAnimation], animations: [fadeAnimation],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class MensaSectionContentComponent { export class MensaSectionContentComponent {
private readonly mensaService = inject(PlaceMensaService);
/** /**
* Map of dishes for each day * Map of dishes for each day
*/ */
@@ -41,6 +44,4 @@ export class MensaSectionContentComponent {
return closestDayWithDishes ? it[closestDayWithDishes] : []; return closestDayWithDishes ? it[closestDayWithDishes] : [];
}); });
} }
constructor(private readonly mensaService: PlaceMensaService) {}
} }
@@ -15,7 +15,7 @@
@if (items | async; as items) { @if (items | async; as items) {
@if (items.length !== 0) { @if (items.length !== 0) {
@for (item of items; track item) { @for (item of items; track item.uid) {
<stapps-section @fade [item]="item" [title]="'name' | thingTranslate: item"> <stapps-section @fade [item]="item" [title]="'name' | thingTranslate: item">
<ion-button slot="button-end" fill="clear" color="medium" (click)="favoritesService.delete(item)"> <ion-button slot="button-end" fill="clear" color="medium" (click)="favoritesService.delete(item)">
<ion-icon slot="icon-only" name="delete" [size]="24"></ion-icon> <ion-icon slot="icon-only" name="delete" [size]="24"></ion-icon>
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {ChangeDetectionStrategy, Component} from '@angular/core'; import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
import {map} from 'rxjs/operators'; import {map} from 'rxjs/operators';
import {FavoritesService} from '../../../favorites/favorites.service'; import {FavoritesService} from '../../../favorites/favorites.service';
import {fadeAnimation} from '../../fade.animation'; import {fadeAnimation} from '../../fade.animation';
@@ -27,9 +27,10 @@ import {isMensaThing} from '../../mensa-filters';
styleUrls: ['mensa-section.component.scss'], styleUrls: ['mensa-section.component.scss'],
animations: [fadeAnimation], animations: [fadeAnimation],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class MensaSectionComponent { export class MensaSectionComponent {
items = this.favoritesService.favoriteThings$.pipe(map(favorites => favorites.filter(isMensaThing))); protected favoritesService = inject(FavoritesService);
constructor(protected favoritesService: FavoritesService) {} items = this.favoritesService.favoriteThings$.pipe(map(favorites => favorites.filter(isMensaThing)));
} }
@@ -23,8 +23,8 @@ simple-swiper {
&::part(native) { &::part(native) {
height: 100%; height: 100%;
background: none;
border-radius: var(--border-radius-default); border-radius: var(--border-radius-default);
background: none;
} }
ion-label { ion-label {
@@ -64,10 +64,9 @@ simple-swiper {
overflow: hidden; overflow: hidden;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 3;
white-space: break-spaces; white-space: break-spaces;
-webkit-line-clamp: 3;
} }
.title-sub { .title-sub {
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {ChangeDetectionStrategy, Component} from '@angular/core'; import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
import {NewsProvider} from '../../../news/news.provider'; import {NewsProvider} from '../../../news/news.provider';
import {fadeAnimation} from '../../fade.animation'; import {fadeAnimation} from '../../fade.animation';
@@ -25,12 +25,13 @@ import {fadeAnimation} from '../../fade.animation';
styleUrls: ['news-section.component.scss'], styleUrls: ['news-section.component.scss'],
animations: [fadeAnimation], animations: [fadeAnimation],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class NewsSectionComponent { export class NewsSectionComponent {
readonly newsProvider = inject(NewsProvider);
news = this.newsProvider news = this.newsProvider
.getCurrentFilters() .getCurrentFilters()
// eslint-disable-next-line unicorn/prefer-top-level-await,unicorn/consistent-function-scoping // eslint-disable-next-line unicorn/prefer-top-level-await,unicorn/consistent-function-scoping
.then(filters => this.newsProvider.getList(5, 0, filters)); .then(filters => this.newsProvider.getList(5, 0, filters));
constructor(readonly newsProvider: NewsProvider) {}
} }
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component} from '@angular/core'; import {Component, inject} from '@angular/core';
import {AnimationController} from '@ionic/angular/standalone'; import {AnimationController} from '@ionic/angular/standalone';
import {homePageSearchTransition} from './search-route-transition'; import {homePageSearchTransition} from './search-route-transition';
@@ -23,9 +23,10 @@ import {homePageSearchTransition} from './search-route-transition';
selector: 'stapps-search-section', selector: 'stapps-search-section',
templateUrl: 'search-section.component.html', templateUrl: 'search-section.component.html',
styleUrls: ['search-section.component.scss'], styleUrls: ['search-section.component.scss'],
standalone: false,
}) })
export class SearchSectionComponent { export class SearchSectionComponent {
routeTransition = homePageSearchTransition(this.animationController); private animationController = inject(AnimationController);
constructor(private animationController: AnimationController) {} routeTransition = homePageSearchTransition(this.animationController);
} }
@@ -22,6 +22,7 @@ import {SCDateSeries, SCThingType, SCThings} from '@openstapps/core';
selector: 'stapps-action-chip-list', selector: 'stapps-action-chip-list',
templateUrl: 'action-chip-list.html', templateUrl: 'action-chip-list.html',
styleUrls: ['action-chip-list.scss'], styleUrls: ['action-chip-list.scss'],
standalone: false,
}) })
export class ActionChipListComponent { export class ActionChipListComponent {
private _item: SCThings; private _item: SCThings;
@@ -36,8 +36,17 @@ import {MaterialSymbol} from 'material-symbols';
templateUrl: 'add-event-action-chip.html', templateUrl: 'add-event-action-chip.html',
styleUrls: ['add-event-action-chip.scss'], styleUrls: ['add-event-action-chip.scss'],
animations: [chipSkeletonTransition, chipTransition], animations: [chipSkeletonTransition, chipTransition],
standalone: false,
}) })
export class AddEventActionChipComponent { export class AddEventActionChipComponent {
readonly dataProvider = inject(CoordinatedSearchProvider);
readonly modalController = inject(ModalController);
readonly scheduleProvider = inject(ScheduleProvider);
readonly routerOutlet = inject(IonRouterOutlet);
/** /**
* Associated date series * Associated date series
*/ */
@@ -93,13 +102,6 @@ export class AddEventActionChipComponent {
destroy$ = inject(DestroyRef); destroy$ = inject(DestroyRef);
constructor(
readonly dataProvider: CoordinatedSearchProvider,
readonly modalController: ModalController,
readonly scheduleProvider: ScheduleProvider,
readonly routerOutlet: IonRouterOutlet,
) {}
/** /**
* Apply state * Apply state
*/ */
@@ -22,6 +22,7 @@ import {SCThing} from '@openstapps/core';
@Component({ @Component({
selector: 'stapps-locate-action-chip', selector: 'stapps-locate-action-chip',
templateUrl: 'locate-action-chip.html', templateUrl: 'locate-action-chip.html',
standalone: false,
}) })
export class LocateActionChipComponent { export class LocateActionChipComponent {
/** /**
@@ -19,6 +19,7 @@ import {SCPlaceWithoutReferences, SCThings} from '@openstapps/core';
selector: 'stapps-navigate-action-chip', selector: 'stapps-navigate-action-chip',
templateUrl: 'navigate-action-chip.html', templateUrl: 'navigate-action-chip.html',
styleUrls: ['navigate-action-chip.scss'], styleUrls: ['navigate-action-chip.scss'],
standalone: false,
}) })
export class NavigateActionChipComponent { export class NavigateActionChipComponent {
place: SCPlaceWithoutReferences; place: SCPlaceWithoutReferences;
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, inject} from '@angular/core';
import {ModalController} from '@ionic/angular/standalone'; import {ModalController} from '@ionic/angular/standalone';
import {SCDateSeries} from '@openstapps/core'; import {SCDateSeries} from '@openstapps/core';
import { import {
@@ -38,8 +38,17 @@ import {SelectionValue, TreeNode} from './tree-node';
selector: 'stapps-edit-event-selection', selector: 'stapps-edit-event-selection',
templateUrl: 'edit-event-selection.html', templateUrl: 'edit-event-selection.html',
styleUrls: ['edit-event-selection.scss'], styleUrls: ['edit-event-selection.scss'],
standalone: false,
}) })
export class EditEventSelectionComponent implements OnInit { export class EditEventSelectionComponent implements OnInit {
readonly ref = inject(ChangeDetectorRef);
readonly scheduleProvider = inject(ScheduleProvider);
readonly calendar = inject(CalendarService);
readonly modalController = inject(ModalController);
/** /**
* The item the action belongs to * The item the action belongs to
*/ */
@@ -58,13 +67,6 @@ export class EditEventSelectionComponent implements OnInit {
@Output() @Output()
modified = new EventEmitter(); modified = new EventEmitter();
constructor(
readonly ref: ChangeDetectorRef,
readonly scheduleProvider: ScheduleProvider,
readonly calendar: CalendarService,
readonly modalController: ModalController,
) {}
ngOnInit() { ngOnInit() {
this.partialDateSeries = this.scheduleProvider.partialEvents$.value; this.partialDateSeries = this.scheduleProvider.partialEvents$.value;
this.reset(); this.reset();
@@ -21,6 +21,7 @@ import {Component, EventEmitter, Input, Output} from '@angular/core';
selector: 'stapps-chip-filter', selector: 'stapps-chip-filter',
templateUrl: './chip-filter.component.html', templateUrl: './chip-filter.component.html',
styleUrls: ['./chip-filter.component.scss'], styleUrls: ['./chip-filter.component.scss'],
standalone: false,
}) })
export class ChipFilterComponent { export class ChipFilterComponent {
/** /**
@@ -13,7 +13,7 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {SCSearchRequest, SCSearchResponse} from '@openstapps/core'; import {SCSearchRequest, SCSearchResponse} from '@openstapps/core';
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {DataProvider} from './data.provider'; import {DataProvider} from './data.provider';
/** /**
@@ -50,7 +50,7 @@ interface OngoingQuery {
providedIn: 'root', providedIn: 'root',
}) })
export class CoordinatedSearchProvider { export class CoordinatedSearchProvider {
constructor(readonly dataProvider: DataProvider) {} readonly dataProvider = inject(DataProvider);
/** /**
* Queue of ongoing queries * Queue of ongoing queries
@@ -21,6 +21,7 @@ import {DataIcons} from './data-icon.config';
*/ */
@Pipe({ @Pipe({
name: 'dataIcon', name: 'dataIcon',
standalone: false,
}) })
export class DataIconPipe implements PipeTransform { export class DataIconPipe implements PipeTransform {
/** /**
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {Client} from '@openstapps/api'; import {Client} from '@openstapps/api';
import { import {
SCFacet, SCFacet,
@@ -141,12 +141,10 @@ export class DataProvider {
return facet; return facet;
} }
/** constructor() {
* TODO const stAppsWebHttpClient = inject(StAppsWebHttpClient);
* @param stAppsWebHttpClient TODO const storageProvider = inject(StorageProvider);
* @param storageProvider TODO
*/
constructor(stAppsWebHttpClient: StAppsWebHttpClient, storageProvider: StorageProvider) {
this.client = new Client(stAppsWebHttpClient, this.backendUrl, this.appVersion); this.client = new Client(stAppsWebHttpClient, this.backendUrl, this.appVersion);
this.storageProvider = storageProvider; this.storageProvider = storageProvider;
} }
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Injectable} from '@angular/core'; import {Injectable, inject} from '@angular/core';
import {SCFeedbackRequestMetaData} from '@openstapps/core'; import {SCFeedbackRequestMetaData} from '@openstapps/core';
import {Platform} from '@ionic/angular/standalone'; import {Platform} from '@ionic/angular/standalone';
import {DataProvider} from './data.provider'; import {DataProvider} from './data.provider';
@@ -23,6 +23,14 @@ import {SettingsProvider} from '../settings/settings.provider';
providedIn: 'root', providedIn: 'root',
}) })
export class DebugDataCollectorService { export class DebugDataCollectorService {
private platform = inject(Platform);
private dataProvider = inject(DataProvider);
private router = inject(Router);
private settingsProvider = inject(SettingsProvider);
/** /**
* Previously visited route * Previously visited route
*/ */
@@ -33,12 +41,9 @@ export class DebugDataCollectorService {
*/ */
currentRoute: string; currentRoute: string;
constructor( constructor() {
private platform: Platform, const router = this.router;
private dataProvider: DataProvider,
private router: Router,
private settingsProvider: SettingsProvider,
) {
this.currentRoute = this.router.url; this.currentRoute = this.router.url;
router.events.subscribe(event => { router.events.subscribe(event => {
if (event instanceof NavigationEnd) { if (event instanceof NavigationEnd) {
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, Input, TemplateRef} from '@angular/core'; import {Component, Input, TemplateRef, inject} from '@angular/core';
import {SCThings} from '@openstapps/core'; import {SCThings} from '@openstapps/core';
import {DataListContext} from '../list/data-list.component'; import {DataListContext} from '../list/data-list.component';
import {ModalController} from '@ionic/angular/standalone'; import {ModalController} from '@ionic/angular/standalone';
@@ -24,8 +24,11 @@ import {ModalController} from '@ionic/angular/standalone';
selector: 'stapps-data-detail-content', selector: 'stapps-data-detail-content',
styleUrls: ['data-detail-content.scss'], styleUrls: ['data-detail-content.scss'],
templateUrl: 'data-detail-content.html', templateUrl: 'data-detail-content.html',
standalone: false,
}) })
export class DataDetailContentComponent { export class DataDetailContentComponent {
readonly modalController = inject(ModalController);
/** /**
* TODO * TODO
*/ */
@@ -36,6 +39,4 @@ export class DataDetailContentComponent {
@Input() openAsModal = false; @Input() openAsModal = false;
@Input() showModalHeader = false; @Input() showModalHeader = false;
constructor(readonly modalController: ModalController) {}
} }
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
@import '../../../../theme/util/mixins'; @use '../../../../theme/util/mixins';
:host { :host {
display: contents; display: contents;
@@ -34,8 +34,8 @@ stapps-origin-detail {
padding: 0 var(--spacing-md); padding: 0 var(--spacing-md);
::ng-deep > * { ::ng-deep > * {
@include border-radius-in-parallax(var(--border-radius-default)); @include mixins.border-radius-in-parallax(var(--border-radius-default));
@include content-padding; @include mixins.content-padding;
position: relative; position: relative;
@@ -12,7 +12,16 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, ContentChild, EventEmitter, Input, OnInit, Output, TemplateRef} from '@angular/core'; import {
Component,
ContentChild,
EventEmitter,
Input,
OnInit,
Output,
TemplateRef,
inject,
} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {ModalController} from '@ionic/angular/standalone'; import {ModalController} from '@ionic/angular/standalone';
import {LangChangeEvent, TranslateService} from '@ngx-translate/core'; import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
@@ -36,8 +45,17 @@ export interface ExternalDataLoadEvent {
selector: 'stapps-data-detail', selector: 'stapps-data-detail',
styleUrls: ['data-detail.scss'], styleUrls: ['data-detail.scss'],
templateUrl: 'data-detail.html', templateUrl: 'data-detail.html',
standalone: false,
}) })
export class DataDetailComponent implements OnInit { export class DataDetailComponent implements OnInit {
protected readonly route = inject(ActivatedRoute);
private readonly dataProvider = inject(DataProvider);
private readonly favoritesService = inject(FavoritesService);
readonly modalController = inject(ModalController);
/** /**
* The associated item * The associated item
* *
@@ -86,15 +104,11 @@ export class DataDetailComponent implements OnInit {
return (thing as SCSaveableThing).data !== undefined; return (thing as SCSaveableThing).data !== undefined;
} }
constructor( constructor() {
protected readonly route: ActivatedRoute, const router = inject(Router);
router: Router, const translateService = inject(TranslateService);
private readonly dataProvider: DataProvider,
private readonly favoritesService: FavoritesService, this.inputItem = router.currentNavigation()?.extras.state?.item;
readonly modalController: ModalController,
translateService: TranslateService,
) {
this.inputItem = router.getCurrentNavigation()?.extras.state?.item;
if (!this.inputItem?.origin) { if (!this.inputItem?.origin) {
// We received a ThingWithoutReferences. // We received a ThingWithoutReferences.
// This can happen, for example, when detail views use `inPlace` list items // This can happen, for example, when detail views use `inPlace` list items
@@ -26,8 +26,17 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
selector: 'stapps-data-path', selector: 'stapps-data-path',
templateUrl: './data-path.html', templateUrl: './data-path.html',
styleUrls: ['./data-path.scss'], styleUrls: ['./data-path.scss'],
standalone: false,
}) })
export class DataPathComponent implements OnInit { export class DataPathComponent implements OnInit {
readonly dataRoutingService = inject(DataRoutingService);
readonly navController = inject(NavController);
readonly routeStack = inject(RoutingStackService);
readonly dataProvider = inject(DataProvider);
path: Promise<SCThingWithoutReferences[]>; path: Promise<SCThingWithoutReferences[]>;
$width: Observable<number>; $width: Observable<number>;
@@ -65,13 +74,6 @@ export class DataPathComponent implements OnInit {
destroy$ = inject(DestroyRef); destroy$ = inject(DestroyRef);
constructor(
readonly dataRoutingService: DataRoutingService,
readonly navController: NavController,
readonly routeStack: RoutingStackService,
readonly dataProvider: DataProvider,
) {}
ngOnInit() { ngOnInit() {
this.$width = fromEvent(window, 'resize').pipe( this.$width = fromEvent(window, 'resize').pipe(
map(() => window.innerWidth), map(() => window.innerWidth),
@@ -21,6 +21,7 @@ import {SCPostalAddress} from '@openstapps/core';
@Component({ @Component({
selector: 'stapps-address-detail', selector: 'stapps-address-detail',
templateUrl: 'address-detail.html', templateUrl: 'address-detail.html',
standalone: false,
}) })
export class AddressDetailComponent { export class AddressDetailComponent {
/** /**
@@ -19,6 +19,7 @@ import {SCCertificationWithoutReferences} from '@openstapps/core';
selector: 'stapps-certifications-in-detail', selector: 'stapps-certifications-in-detail',
templateUrl: 'certifications-in-detail.html', templateUrl: 'certifications-in-detail.html',
styleUrls: ['certifications-in-detail.scss'], styleUrls: ['certifications-in-detail.scss'],
standalone: false,
}) })
export class CertificationsInDetailComponent { export class CertificationsInDetailComponent {
@Input() certifications: SCCertificationWithoutReferences[] = []; @Input() certifications: SCCertificationWithoutReferences[] = [];
@@ -13,21 +13,22 @@
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, Input} from '@angular/core'; import {Component, Input, inject} from '@angular/core';
import {SimpleBrowser} from '../../../util/browser.factory'; import {SimpleBrowser} from '../../../util/browser.factory';
@Component({ @Component({
selector: 'stapps-external-link', selector: 'stapps-external-link',
templateUrl: './external-link.html', templateUrl: './external-link.html',
styleUrls: ['./external-link.scss'], styleUrls: ['./external-link.scss'],
standalone: false,
}) })
export class ExternalLinkComponent { export class ExternalLinkComponent {
private browser = inject(SimpleBrowser);
@Input() link: string; @Input() link: string;
@Input() text: string; @Input() text: string;
constructor(private browser: SimpleBrowser) {}
onLinkClick(url: string) { onLinkClick(url: string) {
// make sure if the url is valid and then open it in the browser (prevent problem in iOS) // make sure if the url is valid and then open it in the browser (prevent problem in iOS)
this.browser.open(new URL(url).href); this.browser.open(new URL(url).href);
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {ChangeDetectionStrategy, Component, Input} from '@angular/core'; import {ChangeDetectionStrategy, Component, Input, inject} from '@angular/core';
import {SCIndexableThings} from '@openstapps/core'; import {SCIndexableThings} from '@openstapps/core';
import {FavoritesService} from '../../favorites/favorites.service'; import {FavoritesService} from '../../favorites/favorites.service';
import {Observable} from 'rxjs'; import {Observable} from 'rxjs';
@@ -26,8 +26,11 @@ import {map, take} from 'rxjs/operators';
templateUrl: './favorite-button.component.html', templateUrl: './favorite-button.component.html',
styleUrls: ['./favorite-button.component.scss'], styleUrls: ['./favorite-button.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class FavoriteButtonComponent { export class FavoriteButtonComponent {
private favoritesService = inject(FavoritesService);
/** /**
* Item getter * Item getter
*/ */
@@ -57,8 +60,6 @@ export class FavoriteButtonComponent {
*/ */
isFavorite$: Observable<boolean>; isFavorite$: Observable<boolean>;
constructor(private favoritesService: FavoritesService) {}
/** /**
* Add or remove the thing from favorites (depending on its current status) * Add or remove the thing from favorites (depending on its current status)
* @param event A click event * @param event A click event
@@ -20,6 +20,7 @@ import {Component, Input} from '@angular/core';
@Component({ @Component({
selector: 'stapps-long-inline-text', selector: 'stapps-long-inline-text',
templateUrl: 'long-inline-text.html', templateUrl: 'long-inline-text.html',
standalone: false,
}) })
export class LongInlineTextComponent { export class LongInlineTextComponent {
/** /**
@@ -13,20 +13,20 @@
~ this program. If not, see <https://www.gnu.org/licenses/>. ~ this program. If not, see <https://www.gnu.org/licenses/>.
--> -->
@if (text !== undefined) { @if (text !== undefined) {
<span class="ion-hide-sm-up"> <span class="ion-hide-sm-up"
{{ text | slice: 0 : size }} >{{ text | slice: 0 : size }}
@if (text.length > size) { @if (text.length > size) {
<span class="ion-hide-sm-up"></span> <span class="ion-hide-sm-up"></span>
} }
</span> </span>
<span class="ion-hide-sm-down ion-hide-md-up"> <span class="ion-hide-sm-down ion-hide-md-up"
{{ text | slice: 0 : size * 2 }} >{{ text | slice: 0 : size * 2 }}
@if (text.length > size * 2) { @if (text.length > size * 2) {
<span class="ion-hide-sm-down ion-hide-md-up"></span> <span class="ion-hide-sm-down ion-hide-md-up"></span>
} }
</span> </span>
<span class="ion-hide-md-down"> <span class="ion-hide-md-down"
{{ text | slice: 0 : size * 3 }} >{{ text | slice: 0 : size * 3 }}
@if (text.length > size * 3) { @if (text.length > size * 3) {
<span class="ion-hide-md-down"></span> <span class="ion-hide-md-down"></span>
} }
@@ -18,6 +18,7 @@ import {SCAcademicPriceGroup, SCThingThatCanBeOfferedOffer} from '@openstapps/co
@Component({ @Component({
selector: 'stapps-offers-detail', selector: 'stapps-offers-detail',
templateUrl: 'offers-detail.html', templateUrl: 'offers-detail.html',
standalone: false,
}) })
export class OffersDetailComponent { export class OffersDetailComponent {
@Input() offers: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>; @Input() offers: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>;
@@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Component, Input} from '@angular/core'; import {Component, Input, inject} from '@angular/core';
import { import {
SCAcademicPriceGroup, SCAcademicPriceGroup,
SCThingThatCanBeOfferedAvailability, SCThingThatCanBeOfferedAvailability,
@@ -24,8 +24,11 @@ import {SettingsProvider} from '../../settings/settings.provider';
selector: 'stapps-offers-in-list', selector: 'stapps-offers-in-list',
templateUrl: 'offers-in-list.html', templateUrl: 'offers-in-list.html',
styleUrls: ['offers-in-list.scss'], styleUrls: ['offers-in-list.scss'],
standalone: false,
}) })
export class OffersInListComponent { export class OffersInListComponent {
readonly settingsProvider = inject(SettingsProvider);
@Input() set offers(it: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>) { @Input() set offers(it: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>) {
this._offers = it; this._offers = it;
this.price = it[0].prices?.default; this.price = it[0].prices?.default;
@@ -43,6 +46,4 @@ export class OffersInListComponent {
availability: SCThingThatCanBeOfferedAvailability; availability: SCThingThatCanBeOfferedAvailability;
_offers: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>; _offers: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>;
constructor(readonly settingsProvider: SettingsProvider) {}
} }
@@ -22,6 +22,7 @@ import {SCThingUserOrigin, SCThingRemoteOrigin} from '@openstapps/core';
selector: 'stapps-origin-detail', selector: 'stapps-origin-detail',
templateUrl: 'origin-detail.html', templateUrl: 'origin-detail.html',
styleUrl: 'origin-detail.scss', styleUrl: 'origin-detail.scss',
standalone: false,
}) })
export class OriginDetailComponent { export class OriginDetailComponent {
/** /**
@@ -21,6 +21,7 @@ import {SCThingUserOrigin, SCThingRemoteOrigin} from '@openstapps/core';
@Component({ @Component({
selector: 'stapps-origin-in-list', selector: 'stapps-origin-in-list',
templateUrl: 'origin-in-list.html', templateUrl: 'origin-in-list.html',
standalone: false,
}) })
export class OriginInListComponent { export class OriginInListComponent {
/** /**
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>. * this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {ChangeDetectionStrategy, Component, ElementRef, HostListener, Input} from '@angular/core'; import {ChangeDetectionStrategy, Component, ElementRef, HostListener, Input, inject} from '@angular/core';
import {SCDish, SCRatingRequest} from '@openstapps/core'; import {SCDish, SCRatingRequest} from '@openstapps/core';
import {RatingProvider} from '../rating.provider'; import {RatingProvider} from '../rating.provider';
import {ratingAnimation} from './rating.animation'; import {ratingAnimation} from './rating.animation';
@@ -26,8 +26,13 @@ import {catchError, map} from 'rxjs/operators';
styleUrls: ['rating.scss'], styleUrls: ['rating.scss'],
animations: [ratingAnimation], animations: [ratingAnimation],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
standalone: false,
}) })
export class StappsRatingComponent { export class StappsRatingComponent {
readonly elementRef = inject(ElementRef);
readonly ratingProvider = inject(RatingProvider);
performRating = new BehaviorSubject(false); performRating = new BehaviorSubject(false);
userRating = new BehaviorSubject<number | undefined>(undefined); userRating = new BehaviorSubject<number | undefined>(undefined);
@@ -51,11 +56,6 @@ export class StappsRatingComponent {
this.dish.next(value); this.dish.next(value);
} }
constructor(
readonly elementRef: ElementRef,
readonly ratingProvider: RatingProvider,
) {}
@HostListener('document:mousedown', ['$event']) @HostListener('document:mousedown', ['$event'])
clickOutside(event: MouseEvent) { clickOutside(event: MouseEvent) {
if (this.userRating.value) return; if (this.userRating.value) return;
@@ -34,9 +34,9 @@ ion-button {
justify-content: flex-start; justify-content: flex-start;
padding-inline: var(--spacing-xl); padding-inline: var(--spacing-xl);
border-radius: var(--border-radius-default);
background: var(--ion-color-light); background: var(--ion-color-light);
border-radius: var(--border-radius-default);
> ion-icon { > ion-icon {
&:active, &:active,
@@ -1,4 +1,4 @@
import {Component, Input} from '@angular/core'; import {Component, Input, inject} from '@angular/core';
import {ToastController} from '@ionic/angular/standalone'; import {ToastController} from '@ionic/angular/standalone';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
@@ -6,16 +6,17 @@ import {environment} from '../../../../environments/environment';
selector: 'stapps-share-button', selector: 'stapps-share-button',
templateUrl: 'share-button.html', templateUrl: 'share-button.html',
styleUrls: ['share-button.scss'], styleUrls: ['share-button.scss'],
standalone: false,
}) })
export class ShareButtonComponent { export class ShareButtonComponent {
readonly toastController = inject(ToastController);
canShare = false; canShare = false;
@Input({required: true}) title: string; @Input({required: true}) title: string;
@Input() url: string; @Input() url: string;
constructor(readonly toastController: ToastController) {}
share(): boolean { share(): boolean {
const url = this.url ?? new URL(window.location.pathname, `https://${environment.app_host}`); const url = this.url ?? new URL(window.location.pathname, `https://${environment.app_host}`);
@@ -18,6 +18,7 @@ import {SCThingWithoutReferences} from '@openstapps/core';
@Component({ @Component({
selector: 'stapps-simple-card', selector: 'stapps-simple-card',
templateUrl: 'simple-card.html', templateUrl: 'simple-card.html',
standalone: false,
}) })
export class SimpleCardComponent { export class SimpleCardComponent {
areThings = false; areThings = false;
@@ -24,7 +24,7 @@
} }
} @else { } @else {
@if (content && isThing(content[0])) { @if (content && isThing(content[0])) {
@for (thing of $any(content); track thing) { @for (thing of $any(content); track thing.uid) {
<a [routerLink]="['/data-detail', thing.uid]"> <a [routerLink]="['/data-detail', thing.uid]">
<p>{{ 'name' | thingTranslate: thing }}</p> <p>{{ 'name' | thingTranslate: thing }}</p>
</a> </a>
@@ -21,6 +21,7 @@ import {Component, Input} from '@angular/core';
selector: 'stapps-skeleton-list-item', selector: 'stapps-skeleton-list-item',
templateUrl: 'skeleton-list-item.html', templateUrl: 'skeleton-list-item.html',
styleUrls: ['skeleton-list-item.scss'], styleUrls: ['skeleton-list-item.scss'],
standalone: false,
}) })
export class SkeletonListItemComponent { export class SkeletonListItemComponent {
@Input() hideThumbnail = false; @Input() hideThumbnail = false;

Some files were not shown because too many files have changed in this diff Show More