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

Implement Kiara's feedback

Browse source
This commit is contained in:
lois Verheij 2025-04-01 16:18:06 +02:00
parent 31c509f4fa
commit 724812c5c5
2 changed files with 20 additions and 14 deletions
panel/src/panel
templates/partials
deployment_result.html
views.py

12
panel/src/panel/templates/partials/deployment_result.html
View file

@ -1,15 +1,15 @@
{% if deployment_status == "Deployment Succeeded"%}
<p>{{ deployment_status }}</p>
{% if deployment_succeeded %}
<p>Deployment Succeeded</p>
<ul>
{% for service, state in services.items %}
{% if state.0 %}
{% for service_name, service_meta in services.items %}
{% if service_meta.enable %}
<li>
✓ <a target="_blank" href={{ state.1 }}>{{ service }}</a>
✓ <a target="_blank" href={{ service_meta.url }}>{{ service_name }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
{% else %}
<p>{{ deployment_status }}</p>
<p>Deployment Failed</p>
{% endif %}

22
panel/src/panel/views.py
View file

@ -102,17 +102,23 @@ class DeploymentStatus(ConfigurationForm):
# Check for deploy button
if "deploy" in self.request.POST.keys():
deployment_result, deployment_params = self.deployment(obj)
if deployment_result.returncode == 0:
deployment_status = "Deployment Succeeded"
else:
deployment_status = "Deployment Failed"
deployment_succeeded = deployment_result.returncode == 0
return render(self.request, "partials/deployment_result.html", {
"deployment_status": deployment_status,
"deployment_succeeded": deployment_succeeded,
"services": {
"peertube": (deployment_params['peertube']['enable'], f"https://peertube.{deployment_params['domain']}"),
"pixelfed": (deployment_params['pixelfed']['enable'], f"https://pixelfed.{deployment_params['domain']}"),
"mastodon": (deployment_params['mastodon']['enable'], f"https://mastodon.{deployment_params['domain']}")
"peertube": {
"enable": deployment_params['peertube']['enable'],
"url": f"https://peertube.{deployment_params['domain']}"
},
"pixelfed":{
"enable": deployment_params['pixelfed']['enable'],
"url": f"https://pixelfed.{deployment_params['domain']}"
},
"mastodon": {
"enable": deployment_params['mastodon']['enable'],
"url": f"https://mastodon.{deployment_params['domain']}"
},
}
})