Clan update and create message validations (#531)

* edit validations to only provide a single error msg if empty or over 1k chars * add padding to button used in create and update clan views - class was applied but didn't exist. add class to update view * english fix * normalize btn * implement same error standards on create errors
FAForever · Dec 14, 2023 · b8240d5 · b8240d5
1 parent 7f8d01b
commit b8240d5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/public/styles/abstracts/_mixins.sass b/public/styles/abstracts/_mixins.sass
@@ -95,7 +95,11 @@ button
   font-size: 0.75em
   margin: 0.25em
   padding: 0.5em
-
+.bigButton
+  @include button
+  font-size: 1em
+  margin: 0.75em
+  padding: 1em
 .descriptionMain
   //background-color: variables.$background-secondary
   padding: 10px

diff --git a/src/backend/routes/views/clans/create.js b/src/backend/routes/views/clans/create.js
@@ -8,9 +8,10 @@ module.exports = [
     )
         .notEmpty()
         .isLength({ max: 3 }),
-    body('clan_description', 'Please add a description for your clan')
-        .notEmpty()
-        .isLength({ max: 1000 }),
+    body('clan_description', 'Cannot exceed 1000 characters').isLength({
+        max: 1000,
+    }),
+    body('clan_description', 'Cannot be empty').notEmpty(),
     body('clan_name', "Please indicate your clan's name")
         .notEmpty()
         .isLength({ max: 40 }),

diff --git a/src/backend/routes/views/clans/post/update.js b/src/backend/routes/views/clans/post/update.js
@@ -8,9 +8,10 @@ exports = module.exports = [
     )
         .notEmpty()
         .isLength({ max: 3 }),
-    body('clan_description', 'Please add a description for your clan')
-        .notEmpty()
-        .isLength({ max: 1000 }),
+    body('clan_description', 'Cannot exceed 1000 characters').isLength({
+        max: 1000,
+    }),
+    body('clan_description', 'Cannot be empty').notEmpty(),
     body('clan_name', "Please indicate your clan's name")
         .notEmpty()
         .isLength({ max: 40 }),

diff --git a/src/backend/templates/views/clans/create.pug b/src/backend/templates/views/clans/create.pug
@@ -50,8 +50,8 @@ block content
                         name='clan_description',
                         title='description',
                         required='required',
-                        placeholder='The description players will see when they look your clan'
+                        placeholder='The description players will see when they view your clan'
                     ) #{ clan_description }
                     br
 
-                    button.bigButton(type='submit') Create your Clan
+                    button.bigButton(type='submit') Create Your Clan
diff --git a/src/backend/templates/views/clans/manage.pug b/src/backend/templates/views/clans/manage.pug
@@ -37,11 +37,11 @@ block content
                     name='clan_description',
                     title='description',
                     required='required',
-                    placeholder='The description players will see when they look your clan'
+                    placeholder='The description players will see when they view your clan'
                 ) #{ clan_description }
                 br
 
-                button(type='submit') Update Clan Settings
+                button.bigButton(type='submit') Update Clan Settings
                 br
                 br
                 hr
@@ -56,5 +56,5 @@ block content
                 action='/clans/destroy',
                 onsubmit='return confirm(\'THIS OPERATION IS DEFINITIVE. Press OK to confirm you want to delete your clan\');'
             )
-                button(type='submit') Delete my clan
+                button(type='submit') Delete My Clan
             br