Move some misc classes into the 'helpers' directory

src/app/api/client.service.ts

@@ -1,15 +1,15 @@
 import {Injectable} from '@angular/core';
 import {HttpClient, HttpParams} from "@angular/common/http";
 import {Instance} from "./types/instance";
-import {LazySubject} from "./lazy-subject";
+import {LazySubject} from "../helpers/lazy-subject";
 import {LevelCategory} from "./types/levels/level-category";
 import {Room} from "./types/rooms/room";
 import {Level} from "./types/levels/level";
 import {ListWithData} from "./list-with-data";
 import {User} from "./types/users/user";
 import {ActivityPage} from "./types/activity/activity-page";
 import {Photo} from "./types/photos/photo";
-import {Observable, of} from "rxjs";
+import {Observable} from "rxjs";
 
 export const defaultPageSize: number = 40;
 

src/app/api/interceptors/api-base.interceptor.ts

@@ -1,6 +1,6 @@
 import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';
 import {Observable} from 'rxjs';
-import {getApiBaseUrl} from "../data-fetching";
+import {getApiBaseUrl} from "../../helpers/data-fetching";
 
 export class ApiBaseInterceptor implements HttpInterceptor {
     intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {

src/app/app.config.ts

@@ -7,8 +7,8 @@ import { routes } from './app.routes';
 import { provideClientHydration } from '@angular/platform-browser';
 import {ApiBaseInterceptor} from "./api/interceptors/api-base.interceptor";
 import {APIv3Interceptor} from "./api/interceptors/apiv3.interceptor";
-import {IMAGE_LOADER, ImageLoaderConfig} from "@angular/common";
-import {getImageLink} from "./api/data-fetching";
+import {IMAGE_LOADER} from "@angular/common";
+import {loadImage} from "./helpers/data-fetching";
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -19,15 +19,7 @@ export const appConfig: ApplicationConfig = {
     useInterceptor(APIv3Interceptor),
     {
       provide: IMAGE_LOADER,
-      useValue: (config: ImageLoaderConfig) => {
-        if(config.src.startsWith("/")) return config.src;
-
-        // Only consider SHA1 asset hashes
-        // Naturally filters out GUIDs, and blank hashes.
-        if(config.src.length != 40) return "/assets/missingLevel.svg";
-
-        return getImageLink(config.src);
-      }
+      useValue: loadImage,
     }
   ]
 };

src/app/components/ui/text/code-block.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import {ContainerComponent} from "./container.component";
+import {ContainerComponent} from "../container.component";
 
 @Component({
   selector: 'app-codeblock',

src/app/helpers/data-fetching.ts

@@ -0,0 +1,19 @@
+import {ImageLoaderConfig} from "@angular/common";
+
+export function getApiBaseUrl(): string {
+    return "https://lbp.littlebigrefresh.com/api/v3";
+}
+
+export function getImageLink(hash: string): string {
+    return `${getApiBaseUrl()}/assets/${hash}/image`;
+}
+
+export function loadImage(config: ImageLoaderConfig) {
+    if(config.src.startsWith("/")) return config.src;
+
+    // Only consider SHA1 asset hashes
+    // Naturally filters out GUIDs, and blank hashes.
+    if(config.src.length != 40) return "/assets/missingLevel.svg";
+
+    return getImageLink(config.src);
+}

src/app/api/scrollable.ts → src/app/helpers/scrollable.ts

@@ -1,4 +1,4 @@
-import {RefreshApiListInfo} from "./refresh-api-list-info";
+import {RefreshApiListInfo} from "../api/refresh-api-list-info";
 
 export interface Scrollable {
     isLoading: boolean;

src/app/pages/activity-listing/activity-listing.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import {PageTitleComponent} from "../../components/ui/text/page-title.component";
-import { Scrollable } from '../../api/scrollable';
+import { Scrollable } from '../../helpers/scrollable';
 import {defaultListInfo, RefreshApiListInfo} from '../../api/refresh-api-list-info';
 import {ActivityPage} from "../../api/types/activity/activity-page";
 import {ClientService} from "../../api/client.service";

src/app/pages/level-listing/level-listing.component.ts

@@ -9,7 +9,7 @@ import {ResponsiveGridComponent} from "../../components/ui/responsive-grid.compo
 import {Level} from "../../api/types/levels/level";
 import {LevelPreviewComponent} from "../../components/items/level-preview.component";
 import {ContainerComponent} from "../../components/ui/container.component";
-import {Scrollable} from "../../api/scrollable";
+import {Scrollable} from "../../helpers/scrollable";
 import {defaultListInfo, RefreshApiListInfo} from "../../api/refresh-api-list-info";
 import {InfiniteScrollerComponent} from "../../components/ui/infinite-scroller.component";
 

src/app/pages/photo-listing/photo-listing.component.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import {PageTitleComponent} from "../../components/ui/text/page-title.component";
 import {ClientService} from "../../api/client.service";
 import {Photo} from "../../api/types/photos/photo";
-import {Scrollable} from "../../api/scrollable";
+import {Scrollable} from "../../helpers/scrollable";
 import {defaultListInfo, RefreshApiListInfo} from "../../api/refresh-api-list-info";
 import {ContainerComponent} from "../../components/ui/container.component";
 import {InfiniteScrollerComponent} from "../../components/ui/infinite-scroller.component";

src/app/services/embed.service.ts

@@ -5,7 +5,7 @@ import {Injectable} from "@angular/core";
 import {User} from "../api/types/users/user";
 import {ClientService} from "../api/client.service";
 import {Photo} from "../api/types/photos/photo";
-import {getImageLink} from "../api/data-fetching";
+import {getImageLink} from "../helpers/data-fetching";
 import {TitleService} from "./title.service";
 
 @Injectable({providedIn: 'root'})