0.0.4 fix text for about page

.gitignore

@@ -414,5 +414,4 @@ fabric.properties
 
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
-celerybeat-schedule.db
 

GeneralApp/admin.py

@@ -47,7 +47,7 @@ class Admin_StaticPage(Admin_Trans_BaseModelViewPage):
         if request.user.is_superuser:
            return True
 
-        if obj.url in ('main', 'spec_technics', 'works'):
+        if not obj or obj.url in ('main', 'works'):
             return False
 
 admin.site.register(StaticPage,Admin_StaticPage)

README.md

@@ -1,3 +0,0 @@
-celery -A TWB.celery:app worker -l info
-
-celery -A TWB.celery:app beat -l info

SubscribesApp/serializers.py

@@ -1,7 +0,0 @@
-from rest_framework import serializers
-
-
-class SubscribersSerializer(serializers.Serializer):
-    email = serializers.EmailField(error_messages={'invalid': 'Invalid email'})
-    email_notification = serializers.BooleanField()
-    auto_subscribe = serializers.BooleanField()

SubscribesApp/urls.py

@@ -1,9 +0,0 @@
-from django.urls import path
-
-from SubscribesApp.views import SubscribersView
-
-urlpatterns = [
-
-    path('auto-subscribe/', SubscribersView.as_view(), name='auto_subscribe'),
-
-]

SubscribesApp/views.py

@@ -1,43 +1,3 @@
-from django.contrib.auth.models import User
+from django.shortcuts import render
-from django.http import JsonResponse
-from rest_framework import status
-from rest_framework.permissions import IsAuthenticated
-from rest_framework.views import APIView
 
-from SubscribesApp.models import SubscribeForUser
+# Create your views here.
-from SubscribesApp.serializers import SubscribersSerializer
-
-
-class SubscribersView(APIView):
-    # permission_classes = [IsAuthenticated]
-
-    def post(self, request):
-        serializer = SubscribersSerializer(data=request.data)
-
-        if serializer.is_valid():
-            validated_data = serializer.validated_data
-            email = validated_data['email']
-            email_notification = validated_data['email_notification']
-            auto_subscribe = validated_data['auto_subscribe']
-
-            user = User.objects.filter(email=email)
-
-            if user:
-
-                subscribe_for_user = SubscribeForUser.objects.filter(user_id=user[0].id)
-
-                if email_notification:
-                    subscribe_for_user.update(receive_finish_subscribe_msg=True)
-                else:
-                    subscribe_for_user.update(receive_finish_subscribe_msg=False)
-
-                if auto_subscribe:
-                    subscribe_for_user.update(auto_continue=True)
-                else:
-                    subscribe_for_user.update(auto_continue=False)
-
-                return JsonResponse({"message": "Subscriptions updated successfully"}, status=status.HTTP_200_OK)
-            else:
-                return JsonResponse({"message": "User not found"}, status=status.HTTP_404_NOT_FOUND)
-        else:
-            return JsonResponse(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

TWB/celery.py

@@ -1,27 +0,0 @@
-from __future__ import absolute_import
-
-import os
-
-from celery import Celery
-from celery.schedules import crontab
-from django.conf import settings
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "TWB.settings")
-
-app = Celery('bo', include=['TWB.tasks'])
-app.config_from_object('django.conf:settings', namespace='CELERY')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
-
-app.conf.beat_schedule = {
-    'update-currency-rates': {
-        'task': 'TWB.tasks.check_auto_subscribe',
-        'schedule': crontab(minute=0, hour='*/1'),
-    },
-    'subscription_expiration_check': {
-        'task': 'TWB.tasks.subscription_expiration_check',
-        'schedule': crontab(hour=0, minute=0),
-        # 'schedule': crontab(minute='*', hour='*'),
-    },
-}
-
-app.conf.broker_url = settings.CELERY_BROKER_URL

TWB/settings.py

