Fixed merge conflicts

PalisadoesFoundation · Mar 4, 2024 · 2a026b5 · 2a026b5
1 parent 65041ad
commit 2a026b5
Show file tree

Hide file tree

Showing 24 changed files with 778 additions and 873 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -71,6 +71,7 @@
         "allowTypedFunctionExpressions": true
       }
     ],
+    "camelcase": "off",
     "@typescript-eslint/naming-convention": [
       "error",
       // Interfaces must begin with Interface or TestInterface followed by a PascalCase name
@@ -91,7 +92,7 @@
       },
       {
         "selector": "variable",
-        "format": ["camelCase", "UPPER_CASE"],
+        "format": ["camelCase", "UPPER_CASE", "PascalCase"],
         "leadingUnderscore": "allow"
       },
       {
@@ -101,7 +102,7 @@
       },
       {
         "selector": "function",
-        "format": ["camelCase"]
+        "format": ["camelCase", "PascalCase"]
       },
       {
         "selector": "memberLike",

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -103,7 +103,7 @@ jobs:
   Test-Application:
     name: Test Application
     runs-on: ubuntu-latest
-    needs: [Code-Quality-Checks]
+    needs: [Code-Quality-Checks, Check-ESlint-Disable]
     steps:
       - name: Checkout the Repository
         uses: actions/checkout@v4

diff --git a/public/images/svg/profiledefault.svg b/public/images/svg/profiledefault.svg
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -218,7 +218,10 @@
     "users": "Users",
     "searchName": "Enter Name",
     "searchevent": "Enter Event",
-    "searchFullName": "Enter Full Name"
+    "searchFullName": "Enter Full Name",
+    "people": "People",
+    "sort": "Search by Role",
+    "actions": "Actions"
   },
   "userListCard": {
     "joined": "Joined",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -202,7 +202,10 @@
     "searchName": "Entrez le nom",
     "searchevent": "Entrez l'événement",
     "searchFirstName": "Entrez votre prénom",
-    "searchLastName": "Entrer le nom de famille"
+    "searchLastName": "Entrer le nom de famille",
+    "people": "Personnes",
+    "sort": "Trier par rôle",
+    "actions": "Actions"
   },
   "userListCard": {
     "joined": "Inscrit",

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -202,7 +202,10 @@
     "searchName": "नाम दर्ज करें",
     "searchevent": "घटना दर्ज करें",
     "searchFirstName": "प्रथम नाम दर्ज करें",
-    "searchLastName": "अंतिम नाम दर्ज करो"
+    "searchLastName": "अंतिम नाम दर्ज करो",
+    "people": "लोग",
+    "sort": "भूमिका के आधार पर खोजें",
+    "actions": "क्रियाएँ"
   },
   "userListCard": {
     "joined": "में शामिल हो गए",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -202,7 +202,10 @@
     "searchName": "Ingrese su nombre",
     "searchevent": "Ingresar evento",
     "searchFirstName": "Ingrese el nombre",
-    "searchLastName": "Introduzca el apellido"
+    "searchLastName": "Introduzca el apellido",
+    "people": "Personas",
+    "sort": "Ordenar por Rol",
+    "actions": "Acciones"
   },
   "userListCard": {
     "joined": "Unido",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -202,7 +202,10 @@
     "searchName": "輸入名字",
     "searchevent": "輸入事件",
     "searchFirstName": "输入名字",
-    "searchLastName": "输入姓氏"
+    "searchLastName": "输入姓氏",
+    "people": "人",
+    "sort": "按角色搜索",
+    "actions": "操作"
   },
   "userListCard": {
     "joined": "加入",

diff --git a/src/GraphQl/Mutations/mutations.ts b/src/GraphQl/Mutations/mutations.ts
@@ -568,6 +568,12 @@ export const REGISTER_EVENT = gql`
   }
 `;
 
+export const UPLOAD_PRELOGIN_IMAGERY = gql`
+  mutation uploadPreLoginImagery($data: PreLoginImageryInput!) {
+    uploadPreLoginImagery(data: $data)
+  }
+`;
+
 // Create and Update Action Item Categories
 export { CREATE_ACTION_ITEM_CATEGORY_MUTATION } from './ActionItemCategoryMutations';
 export { UPDATE_ACTION_ITEM_CATEGORY_MUTATION } from './ActionItemCategoryMutations';

diff --git a/src/components/LeftDrawer/LeftDrawer.tsx b/src/components/LeftDrawer/LeftDrawer.tsx
@@ -128,45 +128,56 @@ const leftDrawer = ({
         )}
       </div>
       <div style={{ marginTop: 'auto' }}>
+        <Link
+          to={{
+            pathname: `/member/id=${userId}`,
+            state: { from: 'orglist' },
+          }}
+        >
+          <Button
+            key={'profileBtn'}
+            className={styles.profileContainer}
+            variant={screenName === 'Profile' ? 'success' : 'light'}
+            data-testid="profileBtn"
+          >
+            <div className={styles.imageContainer}>
+              {userImage && userImage !== 'null' ? (
+                <img src={userImage} alt={`profile picture`} />
+              ) : (
+                <Avatar
+                  name={`${firstName} ${lastName}`}
+                  alt={`dummy picture`}
+                />
+              )}
+            </div>
+            <div className={styles.profileText}>
+              <span className={styles.primaryText}>
+                {firstName} {lastName}
+              </span>
+              <span
+                className={`${styles.secondaryText} ${
+                  screenName === 'Profile' && 'text-white'
+                }`}
+              >
+                {`${userType}`.toLowerCase()}
+              </span>
+            </div>
+            <AngleRightIcon fill={'var(--bs-secondary)'} />
+          </Button>
+        </Link>
+
         <Button
-          className={styles.profileContainer}
-          variant={screenName === 'Profile' ? 'success' : 'light'}
-          data-testid="profileBtn"
+          variant="light"
+          className={`mt-4 d-flex justify-content-start px-0 w-100 bg-danger text-white  ${styles.logout}`}
+          onClick={(): void => logout()}
+          data-testid="logoutBtn"
         >
           <div className={styles.imageContainer}>
-            {userImage && userImage !== 'null' ? (
-              <img src={userImage} alt={`profile picture`} />
-            ) : (
-              <Avatar name={`${firstName} ${lastName}`} alt={`dummy picture`} />
-            )}
+            <LogoutIcon fill={'white'} />
           </div>
-          <div className={styles.profileText}>
-            <span className={styles.primaryText}>
-              {firstName} {lastName}
-            </span>
-            <span
-              className={`${styles.secondaryText} ${
-                screenName === 'Profile' && 'text-white'
-              }`}
-            >
-              {`${userType}`.toLowerCase()}
-            </span>
-          </div>
-          <AngleRightIcon fill={'var(--bs-secondary)'} />
+          {t('logout')}
         </Button>
       </div>
-
-      <Button
-        variant="light"
-        className={`mt-4 d-flex justify-content-start px-0 w-100 bg-danger text-white  ${styles.logout}`}
-        onClick={(): void => logout()}
-        data-testid="logoutBtn"
-      >
-        <div className={styles.imageContainer}>
-          <LogoutIcon fill={'white'} />
-        </div>
-        {t('logout')}
-      </Button>
     </div>
   );
 };