Merge pull request #1554 from Monilprajapati/2.0.0

New App page

frontend/src/App.jsx

@@ -14,6 +14,7 @@ import HealthPage from "./components/HealthPage.jsx";
 //import Header from "./components/Header.jsx";
 import theme from "./theme";
 import Apps from "./views/Apps";
+import Apps2 from "./views/Apps2.jsx";
 import AppCreator from "./views/AppCreator";
 import DetectionDashBoard from "./views/DetectionDashboard.jsx";
 
@@ -408,6 +409,23 @@ const App = (message, props) => {
 					{...props}
 				/>
         	  }
+        	/>
+			<Route
+        	  exact
+        	  path="/apps2"
+        	  element={
+				<Apps2
+					serverside={false} 
+					isLoaded={isLoaded} 
+					isLoggedIn={isLoggedIn}
+					checkLogin={checkLogin}
+					userdata={userdata} 
+					globalUrl={globalUrl} 
+					surfaceColor={theme.palette.surfaceColor} 
+					inputColor={theme.palette.inputColor} 
+					{...props} 
+				/>
+        	  }
         	/>
         	<Route
         	  exact

frontend/src/components/AppSelection.jsx

@@ -47,6 +47,7 @@ const AppSelection = props => {
         defaultSearch,
         setDefaultSearch,
         checkLogin,
+		isAppPage=false
 
     } = props;
     const [discoveryData, setDiscoveryData] = React.useState({})
@@ -507,26 +508,31 @@ const AppSelection = props => {
             	        })}
             	    </Grid>
             	</div>
-            	{!moreButton ? (
-            	    <div style={{ width: "100%", marginLeft: isMobile ? 80 : 200, marginBottom: 20, textAlign: isMobile ? "center" : null }}>
-            	        <Link style={{ color: "#FF8444" }} onClick={() => {
+            	{
+					!isAppPage && (
+						<>
+						{!moreButton ? (
+            	    	<div style={{ width: "100%", marginLeft: isMobile ? 80 : 200, marginBottom: 20, textAlign: isMobile ? "center" : null }}>
+            	        	<Link style={{ color: "#FF8444" }} onClick={() => {
             	            setMoreButton(true)
-
             	            setTimeout(() => {
             	                navigate("/welcome?tab=2")
             	            }, 250)
             	        }}
             	        >See More Apps</Link>
-            	    </div>) : ""}
+            	    	</div>) : ""}
 
-            	<div style={{ flexDirection: "row", width: isMobile ? 340 : null, textAlign: isMobile ? "center" : null }}>
-            	    <Button variant="contained" type="submit" fullWidth style={bottomButtonStyle} onClick={() => {
-            	        navigate("/usecases2")
-            	        setActiveStep(2)
-            	    }}>
-						See usecases
-            	    </Button>
-            	</div>
+            			<div style={{ flexDirection: "row", width: isMobile ? 340 : null, textAlign: isMobile ? "center" : null }}>
+            	    	<Button variant="contained" type="submit" fullWidth style={bottomButtonStyle} onClick={() => {
+            	      	  	navigate("/usecases2")
+            	        	setActiveStep(2)
+            	    	}}>
+							See usecases
+            	    	</Button>
+            			</div>
+						</>
+					)
+				}
 			</div>
         </Fade>
     )