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

Products #1741

Open
wants to merge 96 commits into
base: main
Choose a base branch
from
Open

Products #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
4c0d0dd
contacts section done
AlexandraMdv Aug 26, 2024
b208f32
Merge pull request #1 from MarcoPolo236/feature/contacts
MarcoPolo236 Aug 26, 2024
24b3280
style reset added and other modification
MarcoPolo236 Aug 26, 2024
5466d81
customer review added
MarcoPolo236 Aug 27, 2024
0f4c4aa
button functional and modals working
AlexandraMdv Aug 27, 2024
ed3a219
Merge branch 'main' into feature/contacts
MarcoPolo236 Aug 27, 2024
fddbe10
Merge pull request #2 from MarcoPolo236/feature/contacts
MarcoPolo236 Aug 27, 2024
7beefe8
Merge pull request #3 from MarcoPolo236/feature/gallery+customer-reviews
MarcoPolo236 Aug 27, 2024
44fae45
added include and import styles
MarcoPolo236 Aug 27, 2024
76803e3
Merge pull request #4 from MarcoPolo236/feature/gallery+customer-reviews
MarcoPolo236 Aug 27, 2024
88e652b
added js and more html in customer feature
MarcoPolo236 Aug 27, 2024
f7d435b
Merge branch 'main' into feature/gallery+customer-reviews
MarcoPolo236 Aug 27, 2024
7758efc
Merge pull request #5 from MarcoPolo236/feature/gallery+customer-reviews
MarcoPolo236 Aug 27, 2024
9fd66b9
About + advantages for 320px
mserban27 Aug 28, 2024
57293d4
added background and images to customer review
MarcoPolo236 Aug 28, 2024
a71fa4b
Mobile container
Dragostin99 Aug 29, 2024
e36255f
480res
Dragostin99 Aug 29, 2024
1476b09
updated review section
MarcoPolo236 Aug 29, 2024
2e5d8cf
About section + 420px display
mserban27 Aug 29, 2024
239aa69
carousel attempt update
MarcoPolo236 Aug 30, 2024
14d393a
Merge branch 'main' into About-and-Advantages
MarcoPolo236 Aug 30, 2024
5809082
Merge pull request #7 from MarcoPolo236/About-and-Advantages
MarcoPolo236 Aug 30, 2024
68b670f
Merge branch 'main' into feature/gallery+customer-reviews
MarcoPolo236 Aug 30, 2024
f4c9c36
Merge pull request #8 from MarcoPolo236/feature/gallery+customer-reviews
MarcoPolo236 Aug 30, 2024
1ddecf1
Merge branch 'main' into hero-section
MarcoPolo236 Aug 30, 2024
7d067b8
Merge pull request #9 from MarcoPolo236/hero-section
MarcoPolo236 Aug 30, 2024
ca1a97f
more review updates
MarcoPolo236 Aug 31, 2024
1ef80bc
reviews update (not far from finish)
MarcoPolo236 Aug 31, 2024
80f2660
Merge branch 'main' into feature/gallery+customer-reviews
MarcoPolo236 Aug 31, 2024
7e4b03e
Merge pull request #10 from MarcoPolo236/feature/gallery+customer-rev…
MarcoPolo236 Aug 31, 2024
b7cc497
products mobile version
victoriadgt Aug 31, 2024
cd3f8c4
Media queries + Modal window
mserban27 Aug 31, 2024
6370498
Almost finish !
Dragostin99 Sep 1, 2024
c1c7485
products section done
victoriadgt Sep 1, 2024
dadafbf
Close from finish
Dragostin99 Sep 1, 2024
86a3212
fix index.js bug (paranteza lipsa)
AlexandraMdv Sep 1, 2024
11cfec5
more changes to review/gallery
MarcoPolo236 Sep 1, 2024
1ac35b2
Merge pull request #11 from MarcoPolo236/hero-section
MarcoPolo236 Sep 1, 2024
3c9a123
Merge branch 'main' into About-and-Advantages
MarcoPolo236 Sep 1, 2024
ad1ab4b
Merge pull request #12 from MarcoPolo236/About-and-Advantages
MarcoPolo236 Sep 1, 2024
186de55
Merge pull request #14 from MarcoPolo236/feature/gallery+customer-rev…
MarcoPolo236 Sep 1, 2024
803e47d
finish
Dragostin99 Sep 1, 2024
d78357f
Merge pull request #15 from MarcoPolo236/hero-section
MarcoPolo236 Sep 1, 2024
3742da8
Merge branch 'main' into Products
victoriadgt Sep 1, 2024
73ddb81
update
Dragostin99 Sep 1, 2024
98845d1
added sections in index.html
victoriadgt Sep 1, 2024
14bc9d9
added sections to index.html
victoriadgt Sep 1, 2024
26c21fc
nav+header
Izabella-nogyosi Sep 1, 2024
0574c8e
Merge branch 'main' into Nav-Header+Footer
Izabella-nogyosi Sep 1, 2024
a4664aa
Merge branch 'main' into hero-section
Dragostin99 Sep 1, 2024
87c29fb
nav header
Izabella-nogyosi Sep 1, 2024
3b67389
modified section products
victoriadgt Sep 1, 2024
4c441c1
Merge pull request #16 from MarcoPolo236/Nav-Header+Footer
MarcoPolo236 Sep 1, 2024
cb744a0
Merge branch 'main' into Products
victoriadgt Sep 1, 2024
de3b487
Merge branch 'main' into hero-section
Dragostin99 Sep 1, 2024
aa3a46b
Merge branch 'main' into Products
victoriadgt Sep 1, 2024
b268f3f
Changes + About section
mserban27 Sep 1, 2024
4563571
commit
AlexandraMdv Sep 1, 2024
17dbad8
Merge branch 'main' into feature/contacts
AlexandraMdv Sep 1, 2024
7b153d6
buttons working on contacts and about sections
AlexandraMdv Sep 1, 2024
3917e8e
Media queries 768px and 1200px + Modal box
mserban27 Sep 1, 2024
1fb1a90
section products modal added
victoriadgt Sep 1, 2024
fe516af
section products - modal update
victoriadgt Sep 1, 2024
3222879
nav and footer scss
Izabella-nogyosi Sep 2, 2024
fff2859
products section - modal functional
victoriadgt Sep 2, 2024
bcb9afb
updated modal functionality - section Products
victoriadgt Sep 2, 2024
a87ff43
mobile navigation working
AlexandraMdv Sep 2, 2024
6f6ca7a
footer
Izabella-nogyosi Sep 2, 2024
3f4027e
Merge pull request #13 from MarcoPolo236/Products
MarcoPolo236 Sep 2, 2024
5a1590e
Merge pull request #17 from MarcoPolo236/Nav-Header+Footer
MarcoPolo236 Sep 2, 2024
7df8ccd
Merge pull request #19 from MarcoPolo236/hero-section
MarcoPolo236 Sep 2, 2024
70bb1b3
nav-header mobile
AlexandraMdv Sep 2, 2024
d25eb7a
Modal window updates
mserban27 Sep 2, 2024
17b4c05
Merge branch 'main' into About-and-Advantages
MarcoPolo236 Sep 2, 2024
45c933a
Merge pull request #18 from MarcoPolo236/About-and-Advantages
MarcoPolo236 Sep 2, 2024
4ae11cf
Merge branch 'main' into feature/contacts
MarcoPolo236 Sep 2, 2024
0401179
Merge pull request #20 from MarcoPolo236/feature/contacts
MarcoPolo236 Sep 2, 2024
7e91d72
changes on main hotfix
MarcoPolo236 Sep 2, 2024
5b8d075
changes on js for main
MarcoPolo236 Sep 2, 2024
7f26eab
Media queries 768px & 1200px
mserban27 Sep 2, 2024
335c580
Merge branch 'main' into feature/contacts
AlexandraMdv Sep 2, 2024
79e17c9
buttons working, js file without errors, about section modal showing
AlexandraMdv Sep 2, 2024
b0bd92c
Merge branch 'main' into About-and-Advantages
MarcoPolo236 Sep 3, 2024
86fac3d
Merge pull request #21 from MarcoPolo236/About-and-Advantages
MarcoPolo236 Sep 3, 2024
2b79b48
change mobile-menu padding for desktop screen
AlexandraMdv Sep 3, 2024
4aee084
Merge branch 'feature/contacts' of https://github.com/MarcoPolo236/Ec…
AlexandraMdv Sep 3, 2024
8c852b4
footer responsive from Izabella, hero section padding modified
AlexandraMdv Sep 3, 2024
af427f8
review mobile final update (god I hope)
MarcoPolo236 Sep 3, 2024
4ade784
final javascript modifications
MarcoPolo236 Sep 3, 2024
4306234
Merge pull request #23 from MarcoPolo236/feature/gallery+customer-rev…
MarcoPolo236 Sep 3, 2024
79d5f0c
main update for js
MarcoPolo236 Sep 3, 2024
830671e
about section mobile + 480 px done
AlexandraMdv Sep 3, 2024
caf6dd0
about cow image original
AlexandraMdv Sep 3, 2024
b242e53
Merge branch 'main' into feature/contacts
MarcoPolo236 Sep 3, 2024
22bd476
Merge pull request #24 from MarcoPolo236/feature/contacts
MarcoPolo236 Sep 3, 2024
041f73f
updated section products
victoriadgt 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
276 changes: 162 additions & 114 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/images/1st-review-img.jpg
View file
Open in desktop
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 src/images/2nd-review-img.jpg
View file
Open in desktop
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 src/images/3rd-review-img.jpg
View file
Open in desktop
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 src/images/Cow-image.png
View file
Open in desktop
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 src/images/about-cow-desktop.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/images/arrow-right.svg
View file
Open in desktop
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 src/images/buy-now-ice-coffee.jpg
View file
Open in desktop
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 src/images/buy-now-ice-cream.jpg
View file
Open in desktop
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 src/images/buy-now-milkshake.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/images/close-play-modal.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions src/images/cow-weight-icecream.svg
View file
Open in desktop
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 src/images/horizontal-line.jpg
View file
Open in desktop
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 src/images/ice-cream-background-desktop.jpg
View file
Open in desktop
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 src/images/[email protected]
View file
Open in desktop
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 src/images/ice-cream-background-mobile.jpg
View file
Open in desktop
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 src/images/[email protected]
View file
Open in desktop
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 src/images/ice-cream-background-tablet.jpg
View file
Open in desktop
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 src/images/[email protected]
View file
Open in desktop
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 src/images/ice-cream-background.jpg
View file
Open in desktop
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 src/images/ice-cream-overlap-picture-2.jpg
View file
Open in desktop
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 src/images/ice-cream-overlap-picture-3.jpg
View file
Open in desktop
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 src/images/ice-cream-overlap-picture.jpg
View file
Open in desktop
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 src/images/icecream-480rez.png
View file
Open in desktop
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 src/images/icecream-desktoprez.png
View file
Open in desktop
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 src/images/icecream-mobile.png
View file
Open in desktop
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 src/images/icecream-plate-desktop.png
View file
Open in desktop
Binary file added src/images/icecream-plate.png
View file
Open in desktop
Binary file added src/images/icecream-tabletrez.png
View file
Open in desktop
10 changes: 10 additions & 0 deletions src/images/icons-products.svg
View file
Open in desktop
Binary file added src/images/modal-products-ice-cream.jpg
View file
Open in desktop
Binary file added src/images/[email protected]
View file
Open in desktop
Binary file added src/images/products-ice-coffee.jpg
View file
Open in desktop
Binary file added src/images/[email protected]
View file
Open in desktop
Binary file added src/images/products-ice-cream.jpg
View file
Open in desktop
Binary file added src/images/[email protected]
View file
Open in desktop
Binary file added src/images/products-milkshakes.jpg
View file
Open in desktop
Binary file added src/images/[email protected]
View file
Open in desktop
Loading