diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..031c4235d5c9947d86a31cbe6a606fa82ba494e4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+website/db.sqlite3
+
+.DS_Store
+
+website/nutriform/__pycache__/*
+
+website/nutriform/migrations/__pycache__/*
+
+website/website/__pycache__/*
diff --git a/website/nutriform/__pycache__/__init__.cpython-37.pyc b/website/nutriform/__pycache__/__init__.cpython-37.pyc
deleted file mode 100644
index 2301532019f3ee528fe212f4c9bca5f49b8ffe67..0000000000000000000000000000000000000000
Binary files a/website/nutriform/__pycache__/__init__.cpython-37.pyc and /dev/null differ
diff --git a/website/nutriform/__pycache__/admin.cpython-37.pyc b/website/nutriform/__pycache__/admin.cpython-37.pyc
deleted file mode 100644
index 7bb7eea0e53e58527e9e0ce7fb1699dff6a1339c..0000000000000000000000000000000000000000
Binary files a/website/nutriform/__pycache__/admin.cpython-37.pyc and /dev/null differ
diff --git a/website/nutriform/__pycache__/models.cpython-37.pyc b/website/nutriform/__pycache__/models.cpython-37.pyc
deleted file mode 100644
index 641e468d73bf2bf7e9ac7df0f426f3482aba3ff1..0000000000000000000000000000000000000000
Binary files a/website/nutriform/__pycache__/models.cpython-37.pyc and /dev/null differ
diff --git a/website/nutriform/__pycache__/urls.cpython-37.pyc b/website/nutriform/__pycache__/urls.cpython-37.pyc
deleted file mode 100644
index f10ae81b9d8567d19f35b75918a76a0d7fc8fb12..0000000000000000000000000000000000000000
Binary files a/website/nutriform/__pycache__/urls.cpython-37.pyc and /dev/null differ
diff --git a/website/nutriform/__pycache__/views.cpython-37.pyc b/website/nutriform/__pycache__/views.cpython-37.pyc
deleted file mode 100644
index 5582d03530d3ab62ed4b94910b66bfe13514aabf..0000000000000000000000000000000000000000
Binary files a/website/nutriform/__pycache__/views.cpython-37.pyc and /dev/null differ
diff --git a/website/nutriform/forms.py b/website/nutriform/forms.py
new file mode 100644
index 0000000000000000000000000000000000000000..911ceca3992c76499e8003de98531a1a6e3a56b3
--- /dev/null
+++ b/website/nutriform/forms.py
@@ -0,0 +1,13 @@
+from django import forms
+from datetime import datetime
+from django.contrib.auth.models import User
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+from django.core.exceptions import ValidationError
+import os
+
+class UserForm(UserCreationForm):
+ email = forms.EmailField(required=False)
+
+ class Meta:
+ model = User
+ fields = ('username', 'password1', 'password2')
\ No newline at end of file
diff --git a/website/nutriform/migrations/0001_initial.py b/website/nutriform/migrations/0001_initial.py
new file mode 100644
index 0000000000000000000000000000000000000000..434aa7a766ffb63ffab6c34ab0dbd5e2d1f31443
--- /dev/null
+++ b/website/nutriform/migrations/0001_initial.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2.6 on 2019-10-16 17:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Menu',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('nb_plat', models.IntegerField()),
+ ('entree', models.CharField(max_length=150)),
+ ],
+ ),
+ ]
diff --git a/website/nutriform/migrations/__pycache__/__init__.cpython-37.pyc b/website/nutriform/migrations/__pycache__/__init__.cpython-37.pyc
deleted file mode 100644
index 657bc80f0d463ac20bc3f9afcf396b1b0710778b..0000000000000000000000000000000000000000
Binary files a/website/nutriform/migrations/__pycache__/__init__.cpython-37.pyc and /dev/null differ
diff --git a/website/nutriform/models.py b/website/nutriform/models.py
index 71a836239075aa6e6e4ecb700e9c42c95c022d91..2aa8a885242150df714eec1892899206b5ff14fe 100644
--- a/website/nutriform/models.py
+++ b/website/nutriform/models.py
@@ -1,3 +1,7 @@
from django.db import models
# Create your models here.
+class Menu(models.Model):
+ nb_plat = models.IntegerField()
+ entree = models.CharField(max_length=150)
+
diff --git a/website/nutriform/templates/nutriform/base.html b/website/nutriform/templates/nutriform/base.html
index 80eede345eb6c211cfb9b4cb6325f8cc9cc7565b..5c16434135935dbcbe70c2b0d690f70d09ffa414 100644
--- a/website/nutriform/templates/nutriform/base.html
+++ b/website/nutriform/templates/nutriform/base.html
@@ -6,40 +6,57 @@
Released for free under the Creative Commons Attribution 3.0 license (templated.co/license)
-->
<html>
- <head>
- <title>NutriForm</title>
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <link rel="stylesheet" href="{% static 'nutriform/assets/css/main.css' %}" />
- </head>
- <body class="landing">
-
-
-
- {% block content %}
- {% endblock %}
-
- <!-- Footer -->
- <footer id="footer">
- <div class="container">
- <ul class="icons">
- <li><a href="#" class="icon fa-facebook"></a></li>
- <li><a href="#" class="icon fa-twitter"></a></li>
- <li><a href="#" class="icon fa-instagram"></a></li>
- </ul>
- <ul class="copyright">
- <li>© NutriForm</li>
- <li>Design: <a href="http://templated.co">TEMPLATED</a></li>
- <li>Images: <a href="http://unsplash.com">Unsplash</a></li>
- </ul>
- </div>
- </footer>
-
- <!-- Scripts -->
- <script src="{% static 'nutriform/assets/js/jquery.min.js' %}"></script>
- <script src="{% static 'nutriform/assets/js/skel.min.js' %}"></script>
- <script src="{% static 'nutriform/assets/js/util.js' %}"></script>
- <script src="{% static 'nutriform/assets/js/main.js' %}"></script>
-
- </body>
+
+<head>
+ <title>NutriForm</title>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link rel="stylesheet" href="{% static 'nutriform/assets/css/main.css' %}" />
+</head>
+
+<body>
+
+ <header id="header">
+ <h1><strong><a href="{% url 'index' %}">Nutriform</a></h1>
+ <nav id="nav">
+ <ul>
+ <li><a href="{% url 'index' %}">Accueil</a></li>
+ <li><a href="elements.html">About us</a></li>
+ <li><a href="{% url 'compte' %}">Mon compte</a></li>
+ {% if user.is_authenticated %}
+ <li><a href="{% url 'logout' %}">Se déconnecter</a></li>
+ {% else %}
+ <li><a href="{% url 'login' %}">Se connecter</a></li>
+ {% endif %}
+ </ul>
+ </nav>
+ </header>
+
+ {% block content %}
+ {% endblock %}
+
+ <!-- Footer -->
+ <footer id="footer">
+ <div class="container">
+ <ul class="icons">
+ <li><a href="#" class="icon fa-facebook"></a></li>
+ <li><a href="#" class="icon fa-twitter"></a></li>
+ <li><a href="#" class="icon fa-instagram"></a></li>
+ </ul>
+ <ul class="copyright">
+ <li>© NutriForm</li>
+ <li>Design: <a href="http://templated.co">TEMPLATED</a></li>
+ <li>Images: <a href="http://unsplash.com">Unsplash</a></li>
+ </ul>
+ </div>
+ </footer>
+
+ <!-- Scripts -->
+ <script src="{% static 'nutriform/assets/js/jquery.min.js' %}"></script>
+ <script src="{% static 'nutriform/assets/js/skel.min.js' %}"></script>
+ <script src="{% static 'nutriform/assets/js/util.js' %}"></script>
+ <script src="{% static 'nutriform/assets/js/main.js' %}"></script>
+
+</body>
+
</html>
\ No newline at end of file
diff --git a/website/nutriform/templates/nutriform/compte.html b/website/nutriform/templates/nutriform/compte.html
new file mode 100644
index 0000000000000000000000000000000000000000..d32020672481f897035d678cd89a4f11ee9dfb0a
--- /dev/null
+++ b/website/nutriform/templates/nutriform/compte.html
@@ -0,0 +1,11 @@
+{% extends "../nutriform/base.html" %}
+
+{% block content %}
+
+<div class="container">
+
+ <p>Je suis bien dans mon compte en tant que {{ user.username }}</p>
+ <h3>Mes informations diverses</h3>
+
+</div class="container">
+{% endblock %}
\ No newline at end of file
diff --git a/website/nutriform/templates/nutriform/index.html b/website/nutriform/templates/nutriform/index.html
index 90a1a91c926a190f2282eda13c3a29776387563f..1919ba91fb3270759ea623fac637e42ceaaa6875 100644
--- a/website/nutriform/templates/nutriform/index.html
+++ b/website/nutriform/templates/nutriform/index.html
@@ -6,196 +6,224 @@
Released for free under the Creative Commons Attribution 3.0 license (templated.co/license)
-->
<html>
- <head>
- <title>NutriForm</title>
- <meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <link rel="stylesheet" href="{% static 'nutriform/assets/css/main.css' %}" />
- </head>
- <body class="landing">
-
- <!-- Header -->
- <header id="header" class="alt">
- <h1><strong><a href="index.html">NutriForm</a></strong> tout simplement</h1>
- <nav id="nav">
- <ul>
- <li><a href="{% url 'index' %}">Accueil</a></li>
- <li><a href="generic.html">Mon compte</a></li>
- <li><a href="elements.html">About us</a></li>
- </ul>
- </nav>
+
+<head>
+ <title>NutriForm</title>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link rel="stylesheet" href="{% static 'nutriform/assets/css/main.css' %}" />
+</head>
+
+<body class="landing">
+
+ <!-- Header -->
+ <header id="header" class="alt">
+ <h1><strong><a href="index.html">NutriForm</a></strong> tout simplement</h1>
+ <nav id="nav">
+ <ul>
+ <li><a href="{% url 'index' %}">Accueil</a></li>
+ <li><a href="elements.html">About us</a></li>
+ <li><a href="{% url 'compte' %}">Mon compte</a></li>
+ {% if user.is_authenticated %}
+ <li><a href="{% url 'logout' %}">Se déconnecter</a></li>
+ {% else %}
+ <li><a href="{% url 'login' %}">Se connecter</a></li>
+ {% endif %}
+ </ul>
+ </nav>
+ </header>
+
+ <a href="#menu" class="navPanelToggle"><span class="fa fa-bars"></span></a>
+
+ <!-- Banner -->
+ <section id="banner">
+ <h2>NutriForm</h2>
+ <p>La solution pour vos conseils bien-être<br /> Par le super groupe de PIMA</p>
+ <ul class="actions">
+ <li><a href="{% url 'register' %}" class="button special big">Je m'inscris</a></li>
+ </ul>
+ </section>
+
+ <!-- One -->
+ <section id="one" class="wrapper style1">
+ <div class="container 75%">
+ <div class="row 200%">
+ <div class="6u 12u$(medium)">
+ <header class="major">
+ <h2>Nutriform</h2>
+ <p>Des conseils adaptés à vos besoins</p>
+ </header>
+ </div>
+ <div class="6u$ 12u$(medium)">
+ <p>NutriForm qu'est ce que c'est? C'est un suivi et des conseils adaptés aux besoins de chacun. Lors
+ de votre premmière inscription vous rentrez vos inforamtions générales sur votre condition
+ physique. Vous rentrez aussi votre objectif. Vous receverez alors vos premiers conseil de menu
+ fitness pour manger plus seinement et ainsi améliorer votre bien être physique. Deplus vous
+ receverez de manière régulière des questionnaires à compléter sur notre site pour que nos
+ conseils soient le plus adaptés à vos besoins et pour pouvoir améliorer votre bien être.</p>
+ <p>NutriForm c'est aussi des conseils d'activité physique pour pouvoir allier sport et régime
+ alimentaire pour de meilleurs résultats.En effet des conseils d'exercices vous seront proposés
+ régulièrement. De même des propositions de lieux proche de chez vous pour pouvoir pratiquer du
+ sport et améliorer votre condition physique.</p>
+ </div>
+ </div>
+ </div>
+ </section>
+
+ <!-- Two -->
+ <section id="two" class="wrapper style2 special">
+ <div class="container">
+ <header class="major">
+ <h2>Definissez votre objectif</h2>
+ <p>Que souhaitez vous accomplir en suivant notre programme?</p>
</header>
+ <div class="row 150%">
+ <div class="6u 12u$(xsmall)">
+ <div class="image fit captioned">
+ <img src="{% static 'nutriform/images/perte-de-poids.jpg' %}" width="400" height="300" alt="" />
+ <h3 width="400" height="100">Perte de pois et remise en forme</h3>
+ </div>
+ </div>
+ <div class="6u$ 12u$(xsmall)">
+ <div class="image fit captioned">
+ <img src="{% static 'nutriform/images/111345962.jpg' %}" width="400" height="300" alt="" />
+ <h3 width="400" height="100">Entretient physique</h3>
+ </div>
+ </div>
+ </div>
+ <ul class="actions">
+ <li><a href="#" class="button special big">Perte de poids</a></li>
+ <li><a href="#" class="button big">Entretient</a></li>
+ </ul>
+ </div>
+ </section>
- <a href="#menu" class="navPanelToggle"><span class="fa fa-bars"></span></a>
-
- <!-- Banner -->
- <section id="banner">
- <h2>NutriForm</h2>
- <p>La solution pour vos conseils bien-être<br/> Par le super groupe de PIMA</p>
- <ul class="actions">
- <li><a href="{% url 'login' %}" class="button special big">Je m'inscris</a></li>
- </ul>
- </section>
-
- <!-- One -->
- <section id="one" class="wrapper style1">
- <div class="container 75%">
- <div class="row 200%">
- <div class="6u 12u$(medium)">
- <header class="major">
- <h2>Nutriform</h2>
- <p>Des conseils adaptés à vos besoins</p>
- </header>
- </div>
- <div class="6u$ 12u$(medium)">
- <p>NutriForm qu'est ce que c'est? C'est un suivi et des conseils adaptés aux besoins de chacun. Lors de votre premmière inscription vous rentrez vos inforamtions générales sur votre condition physique. Vous rentrez aussi votre objectif. Vous receverez alors vos premiers conseil de menu fitness pour manger plus seinement et ainsi améliorer votre bien être physique. Deplus vous receverez de manière régulière des questionnaires à compléter sur notre site pour que nos conseils soient le plus adaptés à vos besoins et pour pouvoir améliorer votre bien être.</p>
- <p>NutriForm c'est aussi des conseils d'activité physique pour pouvoir allier sport et régime alimentaire pour de meilleurs résultats.En effet des conseils d'exercices vous seront proposés régulièrement. De même des propositions de lieux proche de chez vous pour pouvoir pratiquer du sport et améliorer votre condition physique.</p>
- </div>
- </div>
+ <!-- Three -->
+ <section id="three" class="wrapper style1">
+ <div class="container">
+ <header class="major special">
+ <h2>Les atouts de nutriform</h2>
+ <p>Ce que vous fournit notre programme.</p>
+ </header>
+ <div class="feature-grid">
+ <div class="feature">
+ <div class="image rounded"><img
+ src="{% static 'nutriform/images/comment-faire-un-plat-de-riz-a-l-indienne.jpg' %}"
+ width="100" height="100" alt="" /></div>
+ <div class="content">
+ <header>
+ <h4>Menus nutriform</h4>
+ <p width="100" height="100">Recevez chaque jour nos menus adaptés pour vous aider à
+ améliorer votre condition physique</p>
+ </header>
+ <p width="100" height="100">Nutriform conçoit des menus équilibrés répondant aix besoins de
+ chacun. Avec des ingrédients et des aliments accessible et variés. </p>
</div>
- </section>
-
- <!-- Two -->
- <section id="two" class="wrapper style2 special">
- <div class="container">
- <header class="major">
- <h2>Definissez votre objectif</h2>
- <p>Que souhaitez vous accomplir en suivant notre programme?</p>
+ </div>
+ <div class="feature">
+ <div class="image rounded"><img src="{% static 'nutriform/images/questionnaire.jpg' %}" width="100"
+ height="100" alt="" /></div>
+ <div class="content">
+ <header>
+ <h4>Activités physique</h4>
+ <p width="100" height="100">Recevez des conseils d'exercices quotidiennement</p>
</header>
- <div class="row 150%">
- <div class="6u 12u$(xsmall)">
- <div class="image fit captioned">
- <img src="{% static 'nutriform/images/perte-de-poids.jpg' %}" width="400" height="300" alt="" />
- <h3 width="400" height="100">Perte de pois et remise en forme</h3>
- </div>
- </div>
- <div class="6u$ 12u$(xsmall)">
- <div class="image fit captioned">
- <img src="{% static 'nutriform/images/111345962.jpg' %}" width="400" height="300" alt="" />
- <h3 width="400" height="100">Entretient physique</h3>
- </div>
- </div>
- </div>
- <ul class="actions">
- <li><a href="#" class="button special big">Perte de poids</a></li>
- <li><a href="#" class="button big">Entretient</a></li>
- </ul>
+ <p width="100" height="100">Nutriform propose des exercices physiques pour vous aider à
+ atteindre vos objectifs.</p>
</div>
- </section>
-
- <!-- Three -->
- <section id="three" class="wrapper style1">
- <div class="container">
- <header class="major special">
- <h2>Les atouts de nutriform</h2>
- <p>Ce que vous fournit notre programme.</p>
+ </div>
+ <div class="feature">
+ <div class="image rounded"><img src="{% static 'nutriform/images/Kumpellauf-gross.jpg' %}"
+ width="100" height="100" alt="" /></div>
+ <div class="content">
+ <header>
+ <h4>GéoLocalisation SPORT </h4>
+ <p width="100" height="100">Où pratiquer du sport près de chez vous</p>
</header>
- <div class="feature-grid">
- <div class="feature">
- <div class="image rounded"><img src="{% static 'nutriform/images/comment-faire-un-plat-de-riz-a-l-indienne.jpg' %}" width="100" height="100" alt="" /></div>
- <div class="content">
- <header>
- <h4>Menus nutriform</h4>
- <p width="100" height="100">Recevez chaque jour nos menus adaptés pour vous aider à améliorer votre condition physique</p>
- </header>
- <p width="100" height="100">Nutriform conçoit des menus équilibrés répondant aix besoins de chacun. Avec des ingrédients et des aliments accessible et variés. </p>
- </div>
- </div>
- <div class="feature">
- <div class="image rounded"><img src="{% static 'nutriform/images/questionnaire.jpg' %}" width="100" height="100" alt="" /></div>
- <div class="content">
- <header>
- <h4>Activités physique</h4>
- <p width="100" height="100">Recevez des conseils d'exercices quotidiennement</p>
- </header>
- <p width="100" height="100">Nutriform propose des exercices physiques pour vous aider à atteindre vos objectifs.</p>
- </div>
- </div>
- <div class="feature">
- <div class="image rounded"><img src="{% static 'nutriform/images/Kumpellauf-gross.jpg' %}" width="100" height="100" alt="" /></div>
- <div class="content">
- <header>
- <h4>GéoLocalisation SPORT </h4>
- <p width="100" height="100">Où pratiquer du sport près de chez vous</p>
- </header>
- <p width="100" height="100">Recevez des conseils de lieux pour pratiquer une activité physique près de chez vous.</p>
- </div>
- </div>
- <div class="feature">
- <div class="image rounded"><img src="{% static 'nutriform/images/ouvrir-une-franchise-de-salle-de-sport-fitness.jpg' %}" width="100" height="100" alt="" /></div>
- <div class="content">
- <header>
- <h4>Suivi Personnalisé</h4>
- <p width="100" height="100">Des questionnaires réguliers pour mieux répondre à vos attentes</p>
- </header>
- <p>Nutriform vous suit tout au long de votre programme pour pouvoir évaluer vos progrès et adapter nos conseils en conséquence.</p>
- </div>
- </div>
- </div>
+ <p width="100" height="100">Recevez des conseils de lieux pour pratiquer une activité physique
+ près de chez vous.</p>
</div>
- </section>
-
- <!-- Four -->
- <section id="four" class="wrapper style3 special">
- <div class="container">
- <header class="major">
- <h2>Un besoin ? Des questions ?</h2>
- <p>N'hésitez pas à nous contacter !</p>
+ </div>
+ <div class="feature">
+ <div class="image rounded"><img
+ src="{% static 'nutriform/images/ouvrir-une-franchise-de-salle-de-sport-fitness.jpg' %}"
+ width="100" height="100" alt="" /></div>
+ <div class="content">
+ <header>
+ <h4>Suivi Personnalisé</h4>
+ <p width="100" height="100">Des questionnaires réguliers pour mieux répondre à vos attentes
+ </p>
</header>
- <form method="post" action="#">
- {% csrf_token %}
- <div class="row uniform 50%" style="color: whitesmoke;">
- <div class="6u 12u$(xsmall)">
- <input type="text" name="name" id="name" value="" placeholder="Nom" />
- </div>
- <div class="6u$ 12u$(xsmall)">
- <input type="email" name="email" id="email" value="" placeholder="Email" />
- </div>
-
- <div class="12u$">
- <textarea name="message" id="message" placeholder="Dites-nous tout" rows="6"></textarea>
- </div>
- <div class="12u$">
- <ul class="actions">
- <li><input type="submit" value="Nous contacter" class="special" /></li>
- <li><input type="reset" value="Réinitialiser" /></li>
- </ul>
- </div>
- </div>
- </form>
- <!--
+ <p>Nutriform vous suit tout au long de votre programme pour pouvoir évaluer vos progrès et
+ adapter nos conseils en conséquence.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </section>
+
+ <!-- Four -->
+ <section id="four" class="wrapper style3 special">
+ <div class="container">
+ <header class="major">
+ <h2>Un besoin ? Des questions ?</h2>
+ <p>N'hésitez pas à nous contacter !</p>
+ </header>
+ <form method="post" action="#">
+ {% csrf_token %}
+ <div class="row uniform 50%" style="color: whitesmoke;">
+ <div class="6u 12u$(xsmall)">
+ <input type="text" name="name" id="name" value="" placeholder="Nom" />
+ </div>
+ <div class="6u$ 12u$(xsmall)">
+ <input type="email" name="email" id="email" value="" placeholder="Email" />
+ </div>
+
+ <div class="12u$">
+ <textarea name="message" id="message" placeholder="Dites-nous tout" rows="6"></textarea>
+ </div>
+ <div class="12u$">
<ul class="actions">
- <li><a href="#" class="button special big">Nous contacter</a></li>
+ <li><input type="submit" value="Nous contacter" class="special" /></li>
+ <li><input type="reset" value="Réinitialiser" /></li>
</ul>
- -->
</div>
- </section>
-
- <section id="one" class="wrapper style1">
-
- </section>
-
- <!-- Footer -->
- <footer id="footer">
- <div class="container">
- <ul class="icons">
- <li><a href="#" class="icon fa-facebook"></a></li>
- <li><a href="#" class="icon fa-twitter"></a></li>
- <li><a href="#" class="icon fa-instagram"></a></li>
- </ul>
- <ul class="copyright">
- <li>© NutriForm</li>
- <li>Design: <a href="http://templated.co">NutriForm_Design</a></li>
- <li>Images: <a href="http://unsplash.com">Unsplash</a></li>
- </ul>
</div>
- </footer>
+ </form>
+ <!--
+ <ul class="actions">
+ <li><a href="#" class="button special big">Nous contacter</a></li>
+ </ul>
+ -->
+ </div>
+ </section>
+
+ <section id="one" class="wrapper style1">
+
+ </section>
+
+ <!-- Footer -->
+ <footer id="footer">
+ <div class="container">
+ <ul class="icons">
+ <li><a href="#" class="icon fa-facebook"></a></li>
+ <li><a href="#" class="icon fa-twitter"></a></li>
+ <li><a href="#" class="icon fa-instagram"></a></li>
+ </ul>
+ <ul class="copyright">
+ <li>© NutriForm</li>
+ <li>Design: <a href="http://templated.co">NutriForm_Design</a></li>
+ <li>Images: <a href="http://unsplash.com">Unsplash</a></li>
+ </ul>
+ </div>
+ </footer>
+
+ <!-- Scripts -->
+ <script src="{% static 'nutriform/assets/js/jquery.min.js' %}"></script>
+ <script src="{% static 'nutriform/assets/js/skel.min.js' %}"></script>
+ <script src="{% static 'nutriform/assets/js/util.js' %}"></script>
+ <script src="{% static 'nutriform/assets/js/main.js' %}"></script>
- <!-- Scripts -->
- <script src="{% static 'nutriform/assets/js/jquery.min.js' %}"></script>
- <script src="{% static 'nutriform/assets/js/skel.min.js' %}"></script>
- <script src="{% static 'nutriform/assets/js/util.js' %}"></script>
- <script src="{% static 'nutriform/assets/js/main.js' %}"></script>
+</body>
- </body>
</html>
\ No newline at end of file
diff --git a/website/nutriform/templates/nutriform/register.html b/website/nutriform/templates/nutriform/register.html
new file mode 100644
index 0000000000000000000000000000000000000000..15e62d05fd67f82b1fecdbd86ccc1e5ddaec178b
--- /dev/null
+++ b/website/nutriform/templates/nutriform/register.html
@@ -0,0 +1,28 @@
+{% extends "../nutriform/base.html" %}
+
+{% block content %}
+
+<div class="container">
+
+<form method="post" action="{% url 'register' %}">
+{% csrf_token %}
+ {{ form.non_field_errors }}
+
+ {{ form.username.label_tag }}
+ {{ form.username.errors }}
+ {{ form.username }}
+
+ {{ form.password1.label_tag }}
+ {{ form.password1.errors }}
+ {{ form.password1 }}
+
+ {{ form.password2.label_tag }}
+ {{ form.password2.errors }}
+ {{ form.password2 }}
+
+<input type="submit" value="s'inscrire" style="margin-top: 5px;">
+<input type="hidden" name="next" value="{{ next }}">
+</form>
+
+</div class="container">
+{% endblock %}
\ No newline at end of file
diff --git a/website/nutriform/templates/registration/logged_out.html b/website/nutriform/templates/registration/logged_out.html
new file mode 100644
index 0000000000000000000000000000000000000000..57c33199670407ee8b692e07d5b3bde5a7df39bf
--- /dev/null
+++ b/website/nutriform/templates/registration/logged_out.html
@@ -0,0 +1,11 @@
+{% extends "../nutriform/base.html" %}
+
+{% block content %}
+
+<div class="container">
+
+ <h3>Vous vous êtes déconnecté</h3>
+ <a href="{% url 'login' %}">Cliquez ici pour vous connecter à nouveau</a>
+
+</div class="container">
+{% endblock %}
\ No newline at end of file
diff --git a/website/nutriform/templates/registration/login.html b/website/nutriform/templates/registration/login.html
index bb549e84c2168f6627e21247499ca1cdb79ae7dd..99907d481746303de3b5ca256cb30133f98da1cd 100644
--- a/website/nutriform/templates/registration/login.html
+++ b/website/nutriform/templates/registration/login.html
@@ -25,8 +25,10 @@
{{ form.password.label_tag }}
{{ form.password }}
-<input type="submit" value="login" style="margin-top: 5px;">
+<input type="submit" value="se connecter" style="margin-top: 5px;">
<input type="hidden" name="next" value="{{ next }}">
+<a href="{% url 'register' %}" class="button">S'inscrire</a>
+
</form>
</div class="container">
diff --git a/website/nutriform/urls.py b/website/nutriform/urls.py
index 8e30042de702e3026fe3c4772a45430116f0657a..13f48b069f3be19f318dbd5d71a631bfc20eb5e4 100644
--- a/website/nutriform/urls.py
+++ b/website/nutriform/urls.py
@@ -4,5 +4,7 @@ from . import views
urlpatterns = [
path('', views.index, name='index'),
+ path('register/', views.register, name='register'),
+ path('accounts/profile/', views.compte, name='compte'),
path('accounts/', include('django.contrib.auth.urls'))
]
diff --git a/website/nutriform/views.py b/website/nutriform/views.py
index 747ea6fb863ca838f4763bb4678a137b252a7f47..e558c61a5e0a518e6af5c2e3999505ecf2bb5e28 100644
--- a/website/nutriform/views.py
+++ b/website/nutriform/views.py
@@ -1,6 +1,9 @@
-from django.shortcuts import render
+from django.shortcuts import render, get_object_or_404, redirect
from django.http import HttpResponse
from django.core.mail import send_mail
+from django.contrib.auth.decorators import login_required
+
+from .forms import UserForm
def index(request):
if request.method == 'POST' :
@@ -14,4 +17,21 @@ def index(request):
return render(request, 'nutriform/index.html')
-# Create your views here.
+def register(request):
+ if request.method == 'POST':
+ form = UserForm(request.POST)
+ if form.is_valid():
+ user = form.save()
+ return redirect('login')
+
+ else :
+ form = UserForm()
+
+ context = {
+ 'form': form,
+ }
+ return render(request, 'nutriform/register.html', context)
+
+@login_required
+def compte(request):
+ return render(request, 'nutriform/compte.html')
diff --git a/website/website/__pycache__/__init__.cpython-37.pyc b/website/website/__pycache__/__init__.cpython-37.pyc
deleted file mode 100644
index 4bdb6822ca1d3388dab3ea35da7d1e11503913f4..0000000000000000000000000000000000000000
Binary files a/website/website/__pycache__/__init__.cpython-37.pyc and /dev/null differ
diff --git a/website/website/__pycache__/settings.cpython-37.pyc b/website/website/__pycache__/settings.cpython-37.pyc
deleted file mode 100644
index 18dcaafcf635479bf173a1931c767a752db9c103..0000000000000000000000000000000000000000
Binary files a/website/website/__pycache__/settings.cpython-37.pyc and /dev/null differ
diff --git a/website/website/__pycache__/urls.cpython-37.pyc b/website/website/__pycache__/urls.cpython-37.pyc
deleted file mode 100644
index 70db5c784ea6d3007472fdd28b1d188883dec1e8..0000000000000000000000000000000000000000
Binary files a/website/website/__pycache__/urls.cpython-37.pyc and /dev/null differ
diff --git a/website/website/__pycache__/wsgi.cpython-37.pyc b/website/website/__pycache__/wsgi.cpython-37.pyc
deleted file mode 100644
index 4feb53569c655215694d3a19ff29ac2aaa11da66..0000000000000000000000000000000000000000
Binary files a/website/website/__pycache__/wsgi.cpython-37.pyc and /dev/null differ
diff --git a/website/website/settings.py b/website/website/settings.py
index ff4902d36f44c129ce42d0eff94fe57ac045e787..89dc7cb5a8ea11c60650c5b7aff0f04e0c2a5b2f 100644
--- a/website/website/settings.py
+++ b/website/website/settings.py
@@ -30,17 +30,20 @@ DEBUG = True
ALLOWED_HOSTS = []
+LOGIN_URL = '/nutriform/accounts/login'
+
+LOGIN_REDIRECT_URL = '/nutriform/accounts/profile'
# Application definition
INSTALLED_APPS = [
+ 'nutriform',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
- 'nutriform',
]
MIDDLEWARE = [
@@ -107,7 +110,7 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization
# https://docs.djangoproject.com/en/2.2/topics/i18n/
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'fr-fr'
TIME_ZONE = 'UTC'
diff --git a/website/website/urls.py b/website/website/urls.py
index 9d21e914a453d9f3d72ac2a1448800111d5624fa..d6811495faef0371f5721a8200ccc13356201a01 100644
--- a/website/website/urls.py
+++ b/website/website/urls.py
@@ -15,8 +15,10 @@ Including another URLconf
"""
from django.contrib import admin
from django.urls import include, path
+from nutriform import views
urlpatterns = [
path('nutriform/', include('nutriform.urls')),
path('admin/', admin.site.urls),
+ path('', views.index, name='home'),
]