Fix api and frontend issues

benjammin4dayz · May 30, 2024 · b876f54 · b876f54
1 parent 9ab372c
commit b876f54
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 26 deletions.
diff --git a/api/src/models/User.ts b/api/src/models/User.ts
@@ -75,7 +75,6 @@ const userSchema = new Schema<env.User>(
     },
     bio: {
       type: String,
-      maxlength: 100,
       trim: true,
     },
     location: {

diff --git a/backend/src/assets/css/car-list.css b/backend/src/assets/css/car-list.css
@@ -34,7 +34,7 @@ section.car-list .empty-list {
     color: #333;
     font-size: 12px;
     margin: 0 1px 10px;
-    height: 730px;
+    min-height: 730px;
     padding: 15px;
   }
 
@@ -50,7 +50,7 @@ section.car-list .empty-list {
     font-weight: 700;
     text-size-adjust: none;
     line-height: 1.3em;
-    word-break: break-all;
+    word-break: break-word;
     display: inline;
     font-size: 2em;
     font-weight: 700;
@@ -59,7 +59,7 @@ section.car-list .empty-list {
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
   }
@@ -108,7 +108,7 @@ section.car-list .empty-list {
     line-height: 1em;
     white-space: nowrap;
     margin-left: 5px;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
     width: 180px;
@@ -231,7 +231,7 @@ section.car-list .empty-list {
     color: #333;
     font-size: 12px;
     margin-bottom: 10px;
-    height: 430px;
+    min-height: 430px;
     width: 800px;
   }
 
@@ -246,7 +246,7 @@ section.car-list .empty-list {
     font-weight: 700;
     text-size-adjust: none;
     line-height: 1.3em;
-    word-break: break-all;
+    word-break: break-word;
     display: inline;
     font-size: 2em;
     font-weight: 700;
@@ -255,7 +255,7 @@ section.car-list .empty-list {
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
   }
@@ -309,7 +309,7 @@ section.car-list .empty-list {
     line-height: 1em;
     white-space: nowrap;
     margin-left: 5px;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
     width: 100px;

diff --git a/backend/src/assets/css/supplier.css b/backend/src/assets/css/supplier.css
@@ -16,13 +16,17 @@ div.supplier {
   font-weight: 400;
   margin-top: 10px;
   color: #676767;
+  word-wrap: break-word;
 }
 
 .supplier div.col-1 .supplier-bio-link {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-
+  overflow: hidden;
+  word-break: break-word;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  text-align: center;
+  padding: 0 10px;
 }
 
 .supplier div.col-1 .supplier-actions {
@@ -68,10 +72,6 @@ div.supplier {
     justify-content: center;
   }
 
-  .supplier div.col-1 .car-count {
-    display: none;
-  }
-
   .supplier div.col-2 {
     display: flex;
     flex-direction: column;

diff --git a/backend/src/lang/common.ts b/backend/src/lang/common.ts
@@ -60,6 +60,7 @@ const strings = new LocalizedStrings({
     SEND_MESSAGE: 'Envoyer un message',
     VERIFIED: 'Compte vérifié',
     CAR: 'voiture',
+    CARS: 'voitures',
     RESEND_ACTIVATION_LINK: "Renvoyer le lien d'activation du compte",
     ACTIVATION_EMAIL_SENT: "E-mail d'activation envoyé.",
     EMAIL_NOT_VALID: 'E-mail non valide',
@@ -135,6 +136,7 @@ const strings = new LocalizedStrings({
     SEND_MESSAGE: 'Send a message',
     VERIFIED: 'Verified account',
     CAR: 'car',
+    CARS: 'cars',
     RESEND_ACTIVATION_LINK: 'Resend account activation link',
     ACTIVATION_EMAIL_SENT: 'Activation email sent.',
     EMAIL_NOT_VALID: 'Invalid email address',

diff --git a/backend/src/pages/Cars.tsx b/backend/src/pages/Cars.tsx
@@ -96,7 +96,7 @@ const Cars = () => {
                 {strings.NEW_CAR}
               </Button>
 
-              {rowCount > 0 && <InfoBox value={`${rowCount} ${commonStrings.CAR}${rowCount > 1 ? 's' : ''}`} className="car-count" />}
+              {rowCount > 0 && <InfoBox value={`${rowCount} ${rowCount > 1 ? commonStrings.CARS : commonStrings.CAR}`} className="car-count" />}
 
               <SupplierFilter suppliers={allSuppliers} onChange={handleSupplierFilterChange} className="filter" />
 

diff --git a/backend/src/pages/Supplier.tsx b/backend/src/pages/Supplier.tsx
@@ -201,7 +201,7 @@ const Supplier = () => {
                 </Tooltip>
               )}
             </div>
-            {rowCount > 0 && <InfoBox value={`${rowCount} ${commonStrings.CAR}${rowCount > 1 ? 's' : ''}`} className="car-count" />}
+            {rowCount > 0 && <InfoBox value={`${rowCount} ${rowCount > 1 ? commonStrings.CARS : commonStrings.CAR}`} className="car-count" />}
           </div>
           <div className="col-2">
             <CarList

diff --git a/frontend/src/assets/css/car-list.css b/frontend/src/assets/css/car-list.css
@@ -34,7 +34,7 @@ section.car-list article .btn-book {
     color: #333;
     font-size: 12px;
     margin: 0 1px 10px;
-    height: 750px;
+    min-height: 750px;
     padding: 15px;
     max-width: 480px;
   }
@@ -54,7 +54,7 @@ section.car-list article .btn-book {
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
   }
@@ -103,7 +103,7 @@ section.car-list article .btn-book {
     line-height: 1em;
     white-space: nowrap;
     margin-left: 5px;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
     width: 200px;
@@ -246,7 +246,7 @@ section.car-list article .btn-book {
     color: #333;
     font-size: 12px;
     margin-bottom: 10px;
-    height: 430px;
+    min-height: 430px;
     width: 800px;
   }
 
@@ -266,7 +266,7 @@ section.car-list article .btn-book {
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
   }
@@ -320,7 +320,7 @@ section.car-list article .btn-book {
     line-height: 1em;
     white-space: nowrap;
     margin-left: 5px;
-    word-break: break-all;
+    word-break: break-word;
     overflow: hidden;
     text-overflow: ellipsis;
     width: 200px;

diff --git a/frontend/src/assets/css/checkout.css b/frontend/src/assets/css/checkout.css
@@ -120,7 +120,7 @@ div.booking div.booking-details div.booking-detail div.booking-detail-value span
   margin-left: 5px;
   overflow: hidden;
   text-overflow: ellipsis;
-  word-break: break-all;
+  word-break: break-word;
   width: 200px;
 }