diff --git a/.gitignore b/.gitignore index abba2a9..3fcea8c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ dist/html/* # Files index.html +issues.md diff --git a/index.php b/index.php index bccb250..8bd2fe2 100644 --- a/index.php +++ b/index.php @@ -22,6 +22,7 @@ + @@ -29,11 +30,9 @@
+ + +
- - - diff --git a/src/html/member.html b/src/html/member.html new file mode 100644 index 0000000..917719b --- /dev/null +++ b/src/html/member.html @@ -0,0 +1,16 @@ + diff --git a/src/html/members.html b/src/html/members.html index 8cf324e..f7182f8 100644 --- a/src/html/members.html +++ b/src/html/members.html @@ -5,31 +5,14 @@ - - diff --git a/src/html/menu.html b/src/html/menu.html index 845cc8e..760e5dd 100644 --- a/src/html/menu.html +++ b/src/html/menu.html @@ -8,10 +8,12 @@ diff --git a/src/html/project.html b/src/html/project.html new file mode 100644 index 0000000..7532397 --- /dev/null +++ b/src/html/project.html @@ -0,0 +1,60 @@ + diff --git a/src/html/projects.html b/src/html/projects.html index 9f302e9..cb01187 100644 --- a/src/html/projects.html +++ b/src/html/projects.html @@ -1,64 +1,27 @@ + diff --git a/img/Logo_Happy_Dev.png b/src/img/Logo_Happy_Dev.png similarity index 100% rename from img/Logo_Happy_Dev.png rename to src/img/Logo_Happy_Dev.png diff --git a/src/img/alexandre-bourlier.jpg b/src/img/alexandre-bourlier.jpg new file mode 100644 index 0000000..36ea7d8 Binary files /dev/null and b/src/img/alexandre-bourlier.jpg differ diff --git a/img/chat_image.PNG b/src/img/chat_image.PNG similarity index 100% rename from img/chat_image.PNG rename to src/img/chat_image.PNG diff --git a/img/default_avatar.png b/src/img/default_avatar.png similarity index 100% rename from img/default_avatar.png rename to src/img/default_avatar.png diff --git a/src/models.py b/src/models.py new file mode 100644 index 0000000..a7991aa --- /dev/null +++ b/src/models.py @@ -0,0 +1,52 @@ +from django.db import models + + +class Member(models.Model): + avatar = models.URLField() + firstname = models.CharField(max_length=255, default='') + lastname = models.CharField(max_length=255, default='') + email = models.CharField(max_length=255, default='') + number = models.CharField(max_length=255, default='') + cell = models.ForeignKey("Cell") + country = models.CharField(max_length=255, default='') + skills = models.ManyToManyField("Skill") + projects = models.ManyToManyField("Project") + + def __str__(self): + return self.firstname +' '+ self.lastname + + +class Skill(models.Model): + name = models.CharField(max_length=255, default='') + + def __str__(self): + return self.name + + +class Project(models.Model): + name = models.CharField(max_length=255, default='') + number = models.PositiveIntegerField(default='0') + client = models.OneToOneField("Client") + + def __str__(self): + return self.name + + +class Client(models.Model): + name = models.CharField(max_length=255, default='') + address = models.CharField(max_length=255, default='') + + def __str__(self): + return self.name + + +class Cell(models.Model): + name = models.CharField(max_length=255, default='') + city = models.CharField(max_length=255, default='') + country = models.CharField(max_length=255, default='') + + def __str__(self): + return self.name + + +