Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #PS-2322 fix: Workspace UI improvements and Fixes #92

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Issue #PS-2322 fix: Workspace UI improvements and Fixes #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"lint": "next lint"
},
"dependencies": {
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@module-federation/nextjs-mf": "^8.5.5",
"@module-federation/utilities": "3.0.11",
"@mui/icons-material": "^5.15.20",
"@mui/material": "^5.16.0",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.15",
"@mui/material": "^5.15.21",
"@project-sunbird/sunbird-collection-editor-web-component": "^1.6.0",
"async": "^3.2.5",
"body-parser": "^1.20.2",
Expand Down Expand Up @@ -55,4 +55,4 @@
"typescript": "^5.6.2",
"webpack": "^5.76.2"
}
}
}
4 changes: 2 additions & 2 deletions src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ interface LayoutProps {

const Layout: React.FC<LayoutProps> = ({ children, selectedKey, onSelect }) => {
return (
<Box display="flex" minHeight={"100vh"}>
<Box display="flex" sx={{ overflowX: 'hidden !important' }} minHeight={"100vh"}>
<Box sx={{ height: '100vh', '@media (max-width: 900px)': { position: 'absolute' }, '@media (min-width: 900px)': { background: '#fff' } }}>
<Sidebar selectedKey={selectedKey} onSelect={onSelect} />
</Box>
<Box sx={{ flex: 1, background: 'rgb(243, 245, 248)' }}>{children}</Box>
<Box sx={{ flex: 1, background: 'rgb(243, 245, 248)', '@media (min-width: 900px)': { width: 'calc(100% - 251px)', }, width: '100%' }}>{children}</Box>
</Box>
);
};
Expand Down
8 changes: 4 additions & 4 deletions src/pages/workspace/content/allContents/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import { DataType } from 'ka-table/enums';
import "ka-table/style.css";
import KaTableComponent from "@/components/KaTableComponent";
const columns = [
{ key: 'name', title: 'Content', dataType: DataType.String },
{ key: 'lastUpdatedOn', title: 'Last Updated', dataType: DataType.String },
{ key: 'status', title: 'Status', dataType: DataType.String },
{ key: 'contentAction', title: 'Action', dataType: DataType.String },
{ key: 'name', title: 'Content', dataType: DataType.String, width: "450px" },
{ key: 'lastUpdatedOn', title: 'Last Updated', dataType: DataType.String, width: "300px" },
{ key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
{ key: 'contentAction', title: 'Action', dataType: DataType.String, width: "200px" },

]
const AllContentsPage = () => {
Expand Down
10 changes: 5 additions & 5 deletions src/pages/workspace/content/draft/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import Paper from '@mui/material/Paper';
import { timeAgo } from "@/utils/Helper";

const columns = [
{ key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, },
{ key: 'contentType', title: 'Content Type', dataType: DataType.String, },
{ key: 'status', title: 'Status', dataType: DataType.String, },
{ key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, },
{ key: 'action', title: 'Action', dataType: DataType.String, },
{ key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, width: "450px" },
{ key: 'contentType', title: 'Content Type', dataType: DataType.String, width: "300px" },
{ key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
{ key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, width: "300px" },
{ key: 'action', title: 'Action', dataType: DataType.String, width: "200px" },


]
Expand Down
10 changes: 5 additions & 5 deletions src/pages/workspace/content/publish/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import KaTableComponent from "@/components/KaTableComponent";
import { timeAgo } from "@/utils/Helper";

const columns = [
{ key: 'title_and_description', title: 'Title & Description', dataType: DataType.String },
{ key: 'contentType', title: 'Content Type', dataType: DataType.String },
{ key: 'status', title: 'Status', dataType: DataType.String },
{ key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String },
{ key: 'action', title: 'Action', dataType: DataType.String },
{ key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, width: "450px" },
{ key: 'contentType', title: 'Content Type', dataType: DataType.String, width: "300px" },
{ key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
{ key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, width: "300px" },
{ key: 'action', title: 'Action', dataType: DataType.String, width: "200px" },


]
Expand Down
10 changes: 5 additions & 5 deletions src/pages/workspace/content/submitted/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import { DataType } from 'ka-table/enums';
import KaTableComponent from "@/components/KaTableComponent";
import { timeAgo } from "@/utils/Helper";
const columns = [
{ key: 'title_and_description', title: 'Title & Description', dataType: DataType.String },
{ key: 'contentType', title: 'Content Type', dataType: DataType.String },
{ key: 'status', title: 'Status', dataType: DataType.String },
{ key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String },
{ key: 'action', title: 'Action', dataType: DataType.String },
{ key: 'title_and_description', title: 'Title & Description', dataType: DataType.String, width: "450px" },
{ key: 'contentType', title: 'Content Type', dataType: DataType.String, width: "300px" },
{ key: 'status', title: 'Status', dataType: DataType.String, width: "300px" },
{ key: 'lastUpdatedOn', title: 'Last Modified', dataType: DataType.String, width: "300px" },
{ key: 'action', title: 'Action', dataType: DataType.String, width: "200px" },


]
Expand Down