Merge branch 'development'

src/FOSSDB/settings.py

@@ -35,9 +35,9 @@ DEBUG = config["DEBUG"]
 # Application definition
 
 INSTALLED_APPS = [
-    "main",
-    "account",
     "fossdb",
+    "account",
+    "main",
     "search_views",
     "tailwind",
     "tokyonight_night",

src/apps/account/migrations/0001_initial.py

@@ -1,9 +1,11 @@
-# Generated by Django 4.2.2 on 2023-06-27 16:35
+# Generated by Django 4.2.2 on 2023-06-29 23:07
 
 import account.models
+from django.conf import settings
 import django.contrib.auth.models
 import django.contrib.auth.validators
 from django.db import migrations, models
+import django.db.models.deletion
 import django.utils.timezone
 import uuid
 
@@ -31,7 +33,6 @@ class Migration(migrations.Migration):
                 ('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')),
                 ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='ID')),
-                ('profile_picture', models.ImageField(default='profile_pics/default.jpg', upload_to=account.models.get_profile_pic_path)),
                 ('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')),
             ],
@@ -44,4 +45,12 @@ class Migration(migrations.Migration):
                 ('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')),
+                ('picture', models.ImageField(default='profile-pics/default.jpg', upload_to=account.models.get_profile_pic_path)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
     ]

src/apps/account/migrations/0002_alter_user_profile_picture.py

@@ -1,19 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-28 16:17
-
-import account.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='profile_picture',
-            field=models.ImageField(default='profile-pics/default.jpg', upload_to=account.models.get_profile_pic_path),
-        ),
-    ]

src/apps/account/migrations/0003_remove_user_profile_picture_profile.py

@@ -1,28 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-28 20:26
-
-import account.models
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0002_alter_user_profile_picture'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='user',
-            name='profile_picture',
-        ),
-        migrations.CreateModel(
-            name='Profile',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('profile_picture', models.ImageField(default='profile-pics/default.jpg', upload_to=account.models.get_profile_pic_path)),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

src/apps/account/migrations/0004_rename_profile_picture_profile_picture.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-28 20:32
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0003_remove_user_profile_picture_profile'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='profile',
-            old_name='profile_picture',
-            new_name='picture',
-        ),
-    ]

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

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-27 16:35
+# Generated by Django 4.2.2 on 2023-06-29 23:07
 
 from django.conf import settings
 from django.db import migrations, models
@@ -26,8 +26,8 @@ class Migration(migrations.Migration):
             name='License',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('short_name', models.CharField(max_length=50, unique=True)),
+                ('short_name', models.CharField(db_index=True, max_length=50, unique=True)),
-                ('full_name', models.CharField(max_length=100, unique=True)),
+                ('full_name', models.CharField(db_index=True, max_length=100, unique=True)),
                 ('url', models.URLField(blank=True, default='')),
                 ('text', models.TextField(blank=True, default='')),
             ],
@@ -36,8 +36,9 @@ class Migration(migrations.Migration):
             name='OperatingSystem',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100, unique=True)),
+                ('name', models.CharField(db_index=True, max_length=100, unique=True)),
                 ('description', models.TextField(blank=True, default='')),
+                ('is_linux', models.BooleanField(blank=True, default=False)),
             ],
         ),
         migrations.CreateModel(
@@ -54,14 +55,14 @@ class Migration(migrations.Migration):
             name='ProgrammingLanguage',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100, unique=True)),
+                ('name', models.CharField(db_index=True, max_length=100, unique=True)),
             ],
         ),
         migrations.CreateModel(
             name='Project',
             fields=[
                 ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255)),
+                ('name', models.CharField(db_index=True, max_length=255)),
                 ('description', models.TextField(blank=True, default='')),
                 ('date_created', models.DateTimeField(auto_now_add=True)),
                 ('license', models.ManyToManyField(blank=True, to='fossdb.license')),
@@ -75,14 +76,14 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(db_index=True, max_length=100, unique=True)),
                 ('description', models.TextField(blank=True, default='')),
-                ('icon', models.ImageField(blank=True, upload_to='types/icons/')),
+                ('icon', models.ImageField(blank=True, null=True, upload_to='tags/icons/')),
             ],
         ),
         migrations.CreateModel(
             name='ProjectProgrammingLanguage',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('percentage', models.PositiveIntegerField()),
+                ('percentage', models.PositiveIntegerField(blank=True, default=0)),
                 ('programming_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')),
             ],

src/apps/fossdb/migrations/0002_alter_tag_icon.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-27 16:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fossdb', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='tag',
-            name='icon',
-            field=models.ImageField(blank=True, null=True, upload_to='types/icons/'),
-        ),
-    ]

src/apps/fossdb/migrations/0003_alter_projectprogramminglanguage_percentage.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-27 18:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fossdb', '0002_alter_tag_icon'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='projectprogramminglanguage',
-            name='percentage',
-            field=models.PositiveIntegerField(blank=True, null=True),
-        ),
-    ]

src/apps/fossdb/migrations/0004_alter_tag_icon_star.py

@@ -1,29 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-28 16:17
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('fossdb', '0003_alter_projectprogramminglanguage_percentage'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='tag',
-            name='icon',
-            field=models.ImageField(blank=True, null=True, upload_to='tags/icons/'),
-        ),
-        migrations.CreateModel(
-            name='Star',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fossdb.project')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

src/apps/fossdb/migrations/0005_operatingsystem_is_linux.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-28 22:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fossdb', '0004_alter_tag_icon_star'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='operatingsystem',
-            name='is_linux',
-            field=models.BooleanField(blank=True, default=False),
-        ),
-    ]

src/apps/fossdb/migrations/0006_alter_projectprogramminglanguage_percentage.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-29 14:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fossdb', '0005_operatingsystem_is_linux'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='projectprogramminglanguage',
-            name='percentage',
-            field=models.PositiveIntegerField(blank=True, default=0),
-        ),
-    ]

src/apps/fossdb/migrations/0007_alter_license_full_name_alter_license_short_name_and_more.py

@@ -1,43 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-29 15:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fossdb', '0006_alter_projectprogramminglanguage_percentage'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='license',
-            name='full_name',
-            field=models.CharField(db_index=True, max_length=100, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='license',
-            name='short_name',
-            field=models.CharField(db_index=True, max_length=50, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='operatingsystem',
-            name='name',
-            field=models.CharField(db_index=True, max_length=100, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='programminglanguage',
-            name='name',
-            field=models.CharField(db_index=True, max_length=100, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='project',
-            name='description',
-            field=models.TextField(blank=True, db_index=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='project',
-            name='name',
-            field=models.CharField(db_index=True, max_length=255),
-        ),
-    ]

src/apps/fossdb/migrations/0008_alter_project_description.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-29 15:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fossdb', '0007_alter_license_full_name_alter_license_short_name_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='project',
-            name='description',
-            field=models.TextField(blank=True, default=''),
-        ),
-    ]

src/apps/fossdb/migrations/0009_delete_star.py

@@ -1,16 +0,0 @@
-# Generated by Django 4.2.2 on 2023-06-29 16:51
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fossdb', '0008_alter_project_description'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='Star',
-        ),
-    ]