sr2/link-stack
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Label studio & sidebar & mobile fixes

Browse source
This commit is contained in:
Darren Clarke 2023-09-12 14:33:37 +02:00
parent 9e68be7225
commit 7071f0c64a
18 changed files with 652 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/link/app/(main)/_components/Sidebar.tsx
View file

@ -315,7 +315,19 @@ export const Sidebar: FC<SidebarProps> = ({ open, setOpen }) => {
sx={{ height: "0.5px", width: "100%", backgroundColor: "#666" }}
/>
</Grid>
<Grid item container direction="column" sx={{ mt: "6px" }} flexGrow={1}>
<Grid
item
container
direction="column"
sx={{
mt: "6px",
overflow: "scroll",
scrollbarWidth: "none",
msOverflowStyle: "none",
"&::-webkit-scrollbar": { display: "none" },
}}
flexGrow={1}
>
<List
component="nav"
sx={{

2
apps/link/app/(main)/admin/label-studio/_components/LabelStudioWrapper.tsx
View file

@ -14,7 +14,7 @@ export const LabelStudioWrapper: FC = () => (
<Grid item sx={{ height: "100vh", width: "100%" }}>
<Iframe
id="label-studio"
url={"/proxy/label-studio"}
url={"/label-studio"}
width="100%"
height="100%"
frameBorder={0}

3
apps/link/middleware.ts
View file

@ -24,7 +24,6 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
const { token } = request.nextauth;
const headers = { 'X-Forwarded-User': token?.email?.toLowerCase() };
console.log(request.nextUrl);
if (request.nextUrl.pathname.startsWith('/metamigo')) {
return rewriteURL(request, `${linkBaseURL}/metamigo`, metamigoURL);
} else if (request.nextUrl.pathname.startsWith('/label-studio')) {
@ -35,7 +34,7 @@ const checkRewrites = async (request: NextRequestWithAuth) => {
return rewriteURL(request, linkBaseURL, zammadURL, headers);
} else if (request.nextUrl.pathname.startsWith('/proxy/api') || request.nextUrl.pathname.startsWith('/proxy/assets')) {
return rewriteURL(request, `${linkBaseURL}/proxy`, zammadURL);
} else if (request.nextUrl.pathname.startsWith('/api/v1') || request.nextUrl.pathname.startsWith('/auth/sso')) {
} else if (request.nextUrl.pathname.startsWith('/api/v1') || request.nextUrl.pathname.startsWith('/auth/sso') || request.nextUrl.pathname.startsWith('/mobile')) {
return rewriteURL(request, linkBaseURL, zammadURL, headers);
}

24
apps/link/package.json
View file

@ -15,14 +15,14 @@
"@emotion/react": "^11.11.1",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@fontsource/playfair-display": "^5.0.11",
"@fontsource/playfair-display": "^5.0.12",
"@fontsource/poppins": "^5.0.8",
"@fontsource/roboto": "^5.0.8",
"@mui/icons-material": "^5",
"@mui/lab": "^5.0.0-alpha.143",
"@mui/material": "^5",
"@mui/x-data-grid-pro": "^6.12.1",
"@mui/x-date-pickers-pro": "^6.12.1",
"@mui/x-data-grid-pro": "^6.13.0",
"@mui/x-date-pickers-pro": "^6.13.0",
"cryptr": "^6.3.0",
"date-fns": "^2.30.0",
"graphql-request": "^6.1.0",
@ -31,14 +31,14 @@
"mui-chips-input": "^2.1.3",
"next": "13.4.19",
"next-auth": "^4.23.1",
"ra-data-graphql": "^4.13.0",
"ra-i18n-polyglot": "^4.13.3",
"ra-input-rich-text": "^4.13.3",
"ra-language-english": "^4.13.3",
"ra-data-graphql": "^4.14.0",
"ra-i18n-polyglot": "^4.14.0",
"ra-input-rich-text": "^4.14.0",
"ra-language-english": "^4.14.0",
"ra-postgraphile": "^6.1.1",
"react": "18.2.0",
"react-admin": "^4.13.3",
"react-cookie": "^6.1.0",
"react-admin": "^4.14.0",
"react-cookie": "^6.1.1",
"react-digit-input": "^2.1.0",
"react-dom": "18.2.0",
"react-iframe": "^1.8.5",
@ -51,12 +51,12 @@
"twilio-client": "^1.15.0"
},
"devDependencies": {
"@babel/core": "^7.22.15",
"@types/node": "^20.5.9",
"@babel/core": "^7.22.17",
"@types/node": "^20.6.0",
"@types/react": "18.2.21",
"@types/uuid": "^9.0.3",
"babel-loader": "^9.1.3",
"eslint": "^8.48.0",
"eslint": "^8.49.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-next": "^13.4.19",
"eslint-config-prettier": "^9.0.0",