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.

Sign up for GitHub

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 10 commits into from
Jan 14, 2025
Merged

Updating to NEW COLOR SCHEME #2984

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc1c534
changed green to blue
rahul-fl Dec 28, 2024
e6ce151
resolved merge conflicts
rahulch07 Jan 2, 2025
771a202
updated funds section
rahulch07 Jan 2, 2025
fa19b90
people section css updated
rahulch07 Jan 4, 2025
7a3b7d0
resolved merge conflicts
rahulch07 Jan 6, 2025
8090392
updated Tags section
rahulch07 Jan 6, 2025
8173931
Merge branch 'develop-postgres' into update-css-2880
rahulch07 Jan 11, 2025
851e246
venues, action items, advertisments, plugins sections updated
rahulch07 Jan 11, 2025
43c9220
fixed code coverage test
rahulch07 Jan 11, 2025
b5e6d4f
fixed code coverage test
rahulch07 Jan 11, 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
4 changes: 2 additions & 2 deletions src/assets/css/app.css
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions src/components/OrgListCard/OrgListCard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down
17 changes: 10 additions & 7 deletions src/screens/FundCampaignPledge/FundCampaignPledge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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}`}
Expand All @@ -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')}
Expand All @@ -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>
Expand All @@ -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 />
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/screens/FundCampaignPledge/PledgeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')}
Expand Down
5 changes: 3 additions & 2 deletions src/screens/OrgList/OrgList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ function orgList(): JSX.Element {
<Form.Control
type="name"
id="searchOrgname"
className={'bg-white'}
className={styles.inputField}
placeholder={tCommon('searchByName')}
data-testid="searchByName"
autoComplete="off"
Expand All @@ -346,7 +346,7 @@ function orgList(): JSX.Element {
<Button
tabIndex={-1}
// className={`position-absolute z-10 bottom-0 end-0 h-100 d-flex justify-content-center align-items-center`}
className={styles.searchButtonOrgList}
className={styles.searchButton}
onClick={handleSearchByBtnClick}
data-testid="searchBtn"
>
Expand All @@ -366,6 +366,7 @@ function orgList(): JSX.Element {
sortingState.option === '' ? 'outline-success' : 'success'
}
data-testid="sortOrgs"
className={styles.dropdown}
>
<SortIcon className={'me-1'} />
{sortingState.selectedOption}
Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrganizationFundCampaign/CampaignModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ const CampaignModal: React.FC<InterfaceCampaignModal> = ({
{/* Button to create the campaign */}
<Button
type="submit"
className={styles.greenregbtnOrganizationFundCampaign}
className={styles.addButton}
data-testid="submitCampaignBtn"
>
{t(mode === 'edit' ? 'updateCampaign' : 'createCampaign')}
Expand Down
139 changes: 69 additions & 70 deletions src/screens/OrganizationFundCampaign/OrganizationFundCampagins.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ const orgFundCampaign = (): JSX.Element => {
<Button
variant="success"
size="sm"
className="me-2 rounded"
className={styles.editButton}
data-testid="editCampaignBtn"
onClick={() =>
handleOpenModal(
Expand Down Expand Up @@ -312,7 +312,7 @@ const orgFundCampaign = (): JSX.Element => {
<Button
variant="outline-success"
size="sm"
className="rounded"
className={styles.editButton}
data-testid="viewBtn"
onClick={() => handleClick(params.row.campaign._id as string)}
>
Expand All @@ -339,76 +339,75 @@ const orgFundCampaign = (): JSX.Element => {
<Typography color="text.primary">{t('title')}</Typography>
</Breadcrumbs>

<div className={styles.btnsContainerOrganizationFundCampaign}>
<div className={styles.inputOrganizationFundCampaign}>
<Form.Control
type="name"
placeholder={tCommon('searchByName')}
autoComplete="off"
required
className={styles.inputFieldOrganizationFundCampaign}
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
data-testid="searchFullName"
/>
<Button
className="position-absolute z-10 bottom-0 end-0 d-flex justify-content-center align-items-center"
data-testid="searchBtn"
>
<Search />
</Button>
</div>
<div className={styles.btnsBbtnsBlockOrganizationFundCampaignlock}>
<div className="d-flex justify-space-between">
<Dropdown>
<Dropdown.Toggle
<div className={styles.head}>
<div className={`${styles.btnsContainer} gap-4 flex-wrap`}>
<div className={`${styles.input} mb-1`}>
<Form.Control
type="name"
placeholder={tCommon('searchByName')}
autoComplete="off"
required
className={styles.inputField}
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
data-testid="searchFullName"
/>
<Button className={styles.searchButton} data-testid="searchBtn">
<Search />
</Button>
</div>
<div className="d-flex gap-4 mb-1">
<div className={'d-flex justify-space-between align-items-center'}>
<Dropdown>
<Dropdown.Toggle
variant="success"
id="dropdown-basic"
className={styles.dropdown}
data-testid="filter"
>
<Sort className={'me-1'} />
{tCommon('sort')}
</Dropdown.Toggle>
<Dropdown.Menu>
<Dropdown.Item
onClick={() => setSortBy('fundingGoal_ASC')}
data-testid="fundingGoal_ASC"
>
{t('lowestGoal')}
</Dropdown.Item>
<Dropdown.Item
onClick={() => setSortBy('fundingGoal_DESC')}
data-testid="fundingGoal_DESC"
>
{t('highestGoal')}
</Dropdown.Item>
<Dropdown.Item
onClick={() => setSortBy('endDate_DESC')}
data-testid="endDate_DESC"
>
{t('latestEndDate')}
</Dropdown.Item>
<Dropdown.Item
onClick={() => setSortBy('endDate_ASC')}
data-testid="endDate_ASC"
>
{t('earliestEndDate')}
</Dropdown.Item>
</Dropdown.Menu>
</Dropdown>
</div>
<div className="">
<Button
variant="success"
id="dropdown-basic"
className={styles.dropdownOrganizationFundCampaign}
data-testid="filter"
className={styles.createButton}
onClick={() => handleOpenModal(null, 'create')}
data-testid="addCampaignBtn"
disabled={isArchived}
>
<Sort className={'me-1'} />
{tCommon('sort')}
</Dropdown.Toggle>
<Dropdown.Menu>
<Dropdown.Item
onClick={() => setSortBy('fundingGoal_ASC')}
data-testid="fundingGoal_ASC"
>
{t('lowestGoal')}
</Dropdown.Item>
<Dropdown.Item
onClick={() => setSortBy('fundingGoal_DESC')}
data-testid="fundingGoal_DESC"
>
{t('highestGoal')}
</Dropdown.Item>
<Dropdown.Item
onClick={() => setSortBy('endDate_DESC')}
data-testid="endDate_DESC"
>
{t('latestEndDate')}
</Dropdown.Item>
<Dropdown.Item
onClick={() => setSortBy('endDate_ASC')}
data-testid="endDate_ASC"
>
{t('earliestEndDate')}
</Dropdown.Item>
</Dropdown.Menu>
</Dropdown>
</div>
<div>
<Button
variant="success"
className={styles.orgFundCampaignButton}
onClick={() => handleOpenModal(null, 'create')}
data-testid="addCampaignBtn"
disabled={isArchived}
>
<i className={'fa fa-plus me-2'} />
{t('addCampaign')}
</Button>
<i className={'fa fa-plus me-2'} />
{t('addCampaign')}
</Button>
</div>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/screens/OrganizationFunds/FundModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ const FundModal: React.FC<InterfaceFundModal> = ({
type="checkbox"
checked={formState.taxDeductible}
data-testid="setTaxDeductibleSwitch"
className="ms-2"
className={`ms-2 ${styles.switch}`}
onChange={() =>
setFormState({
...formState,
Expand All @@ -241,7 +241,7 @@ const FundModal: React.FC<InterfaceFundModal> = ({
<label>{t('default')} </label>
<Form.Switch
type="checkbox"
className="ms-2"
className={`ms-2 ${styles.switch}`}
data-testid="setDefaultSwitch"
checked={formState.isDefault}
onChange={() =>
Expand All @@ -259,7 +259,7 @@ const FundModal: React.FC<InterfaceFundModal> = ({
type="checkbox"
checked={formState.isArchived}
data-testid="archivedSwitch"
className="ms-2"
className={`ms-2 ${styles.switch}`}
onChange={() =>
setFormState({
...formState,
Expand Down
Loading
Loading