diff --git a/cookies.txt b/cookies.txt index 4133569..34ed13f 100644 --- a/cookies.txt +++ b/cookies.txt @@ -2,4 +2,4 @@ # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. -127.0.0.1 FALSE / TRUE 1796991812 csrftoken cXuPVQPkN93dgAsbLP1e8OsLOYhW3Mkl +127.0.0.1 FALSE / TRUE 1796993740 csrftoken O0Vgh9DkmoXw8WCtMNdqOcunv8UiueAy diff --git a/core/__pycache__/forms.cpython-311.pyc b/core/__pycache__/forms.cpython-311.pyc index d1f8e91..0425875 100644 Binary files a/core/__pycache__/forms.cpython-311.pyc and b/core/__pycache__/forms.cpython-311.pyc differ diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 3a67afd..fd44fb3 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index cdb0bc9..4390aa4 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/forms.py b/core/forms.py index f4ce4f5..3beef9e 100644 --- a/core/forms.py +++ b/core/forms.py @@ -1,5 +1,5 @@ from django import forms -from django.contrib.auth.forms import UserCreationForm +from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from .models import User, Profile class CompanySignUpForm(UserCreationForm): @@ -27,3 +27,6 @@ class InfluencerSignUpForm(UserCreationForm): user.save() Profile.objects.create(user=user) return user + +class LoginForm(AuthenticationForm): + pass diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 65701c9..075908a 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,6 +1,10 @@ -# Generated by Django 5.2.7 on 2025-12-12 12:06 +# Generated by Django 5.2.7 on 2025-12-12 12:58 +import django.contrib.auth.models +import django.contrib.auth.validators import django.db.models.deletion +import django.utils.timezone +from django.conf import settings from django.db import migrations, models @@ -9,26 +13,54 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), ] operations = [ migrations.CreateModel( - name='Influencer', + name='User', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('bio', models.TextField()), - ('profile_picture', models.ImageField(blank=True, null=True, upload_to='influencer_profile_pictures/')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('role', models.CharField(choices=[('COMPANY', 'Company'), ('INFLUENCER', 'Influencer')], max_length=50)), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), ], ), migrations.CreateModel( name='Profile', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('bio', models.TextField(blank=True)), + ('profile_picture', models.ImageField(blank=True, null=True, upload_to='profile_pictures/')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='SocialProfile', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('platform', models.CharField(max_length=255)), ('handle', models.CharField(max_length=255)), ('url', models.URLField()), - ('influencer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='profiles', to='core.influencer')), + ('profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='social_profiles', to='core.profile')), ], ), ] diff --git a/core/migrations/__pycache__/0001_initial.cpython-311.pyc b/core/migrations/__pycache__/0001_initial.cpython-311.pyc index 590cb84..1ad14ab 100644 Binary files a/core/migrations/__pycache__/0001_initial.cpython-311.pyc and b/core/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/core/templates/core/dashboard.html b/core/templates/core/dashboard.html new file mode 100644 index 0000000..16ec8bf --- /dev/null +++ b/core/templates/core/dashboard.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% load static %} + +{% block title %}Dashboard - MarketMatchr{% endblock %} + +{% block content %} +
+
+
+

Welcome, {{ user.username }}!

+

This is your dashboard. You are logged in as a {{ user.role }}.

+
+
+
+{% endblock %} diff --git a/core/templates/core/login.html b/core/templates/core/login.html index 61faa81..d96d7f1 100644 --- a/core/templates/core/login.html +++ b/core/templates/core/login.html @@ -4,10 +4,18 @@ {% block content %}
-
-
-

Login

-

This is a placeholder for the login page.

+
+
+
+
+

Login

+
+ {% csrf_token %} + {{ form.as_p }} + +
+
+
diff --git a/core/urls.py b/core/urls.py index 2d1f36c..f891ab5 100644 --- a/core/urls.py +++ b/core/urls.py @@ -1,10 +1,11 @@ from django.urls import path -from .views import index, pricing, login, signup +from .views import index, pricing, login, signup, dashboard urlpatterns = [ path("", index, name="index"), path("pricing/", pricing, name="pricing"), path("login/", login, name="login"), path("signup/", signup, name="signup"), + path("dashboard/", dashboard, name="dashboard"), ] diff --git a/core/views.py b/core/views.py index 02b3f65..e450b28 100644 --- a/core/views.py +++ b/core/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, redirect -from django.contrib.auth import login -from .forms import CompanySignUpForm, InfluencerSignUpForm +from django.contrib.auth import login as auth_login, authenticate +from .forms import CompanySignUpForm, InfluencerSignUpForm, LoginForm def index(request): return render(request, 'core/index.html') @@ -9,7 +9,18 @@ def pricing(request): return render(request, 'core/pricing.html') def login(request): - return render(request, 'core/login.html') + if request.method == 'POST': + form = LoginForm(request, data=request.POST) + if form.is_valid(): + username = form.cleaned_data.get('username') + password = form.cleaned_data.get('password') + user = authenticate(username=username, password=password) + if user is not None: + auth_login(request, user) + return redirect('dashboard') + else: + form = LoginForm() + return render(request, 'core/login.html', {'form': form}) def signup(request): if request.method == 'POST': @@ -19,8 +30,11 @@ def signup(request): form = InfluencerSignUpForm(request.POST) if form.is_valid(): user = form.save() - login(request, user) - return redirect('index') + auth_login(request, user) + return redirect('dashboard') else: form = InfluencerSignUpForm() - return render(request, 'core/signup.html', {'form': form}) \ No newline at end of file + return render(request, 'core/signup.html', {'form': form}) + +def dashboard(request): + return render(request, 'core/dashboard.html') \ No newline at end of file