Selaa lähdekoodia

fixing some bugs and responsive desing for user details page

FE_dev
Dzenis Hadzifejzovic 3 vuotta sitten
vanhempi
commit
f4fd51e6d2

+ 19
- 5
src/assets/styles/components/_candidatesPage.scss Näytä tiedosto

margin-left: 42px; margin-left: 42px;
} }


.ads-search-field-responsive {
min-width: 350px;
// .ads-search-field-responsive {
// min-width: 350px;
// border: 1px solid #226cb0;
// border-radius: 10px;
// padding: 20px;
// background-color: white;
// position: absolute;
// top: 100px;
// right: 9px;
// z-index: 1000;
// &.smaller {
// min-width: 250px !important;
// }
// }

.ads-search-field-responsive2 {
border: 1px solid #226cb0; border: 1px solid #226cb0;
border-radius: 10px; border-radius: 10px;
padding: 20px;
padding: 15px;
background-color: white; background-color: white;
position: absolute; position: absolute;
top: 100px;
right: 9px;
top: 125px;
right: 35px;
z-index: 1000; z-index: 1000;
&.smaller { &.smaller {
min-width: 250px !important; min-width: 250px !important;

+ 0
- 1
src/assets/styles/components/_files.scss Näytä tiedosto

} }


.files-page-card-content-checkboxes { .files-page-card-content-checkboxes {
padding: 0 9px !important;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-start; justify-content: flex-start;

+ 7
- 3
src/components/Docs/DocsFilters.js Näytä tiedosto

const dispatch = useDispatch(); const dispatch = useDispatch();
const { filters } = useSelector((s) => s.fileFilters); const { filters } = useSelector((s) => s.fileFilters);
let { id } = useParams(); let { id } = useParams();
console.log(setPage);
console.log(setFile);


const handleCheckboxesExt = (e) => const handleCheckboxesExt = (e) =>
dispatch(updateFileFilterExt(e.target.value)); dispatch(updateFileFilterExt(e.target.value));
extensions: extFilters, extensions: extFilters,
tags: tagFilters, tags: tagFilters,
content: filters.content === undefined ? "" : filters.content, content: filters.content === undefined ? "" : filters.content,
onSuccess:() => setFile(null)
onSuccess: () => {
setFile(null);
setPage(1);
},
}, },
apiSuccess: handleClose, apiSuccess: handleClose,
}) })
); );
setPage(1);
}; };


const list = () => ( const list = () => (
open: PropType.any, open: PropType.any,
handleClose: PropType.func, handleClose: PropType.func,
setPage: PropType.func, setPage: PropType.func,
setFile:PropType.func
setFile: PropType.func,
}; };


export default DocsFilters; export default DocsFilters;

+ 1
- 1
src/i18n/resources/en.js Näytä tiedosto

ad: "Ad", ad: "Ad",
ads: "Ads", ads: "Ads",
signUp: "Sign up", signUp: "Sign up",
dragPdf1: "Drag the .pdf document in this part of the screen or",
dragPdf1: "Drag the document or",
dragPdf2: "on the computer", dragPdf2: "on the computer",
coverLetter: "Cover letter (Optional)", coverLetter: "Cover letter (Optional)",
professionalQualification: "Professional qualification", professionalQualification: "Professional qualification",

+ 7
- 1
src/pages/FilesPage/AddFile.js Näytä tiedosto

import { FILES_PAGE } from "../../constants/pages"; import { FILES_PAGE } from "../../constants/pages";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import TreeViewFiles from "../../components/Files/TreeViewFiles"; import TreeViewFiles from "../../components/Files/TreeViewFiles";
import { useTheme } from "@mui/system";
import { useMediaQuery } from "@mui/material";
import Button from "../../components/Button/Button"; import Button from "../../components/Button/Button";


const AddFile = ({ history }) => { const AddFile = ({ history }) => {
name: "", name: "",
}); });
const { t } = useTranslation(); const { t } = useTranslation();
const theme = useTheme();
const matches = useMediaQuery(theme.breakpoints.down("370"));

console.log(matches);


useEffect(() => { useEffect(() => {
dispatch(setCategoriesReq()); dispatch(setCategoriesReq());
) : ( ) : (
<> <>
<p> <p>
{t("ads.dragPdf1")} &nbsp;
{t("ads.dragPdf1")} <br></br>
<label <label
htmlFor="upload-file" htmlFor="upload-file"
style={{ style={{

+ 9
- 2
src/pages/FilesPage/FileTable.js Näytä tiedosto

}, },
}) })
); );
}, [id, page]);
setPage(1);
}, [id]);


