Skip to content

Customizations settings dev #29

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jan 23, 2024
Merged

Customizations settings dev #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07ceda3
created customizations form inputs and layout
Darren52BT Jan 19, 2024
8526c0f
added typehead implementation, started scss override
Darren52BT Jan 23, 2024
77daa25
styled dropdown menu, fixed save/cancel changes
Darren52BT Jan 23, 2024
be7c345
added color for no matches found text
Darren52BT Jan 23, 2024
3d89a63
removed redundant test code
Darren52BT Jan 23, 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
88 changes: 88 additions & 0 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"react": "^18.2.0",
"react-bootstrap": "^2.9.1",
"react-bootstrap-icons": "^1.10.3",
"react-bootstrap-typeahead": "^6.3.2",
"react-dom": "^18.2.0",
"react-router-dom": "^6.18.0",
"web-vitals": "^2.1.4"
Expand Down Expand Up @@ -42,5 +43,5 @@
"@vitejs/plugin-react": "^4.2.1",
"vite": "^5.0.11"
},
"type":"module"
"type": "module"
}
3 changes: 2 additions & 1 deletion frontend/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Signin from "./pages/SignPages/Signin.jsx";
import BasePage from "./pages/BasePage.jsx";

import ProfileEdit from "./Components/Settings/Profile/ProfileEdit.jsx";
import CustomizationsEdit from "./Components/Settings/Customizations/CustomizationsEdit.jsx";

function App() {
return (
Expand All @@ -24,7 +25,7 @@ function App() {
<Route index element={<ArticleView />} />
<Route path=":name" element={<ArticleView />} />
</Route>
<Route path="profile-settings" element={<ProfileEdit />} />
<Route path="profile-settings" element={<><ProfileEdit/><CustomizationsEdit/></>} />
<Route
path="*"
element={<h1 className="text-center">404 - Page Not Found</h1>}
Expand Down
24 changes: 12 additions & 12 deletions frontend/src/Components/Footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Container, Button, Stack } from "react-bootstrap";

export default function Footer() {
return (
<Container fluid className="bg-primary border-top py-2 mt-auto">
<Container fluid className="bg-primary border-top py-2 mt-auto" style={{flex:"0"}}>
<Stack direction="horizontal" gap={5} className=" justify-content-center">
<Button className="text-white fw-semibold" href="/">
Home
Expand Down Expand Up @@ -59,13 +59,13 @@ export default function Footer() {
r="44.899"
gradientUnits="userSpaceOnUse"
>
<stop offset="0" stop-color="#fd5"></stop>
<stop offset=".328" stop-color="#ff543f"></stop>
<stop offset=".348" stop-color="#fc5245"></stop>
<stop offset=".504" stop-color="#e64771"></stop>
<stop offset=".643" stop-color="#d53e91"></stop>
<stop offset=".761" stop-color="#cc39a4"></stop>
<stop offset=".841" stop-color="#c837ab"></stop>
<stop offset="0" stopColor="#fd5"></stop>
<stop offset=".328" stopColor="#ff543f"></stop>
<stop offset=".348" stopColor="#fc5245"></stop>
<stop offset=".504" stopColor="#e64771"></stop>
<stop offset=".643" stopColor="#d53e91"></stop>
<stop offset=".761" stopColor="#cc39a4"></stop>
<stop offset=".841" stopColor="#c837ab"></stop>
</radialGradient>
<path
fill="url(#yOrnnhliCrdS2gy~4tD8ma_Xy10Jcu1L2Su_gr1)"
Expand All @@ -79,8 +79,8 @@ export default function Footer() {
gradientTransform="matrix(1 0 0 .6663 0 1.849)"
gradientUnits="userSpaceOnUse"
>
<stop offset="0" stop-color="#4168c9"></stop>
<stop offset=".999" stop-color="#4168c9" stop-opacity="0"></stop>
<stop offset="0" stopColor="#4168c9"></stop>
<stop offset=".999" stopColor="#4168c9" stopOpacity="0"></stop>
</radialGradient>
<path
fill="url(#yOrnnhliCrdS2gy~4tD8mb_Xy10Jcu1L2Su_gr2)"
Expand Down Expand Up @@ -117,8 +117,8 @@ export default function Footer() {
y2="23.508"
gradientUnits="userSpaceOnUse"
>
<stop offset="0" stop-color="#4c4c4c"></stop>
<stop offset="1" stop-color="#343434"></stop>
<stop offset="0" stopColor="#4c4c4c"></stop>
<stop offset="1" stopColor="#343434"></stop>
</linearGradient>
<path
fill="url(#rL2wppHyxHVbobwndsT6Ca_AZOZNnY73haj_gr1)"
Expand Down
Loading