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

Plugin and advertisement screen revamp #2006

Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6173faf
advertisement and plugin screen
duplixx May 24, 2024
afd1fa6
Merge branch 'develop' into plugin-advertisement-revamp
duplixx Nov 13, 2024
323a0c7
added revamped design
duplixx Nov 13, 2024
9bc0676
fixes added
duplixx Nov 13, 2024
9e12260
fixed testcases
duplixx Nov 14, 2024
82836f0
chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433)
dependabot[bot] Nov 14, 2024
a97314c
chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434)
dependabot[bot] Nov 14, 2024
32eb6a9
chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435)
dependabot[bot] Nov 14, 2024
ab509f6
chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436)
dependabot[bot] Nov 14, 2024
fb913e1
Update pull-request.yml
palisadoes Nov 14, 2024
d16b95e
Update dependabot.yaml
palisadoes Nov 16, 2024
15513f5
added docker check to workflow (#2414)
VanshikaSabharwal Nov 17, 2024
3ea2919
eslint-rule-no_unused_vars (#2428)
prayanshchh Nov 17, 2024
084ac7e
Updated pr template with checklist (#2454)
dhirajudhani Nov 20, 2024
32159c2
Merge branch 'develop-postgres' into plugin-advertisement-revamp
duplixx Nov 20, 2024
584662a
Merge branch 'develop' into plugin-advertisement-revamp
duplixx Nov 20, 2024
908e6c8
Merge remote-tracking branch 'upstream/develop-postgres' into plugin-…
duplixx Nov 27, 2024
fb55f35
Merge branch 'develop-postgres' into plugin-advertisement-revamp
duplixx Nov 28, 2024
a63e0d4
refactored addOnStore
duplixx Dec 1, 2024
f92cba1
Merge branch 'develop-postgres' into plugin-advertisement-revamp
duplixx Dec 1, 2024
a35b2ab
refactored addOnEntry v1
duplixx Dec 1, 2024
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 public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@
"register": "register"
},
"addOnStore": {
"title": "Add On Store",
"title": "Plugin Store",
"searchName": "Ex: Donations",
"search": "Search",
"enable": "Enabled",
Expand Down Expand Up @@ -1227,7 +1227,7 @@
"RstartDate": "Select Start Date",
"RendDate": "Select End Date",
"RClose": "Close the window",
"addNew": "Create new advertisement",
"addNew": "Create",
"EXname": "Ex. Cookie Shop",
"EXlink": "Ex. http://yourwebsite.com/photo",
"createAdvertisement": "Create Advertisement",
Expand Down
6 changes: 5 additions & 1 deletion src/components/AddOn/core/AddOnEntry/AddOnEntry.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
margin-left: auto;
display: flex !important;
align-items: center;
background-color: transparent;
color: #31bb6b;
}
.card {
border: 4px solid green;
}

.entryaction i {
margin-right: 8px;
}
Expand Down
12 changes: 8 additions & 4 deletions src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface InterfaceAddOnEntryProps {
component?: string; // Optional props
modified?: any; // Optional props
uninstalledOrgs: string[];
getInstalledPlugins: () => any;
getInstalledPlugins: () => void;
}

/**
Expand Down Expand Up @@ -59,6 +59,7 @@ function addOnEntry({

// Getting orgId from URL parameters
const { orgId: currentOrg } = useParams();
// console.log(currentOrg);
if (!currentOrg) {
// If orgId is not present in the URL, navigate to the org list page
return <Navigate to={'/orglist'} />;
Expand Down Expand Up @@ -101,7 +102,10 @@ function addOnEntry({

return (
<>
<Card data-testid="AddOnEntry">
<Card
data-testid="AddOnEntry"
style={{ border: '1px solid #31BB6B', borderRadius: '10px' }}
>
{/* {uninstalledOrgs.includes(currentOrg) && (
<Form.Check
type="switch"
Expand All @@ -114,7 +118,7 @@ function addOnEntry({
/>
)} */}
<Card.Body>
<Card.Title>{title}</Card.Title>
<Card.Title style={{ fontWeight: '800' }}>{title}</Card.Title>
<Card.Subtitle className="mb-2 text-muted author">
{createdBy}
</Card.Subtitle>
Expand All @@ -134,7 +138,7 @@ function addOnEntry({
<Spinner animation="grow" />
) : (
<i
className={!isInstalledLocal ? 'fa fa-trash' : 'fa fa-cubes'}
className={!isInstalledLocal ? 'fa fa-trash' : 'fa fa-plus'}
duplixx marked this conversation as resolved.
Show resolved Hide resolved
></i>
)}
{/* {installed ? 'Remove' : configurable ? 'Installed' : 'Install'} */}
Expand Down
45 changes: 43 additions & 2 deletions src/components/AddOn/core/AddOnStore/AddOnStore.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@
border-bottom: 3px solid #31bb6b;
width: 15%;
}

.actioninput {
.input {
display: flex;
position: relative;
width: 560px;
}
/* .actioninput {
text-decoration: none;
margin-bottom: 50px;
border-color: #e8e5e5;
Expand All @@ -23,9 +27,46 @@
padding-right: 10px;
padding-left: 10px;
box-shadow: none;
} */
.actioninput {
margin-top: 10px;
margin-bottom: 10px;
background-color: white;
box-shadow: 0 1px 1px #31bb6b;
}
.inputField > button {
padding-top: 10px;
padding-bottom: 10px;
}

.actionradio input {
width: fit-content;
margin: inherit;
}
.cardGridItem {
width: 38vw;
}
.justifysp {
display: grid;
width: 100%;
justify-content: space-between;
align-items: baseline;
grid-template-rows: auto;
grid-template-columns: repeat(2, 1fr);
grid-gap: 0.8rem 0.4rem;
}

@media screen and (max-width: 600px) {
.cardGridItem {
width: 100%;
}
.justifysp {
display: grid;
width: 100%;
justify-content: center;
align-items: start;
grid-template-rows: auto;
grid-template-columns: 1fr;
grid-gap: 0.8rem 0.4rem;
}
}
20 changes: 12 additions & 8 deletions src/components/AddOn/core/AddOnStore/AddOnStore.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,18 @@ describe('Testing AddOnStore Component', () => {
await wait();
userEvent.click(screen.getByText('Installed'));

expect(screen.getByText('Filters')).toBeInTheDocument();
expect(screen.getByLabelText('Enabled')).toBeInTheDocument();
expect(screen.getByLabelText('Disabled')).toBeInTheDocument();

fireEvent.click(screen.getByLabelText('Enabled'));
expect(screen.getByLabelText('Enabled')).toBeChecked();
fireEvent.click(screen.getByLabelText('Disabled'));
expect(screen.getByLabelText('Disabled')).toBeChecked();
// Updated expectations to match actual component content
const dropdownButton = screen.getByRole('button', { name: /enabled/i });
expect(dropdownButton).toBeInTheDocument();

// Click dropdown to show options
userEvent.click(dropdownButton);

// Check for dropdown options
expect(
screen.getByRole('button', { name: /enabled/i }),
).toBeInTheDocument();
expect(screen.getByText(/disabled/i)).toBeInTheDocument();
});

test('check the working search bar when on Installed tab', async () => {
Expand Down
Loading
Loading