diff --git a/SocialHelper/homepage/__pycache__/models.cpython-37.pyc b/SocialHelper/homepage/__pycache__/models.cpython-37.pyc
index 74a6f6e..9a1f377 100644
Binary files a/SocialHelper/homepage/__pycache__/models.cpython-37.pyc and b/SocialHelper/homepage/__pycache__/models.cpython-37.pyc differ
diff --git a/SocialHelper/homepage/__pycache__/urls.cpython-37.pyc b/SocialHelper/homepage/__pycache__/urls.cpython-37.pyc
index 13f81a5..169035a 100644
Binary files a/SocialHelper/homepage/__pycache__/urls.cpython-37.pyc and b/SocialHelper/homepage/__pycache__/urls.cpython-37.pyc differ
diff --git a/SocialHelper/homepage/__pycache__/views.cpython-37.pyc b/SocialHelper/homepage/__pycache__/views.cpython-37.pyc
index cb03f2f..28c0ccc 100644
Binary files a/SocialHelper/homepage/__pycache__/views.cpython-37.pyc and b/SocialHelper/homepage/__pycache__/views.cpython-37.pyc differ
diff --git a/SocialHelper/homepage/migrations/0001_initial.py b/SocialHelper/homepage/migrations/0001_initial.py
index 64d4821..c7ffa2c 100644
--- a/SocialHelper/homepage/migrations/0001_initial.py
+++ b/SocialHelper/homepage/migrations/0001_initial.py
@@ -1,7 +1,9 @@
-# Generated by Django 2.1.5 on 2020-12-10 20:03
+# Generated by Django 3.1.4 on 2020-12-20 16:51
import datetime
+from django.conf import settings
from django.db import migrations, models
+import django.db.models.deletion
class Migration(migrations.Migration):
@@ -9,6 +11,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
@@ -19,13 +22,13 @@ class Migration(migrations.Migration):
('active', models.BooleanField(default=True)),
('picture', models.ImageField(blank=True, null=True, upload_to='images/')),
('create_date', models.DateField(default=datetime.date.today, verbose_name='Date')),
- ('user_owner', models.TextField(default='', max_length=40)),
('type', models.IntegerField(choices=[(1, 'Potrzebuje'), (2, 'Oddam')], default='')),
('offer', models.IntegerField(choices=[(1, 'Usługa'), (2, 'Przedmiot')], default='')),
('title', models.TextField(default='', max_length=40)),
('description', models.TextField(default='', max_length=6000)),
('place', models.TextField(default='', max_length=40)),
('keywords', models.TextField(default='', max_length=6000)),
+ ('user_iden', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
diff --git a/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-37.pyc b/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-37.pyc
index 856ed75..f887f0f 100644
Binary files a/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-37.pyc and b/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-37.pyc differ
diff --git a/SocialHelper/homepage/migrations/__pycache__/0002_auto_20201220_1746.cpython-37.pyc b/SocialHelper/homepage/migrations/__pycache__/0002_auto_20201220_1746.cpython-37.pyc
new file mode 100644
index 0000000..7713d55
Binary files /dev/null and b/SocialHelper/homepage/migrations/__pycache__/0002_auto_20201220_1746.cpython-37.pyc differ
diff --git a/SocialHelper/homepage/migrations/__pycache__/0003_auto_20201220_1746.cpython-37.pyc b/SocialHelper/homepage/migrations/__pycache__/0003_auto_20201220_1746.cpython-37.pyc
new file mode 100644
index 0000000..c330d69
Binary files /dev/null and b/SocialHelper/homepage/migrations/__pycache__/0003_auto_20201220_1746.cpython-37.pyc differ
diff --git a/SocialHelper/homepage/migrations/__pycache__/0004_auto_20201220_1747.cpython-37.pyc b/SocialHelper/homepage/migrations/__pycache__/0004_auto_20201220_1747.cpython-37.pyc
new file mode 100644
index 0000000..19c47b1
Binary files /dev/null and b/SocialHelper/homepage/migrations/__pycache__/0004_auto_20201220_1747.cpython-37.pyc differ
diff --git a/SocialHelper/homepage/models.py b/SocialHelper/homepage/models.py
index 12099fd..14601b1 100644
--- a/SocialHelper/homepage/models.py
+++ b/SocialHelper/homepage/models.py
@@ -1,4 +1,6 @@
from django.db import models
+from django.contrib.auth.models import User
+
import datetime
TYPE_T = (
@@ -10,11 +12,12 @@ TYPE_O = (
(1,'Usługa'),
(2,'Przedmiot'),
)
+
class Product(models.Model):
active = models.BooleanField(default=True)
picture = models.ImageField(null=True, blank=True, upload_to="images/")
create_date = models.DateField(("Date"), default=datetime.date.today)
- user_owner = models.TextField(max_length=40, blank=False, default="")
+ user_iden = models.ForeignKey(User, on_delete=models.CASCADE)
type = models.IntegerField(choices = TYPE_T, blank=False, default="")
offer = models.IntegerField(choices = TYPE_O, blank=False, default="")
title = models.TextField(max_length=40, blank=False, default="")
diff --git a/SocialHelper/homepage/templates/homepage/Dodawanie.html b/SocialHelper/homepage/templates/homepage/add_offer.html
similarity index 99%
rename from SocialHelper/homepage/templates/homepage/Dodawanie.html
rename to SocialHelper/homepage/templates/homepage/add_offer.html
index 9525048..0176fbb 100644
--- a/SocialHelper/homepage/templates/homepage/Dodawanie.html
+++ b/SocialHelper/homepage/templates/homepage/add_offer.html
@@ -16,7 +16,7 @@
-
+
+
+
+
+
+
+
+
+ {% endblock %}
diff --git a/SocialHelper/homepage/templates/homepage/edycja_ogloszenia.html b/SocialHelper/homepage/templates/homepage/edycja_ogloszenia.html
index bc7c594..f0ba863 100644
--- a/SocialHelper/homepage/templates/homepage/edycja_ogloszenia.html
+++ b/SocialHelper/homepage/templates/homepage/edycja_ogloszenia.html
@@ -79,7 +79,7 @@
-
+
diff --git a/SocialHelper/homepage/templates/homepage/login.html b/SocialHelper/homepage/templates/homepage/login.html
new file mode 100644
index 0000000..efa98ed
--- /dev/null
+++ b/SocialHelper/homepage/templates/homepage/login.html
@@ -0,0 +1,144 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block content %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% endblock %}
diff --git a/SocialHelper/homepage/templates/homepage/Mojeogloszenia.html b/SocialHelper/homepage/templates/homepage/my_offer.html
similarity index 98%
rename from SocialHelper/homepage/templates/homepage/Mojeogloszenia.html
rename to SocialHelper/homepage/templates/homepage/my_offer.html
index 0951898..a7338ad 100644
--- a/SocialHelper/homepage/templates/homepage/Mojeogloszenia.html
+++ b/SocialHelper/homepage/templates/homepage/my_offer.html
@@ -9,6 +9,7 @@
+
{{ username }}
Moje ogłoszenia
@@ -61,6 +62,7 @@
No polls are available.
{% endif %}
+