diff --git a/src/app.html b/src/app.html index aca596b8..882beccd 100644 --- a/src/app.html +++ b/src/app.html @@ -2,15 +2,15 @@ - - - - %sveltekit.head% + + + + %sveltekit.head% -
%sveltekit.body%
+ class="scrollbar-thin scrollbar-thumb-[#aeaeae] scrollbar-track-[#25252A] overflow-y-scroll scrollbar-thumb-rounded"> +
%sveltekit.body%
\ No newline at end of file diff --git a/src/hooks.server.ts b/src/hooks.server.ts index c3161c39..0b4b2e37 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,39 +1,48 @@ -import { redirect } from '@sveltejs/kit' -import { get } from 'svelte/store' -import { getUserDetails, userRole, currentUser } from '$lib/stores/authStore' -import { getUserRole, getRoles } from '$lib/stores/adminStore' -import { getRemoteConfigs, isMaintenanceModeEnabled } from '$lib/stores/remoteConfigStore' +import { redirect, type HandleFetch } from '@sveltejs/kit' +import { get as getWritableVal } from 'svelte/store' +import { + isMaintenanceModeEnabled, + isFeatureVideoResponsesEnabled, + isFeatureGroupChatEnabled, + isFeatureMintPageEnabled, + isFeaturePremiumPageEnabled +} from '$lib/stores/remoteConfigStore' import { Authenticate } from '$lib/authentication/authentication' import type { Handle } from '@sveltejs/kit' import { env } from '$env/dynamic/public' -import { - isChannelPage, - userId as userIdWritable, - token as tokenWritable -} from '$lib/stores/helperStore' +import { get } from '$lib/api' +import { current_user, user_role } from '$lib/stores/authStore' export const handle: Handle = async ({ event, resolve }) => { const pathname = event.url.pathname const userId = event.url.searchParams.get('userId') || event.cookies.get('userId') || '' - userIdWritable.set(userId) let token = event.url.searchParams.get('token') || event.cookies.get('token') || '' - tokenWritable.set(token) - let user = get(currentUser), - role = get(userRole), + + let user: any = event.locals.user?.user || '', isBanned = false + const role = getWritableVal(user_role) + + const remoteConfigs = await get('/remote-configs', { userId, token }) + remoteConfigs.map((config: { flagKey: string; flagValue: boolean }) => { + if (config.flagKey === 'maintenance-mode') isMaintenanceModeEnabled.set(config.flagValue) + if (config.flagKey === 'feature-video-responses') + isFeatureVideoResponsesEnabled.set(config.flagValue) + if (config.flagKey === 'feature-group-chat') isFeatureGroupChatEnabled.set(config.flagValue) + if (config.flagKey === 'feature-mint-page') isFeatureMintPageEnabled.set(config.flagValue) + if (config.flagKey === 'feature-premium-page') isFeaturePremiumPageEnabled.set(config.flagValue) + }) - await getRemoteConfigs() - const maintenance_mode = get(isMaintenanceModeEnabled) || false + const maintenance_mode = getWritableVal(isMaintenanceModeEnabled) || false if (token && userId) { if (!user) { - const response = await getUserDetails(token, userId) + const response = await get('/auth/me', { userId, token }) if (response) { if (response.freshJwt) { token = response.freshJwt } - user = response - currentUser.set(user) + user = response.user + current_user.set(user) } } @@ -48,19 +57,19 @@ export const handle: Handle = async ({ event, resolve }) => { headers['x-api-key'] = env.PUBLIC_API_KEY } - const all_roles = await getRoles(true, headers) - if (Array.isArray(all_roles)) { - const get_role = await getUserRole(true, headers) - if (get_role && get_role.role) { - role = all_roles.find((item) => { - return item._id == get_role.role + const allRoles = await get('/roles', headers) + if (Array.isArray(allRoles)) { + const userRole = await get('/roles/role-mapping', headers) + if (userRole && userRole.role) { + const usersRoleName = allRoles.find((item) => { + return item._id == userRole.role })?.name - userRole.set(role) + user_role.set(usersRoleName) } } - } catch (e) { - console.log('something wrong', e) + } catch (err) { + console.log('something went wrong', err) } } @@ -86,7 +95,6 @@ export const handle: Handle = async ({ event, resolve }) => { if (user && user.isBanned) { isBanned = true - const cookieItem = ['token', 'userId'] cookieItem.forEach((item) => { event.cookies.set(item, '', { @@ -94,10 +102,7 @@ export const handle: Handle = async ({ event, resolve }) => { expires: new Date(0) }) }) - - currentUser.set(null) - userRole.set('user') - + user_role.set('user') event.locals['isBanned'] = isBanned } @@ -113,23 +118,38 @@ export const handle: Handle = async ({ event, resolve }) => { throw redirect(302, '/maintenance') } } else { - console.log('pathname', pathname) - if (pathname.includes('/channel')) { - isChannelPage.set(false) - } else { - isChannelPage.set(false) - } return await resolve(event) } } throw redirect(302, '/browse') } -export function handleError({ error }: { error: any }) { +export const handleError = ({ error }: { error: any }) => { console.log('error', error) // example integration with https://sentry.io/ // Sentry.captureException(error, { event, errorId }); return { - message: 'Whoops something wrong!' + message: 'Whoops something went wrong!' } } + +export const handleFetch = (async ({ + event, + request, + fetch +}: { + event: any + request: any + fetch: any +}) => { + if (request.url.startsWith(env.PUBLIC_API_URL)) { + request.headers['userId'] = event.locals.user.userId + if (env.PUBLIC_CROSS_ORIGIN === 'false') { + request.headers['authorization'] = event.locals.user.token + } else { + request.headers['x-api-key'] = env.PUBLIC_X_API_KEY + } + } + + return fetch(request) +}) satisfies HandleFetch diff --git a/src/lib/api.ts b/src/lib/api.ts new file mode 100644 index 00000000..cc9fe4ca --- /dev/null +++ b/src/lib/api.ts @@ -0,0 +1,58 @@ +import { error } from '@sveltejs/kit' +import { env } from '$env/dynamic/public' + +const base = env.PUBLIC_API_URL + +async function send({ + method, + path, + data, + headers +}: { + method: string + path: string + data?: any + headers?: any +}) { + const opts: any = { method, headers: {} } + + if (data) { + opts.headers['Content-Type'] = 'application/json' + opts.body = JSON.stringify(data) + } + + // if headers sent manually + if (headers && headers.userId) { + opts.headers['userId'] = headers.userId + } + + if (env.PUBLIC_CROSS_ORIGIN === 'false') { + opts.headers['authorization'] = headers.token + } else { + opts.headers['x-api-key'] = env.PUBLIC_X_API_KEY + } + + const res = await fetch(`${base}/${path}`, opts) + if (res.ok || res.status === 422) { + const text = await res.text() + return text ? JSON.parse(text) : {} + } + + return { error: res.status } +} + +export function get(path: string, headers?: any) { + return send({ method: 'GET', path, headers }) +} + +export function del(path: string) { + return send({ method: 'DELETE', path }) +} + +export function post(path: string, data: any) { + return send({ method: 'POST', path, data }) +} + +export function put(path: string, data: any = {}) { + return send({ method: 'PUT', path, data }) +} diff --git a/src/lib/components/Browse/AddCategory.svelte b/src/lib/components/Browse/AddCategoryDrawer.svelte similarity index 100% rename from src/lib/components/Browse/AddCategory.svelte rename to src/lib/components/Browse/AddCategoryDrawer.svelte diff --git a/src/lib/components/Browse/Carousel.svelte b/src/lib/components/Browse/Carousel.svelte deleted file mode 100644 index 7e2377df..00000000 --- a/src/lib/components/Browse/Carousel.svelte +++ /dev/null @@ -1,110 +0,0 @@ - - -
- - -
- -
- -
- {#if channels && channels.length} -
- {#each channels as channel} -
- -
goto(`/channel/${channel._id}`)}> -
-
-
- -
-
-
-

{channel.title}

-

{channel.description}

-
-
-
-
- {/each} -
- {:else} -
- Loading... -
- -
- Loading... -
- - - {/if} -
- - -
- -
-
- - diff --git a/src/lib/components/Browse/ChannelSection.svelte b/src/lib/components/Browse/ChannelSection.svelte deleted file mode 100644 index c0d30491..00000000 --- a/src/lib/components/Browse/ChannelSection.svelte +++ /dev/null @@ -1,116 +0,0 @@ - - -
-
- {title || 'Channel Group'} -
- {#if channels && channels.length} -
-
-
- -
-
- -
- {#each channels as channel} -
-
- -
goto(`/channel/${channel._id}`)}> - {#if channel.thumbnail} -
- {/if} - {channel.thumbnail ? '' : channel.title} -
- -
-
- -
-
-
-
-
-
- -
-
- -
-

{channel.title}

-

{channel.description}

-
-
-
- {/each} -
- -
-
- -
-
-
- {:else} -
-
-
- - - diff --git a/src/lib/components/Browse/ChannelTable.svelte b/src/lib/components/Browse/ChannelTable.svelte deleted file mode 100644 index 535ab625..00000000 --- a/src/lib/components/Browse/ChannelTable.svelte +++ /dev/null @@ -1,127 +0,0 @@ - - -
- - - - - - - - - - - - {#if channels && channels.length} - {#each channels as channel} - goto(`/channel/${channel._id}`)}> - - - - - - - {/each} - {:else} - - - - - - - - {/if} - - - - - - - - - - -
HostTitleViewersTagCategory
-
-
-
- -
-
-
-
{channel.createdBy || ''}
-
@{channel.user || ''}
-
-
- 		- {channel.title} -
- {channel.description} - 		-
- {#if channel.isPrivate} - - {/if} - - {channel.memberCount || '0'} -
- 		-
- {#if channel.tags && channel.tags.length} - {#each channel.tags as tag} -
{tag}
- {/each} - {/if} -
- 		-
- {#if channel.category && channel.category.length} - {#each channel.category as category} -
- -
- {/each} - {/if} -
-
-
- Loading... -
- 		-
- Loading... -
- 		-
- Loading... -
- 		-
- Loading... -
- 		-
- Loading... -
-
HostTitleViewersTagsCategory
-
diff --git a/src/lib/components/Browse/CreateChannel.svelte b/src/lib/components/Browse/CreateChannelDrawer.svelte similarity index 93% rename from src/lib/components/Browse/CreateChannel.svelte rename to src/lib/components/Browse/CreateChannelDrawer.svelte index 6e0d7717..599f1cd4 100644 --- a/src/lib/components/Browse/CreateChannel.svelte +++ b/src/lib/components/Browse/CreateChannelDrawer.svelte @@ -1,10 +1,11 @@ @@ -69,7 +73,10 @@
(showDrawer = false)} class="drawer-overlay" /> {#if showAddCategory} - + {:else}

diff --git a/src/lib/components/Browse/ChannelSearch.svelte b/src/lib/components/Browse/SearchChannel.svelte similarity index 88% rename from src/lib/components/Browse/ChannelSearch.svelte rename to src/lib/components/Browse/SearchChannel.svelte index a83b9461..dfdfd69c 100644 --- a/src/lib/components/Browse/ChannelSearch.svelte +++ b/src/lib/components/Browse/SearchChannel.svelte @@ -1,7 +1,7 @@ @@ -30,6 +30,6 @@

{#if showDrawer} - + {/if}
diff --git a/src/lib/components/Browse/Sections/CarouselSection.svelte b/src/lib/components/Browse/Sections/CarouselSection.svelte new file mode 100644 index 00000000..bd60d48e --- /dev/null +++ b/src/lib/components/Browse/Sections/CarouselSection.svelte @@ -0,0 +1,112 @@ + + +{#if !channels.error} +
+ + +
+ +
+ +
+ {#if channels && channels.length} +
+ {#each channels as channel} +
+ +
goto(`/channel/${channel._id}`)}> +
+
+
+ +
+
+
+

{channel.title}

+

{channel.description}

+
+
+
+
+ {/each} +
+ {:else} +
+ Loading... +
+ +
+ Loading... +
+ + + {/if} +
+ + +
+ +
+
+{/if} + + diff --git a/src/lib/components/Browse/Sections/ChannelSection.svelte b/src/lib/components/Browse/Sections/ChannelSection.svelte new file mode 100644 index 00000000..38b74f3d --- /dev/null +++ b/src/lib/components/Browse/Sections/ChannelSection.svelte @@ -0,0 +1,118 @@ + + +{#if !channels.error} +
+
+ {title} +
+ {#if channels && channels.length} +
+
+
+ +
+
+ +
+ {#each channels as channel} +
+
+ +
goto(`/channel/${channel._id}`)}> + {#if channel.thumbnail} +
+ {/if} + {channel.thumbnail ? '' : channel.title} +
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+

{channel.title}

+

{channel.description}

+
+
+
+ {/each} +
+ +
+
+ +
+
+
+ {:else} +
+
+
+ +{/if} + + diff --git a/src/lib/components/Browse/Sections/TableSection.svelte b/src/lib/components/Browse/Sections/TableSection.svelte new file mode 100644 index 00000000..dc81b2f0 --- /dev/null +++ b/src/lib/components/Browse/Sections/TableSection.svelte @@ -0,0 +1,129 @@ + + +{#if !channels.error} +
+ + + + + + + + + + + + {#if channels && channels.length} + {#each channels as channel} + goto(`/channel/${channel._id}`)}> + + + + + + + {/each} + {:else} + + + + + + + + {/if} + + + + + + + + + + +
HostTitleViewersTagCategory
+
+
+
+ +
+
+
+
{channel.createdBy || ''}
+
@{channel.user || ''}
+
+
+ 		+ {channel.title} +
+ {channel.description} + 		+
+ {#if channel.isPrivate} + + {/if} + + {channel.memberCount || '0'} +
+ 		+
+ {#if channel.tags && channel.tags.length} + {#each channel.tags as tag} +
{tag}
+ {/each} + {/if} +
+ 		+
+ {#if channel.category && channel.category.length} + {#each channel.category as category} +
+ +
+ {/each} + {/if} +
+
+
+ Loading... +
+ 		+
+ Loading... +
+ 		+
+ Loading... +
+ 		+
+ Loading... +
+ 		+
+ Loading... +
+
HostTitleViewersTagsCategory
+
+{/if} diff --git a/src/lib/components/Browse/Sections/UserSection.svelte b/src/lib/components/Browse/Sections/UserSection.svelte new file mode 100644 index 00000000..1d6a1cfa --- /dev/null +++ b/src/lib/components/Browse/Sections/UserSection.svelte @@ -0,0 +1,118 @@ + + +{#if !users.error} +
+
+ {title || 'Channel Group'} +
+ {#if users && users.length} +
+
+
+ +
+
+ +
+ {#each users as user} +
+
+ +
goto(`/channel/${user._id}`)}> + {#if user.thumbnail} +
+ {/if} + {user.thumbnail ? '' : user.title} +
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+

{user.title}

+

{user.description}

+
+
+
+ {/each} +
+ +
+
+ +
+
+
+ {:else} +
+
+
+ +{/if} + + diff --git a/src/lib/components/Browse/UserSection.svelte b/src/lib/components/Browse/UserSection.svelte deleted file mode 100644 index e4331415..00000000 --- a/src/lib/components/Browse/UserSection.svelte +++ /dev/null @@ -1,116 +0,0 @@ - - -
-
- {title || 'Channel Group'} -
- {#if users && users.length} -
-
-
- -
-
- -
- {#each users as user} -
-
- -
goto(`/channel/${user._id}`)}> - {#if user.thumbnail} -
- {/if} - {user.thumbnail ? '' : user.title} -
- -
-
- -
-
-
-
-
-
- -
-
- -
-

{user.title}

-

{user.description}

-
-
-
- {/each} -
- -
-
- -
-
-
- {:else} -
-
-
- - - diff --git a/src/lib/components/Chat/ChatDrawer.svelte b/src/lib/components/Chat/ChatDrawer.svelte index 5306b1fc..4c3d0561 100644 --- a/src/lib/components/Chat/ChatDrawer.svelte +++ b/src/lib/components/Chat/ChatDrawer.svelte @@ -8,13 +8,12 @@ let username = 'Gagan', message = - 'Hello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello World' - - let sender = { username, message } - - let youSender = { username: 'Singh', message: 'hewrewrwe ehe' } - let modSender = { username: 'Moderator', message: 'hewe rew rwe rwhe' } - let otherSender = { username: 'Randos', message: 'he wer wer wehe' } + 'Hello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello World', + role = 'Host' + let sender = { username, message, role } + let youSender = { username: 'Singh', message: 'hewrewrwe ehe', role: 'You' } + let modSender = { username: 'Simmi', message: 'hewe rew rwe rwhe', role: 'Mod' } + let otherSender = { username: 'Arjan', message: 'he wer wer wehe', role: 'Rando' } onMount(async () => { // if (!$tags.length) { diff --git a/src/lib/components/Chat/ChatMessage.svelte b/src/lib/components/Chat/ChatMessage.svelte index e0a5a60d..51246dba 100644 --- a/src/lib/components/Chat/ChatMessage.svelte +++ b/src/lib/components/Chat/ChatMessage.svelte @@ -1,43 +1,60 @@ + +
  • - {#if sender.username == 'Gagan'} - - -
    - - Host - @{sender.username} - {sender.message} - -
    - {:else if sender.username == 'Singh'} + {#if sender.role === 'You'}
    {sender.message} - @{sender.username} - You - -
    - {:else if sender.username == 'Moderator'} - -
    - - Mod - @{sender.username} - {sender.message} + @{sender.username} + {sender.role}
    {:else} - +
    - @{sender.username} + {#if sender.role == 'Host' || sender.role == 'Mod'} + {sender.role} + {/if} + @{sender.username} {sender.message}
    diff --git a/src/lib/components/Chat/ChatProfileCard.svelte b/src/lib/components/Chat/ChatProfileCard.svelte new file mode 100644 index 00000000..7964115d --- /dev/null +++ b/src/lib/components/Chat/ChatProfileCard.svelte @@ -0,0 +1,48 @@ +
    • - {#if $currentUser} + {#if $current_user}
    • {/if} - {#if $currentUser} + {#if $current_user}