Skip to content

Commit

Permalink
fix: formatting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
disha1202 committed Jan 18, 2024
1 parent d0c419f commit 7a31c8e
Show file tree
Hide file tree
Showing 182 changed files with 1,127 additions and 1,032 deletions.
8 changes: 4 additions & 4 deletions src/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('Testing the App Component', () => {
</I18nextProvider>
</Provider>
</BrowserRouter>
</MockedProvider>
</MockedProvider>,
);

await wait();
Expand All @@ -71,8 +71,8 @@ describe('Testing the App Component', () => {
expect(window.location).toBeAt('/orglist');
expect(
screen.getByText(
'An open source application by Palisadoes Foundation volunteers'
)
'An open source application by Palisadoes Foundation volunteers',
),
).toBeTruthy();
});

Expand All @@ -86,7 +86,7 @@ describe('Testing the App Component', () => {
</I18nextProvider>
</Provider>
</BrowserRouter>
</MockedProvider>
</MockedProvider>,
);

await wait();
Expand Down
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function app(): JSX.Element {
if (data) {
localStorage.setItem(
'name',
`${data.checkAuth.firstName} ${data.checkAuth.lastName}`
`${data.checkAuth.firstName} ${data.checkAuth.lastName}`,
);
localStorage.setItem('id', data.checkAuth._id);
localStorage.setItem('email', data.checkAuth.email);
Expand All @@ -89,7 +89,7 @@ function app(): JSX.Element {
component={extraComponent}
/>
);
}
},
);

