antontranelis/utopia-ui
1
0
Fork 0
mirror of https://github.com/utopia-os/utopia-ui.git synced 2025-12-13 07:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated to utopia-ui@3.0.19

Browse Source
This commit is contained in:
Anton Tranelis 2024-11-08 22:08:27 +01:00
parent 400f65ad91
commit f8c494548e
5 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package-lock.json generated
View File

@ -17,7 +17,7 @@
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-rnd": "^10.4.1", "react-rnd": "^10.4.1",
"react-router-dom": "^6.23.0", "react-router-dom": "^6.23.0",
"utopia-ui": "^3.0.10" "utopia-ui": "^3.0.19"
}, },
"devDependencies": { "devDependencies": {
"@types/react": "^18.2.79", "@types/react": "^18.2.79",
@ -1969,20 +1969,20 @@
} }
}, },
"node_modules/@tanstack/query-core": { "node_modules/@tanstack/query-core": {
"version": "5.59.16", "version": "5.59.20",
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.59.16.tgz", "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.59.20.tgz",
"integrity": "sha512-crHn+G3ltqb5JG0oUv6q+PMz1m1YkjpASrXTU+sYWW9pLk0t2GybUHNRqYPZWhxgjPaVGC4yp92gSFEJgYEsPw==", "integrity": "sha512-e8vw0lf7KwfGe1if4uPFhvZRWULqHjFcz3K8AebtieXvnMOz5FSzlZe3mTLlPuUBcydCnBRqYs2YJ5ys68wwLg==",
"funding": { "funding": {
"type": "github", "type": "github",
"url": "https://github.com/sponsors/tannerlinsley" "url": "https://github.com/sponsors/tannerlinsley"
} }
}, },
"node_modules/@tanstack/react-query": { "node_modules/@tanstack/react-query": {
"version": "5.59.16", "version": "5.59.20",
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.59.16.tgz", "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.59.20.tgz",
"integrity": "sha512-MuyWheG47h6ERd4PKQ6V8gDyBu3ThNG22e1fRVwvq6ap3EqsFhyuxCAwhNP/03m/mLg+DAb0upgbPaX6VB+CkQ==", "integrity": "sha512-Zly0egsK0tFdfSbh5/mapSa+Zfc3Et0Zkar7Wo5sQkFzWyB3p3uZWOHR2wrlAEEV2L953eLuDBtbgFvMYiLvUw==",
"dependencies": { "dependencies": {
"@tanstack/query-core": "5.59.16" "@tanstack/query-core": "5.59.20"
}, },
"funding": { "funding": {
"type": "github", "type": "github",
@ -4835,9 +4835,9 @@
} }
}, },
"node_modules/mdast-util-to-markdown": { "node_modules/mdast-util-to-markdown": {
"version": "2.1.1", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.1.tgz", "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz",
"integrity": "sha512-OrkcCoqAkEg9b1ykXBrA0ehRc8H4fGU/03cACmW2xXzau1+dIdS+qJugh1Cqex3hMumSBgSE/5pc7uqP12nLAw==", "integrity": "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==",
"dependencies": { "dependencies": {
"@types/mdast": "^4.0.0", "@types/mdast": "^4.0.0",
"@types/unist": "^3.0.0", "@types/unist": "^3.0.0",
@ -7203,9 +7203,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/utopia-ui": { "node_modules/utopia-ui": {
"version": "3.0.10", "version": "3.0.19",
"resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.10.tgz", "resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.19.tgz",
"integrity": "sha512-xrutPzz/xVSmUoGOtOJ9vLQ+UoCXdrVloVI6v+qZNU2gBfJvAOouUWi6qY3J/yXU2b6cEFVLNJLEE2L3LAg0Sg==", "integrity": "sha512-3MKWg36129nuL7rxCUSofx1p4KKQZjbOT6EbdVcy/VlAE9N6Sdc7xpvBathhI4PHiusiV3Xpm64zgBZwAQczoA==",
"dependencies": { "dependencies": {
"@heroicons/react": "^2.0.17", "@heroicons/react": "^2.0.17",
"@tanstack/react-query": "^5.17.8", "@tanstack/react-query": "^5.17.8",

2
package.json
View File

@ -19,7 +19,7 @@
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-rnd": "^10.4.1", "react-rnd": "^10.4.1",
"react-router-dom": "^6.23.0", "react-router-dom": "^6.23.0",
"utopia-ui": "^3.0.10" "utopia-ui": "^3.0.19"
}, },
"devDependencies": { "devDependencies": {
"@types/react": "^18.2.79", "@types/react": "^18.2.79",

9
src/App.tsx
View File

@ -29,7 +29,6 @@ function App() {
const [layerPageRoutes, setLayerPageRoutes] = useState<any>(); const [layerPageRoutes, setLayerPageRoutes] = useState<any>();
const [loading, setLoading] = useState<boolean>(true); const [loading, setLoading] = useState<boolean>(true);
useEffect(() => { useEffect(() => {
setPermissionsApiInstance(new permissionsApi()); setPermissionsApiInstance(new permissionsApi());
setMapApiInstance(new mapApi(window.location.origin)); setMapApiInstance(new mapApi(window.location.origin));
@ -103,15 +102,15 @@ function App() {
<Route path="/*" element={<MapContainer map={map} layers={layers} />}> <Route path="/*" element={<MapContainer map={map} layers={layers} />}>
<Route path='login' element={<LoginPage />} /> <Route path='login' element={<LoginPage />} />
<Route path='signup' element={<SignupPage />} /> <Route path='signup' element={<SignupPage />} />
<Route path='reset-password' element={<RequestPasswordPage reset_url={map.url + "/set-new-password/"} />} /> <Route path='reset-password' element={<RequestPasswordPage resetUrl={map.url + "/set-new-password/"} />} />
<Route path='set-new-password' element={<SetNewPasswordPage />} /> <Route path='set-new-password' element={<SetNewPasswordPage />} />
<Route path="item/*" element={<ProfileView attestationApi={attestationApi} userType={map.user_type.name} />} /> <Route path="item/*" element={<ProfileView attestationApi={attestationApi} />} />
<Route path="edit-item/*" element={<ProfileForm userType={map.user_type.name}/>} /> <Route path="edit-item/*" element={<ProfileForm/>} />
<Route path="user-settings" element={<UserSettings />} /> <Route path="user-settings" element={<UserSettings />} />
<Route path="moon-calendar" element={<MoonCalendar />} /> <Route path="moon-calendar" element={<MoonCalendar />} />
<Route path="landingpage" element={<Landingpage />} /> <Route path="landingpage" element={<Landingpage />} />
<Route path="market" element={<MarketView />} /> <Route path="market" element={<MarketView />} />
<Route path="select-user" element={<SelectUser userType={map.user_type.name} />} /> <Route path="select-user" element={<SelectUser/>} />
<Route path="attestation-form" element={<AttestationForm api={attestationApi}/>} /> <Route path="attestation-form" element={<AttestationForm api={attestationApi}/>} />
{ {
layers.map((l: any) => layers.map((l: any) =>

2
src/api/layersApi.ts
View File

@ -12,7 +12,7 @@ export class layersApi {
async getItems() { async getItems() {
try { try {
const layers = await directusClient.request(readItems("layers" as any, { fields: ['*', {itemType : ['*']}], filter: { "maps": { "maps_id": { "id": { "_eq": this.mapId } } } }, limit: 500 })); const layers = await directusClient.request(readItems("layers" as any, { fields: ['*', {itemType : ['*.*', {profileTemplate: ['*', 'item.*.*.*'] }]} as any], filter: { "maps": { "maps_id": { "id": { "_eq": this.mapId } } } }, limit: 500 }));
return layers; return layers;
} catch (error: any) { } catch (error: any) {
console.log(error); console.log(error);

20
src/pages/MapContainer.tsx
View File

@ -21,12 +21,20 @@ function MapContainer({ layers, map }: { layers: Array<LayerProps>, map: any })
layers.map((layer: LayerProps) => { layers.map((layer: LayerProps) => {
apis && setApis(current => [...current, { apis && setApis(current => [...current, {
id: layer.id!, api: new itemsApi<Place>('items', layer.id, undefined, { id: layer.id!, api: new itemsApi<Place>('items', layer.id, undefined, {
...(layer.itemType.name == "event" && { "_or": [
"end": { {
"_gt": etartOfDayISO "end": {
"_gt": etartOfDayISO
}
},
{
"end": {
"_null": true
}
} }
}) ]
}) }
)
}]) }])
}) })
}, [layers]) }, [layers])
@ -89,7 +97,7 @@ function MapContainer({ layers, map }: { layers: Array<LayerProps>, map: any })
<ItemForm> <ItemForm>
{layer.itemType.show_name_input && <PopupTextInput dataField='name' placeholder='Name'></PopupTextInput>} {layer.itemType.show_name_input && <PopupTextInput dataField='name' placeholder='Name'></PopupTextInput>}
{layer.itemType.show_start_end_input && <PopupStartEndInput></PopupStartEndInput>} {layer.itemType.show_start_end_input && <PopupStartEndInput></PopupStartEndInput>}
{layer.itemType.show_text_input && <PopupTextAreaInput dataField='text' placeholder={'Text ...'} style="tw-h-40"></PopupTextAreaInput>} {layer.itemType.show_text_input && <div className='mt-4'><PopupTextAreaInput dataField='text' placeholder={'Text ...'} style="tw-h-40"></PopupTextAreaInput></div>}
{//layer.public_edit_items && <PopupCheckboxInput dataField={'public_edit'} label={'public edit'}/> {//layer.public_edit_items && <PopupCheckboxInput dataField={'public_edit'} label={'public edit'}/>
} }
{layer.itemType.custom_text && <div className='flex justify-center'> {layer.itemType.custom_text && <div className='flex justify-center'>