Merge pull request #745 from NSUWAL123/create-project-tags

Create project tags
hotosm · Aug 22, 2023 · b1a3741 · b1a3741
2 parents 2ad187c + 2d4604d
commit b1a3741
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/frontend/main/src/views/CreateOrganization.tsx b/src/frontend/main/src/views/CreateOrganization.tsx
@@ -61,7 +61,8 @@ const CreateOrganizationForm = () => {
       </CoreModules.Box>
       <CoreModules.Box
         sx={{
-          width: 600,
+          width: '85%',
+          maxWidth: 600,
           padding: 3,
           cursor: 'pointer',
           background: '#ffff',

diff --git a/src/frontend/main/src/views/MainView.jsx b/src/frontend/main/src/views/MainView.jsx
@@ -6,9 +6,11 @@ import CustomizedSnackbars from '../utilities/CustomizedSnackbar';
 import { CommonActions } from '../store/slices/CommonSlice';
 import Loader from '../utilities/AppLoader';
 import MappingHeader from '../utilities/MappingHeader';
+import { useSearchParams } from 'react-router-dom';
 
 const MainView = () => {
   const dispatch = CoreModules.useAppDispatch();
+  const [searchParams, setSearchParams] = useSearchParams();
   const { windowSize } = windowDimention();
   const checkTheme = CoreModules.useAppSelector((state) => state.theme.hotTheme);
   const theme = CoreModules.createTheme(checkTheme);
@@ -26,6 +28,9 @@ const MainView = () => {
       }),
     );
   };
+
+  const popupInParams = searchParams.get('popup');
+
   return (
     <CoreModules.ThemeProvider theme={theme}>
       <CustomizedSnackbars
@@ -40,11 +45,15 @@ const MainView = () => {
       <CoreModules.Paper>
         <CoreModules.Container disableGutters={true} maxWidth={false}>
           <CoreModules.Stack sx={{ height: '100vh' }}>
-            <MappingHeader />
-            <PrimaryAppBar />
+            {popupInParams !== 'true' && (
+              <div>
+                <MappingHeader />
+                <PrimaryAppBar />
+              </div>
+            )}
             <CoreModules.Stack
               className="mainview"
-              sx={{ height: windowSize.width <= 599 ? '90vh' : '92vh', overflow: 'auto' }}
+              sx={{ height: popupInParams ? '100vh' : windowSize.width <= 599 ? '90vh' : '92vh', overflow: 'auto' }}
             >
               <CoreModules.Outlet />
               {/* Footer */}