Skip to content

Commit 8bd709f

Browse files
authored
feat/layout-enhancement (#168)
1 parent 9e98d04 commit 8bd709f

File tree

4 files changed

+34
-29
lines changed

4 files changed

+34
-29
lines changed

platforms/metagram/src/lib/fragments/SideBar/SideBar.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</h3>
125125
</button>
126126

127-
<button
127+
<button
128128
type="button"
129129
class="flex items-center gap-2"
130130
aria-current={activeTab === 'settings' ? 'page' : undefined}

platforms/metagram/src/lib/icons/Settings.svelte

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,23 @@
44
let { size = '20px', color = '#A5A5A5', ...restProps }: ISvgProps = $props();
55
</script>
66

7-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width={size} height={size} color={color} fill="none">
8-
<path d="M15.5 12C15.5 13.933 13.933 15.5 12 15.5C10.067 15.5 8.5 13.933 8.5 12C8.5 10.067 10.067 8.5 12 8.5C13.933 8.5 15.5 10.067 15.5 12Z" stroke={color} stroke-width="1.5"></path>
9-
<path d="M21.011 14.0965C21.5329 13.9558 21.7939 13.8854 21.8969 13.7508C22 13.6163 22 13.3998 22 12.9669V11.0332C22 10.6003 22 10.3838 21.8969 10.2493C21.7938 10.1147 21.5329 10.0443 21.011 9.90358C19.0606 9.37759 17.8399 7.33851 18.3433 5.40087C18.4817 4.86799 18.5509 4.60156 18.4848 4.44529C18.4187 4.28902 18.2291 4.18134 17.8497 3.96596L16.125 2.98673C15.7528 2.77539 15.5667 2.66972 15.3997 2.69222C15.2326 2.71472 15.0442 2.90273 14.6672 3.27873C13.208 4.73448 10.7936 4.73442 9.33434 3.27864C8.95743 2.90263 8.76898 2.71463 8.60193 2.69212C8.43489 2.66962 8.24877 2.77529 7.87653 2.98663L6.15184 3.96587C5.77253 4.18123 5.58287 4.28891 5.51678 4.44515C5.45068 4.6014 5.51987 4.86787 5.65825 5.4008C6.16137 7.3385 4.93972 9.37763 2.98902 9.9036C2.46712 10.0443 2.20617 10.1147 2.10308 10.2492C2 10.3838 2 10.6003 2 11.0332V12.9669C2 13.3998 2 13.6163 2.10308 13.7508C2.20615 13.8854 2.46711 13.9558 2.98902 14.0965C4.9394 14.6225 6.16008 16.6616 5.65672 18.5992C5.51829 19.1321 5.44907 19.3985 5.51516 19.5548C5.58126 19.7111 5.77092 19.8188 6.15025 20.0341L7.87495 21.0134C8.24721 21.2247 8.43334 21.3304 8.6004 21.3079C8.76746 21.2854 8.95588 21.0973 9.33271 20.7213C10.7927 19.2644 13.2088 19.2643 14.6689 20.7212C15.0457 21.0973 15.2341 21.2853 15.4012 21.3078C15.5682 21.3303 15.7544 21.2246 16.1266 21.0133L17.8513 20.034C18.2307 19.8187 18.4204 19.711 18.4864 19.5547C18.5525 19.3984 18.4833 19.132 18.3448 18.5991C17.8412 16.6616 19.0609 14.6226 21.011 14.0965Z" stroke={color} stroke-width="1.5" stroke-linecap="round"></path>
7+
<svg
8+
xmlns="http://www.w3.org/2000/svg"
9+
viewBox="0 0 24 24"
10+
width={size}
11+
height={size}
12+
{color}
13+
fill="none"
14+
>
15+
<path
16+
d="M15.5 12C15.5 13.933 13.933 15.5 12 15.5C10.067 15.5 8.5 13.933 8.5 12C8.5 10.067 10.067 8.5 12 8.5C13.933 8.5 15.5 10.067 15.5 12Z"
17+
stroke={color}
18+
stroke-width="1.5"
19+
></path>
20+
<path
21+
d="M21.011 14.0965C21.5329 13.9558 21.7939 13.8854 21.8969 13.7508C22 13.6163 22 13.3998 22 12.9669V11.0332C22 10.6003 22 10.3838 21.8969 10.2493C21.7938 10.1147 21.5329 10.0443 21.011 9.90358C19.0606 9.37759 17.8399 7.33851 18.3433 5.40087C18.4817 4.86799 18.5509 4.60156 18.4848 4.44529C18.4187 4.28902 18.2291 4.18134 17.8497 3.96596L16.125 2.98673C15.7528 2.77539 15.5667 2.66972 15.3997 2.69222C15.2326 2.71472 15.0442 2.90273 14.6672 3.27873C13.208 4.73448 10.7936 4.73442 9.33434 3.27864C8.95743 2.90263 8.76898 2.71463 8.60193 2.69212C8.43489 2.66962 8.24877 2.77529 7.87653 2.98663L6.15184 3.96587C5.77253 4.18123 5.58287 4.28891 5.51678 4.44515C5.45068 4.6014 5.51987 4.86787 5.65825 5.4008C6.16137 7.3385 4.93972 9.37763 2.98902 9.9036C2.46712 10.0443 2.20617 10.1147 2.10308 10.2492C2 10.3838 2 10.6003 2 11.0332V12.9669C2 13.3998 2 13.6163 2.10308 13.7508C2.20615 13.8854 2.46711 13.9558 2.98902 14.0965C4.9394 14.6225 6.16008 16.6616 5.65672 18.5992C5.51829 19.1321 5.44907 19.3985 5.51516 19.5548C5.58126 19.7111 5.77092 19.8188 6.15025 20.0341L7.87495 21.0134C8.24721 21.2247 8.43334 21.3304 8.6004 21.3079C8.76746 21.2854 8.95588 21.0973 9.33271 20.7213C10.7927 19.2644 13.2088 19.2643 14.6689 20.7212C15.0457 21.0973 15.2341 21.2853 15.4012 21.3078C15.5682 21.3303 15.7544 21.2246 16.1266 21.0133L17.8513 20.034C18.2307 19.8187 18.4204 19.711 18.4864 19.5547C18.5525 19.3984 18.4833 19.132 18.3448 18.5991C17.8412 16.6616 19.0609 14.6226 21.011 14.0965Z"
22+
stroke={color}
23+
stroke-width="1.5"
24+
stroke-linecap="round"
25+
></path>
1026
</svg>
11-

platforms/metagram/src/lib/icons/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ export { default as Flash } from './Flash.svelte';
88
export { default as CommentsTwo } from './CommentsTwo.svelte';
99
export { default as Search } from './Search.svelte';
1010
export { default as Camera } from './Camera.svelte';
11-
export { default as Settings } from "./Settings.svelte";
11+
export { default as Settings } from './Settings.svelte';

platforms/metagram/src/routes/(protected)/+layout.svelte

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,26 @@
55
let { children } = $props();
66
77
let route = $derived(page.url.pathname);
8-
let heading = $state("");
8+
let heading = $state('');
9+
10+
const routeToHeading: Record<string, string> = {
11+
'/home': 'Feed',
12+
'/discover': 'Search',
13+
'/post': 'Post',
14+
'/messages': 'Messages',
15+
'/settings': 'Settings',
16+
'/profile': 'Profile'
17+
};
918
1019
$effect(() => {
11-
switch (route) {
12-
case "/home":
13-
heading = "Feed";
14-
break;
15-
case "/discover":
16-
heading = "Search";
17-
break;
18-
case "/post":
19-
heading = "Post";
20-
break;
21-
case "/messages":
22-
heading = "Messages";
23-
break;
24-
case "/settings":
25-
heading = "Settings";
26-
break;
27-
case "/profile":
28-
heading = "Profile";
29-
break;
30-
}
31-
})
20+
heading = routeToHeading[route] ?? heading;
21+
});
3222
</script>
3323

3424
<main class="block h-[100dvh] grid-cols-[22vw_auto_31vw] md:grid">
3525
<SideBar profileSrc="https://picsum.photos/200" handlePost={async () => alert('adas')} />
3626
<section class="md:pt-10">
37-
<Header variant="primary" {heading}/>
27+
<Header variant="primary" {heading} />
3828
{@render children()}
3929
</section>
4030
{#if !route.endsWith('/messages')}

0 commit comments

Comments
 (0)