Преглед на файлове

updated modal styles for smaller resolutions

pull/87/head
meris.ahmatovic преди 3 години
родител
ревизия
b3b97de748
променени са 4 файла, в които са добавени 85 реда и са изтрити 39 реда
  1. 11
    0
      src/assets/styles/components/_modal.scss
  2. 64
    31
      src/components/MUI/ConfirmDialog.js
  3. 8
    6
      src/components/MUI/InviteDialog.js
  4. 2
    2
      src/pages/UsersPage/UsersPage.js

+ 11
- 0
src/assets/styles/components/_modal.scss Целия файл

.dialog-btn:last-of-type{ .dialog-btn:last-of-type{
color: $white; color: $white;
background-color: $mainBlue; background-color: $mainBlue;

&.sm-full{
@include media-below($bp-xl) {
width: 80%;
// align-self: center;
// justify-self: center;
margin: 20px auto 0px auto;
height: 50px !important;
}
}
} }
.modal-content{ .modal-content{
padding: 25px 0px 15px 0px; padding: 25px 0px 15px 0px;

+ 64
- 31
src/components/MUI/ConfirmDialog.js Целия файл

import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import x from "../../assets/images/x.png";
import { import {
Dialog, Dialog,
DialogTitle, DialogTitle,
const theme = useTheme(); const theme = useTheme();
const fullScreen = useMediaQuery(theme.breakpoints.down("md")); const fullScreen = useMediaQuery(theme.breakpoints.down("md"));


// const { t } = useTranslation();

const handleClose = () => { const handleClose = () => {
onClose(); onClose();
}; };


// useEffect(()=>{
// handleClose();
// },[onConfirm])

return ( return (
<Dialog <Dialog
maxWidth={maxWidth} maxWidth={maxWidth}
> >
<div style={{ padding: "36px" }}> <div style={{ padding: "36px" }}>
<DialogTitle style={{ padding: 0 }}> <DialogTitle style={{ padding: 0 }}>
<div
className="flex-center"
style={{ justifyContent: "space-between" }}
>
<div className="flex-center" style={{ justifyContent: "start" }}>
<img
style={{
position: "relative",
top: -0.25,
paddingRight: "10px",
}}
src={imgSrc}
/>
<h5>{title}</h5>
<div className="vr"></div>
<p className="dialog-subtitle">{subtitle}</p>
{fullScreen ? (
<>
<div className="flex-center" style={{ justifyContent: "start" }}>
<img
style={{
position: "relative",
top: -0.25,
paddingRight: "10px",
}}
src={imgSrc}
/>
<h5 style={{ textAlign: "start" }}>{title}</h5>
<div style={{ justifySelf: "stretch", flex:'1' }}></div>
<IconButton
onClick={onClose}
>
<img
style={{
position: "relative",
top: -0.25,
}}
src={x}
/>
</IconButton>
</div>
<p
className="dialog-subtitle"
style={{ paddingLeft: "23px", marginTop: "-10px" }}
>
| {subtitle}
</p>
</>
) : (
<div
className="flex-center"
style={{ justifyContent: "space-between" }}
>
<div className="flex-center" style={{ justifyContent: "start" }}>
<img
style={{
position: "relative",
top: -0.25,
paddingRight: "10px",
}}
src={imgSrc}
/>
<h5>{title}</h5>
<div className="vr"></div>
<p className="dialog-subtitle">{subtitle}</p>
</div>
</div> </div>
</div>
)}
</DialogTitle> </DialogTitle>
<DialogContent> <DialogContent>
<div className="modal-content">{content}</div> <div className="modal-content">{content}</div>
</DialogContent> </DialogContent>
<DialogActions style={{ padding: 0 }}> <DialogActions style={{ padding: 0 }}>
{!fullScreen ? (
<IconButton
data-testid="editbtn"
className={`c-btn--primary-outlined c-btn dialog-btn`}
onClick={onClose}
>
Cancel
</IconButton>
) : (
""
)}
<IconButton <IconButton
data-testid="editbtn" data-testid="editbtn"
className={`c-btn--primary-outlined c-btn dialog-btn`}
onClick={onClose}
>
Cancel
</IconButton>
<IconButton
data-testid="editbtn"
className={`c-btn--primary-outlined c-btn dialog-btn`}
className={`c-btn--primary-outlined sm-full c-btn dialog-btn`}
onClick={onConfirm} onClick={onConfirm}
> >
Confirm Confirm

+ 8
- 6
src/components/MUI/InviteDialog.js Целия файл

firstName, firstName,
email, email,
}, },
handleApiResponseSuccess: resetForm
handleApiResponseSuccess: resetForm,
}) })
); );
}; };
validationSchema: Yup.object().shape({ validationSchema: Yup.object().shape({
firstName: Yup.string().required(t("login.firstnameRequired")), firstName: Yup.string().required(t("login.firstnameRequired")),
lastName: Yup.string().required(t("login.lastnameRequired")), lastName: Yup.string().required(t("login.lastnameRequired")),
email: Yup.string().required(t("login.emailRequired")),
email: Yup.string()
.required(t("login.emailRequired"))
.matches(/^[\w-.]+@([\w-]+\.)+[\w-]{2,4}$/, "Invalid email format."),
}), }),
onSubmit: handleSubmit, onSubmit: handleSubmit,
validateOnBlur: true, validateOnBlur: true,
<div <div
className="" className=""
style={{ style={{
display: "flex",
display: fullScreen ? "" : "flex",
justifyContent: "center", justifyContent: "center",
alignItems: "start", alignItems: "start",
gap: "15px", gap: "15px",
<TextField <TextField
name="firstName" name="firstName"
// label={t("users.receiver")} // label={t("users.receiver")}
label={'Ime'}
label={"Ime"}
margin="normal" margin="normal"
value={formik.values.firstName} value={formik.values.firstName}
onChange={formik.handleChange} onChange={formik.handleChange}
<TextField <TextField
name="lastName" name="lastName"
// label={t("users.receiver")} // label={t("users.receiver")}
label={'Prezime'}
label={"Prezime"}
margin="normal" margin="normal"
value={formik.values.lastName} value={formik.values.lastName}
onChange={formik.handleChange} onChange={formik.handleChange}
<TextField <TextField
name="email" name="email"
// label={t("users.receiver")} // label={t("users.receiver")}
label={'E-mail adresa'}
label={"E-mail adresa"}
margin="normal" margin="normal"
value={formik.values.email} value={formik.values.email}
onChange={formik.handleChange} onChange={formik.handleChange}

+ 2
- 2
src/pages/UsersPage/UsersPage.js Целия файл

src={addUser} src={addUser}
/> />
<h5>{t("users.inviteUser")}</h5> <h5>{t("users.inviteUser")}</h5>
<div className="vr"></div>
<p className="dialog-subtitle">{t("users.regLink")}</p>
{!matches && <div className="vr"></div>}
{!matches && <p className="dialog-subtitle">{t("users.regLink")}</p>}
</div> </div>
<IconButton onClick={() => setShowInvite(false)}> <IconButton onClick={() => setShowInvite(false)}>
<img <img

Loading…
Отказ
Запис