working on resetting everything up with updated versions
This commit is contained in:
24564
frontend/package-lock.json
generated
24564
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,33 +3,32 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@emotion/cache": "^11.9.3",
|
||||
"@emotion/react": "^11.9.3",
|
||||
"@emotion/serialize": "^1.0.4",
|
||||
"@emotion/utils": "^1.1.0",
|
||||
"@mantine/core": "^5.0.0",
|
||||
"@mantine/dates": "^5.0.0",
|
||||
"@mantine/dropzone": "^5.0.0",
|
||||
"@mantine/form": "^5.0.0",
|
||||
"@mantine/hooks": "^5.0.0",
|
||||
"@mantine/notifications": "^5.0.0",
|
||||
"@tabler/icons": "^1.78.1",
|
||||
"@testing-library/jest-dom": "^5.16.4",
|
||||
"@testing-library/react": "^12.1.5",
|
||||
"@testing-library/user-event": "^13.5.0",
|
||||
"@emotion/cache": "^11.10.5",
|
||||
"@emotion/react": "^11.10.5",
|
||||
"@emotion/serialize": "^1.1.1",
|
||||
"@emotion/utils": "^1.2.0",
|
||||
"@mantine/core": "^5.10.0",
|
||||
"@mantine/dates": "^5.10.0",
|
||||
"@mantine/dropzone": "^5.10.0",
|
||||
"@mantine/form": "^5.10.0",
|
||||
"@mantine/hooks": "^5.10.0",
|
||||
"@mantine/notifications": "^5.10.0",
|
||||
"@tabler/icons": "^1.119.0",
|
||||
"@testing-library/jest-dom": "^5.16.5",
|
||||
"@testing-library/react": "^13.4.0",
|
||||
"@testing-library/user-event": "^14.4.3",
|
||||
"base-64": "^1.0.0",
|
||||
"dayjs": "^1.11.4",
|
||||
"jotai": "^1.7.6",
|
||||
"npm-check-updates": "^12.5.12",
|
||||
"react": "^17.0.2",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-icons": "^4.4.0",
|
||||
"react-jss": "^10.9.1",
|
||||
"react-router": "^6.3.0",
|
||||
"react-router-dom": "^6.3.0",
|
||||
"react-scripts": "5.0.0",
|
||||
"tabler-icons": "^1.35.0",
|
||||
"web-vitals": "^2.1.4"
|
||||
"dayjs": "^1.11.7",
|
||||
"jotai": "^1.12.1",
|
||||
"npm-check-updates": "^16.6.2",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-icons": "^4.7.1",
|
||||
"react-jss": "^10.9.2",
|
||||
"react-router": "^6.6.2",
|
||||
"react-router-dom": "^6.6.2",
|
||||
"react-scripts": "5.0.1",
|
||||
"web-vitals": "^3.1.0"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
|
@@ -12,7 +12,7 @@ import { showNotification } from '@mantine/notifications';
|
||||
|
||||
import { backendAPI, defaultURLS } from './services/backend-api';
|
||||
|
||||
import { serverConfigAtom } from './state/main'
|
||||
import { serverConfigAtom } from './state/state'
|
||||
|
||||
|
||||
import SideBar from './components/SideBar';
|
||||
|
11
frontend/src/Notifications.js
Normal file
11
frontend/src/Notifications.js
Normal file
@@ -0,0 +1,11 @@
|
||||
|
||||
|
||||
function Notifications() {
|
||||
|
||||
|
||||
return(
|
||||
<></>
|
||||
)
|
||||
}
|
||||
|
||||
export default Notifications;
|
@@ -2,7 +2,7 @@ import React, {useState, useEffect, useContext } from 'react';
|
||||
import { useAtom } from 'jotai';
|
||||
import { Header, MediaQuery, Burger, Text, ThemeIcon, Group, Title, createStyles, useMantineTheme } from '@mantine/core';
|
||||
import { BsHouseDoor } from 'react-icons/bs'
|
||||
import { menuOpenedAtom } from '../state/main';
|
||||
import { menuOpenedAtom } from '../state/state';
|
||||
|
||||
|
||||
function AppHeader(props) {
|
||||
|
@@ -2,7 +2,7 @@ import React from 'react';
|
||||
import { Text, Button, Card, Group, Menu, Image, Badge } from '@mantine/core'
|
||||
import { useAtom } from 'jotai';
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { activePageAtom, roomFilterAtom, serverConfigAtom } from '../../state/main';
|
||||
import { activePageAtom, roomFilterAtom, serverConfigAtom } from '../../state/state';
|
||||
import { Link } from 'react-router-dom';
|
||||
|
||||
|
||||
|
@@ -2,7 +2,7 @@ import React from 'react';
|
||||
import { Text, Button, Card, Group, Menu, Image, Badge } from '@mantine/core'
|
||||
import { useAtom } from 'jotai';
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { activePageAtom, roomFilterAtom, serverConfigAtom } from '../../state/main';
|
||||
import { activePageAtom, roomFilterAtom, serverConfigAtom } from '../../state/state';
|
||||
|
||||
|
||||
|
||||
|
@@ -4,7 +4,7 @@ import { DatePicker } from '@mantine/dates';
|
||||
import dayjs from 'dayjs';
|
||||
import { useForm } from '@mantine/form';
|
||||
import { useAtom } from 'jotai';
|
||||
import { serverConfigAtom } from '../../state/main'
|
||||
import { serverConfigAtom } from '../../state/state'
|
||||
import { backendAPI } from '../../services/backend-api';
|
||||
import { IMAGE_MIME_TYPE } from '@mantine/dropzone';
|
||||
import CustomDropZone from '../CustomDropZone';
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import React, {useState, useEffect, useContext, createContext} from 'react';
|
||||
import { Text, Title, ThemeIcon, Group, Container, Space } from '@mantine/core'
|
||||
import { useAtom } from 'jotai';
|
||||
import { serverConfigAtom } from '../../state/main'
|
||||
import { serverConfigAtom } from '../../state/state'
|
||||
import { GoLocation } from 'react-icons/go'
|
||||
import { BsDoorClosed, BsDiagram2 } from 'react-icons/bs'
|
||||
import { useNotifications } from '@mantine/notifications';
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import React, {useState, useEffect } from 'react';
|
||||
import { useAtom } from 'jotai'
|
||||
import { serverConfigAtom } from '../../state/main';
|
||||
import { serverConfigAtom } from '../../state/state';
|
||||
import { Loader, Center, Title, Group, Button, Space, Container, ThemeIcon, Text, Image } from '@mantine/core'
|
||||
import { useNavigate, useLocation, useParams } from "react-router-dom";
|
||||
import { useNotifications } from '@mantine/notifications';
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import React, {useState, useEffect } from 'react';
|
||||
import { useAtom } from 'jotai'
|
||||
import { serverConfigAtom } from '../../state/main';
|
||||
import { serverConfigAtom } from '../../state/state';
|
||||
import { HiPlus } from 'react-icons/hi'
|
||||
import { Loader, Center, SimpleGrid, Title, Group, Button } from '@mantine/core'
|
||||
import { useNavigate } from "react-router-dom";
|
||||
|
@@ -1,6 +1,6 @@
|
||||
import React, {useState, useEffect, useContext, createContext} from 'react';
|
||||
import { useAtom } from 'jotai'
|
||||
import { roomFilterAtom, serverConfigAtom } from '../../state/main';
|
||||
import { roomFilterAtom, serverConfigAtom } from '../../state/state';
|
||||
import { Text, Loader, Center, Card, Image, Badge, Button, SimpleGrid, Group, Title, ActionIcon } from '@mantine/core'
|
||||
import { useLocation } from "react-router-dom";
|
||||
import { useNotifications } from '@mantine/notifications';
|
||||
|
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
|
||||
import App from './App';
|
||||
import reportWebVitals from './reportWebVitals';
|
||||
import { NotificationsProvider } from '@mantine/notifications';
|
||||
import { Notifications } from './Notifications.js'
|
||||
|
||||
//setup api
|
||||
//const backendPort = process.env.REACT_APP_BACKEND_PORT
|
||||
@@ -11,6 +12,7 @@ import { NotificationsProvider } from '@mantine/notifications';
|
||||
ReactDOM.render(
|
||||
<React.StrictMode>
|
||||
<NotificationsProvider>
|
||||
<Notifications />
|
||||
<App />
|
||||
</NotificationsProvider>
|
||||
</React.StrictMode>,
|
||||
|
@@ -1,14 +1,19 @@
|
||||
import { atom } from 'jotai'
|
||||
|
||||
|
||||
export const serverConfigAtom = atom({})
|
||||
|
||||
// Size and menu handling
|
||||
export const menuOpenedAtom = atom(false)
|
||||
|
||||
// Pages state
|
||||
export const activePageAtom = atom({})
|
||||
|
||||
// Filters for all pages to pass back and forth
|
||||
export const locationFilterAtom = atom({})
|
||||
export const roomFilterAtom = atom({})
|
||||
import { atom } from 'jotai'
|
||||
import { atomWithReset } from 'jotai/utils'
|
||||
|
||||
|
||||
export const serverConfigAtom = atom({})
|
||||
|
||||
// Size and menu handling
|
||||
export const menuOpenedAtom = atom(false)
|
||||
|
||||
// Pages state
|
||||
export const activePageAtom = atom({})
|
||||
|
||||
// Filters for all pages to pass back and forth
|
||||
export const locationFilterAtom = atom({})
|
||||
export const roomFilterAtom = atom({})
|
||||
|
||||
// Notification history and notification stack
|
||||
export const notificationHistory = atom([])
|
||||
export const notifications = atomWithReset([])
|
Reference in New Issue
Block a user