Merge pull request #681 from CodeCrowCorp/dev

Feat: changed profile route to root

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mage-website",
-	"version": "0.0.16",
+	"version": "0.0.17",
 	"license": "GPL-3.0",
 	"private": true,
 	"type": "module",

src/lib/components/Browse/DrawerCreateChannel.svelte

@@ -148,7 +148,7 @@
 							{#if $tags && $tags.length > 0}
 								{#each $tags as tag}
 									<span
-										class="badge badge-md text-primary bg-gray-200 rounded-md font-semibold mx-1 cursor-pointer border-none my-1"
+										class="badge badge-md text-secondary rounded-md font-semibold mx-1 cursor-pointer border-none my-1"
 										on:click={() => addTag(tag.name)}>{tag.name}</span>
 								{/each}
 							{:else}

src/lib/components/Browse/Sections/ItemTable.svelte

@@ -54,8 +54,7 @@
 				{/if}
 				{#each channel.tags as tag}
 					<div>
-						<span
-							class="badge badge-md text-primary bg-gray-200 rounded-md font-semibold border-none"
+						<span class="badge badge-md text-secondary rounded-md font-semibold border-none"
 							>{tag}</span>
 					</div>
 				{/each}

src/lib/components/Browse/Sections/ItemUser.svelte

@@ -5,9 +5,7 @@
 	export let user: any = {}
 </script>
 
-<a
-	class="p-4 bg-base-100 hover:bg-base-300 shrink-0 rounded-md my-4"
-	href="/profile/{user.username}">
+<a class="p-4 bg-base-100 hover:bg-base-300 shrink-0 rounded-md my-4" href="/{user.username}">
 	<div class="text-center space-y-3 w-[200px]">
 		<div class="avatar">
 			<div class="w-36 mask {user?.planDetails?.planTier > 1 ? 'mask-hexagon' : 'mask-squircle'}">

src/lib/components/Channel/Chat/DrawerEditChannel.svelte

@@ -179,7 +179,7 @@
 							{#if $tags && $tags.length > 0}
 								{#each $tags as tag}
 									<span
-										class="badge badge-md text-primary bg-gray-200 rounded-md font-semibold mx-1 cursor-pointer border-none"
+										class="badge badge-md text-secondary rounded-md font-semibold mx-1 cursor-pointer border-none"
 										on:keyup
 										on:click={() => addTag(tag.name)}>{tag.name}</span>
 								{/each}

src/lib/components/Channel/Chat/DropdownViewChannel.svelte

@@ -106,8 +106,7 @@
 					{#if channel.tags && channel.tags.length}
 						{#each channel.tags as tag}
 							<div>
-								<span
-									class="badge badge-md text-primary bg-gray-200 rounded-md font-semibold border-none"
+								<span class="badge badge-md text-secondary rounded-md font-semibold border-none"
 									>{tag}</span>
 							</div>
 						{/each}
@@ -116,7 +115,7 @@
 			</a>
 		</li>
 		<li>
-			<a href="/profile/{channel.userDetails?.username}">
+			<a href="/{channel.userDetails?.username}">
 				<div class="flex flex-wrap gap-2">
 					<div class="avatar online">
 						<div

src/lib/components/Channel/Chat/ProfilePopup.svelte

@@ -135,7 +135,7 @@
 						{profileData?.profile?.displayName}
 					</p>
 					<p class="mb-3 text-sm font-normal">
-						<a class="link link-hover flex gap-1" href="/profile/{profileData?.profile?.username}"
+						<a class="link link-hover flex gap-1" href="/{profileData?.profile?.username}"
 							>@{profileData?.profile?.username}
 							{#if profileData?.profile?.planDetails?.planTier > 1}
 								<div class="text-accent font-bold">

src/lib/components/Global/DrawerMain.svelte

@@ -93,7 +93,7 @@
 		{#if currentUser}
 			<li class={isChannelPage ? 'md:w-full' : ''}>
 				<a
-					href="/profile/{currentUser.username}"
+					href="/{currentUser.username}"
 					class="{isChannelPage ? 'justify-center md:w-full hero' : ''} rounded-md cursor-pointer">
 					<div class={isChannelPage ? 'md:text-center' : ''}>
 						<div class={isChannelPage ? '' : 'my-1'}>

src/lib/components/Profile/Elements/FollowItem.svelte

@@ -69,7 +69,7 @@
 			</button>
 			<ul tabindex="-1" class="z-20 dropdown-content menu p-2 shadow bg-base-200 rounded-box w-52">
 				<li>
-					<a href="/profile/{followItem.username}">Profile</a>
+					<a href="/{followItem.username}">Profile</a>
 				</li>
 			</ul>
 		</div>

src/lib/components/Search/ItemSearchChannel.svelte

@@ -57,7 +57,7 @@
 						<img src={item.avatar} alt="" />
 					</div>
 				</div>
-				<a class="ml-2 link link-hover flex gap-1" href="/profile/{item.userDetails.username}"
+				<a class="ml-2 link link-hover flex gap-1" href="/{item.userDetails.username}"
 					>@{item.userDetails.username || ''}
 					{#if item.planDetails?.planTier > 1}
 						<div class="text-accent font-bold">
@@ -70,8 +70,7 @@
 				{#if item.tags && item.tags.length}
 					{#each item.tags as tag}
 						<div>
-							<span
-								class="badge badge-md text-primary bg-gray-200 rounded-md font-semibold border-none"
+							<span class="badge badge-md text-secondary rounded-md font-semibold border-none"
 								>{tag}</span>
 						</div>
 					{/each}

src/lib/components/Search/ItemSearchUser.svelte

@@ -6,7 +6,7 @@
 	export let item: any
 </script>
 
-<a href={`/profile/${item.username}`} class="menu p-4 bg-base-100 rounded-md hover:bg-base-300">
+<a href={`/${item.username}`} class="menu p-4 bg-base-100 rounded-md hover:bg-base-300">
 	<div class="flex-col md:flex-row gap-4 w-full contents">
 		<div class="max-w-md">
 			<div class="avatar">
@@ -29,7 +29,7 @@
 				{item.displayName || ''}
 			</h2>
 			<div class="flex items-center">
-				<a class="link link-hover flex gap-1" href="/profile/{item.username}"
+				<a class="link link-hover flex gap-1" href="/{item.username}"
 					>@{item.username || ''}
 					<div class="text-accent font-bold">
 						<IconDrawerVerification />

src/routes/profile/[username]/+page.server.ts → src/routes/[username]/+page.server.ts

@@ -1,9 +1,12 @@
 import type { Actions, PageServerLoad } from './$types'
 import { get, patch, putImage } from '$lib/api'
-import { redirect, fail } from '@sveltejs/kit'
+import { redirect, fail, error } from '@sveltejs/kit'
 
 export const load = (async ({ params }: { params: any }) => {
 	const profile = await get(`users/search/username?username=${params.username}`)
+	if (profile.error) {
+		throw error(404)
+	}
 	return {
 		profile: profile,
 		lazy: {
@@ -68,7 +71,7 @@ export const actions = {
 		} else {
 			if (updatedUser._id) {
 				locals.user.user = updatedUser
-				throw redirect(303, `/profile/${updatedUser.username}`)
+				throw redirect(303, `/${updatedUser.username}`)
 			} else {
 				throw redirect(303, 'browse')
 			}

src/routes/profile/[username]/[live]/+page.server.ts → src/routes/[username]/[live]/+page.server.ts

@@ -1,13 +1,16 @@
 import type { PageServerLoad } from '../$types'
 import { get } from '$lib/api'
-import { redirect } from '@sveltejs/kit'
+import { error, redirect } from '@sveltejs/kit'
 
 export const load = (async ({ params }: { params: any }) => {
 	const profile = await get(`users/search/username?username=${params.username}`)
+	if (profile.error) {
+		throw error(404)
+	}
 	const channelId = await get(`channel/live?userId=${profile._id}`)
 	if (channelId) {
 		throw redirect(303, `/channel/${channelId}`)
 	} else {
-		throw redirect(303, `/profile/${params.username}`)
+		throw redirect(303, `/${params.username}`)
 	}
 }) satisfies PageServerLoad