diff --git a/platforms/metagram/src/app.css b/platforms/metagram/src/app.css index 08fcb562..4579296e 100644 --- a/platforms/metagram/src/app.css +++ b/platforms/metagram/src/app.css @@ -11,9 +11,9 @@ body { font-family: 'Geist', sans-serif; padding-top: env(safe-area-inset-top); - padding-bottom: env(safe-area-inset-bottom); - padding-left: env(safe-area-inset-left); - padding-right: env(safe-area-inset-right); + padding-bottom: env(safe-area-inset-bottom); + padding-left: env(safe-area-inset-left); + padding-right: env(safe-area-inset-right); background-color: white; } diff --git a/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte b/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte index c8cd4ec2..f5b99e0e 100644 --- a/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte +++ b/platforms/metagram/src/lib/fragments/BottomNav/BottomNav.svelte @@ -40,7 +40,7 @@ diff --git a/platforms/metagram/src/lib/fragments/index.ts b/platforms/metagram/src/lib/fragments/index.ts index 72fd77ff..006ed9b8 100644 --- a/platforms/metagram/src/lib/fragments/index.ts +++ b/platforms/metagram/src/lib/fragments/index.ts @@ -7,3 +7,4 @@ export { default as Drawer } from './Drawer/Drawer.svelte'; export { default as Message } from './Message/Message.svelte'; export { default as ActionMenu } from './ActionMenu/ActionMenu.svelte'; export { default as Modal } from './Modal/Modal.svelte'; +export { default as SideBar } from './SideBar/SideBar.svelte'; diff --git a/platforms/metagram/src/lib/icons/Settings.svelte b/platforms/metagram/src/lib/icons/Settings.svelte new file mode 100644 index 00000000..5b7308e8 --- /dev/null +++ b/platforms/metagram/src/lib/icons/Settings.svelte @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/platforms/metagram/src/lib/icons/index.ts b/platforms/metagram/src/lib/icons/index.ts index c5af67c6..2771bcd3 100644 --- a/platforms/metagram/src/lib/icons/index.ts +++ b/platforms/metagram/src/lib/icons/index.ts @@ -8,3 +8,4 @@ export { default as Flash } from './Flash.svelte'; export { default as CommentsTwo } from './CommentsTwo.svelte'; export { default as Search } from './Search.svelte'; export { default as Camera } from './Camera.svelte'; +export { default as Settings } from "./Settings.svelte"; \ No newline at end of file diff --git a/platforms/metagram/src/lib/ui/Button/Button.svelte b/platforms/metagram/src/lib/ui/Button/Button.svelte index ae962d7a..3c9658aa 100644 --- a/platforms/metagram/src/lib/ui/Button/Button.svelte +++ b/platforms/metagram/src/lib/ui/Button/Button.svelte @@ -3,7 +3,7 @@ import type { HTMLButtonAttributes } from 'svelte/elements'; interface IButtonProps extends HTMLButtonAttributes { - variant?: 'primary' | 'danger'; + variant?: 'primary' | 'secondary' | 'danger'; isLoading?: boolean; callback?: () => Promise | void; blockingClick?: boolean; @@ -39,13 +39,35 @@ }; const variantClasses = { - primary: { background: 'bg-grey', text: 'text-black-800' }, - danger: { background: 'bg-red-500', text: 'text-white' } + primary: { + background: 'bg-grey', + text: 'text-black-800', + border: 'border border-black-400' + }, + secondary: { + background: 'bg-brand-burnt-orange', + text: 'text-white', + border: 'border border-brand-burnt-orange-700' + }, + danger: { background: 'bg-red-500', text: 'text-white', border: 'border border-red-700' } }; const disabledVariantClasses = { - primary: { background: 'bg-grey/50', text: 'text-black-800/50' }, - danger: { background: 'bg-red-500/50', text: 'text-white/50' } + primary: { + background: 'bg-grey/50', + text: 'text-black-800/50', + border: 'border border-black-400/50' + }, + secondary: { + background: 'bg-brand-burnt-orange/50', + text: 'text-white/50', + border: 'border border-brand-burnt-orange-700/50' + }, + danger: { + background: 'bg-red-500/50', + text: 'text-white/50', + border: 'border border-red-700/50' + } }; const sizeVariant = { @@ -55,7 +77,7 @@ const classes = $derived({ common: cn( - 'cursor-pointer w-min flex items-center justify-center rounded-full font-semibold duration-100', + 'cursor-pointer w-full flex items-center justify-center rounded-full font-semibold duration-100', sizeVariant[size] ), background: disabled @@ -64,6 +86,9 @@ text: disabled ? disabledVariantClasses[variant].text || variantClasses[variant].text : variantClasses[variant].text, + border: disabled + ? disabledVariantClasses[variant].border || variantClasses[variant].border + : variantClasses[variant].border, disabled: 'cursor-not-allowed' }); @@ -75,6 +100,7 @@ classes.common, classes.background, classes.text, + classes.border, disabled && classes.disabled, restProps.class ].join(' ') diff --git a/platforms/metagram/src/routes/(protected)/+layout.svelte b/platforms/metagram/src/routes/(protected)/+layout.svelte index 1fb8b93d..add5ccd7 100644 --- a/platforms/metagram/src/routes/(protected)/+layout.svelte +++ b/platforms/metagram/src/routes/(protected)/+layout.svelte @@ -1,9 +1,46 @@ -
- {@render children()} +
+ alert('adas')} /> +
+
+ {@render children()} +
+ {#if !route.endsWith('/messages')} + + {/if}
diff --git a/platforms/metagram/src/routes/(protected)/discover/+page.svelte b/platforms/metagram/src/routes/(protected)/discover/+page.svelte index 68085d8d..0fbba997 100644 --- a/platforms/metagram/src/routes/(protected)/discover/+page.svelte +++ b/platforms/metagram/src/routes/(protected)/discover/+page.svelte @@ -1,4 +1,2 @@ - -

Discover Page

diff --git a/platforms/metagram/src/routes/(protected)/home/+page.svelte b/platforms/metagram/src/routes/(protected)/home/+page.svelte index 04ae6f62..0fbba997 100644 --- a/platforms/metagram/src/routes/(protected)/home/+page.svelte +++ b/platforms/metagram/src/routes/(protected)/home/+page.svelte @@ -1,12 +1,2 @@ - -

Home

- diff --git a/platforms/metagram/src/routes/(protected)/messages/+page.svelte b/platforms/metagram/src/routes/(protected)/messages/+page.svelte index f19257d6..0fbba997 100644 --- a/platforms/metagram/src/routes/(protected)/messages/+page.svelte +++ b/platforms/metagram/src/routes/(protected)/messages/+page.svelte @@ -1,4 +1,2 @@ - -

Messages

diff --git a/platforms/metagram/src/routes/(protected)/post/+page.svelte b/platforms/metagram/src/routes/(protected)/post/+page.svelte index e27f433e..0fbba997 100644 --- a/platforms/metagram/src/routes/(protected)/post/+page.svelte +++ b/platforms/metagram/src/routes/(protected)/post/+page.svelte @@ -1,4 +1,2 @@ - -

Post

diff --git a/platforms/metagram/src/routes/(protected)/profile/+page.svelte b/platforms/metagram/src/routes/(protected)/profile/+page.svelte index 74ff5064..0fbba997 100644 --- a/platforms/metagram/src/routes/(protected)/profile/+page.svelte +++ b/platforms/metagram/src/routes/(protected)/profile/+page.svelte @@ -1,4 +1,2 @@ - -

Profile

diff --git a/platforms/metagram/src/routes/(protected)/settings/+page.svelte b/platforms/metagram/src/routes/(protected)/settings/+page.svelte new file mode 100644 index 00000000..e69de29b diff --git a/platforms/metagram/src/routes/+layout.svelte b/platforms/metagram/src/routes/+layout.svelte index 8a33cead..ba6dd57a 100644 --- a/platforms/metagram/src/routes/+layout.svelte +++ b/platforms/metagram/src/routes/+layout.svelte @@ -9,6 +9,9 @@ onNavigate((navigation) => { if (!document.startViewTransition) return; + if (!window.matchMedia('(max-width: 768px)').matches) { + return; + } const currentRoute = navigation.from?.url.pathname; const targetRoute = navigation.to?.url.pathname; @@ -33,6 +36,6 @@ }); -
+
{@render children()}