diff --git a/infrastructure/eid-wallet/src/routes/(auth)/verify/steps/selfie.svelte b/infrastructure/eid-wallet/src/routes/(auth)/verify/steps/selfie.svelte
index eed8fd72..4b6b765d 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/verify/steps/selfie.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/verify/steps/selfie.svelte
@@ -1,72 +1,67 @@
diff --git a/infrastructure/eid-wallet/src/routes/+layout.svelte b/infrastructure/eid-wallet/src/routes/+layout.svelte
index 0444fe77..0806cb78 100644
--- a/infrastructure/eid-wallet/src/routes/+layout.svelte
+++ b/infrastructure/eid-wallet/src/routes/+layout.svelte
@@ -1,102 +1,102 @@
{#if showSplashScreen}
diff --git a/platforms/metagram/src/lib/dummyData.ts b/platforms/metagram/src/lib/dummyData.ts
index 7c8580b9..03b5e705 100644
--- a/platforms/metagram/src/lib/dummyData.ts
+++ b/platforms/metagram/src/lib/dummyData.ts
@@ -1,24 +1,22 @@
import type { CommentType } from './types';
-
export const dummyPosts = Array.from({ length: 100 }, (_, i) => ({
- id: i + 1,
+ id: (i + 1).toString(),
avatar: 'https://www.gravatar.com/avatar/2c7d99fe281ecd3bcd65ab915bac6dd5?s=250',
+ userId: (i + 1).toString(),
username: `user${i + 1}`,
- imgUri: [
+ imgUris: [
'https://picsum.photos/800',
'https://picsum.photos/600',
'https://picsum.photos/800',
'https://picsum.photos/600'
],
- postAlt: 'Sample',
- text: `This is post number ${i + 1}. Loving how these shots came out! 📸`,
+ caption: `This is post number ${i + 1}. Loving how these shots came out! :camera_with_flash:`,
time: `${i + 1} hours ago`,
count: {
likes: Math.floor(Math.random() * 500),
comments: Math.floor(Math.random() * 200)
}
}));
-
export const comments: CommentType[] = Array.from({ length: 50 }, (_, i) => ({
userImgSrc: 'https://picsum.photos/800',
name: `user${i + 1}`,
diff --git a/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte b/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte
index 6175ec8b..98104c23 100644
--- a/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte
+++ b/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte
@@ -2,7 +2,7 @@
import type { HTMLAttributes } from 'svelte/elements';
import { Home, CommentsTwo, Search, Camera } from '$lib/icons';
import { goto } from '$app/navigation';
- import { isNavigatingThroughNav } from '$lib/store/store.svelte';
+ import { isNavigatingThroughNav, ownerId } from '$lib/store/store.svelte';
import { page } from '$app/state';
interface IBottomNavProps extends HTMLAttributes
{
@@ -27,7 +27,11 @@
const direction = toIndex > fromIndex ? 'right' : 'left';
document.documentElement.setAttribute('data-transition', direction);
previousTab = newTab;
- goto(`/${newTab}`);
+ if (newTab === 'profile') {
+ goto(`/profile/${ownerId}`);
+ } else {
+ goto(`/${newTab}`);
+ }
};
$effect(() => {
diff --git a/platforms/metagram/src/lib/fragments/Header/Header.stories.ts b/platforms/metagram/src/lib/fragments/Header/Header.stories.ts
index 798561f3..597e9f58 100644
--- a/platforms/metagram/src/lib/fragments/Header/Header.stories.ts
+++ b/platforms/metagram/src/lib/fragments/Header/Header.stories.ts
@@ -15,6 +15,7 @@ export const Primary = {
args: {
variant: 'primary',
heading: 'metagram',
+ isCallBackNeeded: true,
callback: () => alert('clicked')
}
};
@@ -37,6 +38,7 @@ export const SecondaryWithMenu = {
args: {
variant: 'secondary',
heading: 'Account',
+ isCallBackNeeded: true,
callback: () => alert('menu clicked')
}
};
@@ -44,6 +46,7 @@ export const SecondaryWithMenu = {
export const Tertiary = {
args: {
variant: 'tertiary',
+ isCallBackNeeded: true,
callback: () => alert('clicked')
}
};
diff --git a/platforms/metagram/src/lib/fragments/Header/Header.svelte b/platforms/metagram/src/lib/fragments/Header/Header.svelte
index 2694cb43..b6e1781c 100644
--- a/platforms/metagram/src/lib/fragments/Header/Header.svelte
+++ b/platforms/metagram/src/lib/fragments/Header/Header.svelte
@@ -13,11 +13,13 @@
interface IHeaderProps extends HTMLAttributes {
variant: 'primary' | 'secondary' | 'tertiary';
heading?: string;
+ isCallBackNeeded?: boolean;
callback?: () => void;
options?: { name: string; handler: () => void }[];
}
- const { variant, callback, heading, options, ...restProps }: IHeaderProps = $props();
+ const { variant, isCallBackNeeded, callback, heading, options, ...restProps }: IHeaderProps =
+ $props();
const variantClasses = {
primary: {
@@ -47,7 +49,7 @@
const classes = $derived({
common: cn(
- 'w-full flex items-center justify-between my-4 pb-6 border-b-[1px] md:border-0 border-grey'
+ 'flex items-center justify-between my-4 w-full pb-2 border-b-[1px] md:border-0 border-grey'
),
text: variantClasses[variant].text,
background: variantClasses[variant].background
@@ -81,7 +83,7 @@
{/if}
- {#if callback}
+ {#if isCallBackNeeded}