Progress

Author: W2Wizard

backend/NXTBackend.API.Core/Services/Implementation/GitService.cs

@@ -202,9 +202,11 @@ public async Task<Git> UpdateRepository(Guid id, GitRepoPatchRequestDTO DTO)
 
     public async Task<Git> CreateRepository(GitRepoPostRequestDTO DTO, OwnerKind OwnerType)
     {
-        GetUserID();
+        var user = await _context.Users.FindAsync(GetUserID());
+        SetWebauthHeader("w2wizard");
+        
         var response = await _client.PostAsJsonAsync($"/api/v1/repos/{_gitTemplate}/generate", DTO);
-        // logger.LogInformation("Response: {response}", response);
+        logger.LogInformation("Response: {response}", response);
 
         if (response.StatusCode is HttpStatusCode.Conflict)
             throw new ServiceException(StatusCodes.Status409Conflict, "The repository with the same name already exists");

backend/NXTBackend.API.Models/Requests/Project/ProjectPostRequestDto.cs

@@ -65,6 +65,6 @@ public class ProjectPostRequestDTO : BaseRequestDTO
     /// <summary>
     /// Tags for the project
     /// /// </summary>
-    [MaxLength(24), StringLengthEnumerable(1, 64), JsonIgnore]
+    [MaxLength(42)]
     public string[] Tags { get; set; }
 }

backend/NXTBackend.API/Controllers/ProjectController.cs

@@ -18,6 +18,7 @@
 using NXTBackend.API.Infrastructure.Database;
 using NXTBackend.API.Models;
 using NXTBackend.API.Models.Requests.Cursus;
+using NXTBackend.API.Models.Requests.ExternalGit;
 using NXTBackend.API.Models.Requests.LearningGoal;
 using NXTBackend.API.Models.Requests.Project;
 using NXTBackend.API.Models.Responses.Objects;
