Skip to content
Snippets Groups Projects
Commit 07af76be authored by Bertille Bouget's avatar Bertille Bouget
Browse files

avancees design

parent 726407ab
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 97 additions and 112 deletions
site_campagne/campagne/static/campagne/css/base.css
+ 8
− 0
View file @ 07af76be
......@@ -264,3 +264,11 @@ position: relative;
#bouton_crepes{
background-color: white;
}
.box_crepes{
width: 250px;
margin: 5px;
background: #fff;
padding: 20px 10px;
border-radius: 10px;
}
\ No newline at end of file
site_campagne/campagne/templates/campagne/activites.html
+ 4
− 5
View file @ 07af76be
......@@ -58,8 +58,7 @@
<p>En Michelin à 22h</p>
<br>
<a href = "{% url 'hotline' %}" style="text-decoration:none;color:coral">
<h3>Début de la hotline crêpes</h3>
<p>Commandes jusqu'à 2h aujourd'hui bouya</p>
<h3>Début de la hotline crêpes demain matin à 7h</h3>
</a>
</div>
<br>
......@@ -114,7 +113,7 @@
</h1>
<div class="text_box">
<h3>Petit déjeuner</h3>
<p style="color:red;">peut-etre des gaufres qui sait</p>
<p>Gâteau au chocolat</p>
<p>Stand capable de 7h30 à 10h</p>
<br>
<h3>Repas du midi</h3>
......@@ -149,7 +148,7 @@
</h1>
<div class="text_box">
<h3>Repas du midi</h3>
<p>Salade de pâtes</p>
<p>Crozet</p>
<p>Stand capable de 11h45 à 13h15</p>
<br>
<h3>Activité - escape game</h3>
......@@ -176,7 +175,7 @@
</h1>
<div class="text_box">
<h3>Repas du midi</h3>
<p>Crozet</p>
<p>Salade de pâtes</p>
<p>Stand capable de 11h45 à 13h15</p>
<br>
<h3>Activité - village Gaulois</h3>
......
site_campagne/campagne/templates/campagne/base.html
+ 4
− 1
View file @ 07af76be
......@@ -59,7 +59,10 @@
{% block content %}{% endblock %}
</main>
<footer>
<a href="tel:(33)(768104358)" class="le_bas">Pour nous contacter : 0768104358</a>
<div class="le_bas">
Pour nous contacter : <a href="">@astegif_et_obegif sur facebook </a>
</div>
<a href="tel:(33)(768104358)">Pour nous contacter : @astegif_et_obegif sur insta</a>
</footer>
<script type="text/javascript" src="{% static 'campagne/js/navbar.js' %}" ></script>
</body>
......
site_campagne/campagne/templates/campagne/hotline.html
+ 52
− 50
View file @ 07af76be
......@@ -24,34 +24,36 @@
</div>
</h1>
<div id= "commande_crepe">
<div class="text_box">
<div class="our_team">
<div class="box_crepes">
<h4>Crêpes natures</h4>
<br>
<img src="{% static 'campagne/images/nature.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="nature" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
<div class="text_box">
<div class="box_crepes">
<h4>Crêpes nutella</h4>
<br>
<img src="{% static 'campagne/images/nutella.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="nutella" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
<div class="text_box">
<div class="box_crepes">
<h4>Crêpes sucre</h4>
<br>
<img src="{% static 'campagne/images/sucre.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="sucre" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
<div class="text_box">
<div class="box_crepes">
<h4>Crêpes confiture</h4>
<br>
<img src="{% static 'campagne/images/confiture.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="confiture" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
</div>
<br>
<div class="text_box">
<p>Adresse de livraison</p>
......
site_campagne/campagne/templates/campagne/test.html
+ 27
− 55
View file @ 07af76be
......@@ -7,61 +7,33 @@
{% endblock %}
{% block content %}
<div class="wrapper">
<br>
<br>
<h1>
<div class="row" style="display: flex;">
<div class="column" style="flex: 10%;">
<img src="{% static 'campagne/images/casque.png' %}" style="vertical-align: middle;height: 1em;">
</div>
<div class="column" style="flex: 80%;">
HOTLINE
</div>
<div class="column" style="flex: 10%;">
<img src="{% static 'campagne/images/epee.png' %}" style="vertical-align: middle;height: 1em;padding-left: 2%;">
</div>
</div>
</h1>
<div id= "commande_crepe">
<div class="text_box">
<h4>Crêpes natures</h4>
<br>
<img src="{% static 'campagne/images/nature.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="nature" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
<div class="text_box">
<h4>Crêpes nutella</h4>
<br>
<img src="{% static 'campagne/images/nutella.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="nutella" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
<div class="text_box">
<h4>Crêpes sucre</h4>
<br>
<img src="{% static 'campagne/images/sucre.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="sucre" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
<div class="text_box">
<h4>Crêpes confiture</h4>
<br>
<img src="{% static 'campagne/images/confiture.jpeg' %}" style="vertical-align: middle;width: 70%;">
<br><br>
<input id="confiture" type="number" value=0 min=0 max=40 style="padding: 1%;"/>
</div>
<br>
<div class="text_box">
<p>Adresse de livraison</p>
<input id="adresse" type="text"/>
</div>
<div id="passer_commande">
<button id="bouton_crepes" style="font-size: 20px;">Commander</button>
</div>
</div>
</div>
<p>Voici tes commandes</p>
{% for commande in commandes %}
<div class="une_commande">
{% if commande.statut != "close" and commande.commanditaire.email == email %}
Vous avez commandé à {{commande.date}}:
{% if commande.crepe_nature != 0 %}
Crêpes nature : {{commande.crepe_nature}}
{% endif %}
{% if commande.crepe_confiture != 0 %}
Crêpes nature : {{commande.crepe_confiture}}
{% endif %}
{% if commande.crepe_nutella != 0 %}
Crêpes nature : {{commande.crepe_nutella}}
{% endif %}
{% if commande.crepe_sucre != 0 %}
Crêpes nature : {{commande.crepe_sucre}}
{% endif %}
{% if commande.statut == "a traiter" %}
Votre commande n'est pas encore prise en charge
<div >
<a class="annuler" href="/annuler/{{commande.pk}}">Annuler la commande</a>
</div>
{% else %}
{{commande.livreur.prenom}} {{commande.livreur.nom}} a pris en charge ta commande
{% endif %}
{% endif %}
</div>
{%endfor%}
<script type="text/javascript" src="{% static 'campagne/js/hotline.js' %}" ></script>
{% endblock %}
\ No newline at end of file
site_campagne/campagne/views.py
+ 2
− 1
View file @ 07af76be
......@@ -10,7 +10,8 @@ import json
from django.core.mail import send_mail
def test(request):
return render(request,'campagne/test.html')
commandes=commande_crepe.objects.all()
return render(request,'campagne/test.html',{'commandes':commandes})
def connexion(request):
return HttpResponseRedirect('https://auth.viarezo.fr/oauth/authorize/?redirect_uri=http://localhost:8000&client_id=2fe828e15647fc92437727b6646ce5c799c40991&response_type=code&state=sqdkfjhsqdkf&scope=default')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment