diff --git a/SocialHelper/control/__pycache__/urls.cpython-37.pyc b/SocialHelper/control/__pycache__/urls.cpython-37.pyc index 6016956..e2abab2 100644 Binary files a/SocialHelper/control/__pycache__/urls.cpython-37.pyc and b/SocialHelper/control/__pycache__/urls.cpython-37.pyc differ diff --git a/SocialHelper/control/__pycache__/views.cpython-37.pyc b/SocialHelper/control/__pycache__/views.cpython-37.pyc index 5999900..5439a55 100644 Binary files a/SocialHelper/control/__pycache__/views.cpython-37.pyc and b/SocialHelper/control/__pycache__/views.cpython-37.pyc differ diff --git a/SocialHelper/control/urls.py b/SocialHelper/control/urls.py index de9d510..9163e3e 100644 --- a/SocialHelper/control/urls.py +++ b/SocialHelper/control/urls.py @@ -23,7 +23,6 @@ urlpatterns = [ path('ExtendVIP/', views.Vipuser_extension, name='Vipuser_extension'), path('UserList', views.UserPage, name='UserPage'), - path('AddVIP/', views.AddVIP, name='AddVIP'), - - + path('AddVIP/', views.AddVIP, name='AddVIP') + ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/SocialHelper/control/views.py b/SocialHelper/control/views.py index 2ca4cc8..72889da 100644 --- a/SocialHelper/control/views.py +++ b/SocialHelper/control/views.py @@ -38,7 +38,7 @@ def pulpit(request): } return HttpResponse(template.render(context, request)) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def NotificationuserPage(request): if request.user.is_authenticated and request.user.is_superuser == True: @@ -49,7 +49,7 @@ def NotificationuserPage(request): } return HttpResponse(template.render(context, request)) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def Notificationuser_deletenot(request, not_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -59,7 +59,7 @@ def Notificationuser_deletenot(request, not_id): messages.success(request, 'Zgłoszenie Zamknięte') return redirect(NotificationuserPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def Notificationuser_deleteuser(request, user_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -70,7 +70,7 @@ def Notificationuser_deleteuser(request, user_id): messages.success(request, 'Użytkownik Usunięty') return redirect(UserPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def NotificationofferPage(request): if request.user.is_authenticated and request.user.is_superuser == True: @@ -81,7 +81,7 @@ def NotificationofferPage(request): } return HttpResponse(template.render(context, request)) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def Notificationoffer_deletenot(request, not_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -91,7 +91,7 @@ def Notificationoffer_deletenot(request, not_id): messages.success(request, 'Zgłoszenie Zamknięte') return redirect(NotificationofferPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def Notificationoffer_deleteoffer(request, offer_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -101,7 +101,7 @@ def Notificationoffer_deleteoffer(request, offer_id): messages.success(request, 'Ogłoszenie Usunięte') return redirect(NotificationofferPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def UsermessagerPage(request): if request.user.is_authenticated and request.user.is_superuser == True: @@ -112,7 +112,7 @@ def UsermessagerPage(request): } return HttpResponse(template.render(context, request)) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def Usermessager_deletenot(request, not_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -122,7 +122,7 @@ def Usermessager_deletenot(request, not_id): messages.success(request, 'Zgłoszenie Zamknięte') return redirect(UsermessagerPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def VipuserPage(request): if request.user.is_authenticated and request.user.is_superuser == True: @@ -135,7 +135,7 @@ def VipuserPage(request): } return HttpResponse(template.render(context, request)) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def Vipuser_delete(request, vip_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -148,7 +148,7 @@ def Vipuser_delete(request, vip_id): messages.success(request, 'Usunięto status VIP') return redirect(VipuserPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def Vipuser_extension(request, vip_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -161,7 +161,7 @@ def Vipuser_extension(request, vip_id): messages.success(request, 'Przedłużono status VIP') return redirect(VipuserPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def UserPage(request): if request.user.is_authenticated and request.user.is_superuser == True: @@ -173,7 +173,7 @@ def UserPage(request): } return HttpResponse(template.render(context, request)) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") def AddVIP(request, user_id): if request.user.is_authenticated and request.user.is_superuser == True: @@ -200,4 +200,4 @@ def AddVIP(request, user_id): messages.success(request, 'Nadano status VIP') return redirect(UserPage) else: - return redirect(index) + return HttpResponseRedirect("http://127.0.0.1:8000/homepage/") diff --git a/SocialHelper/enGB/__pycache__/urls.cpython-37.pyc b/SocialHelper/enGB/__pycache__/urls.cpython-37.pyc index f62dbac..530a3cb 100644 Binary files a/SocialHelper/enGB/__pycache__/urls.cpython-37.pyc and b/SocialHelper/enGB/__pycache__/urls.cpython-37.pyc differ diff --git a/SocialHelper/enGB/__pycache__/views.cpython-37.pyc b/SocialHelper/enGB/__pycache__/views.cpython-37.pyc index 1bde51e..f92e025 100644 Binary files a/SocialHelper/enGB/__pycache__/views.cpython-37.pyc and b/SocialHelper/enGB/__pycache__/views.cpython-37.pyc differ diff --git a/SocialHelper/enGB/templates/enbase.html b/SocialHelper/enGB/templates/base3.html similarity index 98% rename from SocialHelper/enGB/templates/enbase.html rename to SocialHelper/enGB/templates/base3.html index 7c78e23..955d111 100644 --- a/SocialHelper/enGB/templates/enbase.html +++ b/SocialHelper/enGB/templates/base3.html @@ -23,9 +23,10 @@ - {% include 'ennavbar.html' %} + {% include 'navbar3.html' %} {% include 'alerts.html' %} {% block content %} {% endblock %} + {% include 'footer3.html' %} diff --git a/SocialHelper/enGB/templates/base4.html b/SocialHelper/enGB/templates/base4.html new file mode 100644 index 0000000..5df4378 --- /dev/null +++ b/SocialHelper/enGB/templates/base4.html @@ -0,0 +1,55 @@ +{% load static %} + + + + + + + + + SocialHelper + + + + + + + + + + + + + + + + {% include 'navbar4.html' %} + {% include 'alerts.html' %} + {% block content %} {% endblock %} + {% include 'footer4.html' %} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SocialHelper/enGB/templates/enGB/.DS_Store b/SocialHelper/enGB/templates/enGB/.DS_Store new file mode 100644 index 0000000..f699464 Binary files /dev/null and b/SocialHelper/enGB/templates/enGB/.DS_Store differ diff --git a/SocialHelper/enGB/templates/enGB/about.html b/SocialHelper/enGB/templates/enGB/about.html new file mode 100644 index 0000000..51490d1 --- /dev/null +++ b/SocialHelper/enGB/templates/enGB/about.html @@ -0,0 +1,21 @@ +{% extends isVIP|yesno:"base3.html,base4.html" %} +{% load static %} +{% block content %} + + + + + +
+
+
+

About us

+

We are a young, dynamic team that loves fruity Thursdays!

+

If you also like to eat a fresh apple every Thursday, be sure to go to the contact tab!

+

Maybe we are looking for you?

+
+
+
+ + + {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/add_comment.html b/SocialHelper/enGB/templates/enGB/add_comment.html index f9137c2..33902fc 100644 --- a/SocialHelper/enGB/templates/enGB/add_comment.html +++ b/SocialHelper/enGB/templates/enGB/add_comment.html @@ -1,4 +1,4 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} @@ -9,7 +9,7 @@
-

Rate User

+

Rate the User

{{ user_name }}
@@ -31,7 +31,7 @@
- + -Copyright © All rights reserved | This template is made with by Colorlib. Downloaded from Themeslab - - -
-
- - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/add_offer.html b/SocialHelper/enGB/templates/enGB/add_offer.html index b5596e0..18109f9 100644 --- a/SocialHelper/enGB/templates/enGB/add_offer.html +++ b/SocialHelper/enGB/templates/enGB/add_offer.html @@ -1,4 +1,4 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} @@ -11,7 +11,7 @@
-

Add new announcement

+

Add a new ad

@@ -42,10 +42,10 @@
- +
@@ -54,7 +54,7 @@
- + {% for place in place_list %} @@ -98,7 +98,7 @@
- Choose a picture + Photo
@@ -119,91 +119,6 @@ - - - - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/chating.html b/SocialHelper/enGB/templates/enGB/chating.html new file mode 100644 index 0000000..92bb6be --- /dev/null +++ b/SocialHelper/enGB/templates/enGB/chating.html @@ -0,0 +1,38 @@ + +{% block content %} + + + + + + + + {% for messages in mess %} + {% if user_get_id == messages.author_id.id %} +

+ {{messages.author_id}}:
+ {{messages.text}} +

+ {% else %} +

+ {{messages.author_id}}:
+ {{messages.text}} +

+ {% endif %} + {% endfor %} +

{{ last_date.pub_date }}

+ + + +{% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/conditions_of_use.html b/SocialHelper/enGB/templates/enGB/conditions_of_use.html deleted file mode 100644 index f0f40b3..0000000 --- a/SocialHelper/enGB/templates/enGB/conditions_of_use.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - Conditions of use - - - - - - - -

SocialHelper Conditions of use

- - The website for displaying SocialHelper items and services is managed by the SocialHelper company based at Jana Kowalskiego 99, 12-200 Warsaw, Poland. -

- Before registering on the website, the user is obliged to read these regulations and undertake to comply with them. -

- §1.1 These terms and conditions define the mutual relationship between SocialHelper and Users or Visitors. -
- §1.2 The website allows Users to exchange items and services on the basis of barter or voluntary work. -
- §1.3 The website is not intended for minors. In the case of minors, a parent or guardian must register to use the services and supervise the use of the services by minors. -
- §1.4 When registering on the website, the user is required to provide his e-mail address and password (directly or using a Facebook or Google profile). -

- §2.1 SocialHelper is an internet intermediary service offering users a virtual exchange forum. SocialHelper is not a party to any transaction between users. -
- §2.2 The items on display may not be medical or human products, stimulants, firearms and ammunition, as well as any items whose possession is inconsistent with Polish law. -
- §2.3 The services displayed cannot be of a sexual nature. -
- §2.4 The user must be the owner of the items on display and have the right to exchange them. -
- §2.5 SocialHelper reserves the right to block users who violate the regulations, provide incorrect information, fail to complete the transaction and use chat for matters not related to the transactions carried out. -
- §2.6 Users may activate a premium account subject to a recurring monthly fee of PLN 9.99 charged to their account or debit card. -

- - §3.1 All Visitors and Users are fully responsible for the items and services displayed on the SocialHelper website, including its description, the correctness of other details presented and communication with other users, as well as in general transactions concluded with other users and disputes arising therefrom. -

- §4.1 SocialHelper owns all intellectual property rights in the site, its system (directory, portability, etc.), site design and software used by the site, including trademarks and domain names. -
- - - - diff --git a/SocialHelper/enGB/templates/enGB/contact.html b/SocialHelper/enGB/templates/enGB/contact.html index 7b65a2e..7cef18e 100644 --- a/SocialHelper/enGB/templates/enGB/contact.html +++ b/SocialHelper/enGB/templates/enGB/contact.html @@ -1,4 +1,4 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} @@ -8,10 +8,9 @@
-
-

Contact with us!

-

Need help? Please contact with us via telephone, e-mail address or use our contact form below

-
+

Contact us

+

Need support? Please contact us by phone, e-mail or use the contact form below

+
@@ -45,109 +44,28 @@
-

Send a message

-
+

Send a message

+ + {% csrf_token %} + {{ form.media }} + {{ form.as_p }} +
- +
- +
- +
- +
- - - - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/create_user.html b/SocialHelper/enGB/templates/enGB/create_user.html index 9e4b7b3..ebc3f5f 100644 --- a/SocialHelper/enGB/templates/enGB/create_user.html +++ b/SocialHelper/enGB/templates/enGB/create_user.html @@ -1,4 +1,4 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} @@ -95,7 +95,7 @@ body {font-family: Arial, Helvetica, sans-serif;}
-

Create an account

+

Create a new account

@@ -132,7 +132,7 @@ body {font-family: Arial, Helvetica, sans-serif;}
- +
@@ -143,49 +143,47 @@ body {font-family: Arial, Helvetica, sans-serif;}
- + -
- - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/edycja_ogloszenia.html b/SocialHelper/enGB/templates/enGB/edycja_ogloszenia.html index a3e85c1..3ee3c2f 100644 --- a/SocialHelper/enGB/templates/enGB/edycja_ogloszenia.html +++ b/SocialHelper/enGB/templates/enGB/edycja_ogloszenia.html @@ -1,4 +1,4 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} @@ -9,7 +9,7 @@
-

Edit Your Offer

+

Edit offer

@@ -28,7 +28,7 @@
- + {% if offer.offer == types_o.0.0 %} - - + + {% else %} - - + + {% endif %}
@@ -62,7 +62,7 @@
- + {% for place in place_list %} @@ -119,7 +119,7 @@
- Choose a picture + Photo
@@ -135,91 +135,6 @@ - - - - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/enlogin.html b/SocialHelper/enGB/templates/enGB/enlogin.html deleted file mode 100644 index 17bd9bd..0000000 --- a/SocialHelper/enGB/templates/enGB/enlogin.html +++ /dev/null @@ -1,160 +0,0 @@ -{% extends 'enbase.html' %} -{% load static %} -{% block content %} - - - - - -
-
-
-

Sing in

-
-
-
- - - -
- {% csrf_token %} - {{ form.media }} - {{ form.as_p }} - - -
-
-
- - -
-
-
- - -
-
-
- -
-
-
- - -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- - -
-
-
- - - - - - - - - - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/index.html b/SocialHelper/enGB/templates/enGB/index.html index 242f6e3..b80ef11 100644 --- a/SocialHelper/enGB/templates/enGB/index.html +++ b/SocialHelper/enGB/templates/enGB/index.html @@ -1,12 +1,25 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} + +
@@ -14,25 +27,6 @@
-
-
-
-

Sort:

- -
-
-

Show:

- -
-
-
{% if all_product %} @@ -42,48 +36,38 @@ {% else %}
{% endif %} -
-
-
- -
-
-
-
-

{{ product.title }}

-
{{ product.user_iden }}
-
- {% if types.0.0 == product.type %} - Need - {% else %} - Give - {% endif %} - {% if types_o.0.0 == product.offer %} - Service - {% else %} - Items - {% endif %}
+
+
+
+ +
+
-
Location: {{ product.place }}
-
-
-
-
+
+
+

{{ product.title }}

 +
{{ product.user_iden }}
+
+ {% if types.0.0 == product.type %} + I will Need + {% else %} + I Give + {% endif %} + {% if types_o.0.0 == product.offer %} + Service + {% else %} + Item + {% endif %}
+ +
Location: {{ product.place }}
+
+
+
+
{% endfor %} {% else %}

No polls are available.

{% endif %} -
@@ -101,22 +85,22 @@
    - {% if wol_local%} + {% if wol_local %} {% else %} @@ -180,96 +164,7 @@
- - - - - - - - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/login.html b/SocialHelper/enGB/templates/enGB/login.html new file mode 100644 index 0000000..1e9c85f --- /dev/null +++ b/SocialHelper/enGB/templates/enGB/login.html @@ -0,0 +1,76 @@ +{% extends isVIP|yesno:"base3.html,base4.html" %} +{% load static %} +{% block content %} + + + + + +
+
+
+

Sign In

+
+
+
+ + + +
+ {% csrf_token %} + {{ form.media }} + {{ form.as_p }} + + +
+
+
+ + +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+ +
+
+
+ + +
+
+
+ + + + + + + {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/my_offer.html b/SocialHelper/enGB/templates/enGB/my_offer.html index 59916d3..61e35d9 100644 --- a/SocialHelper/enGB/templates/enGB/my_offer.html +++ b/SocialHelper/enGB/templates/enGB/my_offer.html @@ -1,4 +1,4 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} @@ -10,10 +10,23 @@
{{ username }} -

My Offer

+

My Offers

+ @@ -40,22 +53,22 @@
-

{{ product.title }}

+

{{ product.title }}

 {% if types.0.0 == product.type %} -
Need +
I will Need {% else %} -
Give +
I Give {% endif %} {% if types_o.0.0 == product.offer %} Service
- - + + {% else %} Item - - + + {% endif %} -
Locality: {{ product.place }}
+
City: {{ product.place }}

{{ product.description }}

@@ -67,8 +80,8 @@ {% endif %}
- - + +
@@ -87,91 +100,6 @@ - - - - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/offer_note.html b/SocialHelper/enGB/templates/enGB/offer_note.html new file mode 100644 index 0000000..d856d66 --- /dev/null +++ b/SocialHelper/enGB/templates/enGB/offer_note.html @@ -0,0 +1,59 @@ +{% extends isVIP|yesno:"base3.html,base4.html" %} +{% load static %} +{% block content %} + + + + + +
+
+
+

Report Offer:

+
{{ offer.title }}
+
User: {{ offer.user_iden }}
+ +
+
+
+ + + + + {% csrf_token %} + {{ form.media }} + {{ form.as_p }} + + +
+
+
+ + +
+
+
+ + +
+
+
+ +
+
+
+ +
+
+
+ + +
+
+
+ + + + + + {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/offer_page.html b/SocialHelper/enGB/templates/enGB/offer_page.html new file mode 100644 index 0000000..fcdba41 --- /dev/null +++ b/SocialHelper/enGB/templates/enGB/offer_page.html @@ -0,0 +1,191 @@ +{% extends isVIP|yesno:"base3.html,base4.html" %} +{% load static %} +{% block content %} + + + + + + +
+
+
+

Offer Details

+ {% if offer.Wolontatriat %} +
Volunteer Offer
+ {% endif %} + {% if types.0.0 == offer.type %} + I will Need + {% else %} + I give + {% endif %} + {% if types_o.0.0 == offer.offer %} + Service + {% else %} + Item + {% endif %} +
+
+
+ + + +
+
+
+
+
+
+
    +
  • + + + +
    • + +
+
+
+
+
+
+

{{ offer.title }}



+

Listed by: {{ offer.user_iden }}

+
City: {{ offer.place }}


+

{{ offer.description }}



+ {% if user.is_authenticated %} + {% if user_get_id is not offer.user_iden.id %} +
+ Write a message +
+ {% endif %} + {% endif %} + +
+
+
+
+
+ + +{% if user.is_authenticated %} +
+
+ +
+ +

Messages

+
+ {% if user_get_id == offer.user_iden.id %} +
+
+ + {% for user in email_list %} +

+ {% endfor %} +
+
+
+ {% for user in email_list %} +
+ +
+ {% csrf_token %} + + + + + +
+
+ {% endfor %} +
+ {% else %} +
+ +
+ {% csrf_token %} + + + + + +
+
+ {% endif %} +
+ +
+
+ {% endif %} +
+
+ + + + + + + + +{% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/regulamin.html b/SocialHelper/enGB/templates/enGB/regulamin.html index 542f6d6..e9c3287 100644 --- a/SocialHelper/enGB/templates/enGB/regulamin.html +++ b/SocialHelper/enGB/templates/enGB/regulamin.html @@ -1,4 +1,4 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} @@ -8,129 +8,42 @@
-

SocialHelper Terms of Use

+

Terms Of Use


-
The website for displaying SocialHelper items and services is managed by the SocialHelper company based at Jana Kowalskiego 99, 12-200 Warsaw, Poland. -
-
-
Before registering on the website, the user is obliged to read these regulations and undertake to comply with them. -
-
- §1.1 These terms and conditions define the mutual relationship between SocialHelper and Users or Visitors. -
- §1.2 The website allows Users to exchange items and services on a barter or voluntary basis. -
- §1.3 The website is not intended for minors. In the case of minors, a parent or guardian must register to use the services and supervise the use of the services by minors. -
- §1.4 When registering on the website, the user is required to provide his e-mail address and password (directly or using a Facebook or Google profile). -

+
The website for displaying SocialHelper items and services is managed by the SocialHelper company with its registered office at Jana Kowalskiego 99, 12-200 Warsaw, Poland. +
+
+
Before registering on the website, the user is obliged to read these regulations and undertake to comply with them. +
+
+ §1.1 These terms and conditions define the mutual relationship between SocialHelper and Users or Visitors. +
+ §1.2 The website allows Users to exchange items and services on the basis of barter or voluntary work. +
+ §1.3 The website is not intended for minors. In the case of minors, a parent or guardian must register to use the services and supervise the use of the services by minors. +
+ §1.4 When registering on the website, the user is required to provide his e-mail address and password (directly or using a Facebook or Google profile). +

+ §2.1 SocialHelper is an internet intermediary service offering users a virtual exchange forum. SocialHelper is not a party to any transaction between users. +
+ §2.2 The displayed items may not be medical or human products, stimulants, firearms and ammunition, as well as any items the possession of which is inconsistent with Polish law. +
+ §2.3 The services displayed cannot be of a sexual nature. +
+ §2.4 The user must be the owner of the items on display and have the right to exchange them. +
+ §2.5 SocialHelper reserves the right to block users who violate the regulations, provide incorrect information, fail to complete the transaction and use chat for matters not related to the transactions carried out. +
+ §2.6 Users may activate a premium account subject to a recurring monthly fee of PLN 9.99 charged to their account or debit card. +

- §2.1 SocialHelper is an internet intermediary service offering users a virtual exchange forum. SocialHelper is not a party to any transaction between users. -
- §2.2 The items on display may not be medical or human products, stimulants, firearms and ammunition, as well as any items whose possession is inconsistent with Polish law. -
- §2.3 The services displayed cannot be of a sexual nature. -
- §2.4 The user must be the owner of the items on display and have the right to exchange them. -
- §2.5 SocialHelper reserves the right to block users who violate the regulations, provide incorrect information, fail to complete the transaction and use chat for matters not related to the transactions carried out. -
- §2.6 Users may activate a premium account subject to a recurring monthly fee of PLN 9.99 charged to their account or debit card. -

- - - §3.1 All Visitors and Users are fully responsible for the items and services displayed on the SocialHelper website, including its description, the correctness of other details presented and communication with other users, as well as in general transactions concluded with other users and disputes arising therefrom. -

- §4.1 SocialHelper owns all intellectual property rights to the site, its system (directory, portability, etc.), site design and software used by the site, including trademarks and domain names. -
+ §3.1 All Visitors and Users are fully responsible for the items and services displayed on the SocialHelper website, including its description, the correctness of other details presented and communication with other users, as well as in general transactions concluded with other users and disputes arising therefrom. +

+ §4.1 SocialHelper owns all intellectual property rights to the site, its system (directory, portability, etc.), site design and software used by the site, including trademarks and domain names. +
- - - - {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/user_note.html b/SocialHelper/enGB/templates/enGB/user_note.html new file mode 100644 index 0000000..7ba223f --- /dev/null +++ b/SocialHelper/enGB/templates/enGB/user_note.html @@ -0,0 +1,58 @@ +{% extends isVIP|yesno:"base3.html,base4.html" %} +{% load static %} +{% block content %} + + + + + +
+
+
+

Report User:

+
{{ User_prof }}
+ +
+
+
+ + + +
+ {% csrf_token %} + {{ form.media }} + {{ form.as_p }} + + +
+
+
+ + +
+
+
+ + +
+
+
+ +
+
+
+ +
+
+
+ + +
+
+
+ + + + + + {% endblock %} diff --git a/SocialHelper/enGB/templates/enGB/user_profile.html b/SocialHelper/enGB/templates/enGB/user_profile.html index bf4e184..65eb591 100644 --- a/SocialHelper/enGB/templates/enGB/user_profile.html +++ b/SocialHelper/enGB/templates/enGB/user_profile.html @@ -1,274 +1,201 @@ -{% extends 'enbase.html' %} +{% extends isVIP|yesno:"base3.html,base4.html" %} {% load static %} {% block content %} + + - + +
+
+
+ {% if not user_prof %} +

Account deleted

+ {% endif %} +

User profile

+
{{ name }}


+

Average grade: {{ocena_2}}

+ 1 + + {% if ocena > 9 %} + + {% else %} + + {% endif %} + {% if ocena > 19 %} + + {% else %} + + {% endif %} + {% if ocena > 29 %} + + {% else %} + + {% endif %} + {% if ocena > 39 %} + + {% else %} + + {% endif %} + {% if ocena > 49 %} + + {% else %} + + {% endif %} + {% if ocena > 59 %} + + {% else %} + + {% endif %} + {% if ocena > 69 %} + + {% else %} + + {% endif %} + {% if ocena > 79 %} + + {% else %} + + {% endif %} + {% if ocena > 89 %} + + {% else %} + + {% endif %} + {% if ocena > 99 %} + + {% else %} + + {% endif %} 10 + {% if user.email %} +

+ {% endif %} +
+
+
-
-
+ - + -
-
- -
-
-
- - -
- {% if all_product %} - {% for product in all_product %} - {% if product.Wolontatriat %} -
- {% else %} -
- {% endif %} -
-
-
- -
-
-
-
-

{{ product.title }}

- {% if types.0.0 == product.type %} -
Need - {% else %} -
Give - {% endif %} - {% if types_o.0.0 == product.offer %} - Service
- {% else %} - Item - {% endif %} -
Locality: {{ product.place }}
-

{{ product.description }}

-
-
-
-
- {% endfor %} - {% else %} -

No polls are available.

- {% endif %} +
+
+ +
+
+
+
+
+
+ {% if all_product %} + {% for product in all_product %} + {% if product.Wolontatriat %} +
+ {% else %} +
+ {% endif %} +
+
+
+
+
+
+
+

{{ product.title }}

 + {% if types.0.0 == product.type %} +
I will need + {% else %} +
I give + {% endif %} + {% if types_o.0.0 == product.offer %} + Service
+ {% else %} + Item + {% endif %} +
City: {{ product.place }}
+

{{ product.description }}

+
+
- -
- {% csrf_token %} - - - - -
-
-
- -
-
-
-
-
-
- {% if all_oceny %} - {% for ocen_jed in all_oceny %} -
-
-
- {{ocen_jed.ocena_jedn}} -
-
-
- {{ocen_jed.comm}} -
-
-
-
- {% endfor %} - {% else %} -

No polls are available.

- {% endif %}
-
-
-
- {% csrf_token %} - - - -
+ {% endfor %} + {% else %} +

No polls are available.

+ {% endif %}
- - -
-
- - - - - - +
+
+
+
+
+
+
+ {% if all_oceny %} + {% for ocen_jed in all_oceny %} +
+
+
+ {{ocen_jed.ocena_jedn}} +
+
+
+ {{ocen_jed.comm}} +
+
+
+
+ {% endfor %} + {% else %} +

No polls are available.

+ {% endif %} +
+
+
+
+ {% csrf_token %} + + + +
+
+
+
+
+
+ +
+
+ + - {% endblock %} +{% endblock %} diff --git a/SocialHelper/enGB/templates/footer3.html b/SocialHelper/enGB/templates/footer3.html new file mode 100644 index 0000000..bbab369 --- /dev/null +++ b/SocialHelper/enGB/templates/footer3.html @@ -0,0 +1,69 @@ +{% load static %} + +
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
© +Copyright © All rights reserved | This template is made with by Colorlib. Downloaded from Themeslab + +
+
+
+
+ + diff --git a/SocialHelper/enGB/templates/footer4.html b/SocialHelper/enGB/templates/footer4.html new file mode 100644 index 0000000..cca2c73 --- /dev/null +++ b/SocialHelper/enGB/templates/footer4.html @@ -0,0 +1,70 @@ +{% load static %} + +
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
© +Copyright © All rights reserved | This template is made with by Colorlib. Downloaded from Themeslab + +
+
+
+
+ + diff --git a/SocialHelper/enGB/templates/navbar3.html b/SocialHelper/enGB/templates/navbar3.html new file mode 100644 index 0000000..22d9218 --- /dev/null +++ b/SocialHelper/enGB/templates/navbar3.html @@ -0,0 +1,48 @@ +{% load static %} + + + +
+
+
+ +
+
+ + + + diff --git a/SocialHelper/enGB/templates/ennavbar.html b/SocialHelper/enGB/templates/navbar4.html similarity index 71% rename from SocialHelper/enGB/templates/ennavbar.html rename to SocialHelper/enGB/templates/navbar4.html index e820520..3df3548 100644 --- a/SocialHelper/enGB/templates/ennavbar.html +++ b/SocialHelper/enGB/templates/navbar4.html @@ -2,7 +2,7 @@ - +
@@ -15,23 +15,23 @@ +
    • {% if user.email %} -
    • -
    • -
    • +
    • +
    • +
    • {% else %}
    • {% endif %}
    • -
@@ -39,3 +39,11 @@ + diff --git a/SocialHelper/enGB/urls.py b/SocialHelper/enGB/urls.py index 239d865..6396ced 100644 --- a/SocialHelper/enGB/urls.py +++ b/SocialHelper/enGB/urls.py @@ -6,26 +6,34 @@ from django.conf.urls.static import static urlpatterns = [ path('', views.enindex, name='enindex'), - path('product', views.enindex_product, name='enindex_product'), - path('offer', views.enindex_offer, name='enindex_offer'), - path('all', views.enindex, name='enindex'), + path('enproduct', views.enindex_product, name='enindex_product'), + path('enoffer', views.enindex_offer, name='enindex_offer'), + path('enall', views.enindex, name='enindex'), - path('', views.enindex, name='enindex'), - path('contact', views.encontact, name='encontact'), - path('regulamin',views.enregulamin, name='enregulamin'), - path('filter', views.enfilter, name='enfilter'), - path('add_offer', views.enadd_offer, name='enadd_offer'), - path('my_offer', views.enmy_offer, name='enmy_offer'), - path('/delete_offer', views.endelete_offer, name='endelete_offer'), - path('/edit_offer', views.enedit_offer, name='enedit_offer'), + path('enoffer_details/', views.enoffer, name='enoffer'), + path('ensend_message', views.ensend_message, name='ensend_message'), + path('enchating///', views.enchating, name='enchating'), - path('create_user', views.encreate_user, name='encreate_user'), + path('en', views.enindex, name='enindex'), + path('encontact', views.encontact, name='encontact'), + path('enabout', views.enabout, name='enabout'), + path('enregulamin',views.enregulamin, name='enregulamin'), + path('enfilter', views.enfilter, name='enfilter'), + path('enadd_offer', views.enadd_offer, name='enadd_offer'), + path('enmy_offer', views.enmy_offer, name='enmy_offer'), + path('/endelete_offer', views.endelete_offer, name='endelete_offer'), + path('/enedit_offer', views.enedit_offer, name='enedit_offer'), + + path('encreate_user', views.encreate_user, name='encreate_user'), path('enlogin', views.enlogin, name='enlogin'), - path('delete_user', views.endelete_user, name='endelete_user'), - path('logout_user', views.enlogout_user, name='enlogout_user'), - path('/delete_user', views.endelete_user, name='endelete_user'), - path('edit_user', views.enedit_user, name='enedit_user'), - path('user_profile/', views.enuser_profile, name='enuser_profile'), - path('user_profile//add_comment', views.enadd_comment, name='enadd_comment'), + path('endelete_user', views.endelete_user, name='endelete_user'), + path('enlogout_user', views.enlogout_user, name='enlogout_user'), + path('en/delete_user', views.endelete_user, name='endelete_user'), + path('enedit_user', views.enedit_user, name='enedit_user'), + path('enuser_profile/', views.enuser_profile, name='enuser_profile'), + path('enuser_profile//enadd_comment', views.enadd_comment, name='enadd_comment'), + + path('enoffer_note/', views.enoffer_note, name='enoffer_note'), + path('enuser_note/', views.enuser_note, name='enuser_note'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/SocialHelper/enGB/views.py b/SocialHelper/enGB/views.py index b694d2e..8fcbdce 100644 --- a/SocialHelper/enGB/views.py +++ b/SocialHelper/enGB/views.py @@ -6,8 +6,11 @@ from django.urls import reverse from django.template import loader from django.contrib.auth import get_user_model from django.contrib import messages, auth - -from homepage.models import Product, TYPE_T, TYPE_O, Places, Ocena +from django.utils import timezone +from django.views.decorators.clickjacking import xframe_options_exempt +from django.db.models import Q +from homepage.models import Product, TYPE_T, TYPE_O, Places, Ocena, chat +from control.models import Notificationuser, Notificationoffer, Usermessage, Vipuser from django.utils import timezone from datetime import timedelta @@ -15,6 +18,14 @@ import datetime def enindex(request): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + all_product = Product.objects.filter(active = True) template = loader.get_template('enGB/index.html') types = TYPE_T @@ -33,10 +44,19 @@ def enindex(request): 'types_o': types_o, 'usluga_local': usluga_local, 'przedmiot_local': przedmiot_local, + 'isVIP': isVIP, } return HttpResponse(template.render(context, request)) def enindex_product(request): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + all_product = Product.objects.filter(active = True, offer=2) template = loader.get_template('enGB/index.html') types = TYPE_T @@ -55,10 +75,19 @@ def enindex_product(request): 'types_o': types_o, 'usluga_local': usluga_local, 'przedmiot_local': przedmiot_local, + 'isVIP': isVIP, } return HttpResponse(template.render(context, request)) def enindex_offer(request): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + all_product = Product.objects.filter(active = True, offer=1) template = loader.get_template('enGB/index.html') types = TYPE_T @@ -77,17 +106,75 @@ def enindex_offer(request): 'types_o': types_o, 'usluga_local': usluga_local, 'przedmiot_local': przedmiot_local, + 'isVIP': isVIP, } return HttpResponse(template.render(context, request)) def encontact(request): - return render(request , 'enGB/contact.html') + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + + if request.method == 'POST': + name = request.POST['name'] + email = request.POST['email'] + message = request.POST['message'] + if name == "" and email == "" and message == "": + messages.error(request,'Text fields cannot be empty!') + return redirect('encontact') + mess = Usermessage( + active = True, + name = name, + email = email, + text = message, + date = timezone.now() + ) + mess.save() + messages.success(request, 'Messege send, Thanks!') + template = loader.get_template('enGB/contact.html') + context = { + 'isVIP': isVIP, + } + return HttpResponse(template.render(context, request)) + +def enabout(request): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + template = loader.get_template('enGB/about.html') + context = { + 'isVIP': isVIP, + } + return HttpResponse(template.render(context, request)) def enregulamin(request): - return render(request, 'enGB/regulamin.html') + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + template = loader.get_template('enGB/regulamin.html') + context = { + 'isVIP': isVIP, + } + return HttpResponse(template.render(context, request)) def enmy_offer(request): if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False all_product = Product.objects.filter(user_iden = request.user.id, active = True).order_by('create_date') username = request.user.email template = loader.get_template('enGB/my_offer.html') @@ -107,13 +194,21 @@ def enmy_offer(request): 'types_o': types_o, 'usluga_local': usluga_local, 'przedmiot_local': przedmiot_local, - 'username': username + 'username': username, + 'isVIP': isVIP, } return HttpResponse(template.render(context, request)) else: return redirect(enlogin) def enfilter(request): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False all_product = Product.objects.filter(active = True) template = loader.get_template('enGB/index.html') @@ -132,19 +227,19 @@ def enfilter(request): if oddam_local == "on" and potrzebuje_local != "on": zmienna = 2 - all_product = all_product.filter(type=zmienna) + all_product = all_product.filter(type=2) if oddam_local != "on" and potrzebuje_local == "on": zmienna = 1 - all_product = all_product.filter(type=zmienna) + all_product = all_product.filter(type=1) if usluga_local == "on" and przedmiot_local != "on": zmienna = 1 - all_product = all_product.filter(type=zmienna) + all_product = all_product.filter(offer=1) if usluga_local != "on" and przedmiot_local == "on": zmienna = 2 - all_product = all_product.filter(type=zmienna) + all_product = all_product.filter(offer=2) if wol_local == "on": all_product = all_product.filter(Wolontatriat=True) @@ -162,13 +257,19 @@ def enfilter(request): 'usluga_local': usluga_local, 'przedmiot_local': przedmiot_local, 'wol_local': wol_local, + 'isVIP': isVIP, } return HttpResponse(template.render(context, request)) def enadd_offer(request): - place_list = Places.objects.all() if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + + place_list = Places.objects.all() if request.method == 'POST': place_local = request.POST['browser'] type_local = request.POST['type'] @@ -190,14 +291,14 @@ def enadd_offer(request): offer_local = request.POST['offer'] if title_local == "": - messages.error(request,'Title cannot be empty!') - return redirect('add_offer') + messages.error(request,'You must enter a title!') + return redirect('enadd_offer') if script_local == "": - messages.error(request,'Description cannot be empty!') - return redirect('add_offer') + messages.error(request,'You must enter a description!!') + return redirect('enadd_offer') if place_local == "": - messages.error(request,'Locality cannot be empty!') - return redirect('add_offer') + messages.error(request,'You must enter a city!') + return redirect('enadd_offer') product = Product( picture = pic_local, @@ -212,76 +313,107 @@ def enadd_offer(request): keywords = "", ) product.save() - messages.success(request, 'Offer added!') + messages.success(request, 'Advertisement added!') return redirect(enmy_offer) context = { 'place_list': place_list, + 'isVIP': isVIP, } return render(request , 'enGB/add_offer.html', context) else: return redirect(enlogin) def endelete_offer(request, offer_id): - instance = Product.objects.get(id=offer_id) - instance.active = False - instance.save() - messages.success(request, 'Offer removed!') - - return redirect(enmy_offer) + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + if Product.objects.filter(user_iden=request.user , id = offer_id).exists(): + instance = Product.objects.get(id=offer_id) + instance.active = False + instance.save() + messages.success(request, 'Ad removed!') + return redirect(enmy_offer) + else: + messages.error(request, 'You are not authorized!') + return redirect(enindex) + else: + return redirect(enlogin) def enedit_offer(request, offer_id): - instance = Product.objects.get(id=offer_id) - types = TYPE_T - types_o = TYPE_O - place_list = Places.objects.all() - context = { - 'offer': instance, - 'place_list': place_list, - 'types': types, - 'types_o': types_o, - } - if request.method == 'POST': - place_local = request.POST['browser'] - type_local = request.POST['type'] - script_local = request.POST['script'] - title_local = request.POST['title'] - - wol_local = request.POST['wol'] - if wol_local == "1": - wol = False + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True else: - wol = True + isVIP = False + if Product.objects.filter(user_iden=request.user , id = offer_id).exists(): + instance = Product.objects.get(id=offer_id) + types = TYPE_T + types_o = TYPE_O + place_list = Places.objects.all() + context = { + 'offer': instance, + 'place_list': place_list, + 'types': types, + 'types_o': types_o, + 'isVIP': isVIP, + } + if request.method == 'POST': + place_local = request.POST['browser'] + type_local = request.POST['type'] + script_local = request.POST['script'] + title_local = request.POST['title'] - if title_local == "": - messages.error(request,'Title cannot be empty!') - return redirect('add_offer') - if script_local == "": - messages.error(request,'Description cannot be empty!') - return redirect('add_offer') - if place_local == "": - messages.error(request,'Locality cannot be empty!') - return redirect('add_offer') + wol_local = request.POST['wol'] + if wol_local == "1": + wol = False + else: + wol = True - if request.FILES: - pic_local = request.FILES['file'] - instance.picture = pic_local + if title_local == "": + messages.error(request,'You must enter a title!') + return redirect('enadd_offer') + if script_local == "": + messages.error(request,'You must enter a description!!') + return redirect('enadd_offer') + if place_local == "": + messages.error(request,'You must enter a city!') + return redirect('enadd_offer') - offer_local = request.POST['offer'] + if request.FILES: + pic_local = request.FILES['file'] + instance.picture = pic_local - instance.Wolontatriat = wol - instance.type = int(type_local) - instance.offer = int(offer_local) - instance.title = title_local - instance.description = script_local - instance.place= place_local - instance.keywords = "" + offer_local = request.POST['offer'] - instance.save() - messages.success(request, 'Edited offer!') - return redirect(enmy_offer) - return render(request , 'enGB/edycja_ogloszenia.html', context) + instance.Wolontatriat = wol + instance.type = int(type_local) + instance.offer = int(offer_local) + instance.title = title_local + instance.description = script_local + instance.place= place_local + instance.keywords = "" + + instance.save() + messages.success(request, 'Edited announcement!') + return redirect(enmy_offer) + return render(request , 'enGB/edycja_ogloszenia.html', context) + else: + messages.error(request, 'You are not authorized!') + return redirect(enindex) + else: + return redirect(enlogin) def encreate_user(request): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + if request.method == 'POST': User = get_user_model() email = request.POST['email'] @@ -290,32 +422,32 @@ def encreate_user(request): scales = request.POST['scales'] #walidacja if scales == "No": - messages.error(request,'You must accept the Terms of use!') - return redirect('create_user') + messages.error(request,'You must accept the use of terms!') + return redirect('encreate_user') if email == "": messages.error(request,'The email field is empty!') - return redirect('create_user') + return redirect('encreate_user') if "@" not in email: - messages.error(request,'The entered email is invalid!') - return redirect('create_user') + messages.error(request,'The email entered is incorrect!') + return redirect('encreate_user') if User.objects.filter(email=email).exists(): messages.error(request,'This e-mail address is already in use') - return redirect('create_user') + return redirect('encreate_user') if password == "": messages.error(request,'The password field is empty!') - return redirect('create_user') + return redirect('encreate_user') if password != pow_password: messages.error(request,'The passwords provided are different') - return redirect('create_user') + return redirect('encreate_user') if password == email: - messages.error(request,'The password and email provided must be different') - return redirect('create_user') + messages.error(request,'The given passwords and email must be different') + return redirect('encreate_user') dlugosc = 0 znak = 0 @@ -336,7 +468,7 @@ def encreate_user(request): if dlugosc+znak+mala+duza+cyfra != 5: messages.error(request,'The password provided is incorrect. The password must contain at least: 1 digit, 1 uppercase letter, 1 lowercase letter, 1 special character from the range! @ # $% & * () {} [] <>?, And must consist of at least 8 symbols') - return redirect('create_user') + return redirect('encreate_user') else: user = User( @@ -353,64 +485,80 @@ def encreate_user(request): return render(request , 'enGB/create_user.html') def endelete_user(request): - User = get_user_model() - instant = User.objects.filter(id=request.user.id).first() - instant.is_active = False - instant.email = str(instant.id) - instant.username = str(instant.id) - instant_offer = Product.objects.filter(user_iden = instant) - for offer in instant_offer: - offer.active = False - offer.save() - instant.save() + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False - messages.success(request,'Account deleted!') - return redirect(enindex) + User = get_user_model() + instant = User.objects.filter(id=request.user.id).first() + instant.is_active = False + instant.email = str(instant.id) + instant.username = str(instant.id) + instant_offer = Product.objects.filter(user_iden = instant) + for offer in instant_offer: + offer.active = False + offer.save() + instant.save() + + messages.success(request,'Account deleted!!') + return redirect(enindex) + else: + return redirect(enlogin) def enedit_user(request): - User = get_user_model() - instant = User.objects.filter(id=request.user.id).first() - if request.method == 'POST': + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False - oldpassword = request.POST['oldpassword'] - newpassword1 = request.POST['newpassword1'] - newpassword2 = request.POST['newpassword2'] - user = authenticate(request, username=instant.username, password=oldpassword, is_active=True) - if user is None: - messages.error(request,'You entered the wrong password') - return redirect('edit_user') + User = get_user_model() + instant = User.objects.filter(id=request.user.id).first() + if request.method == 'POST': - dlugosc = 0 - znak = 0 - duza = 0 - mala = 0 - cyfra = 0 - for i in newpassword1: - if i in "1234567890": - cyfra = 1 - elif i in "QWERTYUIOPASDFGHJKLZXCVBNM": - duza = 1 - elif i in "qwertyuiopasdfghjklzxcvbnm": - mala = 1 - elif i in "!@#$%&*(){}[]<>?": - znak = 1 - if len(newpassword1) >= 8: - dlugosc = 1 + oldpassword = request.POST['oldpassword'] + newpassword1 = request.POST['newpassword1'] + newpassword2 = request.POST['newpassword2'] + user = authenticate(request, username=instant.username, password=oldpassword, is_active=True) + if user is None: + messages.error(request,'You entered the wrong password') + return redirect('enedit_user') - if dlugosc+znak+mala+duza+cyfra != 5: - messages.error(request,'Podane hasło jest nieprawidłowe. Hasło musi najmniejsze: 1 cyfra, 1 duza litere, 1 mala litere, 1 znak specjalny z zakresu! @ # $% & * () {} [] <> ?, oraz składać sie conajmniej z 8 symboli') - return redirect('edit_user') + dlugosc = 0 + znak = 0 + duza = 0 + mala = 0 + cyfra = 0 + for i in newpassword1: + if i in "1234567890": + cyfra = 1 + elif i in "QWERTYUIOPASDFGHJKLZXCVBNM": + duza = 1 + elif i in "qwertyuiopasdfghjklzxcvbnm": + mala = 1 + elif i in "!@#$%&*(){}[]<>?": + znak = 1 + if len(newpassword1) >= 8: + dlugosc = 1 - if newpassword1 != newpassword2: - messages.error(request,'The new passwords provided are different') - return redirect('edit_user') + if dlugosc+znak+mala+duza+cyfra != 5: + messages.error(request,'The password provided is incorrect. The password must contain at least: 1 digit, 1 uppercase letter, 1 lowercase letter, 1 special character from the range! @ # $% & * () {} [] <>?, And must consist of at least 8 symbols') + return redirect('enedit_user') - instant.set_password(newpassword1) - instant.save() - messages.success(request,'Password changed, you are logged out!') - return redirect('enmy_offer') + if newpassword1 != newpassword2: + messages.error(request,'The new passwords provided are different') + return redirect('enedit_user') - return render(request , 'enGB/edit_user.html') + instant.set_password(newpassword1) + instant.save() + messages.success(request,'Password changed, logged out!') + return redirect('enmy_offer') + + return render(request , 'enGB/edit_user.html') + else: + return redirect(enlogin) def enlogin(request): if request.method == 'POST': @@ -424,7 +572,7 @@ def enlogin(request): else: messages.error(request,'Invalid login details!') return redirect(enlogin) - return render(request , 'enGB/enlogin.html') + return render(request , 'enGB/login.html') def enlogout_user(request): auth.logout(request) @@ -432,6 +580,14 @@ def enlogout_user(request): return redirect(enindex) def enuser_profile(request, user_name): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + User = get_user_model() if User.objects.filter(username=user_name).exists(): user_prof = User.objects.filter(username=user_name).first() @@ -439,12 +595,13 @@ def enuser_profile(request, user_name): user_prof = User.objects.filter(email=user_name).first() all_product = Product.objects.filter(active = True, user_iden = user_prof.id) + suma_prod = all_product.count() oceny = Ocena.objects.filter(user_iden = user_prof.id) template = loader.get_template('enGB/user_profile.html') types = TYPE_T types_o = TYPE_O - + suma = 0 if Ocena.objects.filter(user_iden = user_prof.id).exists(): ocena = 0 suma = 0 @@ -455,17 +612,28 @@ def enuser_profile(request, user_name): ocena = ocena * 10 ocena = int (ocena) else: - ocena = 5 + ocena = 50 + suma_oc = 0 + ocena_2 = ocena/10 context = { 'all_product': all_product, 'all_oceny': oceny, 'ocena': ocena, 'name': user_prof.email, + 'ocena_2': ocena_2, + 'suma_oc': suma, #suma wszystkich ocen uzytkownika + 'suma_prod': suma_prod, + 'user_prof': user_prof.is_active, + 'isVIP': isVIP, } return HttpResponse(template.render(context, request)) def enadd_comment(request, user_name): if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False User = get_user_model() user_prof = User.objects.filter(email=user_name).first() if request.method == 'POST': @@ -482,9 +650,189 @@ def enadd_comment(request, user_name): context = { 'user_name': user_name, + 'isVIP': isVIP, } template = loader.get_template('enGB/add_comment.html') return HttpResponse(template.render(context, request)) else: return redirect(enlogin) + +def enoffer(request, offer_id): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + user_get_id = request.user.id + offer = Product.objects.filter(id = offer_id, active = True).first() + mess = 0 + + if chat.objects.filter(product_id = offer_id, author_id=request.user.id).exists(): + chat_fst = chat.objects.filter(product_id = offer_id, author_id=request.user.id) + else: + chat_fst = chat.objects.none() + mess = mess + 1 + + if chat.objects.filter(product_id = offer_id, sec_user_id=request.user.id).exists(): + chat_scd = chat.objects.filter(product_id = offer_id, sec_user_id=request.user.id) + else: + chat_scd = chat.objects.none() + mess = mess + 1 + + if mess == 2: + mess = chat.objects.none() + user_list = chat.objects.none() + email_list = chat.objects.none() + else: + mess = chat_fst.union(chat_scd).order_by('pub_date') + if offer.user_iden == request.user: + user_list = chat.objects.values_list('author_id', flat=True).distinct('author_id').filter(product_id = offer_id, sec_user_id = request.user.id).exclude(author_id = request.user.id) + User = get_user_model() + email_list = User.objects.filter(id__in = user_list) + else: + user_list = chat.objects.none() + email_list = chat.objects.none() + + template = loader.get_template('enGB/offer_page.html') + types = TYPE_T + types_o = TYPE_O + context = { + 'offer': offer, + 'types': types, + 'types_o': types_o, + 'mess': mess, + 'user_list': user_list, + 'email_list': email_list, + 'user_get_id': user_get_id, + 'isVIP': isVIP, + } + return HttpResponse(template.render(context, request)) + +def ensend_message(request): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + if request.method == 'POST': + author_id = request.POST['author_id'] + sec_user_id = request.POST['sec_user_id'] + product_id = request.POST['product_id'] + text = request.POST['text'] + User = get_user_model() + massage = chat( + product_id = Product.objects.filter(id=product_id).first(), + author_id = User.objects.filter(id=author_id).first(), + sec_user_id = sec_user_id, + text = text, + pub_date = timezone.now(), + ) + massage.save() + return redirect(enoffer, product_id) + else: + return redirect(enlogin) + +def enchating(request, offer_id, au_id, ad_id): + if request.user.is_authenticated: + scd_user_get_id = ad_id + User = get_user_model() + user_prof = User.objects.filter(id=au_id).first() + mess = 0 + user_get_id = request.user.id + if chat.objects.filter(product_id = offer_id, author_id=user_prof.id , sec_user_id = ad_id ).exists(): + chat_fst = chat.objects.filter(product_id = offer_id, author_id=user_prof.id , sec_user_id = ad_id) + else: + chat_fst = chat.objects.none() + mess = mess + 1 + user_prof_2 = User.objects.filter(id=ad_id).first() + if chat.objects.filter(product_id = offer_id, author_id = user_prof_2.id ,sec_user_id=au_id).exists(): + chat_scd = chat.objects.filter(product_id = offer_id, author_id = user_prof_2.id ,sec_user_id=au_id) + else: + chat_scd = chat.objects.none() + mess = mess + 1 + + if mess == 2: + mess = chat.objects.none() + user_list = chat.objects.none() + email_list = chat.objects.none() + else: + mess = chat_fst.union(chat_scd).order_by('pub_date') + + last_date = chat_fst.union(chat_scd).order_by('pub_date') + last_date = chat.objects.filter(Q(product_id = offer_id), Q(author_id=user_prof.id) | Q(author_id=user_prof_2.id), Q(sec_user_id=ad_id) | Q(sec_user_id=au_id)).order_by('pub_date').last() + context ={ + 'mess': mess, + 'user_get_id': user_get_id, + 'scd_user_get_id': scd_user_get_id, + 'last_date': last_date, + } + template = loader.get_template('enGB/chating.html') + return HttpResponse(template.render(context, request)) + else: + return redirect(enlogin) + +def enoffer_note(request, offer_id): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + + offer = Product.objects.get(id = offer_id) + if request.method == 'POST': + text = request.POST['script'] + if text == "": + messages.error(request,'Text fields cannot be empty!') + return redirect('enoffer_note', offer_id) + mess = Notificationoffer( + active = True, + user_iden = offer, + text = text, + date = timezone.now() + ) + mess.save() + messages.success(request, 'Thank you for reporting') + return redirect('enoffer', offer_id) + context = { + 'offer': offer, + 'isVIP': isVIP, + } + template = loader.get_template('enGB/offer_note.html') + return HttpResponse(template.render(context, request)) + +def enuser_note(request, user_id): + if request.user.is_authenticated: + if Vipuser.objects.filter(user_iden = request.user, active = True ).exists(): + isVIP = True + else: + isVIP = False + else: + isVIP = False + + User = get_user_model() + get_user = User.objects.get(email = user_id) + if request.method == 'POST': + text = request.POST['script'] + if text == "": + messages.error(request,'Text fields cannot be empty!') + return redirect('enuser_note', user_id) + mess = Notificationuser( + active = True, + user_iden = get_user, + text = text, + date = timezone.now() + ) + mess.save() + messages.success(request, 'Thank you for reporting') + return redirect('enuser_profile', user_id) + context = { + 'User_prof': get_user, + 'isVIP': isVIP, + } + template = loader.get_template('enGB/user_note.html') + return HttpResponse(template.render(context, request)) diff --git a/SocialHelper/homepage/templates/navbar.html b/SocialHelper/homepage/templates/navbar.html index 8882f9f..3bf6d0b 100644 --- a/SocialHelper/homepage/templates/navbar.html +++ b/SocialHelper/homepage/templates/navbar.html @@ -30,7 +30,6 @@ {% else %}
    • {% endif %} -
    • diff --git a/SocialHelper/homepage/templates/navbar2.html b/SocialHelper/homepage/templates/navbar2.html index 26f767c..d78e8f0 100644 --- a/SocialHelper/homepage/templates/navbar2.html +++ b/SocialHelper/homepage/templates/navbar2.html @@ -31,7 +31,6 @@ {% else %}
    • {% endif %} -