diff --git a/src/mapper/src/lib/components/common/Editor/editor.css b/src/mapper/src/lib/components/common/Editor/editor.css index f482a7d7ac..8321a19509 100644 --- a/src/mapper/src/lib/components/common/Editor/editor.css +++ b/src/mapper/src/lib/components/common/Editor/editor.css @@ -2,13 +2,12 @@ outline: none !important; padding-left: 1rem; padding-right: 1rem; - height: 100px; + height: 100%; overflow-y: scroll; } @media screen and (max-width: 500px) { .tiptap { - height: 80px; overflow-y: scroll; } } diff --git a/src/mapper/src/lib/components/common/Editor/editor.svelte b/src/mapper/src/lib/components/common/Editor/editor.svelte index 5f24cb9dd6..ed17b91967 100644 --- a/src/mapper/src/lib/components/common/Editor/editor.svelte +++ b/src/mapper/src/lib/components/common/Editor/editor.svelte @@ -8,15 +8,22 @@ let element; let editor; + export let editable; + export let content; + export let setEditorHtmlContent; onMount(() => { editor = new Editor({ element: element, extensions: [StarterKit], - content: '', + content: content, onTransaction: () => { editor = editor; }, + editable: editable, + onUpdate: ({ editor }) => { + setEditorHtmlContent && setEditorHtmlContent(editor.getHTML()); + }, }); }); @@ -28,23 +35,14 @@
-
- {#if editor} +
+ {#if editor && editable} {/if} -
-
-
- CLEAR - COMMENT +
+
+
diff --git a/src/mapper/src/lib/components/common/bottom-sheet.svelte b/src/mapper/src/lib/components/common/bottom-sheet.svelte index 4d0c7804bf..c66edda881 100644 --- a/src/mapper/src/lib/components/common/bottom-sheet.svelte +++ b/src/mapper/src/lib/components/common/bottom-sheet.svelte @@ -21,8 +21,8 @@ onMount(() => { show = true; document.body.style.overflowY = 'hidden'; - bottomSheetRef.style.height = `50vh`; - updateSheetHeight(50); + bottomSheetRef.style.height = `85vh`; + updateSheetHeight(85); }); const hideBottomSheet = () => { diff --git a/src/mapper/src/lib/components/page/more/activities.svelte b/src/mapper/src/lib/components/page/more/activities.svelte new file mode 100644 index 0000000000..a4cdbc5f59 --- /dev/null +++ b/src/mapper/src/lib/components/page/more/activities.svelte @@ -0,0 +1,42 @@ + + +
+ {#if false} + {#each Array.from({ length: 5 }) as _, index} + + {/each} + {:else} + {#each Array.from({ length: 5 }) as _, index} +
+
+ +
+

Localadmin

+
+

#2

+
+ +

2024-10-21 11:42

+
+
+
+
+
+

+ svcfmtm updated status to MAPPED +

+ +
+
+ {/each} + {/if} +
+ + diff --git a/src/mapper/src/lib/components/page/more/comment.svelte b/src/mapper/src/lib/components/page/more/comment.svelte new file mode 100644 index 0000000000..c6b390d60b --- /dev/null +++ b/src/mapper/src/lib/components/page/more/comment.svelte @@ -0,0 +1,58 @@ + + +
+
+ {#if false} + {#each Array.from({ length: 5 }) as _, index} + + {/each} + {:else} + {#each Array.from({ length: 5 }) as _, index} +
+
+ +
+

Localadmin

+
+

#2

+
+ +

2024-10-21 11:42

+
+
+
+
+ This is a comment

'} /> +
+ {/each} + {/if} +
+ +
+ { + // to-do: store state to post comment + }} + /> +
+ CLEAR + COMMENT +
+
+
+ + diff --git a/src/mapper/src/lib/components/page/more/index.svelte b/src/mapper/src/lib/components/page/more/index.svelte index c42a184a6f..e629e93428 100644 --- a/src/mapper/src/lib/components/page/more/index.svelte +++ b/src/mapper/src/lib/components/page/more/index.svelte @@ -1,5 +1,7 @@
{#if activeStack === ''} {#each stackGroup as stack}
(activeStack = stack.title)} >
@@ -38,35 +41,24 @@ {#if activeStack !== ''} -
+
(activeStack = '')} > -

{activeStack}

+

{activeStack}

{/if} {#if activeStack === 'Comment'} -
-
- -
- -
-
+ {/if} + {#if activeStack === 'Instructions'} -
-

Instructions

-
+ {/if} {#if activeStack === 'Activities'} -
-

Activities

-
+ {/if}
- - diff --git a/src/mapper/src/lib/components/skeleton/activities.svelte b/src/mapper/src/lib/components/skeleton/activities.svelte new file mode 100644 index 0000000000..1a04c786b9 --- /dev/null +++ b/src/mapper/src/lib/components/skeleton/activities.svelte @@ -0,0 +1,20 @@ +
+
+ +
+ +
+ + +
+
+
+
+ + +
+
diff --git a/src/mapper/src/lib/components/skeleton/comment.svelte b/src/mapper/src/lib/components/skeleton/comment.svelte new file mode 100644 index 0000000000..5ecc3f415d --- /dev/null +++ b/src/mapper/src/lib/components/skeleton/comment.svelte @@ -0,0 +1,17 @@ +
+
+ +
+ +
+ + +
+
+
+ + +
diff --git a/src/mapper/src/routes/[projectId]/+page.svelte b/src/mapper/src/routes/[projectId]/+page.svelte index d5eadd6cdc..36c4afaca0 100644 --- a/src/mapper/src/routes/[projectId]/+page.svelte +++ b/src/mapper/src/routes/[projectId]/+page.svelte @@ -527,15 +527,15 @@ }} > {#if selectedTab === 'events'} - + {/if} - + {/if} {#if selectedTab === 'offline'}
TODO stuff here
diff --git a/src/mapper/src/styles/page.css b/src/mapper/src/styles/page.css index e87d22ddb3..ef12c3c43b 100644 --- a/src/mapper/src/styles/page.css +++ b/src/mapper/src/styles/page.css @@ -36,3 +36,7 @@ ::-webkit-scrollbar-thumb:hover { background: #c9c8c8; } + +p { + margin: 0px; +} diff --git a/src/mapper/static/assets/icons/clock-history.svg b/src/mapper/static/assets/icons/clock-history.svg new file mode 100644 index 0000000000..f685e10a1d --- /dev/null +++ b/src/mapper/static/assets/icons/clock-history.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/mapper/static/assets/icons/person-fill.svg b/src/mapper/static/assets/icons/person-fill.svg new file mode 100644 index 0000000000..46d1a75f83 --- /dev/null +++ b/src/mapper/static/assets/icons/person-fill.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file