Skip to content

update homepage #50

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

Open
buitai97 wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

update homepage #50

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
533ec85
update homepage
buitai97 Apr 23, 2024
f7e9d07
minor changes to footer
buitai97 Apr 25, 2024
30355d2
update the home page as new design
buitai97 Apr 27, 2024
4609ad5
update home page
buitai97 Jun 14, 2024
a6379c6
Merge branch 'dev' into update-homepage
buitai97 Jun 14, 2024
ade28b2
added function for light bulb switch
buitai97 Jun 21, 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
115 changes: 58 additions & 57 deletions frontend/src/Components/Footer/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,107 +1,108 @@
import { Container, Stack, Row, Col, Image } from "react-bootstrap";
import { Container, Stack, ListGroup, Row, Col, Image } from "react-bootstrap";
import { Discord, Github, Instagram } from "react-bootstrap-icons";
import "./Footer.scss";
import logo from "../../assets/logo.png";
import cs_central_white_img from "../../assets/cs-central-white.png";
export default function Footer() {
return (
<footer id="CS-Catalog-footer" className="footer p-4">
<Container fluid style={{ maxWidth: "1000px" }}>
<Row>
<Container>
<Row className="justify-content-center">
{/* Logo container*/}
<Col
xs={{ span: 12 }}
lg={{ span: 6 }}
className="d-flex justify-content-center justify-content-lg-start align-items-center p-0"
className="d-flex align-items-center justify-content-center"
xs={{ span: 4 }}
sm={{ span: 4 }}
md={{ span: 3, offset: 0 }}
lg={3}
>
<Image
src={logo}
id="CS-Catalog-footer-logo"
className="footer-logo"
roundedCircle
/>
<ul
className="footer-socials-list d-flex flex-column align-self-stretch justify-content-evenly m-0"
<Image src={cs_central_white_img} className="footer-logo" fluid />
</Col>
{/*social media container*/}
<Col
className="d-flex justify-content-sm-center justify-content-end divider"
xs={{ span: 6 }}
sm={{ span: 4 }}
>
<ListGroup
className="footer-socials-list d-flex flex-column justify-content-evenly gap-3 ps-3"
id="footer-socials-list"
fluid
>
<li
className="footer-social-container"
<ListGroup.Item
className="footer-social-container bg-transparent p-0 border-0"
id="discord-social-container"
>
<a className="social-link" target="_blank">
<Discord className="footer-social-icon" />
<span className="footer-social-name">Discord</span>
<Discord className="footer-social-icon " />
<span className="footer-social-name ms-2">Discord</span>
</a>
</li>
<li
className="footer-social-container"
</ListGroup.Item>
<ListGroup.Item
className="footer-social-container bg-transparent p-0 border-0"
id="instagram-social-container"
>
<a className="social-link" target="_blank">
<Instagram className="footer-social-icon" />
<span className="footer-social-name">Instagram</span>
<span className="footer-social-name ms-2 ">Instagram</span>
</a>
</li>
<li
className="footer-social-container"
</ListGroup.Item>
<ListGroup.Item
className="footer-social-container bg-transparent p-0 d-block border-0"
id="github-social-container"
>
<a
className="social-link"
href="https://github.com/cppsea/CS-Catalog"
target="_blank"
>
<Github className="footer-social-icon" />
<span className="footer-social-name">Github</span>
<Github className="footer-social-icon large" fluid />
<span className="footer-social-name ms-2">Github</span>
</a>
</li>
</ul>
</ListGroup.Item>
</ListGroup>
</Col>
{/* More info container */}
<Col
className="d-flex justify-content-center"
xs={{ span: 12 }}
lg={{ span: 6 }}
className="d-flex justify-content-center justify-content-lg-start align-items-center p-0"
sm={{ span: 4 }}
md={{ span: 3 }}
lg={{ span: 2, offset: 1 }}
>
<h5
className="footer-title flex-column d-flex"
id="CS-Catalog-footer-title"
>
<span>CS</span> <span>CENTRAL</span>
</h5>
<ul
className="footer-more-info-links-container d-flex flex-column align-self-stretch justify-content-evenly m-0"
<ListGroup
className="footer-more-info-links-container d-flex flex-row flex-sm-column justify-content-evenly"
id="more-info-links-container"
>
<li className="footer-more-info-link-container">
<ListGroup.Item className="footer-more-info-link-container bg-transparent border-0">
<a className="more-info-link" id="footer-home-link">
Home
</a>
</li>
<li className="footer-more-info-link-container">
</ListGroup.Item>
<ListGroup.Item className="footer-more-info-link-container bg-transparent border-0">
<a className="more-info-link" id="footer-feedback-link">
Feedback
</a>
</li>
<li className="footer-more-info-link-container">
</ListGroup.Item>
<ListGroup.Item className="footer-more-info-link-container bg-transparent border-0">
<a className="more-info-link" id="footer-about-link">
About
</a>
</li>
<li className="footer-more-info-link-container">
</ListGroup.Item>
<ListGroup.Item className="footer-more-info-link-container bg-transparent border-0">
<a className="more-info-link" id="footer-team-link">
Our team
</a>
</li>
</ul>
</ListGroup.Item>
</ListGroup>
</Col>
</Row>
</Container>
<Row className="">
<span
className="footer-copyright d-flex justify-content-center"
id="CS-Catalog-copyright"
>
CS Catalog @ 2024 All Rights Reserved
</span>
</Row>
<span
className="footer-copyright d-flex justify-content-center "
id="CS-Catalog-copyright "
>
CS Catalog @ 2024 All Rights Reserved
</span>
</footer>
);
}
42 changes: 9 additions & 33 deletions frontend/src/Components/Footer/Footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import "../../scss/variables.scss";
@import "../../../node_modules/bootstrap/scss/bootstrap-grid.scss";

