diff --git a/FOSSDB/apps/account/__init__.py b/FOSSDB/apps/account/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/FOSSDB/apps/account/admin.py b/FOSSDB/apps/account/admin.py deleted file mode 100644 index e69de29..0000000 diff --git a/FOSSDB/apps/account/apps.py b/FOSSDB/apps/account/apps.py deleted file mode 100644 index 2c684a9..0000000 --- a/FOSSDB/apps/account/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class AccountConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "account" diff --git a/FOSSDB/apps/account/forms.py b/FOSSDB/apps/account/forms.py deleted file mode 100644 index 1b47e64..0000000 --- a/FOSSDB/apps/account/forms.py +++ /dev/null @@ -1,11 +0,0 @@ -from django import forms -from django.contrib.auth.forms import UserCreationForm -from django.contrib.auth.models import User - - -class RegisterForm(UserCreationForm): - email = forms.EmailField(required=True) - - class Meta: - model = User - fields = ["username", "email", "password1", "password2"] diff --git a/FOSSDB/apps/account/tests.py b/FOSSDB/apps/account/tests.py deleted file mode 100644 index e69de29..0000000 diff --git a/FOSSDB/apps/account/urls.py b/FOSSDB/apps/account/urls.py deleted file mode 100644 index 8fa14e8..0000000 --- a/FOSSDB/apps/account/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.urls import path - -from . import views - -urlpatterns = [ - path("", views.sign_up, name="singup"), - path("signup", views.sign_up, name="signup"), - path("login", views.login_, name="login"), -] diff --git a/FOSSDB/apps/account/views.py b/FOSSDB/apps/account/views.py deleted file mode 100644 index 4bf3238..0000000 --- a/FOSSDB/apps/account/views.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.contrib.auth import login -from django.shortcuts import redirect, render - -from .forms import RegisterForm - - -def sign_up(request): - if request.method == "POST": - form = RegisterForm(request.POST) - if form.is_valid(): - user = form.save() - login(request, user) - return redirect("") - else: - form = RegisterForm() - return render(request, "registration/sign_up.html", {"title": "Sign Up", "form": form}) - - -def login_(request): - return render(request, "registration/login.html", {"title": "Login"}) diff --git a/FOSSDB/apps/fossdb/models.py b/FOSSDB/apps/fossdb/models.py index 4a2e73a..d615307 100644 --- a/FOSSDB/apps/fossdb/models.py +++ b/FOSSDB/apps/fossdb/models.py @@ -1,18 +1,16 @@ import uuid -from django.conf import settings +from django.contrib.auth.models import User from django.db import models from .license.models import License from .operating_system.models import OperatingSystemVersion 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") - owner = models.ForeignKey(User, on_delete=models.CASCADE, db_index=True) + owner = models.ForeignKey(User, on_delete=models.CASCADE) name = models.CharField(max_length=255) description = models.TextField(blank=True, default="") license = models.ManyToManyField(License, blank=True) @@ -29,8 +27,3 @@ class Project(models.Model): def __str__(self): return f"{self.owner} | {self.name}" - - def save(self, *args, **kwargs): - if not self.uuid: - self.uuid = uuid.uuid3(uuid.uuid4(), f"{self.owner.username}-{self.name}") - super().save(*args, **kwargs) diff --git a/FOSSDB/settings.py b/FOSSDB/settings.py index 8d9989d..c846f5e 100644 --- a/FOSSDB/settings.py +++ b/FOSSDB/settings.py @@ -35,7 +35,6 @@ DEBUG = config["DEBUG"] # Application definition INSTALLED_APPS = [ - "account", "fossdb", "django.contrib.admin", "django.contrib.auth", @@ -134,6 +133,7 @@ MEDIA_ROOT = BASE_PATH.joinpath("media") # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" +# LOGIN_URL = "login/" LOGIN_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/" diff --git a/FOSSDB/urls.py b/FOSSDB/urls.py index 6618184..1bb535d 100644 --- a/FOSSDB/urls.py +++ b/FOSSDB/urls.py @@ -20,7 +20,6 @@ from django.urls import include, path urlpatterns = [ path("", include("fossdb.urls")), - path("", include("account.urls")), path("admin/", admin.site.urls), path("", include("django.contrib.auth.urls")), ] diff --git a/templates/registration/login.html b/templates/registration/login.html deleted file mode 100644 index e1ca078..0000000 --- a/templates/registration/login.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "layout.html" %} -{% load static %} -{% block title %}{{ title }}{% endblock %} -{% block meta %}{% endblock %} -{% block content %} -
-{% endblock %} diff --git a/templates/registration/sign_up.html b/templates/registration/sign_up.html deleted file mode 100644 index 40b7bad..0000000 --- a/templates/registration/sign_up.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "layout.html" %} -{% block title %}Sign Up{% endblock %} -{% block content %} - -{% endblock %}