Merge branch 'release-1.0.0' of github.com:tekdi/shiksha-workspace in…

…to page-issue
tekdi · Nov 22, 2024 · 5c01677 · 5c01677
2 parents 36f77df + 4dfc68b
commit 5c01677
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/.github/workflows/dev-deployment.yaml b/.github/workflows/dev-deployment.yaml
@@ -31,7 +31,7 @@ jobs:
       env:
        ENV_FILE_CONTENT: ${{ secrets.ENV_FILE_CONTENT_DEV }}
       run: printf "%s" "$ENV_FILE_CONTENT" > manifest/configmap.yaml 
-      #echo "$ENV_FILE_CONTENT" > manifest/configmap.yaml
+      # run: echo "$ENV_FILE_CONTENT" > manifest/configmap.yaml
     - name: Show PWD and list content and Latest 3 commits 
       run: |
            echo "Fetching all branches to ensure complete history"

diff --git a/src/components/GenericEditor.tsx b/src/components/GenericEditor.tsx
@@ -138,7 +138,7 @@ const GenericEditor: React.FC = () => {
         if (typeof window !== 'undefined') {
             window['config'] = _.cloneDeep(editorConfig.GENERIC_EDITOR.WINDOW_CONFIG);
             window['config'].build_number = buildNumber;
-            window['config'].headerLogo = 'https://staging.sunbirded.org/assets/images/sunbird_logo.png';
+            window['config'].headerLogo = '/logo.png';
             window['config'].lock = {};
             window['config'].extContWhitelistedDomains = extContWhitelistedDomains;
             window['config'].enableTelemetryValidation = false;

diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
@@ -11,12 +11,12 @@ interface LayoutProps {
 const Layout: React.FC<LayoutProps> = ({ children, selectedKey, onSelect }) => {
   return (
     <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' } }}>
+      <Box sx={{ height: '100vh', '@media (max-width: 900px)': { position: 'absolute' }, '@media (min-width: 900px)': { background: "linear-gradient(to bottom, white, #F8EFDA)" } }}>
         <Sidebar selectedKey={selectedKey} onSelect={onSelect} />
       </Box>
-      <Box sx={{ flex: 1, background: 'rgb(243, 245, 248)', '@media (min-width: 900px)': { width: 'calc(100% - 251px)', }, width: '100%' }}>{children}</Box>
+      <Box sx={{ flex: 1, background: '#fff', '@media (min-width: 900px)': { width: 'calc(100% - 251px)', }, width: '100%' }}>{children}</Box>
     </Box>
-  );
+  )
 };
 
 export default Layout;
diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
@@ -35,7 +35,7 @@ const menuItems = [
   ...(userRole === Role.CCTA
     ? [{ text: "Up for Review", key: "up-review", icon: <PreviewOutlinedIcon /> }]
     : []),
-  { text: "Publish", key: "publish", icon: <OutlinedFlagOutlinedIcon /> },
+  { text: "Published", key: "publish", icon: <OutlinedFlagOutlinedIcon /> },
   { text: "All My Contents", key: "allContents", icon: <AppsOutlinedIcon /> },
 ];
 
@@ -77,7 +77,19 @@ const Sidebar: React.FC<SidebarProps> = ({ selectedKey, onSelect }) => {
   }};
 
   const drawerContent = (
-    <Box display={'inline-block'} margin={"1rem 0.5rem 0.5rem 0.5rem"} width={"250px"} height={"100%"} sx={{ fontSize: '14px', }}>
+    <Box
+      display="inline-block"
+      padding="1rem 0.5rem 0.5rem"
+      width="275px"
+      height="100%"
+      sx={{
+        fontSize: '16px',
+        '@media (max-width: 900px)': {
+          background: 'linear-gradient(to bottom, white, #F8EFDA)',
+          fontSize: '12px',
+        },
+      }}
+    >
       <Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
         <img src={'/logo.png'} alt="logo" height={60} />
       </Box>
@@ -96,8 +108,8 @@ const Sidebar: React.FC<SidebarProps> = ({ selectedKey, onSelect }) => {
           </ListItemIcon>
           <Typography
             variant="h2"
-            fontSize={"14px"}
-            sx={{ color: theme.palette.warning["100"] }}
+            fontSize={"16px"}
+            sx={{ color: theme.palette.warning["100"], fontWeight: 500 }}
           >
             Back to Main Page
           </Typography>
@@ -121,10 +133,9 @@ const Sidebar: React.FC<SidebarProps> = ({ selectedKey, onSelect }) => {
                 selectedKey === item.key
                   ? "var(--mui-palette-primary-main)"
                   : "transparent",
-              color:
-                selectedKey === item.key
-                  ? "#2E1500"
-                  : theme.palette.warning.A200,
+              color: "#000",
+
+                  fontSize: '16px !important' ,
 
               "&:hover": {
                 background:
@@ -144,13 +155,13 @@ const Sidebar: React.FC<SidebarProps> = ({ selectedKey, onSelect }) => {
                     ? "#2E1500"
                     : theme.palette.warning.A200,
                 minWidth: '40px',
-                fontWeight: selectedKey === item?.key ? '600' : 'normal',
-                fontSize: '14px !important'
+                fontWeight: selectedKey === item?.key ? '500' : '500',
+                fontSize: '16px !important'
               }}
             >
               {item?.icon}
             </ListItemIcon>
-            <ListItemText primaryTypographyProps={{ fontSize: '14px', fontWeight: selectedKey === item?.key ? '600' : 'normal' }} primary={item?.text} />
+            <ListItemText className="menu-list-content" primaryTypographyProps={{ fontSize: '16px', fontWeight: selectedKey === item?.key ? '600' : 'normal' }} primary={item?.text} />
           </ListItemButton>
         ))}
       </List>
@@ -166,6 +177,10 @@ const Sidebar: React.FC<SidebarProps> = ({ selectedKey, onSelect }) => {
 
           <Drawer
             anchor="left"
+            sx={{
+              width: "275px",
+              // background: "linear-gradient(to bottom, white, #F8EFDA)",
+            }}
             open={drawerOpen}
             onClose={toggleDrawer}
             ModalProps={{
@@ -180,11 +195,8 @@ const Sidebar: React.FC<SidebarProps> = ({ selectedKey, onSelect }) => {
           sx={{
             display: "flex",
             justifyContent: "flex-start",
-            width: 250,
-            // height: "100vh",
-            bgcolor: theme.palette.background.paper,
-            borderRight: 1,
-            borderColor: theme.palette.divider,
+            width: 275,
+
           }}
         >
           {drawerContent}

diff --git a/src/pages/workspace/content/create/index.tsx b/src/pages/workspace/content/create/index.tsx
@@ -108,7 +108,7 @@ const CreatePage = () => {
       {/* Outer box for "Create new content" heading and cards */}
       <Box
         sx={{
-          backgroundColor: "#F7F2FA",
+          backgroundColor: "#F8EFE7",
           padding: "1.5rem",
           borderRadius: "12px",
           boxShadow: theme.shadows[3],

diff --git a/src/styles/global.css b/src/styles/global.css
@@ -23,18 +23,6 @@ body {
   font-family: Poppins, sans-serif !important;
 }
 
-.drawer-select div div {
-  display: flex !important;
-  align-items: center;
-  height: 32px !important;
-  padding: 0 10px !important;
-  font-weight: 500 !important;
-  font-size: 14px !important;
-
-  /* border: 1px solid #1f1b13 !important; */
-  border-radius: 8px !important;
-}
-
 .ka-thead-cell {
   font-weight: 600;
 }