Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…awa-admin into session-timeout
  • Loading branch information
JordanCampbell1 committed Aug 20, 2024
2 parents 39fa76d + 6f65709 commit b1f4251
Show file tree
Hide file tree
Showing 27 changed files with 1,789 additions and 429 deletions.
653 changes: 321 additions & 332 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"type": "module",
"config-overrides-path": "scripts/config-overrides",
"dependencies": {
"@apollo/client": "^3.4.0-beta.19",
"@apollo/client": "^3.11.4",
"@apollo/link-error": "^2.0.0-beta.3",
"@apollo/react-testing": "^4.0.0",
"@dicebear/collection": "^8.0.1",
"@dicebear/core": "^8.0.1",
"@dicebear/core": "^8.0.2",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.11.5",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.16.1",
"@mui/material": "^5.16.4",
"@mui/material": "^5.16.7",
"@mui/private-theming": "^5.15.12",
"@mui/system": "^5.14.12",
"@mui/x-charts": "^7.8.0",
Expand All @@ -23,7 +23,7 @@
"@testing-library/react-hooks": "^8.0.1",
"bootstrap": "^5.3.3",
"customize-cra": "^1.0.0",
"dayjs": "^1.11.11",
"dayjs": "^1.11.12",
"flag-icons": "^6.6.6",
"graphql": "^16.9.0",
"graphql-tag": "^2.12.6",
Expand Down Expand Up @@ -111,15 +111,15 @@
"@types/react-dom": "^17.0.9",
"@types/react-google-recaptcha": "^2.1.5",
"@types/react-router-dom": "^5.1.8",
"@types/sanitize-html": "^2.11.0",
"@types/sanitize-html": "^2.13.0",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"@typescript-eslint/parser": "^5.9.0",
"cross-env": "^7.0.3",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^25.3.4",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-tsdoc": "^0.3.0",
"husky": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
Expand Down
12 changes: 12 additions & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,18 @@
"removeUserTagMessage": "Do you want to delete this tag?",
"addChildTag": "Add a Sub Tag"
},
"manageTag": {
"title": "Tag Details",
"addPeopleToTag": "Add People to tag",
"viewProfile": "View",
"noAssignedMembersFound": "No one assigned",
"unassignUserTag": "Unassign Tag",
"unassignUserTagMessage": "Do you want to remove the tag from this user?",
"successfullyUnassigned": "Tag unassigned from user",
"addPeople": "Add People",
"add": "Add",
"subTags": "Sub Tags"
},
"userListCard": {
"addAdmin": "Add Admin",
"addedAsAdmin": "User is added as admin."
Expand Down
12 changes: 12 additions & 0 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,18 @@
"removeUserTagMessage": "Voulez-vous supprimer cette étiquette ?",
"addChildTag": "Ajouter une Sous-Étiquette"
},
"manageTag": {
"title": "Détails de l'étiquette",
"addPeopleToTag": "Ajouter des personnes à l'étiquette",
"viewProfile": "Voir",
"noAssignedMembersFound": "Aucun membre assigné",
"unassignUserTag": "Désassigner l'étiquette",
"unassignUserTagMessage": "Voulez-vous retirer l'étiquette de cet utilisateur?",
"successfullyUnassigned": "Étiquette retirée de l'utilisateur",
"addPeople": "Ajouter des personnes",
"add": "Ajouter",
"subTags": "Sous-étiquettes"
},
"userListCard": {
"addAdmin": "Ajouter un administrateur",
"addedAsAdmin": "L'utilisateur est ajouté en tant qu'administrateur."
Expand Down
12 changes: 12 additions & 0 deletions public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,18 @@
"removeUserTagMessage": "क्या आप इस टैग को हटाना चाहते हैं?",
"addChildTag": "उप-टैग जोड़ें"
},
"manageTag": {
"title": "टैग विवरण",
"addPeopleToTag": "टैग में लोगों को जोड़ें",
"viewProfile": "देखें",
"noAssignedMembersFound": "कोई असाइन किए गए सदस्य नहीं मिले",
"unassignUserTag": "टैग को हटाएं",
"unassignUserTagMessage": "क्या आप इस उपयोगकर्ता से टैग हटाना चाहते हैं?",
"successfullyUnassigned": "उपयोगकर्ता से टैग हटा दिया गया",
"addPeople": "लोगों को जोड़ें",
"add": "जोड़ें",
"subTags": "उप-टैग्स"
},
"userListCard": {
"addAdmin": "व्यवस्थापक जोड़ें",
"addedAsAdmin": "उपयोगकर्ता को व्यवस्थापक के रूप में जोड़ा गया है."
Expand Down
12 changes: 12 additions & 0 deletions public/locales/sp/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,18 @@
"removeUserTagMessage": "¿Desea eliminar esta etiqueta?",
"addChildTag": "Agregar una Sub Etiqueta"
},
"manageTag": {
"title": "Detalles de la Etiqueta",
"addPeopleToTag": "Agregar Personas a la etiqueta",
"viewProfile": "Ver",
"noAssignedMembersFound": "Ningún miembro asignado",
"unassignUserTag": "Desasignar Etiqueta",
"unassignUserTagMessage": "¿Desea eliminar la etiqueta de este usuario?",
"successfullyUnassigned": "Etiqueta desasignada del usuario",
"addPeople": "Agregar Personas",
"add": "Agregar",
"subTags": "Subetiquetas"
},
"userListCard": {
"joined": "Unido",
"addAdmin": "Agregar administrador",
Expand Down
12 changes: 12 additions & 0 deletions public/locales/zh/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,18 @@
"removeUserTagMessage": "您确定要删除此标签吗?",
"addChildTag": "添加子标签"
},
"manageTag": {
"title": "标签详情",
"addPeopleToTag": "将人员添加到标签",
"viewProfile": "查看",
"noAssignedMembersFound": "没有分配成员",
"unassignUserTag": "取消分配标签",
"unassignUserTagMessage": "您想从此用户中删除标签吗?",
"successfullyUnassigned": "标签已从用户中取消分配",
"addPeople": "添加人员",
"add": "添加",
"subTags": "子标签"
},
"userListCard": {
"addAdmin": "添加管理员",
"addedAsAdmin": "用户被添加为管理员。"
Expand Down
13 changes: 4 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import OrganizaitionFundCampiagn from 'screens/OrganizationFundCampaign/Organiza
import OrganizationFunds from 'screens/OrganizationFunds/OrganizationFunds';
import OrganizationPeople from 'screens/OrganizationPeople/OrganizationPeople';
import OrganizationTags from 'screens/OrganizationTags/OrganizationTags';
// import OrganizationTagDetails from 'screens/OrgnanizationTagDetails/OrganizationTagDetails';
// import OrganizationTagChildTags from 'screens/OrganizationTagChildTags/OrganizationTagChildTags';
import ManageTag from 'screens/ManageTag/ManageTag';
import PageNotFound from 'screens/PageNotFound/PageNotFound';
import Requests from 'screens/Requests/Requests';
import Users from 'screens/Users/Users';
Expand Down Expand Up @@ -149,14 +148,10 @@ function app(): JSX.Element {
<Route path="/orgdash/:orgId" element={<OrganizationDashboard />} />
<Route path="/orgpeople/:orgId" element={<OrganizationPeople />} />
<Route path="/orgtags/:orgId" element={<OrganizationTags />} />
{/* <Route
path="orgtags/:orgId/orgtagdetails/:tagId"
element={<OrganizationTagDetails />}
/>
<Route
path="/orgtags/:orgId/orgtagChildTags/:tagId"
element={<OrganizationTagChildTags />}
/> */}
path="orgtags/:orgId/managetag/:tagId"
element={<ManageTag />}
/>
<Route path="/member/:orgId" element={<MemberDetail />} />
<Route path="/orgevents/:orgId" element={<OrganizationEvents />} />
<Route
Expand Down
52 changes: 26 additions & 26 deletions src/GraphQl/Mutations/TagMutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,35 @@ export const CREATE_USER_TAG = gql`
}
`;

// /**
// * GraphQL mutation to unsssign a user tag from a user.
// *
// * @param tagId - Id the tag.
// * @param userId - Id of the user to be unassigned.
// */
/**
* GraphQL mutation to unsssign a user tag from a user.
*
* @param tagId - Id the tag.
* @param userId - Id of the user to be unassigned.
*/

// export const UNASSIGN_USER_TAG = gql`
// mutation UnassignUserTag($tagId: ID!, $userId: ID!) {
// unassignUserTag(input: { tagId: $tagId, userId: $userId }) {
// _id
// }
// }
// `;
export const UNASSIGN_USER_TAG = gql`
mutation UnassignUserTag($tagId: ID!, $userId: ID!) {
unassignUserTag(input: { tagId: $tagId, userId: $userId }) {
_id
}
}
`;

// /**
// * GraphQL mutation to update a user tag.
// *
// * @param tagId - Id the tag.
// * @param name - Updated name of the tag.
// */
/**
* GraphQL mutation to update a user tag.
*
* @param tagId - Id the tag.
* @param name - Updated name of the tag.
*/

// export const UPDATE_USER_TAG = gql`
// mutation UpdateUserTag($tagId: ID!, $name: String!) {
// updateUserTag(input: { tagId: $tagId, name: $name }) {
// _id
// }
// }
// `;
export const UPDATE_USER_TAG = gql`
mutation UpdateUserTag($tagId: ID!, $name: String!) {
updateUserTag(input: { tagId: $tagId, name: $name }) {
_id
}
}
`;

/**
* GraphQL mutation to remove a user tag.
Expand Down
2 changes: 1 addition & 1 deletion src/GraphQl/Queries/Queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ export const GET_COMMUNITY_DATA = gql`
facebook
gitHub
instagram
twitter
X
linkedIn
youTube
reddit
Expand Down
80 changes: 80 additions & 0 deletions src/GraphQl/Queries/userTagQueries.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import gql from 'graphql-tag';

export const USER_TAGS_ASSIGNED_MEMBERS = gql`
query UserTagDetails(
$id: ID!
$after: String
$before: String
$first: PositiveInt
$last: PositiveInt
) {
getUserTag(id: $id) {
name
usersAssignedTo(
after: $after
before: $before
first: $first
last: $last
) {
edges {
node {
_id
firstName
lastName
}
}
pageInfo {
startCursor
endCursor
hasNextPage
hasPreviousPage
}
totalCount
}
}
}
`;

export const USER_TAG_CHILD_TAGS = gql`
query GetChildTags(
$id: ID!
$after: String
$before: String
$first: PositiveInt
$last: PositiveInt
) {
getUserTag(id: $id) {
name
childTags(after: $after, before: $before, first: $first, last: $last) {
edges {
node {
_id
name
usersAssignedTo(first: $first, last: $last) {
totalCount
}
childTags(first: $first, last: $last) {
totalCount
}
}
}
pageInfo {
startCursor
endCursor
hasNextPage
hasPreviousPage
}
totalCount
}
}
}
`;

export const USER_TAG_ANCESTORS = gql`
query GetUserTagAncestors($id: ID!) {
getUserTagAncestors(id: $id) {
_id
name
}
}
`;
File renamed without changes
4 changes: 2 additions & 2 deletions src/assets/svgs/social-icons/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import GithubLogo from './Github-Logo.svg';
import InstagramLogo from './Instagram-Logo.svg';
import LinkedInLogo from './Linkedin-Logo.svg';
import SlackLogo from './Slack-Logo.svg';
import TwitterLogo from './Twitter-Logo.svg';
import XLogo from './X-Logo.svg';
import YoutubeLogo from './Youtube-Logo.svg';
import RedditLogo from './Reddit-Logo.svg';

Expand All @@ -13,7 +13,7 @@ export {
InstagramLogo,
LinkedInLogo,
SlackLogo,
TwitterLogo,
XLogo,
YoutubeLogo,
RedditLogo,
};
8 changes: 4 additions & 4 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
GithubLogo,
InstagramLogo,
SlackLogo,
TwitterLogo,
XLogo,
YoutubeLogo,
RedditLogo,
} from 'assets/svgs/social-icons';
Expand All @@ -16,9 +16,9 @@ export const socialMediaLinks = [
logo: FacebookLogo,
},
{
tag: 'twitter',
href: 'https://twitter.com/palisadoesorg?lang=en',
logo: TwitterLogo,
tag: 'X',
href: 'https://X.com/palisadoesorg?lang=en',
logo: XLogo,
},
{
tag: 'linkedIn',
Expand Down
Loading

0 comments on commit b1f4251

Please sign in to comment.