Revert changes

FOSSDB_web/apps/fossdb/admin.py

@@ -0,0 +1,32 @@
+from django.contrib import admin
+
+from .models import (HostingPlatform, License, ProgrammingLanguage, Project,
+                     ProjectHostingPlatform, ProjectProgrammingLanguage, Tag)
+
+
+class ProjectProgrammingLanguageInline(admin.TabularInline):
+    model = ProjectProgrammingLanguage
+    extra = 1
+
+
+class ProjectHostingPlatformInline(admin.TabularInline):
+    model = ProjectHostingPlatform
+    extra = 1
+
+
+class ProjectAdmin(admin.ModelAdmin):
+    inlines = [ProjectProgrammingLanguageInline, ProjectHostingPlatformInline]
+    list_display = ("author", "name", "_languages", "_hosting_platform")
+
+    def _languages(self, object):
+        return " | ".join([i.language.language for i in object.projectprogramminglanguage_set.all()])
+
+    def _hosting_platform(self, object):
+        return " | ".join([i.hosting_platform.hosting_platform for i in object.projecthostingplatform_set.all()])
+
+
+admin.site.register(HostingPlatform)
+admin.site.register(Project, ProjectAdmin)
+admin.site.register(License)
+admin.site.register(ProgrammingLanguage)
+admin.site.register(Tag)

FOSSDB_web/apps/fossdb/forms.py

@@ -1,11 +1,7 @@
 from django import forms
 
-from fossdb.hosting_platform.forms import HostingPlatformForm
+from .models import (HostingPlatform, License, ProgrammingLanguage, Project,
-from fossdb.hosting_platform.models import ProjectHostingPlatform
+                     ProjectHostingPlatform, ProjectProgrammingLanguage)
-from fossdb.programming_language.forms import ProgrammingLanguageForm
-from fossdb.programming_language.models import ProjectProgrammingLanguage
-
-from .models import Project
 
 
 class ProjectForm(forms.ModelForm):
@@ -27,13 +23,18 @@ class ProjectForm(forms.ModelForm):
         }
 
 
