Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

fix: default route and conventions for route screens #976

Merged
merged 3 commits into from
Feb 2, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: make PR requested changes
spaenleh committed Feb 2, 2024
commit 63a874bfb0cda03dd0d6e4a9294cb6c8d8497172
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
"@graasp/query-client": "2.4.1",
"@graasp/sdk": "3.4.1",
"@graasp/translations": "1.22.1",
"@graasp/ui": "github:graasp/graasp-ui#fix-missing-flex",
"@graasp/ui": "4.5.1",
"@mui/icons-material": "5.14.19",
"@mui/lab": "5.0.0-alpha.151",
"@mui/material": "5.14.19",
2 changes: 1 addition & 1 deletion src/components/Root.tsx
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ const Root = (): JSX.Element => (
<I18nextProvider i18n={i18nConfig}>
<ThemeProvider theme={GraaspTheme}>
<CssBaseline />
{true && <ToastContainer position="bottom-right" theme="colored" />}
<ToastContainer position="bottom-right" theme="colored" />
<Router>
<ModalProviders>
<CurrentUserContextProvider>
14 changes: 0 additions & 14 deletions src/components/context/LayoutContext.tsx
Original file line number Diff line number Diff line change
@@ -10,8 +10,6 @@ interface LayoutContextInterface {
setMode: (mode: string) => void;
editingItemId: string | null;
setEditingItemId: (itemId: string | null) => void;
// isMainMenuOpen?: boolean;
// setIsMainMenuOpen: (isOpen: boolean) => void;
openedActionTabId: string | null;
setOpenedActionTabId: (action: string | null) => void;
isItemMetadataMenuOpen: boolean;
@@ -31,10 +29,6 @@ export const LayoutContext = createContext<LayoutContextInterface>({
setEditingItemId: () => {
// do nothing
},
// isMainMenuOpen: true,
// setIsMainMenuOpen: () => {
// // do nothing
// },
openedActionTabId: null,
setOpenedActionTabId: () => {
// do nothing
@@ -71,7 +65,6 @@ export const LayoutContextProvider = ({
null,
);

// const [isMainMenuOpen, setIsMainMenuOpen] = useState<boolean>();
const [isItemSharingOpen, setIsItemSharingOpen] = useState(true);

const [isItemMetadataMenuOpen, setIsItemMetadataMenuOpen] = useState(false);
@@ -86,12 +79,6 @@ export const LayoutContextProvider = ({
setMode,
editingItemId,
setEditingItemId,
// isMainMenuOpen,
// setIsMainMenuOpen: (state: boolean) => {
// // eslint-disable-next-line no-console
// console.log('toggling main menu to ', state);
// setIsMainMenuOpen(state);
// },
openedActionTabId,
setOpenedActionTabId,
isItemMetadataMenuOpen,
@@ -105,7 +92,6 @@ export const LayoutContextProvider = ({
editingItemId,
isChatboxMenuOpen,
isItemMetadataMenuOpen,
// isMainMenuOpen,
mode,
openedActionTabId,
isItemSharingOpen,
1 change: 0 additions & 1 deletion src/components/file/FileUploader.tsx
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@ const StyledContainer = styled(Box)(({ theme }) => ({
left: 0,
right: 0,

// width: '100%',
boxSizing: 'border-box',

// show above drawer
6 changes: 2 additions & 4 deletions src/components/main/Main.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from 'react-router-dom';
import { Link, useParams } from 'react-router-dom';

import { Stack, styled } from '@mui/material';

@@ -9,7 +9,6 @@ import {
PlatformSwitch,
defaultHostsMapper,
usePlatformNavigation,
useShortenURLParams,
} from '@graasp/ui';

import { HOST_MAP } from '@/config/externalPaths';
@@ -47,10 +46,9 @@ export const platformsHostsMap = defaultHostsMapper({
type Props = { children: JSX.Element | (JSX.Element & string) };

const Main = ({ children }: Props): JSX.Element => {
// const { isMainMenuOpen } = useLayoutContext();
const { t } = useBuilderTranslation();

const itemId = useShortenURLParams(ITEM_ID_PARAMS);
const itemId = useParams()[ITEM_ID_PARAMS];

const getNavigationEvents = usePlatformNavigation(platformsHostsMap, itemId);
const platformProps = {
2 changes: 1 addition & 1 deletion src/config/queryClient.ts
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ const {
enableWebsocket: true,
defaultQueryOptions: {
keepPreviousData: true,
refetchOnMount: true,
refetchOnMount: false,
},
DOMAIN,
});
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -1315,9 +1315,9 @@ __metadata:
languageName: node
linkType: hard

"@graasp/ui@github:graasp/graasp-ui#fix-missing-flex":
version: 4.5.0
resolution: "@graasp/ui@https://github.com/graasp/graasp-ui.git#commit=b9d708e323975a323f261313185112795da1c99c"
"@graasp/ui@npm:4.5.1":
version: 4.5.1
resolution: "@graasp/ui@npm:4.5.1"
dependencies:
"@graasp/sdk": "npm:3.5.0"
http-status-codes: "npm:2.3.0"
@@ -1351,7 +1351,7 @@ __metadata:
optional: true
ag-grid-react:
optional: true
checksum: aebd5cf2e8a308f9222ad54c82c0702333f239183dfee2ca2bf95943c54207517b0e72a70cc0135f89c7cf0ff71dc65a3c8f28de1ad67e10690d08a4c68054d1
checksum: 659135ea821492202155706c4ae6c0effda5aa862ae302c9b056c3220476bc1d4042d2a25ed6d3f808f061370c8f2b970b81de1db88fb9dd9f3ab71712640db4
languageName: node
linkType: hard

@@ -6341,7 +6341,7 @@ __metadata:
"@graasp/query-client": "npm:2.4.1"
"@graasp/sdk": "npm:3.4.1"
"@graasp/translations": "npm:1.22.1"
"@graasp/ui": "github:graasp/graasp-ui#fix-missing-flex"
"@graasp/ui": "npm:4.5.1"
"@mui/icons-material": "npm:5.14.19"
"@mui/lab": "npm:5.0.0-alpha.151"
"@mui/material": "npm:5.14.19"