diff --git a/README.md b/README.md
index f8ec216ccbe752f97f607196871bbc25b7eca22b..7a7e4f55c3936856f739e28dac0a016e15f4c96d 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,8 @@ The following commands will generate the userguide and the jars needed:
```
docker build -f Dockerfile -t jams:latest --target prod .
docker run -v $(pwd)/jams:/jams --rm jams:latest
-sudo chown -R $(whoami) jams
+USER=$(whoami)
+sudo chown -R $USER jams
cd jams
java -jar jams-launcher.jar
```
diff --git a/jams-react-client/public/locales/en/translation.json b/jams-react-client/public/locales/en/translation.json
index 5738f137f75c628e60fd1d278d9b3627a6f6679e..17d10b7b3cd77ea5ab19fa75ff6dc8192c66603a 100644
--- a/jams-react-client/public/locales/en/translation.json
+++ b/jams-react-client/public/locales/en/translation.json
@@ -260,7 +260,7 @@
"welcome_has_description": "Description",
"welcome_Description": "Here is your Jami identifier, don't hesitate to share it in order to be contacted more easily!",
"welcome_has_Tips": "Enable Tips display",
- "instruction_title": "Use Jami title or personalize it (max 20 characters)",
+ "instruction_title": "Use Jami title or personalize it (max 30 characters)",
"instruction_description": "Use Jami description or personalize it (max 100 characters)",
"welcome_has_BackgroundCustom": "Background",
"instruction_background": "Choose a background color or a background image",
diff --git a/jams-react-client/src/assets/img/CustomUiBg.jpg b/jams-react-client/src/assets/img/CustomUiBg.jpg
deleted file mode 100644
index e6d0dab096332718d663a63e4ce22d88ba348e78..0000000000000000000000000000000000000000
Binary files a/jams-react-client/src/assets/img/CustomUiBg.jpg and /dev/null differ
diff --git a/jams-react-client/src/components/CustomImgDropZone/CustomImgDropZone.js b/jams-react-client/src/components/CustomImgDropZone/CustomImgDropZone.js
index 782fd290147ada1ebedf9bd17aa9d79817da08be..423eb972248044a93bc545b3dde2d4140a944002 100644
--- a/jams-react-client/src/components/CustomImgDropZone/CustomImgDropZone.js
+++ b/jams-react-client/src/components/CustomImgDropZone/CustomImgDropZone.js
@@ -73,7 +73,7 @@ function CustomImgDropZone(props) {
}
CustomImgDropZone.defaultProps = {
- accept: { "image/*": [".png", ".jpeg", ".jpg"] },
+ accept: { "image/*": [".png", ".jpeg", ".jpg", ".svg"] },
maxFiles: 1,
};
diff --git a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
index 5787f86b4103bfaf176f0c4e8092877b99d72e72..2d8be051d73c8f18997b4a25ef9e1dc2814b4b88 100644
--- a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
+++ b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
@@ -2,7 +2,6 @@ import React from "react";
import { makeStyles } from "@material-ui/core/styles";
-import customUiBackgroundImage from "assets/img/CustomUiBg.jpg";
import logoImage from "assets/img/logo-jami-net.svg";
import TipBox from "./TipBox";
@@ -12,10 +11,7 @@ import { url_path } from "../../globalUrls";
import { url_port } from "../../globalUrls";
const styles = {
- backgroundImage: {
- backgroundImage: `url(${customUiBackgroundImage})`,
- backgroundSize: "cover",
- backgroundPosition: "center",
+ root: {
height: "250px",
position: (props) => (props.isOldPreview ? "relative" : "absolute"),
left: 0,
@@ -30,8 +26,8 @@ const styles = {
left: "50%",
top: "50%",
transform: "translate(-50%, -50%)",
- width: "80%",
- height: "200px",
+ width: "100%",
+ height: "250px",
borderRadius: "5px",
backgroundColor: "white",
@@ -57,10 +53,12 @@ const styles = {
display: "flex",
flexDirection: "column",
justifyContent: "center",
+ alignItems: "center",
},
welcomeRow: {
display: "flex",
flexDirection: (props) => (props.isCompactDisplay ? "column" : "row"),
+ width: "400px",
height: "100px",
justifyContent: "center",
alignItems: "center",
@@ -81,13 +79,16 @@ const styles = {
title: {
margin: 0,
fontWeight: 500,
+ fontSize: "10px",
},
description: {
- fontSize: "5px",
+ fontSize: "8px",
},
tipRow: {
display: "flex",
- justifyContent: "center",
+ justifyContent: "space-between",
+ width: "400px",
+ marginTop: "0.5rem",
},
};
@@ -156,7 +157,7 @@ export default function CustomUiPreview({
const tip3 = i18next.t("preview_tip3", "How to set shortcuts?");
return (
- <div className={classes.backgroundImage}>
+ <div className={classes.root}>
<div className={classes.previewWindow}>
<div className={classes.sidebar}></div>
<div className={classes.mainContent}>
diff --git a/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js b/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js
index ce5dc0054e95b30a25854f02b4c7621538b6c8b9..b0cc2e5f5427da6dd00d97a8dcb5717bb76f09d9 100644
--- a/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js
+++ b/jams-react-client/src/components/CustomUiPreview/JamiIdCard.js
@@ -11,8 +11,8 @@ import { infoColor } from "assets/jss/material-dashboard-react";
const styles = {
root: {
backgroundColor: (props) => (props.isCompactDisplay ? "#f4f4f4" : "white"),
- maxWidth: (props) => (props.isCompactDisplay ? "100%" : "110px"),
- width: (props) => (props.isCompactDisplay ? "100%" : "110px"),
+ maxWidth: (props) => (props.isCompactDisplay ? "100%" : "150px"),
+ width: (props) => (props.isCompactDisplay ? "100%" : "150px"),
height: (props) => (props.isCompactDisplay ? "20px" : "40px"),
position: "relative",
borderRadius: "9px",
diff --git a/jams-react-client/src/components/CustomUiPreview/TipBox.js b/jams-react-client/src/components/CustomUiPreview/TipBox.js
index b4a513975eed883ac02ec394acff267c882b5187..948bd024f029dddb57f83f484fb0cb23c5e65abb 100644
--- a/jams-react-client/src/components/CustomUiPreview/TipBox.js
+++ b/jams-react-client/src/components/CustomUiPreview/TipBox.js
@@ -5,12 +5,10 @@ import tipLightBulbImage from "assets/img/tip_light_bulb.svg";
const styles = {
root: {
- width: "80px",
- maxWidth: "80px",
+ maxWidth: "115px",
flexBasis: "100%",
backgroundColor: "#f4f4f4",
padding: "0px 5px 5px 5px",
- margin: "2px",
borderRadius: "10px",
},
img: {
@@ -18,11 +16,11 @@ const styles = {
},
title: {
verticalAlign: "middle",
- fontSize: 6,
+ fontSize: "8px",
marginLeft: "0.5rem",
},
text: {
- fontSize: 5,
+ fontSize: "6px",
margin: 0,
},
};
diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js b/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js
index eee10366b8cd489ee63e9328094eb7dc50ffa8fd..7b01486f0e203beeefc6e995add2021d79aa2396 100644
--- a/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js
+++ b/jams-react-client/src/views/Blueprint/EditBlueprintUiForm.js
@@ -88,7 +88,7 @@ const TitleForm = ({ uiCustomization, handleUpdateUi }) => {
<span>
{i18next.t(
"instruction_title",
- "Use Jami title or personalize it (max 20 characters)"
+ "Use Jami title or personalize it (max 30 characters)"
)}
</span>
<TextField
@@ -99,7 +99,7 @@ const TitleForm = ({ uiCustomization, handleUpdateUi }) => {
handleUpdateUi("title", e.target.value);
}}
fullWidth
- inputProps={{ maxLength: 20 }}
+ inputProps={{ maxLength: 30 }}
/>
</FormGroup>
);
diff --git a/jams-react-client/src/views/Blueprint/parsePolicyData.js b/jams-react-client/src/views/Blueprint/parsePolicyData.js
index 5c8186a8f934009a8b7bb6e5b1bb6d67a6ca7156..c9bbd1011327f9f80c172fe9d1a386afbf6f13e2 100644
--- a/jams-react-client/src/views/Blueprint/parsePolicyData.js
+++ b/jams-react-client/src/views/Blueprint/parsePolicyData.js
@@ -73,7 +73,7 @@ const setCustomizationSettings = (policyData) => {
ui.title = result.title;
ui.hasDescription = result.description !== "";
ui.description = result.description;
- ui.hasTips = result.hasTips;
+ ui.hasTips = result.areTipsEnabled;
if (result.backgroundType === "default") {
ui.hasBackground = false;
diff --git a/jams-react-client/src/views/Blueprints/Blueprints.js b/jams-react-client/src/views/Blueprints/Blueprints.js
index c907f861d25a12f7852a1a2703912127d4a4036a..02a57a8832752bf83131d6675fcadc184ab1852a 100644
--- a/jams-react-client/src/views/Blueprints/Blueprints.js
+++ b/jams-react-client/src/views/Blueprints/Blueprints.js
@@ -401,7 +401,7 @@ export default function Blueprints() {
</Link>
<CardFooter>
<IconButton
- color="secondary"
+ color="primary"
onClick={() => {
handleRemoveBlueprint(blueprint.name);
}}