Consolidate frontend types (#1245)

frontend/api/class-interfaces/backups.ts

@@ -1,35 +1,5 @@
 import { BaseAPI } from "../_base";
-
-export interface BackupOptions {
-  recipes?: boolean;
-  settings?: boolean;
-  pages?: boolean;
-  themes?: boolean;
-  groups?: boolean;
-  users?: boolean;
-  notifications?: boolean;
-}
-
-export interface ImportBackup {
-  name: string;
-  options: BackupOptions;
-}
-
-export interface BackupJob {
-  tag?: string;
-  options: BackupOptions;
-  templates?: string[];
-}
-
-export interface BackupFile {
-  name: string;
-  date: string;
-}
-
-export interface AllBackups {
-  imports: BackupFile[];
-  templates: string[];
-}
+import { AllBackups, BackupOptions, CreateBackup } from "~/types/api-types/admin";
 
 const prefix = "/api";
 
@@ -52,7 +22,7 @@ export class BackupAPI extends BaseAPI {
 
   /** Generates a backup of the recipe database in json format.
    */
-  async createOne(payload: BackupJob) {
+  async createOne(payload: CreateBackup) {
     return await this.requests.post(routes.backupsExportDatabase, payload);
   }
 

frontend/api/class-interfaces/email.ts

@@ -1,4 +1,7 @@
 import { BaseAPI } from "../_base";
+import { EmailInitationResponse, EmailInvitation } from "~/types/api-types/group";
+import { ForgotPassword } from "~/types/api-types/user";
+import { EmailTest } from "~/types/api-types/admin";
 
 const routes = {
   base: "/api/admin/email",
@@ -7,30 +10,16 @@ const routes = {
   invitation: "/api/groups/invitations/email",
 };
 
-export interface EmailResponse {
-  success: boolean;
-  error: string;
-}
-
-export interface EmailPayload {
-  email: string;
-}
-
-export interface InvitationEmail {
-  email: string;
-  token: string;
-}
-
 export class EmailAPI extends BaseAPI {
-  test(payload: EmailPayload) {
-    return this.requests.post<EmailResponse>(routes.base, payload);
+  test(payload: EmailTest) {
+    return this.requests.post<EmailInitationResponse>(routes.base, payload);
   }
 
-  sendInvitation(payload: InvitationEmail) {
-    return this.requests.post<EmailResponse>(routes.invitation, payload);
+  sendInvitation(payload: EmailInvitation) {
+    return this.requests.post<EmailInitationResponse>(routes.invitation, payload);
   }
 
-  sendForgotPassword(payload: EmailPayload) {
-    return this.requests.post<EmailResponse>(routes.forgotPassword, payload);
+  sendForgotPassword(payload: ForgotPassword) {
+    return this.requests.post<EmailInitationResponse>(routes.forgotPassword, payload);
   }
 }

frontend/api/class-interfaces/group-cookbooks.ts

@@ -8,7 +8,7 @@ const routes = {
   cookbooksId: (id: number) => `${prefix}/groups/cookbooks/${id}`,
 };
 
-export class CookbookAPI extends BaseCRUDAPI<RecipeCookBook, CreateCookBook> {
+export class CookbookAPI extends BaseCRUDAPI<CreateCookBook, RecipeCookBook, UpdateCookBook> {
   baseRoute: string = routes.cookbooks;
   itemRoute = routes.cookbooksId;
 

frontend/api/class-interfaces/group-event-notifier.ts

@@ -1,5 +1,5 @@
 import { BaseCRUDAPI } from "../_base";
-import { GroupEventNotifierCreate, GroupEventNotifierOut } from "~/types/api-types/group";
+import { GroupEventNotifierCreate, GroupEventNotifierOut, GroupEventNotifierUpdate } from "~/types/api-types/group";
 
 const prefix = "/api";
 
@@ -8,7 +8,7 @@ const routes = {
   eventNotifierId: (id: string | number) => `${prefix}/groups/events/notifications/${id}`,
 };
 
-export class GroupEventNotifierApi extends BaseCRUDAPI<GroupEventNotifierOut, GroupEventNotifierCreate> {
+export class GroupEventNotifierApi extends BaseCRUDAPI<GroupEventNotifierCreate, GroupEventNotifierOut, GroupEventNotifierUpdate> {
   baseRoute = routes.eventNotifier;
   itemRoute = routes.eventNotifierId;
 

frontend/api/class-interfaces/group-mealplan-rules.ts

@@ -8,7 +8,7 @@ const routes = {
   ruleId: (id: string | number) => `${prefix}/groups/mealplans/rules/${id}`,
 };
 
-export class MealPlanRulesApi extends BaseCRUDAPI<PlanRulesOut, PlanRulesCreate> {
+export class MealPlanRulesApi extends BaseCRUDAPI<PlanRulesCreate, PlanRulesOut> {
   baseRoute = routes.rule;
   itemRoute = routes.ruleId;
 }

frontend/api/class-interfaces/group-mealplan.ts

@@ -1,5 +1,5 @@
 import { BaseCRUDAPI } from "../_base";
-import { CreatRandomEntry } from "~/types/api-types/meal-plan";
+import { CreatePlanEntry, CreateRandomEntry, ReadPlanEntry, UpdatePlanEntry } from "~/types/api-types/meal-plan";
 
 const prefix = "/api";
 
@@ -9,31 +9,12 @@ const routes = {
   mealplanId: (id: string | number) => `${prefix}/groups/mealplans/${id}`,
 };
 
-type PlanEntryType = "breakfast" | "lunch" | "dinner" | "side";
-
-export interface CreateMealPlan {
-  date: string;
-  entryType: PlanEntryType;
-  title: string;
-  text: string;
-  recipeId?: string;
-}
-
-export interface UpdateMealPlan extends CreateMealPlan {
-  id: number;
-  groupId: number;
-}
-
-export interface MealPlan extends UpdateMealPlan {
-  recipe: any;
-}
-
-export class MealPlanAPI extends BaseCRUDAPI<MealPlan, CreateMealPlan> {
+export class MealPlanAPI extends BaseCRUDAPI<CreatePlanEntry, ReadPlanEntry, UpdatePlanEntry> {
   baseRoute = routes.mealplan;
   itemRoute = routes.mealplanId;
 
-  async setRandom(payload: CreatRandomEntry) {
+  async setRandom(payload: CreateRandomEntry) {
     console.log(payload);
-    return await this.requests.post<MealPlan>(routes.random, payload);
+    return await this.requests.post<ReadPlanEntry>(routes.random, payload);
   }
 }

frontend/api/class-interfaces/group-migrations.ts

@@ -1,13 +1,11 @@
 import { BaseAPI } from "../_base";
-import { ReportSummary } from "./group-reports";
+import { ReportSummary } from "~/types/api-types/reports";
+import { SupportedMigrations } from "~/types/api-types/group";
 
 const prefix = "/api";
-
-export type SupportedMigration = "nextcloud" | "chowdown" | "mealie_alpha" | "paprika";
-
 export interface MigrationPayload {
   addMigrationTag: boolean;
-  migrationType: SupportedMigration;
+  migrationType: SupportedMigrations;
   archive: File;
 }
 

frontend/api/class-interfaces/group-multiple-purpose-labels.ts

@@ -1,5 +1,5 @@
 import { BaseCRUDAPI } from "../_base";
-import { MultiPurposeLabelCreate, MultiPurposeLabelOut } from "~/types/api-types/labels";
+import { MultiPurposeLabelCreate, MultiPurposeLabelOut, MultiPurposeLabelUpdate } from "~/types/api-types/labels";
 
 const prefix = "/api";
 
@@ -8,7 +8,7 @@ const routes = {
   labelsId: (id: string | number) => `${prefix}/groups/labels/${id}`,
 };
 
-export class MultiPurposeLabelsApi extends BaseCRUDAPI<MultiPurposeLabelOut, MultiPurposeLabelCreate> {
+export class MultiPurposeLabelsApi extends BaseCRUDAPI<MultiPurposeLabelCreate, MultiPurposeLabelOut, MultiPurposeLabelUpdate> {
   baseRoute = routes.labels;
   itemRoute = routes.labelsId;
 }

frontend/api/class-interfaces/group-reports.ts

@@ -1,33 +1,8 @@
 import { BaseAPI } from "../_base";
+import { ReportCategory, ReportOut, ReportSummary } from "~/types/api-types/reports";
 
 const prefix = "/api";
 
-export type ReportCategory = "backup" | "restore" | "migration";
-
-export type SummaryStatus = "success" | "failure" | "partial" | "in-progress";
-
-export interface ReportEntry {
-  id: string;
-  reportId: string;
-  timestamp: Date;
-  success: boolean;
-  message: string;
-  exception: string;
-}
-
-export interface ReportSummary {
-  id: string;
-  timestamp: Date;
-  category: ReportCategory;
-  groupId: number;
-  name: string;
-  status: SummaryStatus;
-}
-
-export interface Report extends ReportSummary {
-  entries: ReportEntry[];
-}
-
 const routes = {
   base: `${prefix}/groups/reports`,
   getOne: (id: string) => `${prefix}/groups/reports/${id}`,
@@ -40,7 +15,7 @@ export class GroupReportsApi extends BaseAPI {
   }
 
   async getOne(id: string) {
-    return await this.requests.get<Report>(routes.getOne(id));
+    return await this.requests.get<ReportOut>(routes.getOne(id));
   }
 
   async deleteOne(id: string) {

frontend/api/class-interfaces/group-shopping-lists.ts

@@ -4,7 +4,9 @@ import {
   ShoppingListCreate,
   ShoppingListItemCreate,
   ShoppingListItemOut,
+  ShoppingListItemUpdate,
   ShoppingListOut,
+  ShoppingListUpdate,
 } from "~/types/api-types/group";
 
 const prefix = "/api";
@@ -18,7 +20,7 @@ const routes = {
   shoppingListItemsId: (id: string) => `${prefix}/groups/shopping/items/${id}`,
 };
 
-export class ShoppingListsApi extends BaseCRUDAPI<ShoppingListOut, ShoppingListCreate> {
+export class ShoppingListsApi extends BaseCRUDAPI<ShoppingListCreate, ShoppingListOut, ShoppingListUpdate> {
   baseRoute = routes.shoppingLists;
   itemRoute = routes.shoppingListsId;
 
@@ -31,7 +33,7 @@ export class ShoppingListsApi extends BaseCRUDAPI<ShoppingListOut, ShoppingListC
   }
 }
 
-export class ShoppingListItemsApi extends BaseCRUDAPI<ShoppingListItemOut, ShoppingListItemCreate> {
+export class ShoppingListItemsApi extends BaseCRUDAPI<ShoppingListItemCreate, ShoppingListItemOut, ShoppingListItemUpdate> {
   baseRoute = routes.shoppingListItems;
   itemRoute = routes.shoppingListItemsId;
 

frontend/api/class-interfaces/group-tasks.ts

@@ -1,5 +1,5 @@
 import { BaseAPI } from "../_base";
-import { ServerTask } from "~/api/types/server-task";
+import { ServerTask } from "~/types/api-types/server";
 const prefix = "/api";
 
 const routes = {

frontend/api/class-interfaces/group-webhooks.ts

@@ -1,4 +1,5 @@
 import { BaseCRUDAPI } from "../_base";
+import { CreateWebhook, ReadWebhook } from "~/types/api-types/group";
 
 const prefix = "/api";
 
@@ -7,19 +8,7 @@ const routes = {
   webhooksId: (id: string | number) => `${prefix}/groups/webhooks/${id}`,
 };
 
-export interface CreateGroupWebhook {
-  enabled: boolean;
-  name: string;
-  url: string;
-  time: string;
-}
-
-export interface GroupWebhook extends CreateGroupWebhook {
-  id: string;
-  groupId: string;
-}
-
-export class WebhooksAPI extends BaseCRUDAPI<GroupWebhook, CreateGroupWebhook> {
+export class WebhooksAPI extends BaseCRUDAPI<CreateWebhook, ReadWebhook> {
   baseRoute = routes.webhooks;
   itemRoute = routes.webhooksId;
 }

frontend/api/class-interfaces/groups.ts

@@ -1,6 +1,6 @@
 import { BaseCRUDAPI } from "../_base";
-import { GroupInDB, UserOut } from "~/types/api-types/user";
-import { GroupStatistics, GroupStorage } from "~/types/api-types/group";
+import { CategoryBase, GroupBase, GroupInDB, UserOut } from "~/types/api-types/user";
+import { CreateInviteToken, GroupAdminUpdate, GroupStatistics, GroupStorage, ReadGroupPreferences, ReadInviteToken, SetPermissions, UpdateGroupPreferences } from "~/types/api-types/group";
 
 const prefix = "/api";
 
@@ -20,82 +20,34 @@ const routes = {
   groupsId: (id: string | number) => `${prefix}/admin/groups/${id}`,
 };
 
-interface Category {
-  id: number;
-  name: string;
-  slug: string;
-}
-
-export interface CreateGroup {
-  name: string;
-}
-
-export interface UpdatePreferences {
-  privateGroup: boolean;
-  firstDayOfWeek: number;
-  recipePublic: boolean;
-  recipeShowNutrition: boolean;
-  recipeShowAssets: boolean;
-  recipeLandscapeView: boolean;
-  recipeDisableComments: boolean;
-  recipeDisableAmount: boolean;
-}
-
-export interface Preferences extends UpdatePreferences {
-  id: number;
-  group_id: number;
-}
-
-export interface Group extends CreateGroup {
-  id: number;
-  preferences: Preferences;
-}
-
-export interface CreateInvitation {
-  uses: number;
-}
-
-export interface Invitation {
-  group_id: number;
-  token: string;
-  uses_left: number;
-}
-
-export interface SetPermissions {
-  userId: string;
-  canInvite?: boolean;
-  canManage?: boolean;
-  canOrganize?: boolean;
-}
-
-export class GroupAPI extends BaseCRUDAPI<GroupInDB, CreateGroup> {
+export class GroupAPI extends BaseCRUDAPI<GroupBase, GroupInDB, GroupAdminUpdate> {
   baseRoute = routes.groups;
   itemRoute = routes.groupsId;
   /** Returns the Group Data for the Current User
    */
   async getCurrentUserGroup() {
-    return await this.requests.get<Group>(routes.groupsSelf);
+    return await this.requests.get<GroupInDB>(routes.groupsSelf);
   }
 
   async getCategories() {
-    return await this.requests.get<Category[]>(routes.categories);
+    return await this.requests.get<CategoryBase[]>(routes.categories);
   }
 
-  async setCategories(payload: Category[]) {
-    return await this.requests.put<Category[]>(routes.categories, payload);
+  async setCategories(payload: CategoryBase[]) {
+    return await this.requests.put<CategoryBase[]>(routes.categories, payload);
   }
 
   async getPreferences() {
-    return await this.requests.get<Preferences>(routes.preferences);
+    return await this.requests.get<ReadGroupPreferences>(routes.preferences);
   }
 
-  async setPreferences(payload: UpdatePreferences) {
+  async setPreferences(payload: UpdateGroupPreferences) {
     // TODO: This should probably be a patch request, which isn't offered by the API currently
-    return await this.requests.put<Preferences, UpdatePreferences>(routes.preferences, payload);
+    return await this.requests.put<ReadGroupPreferences, UpdateGroupPreferences>(routes.preferences, payload);
   }
 
-  async createInvitation(payload: CreateInvitation) {
-    return await this.requests.post<Invitation>(routes.invitation, payload);
+  async createInvitation(payload: CreateInviteToken) {
+    return await this.requests.post<ReadInviteToken>(routes.invitation, payload);
   }
 
   async fetchMembers() {
@@ -104,7 +56,7 @@ export class GroupAPI extends BaseCRUDAPI<GroupInDB, CreateGroup> {
 
   async setMemberPermissions(payload: SetPermissions) {
     // TODO: This should probably be a patch request, which isn't offered by the API currently
-    return await this.requests.put<Permissions, SetPermissions>(routes.permissions, payload);
+    return await this.requests.put<UserOut, SetPermissions>(routes.permissions, payload);
   }
 
   async statistics() {

frontend/api/class-interfaces/organizer-categories.ts

@@ -10,7 +10,7 @@ const routes = {
   categoriesSlug: (category: string) => `${prefix}/categories/slug/${category}`,
 };
 
-export class CategoriesAPI extends BaseCRUDAPI<RecipeCategoryResponse, CategoryIn> {
+export class CategoriesAPI extends BaseCRUDAPI<CategoryIn, RecipeCategoryResponse> {
   baseRoute: string = routes.categories;
   itemRoute = routes.categoriesId;
 

frontend/api/class-interfaces/organizer-tags.ts

@@ -10,7 +10,7 @@ const routes = {
   tagsSlug: (tag: string) => `${prefix}/tags/slug/${tag}`,
 };
 
-export class TagsAPI extends BaseCRUDAPI<RecipeTagResponse, TagIn> {
+export class TagsAPI extends BaseCRUDAPI<TagIn, RecipeTagResponse> {
   baseRoute: string = routes.tags;
   itemRoute = routes.tagsId;
 

frontend/api/class-interfaces/organizer-tools.ts

@@ -11,7 +11,7 @@ const routes = {
   toolsSlug: (id: string) => `${prefix}/tools/slug/${id}`,
 };
 
-export class ToolsApi extends BaseCRUDAPI<RecipeTool, RecipeToolCreate> {
+export class ToolsApi extends BaseCRUDAPI<RecipeToolCreate, RecipeTool> {
   baseRoute: string = routes.tools;
   itemRoute = routes.toolsId;
 

frontend/api/class-interfaces/recipe-bulk-actions.ts

@@ -1,45 +1,10 @@
 import { BaseAPI } from "../_base";
+import { AssignCategories, AssignTags, DeleteRecipes, ExportRecipes } from "~/types/api-types/recipe";
+import { GroupDataExport } from "~/types/api-types/group";
 
-interface BasePayload {
-  recipes: string[];
-}
-
-type exportType = "json";
-
+// Many bulk actions return nothing
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface RecipeBulkDelete extends BasePayload {}
-
-interface RecipeBulkExport extends BasePayload {
-  exportType: exportType;
-}
-
-interface RecipeBulkCategorize extends BasePayload {
-  categories: string[];
-}
-
-interface RecipeBulkTag extends BasePayload {
-  tags: string[];
-}
-
-interface BulkActionError {
-  recipe: string;
-  error: string;
-}
-
 interface BulkActionResponse {
-  success: boolean;
-  message: string;
-  errors: BulkActionError[];
-}
-
-export interface GroupDataExport {
-  id: string;
-  groupId: string;
-  name: string;
-  filename: string;
-  path: string;
-  size: string;
-  expires: Date;
 }
 
 const prefix = "/api";
@@ -53,19 +18,19 @@ const routes = {
 };
 
 export class BulkActionsAPI extends BaseAPI {
-  async bulkExport(payload: RecipeBulkExport) {
+  async bulkExport(payload: ExportRecipes) {
     return await this.requests.post<BulkActionResponse>(routes.bulkExport, payload);
   }
 
-  async bulkCategorize(payload: RecipeBulkCategorize) {
+  async bulkCategorize(payload: AssignCategories) {
     return await this.requests.post<BulkActionResponse>(routes.bulkCategorize, payload);
   }
 
-  async bulkTag(payload: RecipeBulkTag) {
+  async bulkTag(payload: AssignTags) {
     return await this.requests.post<BulkActionResponse>(routes.bulkTag, payload);
   }
 
-  async bulkDelete(payload: RecipeBulkDelete) {
+  async bulkDelete(payload: DeleteRecipes) {
     return await this.requests.post<BulkActionResponse>(routes.bulkDelete, payload);
   }
 
@@ -74,6 +39,6 @@ export class BulkActionsAPI extends BaseAPI {
   }
 
   async purgeExports() {
-    return await this.requests.delete(routes.purgeExports);
+    return await this.requests.delete<BulkActionResponse>(routes.purgeExports);
   }
 }

frontend/api/class-interfaces/recipe-foods.ts

@@ -9,7 +9,7 @@ const routes = {
   merge: `${prefix}/foods/merge`,
 };
 
-export class FoodAPI extends BaseCRUDAPI<IngredientFood, CreateIngredientFood> {
+export class FoodAPI extends BaseCRUDAPI<CreateIngredientFood, IngredientFood> {
   baseRoute: string = routes.food;
   itemRoute = routes.foodsFood;
 

frontend/api/class-interfaces/recipe-units.ts

@@ -9,7 +9,7 @@ const routes = {
   merge: `${prefix}/units/merge`,
 };
 
-export class UnitAPI extends BaseCRUDAPI<IngredientUnit, CreateIngredientUnit> {
+export class UnitAPI extends BaseCRUDAPI<CreateIngredientUnit, IngredientUnit> {
   baseRoute: string = routes.unit;
   itemRoute = routes.unitsUnit;
 

frontend/api/class-interfaces/recipes/recipe-comments.ts

@@ -1,5 +1,5 @@
-import { RecipeComment, RecipeCommentCreate } from "./types";
 import { BaseCRUDAPI } from "~/api/_base";
+import { RecipeCommentCreate, RecipeCommentOut, RecipeCommentUpdate } from "~/types/api-types/recipe";
 
 const prefix = "/api";
 
@@ -9,11 +9,11 @@ const routes = {
   commentsId: (id: string) => `${prefix}/comments/${id}`,
 };
 
-export class CommentsApi extends BaseCRUDAPI<RecipeComment, RecipeCommentCreate> {
+export class CommentsApi extends BaseCRUDAPI<RecipeCommentCreate, RecipeCommentOut, RecipeCommentUpdate> {
   baseRoute: string = routes.comment;
   itemRoute = routes.commentsId;
 
   async byRecipe(slug: string) {
-    return await this.requests.get<RecipeComment[]>(routes.byRecipe(slug));
+    return await this.requests.get<RecipeCommentOut[]>(routes.byRecipe(slug));
   }
 }

frontend/api/class-interfaces/recipes/recipe-share.ts

@@ -1,4 +1,5 @@
 import { BaseCRUDAPI } from "~/api/_base";
+import { RecipeShareToken, RecipeShareTokenCreate } from "~/types/api-types/recipe";
 
 const prefix = "/api";
 
@@ -7,20 +8,7 @@ const routes = {
   shareTokenId: (id: string) => `${prefix}/shared/recipes/${id}`,
 };
 
-export interface RecipeShareTokenCreate {
-  recipeId: string;
-  expiresAt?: Date;
-}
-
-export interface RecipeShareToken {
-  recipeId: string;
-  id: string;
-  groupId: number;
-  expiresAt: string;
-  createdAt: string;
-}
-
-export class RecipeShareApi extends BaseCRUDAPI<RecipeShareToken, RecipeShareTokenCreate> {
+export class RecipeShareApi extends BaseCRUDAPI<RecipeShareTokenCreate, RecipeShareToken> {
   baseRoute: string = routes.shareToken;
   itemRoute = routes.shareTokenId;
 }

frontend/api/class-interfaces/recipes/recipe.ts

@@ -1,11 +1,19 @@
-import { CreateAsset, ParsedIngredient, Parser, RecipeZipToken, BulkCreatePayload } from "./types";
 import { CommentsApi } from "./recipe-comments";
 import { RecipeShareApi } from "./recipe-share";
 import { BaseCRUDAPI } from "~/api/_base";
 
-import { Recipe, CreateRecipe } from "~/types/api-types/recipe";
+import { Recipe, CreateRecipe, RecipeAsset, CreateRecipeByUrlBulk, ParsedIngredient, UpdateImageResponse, RecipeZipTokenResponse } from "~/types/api-types/recipe";
 import { ApiRequestInstance } from "~/types/api";
 
+export type Parser = "nlp" | "brute";
+
+export interface CreateAsset {
+  name: string;
+  icon: string;
+  extension: string;
+  file: File;
+}
+
 const prefix = "/api";
 
 const routes = {
@@ -31,7 +39,7 @@ const routes = {
   recipeShareToken: (token: string) => `${prefix}/recipes/shared/${token}`,
 };
 
-export class RecipeAPI extends BaseCRUDAPI<Recipe, CreateRecipe> {
+export class RecipeAPI extends BaseCRUDAPI<CreateRecipe, Recipe, Recipe> {
   baseRoute: string = routes.recipesBase;
   itemRoute = routes.recipesRecipeSlug;
 
@@ -58,7 +66,7 @@ export class RecipeAPI extends BaseCRUDAPI<Recipe, CreateRecipe> {
     formData.append("extension", payload.extension);
     formData.append("icon", payload.icon);
 
-    return await this.requests.post(routes.recipesRecipeSlugAssets(recipeSlug), formData);
+    return await this.requests.post<RecipeAsset>(routes.recipesRecipeSlugAssets(recipeSlug), formData);
   }
 
   updateImage(slug: string, fileObject: File) {
@@ -66,11 +74,11 @@ export class RecipeAPI extends BaseCRUDAPI<Recipe, CreateRecipe> {
     formData.append("image", fileObject);
     formData.append("extension", fileObject.name.split(".").pop() ?? "");
 
-    return this.requests.put<any>(routes.recipesRecipeSlugImage(slug), formData);
+    return this.requests.put<UpdateImageResponse, FormData>(routes.recipesRecipeSlugImage(slug), formData);
   }
 
   updateImagebyURL(slug: string, url: string) {
-    return this.requests.post(routes.recipesRecipeSlugImage(slug), { url });
+    return this.requests.post<UpdateImageResponse>(routes.recipesRecipeSlugImage(slug), { url });
   }
 
   async testCreateOneUrl(url: string) {
@@ -81,8 +89,8 @@ export class RecipeAPI extends BaseCRUDAPI<Recipe, CreateRecipe> {
     return await this.requests.post<string>(routes.recipesCreateUrl, { url, includeTags });
   }
 
-  async createManyByUrl(payload: BulkCreatePayload) {
-    return await this.requests.post(routes.recipesCreateUrlBulk, payload);
+  async createManyByUrl(payload: CreateRecipeByUrlBulk) {
+    return await this.requests.post<string>(routes.recipesCreateUrlBulk, payload);
   }
 
   async parseIngredients(parser: Parser, ingredients: Array<string>) {
@@ -96,7 +104,7 @@ export class RecipeAPI extends BaseCRUDAPI<Recipe, CreateRecipe> {
   }
 
   async getZipToken(recipeSlug: string) {
-    return await this.requests.post<RecipeZipToken>(routes.recipesRecipeSlugExport(recipeSlug), {});
+    return await this.requests.post<RecipeZipTokenResponse>(routes.recipesRecipeSlugExport(recipeSlug), {});
   }
 
   getZipRedirectUrl(recipeSlug: string, token: string) {

frontend/api/class-interfaces/recipes/types.ts

@@ -1,72 +0,0 @@
-import { CreateIngredientFood, CreateIngredientUnit, IngredientFood, IngredientUnit } from "~/types/api-types/recipe";
-import { RecipeCategory, RecipeTag } from "~/types/api-types/user";
-
-export type Parser = "nlp" | "brute";
-
-export interface Confidence {
-  average?: number;
-  comment?: number;
-  name?: number;
-  unit?: number;
-  quantity?: number;
-  food?: number;
-}
-
-export interface Ingredient {
-  title?: string;
-  note?: string;
-  unit?: IngredientUnit | CreateIngredientUnit;
-  food?: IngredientFood | CreateIngredientFood;
-  disableAmount?: boolean;
-  quantity?: number;
-  referenceId?: string;
-}
-
-export interface ParsedIngredient {
-  input: string
-  confidence: Confidence;
-  ingredient: Ingredient;
-}
-
-export interface BulkCreateRecipe {
-  url: string;
-  categories: RecipeCategory[];
-  tags: RecipeTag[];
-}
-
-export interface BulkCreatePayload {
-  imports: BulkCreateRecipe[];
-}
-
-export interface RecipeZipToken {
-  token: string;
-}
-
-export interface CreateAsset {
-  name: string;
-  icon: string;
-  extension: string;
-  file: File;
-}
-
-export interface RecipeCommentCreate {
-  recipeId: string;
-  text: string;
-}
-
-export interface RecipeCommentUpdate extends RecipeCommentCreate {
-  id: string;
-}
-
-interface RecipeCommentUser {
-  id: string;
-  username: string;
-  admin: boolean;
-}
-
-export interface RecipeComment extends RecipeCommentUpdate {
-  createdAt: any;
-  updatedAt: any;
-  userId: number;
-  user: RecipeCommentUser;
-}

frontend/api/class-interfaces/users.ts

@@ -1,29 +1,5 @@
 import { BaseCRUDAPI } from "../_base";
-import { UserIn, UserOut } from "~/types/api-types/user";
-
-// Interfaces
-
-interface ChangePassword {
-  currentPassword: string;
-  newPassword: string;
-}
-
-interface CreateAPIToken {
-  name: string;
-}
-
-interface ResponseToken {
-  token: string;
-}
-
-interface PasswordResetPayload {
-  token: string;
-  email: string;
-  password: string;
-  passwordConfirm: string;
-}
-
-// Code
+import { ChangePassword, DeleteTokenResponse, LongLiveTokenIn, LongLiveTokenOut, ResetPassword, UserBase, UserIn, UserOut } from "~/types/api-types/user";
 
 const prefix = "/api";
 
@@ -43,7 +19,7 @@ const routes = {
   usersApiTokensTokenId: (token_id: string | number) => `${prefix}/users/api-tokens/${token_id}`,
 };
 
-export class UserApi extends BaseCRUDAPI<UserOut, UserIn> {
+export class UserApi extends BaseCRUDAPI<UserIn, UserOut, UserBase> {
   baseRoute: string = routes.users;
   itemRoute = (itemid: string) => routes.usersId(itemid);
 
@@ -63,12 +39,12 @@ export class UserApi extends BaseCRUDAPI<UserOut, UserIn> {
     return await this.requests.put(routes.usersIdPassword(id), changePassword);
   }
 
-  async createAPIToken(tokenName: CreateAPIToken) {
-    return await this.requests.post<ResponseToken>(routes.usersApiTokens, tokenName);
+  async createAPIToken(tokenName: LongLiveTokenIn) {
+    return await this.requests.post<LongLiveTokenOut>(routes.usersApiTokens, tokenName);
   }
 
-  async deleteAPIToken(tokenId: string | number) {
-    return await this.requests.delete(routes.usersApiTokensTokenId(tokenId));
+  async deleteAPIToken(tokenId: number) {
+    return await this.requests.delete<DeleteTokenResponse>(routes.usersApiTokensTokenId(tokenId));
   }
 
   userProfileImage(id: string) {
@@ -76,7 +52,7 @@ export class UserApi extends BaseCRUDAPI<UserOut, UserIn> {
     return `/api/users/${id}/image`;
   }
 
-  async resetPassword(payload: PasswordResetPayload) {
+  async resetPassword(payload: ResetPassword) {
     return await this.requests.post(routes.passwordReset, payload);
   }
 }

frontend/api/class-interfaces/utils.ts

@@ -1,14 +1,11 @@
 import { BaseAPI } from "../_base";
+import { FileTokenResponse } from "~/types/api-types/response";
 
 const prefix = "/api";
 
-interface DownloadData {
-  fileToken: string;
-}
-
 export class UtilsAPI extends BaseAPI {
   async download(url: string) {
-    const { response } = await this.requests.get<DownloadData>(url);
+    const { response } = await this.requests.get<FileTokenResponse>(url);
 
     if (!response) {
       return;