mirror of
https://github.com/utopia-os/utopia-ui.git
synced 2025-12-13 07:46:10 +00:00
merged
This commit is contained in:
commit
a98fce32d7
22
package-lock.json
generated
22
package-lock.json
generated
@ -17,7 +17,7 @@
|
||||
"react-dom": "^18.2.0",
|
||||
"react-rnd": "^10.4.1",
|
||||
"react-router-dom": "^6.23.0",
|
||||
"utopia-ui": "^3.0.0-alpha.203"
|
||||
"utopia-ui": "^3.0.0-alpha.216"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "^18.2.79",
|
||||
@ -1969,20 +1969,20 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@tanstack/query-core": {
|
||||
"version": "5.51.1",
|
||||
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.51.1.tgz",
|
||||
"integrity": "sha512-fJBMQMpo8/KSsWW5ratJR5+IFr7YNJ3K2kfP9l5XObYHsgfVy1w3FJUWU4FT2fj7+JMaEg33zOcNDBo0LMwHnw==",
|
||||
"version": "5.51.9",
|
||||
"resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.51.9.tgz",
|
||||
"integrity": "sha512-HsAwaY5J19MD18ykZDS3aVVh+bAt0i7m6uQlFC2b77DLV9djo+xEN7MWQAQQTR8IM+7r/zbozTQ7P0xr0bHuew==",
|
||||
"funding": {
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/tannerlinsley"
|
||||
}
|
||||
},
|
||||
"node_modules/@tanstack/react-query": {
|
||||
"version": "5.51.1",
|
||||
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.51.1.tgz",
|
||||
"integrity": "sha512-s47HKFnQ4HOJAHoIiXcpna/roMMPZJPy6fJ6p4ZNVn8+/onlLBEDd1+xc8OnDuwgvecqkZD7Z2mnSRbcWefrKw==",
|
||||
"version": "5.51.11",
|
||||
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.51.11.tgz",
|
||||
"integrity": "sha512-4Kq2x0XpDlpvSnaLG+8pHNH60zEc3mBvb3B2tOMDjcPCi/o+Du3p/9qpPLwJOTliVxxPJAP27fuIhLrsRdCr7A==",
|
||||
"dependencies": {
|
||||
"@tanstack/query-core": "5.51.1"
|
||||
"@tanstack/query-core": "5.51.9"
|
||||
},
|
||||
"funding": {
|
||||
"type": "github",
|
||||
@ -7250,9 +7250,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/utopia-ui": {
|
||||
"version": "3.0.0-alpha.203",
|
||||
"resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.0-alpha.203.tgz",
|
||||
"integrity": "sha512-1dcsROIGmQmhiBwO2rmzrIyIVzPxO3d3wnuNmjREwWCsLBUVr2dTBA1aqL9MS2anB7L9BVYWpKokL8mO/q5E5g==",
|
||||
"version": "3.0.0-alpha.216",
|
||||
"resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.0-alpha.216.tgz",
|
||||
"integrity": "sha512-C7ItBnKfSKfVfYXXXeQ09TAJXpGCxPwxAiTjBvRKRP/klDefvFnL7sIjV9Cg17ccwv/fkz8RPknsdpfeZ93PDw==",
|
||||
"dependencies": {
|
||||
"@heroicons/react": "^2.0.17",
|
||||
"@tanstack/react-query": "^5.17.8",
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
"react-dom": "^18.2.0",
|
||||
"react-rnd": "^10.4.1",
|
||||
"react-router-dom": "^6.23.0",
|
||||
"utopia-ui": "^3.0.0-alpha.203"
|
||||
"utopia-ui": "^3.0.0-alpha.216"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "^18.2.79",
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { AppShell, SideBar, Content, AuthProvider, Modal, LoginPage, SignupPage, Quests, RequestPasswordPage, SetNewPasswordPage, OverlayUserSettings, OverlayItemsIndexPage, OverlayItemProfile, OverlayItemProfileSettings, Permissions, Tags, SelectUser } from 'utopia-ui'
|
||||
import { AppShell, SideBar, Content, AuthProvider, Modal, LoginPage, SignupPage, Quests, RequestPasswordPage, SetNewPasswordPage, UserSettings, OverlayItemsIndexPage, ProfileView, ProfileForm, Permissions, Tags, SelectUser } from 'utopia-ui'
|
||||
import { getBottomRoutes, routes } from './routes/sidebar'
|
||||
import { Route, Routes } from 'react-router-dom'
|
||||
import MapContainer from "./pages/MapContainer"
|
||||
@ -102,9 +102,9 @@ function App() {
|
||||
<Route path='signup' element={<SignupPage />} />
|
||||
<Route path='reset-password' element={<RequestPasswordPage reset_url={map.url + "/set-new-password/"} />} />
|
||||
<Route path='set-new-password' element={<SetNewPasswordPage />} />
|
||||
<Route path="item/*" element={<OverlayItemProfile userType={map.user_type.name} />} />
|
||||
<Route path="edit-item/*" element={<OverlayItemProfileSettings userType={map.user_type.name}/>} />
|
||||
<Route path="user-settings" element={<OverlayUserSettings />} />
|
||||
<Route path="item/*" element={<ProfileView userType={map.user_type.name} />} />
|
||||
<Route path="edit-item/*" element={<ProfileForm userType={map.user_type.name}/>} />
|
||||
<Route path="user-settings" element={<UserSettings />} />
|
||||
<Route path="moon-calendar" element={<MoonCalendar />} />
|
||||
<Route path="landingpage" element={<Landingpage />} />
|
||||
<Route path="select-user" element={<SelectUser userType={map.user_type.name} />} />
|
||||
|
||||
@ -30,7 +30,7 @@ export class itemsApi<T> implements ItemsApi<T>{
|
||||
|
||||
async getItems() {
|
||||
try {
|
||||
return await directusClient.request(readItems(this.collectionName as never, { fields: ['*', "relations.*", "user_created.*", {offers: ['*'], needs: ['*']}] , filter: this.filter, limit: 2000 }));
|
||||
return await directusClient.request(readItems(this.collectionName as never, { fields: ['*', "relations.*", "user_created.*", {offers: ['*'], needs: ['*']}] , filter: this.filter, limit: -1 }));
|
||||
} catch (error: any) {
|
||||
console.log(error);
|
||||
if (error.errors[0]?.message)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user