Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Figma: People Page Violates The Figma Style Guide #3401

Closed
Closed
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
997e7cb
gg
abhassen44 Dec 30, 2024
c873b7f
hh
abhassen44 Dec 30, 2024
4ba5d8a
Merge branch 'develop-postgres' of https://github.com/PalisadoesFound…
abhassen44 Dec 30, 2024
59dfb45
Merge branch 'develop-postgres' into feat/css
abhassen44 Dec 30, 2024
c28c3d8
refreshed
abhassen44 Dec 30, 2024
a377c16
gg
abhassen44 Jan 14, 2025
e0f3c6c
test
abhassen44 Jan 14, 2025
3a4eb6b
resolving-conflict
abhassen44 Jan 14, 2025
7959fbb
resolving-conflict
abhassen44 Jan 14, 2025
c597c38
resolving-design
abhassen44 Jan 14, 2025
73d0d71
resolving-design
abhassen44 Jan 14, 2025
5ad1953
css
abhassen44 Jan 14, 2025
762b6a4
css
abhassen44 Jan 14, 2025
ba82b69
css
abhassen44 Jan 14, 2025
d7ad796
css
abhassen44 Jan 14, 2025
e5c8b87
css
abhassen44 Jan 14, 2025
ef42c3a
css
abhassen44 Jan 14, 2025
2e2828b
code-rabit-reconfigaring
abhassen44 Jan 14, 2025
0a7f31e
code-rabit-reconfigaring
abhassen44 Jan 14, 2025
929ea91
code-rabit-reconfigaring
abhassen44 Jan 16, 2025
d437249
test
abhassen44 Jan 16, 2025
39a0658
test
abhassen44 Jan 16, 2025
a3cf918
test
abhassen44 Jan 16, 2025
5ce3410
test
abhassen44 Jan 16, 2025
ef2fa18
test
abhassen44 Jan 16, 2025
542195b
test
abhassen44 Jan 16, 2025
19f9288
setting
abhassen44 Jan 18, 2025
6295d17
about
abhassen44 Jan 19, 2025
a077c6c
about
abhassen44 Jan 19, 2025
bb7b6d5
Merge branch 'feat/css' into develop-postgres
abhassen44 Jan 19, 2025
285f738
refactor
abhassen44 Jan 19, 2025
fd6d9de
refactor
abhassen44 Jan 19, 2025
8ac942d
ref
abhassen44 Jan 20, 2025
ec2f700
Merge branch 'develop-postgres' of https://github.com/PalisadoesFound…
abhassen44 Jan 20, 2025
af3b3e6
ref2
abhassen44 Jan 20, 2025
0db1b07
Update src/assets/css/app.css
abhassen44 Jan 20, 2025
1375c83
Update src/style/app.module.css
abhassen44 Jan 20, 2025
17f0922
Update src/screens/OrganizationPeople/AddMember.tsx
abhassen44 Jan 20, 2025
5f24959
Update pre-commit
abhassen44 Jan 20, 2025
3168cfd
ref3
abhassen44 Jan 20, 2025
b6b5be7
Update pre-commit
abhassen44 Jan 20, 2025
0cc5fc6
ref4
abhassen44 Jan 21, 2025
4fbf767
Merge branch 'ref/css2' of https://github.com/abhassen44/talawa-admin…
abhassen44 Jan 21, 2025
eabfd4c
ref4
abhassen44 Jan 21, 2025
c5acd11
Update pre-commit
abhassen44 Jan 21, 2025
02b76b0
Merge branch 'develop-postgres' into ref/css2
abhassen44 Jan 21, 2025
2c5a9e4
ref4
abhassen44 Jan 21, 2025
6487d16
ref4
abhassen44 Jan 21, 2025
fd2d713
Update pre-commit
abhassen44 Jan 21, 2025
0da1df0
ref4
abhassen44 Jan 21, 2025
160abc6
Merge branch 'ref/css2' of https://github.com/abhassen44/talawa-admin…
abhassen44 Jan 21, 2025
76560e6
ref4
abhassen44 Jan 21, 2025
7d4f064
Update pre-commit
abhassen44 Jan 21, 2025
4f5a4dd
gg
abhassen44 Jan 23, 2025
4d6a696
gg
abhassen44 Jan 23, 2025
460a02b
Update pre-commit
abhassen44 Jan 23, 2025
dab76bc
cod/rabit
abhassen44 Jan 23, 2025
8a0854d
Merge branch 'ref/css3' of https://github.com/abhassen44/talawa-admin…
abhassen44 Jan 23, 2025
2d52847
fix1
abhassen44 Jan 23, 2025
364bdfc
Update pre-commit
abhassen44 Jan 23, 2025
da04e3d
Merge branch 'develop-postgres' into ref/css3
abhassen44 Jan 23, 2025
976e9f5
Update app.css
abhassen44 Jan 23, 2025
b590b2b
fix1
abhassen44 Jan 23, 2025
e76cfec
Update pre-commit
abhassen44 Jan 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
code-rabit-reconfigaring
abhassen44 committed Jan 16, 2025
commit 929ea91800053ae4117fec0d3a737af34e634b23
12 changes: 7 additions & 5 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -195,14 +195,16 @@ jobs:
id: changed-files
uses: tj-actions/changed-files@v45

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Filter TypeScript files
id: filter-files
run: |
echo "ts_files=$(echo '${{ steps.changed-files.outputs.all_changed_files }}' | tr ',' '\n' | grep -E '\.(ts|tsx)$' | tr '\n' ' ')" >> $GITHUB_OUTPUT
shell: bash

