Skip to content
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

OV-75: add sidebar and header to home page #83

Merged
merged 14 commits into from
Sep 5, 2024
Merged

OV-75: add sidebar and header to home page #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5cb2985
OV-75: + Add sidebar to Home page
stefano-lacorazza Aug 29, 2024
fe4ef34
OV-75: * prettier
stefano-lacorazza Aug 29, 2024
c03b5c1
OV-75: + add Bell icon to Header
stefano-lacorazza Aug 29, 2024
ec9d35c
Revert "OV-75: + add Bell icon to Header"
stefano-lacorazza Aug 29, 2024
b5a198b
OV-75: + add overflow auto property
stefano-lacorazza Aug 29, 2024
fd1efe0
OV-75: + add minHeight to home main wrapper
stefano-lacorazza Aug 30, 2024
1c0bc9c
OV-75: - remove shadow from header
stefano-lacorazza Sep 2, 2024
a255a65
OV-62: * merge
JKaypa Sep 2, 2024
5e2c0bd
Merge branch 'task/OV-13-add-side-bar-component' into task/OV-62-crea…
JKaypa Sep 2, 2024
5b888e5
Merge branch 'next' into task/OV-75-Add-sidebar-and-header-to-Home-page
stefano-lacorazza Sep 2, 2024
2938d41
Merge branch 'task/OV-62-create-avatar-page' into task/OV-75-Add-side…
stefano-lacorazza Sep 2, 2024
de22bad
OV-75: - remove left margin from main content
stefano-lacorazza Sep 2, 2024
474336d
OV-75: * Return header z-index to 100
stefano-lacorazza Sep 3, 2024
339059d
Merge branch 'next' into task/OV-75-Add-sidebar-and-header-to-Home-page
stefano-lacorazza Sep 3, 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
1 change: 0 additions & 1 deletion frontend/src/bundles/common/components/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const Header: React.FC<Properties> = ({ left, center, right }) => {
left="0"
width="full"
backgroundColor="background.900"
boxShadow="md"
zIndex="100"
padding="4"
alignItems="center"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/bundles/home/components/main-content/main-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { VideoSection } from '../components.js';

const MainContent: React.FC = () => {
return (
<Box bg="background.50" borderRadius="lg" margin="0 25px">
<Box bg="background.50" borderRadius="lg">
<VideoSection />
<VideoSection />
</Box>
Expand Down
13 changes: 9 additions & 4 deletions frontend/src/bundles/home/pages/home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import { Box, Header } from '~/bundles/common/components/components.js';
import {
Box,
Header,
Sidebar,
} from '~/bundles/common/components/components.js';

import { MainContent } from '../components/components.js';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you encounter this issue with the background? I think it should be entirely blue, not white at the end. I know Oleksandra created the homepage, but it would be better to fix it now since you're also working on the homepage.

image

Copy link
Contributor

@WilsonBravo WilsonBravo Aug 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You just need to add the overflow: auto; property to the main wrapper.


const Home: React.FC = () => {
return (
<Box bg="background.900" height="100vh">
<Box bg="background.900" minHeight="100vh" overflow="auto">
<Header />
{/* Sidebar */}
<MainContent />
<Sidebar>
<MainContent />
</Sidebar>
</Box>
);
};
Expand Down
Loading