-ProjectHostingPlatformFormSet = forms.inlineformset_factory(
+class LicenseForm(forms.ModelForm):
-    Project,
+    class Meta:
-    ProjectHostingPlatform,
+        model = License
-    form=HostingPlatformForm,
+        fields = ["short_name", "full_name", "url", "description"]
-    extra=1,
+
-    can_delete=False
+
-)
+class ProgrammingLanguageForm(forms.ModelForm):
+    percentage = forms.IntegerField(min_value=0, max_value=100)
+
+    class Meta:
+        model = ProgrammingLanguage
+        fields = ["language", "percentage"]
 
 
 ProjectProgrammingLanguageFormSet = forms.inlineformset_factory(
@@ -43,3 +44,20 @@ ProjectProgrammingLanguageFormSet = forms.inlineformset_factory(
     extra=1,
     can_delete=True,
 )
+
+
+class HostingPlatformForm(forms.ModelForm):
+    url = forms.URLField()
+
+    class Meta:
+        model = HostingPlatform
+        fields = ["hosting_platform", "url"]
+
+
+ProjectHostingPlatformFormSet = forms.inlineformset_factory(
+    Project,
+    ProjectHostingPlatform,
+    form=HostingPlatformForm,
+    extra=1,
+    can_delete=False
+)

FOSSDB_web/apps/fossdb/hosting_platform/admin.py

@@ -1,11 +0,0 @@
-from django.contrib import admin
-
-from .models import HostingPlatform, ProjectHostingPlatform
-
-
-class ProjectHostingPlatformInline(admin.TabularInline):
-    model = ProjectHostingPlatform
-    extra = 1
-
-
-admin.site.register(HostingPlatform)

FOSSDB_web/apps/fossdb/hosting_platform/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class HostingPlatformConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "fossdb.hosting_platform"

FOSSDB_web/apps/fossdb/hosting_platform/forms.py

@@ -1,11 +0,0 @@
-from django import forms
-
-from .models import HostingPlatform
-
-
-class HostingPlatformForm(forms.ModelForm):
-    url = forms.URLField()
-
-    class Meta:
-        model = HostingPlatform
-        fields = ["hosting_platform", "url"]

FOSSDB_web/apps/fossdb/hosting_platform/models.py

@@ -1,17 +0,0 @@
-from django.db import models
-
-
-class HostingPlatform(models.Model):
-    hosting_platform = models.CharField(max_length=100)
-
-    def __str__(self):
-        return self.hosting_platform
-
-
-class ProjectHostingPlatform(models.Model):
-    project = models.ForeignKey("Project", on_delete=models.CASCADE)
-    hosting_platform = models.ForeignKey(HostingPlatform, on_delete=models.CASCADE)
-    url = models.URLField()
-
-    def __str__(self):
-        return f"{self.project} | {self.hosting_platform}"

FOSSDB_web/apps/fossdb/hosting_platform/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

FOSSDB_web/apps/fossdb/hosting_platform/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

FOSSDB_web/apps/fossdb/license/admin.py

@@ -1,5 +0,0 @@
-from django.contrib import admin
-
-from .models import License
-
-admin.site.register(License)

FOSSDB_web/apps/fossdb/license/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class LicenseConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "fossdb.license"

FOSSDB_web/apps/fossdb/license/forms.py

@@ -1,9 +0,0 @@
-from django import forms
-
-from .models import License
-
-
-class LicenseForm(forms.ModelForm):
-    class Meta:
-        model = License
-        fields = ["short_name", "full_name", "url", "description"]

FOSSDB_web/apps/fossdb/license/models.py

@@ -1,11 +0,0 @@
-from django.db import models
-
-
-class License(models.Model):
-    short_name = models.CharField(max_length=50)
-    full_name = models.CharField(max_length=100, blank=True, default="")
-    url = models.URLField(blank=True, default="")
-    description = models.TextField(blank=True, default="")
-
-    def __str__(self):
-        return self.short_name

FOSSDB_web/apps/fossdb/license/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

FOSSDB_web/apps/fossdb/migrations/0001_initial.py

@@ -0,0 +1,99 @@
+# Generated by Django 4.1.7 on 2023-04-08 12:47
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HostingPlatform',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('hosting_platform', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='License',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('short_name', models.CharField(max_length=50)),
+                ('full_name', models.CharField(blank=True, default='', max_length=100)),
+                ('url', models.URLField(blank=True, default='')),
+                ('description', models.TextField(blank=True, default='')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProgrammingLanguage',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('language', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Project',
+            fields=[
+                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True, default='')),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('description', models.TextField(blank=True, default='')),
+                ('icon', models.ImageField(blank=True, null=True, upload_to='types/icons/')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProjectProgrammingLanguage',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('percentage', models.PositiveIntegerField()),
+                ('language', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fossdb.programminglanguage')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fossdb.project')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProjectHostingPlatform',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('url', models.URLField()),
+                ('hosting_platform', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fossdb.hostingplatform')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fossdb.project')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='hosting_platform',
+            field=models.ManyToManyField(related_name='projects', through='fossdb.ProjectHostingPlatform', to='fossdb.hostingplatform'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='licenses',
+            field=models.ManyToManyField(to='fossdb.license'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='programming_languages',
+            field=models.ManyToManyField(related_name='projects', through='fossdb.ProjectProgrammingLanguage', to='fossdb.programminglanguage'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='project_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='fossdb.tag'),
+        ),
+    ]

FOSSDB_web/apps/fossdb/models.py

@@ -0,0 +1,74 @@
+import uuid
+
+from django.conf import settings
+from django.db import models
+
+User = settings.AUTH_USER_MODEL
+
+
+class License(models.Model):
+    short_name = models.CharField(max_length=50)
+    full_name = models.CharField(max_length=100, blank=True, default="")
+    url = models.URLField(blank=True, default="")
+    description = models.TextField(blank=True, default="")
+
+    def __str__(self):
+        return self.short_name
+
+
+class HostingPlatform(models.Model):
+    hosting_platform = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.hosting_platform
+
+
+class ProgrammingLanguage(models.Model):
+    language = models.CharField(max_length=100)
+
+    def __str__(self):
+        return self.language
+
+
+class Tag(models.Model):
+    name = models.CharField(max_length=100)
+    description = models.TextField(blank=True, default="")
+    icon = models.ImageField(upload_to="types/icons/", null=True, blank=True)
+
+
+class ProjectProgrammingLanguage(models.Model):
+    project = models.ForeignKey("Project", on_delete=models.CASCADE)
+    language = models.ForeignKey(ProgrammingLanguage, on_delete=models.CASCADE)
+    percentage = models.PositiveIntegerField()
+
+    def __str__(self):
+        return f"{self.project} | {self.language} | {self.percentage}%"
+
+
+class ProjectHostingPlatform(models.Model):
+    project = models.ForeignKey("Project", on_delete=models.CASCADE)
+    hosting_platform = models.ForeignKey(HostingPlatform, on_delete=models.CASCADE)
+    url = models.URLField()
+
+    def __str__(self):
+        return f"{self.project} | {self.hosting_platform}"
+
+
+class Project(models.Model):
+    uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+    author = models.ForeignKey(User, on_delete=models.CASCADE)
+    name = models.CharField(max_length=255)
+    description = models.TextField(blank=True, default="")
+    licenses = models.ManyToManyField(License)
+    programming_languages = models.ManyToManyField(ProgrammingLanguage, through="ProjectProgrammingLanguage", related_name="projects")
+    hosting_platform = models.ManyToManyField(HostingPlatform, through="ProjectHostingPlatform", related_name="projects")
+    project_type = models.ForeignKey(Tag, on_delete=models.CASCADE, blank=True, null=True)
+    date_created = models.DateTimeField(auto_now_add=True)
+
+    def save(self, *args, **kwargs):
+        if not self.uuid:
+            self.uuid = uuid.uuid5(uuid.NAMESPACE_URL, f"{self.author.username}-{self.name}")
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        return f"{self.author} | {self.name}"

FOSSDB_web/apps/fossdb/programming_language/admin.py

@@ -1,11 +0,0 @@
-from django.contrib import admin
-
-from .models import ProgrammingLanguage, ProjectProgrammingLanguage
-
-
-class ProjectProgrammingLanguageInline(admin.TabularInline):
-    model = ProjectProgrammingLanguage
-    extra = 1
-
-
-admin.site.register(ProgrammingLanguage)

FOSSDB_web/apps/fossdb/programming_language/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class ProgrammingLanguageConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "fossdb.programming_language"

FOSSDB_web/apps/fossdb/programming_language/forms.py

@@ -1,11 +0,0 @@
-from django import forms
-
-from .models import ProgrammingLanguage
-
-
-class ProgrammingLanguageForm(forms.ModelForm):
-    percentage = forms.IntegerField(min_value=0, max_value=100)
-
-    class Meta:
-        model = ProgrammingLanguage
-        fields = ["language", "percentage"]

FOSSDB_web/apps/fossdb/programming_language/models.py

@@ -1,17 +0,0 @@
-from django.db import models
-
-
-class ProgrammingLanguage(models.Model):
-    language = models.CharField(max_length=100)
-
-    def __str__(self):
-        return self.language
-
-
-class ProjectProgrammingLanguage(models.Model):
-    project = models.ForeignKey("Project", on_delete=models.CASCADE)
-    language = models.ForeignKey(ProgrammingLanguage, on_delete=models.CASCADE)
-    percentage = models.PositiveIntegerField()
-
-    def __str__(self):
-        return f"{self.project} | {self.language} | {self.percentage}%"

FOSSDB_web/apps/fossdb/programming_language/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

FOSSDB_web/apps/fossdb/programming_language/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

FOSSDB_web/apps/fossdb/project/admin.py

@@ -1,20 +0,0 @@
-from django.contrib import admin
-
-from fossdb.hosting_platform.admin import ProjectHostingPlatformInline
-from fossdb.programming_language.admin import ProjectProgrammingLanguageInline
-
-from .models import Project
-
-
-class ProjectAdmin(admin.ModelAdmin):
-    inlines = [ProjectProgrammingLanguageInline, ProjectHostingPlatformInline]
-    list_display = ("author", "name", "_languages", "_hosting_platform")
-
-    def _languages(self, object):
-        return " | ".join([i.language.language for i in object.projectprogramminglanguage_set.all()])
-
-    def _hosting_platform(self, object):
-        return " | ".join([i.hosting_platform.hosting_platform for i in object.projecthostingplatform_set.all()])
-
-
-admin.site.register(Project, ProjectAdmin)

FOSSDB_web/apps/fossdb/project/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class ProjectConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "fossdb.project"

FOSSDB_web/apps/fossdb/project/models.py

@@ -1,33 +0,0 @@
-import uuid
-
-from django.conf import settings
-from django.db import models
-
-from fossdb.hosting_platform.models import (HostingPlatform,
-                                            ProjectHostingPlatform)
-from fossdb.license.models import License
-from fossdb.programming_language.models import (ProgrammingLanguage,
-                                                ProjectProgrammingLanguage)
-from fossdb.tag.models import Tag
-
-User = settings.AUTH_USER_MODEL
-
-
-class Project(models.Model):
-    uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-    author = models.ForeignKey(User, on_delete=models.CASCADE)
-    name = models.CharField(max_length=255)
-    description = models.TextField(blank=True, default="")
-    licenses = models.ManyToManyField(License)
-    programming_languages = models.ManyToManyField(ProgrammingLanguage, through=ProjectProgrammingLanguage, related_name="projects")
-    hosting_platform = models.ManyToManyField(HostingPlatform, through=ProjectHostingPlatform, related_name="projects")
-    project_type = models.ForeignKey(Tag, on_delete=models.CASCADE, blank=True, null=True)
-    date_created = models.DateTimeField(auto_now_add=True)
-
-    def save(self, *args, **kwargs):
-        if not self.uuid:
-            self.uuid = uuid.uuid5(uuid.NAMESPACE_URL, f"{self.author.username}-{self.name}")
-        super().save(*args, **kwargs)
-
-    def __str__(self):
-        return f"{self.author} | {self.name}"

FOSSDB_web/apps/fossdb/project/views.py

@@ -1,45 +0,0 @@
-
-from django.contrib.auth.decorators import login_required, permission_required
-from django.shortcuts import redirect, render
-
-from .forms import (ProjectForm, ProjectHostingPlatformFormSet,
-                    ProjectProgrammingLanguageFormSet)
-from .models import Project
-
-# from fossdb.hosting_platform.forms import ProjectHostingPlatformFormSet
-# from fossdb.programming_language.forms import ProjectProgrammingLanguageFormSet
-
-
-@login_required(login_url="login/")
-@permission_required("fossdb.add_post", login_url="login/", raise_exception=True)
-def add_project(request):
-    if request.method == "POST":
-        project_form = ProjectForm(request.POST)
-        language_formset = ProjectProgrammingLanguageFormSet(request.POST, instance=Project())
-        host_formset = ProjectHostingPlatformFormSet(request.POST, instance=Project())
-
-        if project_form.is_valid() and language_formset.is_valid() and host_formset.is_valid():
-            project = project_form.save(commit=False)
-            project.author = request.user
-            project.save()
-
-            language_formset.instance = project
-            language_formset.save()
-
-            host_formset.instance = project
-            host_formset.save()
-
-            project_form.save_m2m()
-            return redirect("/")
-    else:
-        project_form = ProjectForm()
-        language_formset = ProjectProgrammingLanguageFormSet()
-        host_formset = ProjectHostingPlatformFormSet()
-
-    context = {
-        "title": "Add project",
-        "project_form": project_form,
-        "language_formset": language_formset,
-        "host_formset": host_formset,
-    }
-    return render(request, "fossdb/add_project.html", context)

FOSSDB_web/apps/fossdb/tag/admin.py

@@ -1,5 +0,0 @@
-from django.contrib import admin
-
-from .models import Tag
-
-admin.site.register(Tag)

FOSSDB_web/apps/fossdb/tag/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class TagConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "fossdb.tag"

FOSSDB_web/apps/fossdb/tag/models.py

@@ -1,7 +0,0 @@
-from django.db import models
-
-
-class Tag(models.Model):
-    name = models.CharField(max_length=100)
-    description = models.TextField(blank=True, default="")
-    icon = models.ImageField(upload_to="types/icons/", null=True, blank=True)

FOSSDB_web/apps/fossdb/tag/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

FOSSDB_web/apps/fossdb/tag/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

FOSSDB_web/apps/fossdb/views.py

@@ -1,6 +1,9 @@
-from django.shortcuts import render
+from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import redirect, render
 
-from fossdb.models import Project
+from .forms import (ProjectForm, ProjectHostingPlatformFormSet,
+                    ProjectProgrammingLanguageFormSet)
+from .models import Project
 
 
 def index(request):
@@ -9,3 +12,38 @@ def index(request):
         "projects": Project.objects.all(),
     }
     return render(request, "fossdb/index.html", context)
+
+
+@login_required(login_url="login/")
+@permission_required("fossdb.add_post", login_url="login/", raise_exception=True)
+def add_project(request):
+    if request.method == "POST":
+        project_form = ProjectForm(request.POST)
+        language_formset = ProjectProgrammingLanguageFormSet(request.POST, instance=Project())
+        host_formset = ProjectHostingPlatformFormSet(request.POST, instance=Project())
+
+        if project_form.is_valid() and language_formset.is_valid() and host_formset.is_valid():
+            project = project_form.save(commit=False)
+            project.author = request.user
+            project.save()
+
+            language_formset.instance = project
+            language_formset.save()
+
+            host_formset.instance = project
+            host_formset.save()
+
+            project_form.save_m2m()
+            return redirect("/")
+    else:
+        project_form = ProjectForm()
+        language_formset = ProjectProgrammingLanguageFormSet()
+        host_formset = ProjectHostingPlatformFormSet()
+
+    context = {
+        "title": "Add project",
+        "project_form": project_form,
+        "language_formset": language_formset,
+        "host_formset": host_formset,
+    }
+    return render(request, "fossdb/add_project.html", context)

FOSSDB_web/settings.py

@@ -38,11 +38,6 @@ ALLOWED_HOSTS = config["ALLOWED_HOSTS"]
 INSTALLED_APPS = [
     "account",
     "fossdb",
-    "fossdb.project",
-    "fossdb.license",
-    "fossdb.programming_language",
-    "fossdb.hosting_platform",
-    "fossdb.tag",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",