Update README

.gitignore

@@ -159,4 +159,6 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
-users/templates/templates/
+media/
+
+demo_data.json

README.md

@@ -1 +1 @@
-# First Django web application that is being developed by me
+# First Django web application <br> that is being developed by me

password_website/settings.py

@@ -77,8 +77,12 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': os.environ.get('DATABASE_NAME'),
+        'USER': os.environ.get('DATABASE_USER'),
+        'PASSWORD': os.environ.get('DATABASE_PASSWORD'),
+        'HOST': os.environ.get('DATABASE_HOST'),
+        'PORT': os.environ.get('DATABASE_PORT'),
     }
 }
 
@@ -120,3 +124,6 @@
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 
 STATIC_URL = '/static/'
+
+MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')

password_website/urls.py

@@ -13,10 +13,11 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path
 
-# from users import views as user_views
 from users.views import users_views
 from users.views import usage_views
 from users.views import countries_views
@@ -37,4 +38,4 @@
     path('countries/<int:cid>/delete', countries_views.countries_delete, name='countries_delete'),
 
     path('admin/', admin.site.urls),
-]
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

requirements.txt

@@ -0,0 +1,9 @@
+Django==2.2.28
+MarkupSafe==2.1.2
+Pillow==9.4.0
+pip==23.0
+pytz==2022.7.1
+setuptools==65.5.1
+sqlparse==0.4.3
+wheel==0.38.4
+psycopg2-binary>=2.8,<2.9

users/admin.py

@@ -1,3 +1,6 @@
 from django.contrib import admin
+from .models.users import User
+from .models.countries import Country
 
-# Register your models here.
+admin.site.register(User)
+admin.site.register(Country)

users/migrations/0001_initial.py

@@ -0,0 +1,27 @@
+# Generated by Django 2.2.28 on 2023-02-03 19:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=256, verbose_name='First name')),
+                ('last_name', models.CharField(max_length=256, verbose_name='Last name')),
+                ('patronymic', models.CharField(blank=True, default='', max_length=256, verbose_name='Patronymic')),
+                ('birthday', models.DateField(null=True, verbose_name='Date of birth')),
+                ('photo', models.ImageField(blank=True, null=True, upload_to='', verbose_name='Photo')),
+                ('telegram_id', models.CharField(max_length=20, verbose_name='Telegram ID')),
+                ('notes', models.TextField(blank=True, verbose_name='Additional notes')),
+            ],
+        ),
+    ]

users/migrations/0002_auto_20230207_1632.py

@@ -0,0 +1,32 @@
+# Generated by Django 2.2.28 on 2023-02-07 16:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='user',
+            options={'verbose_name': 'User', 'verbose_name_plural': 'Users'},
+        ),
+        migrations.CreateModel(
+            name='Country',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('country_name', models.CharField(max_length=256, verbose_name='Country name')),
+                ('users_country_number', models.IntegerField(default=1, verbose_name='Country users')),
+                ('notes', models.TextField(blank=True, verbose_name='Additional notes')),
+                ('most_active', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='users.User', verbose_name='Capital')),
+            ],
+            options={
+                'verbose_name': 'Country',
+                'verbose_name_plural': 'Countries',
+            },
+        ),
+    ]

users/migrations/0003_user_user_country.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.28 on 2023-02-07 16:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_auto_20230207_1632'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='user_country',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='users.Country', verbose_name='Country'),
+        ),
+    ]

users/migrations/0004_remove_country_users_country_number.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.2.28 on 2023-02-07 17:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0003_user_user_country'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='country',
+            name='users_country_number',
+        ),
+    ]

users/migrations/0005_auto_20230207_1703.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.28 on 2023-02-07 17:03
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0004_remove_country_users_country_number'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='country',
+            name='most_active',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='users.User', verbose_name='Most active user'),
+        ),
+    ]

users/models/countries.py