//colors
.footer {
Expand All @@ -10,29 +11,21 @@
}

/*First half of footer*/
.footer-logo {
background: $primary;
width: 50%;
max-width: 200px;
min-width: 100px;
}

/*Social Links*/
@include media-breakpoint-up(sm) {
.divider {
border-right: 1px solid white;
}
}
.footer-socials-list {
}

.footer-social-container > a {
width: fit-content;
align-items: center;
gap: 10px;
}
.footer-social-icon {
font-size: 2rem;
font-size: clamp(1.5rem, 3vw, 2rem);
}
.footer-social-name {
font-size: 1rem;
font-weight: 200;
margin-left: 10px;
}
.footer-social-icon,
.footer-social-name {
Expand All @@ -56,35 +49,18 @@
border-bottom: 1px solid white;
}
}

.vertical-divider {
border-right: 1px solid white;
width: 1px;
}
/*more info links*/

.footer-more-info-links-container {
padding-left: 50px;
display: flex;
gap: 10px;
}

.footer-more-info-link-container {
white-space: nowrap;
overflow: hidden;
width: 147px;
}

.footer-socials-list,
.footer-links-container {
li {
list-style-type: none;
}
}

//link hover/click styles
.social-link,
.more-info-link {
font-size: clamp(0.9rem, 3vw, 1.5rem);
font-weight: 200;
text-decoration: none;
margin-top: 40px;
&:hover {
Expand Down
14 changes: 6 additions & 8 deletions frontend/src/Components/Header/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import logo from "../../assets/logo.png";
import avatar from "../../assets/avatar.jpg";

import {
Container,
Nav,
Expand All @@ -10,12 +11,8 @@ import {
OverlayTrigger,
Popover,
Button,
DropdownButton,
ButtonGroup,
Dropdown,
} from "react-bootstrap";
import SearchBar from "../SearchBar";
import { SunFill, MoonFill } from "react-bootstrap-icons";
import { Search, LightbulbFill } from "react-bootstrap-icons";

import "./Header.scss";
import { useState } from "react";
Expand Down Expand Up @@ -62,11 +59,12 @@ export default function Header() {
</Nav>
</Navbar.Collapse>
</Stack>

<Stack direction="horizontal" gap={3}>
<div style={{ justifyContent: "center" }}>
<SearchBar />
<div class="search-box">
<input type="text" className="form-control" />
<Search className="" />
</div>
<LightbulbFill className="lightbulb" />

<Nav variant="underline">
<Nav.Item>
Expand Down
34 changes: 33 additions & 1 deletion frontend/src/Components/Header/Header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,23 @@
@import "../../../node_modules/bootstrap/scss/grid";
@import "../../../node_modules//bootstrap/scss/mixins";

@include color-mode(light) {
.lightbulb {
color: white;
}
}
@include color-mode(dark) {
.lightbulb {
color: black;
}
.form-control {
background-color: white;
}
}
.header-divider {
@include media-breakpoint-down(md) {
display: none;
}
border: 1.5px solid $header-text;
height: 75%;
margin-left: 1em;
Expand Down Expand Up @@ -37,7 +53,23 @@
border-radius: 4px;
}
}

.search-box {
position: relative;
}
.search-box input {
border-radius: 25px;
}
.search-box svg {
position: absolute;
right: 10px;
top: 20%;
font-size: 1.5rem;
color: black;
}
.lightbulb {
font-size: 2rem;
color: white;
}
#toggler {
background-color: $primary;
border: none;
Expand Down
17 changes: 0 additions & 17 deletions frontend/src/Components/Home/AppTitle/AppTitle.jsx
View file
Open in desktop

This file was deleted.

Loading