@@ -11,7 +11,6 @@ https://docs.djangoproject.com/en/4.2/ref/settings/
 """
 
 from pathlib import Path
-from decouple import config
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -61,6 +60,7 @@ AUTHENTICATION_BACKENDS = [
 ]
 
 
+
 SOCIALACCOUNT_PROVIDERS = {
     'google': {
         'SCOPE': [
@@ -172,8 +172,11 @@ CHANNEL_LAYERS = {
 }
 
 
-POSTGRES_DB = config('POSTGRES_DB')
+
-POSTGRES_USER = config('POSTGRES_USER')
+
+
+
+
 
 
 # Database
@@ -182,8 +185,8 @@ POSTGRES_USER = config('POSTGRES_USER')
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': POSTGRES_DB,
+        'NAME': 'twbDB',
-        'USER': POSTGRES_USER,
+        'USER': 'test_user',
         'PASSWORD': 'test_db_pass',
         'HOST': '127.0.0.1',
         'PORT': '5432',
@@ -333,16 +336,6 @@ CKEDITOR_CONFIGS = {
     }
 }
 
-CELERY_BROKER_URL = config('CELERY_BROKER_URL')
-CELERY_RESULT_BACKEND = config('CELERY_RESULT_BACKEND')
-
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'smtp.gmail.com'
-EMAIL_USE_TLS = True
-EMAIL_PORT = 587
-EMAIL_HOST_USER = config('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = config('EMAIL_HOST_PASSWORD')
-
 
 # CKEDITOR_OPTIONS = {
 #     'height': 291,

TWB/tasks.py

@@ -1,40 +0,0 @@
-from datetime import datetime, timedelta, timezone
-
-from SubscribesApp.models import SubscribeForUser
-from TWB import settings
-from TWB.celery import app
-from django.core.mail import send_mail
-
-
-@app.task
-def check_auto_subscribe():
-    current_time = datetime.now()
-    subscribes = SubscribeForUser.objects.filter(auto_continue=True)
-    if subscribes:
-        for subscribe in subscribes:
-            if subscribe.paid_period_to_DT and subscribe.paid_period_to_DT <= current_time + timedelta(hours=1):
-                user_email = subscribe.user.email
-                subject = 'Подписка продлена!'
-                message = 'Ваша подписка успешно продлена!'
-                send_mail(subject, message, settings.EMAIL_HOST_USER, [user_email], fail_silently=False)
-    else:
-        print('Нету подписок')
-
-
-@app.task
-def subscription_expiration_check():
-    current_time = datetime.now()
-    subscribes = SubscribeForUser.objects.filter(paid_period_to_DT__gte=current_time)
-    if subscribes:
-        for subscribe in subscribes:
-            expiration_date = subscribe.paid_period_to_DT
-            remaining_days = (expiration_date - current_time).days
-
-            if remaining_days <= 7:
-                message = f'Ваша подписка заканчивается через {remaining_days} дня. Пожалуйста, продлите её.'
-
-            user_email = subscribe.user.email
-            subject = 'Подписка истекает!'
-            send_mail(subject, message, settings.EMAIL_HOST_USER, [user_email], fail_silently=False)
-    else:
-        print('Нету подписок')

TWB/urls.py

@@ -1,3 +1,4 @@
+
 from django.contrib import admin
 from django.urls import path, include
 from django.conf.urls.static import static
@@ -8,6 +9,7 @@ from AuthApp.views import login_View
 handler404 = Page404
 
 urlpatterns = [
+    # path('admin/', admin.site.urls),
     path('ckeditor/', include('ckeditor_uploader.urls')),
     path('i18n/', include('django.conf.urls.i18n')),
 
@@ -37,9 +39,7 @@ urlpatterns = [
 
     path('test_404', Page404, name='page_404'),
 
-    path('', include('PushMessages.urls')),
+    path('', include('PushMessages.urls'))
-    path('', include('SubscribesApp.urls')),
-
 ]
 
 from django.conf.urls.i18n import i18n_patterns

env.sample

@@ -1,8 +0,0 @@
-EMAIL_HOST_USER=
-EMAIL_HOST_PASSWORD=
-
-POSTGRES_DB=
-POSTGRES_USER=
-
-CELERY_BROKER_URL=
-CELERY_RESULT_BACKEND=

requirements.pip

@@ -2,6 +2,7 @@ Django==4.2.2
 django-ckeditor==6.5.1
 psycopg2-binary==2.9.6
 requests
+Pillow==9.5.0
 django-modeltranslation==0.18.10
 overpass
 geopy
@@ -12,6 +13,5 @@ django-colorfield
 django-webpush==0.3.5
 django-allauth==0.60.0
 pytz==2024.1
-celery==5.3.6
+#django-tz-detect==0.4.0
-djangorestframework==3.14.0
+
-python-decouple==3.8

static/css/mobile_styles.css

@@ -121,6 +121,10 @@
         width: 70%;
     }
 
+    .dropdown{
+        vertical-align: sub;
+    }
+
     .handler_curtain_left{
         display: block;
     }
@@ -254,7 +258,7 @@
     }
 
     header{
-        padding: 5px 16px;
+        padding: 3px 16px;
         margin-top: unset;
     }
     .header_logo, .header_btn_mover, .header_btn_sender{
@@ -386,11 +390,14 @@
         margin-left: 5px;
     }
     .header_logo_mobile {
-        margin-right: 37px;
+        margin-right: 20px;
     }
     .line_f_header{
             top: 43px;
     }
+    header .header-second{
+        margin-top: 3px;
+    }
 
     .self_news_img{
         width: 40%;
@@ -495,6 +502,8 @@
     .footer_logo{
         text-align: center;
         margin: 40px 0;
+        max-width: 90px;
+        margin-left: 40%;
     }
 
     .footer_text_sub{

static/css/styles(boris).css

@@ -2201,7 +2201,7 @@ a.open_inf_carrier{
     height: 1px;
     background: #dad7d7;
     width: 100%;
-    top: 60px;
+    top: 100px;
     z-index: 999;
 }
 

static/css/styles.css

@@ -299,7 +299,8 @@ section.register>h1 {
     margin-bottom: 10px;
 }
 .footer_logo{
-    margin-bottom: 40px;
+    margin-bottom: 20px;
+    max-width: 45px;
 }
 
 footer>div {
@@ -502,7 +503,7 @@ footer>div {
 
 header .header-first {
     float: left;
-    margin-top: 12px;
+    /*margin-top: 12px;*/
 
 }
 
@@ -663,6 +664,7 @@ header>div>a>span{
 
 header .header-second {
     float: right;
+    margin-top: 20px;
 
 }
 

static/js/chat_socket_functions/etc_operations_for_chat_socket.js

@@ -6,10 +6,12 @@ function update_count_unread_messages (data) {
         let list_unrd_parent = document.querySelectorAll(".icon_unread_messages")
         let i = 0
         for (i;i < list_unrd.length;i++){
+
             if (!list_unrd_parent[i].classList.contains("showed")){
                 list_unrd_parent[i].classList.toggle("showed")
+
+                list_unrd[i].innerHTML = data.unread_msgs_count.toString()
             }
-            list_unrd[i].innerHTML = data.unread_msgs_count.toString()
         }
     }
 }

templates/blocks/b_footer.html

@@ -78,15 +78,15 @@
           <div class="sf_1_column">Copyright © 2023. {% trans "Все права защищены." %}</div>
 
           <div class="sf_2_column">
-              <a href="/ru/info_page/publichnaya-oferta/">{% trans "Публичная оферта" %}</a>
+              <a href="/{{ request.LANGUAGE_CODE }}/info_page/publichnaya-oferta/">{% trans "Публичная оферта" %}</a>
           </div>
 
           <div class="sf_3_column">
-              <a href="/ru/info_page/politika-konfidencialnosti/">{% trans "Политика конфиденциальности" %}</a>
+              <a href="/{{ request.LANGUAGE_CODE }}/info_page/politika-konfidencialnosti/">{% trans "Политика конфиденциальности" %}</a>
           </div>
 
           <div class="sf_4_column">
-              <a href="/ru/info_page/pravila-polzovaniya-servisom/">{% trans "Правила пользования сервисом" %}</a>
+              <a href="/{{ request.LANGUAGE_CODE }}/info_page/pravila-polzovaniya-servisom/">{% trans "Правила пользования сервисом" %}</a>
           </div>
 
       </div>

templates/blocks/b_header.html

@@ -7,12 +7,12 @@
         <div class="header-first">
               <div class="header_logo">
                   <a href="{% url 'main' %}">
-                      <img class="svg" src="/static/img/svg/Logo.svg">
+                      <img class="svg" src="/static/img/png/finlogo.png" style="height: 90px;">
                   </a>
               </div>
               <div class="header_logo_mobile">
 {#                  <a href="/"><img class="svg" src="/static/img/svg/LogoMobile.svg"></a>#}
-                  <a href="{% url 'main' %}"><img class="svg" src="/static/img/svg/LogoMobile.svg"></a>
+                  <a href="{% url 'main' %}"><img class="svg" src="/static/img/png/finlogo.png" style="height: 30px;"></a>
               </div>
 
               <div   class="dropdown">

templates/blocks/profile/b_profile.html

@@ -67,7 +67,7 @@
         </div>
         <button class="confirm_profile_btn" onclick="change_profile_confirm(this)">
             <p id="save_changes_txt">
-                {% translate "Сохарнить" %}
+                {% translate "Сохранить" %}
             </p>
             <p id="changes_saved_txt">
                 {% translate "Изменения сохранены" %}

templates/blocks/static_pages_blocks/b_about_service.html

@@ -61,7 +61,7 @@
 
         <div class="form_wrapper">
                 {% if page.url == 'contacts' or page.url == 'about_service' %}
-            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи</span>!{% endblocktrans %}</div>
+            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи!</span>{% endblocktrans %}</div>
             <span id="sub_title_static">{% translate "У вас есть вопрос? Отправьте нам сообщение" %}</span>
         {% endif %}
 

templates/blocks/static_pages_blocks/b_customer_service.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
         {% if page.url == 'contacts' or page.url == 'about_service' %}
-            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи</span>!{% endblocktrans %}</div>
+            <div id=title_static>{% blocktrans %}Мы всегда на <span class="color_title">связи!</span>{% endblocktrans %}</div>
             <span id="sub_title_static">{% translate "У вас есть вопрос? Отправьте нам сообщение" %}</span>
         {% endif %}
 

templates/pages/p_main.html

@@ -58,7 +58,7 @@
         <h2 id="title_static">{% translate "О сервисе Trip With Bonus" %}</h2>
             <span id="sub_title_static">
                 <p>
-                    {% translate "TWB — это сервис, созданный для того, чтобы отправитель и перевозчик нашли друг-друга!" %}
+                    {% translate "TripWithBonus — это сервис, созданный для того, чтобы отправитель и перевозчик нашли друг-друга!" %}
                     {% translate "Наш сервис предлагает вам прямые контакты, а не является посредником!" %}
                 </p>
             </span>