Merge pull request #82 from databucket/3.4.2

v.3.4.2

Author: kslysz

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'pl.databucket'
-version = '3.4.1'
+version = '3.4.2'
 targetCompatibility = 8
 sourceCompatibility = 8
 

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "homepage": ".",
   "name": "databucket",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "private": true,
   "dependencies": {
     "@material-ui/core": "4.12.4",

frontend/src/components/dialogs/InfoDialog.jsx

@@ -62,7 +62,7 @@ export default function InfoDialog() {
             >
                 <img style={{marginLeft: '100px', marginTop: '20px'}} src={DatabucketLogo} alt='' width='399' height='65'/>
                 <div style={{margin: '20px'}}>
-                    <Typography color='secondary'>Version: <b>3.4.1</b></Typography>
+                    <Typography color='secondary'>Version: <b>3.4.2</b></Typography>
                     <Link target='_blank' href='https://www.databucket.pl' color="primary">www.databucket.pl</Link><br/>
                     <Link target='_blank' href='https://github.com/databucket/databucket-server' color="textSecondary">Source code</Link><br/>
                     <Link target='_blank' href='https://github.com/databucket/databucket-server/wiki' color="textSecondary">Documentation</Link><br/>

…/components/login/ChangePasswordPage.jsx …components/public/ChangePasswordPage.jsxfrontend/src/components/login/ChangePasswordPage.jsx renamed to frontend/src/components/public/ChangePasswordPage.jsx frontend/src/components/login/ChangePasswordPage.jsx renamed to frontend/src/components/public/ChangePasswordPage.jsx

@@ -96,23 +96,16 @@ export default function ChangePasswordPage() {
                     <Typography className="Title" variant="h5">
                         Change password
                     </Typography>
-                    {/*// additional control to block setting default password by Chrome*/}
-                    <FormControl disabled={true} style={{height: '0px', width: '0px'}}>
-                        <Input
-                            name="pass"
-                            type='password'
-                            value={null}
-                            disabled={true}
-                            // visible={false}
-                        />
-                    </FormControl>
                     <FormControl className="LoginInputText">
                         <InputLabel htmlFor="standard-adornment-password">Current password</InputLabel>
                         <Input
                             name="password"
                             type='password'
                             value={password}
                             onChange={onChange}
+                            onFocus={(event) => {
+                                event.target.setAttribute('autocomplete', 'off');
+                            }}
                         />
                     </FormControl>
                     <FormControl className="LoginInputText">
@@ -122,6 +115,9 @@ export default function ChangePasswordPage() {
                             type='password'
                             value={newPassword}
                             onChange={onChange}
+                            onFocus={(event) => {
+                                event.target.setAttribute('autocomplete', 'off');
+                            }}
                         />
                     </FormControl>
                     <FormControl className="LoginInputText">
@@ -131,6 +127,9 @@ export default function ChangePasswordPage() {
                             type='password'
                             value={newPasswordConfirmation}
                             onChange={onChange}
+                            onFocus={(event) => {
+                                event.target.setAttribute('autocomplete', 'off');
+                            }}
                         />
                     </FormControl>
                     <div className="Button">

…rc/components/login/ConfirmationPage.jsx …c/components/public/ConfirmationPage.jsxfrontend/src/components/login/ConfirmationPage.jsx renamed to frontend/src/components/public/ConfirmationPage.jsx frontend/src/components/login/ConfirmationPage.jsx renamed to frontend/src/components/public/ConfirmationPage.jsx

@@ -49,7 +49,7 @@
     width: 100%;
     margin-top: 50px;
     margin-left: 40px;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
     display: flex;
     flex-direction: column;
     align-items: flex-start;

…/components/login/ForgotPasswordPage.css …components/public/ForgotPasswordPage.cssfrontend/src/components/login/ForgotPasswordPage.css renamed to frontend/src/components/public/ForgotPasswordPage.css frontend/src/components/login/ForgotPasswordPage.css renamed to frontend/src/components/public/ForgotPasswordPage.css

@@ -291,7 +291,7 @@ export default function LoginPage() {
         <div className="ContainerClass">
             {<img src={Logo} alt=''/>}
             {paper()}
-            <Typography variant="caption">3.4.1</Typography>
+            <Typography variant="caption">3.4.2</Typography>
             <MessageBox
                 config={messageBox}
                 onClose={() => setMessageBox({...messageBox, open: false})}

…/components/login/ForgotPasswordPage.jsx …components/public/ForgotPasswordPage.jsxfrontend/src/components/login/ForgotPasswordPage.jsx renamed to frontend/src/components/public/ForgotPasswordPage.jsx frontend/src/components/login/ForgotPasswordPage.jsx renamed to frontend/src/components/public/ForgotPasswordPage.jsx

@@ -1,12 +1,12 @@
-.ContainerClass {
+.ContainerClassSingUp {
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
     padding: 10vh;
 }
 
-.PaperClass {
+.PaperClassSingUp {
     margin-top: 40px;
     display: flex;
     min-width: 370px;
@@ -19,49 +19,49 @@
     padding: 20px 0px 0px 0px;
 }
 
-.Title {
-    padding: 30px;
+.TitleSingUp {
+    padding: 10px;
 }
 
-.Description {
+.DescriptionSingUp {
     padding: 30px;
+    /*margin-left: 30px;*/
 }
 
-.TitleGrid {
+.TitleGridSingUp {
     padding: 30px;
     width: 100%;
     /*overflow: auto;*/
 }
 
-.Button {
+.ButtonSingUp {
     width: 100%;
-    margin-top: 10px;
     padding: 20px;
 }
 
-.EmailInputText {
+.EmailInputTextSingUp {
     height: 70px;
     width: 85%;
     overflow: auto;
 }
 
-.UsernameInputText {
+.UsernameInputTextSingUp {
     height: 70px;
     width: 85%;
     overflow: auto;
 }
 
-.PasswordText {
+.PasswordTextSingUp {
     height: 70px;
     width: 85%;
     overflow: auto;
 }
 
-.BackLink {
+.BackLinkSingUp {
     width: 100%;
-    margin-top: 50px;
+    margin-top: 20px;
     margin-left: 40px;
-    margin-bottom: 10px;
+    margin-bottom: 15px;
     display: flex;
     flex-direction: column;
     align-items: flex-start;