fix merge complications

TUM-Dev · Sep 15, 2023 · b996d07 · b996d07
1 parent 1b1b1ab
commit b996d07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/web/ts/data-store/admin-lecture-list.ts b/web/ts/data-store/admin-lecture-list.ts
@@ -1,7 +1,7 @@
 import { StreamableMapProvider } from "./provider";
 import { AdminLectureList, Lecture, LectureFile, UpdateLectureMetaRequest } from "../api/admin-lecture-list";
 import { FileType } from "../edit-course";
-import { UploadFileListener } from "../global";
+import {PostFormDataListener} from "../utilities/fetch-wrappers";
 
 const dateFormatOptions: Intl.DateTimeFormatOptions = {
     weekday: "long",
@@ -174,7 +174,7 @@ export class AdminLectureListProvider extends StreamableMapProvider<number, Lect
         lectureId: number,
         videoType: string,
         file: File,
-        listener: UploadFileListener = {},
+        listener: PostFormDataListener = {},
     ) {
         await AdminLectureList.uploadVideo(courseId, lectureId, videoType, file, listener);
     }

diff --git a/web/ts/edit-course.ts b/web/ts/edit-course.ts
@@ -13,6 +13,7 @@ import {
 } from "./api/admin-lecture-list";
 import { ChangeSet, comparatorPipeline, ignoreKeys, singleProperty } from "./change-set";
 import { AlpineComponent } from "./components/alpine-component";
+import {uploadFile} from "./utilities/fetch-wrappers";
 
 export enum UIEditMode {
     none,

diff --git a/web/ts/utilities/fetch-wrappers.ts b/web/ts/utilities/fetch-wrappers.ts
@@ -1,5 +1,3 @@
-import { postFormData } from "../global";
-
 /**
  * Wrapper for Javascript's fetch function for GET
  * @param  {string} url URL to fetch