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

Display url after deployment (#287)

Browse source 
closes #264
Added a clickable link to the services that deployed.

Reviewed-on: Fediversity/Fediversity#287
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: lois <lois@procolix.eu>
Co-committed-by: lois <lois@procolix.eu>
This commit is contained in:
Lois Verheij 2025-04-02 08:48:59 +02:00 • committed by lois Verheij
parent 88674c8efc
commit 535da821fd
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -102,18 +102,24 @@ class DeploymentStatus(ConfigurationForm):
# Check for deploy button # Check for deploy button
if "deploy" in self.request.POST.keys(): if "deploy" in self.request.POST.keys():
deployment_result, deployment_params = self.deployment(obj) deployment_result, deployment_params = self.deployment(obj)
if deployment_result.returncode == 0: deployment_succeeded = deployment_result.returncode == 0
deployment_status = "Deployment Succeeded"
else:
deployment_status = "Deployment Failed"
return render(self.request, "partials/deployment_result.html", { return render(self.request, "partials/deployment_result.html", {
"deployment_status": deployment_status, "deployment_succeeded": deployment_succeeded,
"services": { "services": {
"peertube": deployment_params['peertube']['enable'], "peertube": {
"pixelfed": deployment_params['pixelfed']['enable'], "enable": deployment_params['peertube']['enable'],
"mastodon": deployment_params['mastodon']['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']}",
},
},
}) })
def deployment(self, obj): def deployment(self, obj):