Skip to content

Lab4 #4

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

Open
mchemrl wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Lab4 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67230fa
removed jquery
Uaman Jun 3, 2024
cf6a4f3
added html template and some parts of styling
mchemrl Jun 4, 2024
e025ab9
css kinda done
mchemrl Jun 5, 2024
44e71fa
buttons on cart panel work
mchemrl Jun 6, 2024
e5462dc
filter, pizza amount and total done, +fixed minor issues
mchemrl Jun 9, 2024
db5586a
final changes
mchemrl Jun 13, 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
2 changes: 1 addition & 1 deletion Frontend/src/Pizza_List.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var pizza_info = [
price: 169
},
is_new:true,
is_popular:true
is_popular:false

},
{
Expand Down
14 changes: 6 additions & 8 deletions Frontend/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
* Created by chaika on 25.01.16.
*/

$(function(){
document.addEventListener("DOMContentLoaded", (event) => {
//This code will execute when the page is ready
var PizzaMenu = require('./pizza/PizzaMenu');
var PizzaCart = require('./pizza/PizzaCart');
var Pizza_List = require('./Pizza_List');
const PizzaMenu = require('./pizza/PizzaMenu');
const PizzaCart = require('./pizza/PizzaCart');
const Pizza_List = require('./Pizza_List');

PizzaCart.initialiseCart();
PizzaMenu.initialiseMenu();


});
PizzaMenu.initialiseMenu();
});
121 changes: 62 additions & 59 deletions Frontend/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,78 +3,81 @@
<head lang="en">
<meta charset="UTF-8">
<title>Pizza</title>

<!-- Bootsrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">

<!-- LESS основний файл -->
<link rel="stylesheet/less" type="text/css" href="assets/less/main.less" />
<!-- LESS JavaScript компілятор -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.5.3/less.min.js"></script>


<link rel="stylesheet" type="text/css"href="styles.css">
</head>
<body>
<div id="cart"></div>
<div class="container">
<div class="row" id="pizza_list">
<div class="col-sm-6 col-md-4">
<div class="thumbnail pizza-card">
<img src="assets/images/pizza_1.jpg">

<div class="caption"><h3>Thumbnail label</h3>

<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>

<p>
<a href="#" class="btn btn-primary">Button 2</a>
<a href="#" class="btn btn-default">Button 1</a>
</p>
<main class="left-panel">
<header>
<div class="logo">
<span class="logo-pizza">PIZZA</span>
<span class="logo-kma">KMA</span>
<img src="assets/images/discount.svg">
</div>
<div class="info">
<div class="all-info">
<div class="info-text">
<span class="phone">(044) 222 5 222</span>
<span class="working-hours">24 години 7 днів на тиждень</span>
<span class="delivery-status">Безкоштовна доставка піци</span>
</div>
<button type="button" class="button login">ВВІЙТИ</button>
</div>

<div class="header-pizza">PIZZA</div>
</div>
</header>
<div class="pizza-filters">
<span><span class="filter-name">Усі піци</span><span class="pizza-amount" id="amount-main">8</span>
</span>
<div class="filters">
<button class="all chosen" onclick="filterPizza(event)">Усі</button>
<button class="meat" onclick="filterPizza(event)">М'ясні</button>
<button class="pineapple" onclick="filterPizza(event)">З ананасами</button>
<button class="mushrooms" onclick="filterPizza(event)">З грибами</button>
<button class="seafood" onclick="filterPizza(event)">З морепродуктами</button>
<button class="vegan" onclick="filterPizza(event)">Веганські</button>
</div>
</div>
<div class="menu"></div>
<footer>
<span>Pizza.24 - практичний проект в межах курсу з основ веб-технологій в межах Києво-Могилянської академії</span>
<span>Доставка піци не здійснюється</span>
</footer>
</main>

<aside class="cart">

<div class="cart-title">
<span>Замовлення<span class="pizza-amount" id="amount-cart">0</span></span>
<button class="clear-order" onclick="clearOrder(event)">Очистити замовлення</button>
</div>

<div class="col-sm-6 col-md-4">
<div class="thumbnail pizza-card">
<img src="assets/images/pizza_2.jpg">

<div class="caption"><h3>Thumbnail label</h3>
<div class="order-list"></div>

<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<div class="buy-section">
<div class="order-sum">
<span>Сума замовлення</span>
<span class="sum">0грн</span>
</div>

<p>
<a href="#" class="btn btn-primary">Button 3</a>
<a href="#" class="btn btn-default">Button 4</a>
</p>
</div>
<div class="order-section">
<button type="button" class="make-order">Замовити</button>
</div>
</div>

<div class="col-sm-6 col-md-4">
<div class="thumbnail pizza-card">
<img src="assets/images/pizza_3.jpg">

<div class="caption"><h3>Thumbnail label</h3>

<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>

<p>
<a href="#" class="btn btn-primary">Button 5</a>
<a href="#" class="btn btn-default">Button 6</a>
</p>
</div>
</div>
</aside>
<div class="discount">
<img src="assets/images/discount.svg" class="badge">
<div class="badge-text">
<span>ЦЬОГО</span><br>
<span>ТИЖНЯ</span><br>
<span>НА ВСЕ</span>
<div class="dashed-line"></div>
<span>-20%</span>
</div>
</div>
</div>

<!-- jQuery JavaScript -->
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.4.min.js"> </script>

<!--Bootsrap JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>

<!--Own JavaScript -->
<!--<script type="text/javascript" src="assets/js/main.js"> </script>-->
<script src="../src/Pizza_List.js"></script>
<script src="uploadpizza.js"></script>
</body>
</html>
Loading