if (loading) {
Expand Down
4 changes: 2 additions & 2 deletions src/Constant/constant.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ describe('constants', () => {

it('RECAPTCHA_SITE_KEY should be equal to REACT_APP_RECAPTCHA_SITE_KEY environment variable', () => {
expect(RECAPTCHA_SITE_KEY).toEqual(
process.env.REACT_APP_RECAPTCHA_SITE_KEY
process.env.REACT_APP_RECAPTCHA_SITE_KEY,
);
});

it('REACT_APP_USE_RECAPTCHA should be equal to REACT_APP_USE_RECAPTCHA environment variable', () => {
expect(REACT_APP_USE_RECAPTCHA).toEqual(
process.env.REACT_APP_USE_RECAPTCHA
process.env.REACT_APP_USE_RECAPTCHA,
);
});
});
69 changes: 51 additions & 18 deletions src/assets/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2181,7 +2181,9 @@ progress {
border: 0 solid var(--bs-border-color);
appearance: none;
border-radius: var(--bs-border-radius);
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
transition:
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
}
@media (prefers-reduced-motion: reduce) {
.form-control {
Expand Down Expand Up @@ -2230,8 +2232,11 @@ progress {
border-width: 0;
border-inline-end-width: 0;
border-radius: 0;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
}
@media (prefers-reduced-motion: reduce) {
.form-control::file-selector-button {
Expand Down Expand Up @@ -2338,7 +2343,9 @@ textarea.form-control-lg {
background-size: 16px 12px;
border: 0 solid var(--bs-border-color);
border-radius: var(--bs-border-radius);
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
transition:
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
appearance: none;
}
@media (prefers-reduced-motion: reduce) {
Expand Down Expand Up @@ -2528,10 +2535,14 @@ textarea.form-control-lg {
outline: 0;
}
.form-range:focus::-webkit-slider-thumb {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(49, 187, 107, 0.25);
box-shadow:
0 0 0 1px #fff,
0 0 0 0.25rem rgba(49, 187, 107, 0.25);
}
.form-range:focus::-moz-range-thumb {
box-shadow: 0 0 0 1px #fff, 0 0 0 0.25rem rgba(49, 187, 107, 0.25);
box-shadow:
0 0 0 1px #fff,
0 0 0 0.25rem rgba(49, 187, 107, 0.25);
}
.form-range::-moz-focus-outer {
border: 0;
Expand All @@ -2543,7 +2554,9 @@ textarea.form-control-lg {
background-color: #31bb6b;
border: 0;
border-radius: 1rem;
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out,
transition:
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
appearance: none;
}
Expand All @@ -2570,7 +2583,9 @@ textarea.form-control-lg {
background-color: #31bb6b;
border: 0;
border-radius: 1rem;
transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out,
transition:
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
appearance: none;
}
Expand Down Expand Up @@ -2625,7 +2640,9 @@ textarea.form-control-lg {
pointer-events: none;
border: 0 solid transparent;
transform-origin: 0 0;
transition: opacity 0.1s ease-in-out, transform 0.1s ease-in-out;
transition:
opacity 0.1s ease-in-out,
transform 0.1s ease-in-out;
}
@media (prefers-reduced-motion: reduce) {
.form-floating > label {
Expand Down Expand Up @@ -2860,8 +2877,12 @@ textarea.form-control.is-valid {
.form-select.is-valid:not([multiple])[size='1'] {
--bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%2331bb6b' d='M2.3 6.73.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
padding-right: 5.5rem;
background-position: right 1rem center, center right 3rem;
background-size: 16px 12px, calc(0.75em + 0.7rem) calc(0.75em + 0.7rem);
background-position:
right 1rem center,
center right 3rem;
background-size:
16px 12px,
calc(0.75em + 0.7rem) calc(0.75em + 0.7rem);
}
.was-validated .form-select:valid:focus,
.form-select.is-valid:focus {
Expand Down Expand Up @@ -2964,8 +2985,12 @@ textarea.form-control.is-invalid {
.form-select.is-invalid:not([multiple])[size='1'] {
--bs-form-select-bg-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23dc3545'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e");
padding-right: 5.5rem;
background-position: right 1rem center, center right 3rem;
background-size: 16px 12px, calc(0.75em + 0.7rem) calc(0.75em + 0.7rem);
background-position:
right 1rem center,
center right 3rem;
background-size:
16px 12px,
calc(0.75em + 0.7rem) calc(0.75em + 0.7rem);
}
.was-validated .form-select:invalid:focus,
.form-select.is-invalid:focus {
Expand Down Expand Up @@ -3040,8 +3065,11 @@ textarea.form-control.is-invalid {
border: var(--bs-btn-border-width) solid var(--bs-btn-border-color);
border-radius: var(--bs-btn-border-radius);
background-color: var(--bs-btn-bg);
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
}
@media (prefers-reduced-motion: reduce) {
.btn {
Expand Down Expand Up @@ -3906,7 +3934,9 @@ fieldset:disabled .btn {
color: var(--bs-nav-link-color);
background: none;
border: 0;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out;
}
@media (prefers-reduced-motion: reduce) {
Expand Down Expand Up @@ -4880,8 +4910,11 @@ fieldset:disabled .btn {
background-color: var(--bs-pagination-bg);
border: var(--bs-pagination-border-width) solid
var(--bs-pagination-border-color);
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
}
@media (prefers-reduced-motion: reduce) {
.page-link {
Expand Down
4 changes: 3 additions & 1 deletion src/assets/scss/components/_accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ $accordion-button-padding-y: $accordion-padding-y;
$accordion-button-padding-x: $accordion-padding-x;
$accordion-button-color: var(--#{$prefix}body-color);
$accordion-button-bg: var(--#{$prefix}accordion-bg);
$accordion-transition: $btn-transition, border-radius 0.15s ease;
$accordion-transition:
$btn-transition,
border-radius 0.15s ease;
$accordion-button-active-bg: var(--#{$prefix}primary-bg-subtle);
$accordion-button-active-color: var(--#{$prefix}primary-text-emphasis);

Expand Down
11 changes: 8 additions & 3 deletions src/assets/scss/components/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ $btn-font-size-lg: $input-btn-font-size-lg;
$btn-border-width: $input-btn-border-width;

$btn-font-weight: $font-weight-normal;
$btn-box-shadow: inset 0 1px 0 rgba($white, 0.15), 0 1px 1px rgba($black, 0.075);
$btn-box-shadow:
inset 0 1px 0 rgba($white, 0.15),
0 1px 1px rgba($black, 0.075);
$btn-focus-width: $input-btn-focus-width;
$btn-focus-box-shadow: $input-btn-focus-box-shadow;
$btn-disabled-opacity: 0.65;
Expand All @@ -32,8 +34,11 @@ $btn-border-radius: var(--#{$prefix}border-radius);
$btn-border-radius-sm: var(--#{$prefix}border-radius-sm);
$btn-border-radius-lg: var(--#{$prefix}border-radius-lg);

$btn-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
$btn-transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;

$btn-hover-bg-shade-amount: 15%;
$btn-hover-bg-tint-amount: 15%;
Expand Down
6 changes: 4 additions & 2 deletions src/assets/scss/components/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ $nav-link-font-size: null;
$nav-link-font-weight: null;
$nav-link-color: var(--#{$prefix}link-color);
$nav-link-hover-color: var(--#{$prefix}link-hover-color);
$nav-link-transition: color 0.15s ease-in-out,
background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
$nav-link-transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out;
$nav-link-disabled-color: var(--#{$prefix}secondary-color);
$nav-link-focus-box-shadow: $focus-ring-box-shadow;

Expand Down
6 changes: 4 additions & 2 deletions src/assets/scss/components/_pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ $pagination-disabled-color: var(--#{$prefix}secondary-color);
$pagination-disabled-bg: var(--#{$prefix}secondary-bg);
$pagination-disabled-border-color: var(--#{$prefix}border-color);

$pagination-transition: color 0.15s ease-in-out,
background-color 0.15s ease-in-out, border-color 0.15s ease-in-out,
$pagination-transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;

$pagination-border-radius-sm: var(--#{$prefix}border-radius-sm);
Expand Down
4 changes: 3 additions & 1 deletion src/assets/scss/forms/_floating-label.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ $form-floating-label-opacity: 0.65;
$form-floating-label-transform: scale(0.85) translateY(-0.5rem)
translateX(0.15rem);
$form-floating-label-disabled-color: $gray-600;
$form-floating-transition: opacity 0.1s ease-in-out, transform 0.1s ease-in-out;
$form-floating-transition:
opacity 0.1s ease-in-out,
transform 0.1s ease-in-out;
4 changes: 3 additions & 1 deletion src/assets/scss/forms/_form-control.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ $input-height-lg: add(
add($input-padding-y-lg * 2, $input-height-border, false)
);

$input-transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
$input-transition:
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;

$form-color-width: 3rem;

Expand Down
10 changes: 7 additions & 3 deletions src/assets/scss/forms/_range.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ $form-range-thumb-bg: $component-active-bg;
$form-range-thumb-border: 0;
$form-range-thumb-border-radius: 1rem;
$form-range-thumb-box-shadow: 0 0.1rem 0.25rem rgba($black, 0.1);
$form-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-focus-box-shadow;
$form-range-thumb-focus-box-shadow:
0 0 0 1px $body-bg,
$input-focus-box-shadow;
$form-range-thumb-focus-box-shadow-width: $input-focus-width; // For focus box shadow issue in Edge
$form-range-thumb-active-bg: tint-color($component-active-bg, 70%);
$form-range-thumb-disabled-bg: var(--#{$prefix}secondary-color);
$form-range-thumb-transition: background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
$form-range-thumb-transition:
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
box-shadow 0.15s ease-in-out;
2 changes: 1 addition & 1 deletion src/components/AddOn/AddOn.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('Testing Addon component', () => {
</I18nextProvider>
</Provider>
</BrowserRouter>
</MockedProvider>
</MockedProvider>,
);

expect(getByTestId('pluginContainer')).toBeInTheDocument();
Expand Down
12 changes: 6 additions & 6 deletions src/components/AddOn/core/AddOnEntry/AddOnEntry.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('Testing AddOnEntry', () => {
</I18nextProvider>
</BrowserRouter>
</Provider>
</ApolloProvider>
</ApolloProvider>,
);
expect(getByTestId('AddOnEntry')).toBeInTheDocument();
});
Expand Down Expand Up @@ -95,7 +95,7 @@ describe('Testing AddOnEntry', () => {
</I18nextProvider>
</BrowserRouter>
</Provider>
</ApolloProvider>
</ApolloProvider>,
);

expect(getByText('Test Addon')).toBeInTheDocument();
Expand Down Expand Up @@ -130,22 +130,22 @@ describe('Testing AddOnEntry', () => {
</I18nextProvider>
</BrowserRouter>
</Provider>
</MockedProvider>
</MockedProvider>,
);
await wait(100);
const btn = getByTestId('AddOnEntry_btn_install');
await userEvent.click(btn);
await wait(100);
expect(btn.innerHTML).toMatch(/Install/i);
expect(
await findByText('This feature is now removed from your organization')
await findByText('This feature is now removed from your organization'),
).toBeInTheDocument();
await userEvent.click(btn);
await wait(100);

expect(btn.innerHTML).toMatch(/Uninstall/i);
expect(
await findByText('This feature is now enabled in your organization')
await findByText('This feature is now enabled in your organization'),
).toBeInTheDocument();
});

Expand Down Expand Up @@ -176,7 +176,7 @@ describe('Testing AddOnEntry', () => {
</I18nextProvider>
</BrowserRouter>
</Provider>
</MockedProvider>
</MockedProvider>,
);
await wait(100);
const btn = getByTestId('AddOnEntry_btn_install');
Expand Down
4 changes: 2 additions & 2 deletions src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ function addOnEntry({
const currentOrg = window.location.href.split('/id=')[1] + '';
const [buttonLoading, setButtonLoading] = useState(false);
const [isInstalledLocal, setIsInstalledLocal] = useState(
uninstalledOrgs.includes(currentOrg)
uninstalledOrgs.includes(currentOrg),
);
// const [addOrgAsUninstalled] = useMutation(UPDATE_ORG_STATUS_PLUGIN_MUTATION);
const [addOrgAsUninstalled] = useMutation(
UPDATE_INSTALL_STATUS_PLUGIN_MUTATION
UPDATE_INSTALL_STATUS_PLUGIN_MUTATION,
);

const togglePluginInstall = async (): Promise<void> => {
Expand Down
Loading

0 comments on commit 7a31c8e

Please sign in to comment.