Skip to content

Commit

Permalink
Merge pull request #470 from dump-hr/andrea/izlozbeni-prostor
Browse files Browse the repository at this point in the history
Home: Izlozbeni prostor
  • Loading branch information
lovretomic authored Jan 21, 2025
2 parents 9f708e4 + 7b34a21 commit 52b0708
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 1 deletion.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/src/assets/images/fesb pozadina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/src/assets/images/fesb-pozadina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/app/src/assets/images/fesb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
100 changes: 100 additions & 0 deletions apps/app/src/components/LocationSection/LocationSection.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
.containerWrapper {
position: relative;
width: 100%;
display: flex;
flex-direction: column;
background-color: $primary-muted-orange;
border-radius: 16px;
overflow: visible;
min-height: auto;
padding-bottom: 40px;

@media (min-width: $breakpoint-tablet) {
align-items: center;
border-radius: 20px;
padding-bottom: 60px;
}
}

.titleWrapper {
display: flex;
flex-direction: column;
width: 100%;
max-width: 480px;
z-index: 2;
padding: 48px 24px;
margin: 0 auto;
}

.title {
color: $primary-white;
@include heading-2;
font-style: normal;
font-weight: 500;
line-height: 28px;
letter-spacing: -0.24px;
text-transform: uppercase;
margin-bottom: 12px;
}

.description {
color: $primary-white;
@include paragraph-16;
font-style: normal;
font-weight: 400;
line-height: 22px;
letter-spacing: -0.16px;
margin-bottom: 32px;
}

.button {
display: flex;
height: 52px;
justify-content: center;
align-items: center;
}

.imageContainer {
position: relative;
width: 100%;
display: flex;
justify-content: center;
align-items: flex-end;
height: auto;

&::before {
content: '';
position: absolute;
top: 40px;
left: 0;
width: 100%;
height: 100%;
background-image: url('../../assets/images/fesb-pozadina.png');
background-repeat: no-repeat;
background-position: center top;
background-size: 100% 70%;
z-index: 1;

@media (min-width: $breakpoint-tablet) {
background-image: url('../../assets/images/fesb-pozadina-desktop.png');
top: 35px;
}
}
}

.image {
position: relative;
width: 100%;
height: auto;
object-fit: contain;
transform: scale(1.2) translate(-20px, 0);
z-index: 2;
max-width: 500px;
margin-bottom: 40px;

@media (min-width: $breakpoint-tablet) {
max-width: 550px;
transform: none;
margin-bottom: 60px;
}
}
28 changes: 28 additions & 0 deletions apps/app/src/components/LocationSection/LocationSection.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import c from './LocationSection.module.scss';
import fesb from '../../assets/images/fesb.png';
import Button from '../Button';

const LocationSection = () => {
return (
<div className={c.containerWrapper}>
<div className={c.titleWrapper}>
<h1 className={c.title}>IZLOžBENI PROSTOR</h1>

<p className={c.description}>
Nudimo ti interaktivni tlocrt konferencije kako bi se lakše mogao
snalaziti. Zoomiraj na štandove i vidi gdje se koja tvrtka nalazi.
</p>

<Button className={c.button} variant='black'>
ZAVIRI U NAŠ PROSTOR
</Button>
</div>

<div className={c.imageContainer}>
<img src={fesb} alt='zgrada fesba' className={c.image} />
</div>
</div>
);
};

export default LocationSection;
3 changes: 3 additions & 0 deletions apps/app/src/components/LocationSection/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import LocationSection from './LocationSection';

export default LocationSection;
3 changes: 2 additions & 1 deletion apps/app/src/components/Navigation/Navigation.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
width: 100%;
height: 78px;
background-color: $primary-black;
position: absolute;
position: fixed;
bottom: 0px;
display: flex;
justify-content: space-around;
align-items: center;
z-index: 2;

display: none; //TEMP
}
Expand Down
2 changes: 2 additions & 0 deletions apps/app/src/pages/Home/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import c from './Home.module.scss';
import TopCompaniesSection from './sections/TopCompaniesSection';
import EventsSection from './sections/EventsSection';
import LocationSection from '../../components/LocationSection';

const Home = () => {
return (
<div className={c.page}>
<header className={c.header}></header>
<main className={c.main}>
<EventsSection />
<LocationSection />
<TopCompaniesSection />
</main>
</div>
Expand Down

0 comments on commit 52b0708

Please sign in to comment.