diff --git a/package-lock.json b/package-lock.json index c40a0e84..ab878bc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,9 +37,10 @@ "web-vitals": "^4.2.4" }, "devDependencies": { + "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@eslint/js": "^9.17.0", "@svgr/webpack": "^6.2.1", - "daisyui": "^4.12.23", + "daisyui": "^5.0.28", "eslint-config-react-app": "^7.0.1", "eslint-define-config": "^2.1.0", "eslint-plugin-react": "^7.37.2", @@ -646,10 +647,18 @@ } }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.0-placeholder-for-preset-env.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", - "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "version": "7.21.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", + "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", + "dev": true, "license": "MIT", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.21.0", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, "engines": { "node": ">=6.9.0" }, @@ -1954,6 +1963,18 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/preset-modules": { "version": "0.1.6-no-external-plugins", "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", @@ -6530,17 +6551,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/css-selector-tokenizer": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.8.0.tgz", - "integrity": "sha512-Jd6Ig3/pe62/qe5SBPTN8h8LeUg/pT4lLgtavPf7updwwHpvFzxvOQBHYj2LZDMjUnBzgvIUSjRcf6oT5HzHFg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cssesc": "^3.0.0", - "fastparse": "^1.1.2" - } - }, "node_modules/css-tree": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", @@ -6718,34 +6728,14 @@ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "license": "MIT" }, - "node_modules/culori": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/culori/-/culori-3.3.0.tgz", - "integrity": "sha512-pHJg+jbuFsCjz9iclQBqyL3B2HLCBF71BwVNujUYEvCeQMvV97R59MNK3R2+jgJ3a1fcZgI9B3vYgz8lzr/BFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/daisyui": { - "version": "4.12.23", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.12.23.tgz", - "integrity": "sha512-EM38duvxutJ5PD65lO/AFMpcw+9qEy6XAZrTpzp7WyaPeO/l+F/Qiq0ECHHmFNcFXh5aVoALY4MGrrxtCiaQCQ==", + "version": "5.0.28", + "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-5.0.28.tgz", + "integrity": "sha512-H082p8Lg3c7Se9wTbjfSOOhfUbp3BnOM2+cdr3OeY5G1Ll7GYLXB9NWLHgitkTsB1pQKwHRYYchqN2YG0VVShg==", "dev": true, "license": "MIT", - "dependencies": { - "css-selector-tokenizer": "^0.8", - "culori": "^3", - "picocolors": "^1", - "postcss-js": "^4" - }, - "engines": { - "node": ">=16.9.0" - }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/daisyui" + "url": "https://github.com/saadeghi/daisyui?sponsor=1" } }, "node_modules/damerau-levenshtein": { @@ -8333,13 +8323,6 @@ ], "license": "BSD-3-Clause" }, - "node_modules/fastparse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", - "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", - "dev": true, - "license": "MIT" - }, "node_modules/fastq": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz", diff --git a/package.json b/package.json index 5b663a69..f5f99f49 100644 --- a/package.json +++ b/package.json @@ -56,9 +56,10 @@ ] }, "devDependencies": { + "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@eslint/js": "^9.17.0", "@svgr/webpack": "^6.2.1", - "daisyui": "^4.12.23", + "daisyui": "^5.0.28", "eslint-config-react-app": "^7.0.1", "eslint-define-config": "^2.1.0", "eslint-plugin-react": "^7.37.2", diff --git a/src/opportunities/components/PopUpMenu.tsx b/src/opportunities/components/PopUpMenu.tsx index fe3507fa..0bcd07c7 100644 --- a/src/opportunities/components/PopUpMenu.tsx +++ b/src/opportunities/components/PopUpMenu.tsx @@ -108,8 +108,6 @@ export default function PopUpMenu({ setFunction, reset, filters, setFilters }: P setFunction() }; - console.log("Filters: ", filters); - return (
diff --git a/src/opportunities/pages/IndividualPost.tsx b/src/opportunities/pages/IndividualPost.tsx index 95eaef1d..147448df 100644 --- a/src/opportunities/pages/IndividualPost.tsx +++ b/src/opportunities/pages/IndividualPost.tsx @@ -26,8 +26,7 @@ const IndividualPost = () => { async function findDetails() { const data = await fetchOpportunities(); - details = data || "Nothing found"; - setDetails(details); + setDetails(data || "Nothing found"); } useEffect(() => { diff --git a/src/shared/components/Checkbox.tsx b/src/shared/components/Checkbox.tsx index 605b625e..2e4e91e2 100644 --- a/src/shared/components/Checkbox.tsx +++ b/src/shared/components/Checkbox.tsx @@ -53,7 +53,7 @@ export default function CheckBox({ {...formHook} id={item} className={type === "radio" ? "radio" : "checkbox"} - defaultChecked={name === "semesters" && filters?.semesters?.includes(item) || name === "years" && filters?.years?.includes(item) || name === "credits" && filters?.credits?.includes(item) ? true : false} + defaultChecked={(name === "semesters" && filters?.semesters?.includes(item)) || (name === "years" && filters?.years?.includes(item)) || (name === "credits" && filters?.credits?.includes(item) ? true : false)} /> diff --git a/src/shared/components/UIElements/LargeTextCard.tsx b/src/shared/components/UIElements/LargeTextCard.tsx index df6158c9..693d41f3 100644 --- a/src/shared/components/UIElements/LargeTextCard.tsx +++ b/src/shared/components/UIElements/LargeTextCard.tsx @@ -5,7 +5,7 @@ import PropTypes from "prop-types"; const LargeTextCard = ({ to, title, due, pay, credits }) => { return ( -
+

100 ? "text-sm" : "text-lg font-bold" diff --git a/src/staff/components/LargeImageCard.js b/src/staff/components/LargeImageCard.js index ee086928..77a5fbdd 100644 --- a/src/staff/components/LargeImageCard.js +++ b/src/staff/components/LargeImageCard.js @@ -5,7 +5,7 @@ import PropTypes from "prop-types"; const LargeImageCard = ({ to, image, title }) => { return ( -
+
{title}
diff --git a/src/style/App.css b/src/style/App.css index 72203cd3..9b18a50e 100644 --- a/src/style/App.css +++ b/src/style/App.css @@ -39,4 +39,4 @@ .my-logo { filter: brightness(0) invert(1); -} \ No newline at end of file +} diff --git a/src/style/general.css b/src/style/general.css index 9f9c55dd..1ca835be 100644 --- a/src/style/general.css +++ b/src/style/general.css @@ -3,78 +3,212 @@ @tailwind utilities; /* General CSS */ -.align-items-center {@apply items-center;} -.flex2 {@apply flex flex-col;} -.flexjust {@apply flex justify-center;} -.active-link {@apply text-black py-3 border-b-2 border-black text-lg;} -.normal-link {@apply text-gray-600 py-3 text-lg border-black;} +.align-items-center { + @apply items-center; +} +.flex2 { + @apply flex flex-col; +} +.flexjust { + @apply flex justify-center; +} +.active-link { + @apply text-black py-3 border-b-2 border-black text-lg; +} +.normal-link { + @apply text-gray-600 py-3 text-lg border-black; +} /* Opportunities CSS */ -.btn-job {@apply flex align-items-center p-2 rounded-3xl border;} -.about-role {@apply font-extrabold text-3xl;} -.about-map {@apply grid grid-cols-3;} -.about-head {@apply flex flex-col gap-1;} -.about-title {@apply text-gray-500 text-base;} -.about-description {@apply font-extrabold;} -.horizontal-btn {@apply flex gap-1 align-items-center p-2 px-2.5 rounded-3xl border;} -.job-desc-header {@apply flex flex-col gap-2;} -.job-desc-title {@apply font-extrabold text-xl;} -.job-desc-description {@apply text-gray-700;} -.job-details-header {@apply w-full col-span-7 border-l border-r p-24 flex flex-col gap-5 shadow-sm;} -.job-header-header {@apply flex flex-col gap-3;} -.job-header-title {@apply font-bold text-5xl;} -.job-inter-btn {@apply flex align-items-center p-2 px-4 rounded-3xl border;} -.job-post-header {@apply p-2 min-h-36 flex gap-3 py-2;} -.job-post-btn {@apply shadow-sm border-b border-b-gray-300;} -.job-post-title {@apply font-black;} -.job-post-description {@apply text-sm;} -.jobs-header {@apply text-2xl font-bold;} -.jobs-categories {@apply text-base flex gap-4 justify-items-center font-semibold;} -.postsfield-header {@apply border-t border-b grid grid-cols-9;} -.searchbar {@apply flex p-2 px-3 border rounded-3xl align-items-center;} +.btn-job { + @apply flex align-items-center p-2 rounded-3xl border; +} +.about-role { + @apply font-extrabold text-3xl; +} +.about-map { + @apply grid grid-cols-3; +} +.about-head { + @apply flex flex-col gap-1; +} +.about-title { + @apply text-gray-500 text-base; +} +.about-description { + @apply font-extrabold; +} +.horizontal-btn { + @apply flex gap-1 align-items-center p-2 px-2.5 rounded-3xl border; +} +.job-desc-header { + @apply flex flex-col gap-2; +} +.job-desc-title { + @apply font-extrabold text-xl; +} +.job-desc-description { + @apply text-gray-700; +} +.job-details-header { + @apply w-full col-span-7 border-l border-r p-24 flex flex-col gap-5 shadow-sm; +} +.job-header-header { + @apply flex flex-col gap-3; +} +.job-header-title { + @apply font-bold text-5xl; +} +.job-inter-btn { + @apply flex align-items-center p-2 px-4 rounded-3xl border; +} +.job-post-header { + @apply p-2 min-h-36 flex gap-3 py-2; +} +.job-post-btn { + @apply shadow-sm border-b border-b-gray-300; +} +.job-post-title { + @apply font-black; +} +.job-post-description { + @apply text-sm; +} +.jobs-header { + @apply text-2xl font-bold; +} +.jobs-categories { + @apply text-base flex gap-4 justify-items-center font-semibold; +} +.postsfield-header { + @apply border-t border-b grid grid-cols-9; +} +.searchbar { + @apply flex p-2 px-3 border rounded-3xl align-items-center; +} /* Shared CSS */ -.btn-disclosure {@apply relative inline-flex items-center justify-center rounded-md p-2 text-gray-400;} -.blck66 {@apply block h-6 w-6;} -.prof-ring {@apply w-min h-min rounded-full ring ring-primary ring-offset-base-100 ring-offset-2;} -.mainnav {@apply mx-auto max-w-7xl px-2;} -.mainnav-header {@apply relative flex h-16 items-center justify-between;} -.mainnav-desc {@apply absolute inset-y-0 left-0 flex items-center;} -.mainnav-desc2 {@apply flex flex-1 items-center justify-center;} -.mainnav-title-link {@apply flex flex-shrink-0 items-center;} -.mainnav-link {@apply rounded-md px-3 py-2 text-sm font-medium no-underline;} -.btn-disclosure2 {@apply block rounded-md px-3 py-2 text-base font-medium text-black no-underline;} -.pagenav {@apply text-base flex gap-4 justify-items-center font-semibold;} -.opportunitycard {@apply card-compact min-h-48 max-h-48 duration-300 w-64 p-1 bg-base-100;} -.card2-body {@apply text-sm font-light p-0 m-0;} -.avatar1 {@apply flex align-items-center gap-3;} -.avatar-img {@apply rounded-full w-12 h-12;} -.avatar-name {@apply text-blue-800 text-base;} -.avatar-card {@apply p-2 border rounded min-w-fit max-w-fit;} -.profileavatar {@apply w-min h-min rounded-full ring ring-primary ring-offset-base-100 ring-offset-2;} -.stickyfooter {@apply flex2 h-screen justify-between;} -.signin-general {@apply flex2 justify-center text-center;} -.img-center {@apply flex justify-center items-center;} -.home-general {@apply text-center font-sans;} -.stickyfooter-general {@apply rounded border-2 pr-16 pl-16 pt-3 pb-3;} -.stickyfooter-header {@apply text-center text-lg justify-center;} -.stickyfooter-info {@apply flex flex-row justify-between px-12 text-center;} -.grey-link {@apply no-underline text-neutral-600;} -.blue-link {@apply no-underline text-blue-500;} +.btn-disclosure { + @apply relative inline-flex items-center justify-center rounded-md p-2 text-gray-400; +} +.blck66 { + @apply block h-6 w-6; +} +.prof-ring { + @apply w-min h-min rounded-full ring ring-primary ring-offset-base-100 ring-offset-2; +} +.mainnav { + @apply mx-auto max-w-7xl px-2; +} +.mainnav-header { + @apply relative flex h-16 items-center justify-between; +} +.mainnav-desc { + @apply absolute inset-y-0 left-0 flex items-center; +} +.mainnav-desc2 { + @apply flex flex-1 items-center justify-center; +} +.mainnav-title-link { + @apply flex flex-shrink-0 items-center; +} +.mainnav-link { + @apply rounded-md px-3 py-2 text-sm font-medium no-underline; +} +.btn-disclosure2 { + @apply block rounded-md px-3 py-2 text-base font-medium text-black no-underline; +} +.pagenav { + @apply text-base flex gap-4 justify-items-center font-semibold; +} +.opportunitycard { + @apply min-h-48 max-h-48 duration-300 w-64 p-1 bg-base-100; +} +.card2-body { + @apply text-sm font-light p-0 m-0; +} +.avatar1 { + @apply flex align-items-center gap-3; +} +.avatar-img { + @apply rounded-full w-12 h-12; +} +.avatar-name { + @apply text-blue-800 text-base; +} +.avatar-card { + @apply p-2 border rounded min-w-fit max-w-fit; +} +.profileavatar { + @apply w-min h-min rounded-full ring ring-primary ring-offset-base-100 ring-offset-2; +} +.stickyfooter { + @apply flex2 h-screen justify-between; +} +.signin-general { + @apply flex2 justify-center text-center; +} +.img-center { + @apply flex justify-center items-center; +} +.home-general { + @apply text-center font-sans; +} +.stickyfooter-general { + @apply rounded border-2 pr-16 pl-16 pt-3 pb-3; +} +.stickyfooter-header { + @apply text-center text-lg justify-center; +} +.stickyfooter-info { + @apply flex flex-row justify-between px-12 text-center; +} +.grey-link { + @apply no-underline text-gray-600; +} +.blue-link { + @apply no-underline text-blue-500; +} /* Staff CSS */ -.createpost {@apply flex justify-center mt-3;} -.lc-loading {@apply loading loading-spinner loading-lg;} -.featimage {@apply min-w-32 w-96 h-72 bg-base-100 shadow-xl rounded-md overflow-clip;} -.lg-img-card {@apply card-compact w-96 bg-base-100 transition;} -.lg-txt-card {@apply min-h-48 max-h-48 duration-300 card-compact w-56 p-1 bg-base-100;} -.lg-txt-card-attributes {@apply overflow-visible w-fit badge badge-primary;} -.staff {@apply font-bold py-3;} -.staff-body {@apply px-2 grid grid-cols-4;} -.center {@apply pb-10 flex flex-col gap-4;} -.createpost {@apply flex justify-center mt-3;} +.createpost { + @apply flex justify-center mt-3; +} +.lc-loading { + @apply loading loading-spinner loading-lg; +} +.featimage { + @apply min-w-32 w-96 h-72 bg-base-100 shadow-xl rounded-md overflow-clip; +} +.lg-img-card { + @apply w-96 bg-base-100 transition; +} +.lg-txt-card { + @apply min-h-48 max-h-48 duration-300 w-56 p-1 bg-base-100; +} +.lg-txt-card-attributes { + @apply overflow-visible w-fit badge badge-primary; +} +.staff { + @apply font-bold py-3; +} +.staff-body { + @apply px-2 grid grid-cols-4; +} +.center { + @apply pb-10 flex flex-col gap-4; +} +.createpost { + @apply flex justify-center mt-3; +} /* CreatePost CSS*/ -.form-container {@apply flex flex-col gap-5;} -.horizontal-form {@apply flex gap-5;} -.horizontal-form > * {@apply flex-1;} \ No newline at end of file +.form-container { + @apply flex flex-col gap-5; +} +.horizontal-form { + @apply flex gap-5; +} +.horizontal-form > * { + @apply flex-1; +} diff --git a/src/style/index.css b/src/style/index.css index 3567d2d8..550df096 100644 --- a/src/style/index.css +++ b/src/style/index.css @@ -1,19 +1,18 @@ /* Base CSS */ body { margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", + "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace; } - .align-items-center { align-items: center; } @@ -26,4 +25,4 @@ code { height: 100%; background-color: rgba(0, 0, 0, 0.5); /* Adjust opacity as needed */ z-index: 1000; /* Ensure it appears above other content */ -} \ No newline at end of file +}