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

Updating to NEW COLOR SCHEME #2984

Merged
Merged
Changes from 6 commits
Commits
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
4 changes: 2 additions & 2 deletions src/assets/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 0 additions & 54 deletions src/components/AddPeopleToTag/AddPeopleToTag.module.css

This file was deleted.

18 changes: 11 additions & 7 deletions src/components/AddPeopleToTag/AddPeopleToTag.tsx
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import React, { useEffect, useState } from 'react';
import { Modal, Form, Button } from 'react-bootstrap';
import { useParams } from 'react-router-dom';
import type { InterfaceQueryUserTagsMembersToAssignTo } from 'utils/interfaces';
import styles from './AddPeopleToTag.module.css';
import styles from '../../style/app.module.css';
import type { InterfaceTagUsersToAssignToQuery } from 'utils/organizationTagsUtils';
import {
TAGS_QUERY_DATA_CHUNK_SIZE,
@@ -244,7 +244,10 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
data-testid={
isToBeAssigned ? 'deselectMemberBtn' : 'selectMemberBtn'
}
variant={!isToBeAssigned ? 'primary' : 'danger'}
// variant={!isToBeAssigned ? 'primary' : 'danger'}
className={
!isToBeAssigned ? styles.editButton : `btn btn-danger btn-sm`
}
>
{isToBeAssigned ? 'x' : '+'}
</Button>
@@ -263,7 +266,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
centered
>
<Modal.Header
className="bg-primary"
className={`bg-primary ${styles.modalHeader}`}
data-testid="modalOrganizationHeader"
closeButton
>
@@ -301,7 +304,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
<Form.Control
type="text"
id="firstName"
className="bg-light"
className={`bg-light ${styles.inputField}`}
placeholder={tCommon('firstName')}
onChange={(e) =>
setMemberToAssignToSearchFirstName(e.target.value.trim())
@@ -315,7 +318,7 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
<Form.Control
type="text"
id="lastName"
className="bg-light"
className={`bg-light ${styles.inputField}`}
placeholder={tCommon('lastName')}
onChange={(e) =>
setMemberToAssignToSearchLastName(e.target.value.trim())
@@ -396,16 +399,17 @@ const AddPeopleToTag: React.FC<InterfaceAddPeopleToTagProps> = ({
<Modal.Footer>
<Button
onClick={hideAddPeopleToTagModal}
variant="outline-secondary"
variant="outline-danger"
data-testid="closeAddPeopleToTagModal"
className={styles.removeButton}
>
{tCommon('cancel')}
</Button>
<Button
type="submit"
disabled={addPeopleToTagLoading}
variant="primary"
data-testid="assignPeopleBtn"
className={styles.addButton}
>
{t('assign')}
</Button>
4 changes: 4 additions & 0 deletions src/components/OrgListCard/OrgListCard.module.css
Original file line number Diff line number Diff line change
@@ -60,6 +60,10 @@
border: 1px solid var(--dropdown-border-color);
}

.manageBtn:hover {
border: 1px solid var(--dropdown-border-color) !important;
}

.orgName {
text-overflow: ellipsis;
white-space: nowrap;
2 changes: 1 addition & 1 deletion src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ function orgPeopleListCard(
{/* Button to confirm the removal action */}
<Button
type="button"
className={styles.yesButton}
className={styles.regularBtn}
onClick={removeMember}
data-testid="removeMemberBtn"
>
42 changes: 0 additions & 42 deletions src/components/TagActions/TagActions.module.css

This file was deleted.

15 changes: 10 additions & 5 deletions src/components/TagActions/TagActions.tsx
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import type {
InterfaceQueryOrganizationUserTags,
InterfaceTagData,
} from 'utils/interfaces';
import styles from './TagActions.module.css';
import styles from '../../style/app.module.css';
import { ORGANIZATION_USER_TAGS_LIST } from 'GraphQl/Queries/OrganizationQueries';
import {
ASSIGN_TO_TAGS,
@@ -270,7 +270,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
centered
>
<Modal.Header
className="bg-primary"
className={styles.modalHeader}
data-testid="modalOrganizationHeader"
closeButton
>
@@ -312,7 +312,7 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({
<Form.Control
type="text"
id="userName"
className="bg-light"
className={styles.inputField}
placeholder={tCommon('searchByName')}
onChange={(e) => setTagSearchName(e.target.value.trim())}
data-testid="searchByName"
@@ -388,13 +388,18 @@ const TagActions: React.FC<InterfaceTagActionsProps> = ({

<Modal.Footer>
<Button
variant="secondary"
className={`btn btn-danger ${styles.removeButton}`}
onClick={(): void => hideTagActionsModal()}
data-testid="closeTagActionsModalBtn"
>
{tCommon('cancel')}
</Button>
<Button type="submit" value="add" data-testid="tagActionSubmitBtn">
<Button
type="submit"
value="add"
data-testid="tagActionSubmitBtn"
className={`btn ${styles.addButton}`}
>
{tagActionType === 'assignToTags' ? t('assign') : t('remove')}
</Button>
</Modal.Footer>
2 changes: 1 addition & 1 deletion src/components/TagActions/TagNode.tsx
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import type {
} from 'utils/interfaces';
import type { InterfaceOrganizationSubTagsQuery } from 'utils/organizationTagsUtils';
import { TAGS_QUERY_DATA_CHUNK_SIZE } from 'utils/organizationTagsUtils';
import styles from './TagActions.module.css';
import styles from '../../style/app.module.css';
import InfiniteScroll from 'react-infinite-scroll-component';
import InfiniteScrollLoader from 'components/InfiniteScrollLoader/InfiniteScrollLoader';
import { WarningAmberRounded } from '@mui/icons-material';
17 changes: 10 additions & 7 deletions src/screens/FundCampaignPledge/FundCampaignPledge.tsx
Original file line number Diff line number Diff line change
@@ -356,7 +356,7 @@ const fundCampaignPledge = (): JSX.Element => {
<Button
variant="success"
size="sm"
className="me-2 rounded"
className={`me-2 ${styles.editButton}`}
data-testid="editPledgeBtn"
onClick={() =>
handleOpenModal(params.row as InterfacePledgeInfo, 'edit')
@@ -429,7 +429,9 @@ const fundCampaignPledge = (): JSX.Element => {
name="btnradio"
id="pledgedRadio"
checked={progressIndicator === 'pledged'}
onChange={() => setProgressIndicator('pledged')}
onChange={() => {
setProgressIndicator('pledged');
}}
/>
<label
className={`btn btn-outline-primary ${styles.toggleBtnPledge}`}
@@ -440,7 +442,7 @@ const fundCampaignPledge = (): JSX.Element => {

<input
type="radio"
className={`btn-check`}
className={`btn-check ${styles.toggleBtnPledge}`}
name="btnradio"
id="raisedRadio"
onChange={() => setProgressIndicator('raised')}
@@ -462,6 +464,7 @@ const fundCampaignPledge = (): JSX.Element => {
max={campaignInfo?.goal}
style={{ height: '1.5rem', fontSize: '0.9rem' }}
data-testid="progressBar"
className={`${styles.progressBar}`}
/>
<div className={styles.endpoints}>
<div className={styles.start}>$0</div>
@@ -471,20 +474,20 @@ const fundCampaignPledge = (): JSX.Element => {
</div>
</div>
<div className={`${styles.btnsContainerPledge} gap-4 flex-wrap`}>
<div className={`${styles.inputPledge} mb-1`}>
<div className={`${styles.input} mb-1`}>
<Form.Control
type="name"
placeholder={t('searchPledger')}
autoComplete="off"
required
className={styles.inputFieldPledge}
className={styles.inputField}
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
data-testid="searchPledger"
/>
<Button
tabIndex={-1}
className={`position-absolute z-10 bottom-0 end-0 d-flex justify-content-center align-items-center`}
className={`${styles.searchButton}`}
data-testid="searchBtn"
>
<Search />
@@ -533,7 +536,7 @@ const fundCampaignPledge = (): JSX.Element => {
<div>
<Button
variant="success"
className={styles.orgFundCampaignButton}
className={styles.dropdown}
disabled={endDate < new Date()}
onClick={() => handleOpenModal(null, 'create')}
data-testid="addPledgeBtn"
2 changes: 1 addition & 1 deletion src/screens/FundCampaignPledge/PledgeModal.tsx
Original file line number Diff line number Diff line change
@@ -343,7 +343,7 @@ const PledgeModal: React.FC<InterfacePledgeModal> = ({
{/* Button to submit the pledge form */}
<Button
type="submit"
className={styles.greenregbtnPledge}
className={styles.addButton}
data-testid="submitPledgeBtn"
>
{t(mode === 'edit' ? 'updatePledge' : 'createPledge')}
13 changes: 10 additions & 3 deletions src/screens/ManageTag/EditUserTagModal.tsx
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ import type { TFunction } from 'i18next';
import type { FormEvent } from 'react';
import React from 'react';
import { Button, Form, Modal } from 'react-bootstrap';
import styles from '../../style/app.module.css';

/**
* Edit UserTag Modal component for the Manage Tag screen.
@@ -37,7 +38,7 @@ const EditUserTagModal: React.FC<InterfaceEditUserTagModalProps> = ({
centered
>
<Modal.Header
className="bg-primary"
className={styles.modalHeader}
data-testid="modalOrganizationHeader"
closeButton
>
@@ -56,7 +57,7 @@ const EditUserTagModal: React.FC<InterfaceEditUserTagModalProps> = ({
<Form.Control
type="text"
id="tagName"
className="mb-3"
className={`mb-3 ${styles.inputField}`}
placeholder={t('tagNamePlaceholder')}
data-testid="tagNameInput"
autoComplete="off"
@@ -73,10 +74,16 @@ const EditUserTagModal: React.FC<InterfaceEditUserTagModalProps> = ({
variant="secondary"
onClick={(): void => hideEditUserTagModal()}
data-testid="closeEditTagModalBtn"
className={styles.removeButton}
>
{tCommon('cancel')}
</Button>
<Button type="submit" value="invite" data-testid="editTagSubmitBtn">
<Button
type="submit"
value="invite"
data-testid="editTagSubmitBtn"
className={styles.addButton}
>
{tCommon('edit')}
</Button>
</Modal.Footer>
Loading