Renamed templated/registration to templated/account

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
 

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)

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):

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',

FOSSDB/apps/fossdb/migrations/0002_project_proggramming_language.py

@@ -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'),
-        ),
-    ]

FOSSDB/apps/fossdb/migrations/0003_rename_proggramming_language_project_programming_language.py

@@ -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',
-        ),
-    ]

FOSSDB/apps/fossdb/migrations/0004_remove_project_programming_language.py

@@ -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',
-        ),
-    ]

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="")

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
 

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

templates/account/signup.html

@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% block title %}Sign Up{% endblock %}
+{% block title %}{{ title }}{% endblock %}
 {% block content %}
     <form method="post">
         {% csrf_token %}

templates/fossdb/index.html

@@ -11,13 +11,12 @@
     </button>
     <br />
     {% for project in projects %}
-        <b>@{{ project.owner }}</b>
-        <h4>{{ project.name }}</h4>
-        <br />
-        <a href="{{ project.get_absolute_url }}">
-            <button>Read more</button>
-        </a>
-        <p>{{ project.date_created }}</p>
+        <div>
+            <h2>
+                <a href="{{ project.get_absolute_url }}">{{ project.owner }}/{{ project.name }}</a>
+            </h2>
+            <p>{{ project.description }}</p>
+        </div>
     {% empty %}
         <p>No projects yet (</p>
     {% endfor %}