Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/mapper frontend continuation #1823

Merged
merged 35 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1b3d941
fix(page): prettier code indentation fix
NSUWAL123 Sep 30, 2024
09b4e56
fix(bottomSheet): improve user experience
NSUWAL123 Oct 4, 2024
a95002f
fix(bottom-sheet): bottom sheet component add
NSUWAL123 Oct 4, 2024
e34ec0d
fix(+page): integrate bottom sheet
NSUWAL123 Oct 4, 2024
66b682f
feat(pageCss): css for page route
NSUWAL123 Oct 4, 2024
b94b16b
feat(icons): icon add
NSUWAL123 Oct 4, 2024
b3ae43b
fix(bottom-sheet): width fix
NSUWAL123 Oct 4, 2024
496b5b5
feat(more): stacked card UI
NSUWAL123 Oct 4, 2024
5d2523a
feat(images): lock icons add
NSUWAL123 Oct 7, 2024
a78b82d
feat(+page): symbolLayer add to display lockIcons, more layer color add
NSUWAL123 Oct 7, 2024
d6f2c68
feat(icons): layer, legend icon add
NSUWAL123 Oct 7, 2024
b37da38
feat(clickOutside): handle outside click function add
NSUWAL123 Oct 7, 2024
f9e6d69
fix(+page): integrate legend and layer-switcher
NSUWAL123 Oct 7, 2024
ab3664a
feat(legend): legend UI slice
NSUWAL123 Oct 7, 2024
fb83e32
feat(layer-switcher): component for layer switcher
NSUWAL123 Oct 8, 2024
03c1d25
feat(close): icon add
NSUWAL123 Oct 9, 2024
1d998c5
fix(+page): task actions modal add
NSUWAL123 Oct 9, 2024
90d8073
fix(+page): only show modal if status ready or locked for mapping
NSUWAL123 Oct 9, 2024
9e033ac
feat(icons): icon add
NSUWAL123 Oct 15, 2024
29857b2
feat(tiptap): tiptap rich text editor package add
NSUWAL123 Oct 15, 2024
4e6697c
feat(editor): tiptap rich text editor add
NSUWAL123 Oct 15, 2024
54f5158
fix(bottom-sheet): fix css
NSUWAL123 Oct 15, 2024
84e7e9a
feat(more): implement text editor on comment section
NSUWAL123 Oct 15, 2024
f76d3fc
fix(+page): more section add
NSUWAL123 Oct 15, 2024
f3c7a57
feat(button): button css define
NSUWAL123 Oct 16, 2024
a9410a6
fix(button): btn classes add for styling
NSUWAL123 Oct 16, 2024
6de04dc
feat(icons): icons add
NSUWAL123 Oct 16, 2024
e06e216
fix(+page): icon add to task action btns
NSUWAL123 Oct 16, 2024
0903033
Merge branch 'development' of github.com:hotosm/fmtm into feat/mapper…
NSUWAL123 Oct 16, 2024
8cc82d4
fix(+page): change selected task boundary color on task select
NSUWAL123 Oct 17, 2024
0f04951
feat(asset): location image add
NSUWAL123 Oct 17, 2024
0348b03
feat(image): replace locationDot image
NSUWAL123 Oct 18, 2024
b14a4e5
feat(geolocate): icon add
NSUWAL123 Oct 18, 2024
7c6b922
feat(getDeviceRotation): device orientation track function
NSUWAL123 Oct 18, 2024
ade1db2
feat(+page): geolocation with device orientation functionality add
NSUWAL123 Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/frontend/src/components/common/BottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const BottomSheet = ({ body, onClose }: bottomSheetType) => {
};

const dragStart = (e) => {
e.preventDefault();
const pagesY = e.pageY || e.changedTouches[0].screenY;
setStartY(pagesY);
setStartHeight(parseInt(sheetContentRef.current.style.height));
Expand All @@ -54,6 +55,7 @@ const BottomSheet = ({ body, onClose }: bottomSheetType) => {
};

const dragging = (e) => {
if (!isDragging) return;
const delta = startY - (e.pageY || e.changedTouches[0].screenY);
const newHeight = startHeight + (delta / window.innerHeight) * 100;
bottomSheetRef.current.style.height = `100vh`;
Expand Down Expand Up @@ -88,22 +90,21 @@ const BottomSheet = ({ body, onClose }: bottomSheetType) => {
</div>
<div
ref={sheetContentRef}
className={`bottom-sheet-content fmtm-shadow-[30px_-10px_10px_5px_rgba(0,0,0,0.1)] fmtm-w-full fmtm-relative fmtm-bg-white fmtm-max-h-[100vh] fmtm-h-[50vh] fmtm-max-w-[1150px] fmtm-py-6 fmtm-px-4 fmtm-duration-300 fmtm-ease-in-out fmtm-overflow-hidden ${
className={`bottom-sheet-content fmtm-shadow-[30px_-10px_10px_5px_rgba(0,0,0,0.1)] fmtm-w-full fmtm-relative fmtm-bg-white fmtm-max-h-[100vh] fmtm-h-[50vh] fmtm-max-w-[1150px] fmtm-pb-6 fmtm-px-4 fmtm-duration-300 fmtm-ease-in-out fmtm-overflow-hidden ${
!show ? 'fmtm-translate-y-[100%]' : 'fmtm-translate-y-[0%]'
} ${isDragging ? 'fmtm-transition-none' : ''} ${isFullScreen ? 'fmtm-rounded-none' : 'fmtm-rounded-t-2xl'}`}
>
<div className="header fmtm-flex fmtm-justify-center">
<div
className="drag-icon fmtm-cursor-grab fmtm-select-none fmtm-p-4 -fmtm-mt-4 fmtm-z-[9999]"
onMouseDown={dragStart}
onTouchStart={dragStart}
onMouseMove={dragging}
onTouchMove={dragging}
onMouseUp={dragStop}
onTouchEnd={dragStop}
>
<span className="fmtm-h-1 fmtm-w-[2.5rem] fmtm-block fmtm-bg-[#c7d0e1] fmtm-rounded-full hover:fmtm-bg-primaryRed"></span>
</div>
<div
className="header fmtm-group fmtm-flex fmtm-justify-center fmtm-py-4 drag-icon fmtm-cursor-grab fmtm-select-none fmtm-z-[9999]"
onMouseDown={dragStart}
onTouchStart={dragStart}
onMouseMove={dragging}
onTouchMove={dragging}
onMouseUp={dragStop}
onTouchEnd={dragStop}
onMouseOut={dragStop}
>
<span className="fmtm-h-1 fmtm-w-[2.5rem] fmtm-block fmtm-bg-[#c7d0e1] fmtm-rounded-full group-hover:fmtm-bg-primaryRed fmtm-pointer-events-none"></span>
</div>
<div className="body fmtm-overflow-y-scroll scrollbar fmtm-h-full fmtm-p-[1px]">{body}</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/mapper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
"@electric-sql/pglite": "^0.2.4",
"@hotosm/ui": "0.2.0-b5",
"@prisma/client": "4.8.1",
"@tiptap/core": "^2.8.0",
"@tiptap/pm": "^2.8.0",
"@tiptap/starter-kit": "^2.8.0",
"@turf/bbox": "^7.0.0",
"@turf/buffer": "^7.0.0",
"@turf/helpers": "^7.0.0",
Expand Down
Loading
Loading