-
Notifications
You must be signed in to change notification settings - Fork 6
Project The Lippie Factory #2
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.
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
Andreea2194
wants to merge
3
commits into
ITSchool-Web-Heroines:main
Choose a base branch
from
Andreea2194:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,17 @@ | ||
| { | ||
| "source": "src/index.html", | ||
| "browserslist": "> 5%", | ||
| "targets": { | ||
| "default": { | ||
| "publicUrl": "/Proiect-JS" | ||
| "source": "src/index.html", | ||
| "browserslist": "> 5%", | ||
| "scripts": { | ||
| "start": "parcel", | ||
| "build": "parcel build", | ||
| "push-gh-pages": "push-dir --dir=dist --branch=gh-pages --cleanup --verbose" | ||
| }, | ||
| "devDependencies": { | ||
| "@parcel/transformer-sass": "^2.7.0", | ||
| "parcel": "^2.7.0", | ||
| "push-dir": "^0.4.1" | ||
| }, | ||
| "dependencies": { | ||
| "bootstrap": "^5.2.1" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Dacă nu folosești Bootstrap, nu e nevoie să îl ai ca dependință. |
||
| } | ||
| }, | ||
| "scripts": { | ||
| "start": "parcel", | ||
| "build": "parcel build", | ||
| "push-gh-pages": "push-dir --dir=dist --branch=gh-pages --cleanup --verbose" | ||
| }, | ||
| "devDependencies": { | ||
| "@parcel/transformer-sass": "^2.7.0", | ||
| "parcel": "^2.7.0", | ||
| "push-dir": "^0.4.1" | ||
| }, | ||
| "dependencies": { | ||
| "bootstrap": "^5.2.0" | ||
| } | ||
| } | ||
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
|
|
||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <meta http-equiv="X-UA-Compatible" content="ie=edge" /> | ||
| <link rel="stylesheet" href="boutique.scss" /> | ||
| <script src="boutique.js" type="module"></script> | ||
| <title>The Lippie Factory</title> | ||
| </head> | ||
|
|
||
| <body> | ||
| <header> | ||
| <div class="menu"> | ||
| <a class="logo" href="index.html"><img class="navbarlogo" src="./img/logowhite.png" alt="logo"></a> | ||
| <ul class="nav"> | ||
| <li><a class="menu-item" href="story.html">Our Story</a></li> | ||
| <li><a class="menu-item" href="csr.html">Our sustainable difference</a></li> | ||
| <li><a class="menu-item" href="boutique.html">The Boutique</a></li> | ||
| </ul> | ||
| </div> | ||
| </header> | ||
| <section> | ||
| <div class="section1"> | ||
| <img class="boutiqueimage" src="./img/ezgif-1-05ce466842.gif"> | ||
| </div> | ||
| <div class="section2"> | ||
| <p class="intro">Experience the infinite possibilities of custom lipstick:<br> | ||
| Treat yourself, bring a friend, or make it a party. No matter how you play it, we’ll make | ||
| sure you leave with a lipstick (or two!) as unique as You</p> | ||
| <br /> | ||
| <br /> | ||
| <h4 class="heading1">Join the experience</h4> | ||
| </div> | ||
| <div id="container"> | ||
| <nav class="buttons"> | ||
| <a data-target="#appointment" class="active">Book an appointment</a> | ||
| <a data-target="#party">Host a party</a> | ||
| </nav> | ||
| <main class="tabs"> | ||
| <article id="appointment" class="active"> | ||
| <img class="formpicture1" src="./img/image2.png"> | ||
| <br /> | ||
| <br /> | ||
| <br /> | ||
| <form class="appointmentform"> | ||
| <label> | ||
| <div>Name and Surname</div> | ||
| <input type="text" placeholder="..." required/> | ||
| </label> | ||
| <label> | ||
| <div>Email</div> | ||
| <input type="text" placeholder="..." required/> | ||
| </label> | ||
| <label> | ||
| <div>Phone</div> | ||
| <input type="tel" placeholder="..." required/> | ||
| </label> | ||
| <label> | ||
| <div>Date and Time</div> | ||
| <input type="datetime-local" required> | ||
| </label> | ||
| <br /> | ||
| <label class="checkbox-group"> | ||
| <input type="checkbox" required/> | ||
| <div> I accept the terms and conditions</div> | ||
| </label> | ||
| <div class="btn-group"> | ||
| <button type="reset">Reset form</button> | ||
| <button type="button" class="submitbutton" id="submitbutton1">Submit</button> | ||
| </div> | ||
| <div class="popup1" id="popup1"> | ||
| <img src="./img/404-tick.png"> | ||
| <br /> | ||
| <br /> | ||
| <h7>Thank you!</h7> | ||
| <p> Your request has been successfully submitted</p> | ||
| <button type="button" id="closepopup1">Ok</button> | ||
| </div> | ||
| </form> | ||
| </article> | ||
| <article id="party"> | ||
| <img class="formpicture1" src="./img/image3.png"> | ||
| <br /> | ||
| <br /> | ||
| <br /> | ||
| <form class="partyform" action=""> | ||
| <label> | ||
| <div>Name and Surname</div> | ||
| <input type="text" placeholder="..." required/> | ||
| </label> | ||
| <label> | ||
| <div>Email</div> | ||
| <input type="text" placeholder="..." required/> | ||
| </label> | ||
| <label> | ||
| <div>Phone</div> | ||
| <input type="tel" placeholder="..." required/> | ||
| </label> | ||
| <label> | ||
| <div>Number of people</div> | ||
| <input type="text" placeholder="..." required/> | ||
| </label> | ||
| <label> | ||
| <label> | ||
| <div>Date and Time</div> | ||
| <input type="datetime-local" required> | ||
| </label> | ||
| <br /> | ||
| <label class="checkbox-group"> | ||
| <input type="checkbox" required /> | ||
| <div> I accept the terms and conditions</div> | ||
| </label> | ||
| <br /> | ||
| <div class="btn-group"> | ||
| <button type="reset">Reset form</button> | ||
| <button type="button" class="submitbutton" id="submitbutton2">Submit</button> | ||
| </div> | ||
| <div class="popup" id="popup"> | ||
| <img src="./img/404-tick.png"> | ||
| <br /> | ||
| <br /> | ||
| <h7>Thank you!</h7> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nu există |
||
| <p> Your request has been successfully submitted</p> | ||
| <button type="button" id="closepopup2">Ok</button> | ||
| </div> | ||
| </form> | ||
| </article> | ||
| </main> | ||
| </div> | ||
| </section> | ||
| <footer id="footer"> | ||
| <div class="socials"></div> | ||
| <div class="row1"> | ||
| <div class="column1"> | ||
| <h6>About</h6> | ||
| <p class="about">The Lippie Factory is a Romanian cosmetics company and boutique specializing in customized | ||
| lip products. The brand was founded by Andreea Conoro in | ||
| 2015 and it is carried exclusively at The Lippie Factory Bouutique based in Bucharest, Romania. What | ||
| makes The Lippie Factory stand out from other local companies in the beauty industry is the fact that | ||
| all its products | ||
| are made with food-grade, vegan ingredients and are infused with essential oils.</p> | ||
| </div> | ||
| <form class="column2"> | ||
| <h6>Subscribe to our newsletter</h6> | ||
| <input class="email-footer" type="email" placeholder="Email address"></input> | ||
| <button class="btn-footer">Submit</button> | ||
| </form> | ||
| <div class="column3"> | ||
| <h6>Quick links</h6> | ||
| <ul class="list"> | ||
| <li><a class="links" href="#">Contact</a></li> | ||
| <li><a class="links" href="#">Terms and Conditions</a></li> | ||
| <li><a class="links" href="#">Privacy Policy</a></li> | ||
| <li><a class="links" href="#">Sitemap</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="row2"> | ||
| <hr> | ||
| <p class="copyright-text">Copyright © 2022 All Rights Reserved by | ||
| <a href="#">The Lippie Factory</a> | ||
| </div> | ||
| </footer> | ||
| </body> | ||
|
|
||
| </html> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| const btn = document.querySelector(".buttons"); | ||
|
|
||
| btn.addEventListener("click", (event) => { | ||
| const item = document.querySelectorAll(".tabs article, .buttons a"); | ||
|
|
||
| item.forEach((currentValue) => { | ||
| currentValue.classList.remove("active"); | ||
| }); | ||
|
|
||
| event.target.classList.add("active"); | ||
| const selector = event.target.dataset.target; | ||
| const article = document.querySelector(selector); | ||
| article.classList.add("active"); | ||
| }); | ||
|
|
||
| const submitButton = document.getElementById("submitbutton1"); | ||
| const popup1 = document.querySelector(".popup1"); | ||
|
|
||
|
|
||
| submitButton.addEventListener(`click`, ()=> { | ||
| if(popup1.style.display === `none`) { | ||
| popup1.style.display = `block`; | ||
| } else { | ||
| popup1.style.display = `none`; | ||
| } | ||
| }) | ||
|
|
||
| const submitButton2 = document.getElementById("submitbutton2"); | ||
| const popup = document.querySelector(".popup"); | ||
|
|
||
|
|
||
| submitButton2.addEventListener(`click`, () => { | ||
| if (popup.style.display === `none`) { | ||
| popup.style.display = `block`; | ||
| } else { | ||
| popup.style.display = `none`; | ||
| } | ||
| }) | ||
|
|
||
| const closepopup1 = document.getElementById("closepopup1"); | ||
| closepopup1.addEventListener(`click`, () => { | ||
| if (popup1.style.display !== `none`) { | ||
| popup1.style.display = `none`; | ||
| } else { | ||
| popup1.style.display = `block`; | ||
| } | ||
| }) | ||
|
|
||
| const closepopup2 = document.getElementById("closepopup2"); | ||
| closepopup2.addEventListener(`click`, () => { | ||
| if (popup.style.display !== `none`) { | ||
| popup.style.display = `none`; | ||
| } else { | ||
| popup.style.display = `block`; | ||
| } | ||
| }) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dacă nu publici pe GH Pages, poți să renunți la scriptul acesta, și la dependința de
push-dir