kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Changes to fix merge conflicts

Browse source
This commit is contained in:
Lois Verheij 2025-03-05 11:37:02 +01:00
parent 50d32dc05f
commit 393ea1e5ff
5 changed files with 45 additions and 231 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
panel/src/panel/admin.py
View file

@ -1,29 +1,5 @@
from django.contrib import admin from django.contrib import admin
<<<<<<< HEAD
from panel.models import Configuration, PeertubeConfig, PixelfedConfig, MastodonConfig
class MastodonConfigInline(admin.StackedInline):
model = MastodonConfig
class PixelfedConfigInline(admin.StackedInline):
model = PixelfedConfig
class PeertubeConfigInline(admin.StackedInline):
model = PeertubeConfig
class DeployFormModelServices(admin.ModelAdmin):
inlines = [MastodonConfigInline,
PixelfedConfigInline, PeertubeConfigInline]
admin.site.register(Configuration, DeployFormModelServices)
=======
from panel.models import Configuration from panel.models import Configuration
admin.site.register(Configuration) admin.site.register(Configuration)
>>>>>>> 99f1d78e29f74a218b5ef66881151f18c00b7e99

52
panel/src/panel/migrations/0001_init_deployment_model.py
View file

@ -1,52 +0,0 @@
# Generated by Django 4.2.16 on 2025-02-27 15:10
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
replaces = [('panel', '0001_initial'), ('panel', '0002_alter_configuration_operator'), ('panel', '0003_alter_configuration_operator')]
initial = True
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Configuration',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('enable', models.BooleanField(default=False, help_text='Enable the configuration')),
('domain', models.CharField(choices=[('fediversity_eu', 'fediversity.eu'), ('fediversity_net', 'fediversity.net')], max_length=255)),
('operator', models.ForeignKey(help_text='Operator who owns the configuration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='configurations', to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='PixelfedConfig',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('pixelfed', models.BooleanField(default=False)),
('deploy_form', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='panel.configuration')),
],
),
migrations.CreateModel(
name='PeertubeConfig',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('peertube', models.BooleanField(default=False)),
('deploy_form', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='panel.configuration')),
],
),
migrations.CreateModel(
name='MastodonConfig',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('mastodon', models.BooleanField(default=False)),
('deploy_form', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='panel.configuration')),
],
),
]

115
panel/src/panel/migrations/0001_initial.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.16 on 2025-03-04 10:59 # Generated by Django 4.2.16 on 2025-03-05 10:34
from django.conf import settings from django.conf import settings
from django.db import migrations, models from django.db import migrations, models
@ -15,115 +15,36 @@ class Migration(migrations.Migration):
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="MastodonConfig", name='MastodonConfig',
fields=[ fields=[
( ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('enable', models.BooleanField(default=False)),
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("enable", models.BooleanField(default=False)),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="PeertubeConfig", name='PeertubeConfig',
fields=[ fields=[
( ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('enable', models.BooleanField(default=False)),
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("enable", models.BooleanField(default=False)),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="PixelfedConfig", name='PixelfedConfig',
fields=[ fields=[
( ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('enable', models.BooleanField(default=False)),
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("enable", models.BooleanField(default=False)),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Configuration", name='Configuration',
fields=[ fields=[
( ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('enable', models.BooleanField(default=False, help_text='Enable the configuration')),
models.BigAutoField( ('domain', models.CharField(choices=[('fediversity_eu', 'fediversity.eu'), ('fediversity_net', 'fediversity.net')], max_length=255)),
auto_created=True, ('mastodon', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='config', to='panel.mastodonconfig')),
primary_key=True, ('operator', models.ForeignKey(help_text='Operator who owns the configuration', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='configurations', to=settings.AUTH_USER_MODEL)),
serialize=False, ('peertube', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='config', to='panel.peertubeconfig')),
verbose_name="ID", ('pixelfed', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='config', to='panel.pixelfedconfig')),
),
),
(
"enable",
models.BooleanField(
default=False, help_text="Enable the configuration"
),
),
(
"domain",
models.CharField(
choices=[
("fediversity_eu", "fediversity.eu"),
("fediversity_net", "fediversity.net"),
],
max_length=255,
),
),
(
"mastodon",
models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="config",
to="panel.mastodonconfig",
),
),
(
"operator",
models.ForeignKey(
help_text="Operator who owns the configuration",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="configurations",
to=settings.AUTH_USER_MODEL,
),
),
(
"peertube",
models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="config",
to="panel.peertubeconfig",
),
),
(
"pixelfed",
models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="config",
to="panel.pixelfedconfig",
),
),
], ],
), ),
] ]

47
panel/src/panel/models.py
View file

@ -56,19 +56,18 @@ class Configuration(models.Model):
instance.save() instance.save()
return instance return instance
operator = models.ForeignKey(
operator = models.ForeignKey(
User, User,
on_delete=models.SET_NULL, on_delete=models.SET_NULL,
null=True, null=True,
related_name="configurations", related_name="configurations",
help_text="Operator who owns the configuration", help_text="Operator who owns the configuration",
) )
enable = models.BooleanField( enable = models.BooleanField(
default=False, default=False,
help_text="Enable the configuration", help_text="Enable the configuration",
) )
domain = models.CharField( domain = models.CharField(
# XXX: hard-code available apex domains for now, # XXX: hard-code available apex domains for now,
# they will be prefixed by the user name # they will be prefixed by the user name
# TODO: map to user's registered domains # TODO: map to user's registered domains
@ -77,32 +76,10 @@ domain = models.CharField(
("fediversity_net", "fediversity.net") ("fediversity_net", "fediversity.net")
], ],
max_length=255, max_length=255,
) )
# TODO: map to configuration model per service mastodon = models.OneToOneField(
MastodonConfig, on_delete=models.CASCADE, related_name='config', null=True)
pixelfed = models.OneToOneField(
class MastodonConfig(models.Model): PixelfedConfig, on_delete=models.CASCADE, related_name='config', null=True)
deploy_form = models.OneToOneField( peertube = models.OneToOneField(
Configuration, on_delete=models.CASCADE) PeertubeConfig, on_delete=models.CASCADE, related_name='config', null=True)
mastodon = models.BooleanField(default=False)
def __str__(self):
return f"Mastodon: {self.mastodon}"
class PixelfedConfig(models.Model):
deploy_form = models.OneToOneField(
Configuration, on_delete=models.CASCADE)
pixelfed = models.BooleanField(default=False)
def __str__(self):
return f"Pixelfed: {self.pixelfed}"
class PeertubeConfig(models.Model):
deploy_form = models.OneToOneField(
Configuration, on_delete=models.CASCADE)
peertube = models.BooleanField(default=False)
def __str__(self):
return f"Peertube: {self.peertube}"

8
panel/src/panel/templates/configuration_form.html
View file

@ -3,14 +3,6 @@
<form method="post" enctype="multipart/form-data" action="{% url 'configuration_form' %}"> <form method="post" enctype="multipart/form-data" action="{% url 'configuration_form' %}">
{% csrf_token %} {% csrf_token %}
{{ form.as_p }} {{ form.as_p }}
<<<<<<< HEAD
{{ mastodon_form.as_p }}
{{ pixelfed_form.as_p }}
{{ peertube_form.as_p }}
</fieldset>
=======
>>>>>>> 99f1d78e29f74a218b5ef66881151f18c00b7e99
<button class="button" disabled>Deploy</button> <button class="button" disabled>Deploy</button>
<button class="button" type="submit" >Save</button> <button class="button" type="submit" >Save</button>