diff --git a/src/assets/logos/Phone_lost.png b/src/assets/logos/Phone_lost.png
index 6d05337..24d6c66 100644
Binary files a/src/assets/logos/Phone_lost.png and b/src/assets/logos/Phone_lost.png differ
diff --git a/src/components/CreateModal/CreateModal.jsx b/src/components/CreateModal/CreateModal.jsx
index 0c3ee83..79871f5 100644
--- a/src/components/CreateModal/CreateModal.jsx
+++ b/src/components/CreateModal/CreateModal.jsx
@@ -26,6 +26,7 @@ import {
useSteps,
Box,
ModalCloseButton,
+ Textarea,
} from "@chakra-ui/react";
// import logo from "../../assets/images/small_logo.png";
import { storage } from "../../firebase";
@@ -53,6 +54,7 @@ export default function CreateModal({
uploadImg,
upload,
}) {
+ const oldNewAddedItem = newAddedItem;
const { user } = UserAuth();
const { onLoginModalOpen } = useContext(DataContext);
const { isOpen, onOpen, onClose } = useDisclosure();
@@ -85,8 +87,8 @@ export default function CreateModal({
const [date, setDate] = useState(new Date());
const steps = [
- { title: "First", description: "Enter Item Info" },
- { title: "Second", description: "Select Item Type" },
+ { title: "First", description: "Enter Info" },
+ { title: "Second", description: "Select Type" },
{ title: "Third", description: "Choose Date" },
{ title: "Fourth", description: "File Upload" },
{ title: "Fifth", description: "Check Info" },
@@ -161,11 +163,11 @@ export default function CreateModal({
setIsEdit(false);
onClose();
}}
- size="5xl"
+ size="4xl"
closeOnOverlayClick={false}
>
-
+
{/* stepper */}
@@ -193,36 +195,37 @@ export default function CreateModal({
{/* first step */}
{activeStep === 0 && (
-
-
- Enter your information below:{" "}
-
+
+
+ Enter your item below:
-
- setNewAddedItem((prev) => ({
- ...prev,
- name: e.target.value,
- }))
- }
- />
-
- setNewAddedItem((prev) => ({
- ...prev,
- description: e.target.value,
- }))
- }
- />
-
+
+ setNewAddedItem((prev) => ({
+ ...prev,
+ name: e.target.value,
+ }))
+ }
+ />
+
+
)}
{/* first step */}
@@ -235,30 +238,16 @@ export default function CreateModal({
alignItems={"center"}
>
- Select Item Type:
+ Select Item Type:
- {/* */}
+
-
+
Lost or Found Item?
@@ -294,24 +283,15 @@ export default function CreateModal({
{/* third step */}
{activeStep === 2 && (
-
+
{newAddedItem.islost ? "Lost Date:" : "Found Date:"}
- {/*
- setNewAddedItem((prev) => ({
- ...prev,
- itemDate: e.target.value,
- }))
- }
- /> */}
+
File Upload:
-
- {
- setNewAddedItem((prev) => ({
- ...prev,
- image: e.target.files[0],
- }));
- }}
- />
-
+
+
+ {
+ setNewAddedItem((prev) => ({
+ ...prev,
+ image: e.target.files[0],
+ }));
+ }}
+ />
+
+
+
+
)}
@@ -423,7 +423,7 @@ export default function CreateModal({
{activeStep > 0 ? (
- {/*
-
-
-
-
- {newAddedItem.islost
- ? "Oh no! Post here so anteaters can help you! 😥ðŸ˜"
- : "WHAT A LIFE SAVER! 😇😸"}
-
-
-
-
-
-
-
-
-
- */}
diff --git a/src/components/Map/MapIcons.js b/src/components/Map/MapIcons.js
index ee7aaba..cf872e6 100644
--- a/src/components/Map/MapIcons.js
+++ b/src/components/Map/MapIcons.js
@@ -20,56 +20,67 @@ import fly_img from "../../assets/images/fly_img.png";
const headphoneLost = L.icon({
iconUrl: headphone_lost,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const headphoneFound = L.icon({
iconUrl: headphone_found,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const phoneLost = L.icon({
iconUrl: phone_lost,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const phoneFound = L.icon({
iconUrl: phone_found,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const keyLost = L.icon({
iconUrl: key_lost,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const keyFound = L.icon({
iconUrl: key_found,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const walletLost = L.icon({
iconUrl: wallet_lost,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const walletFound = L.icon({
iconUrl: wallet_found,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const othersLost = L.icon({
iconUrl: others_lost,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
const othersFound = L.icon({
iconUrl: others_found,
iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
export const othersDrag = L.icon({
iconUrl: others_black,
- iconSize: [60, 70],
+ iconSize: [60, 60],
+ iconAnchor: [30, 50],
});
export const flyImg = L.icon({
diff --git a/src/components/Type/TypeCard.jsx b/src/components/Type/TypeCard.jsx
index 6a50449..e329b55 100644
--- a/src/components/Type/TypeCard.jsx
+++ b/src/components/Type/TypeCard.jsx
@@ -1,11 +1,11 @@
import React from "react";
-import { Flex, Image, Text } from "@chakra-ui/react";
+import { Flex, Image, Text, Button } from "@chakra-ui/react";
export default function TypeCard({
type,
icon,
setNewAddedItem,
- newAddedItem
+ newAddedItem,
}) {
const handleOnClick = () => {
setNewAddedItem((prev) => ({
@@ -15,20 +15,22 @@ export default function TypeCard({
};
return (
-
- {type.toUpperCase()}
-
-
+
+ {type.toUpperCase()}
+
+
+
);
}
diff --git a/src/components/TypeSelector/TypeSelector.jsx b/src/components/TypeSelector/TypeSelector.jsx
index 7081407..8b3a406 100644
--- a/src/components/TypeSelector/TypeSelector.jsx
+++ b/src/components/TypeSelector/TypeSelector.jsx
@@ -1,5 +1,5 @@
import { React } from "react";
-import { Flex} from "@chakra-ui/react";
+import { Flex } from "@chakra-ui/react";
import TypeCard from "../Type/TypeCard";
import { iconsMap } from "../Map/MapIcons";
@@ -13,7 +13,13 @@ export default function TypeSelector(props) {
};
const typeContainers = Object.keys(types).map((type) => (
-
+
));
return (
@@ -22,6 +28,8 @@ export default function TypeSelector(props) {
flexWrap={"wrap"}
alignItems={"center"}
justifyContent={"center"}
+ paddingX="20%"
+ gap={10}
m={0}
>
{typeContainers}