Skip to content

Commit

Permalink
Merge pull request #70 from Hidden-Warden/dev
Browse files Browse the repository at this point in the history
πŸ”§ image/ β†’ images/
  • Loading branch information
Ahhj93 authored May 31, 2023
2 parents 2c7abca + 2fcd5d2 commit 532f20d
Show file tree
Hide file tree
Showing 85 changed files with 124 additions and 124 deletions.
Binary file modified database/marmita.db
Binary file not shown.
50 changes: 25 additions & 25 deletions database/marmita.db.sql
Original file line number Diff line number Diff line change
Expand Up @@ -107,31 +107,31 @@ INSERT INTO "Ingredients" ("ID","Nom") VALUES (1,'Salade verte'),
(65,'Beurre fondu'),
(66,'Bière'),
(67,'Gros sel');
INSERT INTO "Famille" ("ID","Nom","Image") VALUES (1,'Entrees','image\famille\entrees.png'),
(2,'Plats','image\famille\plats.png'),
(3,'Desserts','image\famille\desserts.png'),
(4,'Sauces','image\famille\sauces.png'),
(5,'Boissons','image\famille\boissons.png'),
(6,'ApΓ©ritifs','image\famille\aperitifs.png');
--(7,'Autres','image\famille\autres.png');
INSERT INTO "Recettes" ("ID","Nom","Image","Nombre de personnes","Cuisson","Difficulte","ID_Famille") VALUES (1,'Salade de chèvre chaud','image\recettes\salade_chevre.png',4,0,1,1),
(2,'Boeuf bourguignon','image\recettes\boeuf_bourguignon.png',6,180,3,2),
(3,'Tarte aux pommes','image\recettes\tarte_pommes.png',8,50,2,3),
(4,'Sauce tomate','image\recettes\sauce_tomate.png',4,30,1,4),
(5,'Mojito','image\recettes\mojito.png',2,0,2,5),
(6,'FeuilletΓ©s au fromage','image\recettes\feuilletes_fromage.png',6,20,2,6),
(7,'Crème brûlée','image\recettes\creme_brulee.png',4,45,3,3),
(8,'Blue Margarita','image\recettes\blue-margarita.jpg',1,0,1,5),
(9,'CrΓͺpe au four finlandaise (Pannukakku)','image\recettes\pannukakku.png',4,20,2,3),
(10,'Petits biscuits de NoΓ«l','image\recettes\biscuits-de-noel.jpg',4,23,1,3),
(11,'Frites','image\recettes\frites.jpg',2,30,1,2),
(12,'PΓ’tes','image\recettes\pates.jpg',2,5,1,2),
(13,'Pizza','image\recettes\pizza.jpg',2,20,2,2),
(14,'Saumon','image\recettes\saumon.jpg',1,15,1,2),
(15,'Sushi','image\recettes\sushi.jpg',6,0,3,1),
(16,'Bretzel','image\recettes\bretzel.jpg',4,35,2,6),
(17,'Cocktail Icee','image\recettes\cocktail-icee.png',1,0,2,5),
(18,'Pain d''Γ©pices','image\recettes\pain-epices.jpg',4,45,2,3);
INSERT INTO "Famille" ("ID","Nom","Image") VALUES (1,'Entrees','images/famille/entrees.png'),
(2,'Plats','images/famille/plats.png'),
(3,'Desserts','images/famille/desserts.png'),
(4,'Sauces','images/famille/sauces.png'),
(5,'Boissons','images/famille/boissons.png'),
(6,'ApΓ©ritifs','images/famille/aperitifs.png');
--(7,'Autres','images/famille/autres.png');
INSERT INTO "Recettes" ("ID","Nom","Image","Nombre de personnes","Cuisson","Difficulte","ID_Famille") VALUES (1,'Salade de chèvre chaud','images/recettes/salade_chevre.png',4,0,1,1),
(2,'Boeuf bourguignon','images/recettes/boeuf_bourguignon.png',6,180,3,2),
(3,'Tarte aux pommes','images/recettes/tarte_pommes.png',8,50,2,3),
(4,'Sauce tomate','images/recettes/sauce_tomate.png',4,30,1,4),
(5,'Mojito','images/recettes/mojito.png',2,0,2,5),
(6,'FeuilletΓ©s au fromage','images/recettes/feuilletes_fromage.png',6,20,2,6),
(7,'Crème brûlée','images/recettes/creme_brulee.png',4,45,3,3),
(8,'Blue Margarita','images/recettes/blue-margarita.jpg',1,0,1,5),
(9,'CrΓͺpe au four finlandaise (Pannukakku)','images/recettes/pannukakku.png',4,20,2,3),
(10,'Petits biscuits de NoΓ«l','images/recettes/biscuits-de-noel.jpg',4,23,1,3),
(11,'Frites','images/recettes/frites.jpg',2,30,1,2),
(12,'PΓ’tes','images/recettes/pates.jpg',2,5,1,2),
(13,'Pizza','images/recettes/pizza.jpg',2,20,2,2),
(14,'Saumon','images/recettes/saumon.jpg',1,15,1,2),
(15,'Sushi','images/recettes/sushi.jpg',6,0,3,1),
(16,'Bretzel','images/recettes/bretzel.jpg',4,35,2,6),
(17,'Cocktail Icee','images/recettes/cocktail-icee.png',1,0,2,5),
(18,'Pain d''Γ©pices','images/recettes/pain-epices.jpg',4,45,2,3);
INSERT INTO "IngredientsDeRecette" ("ID", "ID_recettes", "ID_ingredients", "Quantite", "Unite") VALUES (1, 1, 1, 1.0, 'salade'),
(2,1,2,150.0,'g'),
(3,1,3,150.0,'g'),
Expand Down
4 changes: 2 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,12 @@ def on_error404(_):
return {}


