-
+
@@ -56,11 +53,14 @@ function App() {
} />
+
- } />
+
diff --git a/src/ModalContent.tsx b/src/ModalContent.tsx
index 02181713..eb826009 100644
--- a/src/ModalContent.tsx
+++ b/src/ModalContent.tsx
@@ -1,40 +1,82 @@
import { useState } from 'react'
type ChapterProps = {
- clickAction?: () => void
+ clickAction1?: () => void
+ clickAction2?: () => void
+
}
-export function Welcome1({ clickAction }: ChapterProps) {
+export function Welcome1({ clickAction1 }: ChapterProps) {
return (
<>
- Welcome to the Collaboative Finance Map
- Welcome to the Community Ecosystem Map
+
- This map is a tool for connecting the movement and making projects, local initiatives, people and events visible.
+ It is a tool for collaborative mapping to connect local initiatives, people and events.
- Help fill this map by adding projects and events to the map.
+ Join us and grow the network by adding projects and events to the map.
-
- Sign up to create your personal profile and add it to the map.
+ Create your personal profile and place it on the map.
- clickAction!()}>Close
+ clickAction1!()}>Close
)
}
-export function Welcome2({ clickAction }: ChapterProps) {
+export function Welcome2({ clickAction1 }: ChapterProps) {
return (
<>
- Hypnosis and Disillusion
+ Dencentralized Networking
+
- Most people are still stuck in old ways of thinking and living.
-
+ Onboard new people, places and events
+
+
+ clickAction1!()}>next
+
+
+ )
+}
+
+export function Welcome3({ clickAction1 }: ChapterProps) {
+ return (
+ <>
+ Mapping the Change
+
+ More and more people are waking up to what's really happening.
+
+ They are in the process of understanding the potential that is within themselves and within the whole mankind.
+
+
+ Starting to reconnect with our Mother Earth and beginning to question things that long times have been taken for granted.
+
+
+ clickAction1!()}>next
+
+
+ )
+}
+
+export function Welcome4({ clickAction1 }: ChapterProps) {
+ return (
+ <>
+ Dezentralized Networks
+
+
+ Find like-minded people, places and events. In your neighbourhood and wherever you are!
+
+
Hypnotised, they sit in front of screens in concrete blocks, flooded and disillusioned by irrelevant information.
@@ -44,46 +86,7 @@ export function Welcome2({ clickAction }: ChapterProps) {
From an early age, they are trained to do alienated work and consume unhealthy and meaningless products.
- clickAction!()}>next
-
-
- )
-}
-
-export function Welcome3({ clickAction }: ChapterProps) {
- return (
- <>
- But Consciousness is rising
-
- More and more people are waking up to what's really happening.
-
- They are in the process of understanding the potential that is within themselves and within the whole mankind.
-
-
- Starting to reconnect with our Mother Earth and beginning to question things that long times have been taken for granted.
-
-
- clickAction!()}>next
-
-
- )
-}
-
-export function Welcome4({ clickAction }: ChapterProps) {
- return (
- <>
- Gemeinsam erschaffen wir Strukturen
-
- 🥕 Essen & Trinken
- 🏡 Wohn- & Lebensraum
- 💬 Kommunikation
- 💡 Energie
- 🚐 Mobilität
-
-
- clickAction!()}>Ich mach mit
+ clickAction1!()}>next
)
@@ -103,11 +106,21 @@ export const ModalContent = () => {
const ActiveChapter = () => {
switch (chapter) {
case 1:
- return { close(); }} />
+ return {
+
+ close();
+ setTimeout(() => {
+ // setQuestsOpen(true);
+ setChapter(1);
+ }, 1000);
+
+ }}/>
case 2:
- return { setChapter(3) }} />
+ return { setChapter(3) }} />
case 3:
- return {
+ return { setChapter(4) }} />
+ case 4:
+ return {
close();
setTimeout(() => {
diff --git a/src/pages/MapContainer.tsx b/src/pages/MapContainer.tsx
index 558c8e74..8ce022a0 100644
--- a/src/pages/MapContainer.tsx
+++ b/src/pages/MapContainer.tsx
@@ -6,29 +6,20 @@ import { CalendarDaysIcon, MapPinIcon, UserIcon } from '@heroicons/react/20/soli
function MapContainer() {
-
const [placesApi, setPlacesApi] = useState>();
const [eventsApi, setEventsApi] = useState>();
const [updatesApiInstance, setUpdatesApiInstance] = useState>();
-
-
-
useEffect(() => {
-
- setPlacesApi(new itemsApi('items', undefined, undefined, {"type":{"_eq":"project"}}, {type: "project"}));
+ setPlacesApi(new itemsApi('items', undefined, undefined, {"type":{"_eq":"project"}}, {type: "project", autogenerated: "false"}));
setEventsApi(new itemsApi('items', undefined, undefined, {"type":{"_eq":"event"}}, {type: "event"}));
- setUpdatesApiInstance(new itemsApi('updates', "d2e5c850-74db-4789-910b-79d6784ad265", undefined, { "latest": { "_eq": true } }));
-
-
+ setUpdatesApiInstance(new itemsApi('items', undefined, undefined, {"type":{"_eq":"user"}}, {type: "user"}));
}, []);
const icon = CalendarDaysIcon;
-
return (
-
@@ -54,14 +49,18 @@ function MapContainer() {
@@ -77,19 +76,18 @@ function MapContainer() {
markerIcon='user'
markerShape='square'
markerDefaultColor='#818583'
- itemNameField='user_created.first_name'
- itemTextField='user_created.description'
- itemAvatarField='user_created.avatar'
- itemColorField='user_created.color'
+ itemType='user'
+ itemAvatarField='image'
+ itemColorField='color'
itemOwnerField="user_created"
- itemOffersField='user_created.offers'
- itemNeedsField='user_created.needs'
- customEditLink='/profile-settings'
+ itemSubnameField='subname'
+ customEditLink='/edit-item'
+ customEditParameter='id'
onlyOnePerOwner={true}
// data={places}
api={updatesApiInstance}>
-
diff --git a/src/pages/setItemLocation.tsx b/src/pages/setItemLocation.tsx
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/routes/sidebar.tsx b/src/routes/sidebar.tsx
index 6063d627..beb115a9 100644
--- a/src/routes/sidebar.tsx
+++ b/src/routes/sidebar.tsx
@@ -1,5 +1,5 @@
-import { RectangleGroupIcon } from '@heroicons/react/24/outline'
+import { RectangleGroupIcon, CalendarDaysIcon, UserGroupIcon } from '@heroicons/react/24/outline'
import { MapIcon } from '@heroicons/react/24/outline'
//const iconClasses = `h-6 w-6`
@@ -16,6 +16,16 @@ export const routes = [
path: '/items', // url
icon: 
+ 
+ Find like-minded people, projects and events. In your neighbourhood and wherever you are!
+
+ 
-
-