Skip to content

Commit

Permalink
venues, action items, advertisments, plugins sections updated
Browse files Browse the repository at this point in the history
  • Loading branch information
rahulch07 committed Jan 11, 2025
1 parent 8173931 commit 851e246
Show file tree
Hide file tree
Showing 17 changed files with 260 additions and 214 deletions.
6 changes: 5 additions & 1 deletion src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ function addOnEntry({
</Card.Subtitle>
<Card.Text>{description}</Card.Text>
<Button
className={styles.entryaction}
className={
uninstalledOrgs.includes(currentOrg)
? styles.addButton
: `btn btn-danger ${styles.removeButton}`
}
variant="primary"
// disabled={buttonLoading || !configurable}
disabled={buttonLoading}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import styles from './AdvertisementEntry.module.css';
import styles from '../../../../style/app.module.css';
import { Button, Card, Col, Row, Spinner, Modal } from 'react-bootstrap';
import { DELETE_ADVERTISEMENT_BY_ID } from 'GraphQl/Mutations/mutations';
import { useMutation } from '@apollo/client';
Expand Down Expand Up @@ -99,7 +99,7 @@ function AdvertisementEntry({
<Row data-testid="AdEntry" xs={1} md={2} className="g-4">
{Array.from({ length: 1 }).map((_, idx) => (
<Col key={idx}>
<Card className={styles.card}>
<Card className={styles.addCard}>
<div className={styles.dropdownContainer}>
<button
className={styles.dropdownButton}
Expand Down Expand Up @@ -163,7 +163,7 @@ function AdvertisementEntry({
</Card.Subtitle>
<div className={styles.buttons}>
<Button
className={styles.entryaction}
className={`${styles.entryaction} ${styles.addButton}`}
variant="primary"
disabled={buttonLoading}
data-testid="AddOnEntry_btn_install"
Expand All @@ -189,12 +189,15 @@ function AdvertisementEntry({
{t('deleteAdvertisementMsg')}
</Modal.Body>
<Modal.Footer>
<Button variant="danger" onClick={toggleShowDeleteModal}>
<Button
className={`btn btn-danger ${styles.removeButton}`}
onClick={toggleShowDeleteModal}
>
{tCommon('no')}
</Button>
<Button
type="button"
className="btn btn-success"
className={`btn ${styles.addButton}`}
onClick={(): void => {
onDelete();
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function advertisementRegister({
<>
{formStatus === 'register' ? (
<Button
className={styles.modalbtn}
className={styles.dropdown}
variant="primary"
onClick={handleShow}
data-testid="createAdvertisement"
Expand Down Expand Up @@ -286,6 +286,7 @@ function advertisementRegister({
name: e.target.value,
});
}}
className={styles.inputField}
/>
</Form.Group>
<Form.Group className="mb-3">
Expand All @@ -312,6 +313,7 @@ function advertisementRegister({
});
}
}}
className={styles.inputField}
/>
{formState.advertisementMedia && (
<div
Expand Down Expand Up @@ -367,6 +369,7 @@ function advertisementRegister({
type: e.target.value,
});
}}
className={styles.inputField}
>
<option value="POPUP">Popup Ad</option>
<option value="BANNER">Banner Ad </option>
Expand All @@ -385,6 +388,7 @@ function advertisementRegister({
startDate: new Date(e.target.value),
});
}}
className={styles.inputField}
/>
</Form.Group>

Expand All @@ -400,6 +404,7 @@ function advertisementRegister({
endDate: new Date(e.target.value),
});
}}
className={styles.inputField}
/>
</Form.Group>
</Form>
Expand All @@ -408,14 +413,13 @@ function advertisementRegister({
<Button
variant="secondary"
onClick={handleClose}
className={styles.closeButtonAdvertisementRegister}
className={`btn btn-danger ${styles.removeButton}`}
data-testid="addonclose"
>
{tCommon('close')}
</Button>
{formStatus === 'register' ? (
<Button
variant="primary"
onClick={handleRegister}
data-testid="addonregister"
className={styles.addButton}
Expand All @@ -424,9 +428,9 @@ function advertisementRegister({
</Button>
) : (
<Button
variant="primary"
onClick={handleUpdate}
data-testid="addonupdate"
className={styles.addButton}
>
{tCommon('saveChanges')}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/EventCalendar/EventCalendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ const Calendar: React.FC<InterfaceCalendarProps> = ({
</Button>
<div>
<Button
className={styles.btn__today}
className={styles.editButton}
onClick={handleTodayButton}
data-testid="today"
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/EventCalendar/EventHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function eventHeader({
/>
<Button
variant="success"
className={styles.createButtonEventHeader}
className={styles.dropdown}
onClick={showInviteModal}
data-testid="createEventModalBtn"
>
Expand Down
Loading

0 comments on commit 851e246

Please sign in to comment.