@route('/image/<filepath:path>')
@route('/images/<filepath:path>')
def server_static_image(filepath):
"""
Fonction qui permet d'afficher les images.
"""
return static_file(filepath, root='static/image/')
return static_file(filepath, root='static/images/')


@route('/fonts/<filepath:path>')
Expand Down
20 changes: 10 additions & 10 deletions static/html/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="theme-color" content="black">
<title>Page non trouvΓ©e - Marmit@</title>
<link rel="icon" type="image/x-icon" href="/image/favicon.ico">
<link rel="icon" type="images/x-icon" href="/images/favicon.ico">
<link href="/css/style.css" rel="stylesheet" text="text/css">
<link rel="apple-touch-icon" href="/image/icon/touch-icon-iphone.png">
<link rel="apple-touch-icon" sizes="152x152" href="/image/icon/touch-icon-ipad.png">
<link rel="apple-touch-icon" sizes="180x180" href="/image/icon/touch-icon-iphone-retina.png">
<link rel="apple-touch-icon" sizes="167x167" href="/image/icon/touch-icon-ipad-retina.png">
<link rel="apple-touch-icon" href="/images/icon/touch-icon-iphone.png">
<link rel="apple-touch-icon" sizes="152x152" href="/images/icon/touch-icon-ipad.png">
<link rel="apple-touch-icon" sizes="180x180" href="/images/icon/touch-icon-iphone-retina.png">
<link rel="apple-touch-icon" sizes="167x167" href="/images/icon/touch-icon-ipad-retina.png">
</head>

<body>
<!-- Ajouter un en-tΓͺte avec un logo svg avec le texte "Marmit@" et une barre de recherche -->
<header>
<a href="../">
<img src="/image/logo_text.svg" alt="Logo Marmit@">
<img src="/images/logo_text.svg" alt="Logo Marmit@">
</a>
<form class="search-container" action="/chercheRecettes" method="POST">
<input name="recette" type="text" placeholder="Rechercher une recette" class="search-input">
<button type="submit" class="search-button"> <img src="/image/loop_search.svg"></button>
<button type="submit" class="search-button"> <img src="/images/loop_search.svg"></button>
</form>
</header>

Expand All @@ -36,15 +36,15 @@
<p>
<span class="bigger">Oops ! Cette page est introuvable.</span>
</p>
<img src="/image/404.svg" alt="404" width="400px" height="auto">
<img src="/image/loupe.svg" alt="Loupe" width="200px" class="loupe">
<img src="/images/404.svg" alt="404" width="400px" height="auto">
<img src="/images/loupe.svg" alt="Loupe" width="200px" class="loupe">
</div>
</div>