@@ -0,0 +1,41 @@
+from django.db import models
+
+class Country(models.Model):
+    country_name = models.CharField(
+        max_length=256,
+        verbose_name='Country name',
+    )
+
+    most_active = models.OneToOneField(
+        'User',
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+        verbose_name='Most active user',
+    )
+
+    # users_country_number = models.IntegerField(
+    #     blank=False,
+    #     default = 1,
+    #     verbose_name = 'Country users'
+    # )
+
+
+    notes = models.TextField(
+        blank=True,
+        verbose_name='Additional notes'
+    )
+
+    class Meta:
+        verbose_name = 'Country'
+        verbose_name_plural = 'Countries'
+
+    def __str__(self):
+        if self.most_active:
+            return  '%s (%s %s)' % (
+                self.country_name,
+                self.most_active.first_name,
+                self.most_active.last_name,
+            )
+        else:
+            return '%s' % (self.country_name)

users/models/users.py

@@ -0,0 +1,61 @@
+from django.db import models
+
+class User(models.Model):
+    first_name = models.CharField(
+        max_length=256,
+        blank=False,
+        verbose_name='First name'
+    )
+
+    last_name = models.CharField(
+        max_length=256,
+        blank=False,
+        verbose_name='Last name'
+    )
+
+    patronymic = models.CharField(
+        max_length=256,
+        blank=True,
+        verbose_name='Patronymic',
+        default=''
+    )
+
+    birthday = models.DateField(
+        blank=False,
+        verbose_name='Date of birth',
+        null=True
+    )
+
+    photo = models.ImageField(
+        blank=True,
+        verbose_name='Photo',
+        null=True
+    )
+
+    telegram_id = models.CharField(
+        max_length=20,
+        blank=False,
+        verbose_name='Telegram ID'
+    )
+
+    user_country = models.ForeignKey(
+        'Country',
+        verbose_name='Country',
+        blank=False,
+        null=True,
+        on_delete=models.PROTECT
+    )
+
+    notes = models.TextField(
+        blank=True,
+        verbose_name='Additional notes'
+    )
+
+    class Meta:
+        verbose_name = 'User'
+        verbose_name_plural = 'Users'
+
+    def __str__(self):
+        full_name = '%s %s' % (self.first_name, self.last_name)
+
+        return full_name.strip()

users/templates/users/pagination.html

@@ -1,31 +1,27 @@
 {% load static %}
 
-<nav aria-label="Page navigation">
-    <ul class="pagination">
-        <li class="page-item">
-            <a href="#" class="page-link" aria-label="Previous">
-                <span aria-hidden="true">&laquo;</span>
-            </a>
-        </li>
-        <li class="page-item">
-            <a href="#" class="page-link">1</a>
-        </li>
-        <li class="page-item">
-            <a href="#" class="page-link">2</a>
-        </li>
-        <li class="page-item">
-            <a href="#" class="page-link">3</a>
-        </li>
-        <li class="page-item">
-            <a href="#" class="page-link">4</a>
-        </li>
-        <li class="page-item">
-            <a href="#" class="page-link">5</a>
-        </li>
-        <li class="page-item">
-            <a href="#" class="page-link" aria-label="Next">
-                <span aria-hidden="true">&raquo;</span>
-            </a>
-        </li>
-    </ul>
-</nav>
+{% if users.has_other_pages %}
+    {% with users_order=request.GET.order_by|default:'last_name' reverse=request.GET.reverse %}
+        <nav aria-label="Page navigation">
+            <ul class="pagination">
+                <li class="page-item">
+                    <a href="{% url 'home' %}?page=1&amp;order_by={{ users_order }}&amp;reverse={{ reverse }}" class="page-link" aria-label="Previous">
+                        <span aria-hidden="true">&laquo;</span>
+                    </a>
+                </li>
+
+                {% for page in users.paginator.page_range %}
+                    <li class="page-item {% if users.number == page %} active {% endif %}">
+                        <a href="{% url 'home' %}?page={{ page }}&amp;order_by={{ users_order }}&amp;reverse={{ reverse }}" class="page-link">{{ page }}</a>
+                    </li>
+                {% endfor %}
+
+                <li class="page-item">
+                    <a href="{% url 'home' %}?page={{ users.paginator.num_pages }}&amp;order_by={{ users_order }}&amp;reverse={{ reverse }}" class="page-link" aria-label="Next">
+                        <span aria-hidden="true">&raquo;</span>
+                    </a>
+                </li>
+            </ul>
+        </nav>
+    {% endwith %}
+{% endif %}