@@ -73,7 +74,7 @@ public async Task<ActionResult<ProjectDO>> Create([FromBody] ProjectPostRequestD
         if (owner is null)
             return UnprocessableEntity("Non-existing user");
 
-        var git = await gitService.CreateRepository(new()
+        var git = await gitService.CreateRepository(new GitRepoPostRequestDTO
         {
             Name = data.Name,
             Description = data.Description,

frontend/src/lib/api/types.d.ts

@@ -5367,6 +5367,7 @@ export interface components {
             thumbnailUrl: string;
             public: boolean;
             enabled: boolean;
+            tags?: string[];
         };
         ReviewDO: {
             /** Format: uuid */

frontend/src/lib/components/tag-input.svelte

@@ -4,34 +4,33 @@
 	import Button from "./ui/button/button.svelte";
 	import Input from "./ui/input/input.svelte";
 
-	// let items = $state.raw<string[]>(["1", "2", "3", "4", "5"]);
-
-	interface Props {
-		items: string[]
-	}
-
-	let { items = $bindable() }: Props = $props();
+	let items = $state.raw<string[]>(["1", "2", "3", "4", "5"]);
 </script>
 
-<div class="flex flex-wrap items-center gap-2 p-2 rounded-md border border-input bg-background min-h-10">
+<div
+	class="border-input bg-background flex min-h-10 flex-wrap items-center gap-2 rounded-md border p-2"
+>
 	{#each items as item, i}
-		<Badge color="primary" class="shadow-text px-3 py-1 flex gap-1 text-center justify-center items-center">
+		<Badge
+			color="primary"
+			class="shadow-text flex items-center justify-center gap-1 px-3 py-1 text-center"
+		>
 			<input type="hidden" name="tags" value={item} />
 			<span>{item}</span>
 			<button
 				type="button"
-				class="ml-1 rounded-full hover:bg-primary-foreground/20 transition-colors"
-				onclick={() => items = items.filter((_, j) => j !== i)}
+				class="hover:bg-primary-foreground/20 ml-1 rounded-full transition-colors"
+				onclick={() => (items = items.filter((_, j) => j !== i))}
 				aria-label="Remove tag"
 			>
-			<X class="w-4 h-4" />
+				<X class="h-4 w-4" />
 			</button>
 		</Badge>
 	{/each}
 	<Input
 		placeholder="Add tag..."
 		maxlength={64}
-		class="border-none bg-transparent shadow-none h-min focus-visible:ring-0 p-0 w-auto min-w-32"
+		class="h-min w-auto min-w-32 border-none bg-transparent p-0 shadow-none focus-visible:ring-0"
 		onkeydown={(e) => {
 			if (e.key === "Enter") {
 				e.preventDefault();

frontend/src/routes/(app)/new/project/+page.server.ts

@@ -101,6 +101,7 @@ export const load: PageServerLoad = async ({ request, locals, url }) => {
 export const actions: Actions = {
 	create: async ({ locals, request }) => {
 		const form = await request.formData();
+		const session = await locals.session() ?? kitError(403);
 		let [image, issue] = await ensure(formValueToS3<FormBundle>(form, "thumbnailUrl"));
 
 		logger.debug("Tags =>", form.getAll("tags"));
@@ -127,7 +128,8 @@ export const actions: Actions = {
 				maxMembers: Number(form.get("maxMembers")),
 				public: form.get("public")?.toString() === "true",
 				enabled: form.get("enabled")?.toString() === "true",
-				tags: form.getAll("tags").flatMap((v) => v.toString()),
+				ownerId: session.user_id, // TODO: Support organizations
+				tags: [],
 				thumbnailUrl: url,
 			},
 		});

frontend/src/routes/(app)/users/[id=uuid]/projects/+page.server.ts

@@ -9,61 +9,50 @@ import { Constants, decodeID } from "$lib/utils";
 import { logger } from "$lib/logger";
 import type { FetchResponse } from "openapi-fetch";
 import { check } from "$lib/utils/check.svelte";
+import {z} from "zod/v4";
+import {useQuery} from "$lib/utils/url.svelte";
 
 // ============================================================================
 
-async function getUserProjects(
-	locals: App.Locals,
-	params: URLSearchParams,
-	userID: string,
-) {
-	const name = params.get("search");
-	const page = Number(params.get("page") ?? 0);
-	const { data } = await check(locals.api.GET("/users/{id}/projects", {
-		params: {
-			path: { id: userID },
-			query: {
-				Size: 10,
-				Page: !isNaN(page) ? page : undefined,
-				"filter[name]": name || undefined,
+const schema = z.object({
+	page: z.coerce.number().optional(),
+	size: z.coerce.number().optional(),
+	search: z.string().optional(),
+	filter: z.enum(["available", "subscribed"]).optional(),
+});
+
+export type QueryKeys = keyof z.infer<typeof schema>;
+
+export const load: PageServerLoad = async ({ locals, url, params, parent }) => {
+	const query = useQuery(url, schema);
+	if (query.read("filter") === "subscribed") {
+		const { data } = await check(locals.api.GET("/users/{id}/projects", {
+			params: {
+				path: { id: decodeID(params.id) },
+				query: {
+					Size: query.read("size"),
+					Page: query.read("page"),
+					"filter[name]": query.read("search")
+				},
 			},
-		},
-	}))
+		}))
 
-	return data!;
-}
+		return {
+			projects: data ?? []
+		}
+	}
 
-async function getProjects(locals: App.Locals, params: URLSearchParams) {
-	const name = params.get("search");
-	const page = Number(params.get("page") ?? 0);
-	const slug = params.get("slug");
 	const { data } = await check(locals.api.GET("/projects", {
 		params: {
 			query: {
-				Size: Constants.PER_PAGE,
-				Page: !isNaN(page) ? page : undefined,
-				"filter[slug]": slug || undefined,
-				"filter[name]": name || undefined,
+				Size: query.read("size"),
+				Page: query.read("page"),
+				"filter[name]": query.read("search")
 			},
 		},
-	}));
-
-	return data!;
-}
-
-
-// ============================================================================
+	}))
 
-export const load: PageServerLoad = async ({ locals, url, params, parent }) => {
-	const parentData = await parent();
-	const subscribed = url.searchParams.get("subscribed") === "true";
-	if (subscribed || !parentData.isCurrentUser) {
-		return {
-			projects: await getUserProjects(locals, url.searchParams, decodeID(params.id)),
-		};
-	} else {
-		return {
-			projects: await getProjects(locals, url.searchParams),
-		};
+	return {
+		projects: data ?? []
 	}
 };

frontend/src/routes/(app)/users/[id=uuid]/projects/+page.svelte

@@ -8,7 +8,8 @@
 	import Archive from "lucide-svelte/icons/archive";
 	import Separator from "$lib/components/ui/separator/separator.svelte";
 	import * as Tabs from "$lib/components/ui/tabs/index";
-	import { useQuery } from "$lib/utils/query.svelte";
+	import { useQuery } from "$lib/utils/url.svelte";
+
 	import { z } from "zod";
 	import Base from "$lib/components/base.svelte";
 
@@ -17,24 +18,11 @@
 	import type { PageProps } from "./$types";
 	import Empty from "$lib/components/empty.svelte";
 	import * as Alert from "$lib/components/ui/alert";
+	import type { QueryKeys } from "./+page.server";
 
 	const { data }: PageProps = $props();
 	const debounce = useDebounce();
-	const query = useQuery(
-		z.object({
-			page: z.number().default(0),
-			search: z.string().optional(),
-			subscribed: z.boolean().default(true).optional(),
-		}),
-	);
-
-	function searchProject(search: string) {
-		if (search.length > 0) {
-			query.write("search", search);
-		} else {
-			query.write("search", undefined);
-		}
-	}
+	const query = useQuery<QueryKeys>(page.url);
 </script>
 
 <svelte:head>
@@ -49,13 +37,14 @@
 			icon={Search}
 			value={query.read("search")}
 			placeholder="Search for cursus"
-			oninput={(v) => debounce(searchProject, v.currentTarget.value.trim())}
+			oninput={(v) =>
+				debounce((q: string) => query.write("filter", q), v.currentTarget.value.trim())}
 		/>
 		{#if data.session && data.isCurrentUser}
 			<Separator />
 			<Tabs.Root
-				value={query.read("subscribed") ? "subscribed" : "all"}
-				onValueChange={(v) => query.write("subscribed", v === "subscribed")}
+				value={query.read("filter") ?? "subscribed"}
+				onValueChange={(v) => query.write("filter", v)}
 			>
 				<Tabs.List class="w-full">
 					<Tabs.Trigger class="w-full" value="subscribed">Subscribed</Tabs.Trigger>
@@ -76,14 +65,14 @@
 				{#if data.projects.length === 0}
 					<Empty />
 				{/if}
-				{#key query.read("subscribed")}
-					{#if query.read("subscribed") === true || !data.isCurrentUser}
+				{#key query.read("filter")}
+					{#if query.read("filter") === "subscribed" || !data.isCurrentUser}
 						{#each data.projects as up}
 							{@const userProject = up as BackendTypes["UserProjectDO"]}
 							<Taskcard
 								href="projects/{userProject.project?.slug}"
 								type="project"
-								title={userProject.project?.name}
+								title={userProject.project?.name ?? "Unknown"}
 								state={userProject.state}
 							/>
 						{/each}