Merge pull request #221 from hubert-deriv/new_manage_apps_design

Author: hubert-deriv

src/components/CustomCheckbox/custom_checkbox.module.scss

@@ -2,13 +2,15 @@
 
 .customCheckboxContainer {
     display: flex;
-    align-items: center;
     justify-content: center;
     position: relative;
     min-width: rem(1.6);
     padding-top: rem(0.8);
     z-index: 0;
     margin-bottom: auto;
+    @media screen and (min-width: 992px) {
+        align-items: center;
+    }
     label {
         cursor: pointer;
         margin-left: rem(1.5);

src/features/dashboard/components/AppForm/__tests__/app-form.test.tsx

@@ -201,7 +201,7 @@ describe('App Form', () => {
     const submitButton = screen.getByText('Register Application');
 
     const authURLInput = screen.getByRole('textbox', {
-      name: 'Authorization URL (optional)',
+      name: 'Authorisation URL (optional)',
     });
 
     await userEvent.type(authURLInput, 'http:invalidAUTHurl.com');
@@ -290,7 +290,7 @@ describe('App Form', () => {
     });
 
     const appRedirectUrlInput = screen.getByRole<HTMLInputElement>('textbox', {
-      name: 'Authorization URL (optional)',
+      name: 'Authorisation URL (optional)',
     });
 
     const appVerificationUrlInput = screen.getByRole<HTMLInputElement>('textbox', {

src/features/dashboard/components/AppForm/app-form.module.scss

@@ -90,8 +90,10 @@ fieldset .customTextInput:last-child {
       display: flex;
       flex-direction: column;
       margin-bottom: rem(2.5);
-      .scopesWrapper {
-        padding-left: rem(1.6);
+      @media screen and (min-width: 992px) {
+        .scopesWrapper {
+          margin-left: rem(1.6);
+        }
       }
     }
     .disableTokenDropdown {
@@ -112,23 +114,31 @@ fieldset .customTextInput:last-child {
       margin-bottom: rem(2);
     }
     .formHeaderContainer {
+      font-size: rem(1.4);
       display: flex;
       padding: rem(1) 0;
       gap: rem(1);
       margin-top: rem(1.5);
       flex-direction: column;
+      
       .subHeading {
-        padding-left: rem(1);
+        margin-left: rem(1);
       }
       .formsubHeading {
-        padding: rem(1.6);
+        margin-left: rem(1.6);
         display: inline-block;
       }
       .wrapperHeading {
-        padding-left: rem(1.6);
+        margin-left: rem(1.6);
       }
-      .markup {
-        margin-bottom: rem(1);
+    }
+    .markup {
+      margin-bottom: rem(1);
+      span {
+        font-size: rem(1.2);
+        @media screen and (min-width: 992px) {
+          font-size: rem(1.4);
+        }
       }
     }
   }
@@ -165,20 +175,27 @@ fieldset .customTextInput:last-child {
 .customCheckboxWrapper {
   display: flex;
   gap: rem(1);
+  font-size: rem(1.2);
+  @media screen and (min-width: 992px) {
+    font-size: rem(1.4);
+  }
 
   label {
     cursor: pointer;
   }
 }
 
 .termsOfConditionRegister {
-  margin-left: rem(4);
-  margin-top: rem(6);
+  font-size: rem(1);
+  text-align: center;
+  @media screen and (min-width: 992px) {
+    font-size: rem(1.4);
+  }
 }
 
 .buttons {
   display: flex;
-  gap: rem(1);
+  gap: rem(2.4);
 }
 
 .errorAppname {

src/features/dashboard/components/AppForm/index.tsx

@@ -199,7 +199,9 @@ const AppForm = ({
                 </Text>
                 <br />
                 <Text as='span' type='paragraph-1' className={styles.formsubHeading}>
-                  <b>NOTE: Markup is only available for real accounts</b>
+                  <p>
+                    <b>Note: Markup is only available for real accounts.</b>
+                  </p>
                 </Text>
               </div>
             </div>
@@ -248,14 +250,14 @@ const AppForm = ({
                   type='text'
                   placeholder=' '
                 />
-                <label htmlFor='app_redirect_uri'>Authorization URL (optional)</label>
+                <label htmlFor='app_redirect_uri'>Authorisation URL (optional)</label>
               </div>
               <Text
                 as='p'
                 type='paragraph-2'
                 className={`${styles.helperText} ${styles.formsubHeading}`}
               >
-                *Please note that this URL will be used as the OAuth redirect URL for the OAuth
+                Please note that this URL will be used as the OAuth redirect URL for the OAuth
                 authorization.
               </Text>
               {errors && errors?.redirect_uri && (
@@ -275,6 +277,11 @@ const AppForm = ({
                   placeholder=' '
                 />
                 <label htmlFor='app_verification_uri'>Verification URL (optional)</label>
+                <Text
+                  as='p'
+                  type='paragraph-2'
+                  className={`${styles.helperText} ${styles.formsubHeading}`}
+                ></Text>
               </div>
               {errors && errors.verification_uri && (
                 <span className='error-message'>{errors.verification_uri.message}</span>

src/features/dashboard/components/AppsTable/cells.module.scss

@@ -3,12 +3,10 @@
 @mixin actionIcon {
   background-repeat: no-repeat;
   background-position: center;
-  background-size: rem(2);
+  background-size: rem(1.8);
   cursor: pointer;
-  padding: rem(2) rem(2);
+  padding: rem(1.8) rem(1.8);
   border-radius: 100%;
-  background-color: var(--colors-greyLight200);
-  border: 2px solid var(--colors-greyLight400);
 }
 
 .deleteApp {
@@ -23,8 +21,8 @@
 
 .appActions {
   display: flex;
-  gap: rem(2);
   margin: rem(3);
+  justify-content: center;
 }
 
 .tooltip {

src/features/dashboard/components/Dialogs/UpdateAppDialog/update-app-dialog.module.scss

@@ -6,6 +6,6 @@
   width: 80vw;
 
   .update_app_content {
-    margin: rem(2);
+    margin: rem(1);
   }
 }

src/features/dashboard/components/RestrictionsAppname/RestrictionsAppname.module.scss

@@ -1,6 +1,9 @@
 @use 'src/styles/utility' as *;
 
 .restrictions {
+  display:flex;
+  flex-direction: column;
+  gap: rem(0.8);
   font-size: rem(1.2);
   font-weight: 400;
   line-height: rem(1.8);

src/features/dashboard/components/RestrictionsAppname/index.tsx

@@ -3,12 +3,12 @@ import styles from './RestrictionsAppname.module.scss';
 
 const RestrictionsAppname = () => {
   return (
-    <ol className={styles.restrictions}>
+    <ul className={styles.restrictions}>
       <li>Only alphanumeric characters with spaces and underscores are allowed.</li>
       <li>The name can contain up to 48 characters.</li>
       <li>Duplicate token names aren’t allowed.</li>
       <li>The name cannot contain “Binary”, “Deriv”, or similar words.</li>
-    </ol>
+    </ul>
   );
 };
 

src/features/dashboard/components/Table/scopes.cell.module.scss

@@ -1,13 +1,16 @@
 @use 'src/styles/utility' as *;
 
 .scope {
-  border: 1.6px solid var(--ifm-color-emphasis-400);
-  border-radius: 4px;
-  padding: rem(0.24) rem(0.24);
-  font-size: rem(1.1);
+  display: inline-block;
+  border: rem(0.1) solid var(--ifm-color-emphasis-400);
+  border-radius: 100vw; // pill shaped
+  padding: rem(0.2) rem(0.8);
+  font-size: rem(1.2);
+  margin: rem(0.5);
+  color: var(--ifm-color-emphasis-700);
 }
 
 .adminScope {
-  border: 1.6px solid var(--ifm-color-primary);
-  color: var(--ifm-color-primary);
+  border: rem(0.1) solid var(--admin-border);
+  color: var(--admin-text);
 }

src/features/dashboard/components/Table/table.scss

@@ -8,26 +8,30 @@
   }
 
   thead {
-    background-color: var(--ifm-color-emphasis-200);
-    border: 3px solid var(--ifm-color-emphasis-200);
+    background-color: var(--ifm-color-emphasis-100);
+    border: 3px solid var(--ifm-color-emphasis-100);
     height: rem(5);
   }
 
+  th {
+    min-width: rem(20);
+  }
+
   th,
   td {
+    display: table-cell;
+    border-left: none;
+    border-right: none;
+    border-bottom-color: var(--ifm-color-emphasis-200);
     text-align: left;
-    padding: rem(1.6);
-    min-width: rem(14.4);
-    max-width: rem(14.4);
-    overflow: visible;
-    text-overflow: ellipsis;
-    border: none;
+    &:last-child {
+      text-align: center;
+    }
   }
 
   td:nth-child(3) {
-    display: flex;
-    flex-wrap: wrap;
-    gap: rem(0.64);
+    max-width: rem(20);
+    min-width: rem(15);
   }
 
   td:last-child,
@@ -43,9 +47,8 @@
   }
 
   tbody tr {
+    display: table-row;
     border: none;
-    &:nth-child(even) {
-      background-color: var(--ifm-color-emphasis-100);
-    }
+    background-color: var(--ifm-color-emphasis-0);
   }
 }