const handleChange = (_, value) => { const handleChange = (_, value) => {
setFile(null); setFile(null);
}; };


const handleKeyDown = (event) => { const handleKeyDown = (event) => {
if (event.key === "Enter" && filters.content !== "" && filters.content !== undefined) {
if (
event.key === "Enter" &&
filters.content !== "" &&
filters.content !== undefined
) {
var extFilters = []; var extFilters = [];
filters.extensions filters.extensions
?.filter((n) => n.isChecked) ?.filter((n) => n.isChecked)
}, },
}) })
); );
setPage(1);
setFile(null);
} }
}; };



+ 40
- 13
src/pages/UsersPage/UserDetails.js Näytä tiedosto



const UserDetails = ({ history }) => { const UserDetails = ({ history }) => {
const theme = useTheme(); const theme = useTheme();
const matches = useMediaQuery(theme.breakpoints.down("sm"));
const matches = useMediaQuery(theme.breakpoints.down("371"));
const { id } = useParams(); const { id } = useParams();
const dispatch = useDispatch(); const dispatch = useDispatch();
const [showConfirm, setConfirm] = useState(false); const [showConfirm, setConfirm] = useState(false);
</IconButton> </IconButton>
</div> </div>
</div> </div>
<div className="user-details-middle">
<div
className="user-details-middle"
style={{
display: "flex",
flexDirection: matches ? "column" : "row",
marginTop: matches ? "0px" : "20px",
}}
>
<div> <div>
<div <div
className="flex-center" className="flex-center"
</p> </p>
</div> </div>
</div> </div>
<div
style={{
display: "flex",
justifyContent: "flex-end",
marginTop: "150px",
}}
>
<Link to={"/users"} className="text-blue">
{t("users.backToUsers")}
</Link>
</div>
{!matches && (
<div
style={{
display: "flex",
alignSelf: "flex-start",
marginTop: "150px",
}}
>
<Link to={"/users"} className="text-blue">
{t("users.backToUsers")}
</Link>
</div>
)}
</div> </div>
<div> <div>
<div <div
display: "flex", display: "flex",
justifyContent: "center", justifyContent: "center",
marginBottom: "1rem", marginBottom: "1rem",
marginTop: matches ? "1rem" : "0px",
}} }}
> >
<h1>Granted Categories</h1> <h1>Granted Categories</h1>
Apply Changes Apply Changes
</Button> </Button>
</div> </div>
{matches && (
<div
style={{
display: "flex",
justifyContent: "flex-start",
marginTop: "20px",
}}
>
<Link
to={"/users"}
className="text-blue"
style={{ fontSize: "1.1rem" }}
>
{t("users.backToUsers")}
</Link>
</div>
)}
</div> </div>
</div> </div>
</div> </div>

+ 9
- 6
src/pages/UsersPage/UsersPage.js Näytä tiedosto

placeholder="Pretrazi..." placeholder="Pretrazi..."
value={search} value={search}
onChange={(e) => setSearch(e.target.value)} onChange={(e) => setSearch(e.target.value)}
className="ads-search-field-responsive smaller"
className="ads-search-field-responsive2 smaller"
onClick={stopPropagation} onClick={stopPropagation}
style={{ zIndex: 1000, width: "300px" }} style={{ zIndex: 1000, width: "300px" }}
/> />
style={{ style={{
position: "absolute", position: "absolute",
zIndex: 10000, zIndex: 10000,
marginTop: 47.5,
right: "26px",
marginTop: matches ? 67.5 : 47.5,
right: matches ? 40 : 26,
}} }}
> >
<img src={searchImage} /> <img src={searchImage} />
<div> <div>
<div <div
onClick={() => setIsSearchFieldVisible(false)} onClick={() => setIsSearchFieldVisible(false)}
className="pl-144 flex-center"
className="pl-144"
style={{ style={{
paddingTop: "36px",
paddingTop: matches ? "146px" : "36px",
display: "flex",
flexDirection: matches ? "column" : "row",
alignItems: matches ? "flex-start" : "center",
justifyContent: "space-between", justifyContent: "space-between",
postion: "relative", postion: "relative",
}} }}
onClick={() => setIsSearchFieldVisible(false)} onClick={() => setIsSearchFieldVisible(false)}
style={{ style={{
display: "flex", display: "flex",
marginTop: "39px",
marginTop: matches ? "0px" : "39px",
flexDirection: "column", flexDirection: "column",
justifyContent: "space-between", justifyContent: "space-between",
minHeight: "500px", minHeight: "500px",

Loading…
Peruuta
Tallenna