- name: Run Python script
if: steps.filter-files.outputs.ts_files != ''
run: |
python .github/workflows/scripts/eslint_disable_check.py --files ${{ steps.changed-files.outputs.all_changed_files }}
python .github/workflows/scripts/eslint_disable_check.py --files ${{ steps.filter-files.outputs.ts_files }}
Check-Code-Coverage-Disable:
name: Check for code coverage disable
39 changes: 16 additions & 23 deletions .github/workflows/scripts/eslint_disable_check.py
Original file line number Diff line number Diff line change
@@ -38,8 +38,7 @@ def has_eslint_disable(file_path):
"""
# Initialize key variables
eslint_disable_pattern = re.compile(
r"\/\/\s*eslint-disable(?:-next-line"
r"|-line)?[^\n]*|\/\*\s*eslint-disable[^\*]*\*\/",
r"\/\/\s*eslint-disable(?:-next-line|-line)?[^\n]*|\/\*\s*eslint-disable[^\*]*\*\/",
re.IGNORECASE,
)

@@ -49,13 +48,14 @@ def has_eslint_disable(file_path):
return bool(eslint_disable_pattern.search(content))
except FileNotFoundError:
print(f"File not found: {file_path}")
return False

except PermissionError:
print(f"Permission denied: {file_path}")
return False

except (IOError, OSError) as e:
print(f"Error reading file {file_path}: {e}")
return False

return False


def check_eslint(files_or_directories):
@@ -71,30 +71,21 @@ def check_eslint(files_or_directories):

for item in files_or_directories:
if os.path.isfile(item):
# If it's a file, directly check it
if item.endswith(".ts") or item.endswith(".tsx"):
if has_eslint_disable(item):
print(
f"""\
File {item} contains eslint-disable statement. Please remove them and \
ensure the code adheres to the specified ESLint rules."""
)
eslint_found = True
# Check a single file
if item.endswith((".ts", ".tsx")) and has_eslint_disable(item):
print(f"Error: File {item} contains eslint-disable statements.")
eslint_found = True
elif os.path.isdir(item):
# If it's a directory, walk through it and check all
# .ts and .tsx files
# Recursively check files in a directory
for root, _, files in os.walk(item):
if "node_modules" in root:
continue
for file_name in files:
if file_name.endswith(".ts") or file_name.endswith(".tsx"):
if file_name.endswith((".ts", ".tsx")):
file_path = os.path.join(root, file_name)
if has_eslint_disable(file_path):
print(
f"""File {file_path} contains eslint-disable
statement."""
)
eslint_found = True
print(f"Error: File {file_path} contains eslint-disable statements.")
eslint_found = True

return eslint_found

@@ -107,7 +98,9 @@ def arg_parser_resolver():
Returns:
result: Parsed argument object
"""
parser = argparse.ArgumentParser()
parser = argparse.ArgumentParser(
description="Check TypeScript files for eslint-disable statements."
)
parser.add_argument(
"--files",
type=str,
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
npm run format:fix
# npm run lint:fix
npm run lint-staged
# npm run lint-staged
npm run typecheck
npm run update:toc

4 changes: 4 additions & 0 deletions matrix.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
1 2 3 4 5
6 7 8 9 10
11 12 13 14 15
16 17 18 19 20
1,626 changes: 477 additions & 1,149 deletions package-lock.json

Large diffs are not rendered by default.

31 changes: 12 additions & 19 deletions src/screens/OrganizationPeople/AddMember.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useLazyQuery, useMutation, useQuery } from '@apollo/client';
import { Check, Close, Search } from '@mui/icons-material';
import { Check, Search } from '@mui/icons-material';
import EmailOutlinedIcon from '@mui/icons-material/EmailOutlined';
import Paper from '@mui/material/Paper';
import Table from '@mui/material/Table';
@@ -84,32 +84,25 @@ function AddMember(): JSX.Element {
const toggleDialogModal = (): void =>
setAddUserModalIsOpen(!addUserModalisOpen);

const [createNewUserModalisOpen, setCreateNewUserModalIsOpen] =
useState(false);
function openCreateNewUserModal(): void {
setCreateNewUserModalIsOpen(true);
}

function closeCreateNewUserModal(): void {
setCreateNewUserModalIsOpen(false);
}
const toggleCreateNewUserModal = (): void =>
setCreateNewUserModalIsOpen(!addUserModalisOpen);

const [addMember] = useMutation(ADD_MEMBER_MUTATION);
function useModal(initialState = false) {

function useModal(initialState = false): {
isOpen: boolean;
open: () => void;
close: () => void;
toggle: () => void;
} {
const [isOpen, setIsOpen] = useState(initialState);
const open = useCallback(() => setIsOpen(true), []);
const close = useCallback(() => setIsOpen(false), []);
const toggle = useCallback(() => setIsOpen((prev) => !prev), []);

return { isOpen, open, close, toggle };
}

const {
isOpen: createNewUserModalIsOpen1,
open: openCreateNewUserModal1,
close: closeCreateNewUserModal1,
isOpen: createNewUserModalisOpen,
open: openCreateNewUserModal,
close: closeCreateNewUserModal,
} = useModal();
const createMember = async (userId: string): Promise<void> => {
try {
@@ -435,7 +428,7 @@ function AddMember(): JSX.Element {
<Modal
data-testid="addNewUserModal"
show={createNewUserModalisOpen}
onHide={closeCreateNewUserModal1} // Use the close function directly
onHide={closeCreateNewUserModal} // Use the close function directly
>
<Modal.Header closeButton className={styles.createUserModalHeader}>
<Modal.Title>Create User</Modal.Title>
11 changes: 2 additions & 9 deletions src/screens/OrganizationPeople/OrganizationPeople.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { useLazyQuery } from '@apollo/client';
import { Delete, Search } from '@mui/icons-material';
import {
ORGANIZATIONS_LIST,
ORGANIZATIONS_MEMBER_CONNECTION_LIST,
@@ -10,7 +9,6 @@ import OrgAdminListCard from 'components/OrgAdminListCard/OrgAdminListCard';
import OrgPeopleListCard from 'components/OrgPeopleListCard/OrgPeopleListCard';
import dayjs from 'dayjs';
import React, { useEffect, useState } from 'react';
import { Button, Form } from 'react-bootstrap';
import Row from 'react-bootstrap/Row';
import { useTranslation } from 'react-i18next';
import { Link, useLocation, useParams } from 'react-router-dom';
@@ -21,9 +19,8 @@ import { DataGrid } from '@mui/x-data-grid';
import type { GridColDef, GridCellParams } from '@mui/x-data-grid';
import { Stack } from '@mui/material';
import Avatar from 'components/Avatar/Avatar';
import SortingButton from 'subComponents/SortingButton';
import { Dropdown } from 'react-bootstrap';
import { Sort } from '@mui/icons-material';
import { Button, Dropdown, Form } from 'react-bootstrap';
import { Delete, Search, Sort } from '@mui/icons-material';

/**
* OrganizationPeople component is used to display the list of members, admins and users of the organization.
@@ -306,10 +303,6 @@ function organizationPeople(): JSX.Element {
},
];

const handleSortChange = (value: string): void => {
setState(value === 'users' ? 2 : value === 'members' ? 0 : 1);
};

return (
<>
<Row className={styles.head}>