From e087399f25b029f814c3582d556f9ffa138a99f0 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Tue, 27 Jun 2023 12:35:51 +0000 Subject: [PATCH] Renamed `templated/registration` to `templated/account` --- FOSSDB/apps/account/forms.py | 1 + FOSSDB/apps/account/migrations/__init__.py | 0 FOSSDB/apps/account/views.py | 4 ++-- FOSSDB/apps/fossdb/hosting_platform/forms.py | 2 +- FOSSDB/apps/fossdb/migrations/0001_initial.py | 9 +++++++-- .../0002_project_proggramming_language.py | 18 ------------------ ...ng_language_project_programming_language.py | 18 ------------------ ...0004_remove_project_programming_language.py | 17 ----------------- FOSSDB/apps/fossdb/models.py | 7 +++---- FOSSDB/apps/fossdb/views.py | 1 + FOSSDB/settings.py | 2 +- templates/{registration => account}/login.html | 0 .../{registration => account}/signup.html | 2 +- templates/fossdb/index.html | 13 ++++++------- 14 files changed, 23 insertions(+), 71 deletions(-) create mode 100644 FOSSDB/apps/account/migrations/__init__.py delete mode 100644 FOSSDB/apps/fossdb/migrations/0002_project_proggramming_language.py delete mode 100644 FOSSDB/apps/fossdb/migrations/0003_rename_proggramming_language_project_programming_language.py delete mode 100644 FOSSDB/apps/fossdb/migrations/0004_remove_project_programming_language.py rename templates/{registration => account}/login.html (100%) rename templates/{registration => account}/signup.html (87%) diff --git a/FOSSDB/apps/account/forms.py b/FOSSDB/apps/account/forms.py index b3f01a2..80d92b6 100644 --- a/FOSSDB/apps/account/forms.py +++ b/FOSSDB/apps/account/forms.py @@ -1,4 +1,5 @@ from django import forms + from django.contrib.auth.forms import UserCreationForm from django.contrib.auth.models import User diff --git a/FOSSDB/apps/account/migrations/__init__.py b/FOSSDB/apps/account/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/FOSSDB/apps/account/views.py b/FOSSDB/apps/account/views.py index 88ba798..179216d 100644 --- a/FOSSDB/apps/account/views.py +++ b/FOSSDB/apps/account/views.py @@ -22,7 +22,7 @@ def signup_view(request): "title": "Sign Up", "form": form, } - return render(request, "registration/signup.html", context) + return render(request, "account/signup.html", context) def login_view(request): @@ -37,4 +37,4 @@ def login_view(request): "title": "Login", "form": form, } - return render(request, "registration/login.html", context) + return render(request, "account/login.html", context) diff --git a/FOSSDB/apps/fossdb/hosting_platform/forms.py b/FOSSDB/apps/fossdb/hosting_platform/forms.py index 2f69d24..f4ab0f0 100644 --- a/FOSSDB/apps/fossdb/hosting_platform/forms.py +++ b/FOSSDB/apps/fossdb/hosting_platform/forms.py @@ -1,6 +1,6 @@ from django import forms -from .models import HostingPlatform, ProjectHostingPlatform +from .models import ProjectHostingPlatform, HostingPlatform class HostingPlatformForm(forms.ModelForm): diff --git a/FOSSDB/apps/fossdb/migrations/0001_initial.py b/FOSSDB/apps/fossdb/migrations/0001_initial.py index f7e9410..e0946dc 100644 --- a/FOSSDB/apps/fossdb/migrations/0001_initial.py +++ b/FOSSDB/apps/fossdb/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.2 on 2023-06-26 17:16 +# Generated by Django 4.2.2 on 2023-06-27 10:33 from django.conf import settings from django.db import migrations, models @@ -60,7 +60,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Project', fields=[ - ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=255)), ('description', models.TextField(blank=True, default='')), ('date_created', models.DateTimeField(auto_now_add=True)), @@ -96,6 +96,11 @@ class Migration(migrations.Migration): ('project', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='fossdb.project')), ], ), + migrations.AddField( + model_name='project', + name='programming_language', + field=models.ManyToManyField(blank=True, through='fossdb.ProjectProgrammingLanguage', to='fossdb.programminglanguage'), + ), migrations.AddField( model_name='project', name='tag', diff --git a/FOSSDB/apps/fossdb/migrations/0002_project_proggramming_language.py b/FOSSDB/apps/fossdb/migrations/0002_project_proggramming_language.py deleted file mode 100644 index bbfd090..0000000 --- a/FOSSDB/apps/fossdb/migrations/0002_project_proggramming_language.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.2 on 2023-06-26 17:38 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('fossdb', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='project', - name='proggramming_language', - field=models.ManyToManyField(blank=True, through='fossdb.ProjectProgrammingLanguage', to='fossdb.programminglanguage'), - ), - ] diff --git a/FOSSDB/apps/fossdb/migrations/0003_rename_proggramming_language_project_programming_language.py b/FOSSDB/apps/fossdb/migrations/0003_rename_proggramming_language_project_programming_language.py deleted file mode 100644 index ba7467c..0000000 --- a/FOSSDB/apps/fossdb/migrations/0003_rename_proggramming_language_project_programming_language.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.2 on 2023-06-26 17:43 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('fossdb', '0002_project_proggramming_language'), - ] - - operations = [ - migrations.RenameField( - model_name='project', - old_name='proggramming_language', - new_name='programming_language', - ), - ] diff --git a/FOSSDB/apps/fossdb/migrations/0004_remove_project_programming_language.py b/FOSSDB/apps/fossdb/migrations/0004_remove_project_programming_language.py deleted file mode 100644 index aa9b3c5..0000000 --- a/FOSSDB/apps/fossdb/migrations/0004_remove_project_programming_language.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.2 on 2023-06-26 17:45 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('fossdb', '0003_rename_proggramming_language_project_programming_language'), - ] - - operations = [ - migrations.RemoveField( - model_name='project', - name='programming_language', - ), - ] diff --git a/FOSSDB/apps/fossdb/models.py b/FOSSDB/apps/fossdb/models.py index a5d6aa8..7233a15 100644 --- a/FOSSDB/apps/fossdb/models.py +++ b/FOSSDB/apps/fossdb/models.py @@ -1,6 +1,7 @@ import uuid -from django.conf import settings +from django.contrib.auth.models import User + from django.db import models from .license.models import License @@ -8,11 +9,9 @@ from .operating_system.models import OperatingSystemVersion from .programming_language.models import ProgrammingLanguage, ProjectProgrammingLanguage from .tag.models import Tag -User = settings.AUTH_USER_MODEL - class Project(models.Model): - uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, verbose_name="ID") + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, verbose_name="ID") owner = models.ForeignKey(User, on_delete=models.CASCADE) name = models.CharField(max_length=255) description = models.TextField(blank=True, default="") diff --git a/FOSSDB/apps/fossdb/views.py b/FOSSDB/apps/fossdb/views.py index ad876b3..abd7b23 100644 --- a/FOSSDB/apps/fossdb/views.py +++ b/FOSSDB/apps/fossdb/views.py @@ -5,6 +5,7 @@ from django.views.generic import CreateView, DeleteView, DetailView, UpdateView from .forms import ProjectForm from .hosting_platform.forms import HostingPlatformForm + from .models import Project from .programming_language.forms import ProgrammingLanguageForm diff --git a/FOSSDB/settings.py b/FOSSDB/settings.py index c840486..dbdf365 100644 --- a/FOSSDB/settings.py +++ b/FOSSDB/settings.py @@ -136,7 +136,7 @@ MEDIA_ROOT = BASE_PATH.joinpath("media") DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" LOGIN_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/" -LOGIN_URL = "login/" +LOGIN_URL = "/login/" # HTTPS settings # SESSION_COOKIE_SECURE = True diff --git a/templates/registration/login.html b/templates/account/login.html similarity index 100% rename from templates/registration/login.html rename to templates/account/login.html diff --git a/templates/registration/signup.html b/templates/account/signup.html similarity index 87% rename from templates/registration/signup.html rename to templates/account/signup.html index abfb049..c4aaf09 100644 --- a/templates/registration/signup.html +++ b/templates/account/signup.html @@ -1,5 +1,5 @@ {% extends "layout.html" %} -{% block title %}Sign Up{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block content %}
{% csrf_token %} diff --git a/templates/fossdb/index.html b/templates/fossdb/index.html index 96caf62..c4fbc3f 100644 --- a/templates/fossdb/index.html +++ b/templates/fossdb/index.html @@ -11,13 +11,12 @@
{% for project in projects %} - @{{ project.owner }} -

{{ project.name }}

-
- - - -

{{ project.date_created }}

+
+

+ {{ project.owner }}/{{ project.name }} +

+

{{ project.description }}

+
{% empty %}

No projects yet (

{% endfor %}