Bug fixes for registering users in desktop client

daveajlee · Mar 15, 2024 · 95f7ea7 · 95f7ea7
1 parent ccc301e
commit 95f7ea7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add maven
 
 #Git
 RUN apk add git
-RUN mkdir /trams-crm
+RUN mkdir /personalman
 RUN git clone https://github.com/daveajlee/personalman.git /personalman
 
 #Build

diff --git a/desktop/src/components/forms/AddUserForm/AddUserForm.js b/desktop/src/components/forms/AddUserForm/AddUserForm.js
@@ -35,7 +35,7 @@ function AddUserForm (props) {
      * in the parameters.
      */
     useEffect(() => {
-        if ( props.company === '' ) {
+        if ( !props.company || props.company === '' ) {
             axios.get(process.env.REACT_APP_SERVER_URL + `/companies/`)
                 .then(res => {
                     const companies = res.data;
@@ -238,7 +238,7 @@ function AddUserForm (props) {
                 dateOfBirth: dateOfBirthSplit[2] + '-' + dateOfBirthSplit[1] + '-' + dateOfBirthSplit[0]
             }).then(function (response) {
                 if ( response.status === 201 ) {
-                    if ( props.company === '' ) {
+                    if ( !props.company || props.company === '' ) {
                         alert(t('addUserFormSuccess'))
                         navigate("/")
                     } else {
@@ -294,7 +294,7 @@ function AddUserForm (props) {
                 </Col>
             </Form.Group>
 
-            { ( props.company ==='' ) ? <p className="small text-center fw-bold mt-2 pt-1 mb-4">{t('loginRegisterCompanyTeaser')} <a href="registerCompany"
+            { ( props.company ==='' ) ? <p className="small text-center fw-bold mt-2 pt-1 mb-4">{t('loginRegisterCompanyTeaser')} <a href="/#/registerCompany"
                 className="link-danger">{t('loginRegisterCompanyLink')}</a>
                 </p> : <p></p> }
 

diff --git a/desktop/src/components/pages/Login/Login.js b/desktop/src/components/pages/Login/Login.js
@@ -134,10 +134,10 @@ function Login() {
                         <Col className="text-center">
                             <Button className="mb-0 px-5 me-2" size='lg' onClick={login}>{t('loginLoginButton')}</Button>
                             <Button className="mb-0 px-5 me-2" size='lg' onClick={resetForm}>{t('loginResetButton')}</Button>
-                            <p className="small fw-bold mt-2 pt-1 mb-2">{t('loginRegisterUserTeaser')} <a href="registerUser"
+                            <p className="small fw-bold mt-2 pt-1 mb-2">{t('loginRegisterUserTeaser')} <a href="/#/registerUser"
                                                                                                   className="link-danger">{t('loginRegisterUserLink')}</a>
                             </p>
-                            <p className="small fw-bold mt-2 pt-1 mb-2">{t('loginRegisterCompanyTeaser')} <a href="registerCompany"
+                            <p className="small fw-bold mt-2 pt-1 mb-2">{t('loginRegisterCompanyTeaser')} <a href="/#/registerCompany"
                                                                                                                className="link-danger">{t('loginRegisterCompanyLink')}</a>
                             </p>
                         </Col>

diff --git a/server/docker-compose.yml b/server/docker-compose.yml
@@ -23,11 +23,4 @@ services:
       - 8081:8081
     environment:
       ME_CONFIG_MONGODB_ADMINUSERNAME: mongoadmin
-      ME_CONFIG_MONGODB_ADMINPASSWORD: mymongodb
-
-  eureka:
-    image: daveajlee/eureka-server
-    container_name: eureka
-    restart: always
-    ports:
-      - 8761:8761
+      ME_CONFIG_MONGODB_ADMINPASSWORD: mymongodb