<!-- Ajouter un pied de page avec un logo svg avec le texte "Marmit@" et des liens vers les mentions lΓ©gales et le contact -->
<footer>
<a href="../">
<img src="/image/logo.svg" alt="Logo Marmit@">
<img src="/images/logo.svg" alt="Logo Marmit@">
</a>
<div class="copyright">Marmit@ Β© 2023</div>
<div class="liens">
Expand Down
16 changes: 8 additions & 8 deletions static/html/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="theme-color" content="black">
<title>Contact - Marmit@</title>
<link rel="icon" type="image/x-icon" href="/image/favicon.ico">
<link rel="icon" type="images/x-icon" href="/images/favicon.ico">
<link href="/css/style.css" rel="stylesheet" text="text/css">
<link rel="apple-touch-icon" href="/image/icon/touch-icon-iphone.png">
<link rel="apple-touch-icon" sizes="152x152" href="/image/icon/touch-icon-ipad.png">
<link rel="apple-touch-icon" sizes="180x180" href="/image/icon/touch-icon-iphone-retina.png">
<link rel="apple-touch-icon" sizes="167x167" href="/image/icon/touch-icon-ipad-retina.png">
<link rel="apple-touch-icon" href="/images/icon/touch-icon-iphone.png">
<link rel="apple-touch-icon" sizes="152x152" href="/images/icon/touch-icon-ipad.png">
<link rel="apple-touch-icon" sizes="180x180" href="/images/icon/touch-icon-iphone-retina.png">
<link rel="apple-touch-icon" sizes="167x167" href="/images/icon/touch-icon-ipad-retina.png">
</head>

<body>
<!-- Ajouter un en-tΓͺte avec un logo svg avec le texte "Marmit@" et une barre de recherche -->
<header>
<a href="../">
<img src="image/logo_text.svg" alt="Logo Marmit@">
<img src="images/logo_text.svg" alt="Logo Marmit@">
</a>
<form class="search-container" action="/chercheRecettes" method="POST">
<input name="recette" type="text" placeholder="Rechercher une recette" class="search-input">
<button type="submit" class="search-button"> <img src="/image/loop_search.svg"></button>
<button type="submit" class="search-button"> <img src="/images/loop_search.svg"></button>
</form>
</header>

Expand All @@ -47,7 +47,7 @@ <h2>Contacts GitHub</h2>
<!-- Ajouter un pied de page avec un logo svg avec le texte "Marmit@" et des liens vers les mentions lΓ©gales et le contact -->
<footer>
<a href="../">
<img src="image/logo.svg" alt="Logo Marmit@">
<img src="images/logo.svg" alt="Logo Marmit@">
</a>
<div class="copyright">Marmit@ Β© 2023</div>
<div class="liens">
Expand Down
16 changes: 8 additions & 8 deletions static/html/mentions.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="theme-color" content="black">
<title>Mentions lΓ©gales - Marmit@</title>
<link rel="icon" type="image/x-icon" href="/image/favicon.ico">
<link rel="icon" type="images/x-icon" href="/images/favicon.ico">
<link href="/css/style.css" rel="stylesheet" text="text/css">
<link rel="apple-touch-icon" href="/image/icon/touch-icon-iphone.png">
<link rel="apple-touch-icon" sizes="152x152" href="/image/icon/touch-icon-ipad.png">
<link rel="apple-touch-icon" sizes="180x180" href="/image/icon/touch-icon-iphone-retina.png">
<link rel="apple-touch-icon" sizes="167x167" href="/image/icon/touch-icon-ipad-retina.png">
<link rel="apple-touch-icon" href="/images/icon/touch-icon-iphone.png">
<link rel="apple-touch-icon" sizes="152x152" href="/images/icon/touch-icon-ipad.png">
<link rel="apple-touch-icon" sizes="180x180" href="/images/icon/touch-icon-iphone-retina.png">
<link rel="apple-touch-icon" sizes="167x167" href="/images/icon/touch-icon-ipad-retina.png">
</head>

<body>
<!-- Ajouter un en-tΓͺte avec un logo svg avec le texte "Marmit@" et une barre de recherche -->
<header>
<a href="../">
<img src="image/logo_text.svg" alt="Logo Marmit@">
<img src="images/logo_text.svg" alt="Logo Marmit@">
</a>
<form class="search-container" action="/chercheRecettes" method="POST">
<input name="recette" type="text" placeholder="Rechercher une recette" class="search-input">
<button type="submit" class="search-button"> <img src="/image/loop_search.svg"></button>
<button type="submit" class="search-button"> <img src="/images/loop_search.svg"></button>
</form>
</header>

Expand All @@ -49,7 +49,7 @@
<!-- Ajouter un pied de page avec un logo svg avec le texte "Marmit@" et des liens vers les mentions lΓ©gales et le contact -->
<footer>
<a href="../">
<img src="image/logo.svg" alt="Logo Marmit@">
<img src="images/logo.svg" alt="Logo Marmit@">
</a>
<div class="copyright">Marmit@ Β© 2023</div>
<div class="liens">
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading

0 comments on commit 532f20d

Please sign in to comment.