Skip to content

Commit

Permalink
m,s
Browse files Browse the repository at this point in the history
  • Loading branch information
IsaiasMalvar committed Dec 18, 2023
1 parent 1c87573 commit a523617
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 18 deletions.
6 changes: 3 additions & 3 deletions src/assets/apartments/apartments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ const apartmentsT: ApartmentStructure[] = [
},
id: 1,
image: {
detail: "/img/apartmentyes.jpeg",
preview: "/img/apartmentyes.jpeg",
detail: "img/apartmentyes.jpeg",
preview: "img/apartmentyes.jpeg",
galleryIds: [
{
id: 1,
// imageModulePath is relative path created by vite to find the pictures,
// imageModulePath is a relative path created by vite to find the pictures,
// it is necessary to rearrange the order of the pictures,
// it is passed as a value to compare with other through the find method

Expand Down
10 changes: 7 additions & 3 deletions src/components/Header/components/NavBar/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ const NavBar = ({ isVisible }: NavBarProps): React.ReactElement => {
$isVisible={isVisible}
className="navbar"
>
<Navbar.Brand href="/web#landscape" className="navbar__brand">
<img alt="logo" src="/img/lg21w2.png" />
<Navbar.Brand
as={HashLink}
to={"/web#landscape"}
className="navbar__brand"
>
<img alt="logo" src="img/lg21w2.png" />
</Navbar.Brand>
<Navbar.Toggle aria-controls="basic-navbar-nav" />
<Navbar.Collapse className="navbar__collapse">
Expand All @@ -26,7 +30,7 @@ const NavBar = ({ isVisible }: NavBarProps): React.ReactElement => {
</Nav.Link>
<Nav.Link
as={HashLink}
to={"https://isaiasmalvar.github.io/testP/web#apartments"}
to={"/web#apartments"}
className="navbar__link"
>
Apartments
Expand Down
2 changes: 1 addition & 1 deletion src/components/Landscape/LandscapeStyled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const LandscapeStyled = styled.section`
}
&__background {
background: url("/img/wonder.jpg") no-repeat center center;
background: url("img/wonder.jpg") no-repeat center center;
background-size: cover;
background-repeat: no-repeat;
background-attachment: fixed;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Loader/Loader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Loader = (): React.ReactElement => {
return (
<>
<LoaderStyled className="loader">
<img src="/img/lg21b2.png" alt="" className="loader__logo" />
<img src="img/lg21b2.png" alt="" className="loader__logo" />
<Spinner className="loader__spinner" />
</LoaderStyled>
</>
Expand Down
10 changes: 0 additions & 10 deletions src/pages/HomePage/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,14 @@ import HistorySection from "../../components/HistorySection/HistorySection";
import Landscape from "../../components/Landscape/Landscape";

import HomePageStyled from "./HomePageStyled";
import { useEffect, useState } from "react";
import Loader from "../../components/Loader/Loader";

const HomePage = (): React.ReactElement => {
const [show, setShow] = useState<boolean>(false);

useEffect(() => {
setTimeout(() => {
setShow(true);
}, 500);
}, []);
const { ref, inView } = useInView({
threshold: 0,
});

return (
<>
{!show && <Loader />}
<HomePageStyled className="homepage">
<Header isVisible={inView} />
<main className="homepage__content">
Expand Down

0 comments on commit a523617

Please sign in to comment.