Init

Financer/settings.py

@@ -18,14 +18,13 @@
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/
-AUTH_USER_MODEL = 'FinancerApp.User'
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'django-insecure-qk5&w$dyj+b5k(&thg9#9(7mtl=v(u97p*0&hzsq4c)%drd+$6'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['6424-94-141-124-133.ngrok-free.app','localhost','127.0.0.1']
 
 
 # Application definition
@@ -105,7 +104,7 @@
 # Internationalization
 # https://docs.djangoproject.com/en/5.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'ru'
 
 TIME_ZONE = 'UTC'
 

Financer/urls.py

@@ -16,7 +16,17 @@
 """
 from django.contrib import admin
 from django.urls import path
+from FinancerApp.views import *
+from django.contrib.auth import views as auth_views
+from django.conf.urls.static import static
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('login/', auth_views.LoginView.as_view(template_name='FinancerApp/login.html'), name='login'),
+    path('signin/', register_view, name='register'),
+    path('logout/', logout_view, name='logout'),
+    path('income/add',create_income,name='create_income'),
+    path('expose/add',create_expense, name='create_expense'),
+    path('', profile, name='profile'),
+    # path('', main_view, name='main_view')
 ]

FinancerApp/admin.py

@@ -1,4 +1,7 @@
 from django.contrib import admin
 from FinancerApp.models import *
+
+admin.site.register(Income)
+admin.site.register(Expense)
+admin.site.register(Category)
 # Register your models here.
-admin.site.register(User)

FinancerApp/forms.py

@@ -1,8 +1,7 @@
+from django import forms
 from django.contrib.auth.forms import UserCreationForm
-from django.forms import forms
-
-from FinancerApp.models import User
-
+from django.contrib.auth.models import User
+from FinancerApp.models import *
 
 class SignUpForm(UserCreationForm):
     email = forms.EmailField(max_length=254)
@@ -11,3 +10,12 @@ class Meta:
         model = User
         fields = ('username', 'email', 'password1', 'password2')
 
+class IncomeForm(forms.ModelForm):
+    class Meta:
+        model = Income
+        fields = ['amount', 'category']
+
+class ExpenseForm(forms.ModelForm):
+    class Meta:
+        model = Expense
+        fields = ['amount', 'category']

FinancerApp/migrations/0004_category_expense_income_delete_user.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.0.2 on 2024-02-22 15:56
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('FinancerApp', '0003_alter_user_balance'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Expense',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('date', models.DateField()),
+                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='FinancerApp.category')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Income',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('date', models.DateField()),
+                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='FinancerApp.category')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.DeleteModel(
+            name='User',
+        ),
+    ]

FinancerApp/models.py

@@ -1,9 +1,26 @@
-from django.contrib.auth.models import AbstractUser
-from django.db import models
 
+from django.db import models
+from django.contrib.auth.models import User
 
-class User(AbstractUser):
-    balance = models.IntegerField(default=0)
 
+class Category(models.Model):
+    name = models.CharField(max_length=100)
     def __str__(self):
-        return self.username
+        return self.name
+
+
+class Income(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    amount = models.DecimalField(max_digits=10, decimal_places=2)
+    date = models.DateField(auto_now=True)
+    category = models.ForeignKey(Category, on_delete=models.CASCADE)
+
+
+
+class Expense(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    amount = models.DecimalField(max_digits=10, decimal_places=2)
+    date = models.DateField(auto_now=True)
+    category = models.ForeignKey(Category, on_delete=models.CASCADE)
+
+