From 7c641b918ecb9ec01e46d9a978c6b8edcb0cfaaf Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Wed, 24 Nov 2021 18:57:01 +0100
Subject: [PATCH] Fixed issues in app creator

---
 frontend/src/views/AppCreator.jsx | 95 +++++++++++++++++++------------
 1 file changed, 58 insertions(+), 37 deletions(-)

diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 0b547224..2d50122c 100644
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -2194,7 +2194,7 @@ const AppCreator = (props) => {
   const extraKeys = (
     <div style={{ marginTop: 50 }}>
       <div style={{ display: "flex" }}>
-        <Typography variant="body1">Extra configuration items</Typography>
+        <Typography variant="body1">Extra authentication</Typography>
         {extraAuth.length === 0 ? (
           <Button
             color="primary"
@@ -3119,6 +3119,15 @@ const AppCreator = (props) => {
     <Dialog
       open={actionsModalOpen}
       fullWidth
+			PaperProps={{
+        style: {
+          backgroundColor: surfaceColor,
+          color: "white",
+          minWidth: 500,
+          maxWidth: 500,
+					maxHeight: 800,
+        },
+      }}
       onClose={() => {
         setUrlPath("");
         setCurrentAction({
@@ -3430,6 +3439,14 @@ const AppCreator = (props) => {
                 }
               }
 
+							if (baseUrl !== undefined && baseUrl !== null && parsedurl.startsWith(baseUrl)) {
+      					parsedurl = parsedurl.replaceAll(baseUrl, "");
+							}
+
+							if (parsedurl.includes("?")) {
+								parsedurl = parsedurl.split("?")[0]
+							}
+
               if (event.target.value !== parsedurl) {
                 setUrlPath(parsedurl);
                 setActionField("url", parsedurl);
@@ -4701,6 +4718,7 @@ const AppCreator = (props) => {
               type="name"
               id="outlined-with-placeholder"
               margin="normal"
+							multiline
               variant="outlined"
               placeholder="A description for the service"
               value={description}
@@ -4779,42 +4797,45 @@ const AppCreator = (props) => {
             setBaseUrl(tmpstring);
           }}
         />
-        <FormControl style={{ marginTop: 30 }} variant="outlined">
-          <Typography variant="body1">Authentication type</Typography>
-          <Select
-            fullWidth
-            onChange={(e) => {
-              setAuthenticationOption(e.target.value);
-              if (e.target.value === "No authentication") {
-                setAuthenticationRequired(false);
-              } else {
-                setAuthenticationRequired(true);
-              }
-            }}
-            value={authenticationOption}
-            style={{
-              backgroundColor: inputColor,
-              color: "white",
-              height: "50px",
-            }}
-          >
-            {authenticationOptions.map((data, index) => (
-              <MenuItem
-                key={index}
-                style={{ backgroundColor: inputColor, color: "white" }}
-                value={data}
-              >
-                {data}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
-        {basicAuth}
-        {bearerAuth}
-        {apiKey}
-        {oauth2Auth}
-        {jwtAuth}
-        {extraKeys}
+				<div style={{padding: 25, border: "2px solid rgba(255,255,255,0.7)", borderRadius: theme.palette.borderRadius, }}>
+					<FormControl style={{ }} variant="outlined">
+						<Typography variant="h6">Authentication</Typography>
+						<Select
+							fullWidth
+							onChange={(e) => {
+								setAuthenticationOption(e.target.value);
+								if (e.target.value === "No authentication") {
+									setAuthenticationRequired(false);
+								} else {
+									setAuthenticationRequired(true);
+								}
+							}}
+							value={authenticationOption}
+							style={{
+								backgroundColor: inputColor,
+								color: "white",
+								height: "50px",
+							}}
+						>
+							{authenticationOptions.map((data, index) => (
+								<MenuItem
+									key={index}
+									style={{ backgroundColor: inputColor, color: "white" }}
+									value={data}
+								>
+									{data}
+								</MenuItem>
+							))}
+						</Select>
+					</FormControl>
+					<div style={{marginTop: 15 }} />
+					{basicAuth}
+					{bearerAuth}
+					{apiKey}
+					{oauth2Auth}
+					{jwtAuth}
+					{extraKeys}
+				</div>
 
         {/*authenticationOption === "No authentication" ? null :
 						<FormControlLabel