Merge pull request 'Rename hostea to gna!' (#59) from wip-rename-hostea-to-gna into master

Reviewed-on: https://gitea.gna.org/Hostea/dashboard/pulls/59

Makefile

@@ -9,6 +9,7 @@ endef
 
 default: ## Run app
 	$(call run_migrations)
+	. ./venv/bin/activate && yes yes | python manage.py collectstatic
 	. ./venv/bin/activate && python manage.py runserver
 
 coverage: ## Generate test coverage report

README.md

@@ -2,7 +2,7 @@
 
 # Hostea dashboard
 
-[![status-badge](https://woodpecker.hostea.org/api/badges/Hostea/dashboard/status.svg)](https://woodpecker.hostea.org/Hostea/dashboard)
+[![status-badge](https://woodpecker.gna.org/api/badges/Hostea/dashboard/status.svg)](https://woodpecker.gna.org/Hostea/dashboard)
 [![AGPL License](https://img.shields.io/badge/license-AGPL-blue.svg?style=flat-square)](http://www.gnu.org/licenses/agpl-3.0)
 [![Chat](https://img.shields.io/badge/matrix-hostea:matrix.batsense.net-purple?style=flat-square)](https://matrix.to/#/#hostea:matrix.batsense.net)
 

accounts/templates/accounts/auth/base.html

@@ -1,5 +1,5 @@
 {% extends "common/components/base.html" %}
-{% block title %}{% block title_name %} {% endblock %} | Hostea Dashbaord{% endblock %}
+{% block title %}{% block title_name %} {% endblock %} | Gna! Dashboard{% endblock %}
 {% block nav %} {% include "common/components/nav/pub.html" %} {% endblock %}
 
 {% block main %}
@@ -11,12 +11,12 @@
           A free forge ecosystem for free developers.
           </p>
           <ul class="index-banner__features-list">
-            <li class="index-banner__features">Dedicated <a href="https://hosteadashboard.hostea.org/register/">Gitea hosting</a> and <a href="https://woodpecker-ci.org/">Woodpecker CI</a> from 10€/month</li>
-	    <li class="index-banner__features">Clinic to <a href="https://hostea.org/gitea-clinic/">heal sick Gitea</a> instances</li>
+            <li class="index-banner__features">Dedicated <a href="https://hosteadashboard.gna.org/register/">Gitea hosting</a> and <a href="https://woodpecker-ci.org/">Woodpecker CI</a> from 10€/month</li>
+	    <li class="index-banner__features">Clinic to <a href="https://gna.org/gitea-clinic/">heal sick Gitea</a> instances</li>
             <li class="index-banner__features">100% <a href="https://www.gnu.org/philosophy/free-sw.html">Free Software</a></li>
-            <li class="index-banner__features">Radically <a href="https://forum.hostea.org/t/about-governance-and-decisions-in-hostea/55">Transparent</a></li>
-            <li class="index-banner__features">Run by a <a href="https://forum.hostea.org/t/about-governance-and-decisions-in-hostea/55">horizontal collective</a></li>
-            <li class="index-banner__features">25% of the income <a href="https://forum.hostea.org/t/decision-revenue-sharing-model/92">dedicated to sustain Free Software dependencies</a></li>
+            <li class="index-banner__features">Radically <a href="https://forum.gna.org/t/about-governance-and-decisions-in-hostea/55">Transparent</a></li>
+            <li class="index-banner__features">Run by a <a href="https://forum.gna.org/t/about-governance-and-decisions-in-hostea/55">horizontal collective</a></li>
+            <li class="index-banner__features">25% of the income <a href="https://forum.gna.org/t/decision-revenue-sharing-model/92">dedicated to sustain Free Software dependencies</a></li>
             <li class="index-banner__features">Committed to <a href="https://forgefriends.org/blog/2022/06/30/2022-06-state-forge-federation/">further forge federation</a></li>
           </ul>
     </div>

accounts/templates/accounts/auth/login.html

@@ -39,7 +39,7 @@
   </div>
 </form>
 <p class="form__alt-action">
-  New to Hostea?
+  New to Gna!?
   <a href="{% url 'accounts.register' %}">Create an account</a>
 </p>
 {% endblock %}

accounts/templates/accounts/auth/password-reset-form.html

@@ -1,5 +1,5 @@
 {% extends "common/components/base.html" %}
-{% block title %} Reset Password| Hostea Dashboard{% endblock %}
+{% block title %} Reset Password| Gna! Dashboard{% endblock %}
 {% block nav %} {% include "common/components/nav/pub.html" %} {% endblock %}
 {% block main %}
 <div class="dialogue-box__container">

accounts/templates/accounts/auth/password-reset-resend-verification.html

@@ -1,5 +1,5 @@
 {% extends "common/components/base.html" %}
-{% block title %} Reset Password | Hostea Dashboard{% endblock %}
+{% block title %} Reset Password | Gna! Dashboard{% endblock %}
 {% block nav %} {% include "common/components/nav/pub.html" %} {% endblock %}
 {% block main %}
 <div class="dialogue-box__container">

accounts/templates/accounts/auth/password-reset.html

@@ -1,5 +1,5 @@
 {% extends "common/components/base.html" %}
-{% block title %} Reset Password | Hostea Dashboard{% endblock %}
+{% block title %} Reset Password | Gna! Dashboard{% endblock %}
 {% block nav %} {% include "common/components/nav/pub.html" %} {% endblock %}
 {% block main %}
 <div class="dialogue-box__container">

accounts/templates/accounts/auth/sudo.html

@@ -1,5 +1,5 @@
 {% extends "common/components/base.html" %}
-{% block title %} Confirm Access | Hostea Dashbaord{% endblock %}
+{% block title %} Confirm Access | Gna! Dashboard{% endblock %}
 {% block nav %} {% include "dash/common/components/primary-nav.html" %} {% endblock %}
 
 {% block main %}

accounts/templates/accounts/auth/verification-pending.html

@@ -1,5 +1,5 @@
 {% extends "common/components/base.html" %}
-{% block title %} Confirm Account | Hostea Dashbaord{% endblock %}
+{% block title %} Confirm Account | Gna! Dashboard{% endblock %}
 {% block nav %} {% include "common/components/nav/pub.html" %} {% endblock %}
 {% block main %}
 <div class="dialogue-box__container">

accounts/templates/accounts/auth/verify.html

@@ -1,5 +1,5 @@
 {% extends "common/components/base.html" %}
-{% block title %} Confirm Account | Hostea Dashbaord{% endblock %}
+{% block title %} Confirm Account | Gna! Dashboard{% endblock %}
 {% block nav %} {% include "common/components/nav/pub.html" %} {% endblock %}
 {% block main %}
 <div class="dialogue-box__container">

accounts/templates/common/components/footer.html

@@ -10,21 +10,11 @@
         title="RSS"
       >Home</a>
         <span class="footer__column-divider--mobile-visible">|</span>
-        <a class="license__link" rel="noreferrer" href="https://hostea.org/about" target="_blank"
+        <a class="license__link" rel="noreferrer" href="https://gna.org/about" target="_blank"
           >&nbsp; About</a
         >
       </span>
     </div>
-    <div class="footer__column">
-        <a
-          class="license__link"
-          rel="noreferrer"
-          href="https://www.eff.org/issues/do-not-track/amp/"
-          target="_blank"
-          >No AMP</a
-        >
-
-      <div class="footer__column-divider">|</div>
       <a href="mailto:{{ footer.admin_email }}" class="footer__link"
         >Contact Instance Maintainer</a
       >

accounts/templates/common/components/nav/pub.html

@@ -3,11 +3,8 @@
   <input type="checkbox" class="nav__toggle" id="nav__toggle" />
   <div class="nav__header">
     <a class="nav__logo-container" href="/">
-      <img src="{% static 'img/android-icon-48x48.png' %}" 
-      alt="Hostea temporary logo"/>
-      <p class="nav__home-btn">
-      ostea
-      </p>
+      <img class="nav__logo-img" src="{% static 'img/logo.png' %}" 
+      alt="Gna! logo"/>
     </a>
     <label class="nav__hamburger-menu" for="nav__toggle">
       <span class="nav__hamburger-inner"></span>

common-static/css/main.css

@@ -127,6 +127,10 @@ header {
   text-decoration: underline;
 }
 
+.nav__logo-img {
+  height: 48px;
+}
+
 .nav__toggle {
   display: none;
 }

dash/templates/dash/common/base.html

@@ -4,7 +4,7 @@
   <head>
     <meta charset="UTF-8" />
 	<link rel="stylesheet" href="{% static 'css/main.css' %}" />
-    <title>{{ title }}| Hostea Dashbaord</title>
+    <title>{{ title }}| Gna! Dashboard</title>
     {% include "common/components/meta.html" %}
   </head>
   <body>

dash/templates/dash/common/components/primary-nav.html

@@ -1,36 +1,41 @@
 {% load static %}
 <nav class="nav__container">
-  <input type="checkbox" class="nav__toggle" id="nav__toggle" />
-  <div class="nav__header">
-    <a class="nav__logo-container" href="https://hostea.org">
-      <img
-        src="{% static 'img/android-icon-48x48.png' %}"
-        alt="Hostea logo"
-      />
-      <p class="nav__home-btn">ostea</p>
-    </a>
-    <label class="nav__hamburger-menu" for="nav__toggle">
-      <span class="nav__hamburger-inner"></span>
-    </label>
-  </div>
+	<input type="checkbox" class="nav__toggle" id="nav__toggle" />
+	<div class="nav__header">
+		<a class="nav__logo-container" href="https://gna.org">
+			<img alt="Gna! logo" class="nav__logo-img" src="{% static 'img/logo.png' %}" />
+		</a>
+		<label class="nav__hamburger-menu" for="nav__toggle">
+			<span class="nav__hamburger-inner"></span>
+		</label>
+	</div>
 
-  <div class="nav__spacer"></div>
+	<div class="nav__spacer"></div>
 
-  <div class="nav__link-group">
-    <div class="nav__link-container">
-      <a class="nav__link" rel="noreferrer" href="{% url 'dash.instances.new' %}"
-        >Add Instance</a
-      >
-    </div>
-    <div class="nav__link-container">
-      <a class="nav__link" rel="noreferrer" href="{% url 'support.home' %}"
-        >Support</a
-      >
-    </div>
-    <div class="nav__link-container">
-      <a class="nav__link" rel="noreferrer" href="{% url 'accounts.logout' %}"
-        >Logout</a
-      >
-    </div>
-  </div>
+	<div class="nav__link-group">
+		<div class="nav__link-container">
+			<a
+				class="nav__link"
+				rel="noreferrer"
+				href="{% url 'dash.instances.new' %}"
+				>Add Instance</a
+			>
+		</div>
+		<div class="nav__link-container">
+			<a
+				class="nav__link"
+				rel="noreferrer"
+				href="{% url 'support.home' %}"
+				>Support</a
+			>
+		</div>
+		<div class="nav__link-container">
+			<a
+				class="nav__link"
+				rel="noreferrer"
+				href="{% url 'accounts.logout' %}"
+				>Logout</a
+			>
+		</div>
+	</div>
 </nav>

dash/tests.py

@@ -171,7 +171,7 @@ class InstancesConfig(TestCase):
         """
         Expects InstancesConfig titled "s1-2", "s1-4" and "s1-8"
 
-        ref: https://gitea.hostea.org/Hostea/july-mvp/issues/10#issuecomment-639
+        ref: https://gitea.gna.org/Hostea/july-mvp/issues/10#issuecomment-639
         """
         self.assertEqual(
             InstanceConfiguration.objects.filter(

dash/utils.py

@@ -77,7 +77,7 @@ def footer_ctx():
                 "link": settings.HOSTEA["SOURCE_CODE"],
             }
         else:
-            link = "https://gitea.hostea.org/Hostea/dashboard"
+            link = "https://gitea.gna.org/Hostea/dashboard"
             source_code = {"text": "Source Code", "link": link}
         try:
             r = Repo(".")

dashboard/local_settings.ci.py

@@ -54,8 +54,8 @@ PAYMENT_VARIANTS = {
 ### Dashbaord specific configuration options
 
 HOSTEA = {
-    "SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
-    "INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
+    "SOURCE_CODE": "https://gitea.gna.org/Hostea/dashboard",
+    "INSTANCE_MAINTAINER_CONTACT": "contact@gna.example.org",
     "ACCOUNTS": {
         "MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24,  # in seconds
         "SUDO_TTL": 60 * 5,
@@ -66,7 +66,7 @@ HOSTEA = {
         ),  # meta Gitea insatnce
         "GITEA_ORG_NAME": "Hostea",  # Organisation name on Hostea meta instance
         # Repository dedicated for handling support
-        # ref: https://gitea.hostea.org/Hostea/july-mvp/issues/17
+        # ref: https://gitea.gna.org/Hostea/july-mvp/issues/17
         "SUPPORT_REPOSITORY": "support",
     },
     "INFRA": {
@@ -78,14 +78,14 @@ HOSTEA = {
             # SSH key that can push to the Git repository remote mentioned above
             "SSH_KEY": env.get_value("HOSTEA_INFRA_HOSTEA_REPO_SSH_KEY"),
         },
-        "HOSTEA_DOMAIN": "hostea.org",  # domain at which Hostea VMs will be spun up
+        "HOSTEA_DOMAIN": "gna.org",  # domain at which Hostea VMs will be spun up
     },
 }
 
 # Please see EMAIL_* configuration options:
 # https://docs.djangoproject.com/en/4.1/ref/settings/#email-host
 EMAIL_CONFIG = env.email("EMAIL_URL", default="smtp://admin:password@localhost:10025")
-DEFAULT_FROM_EMAIL = "no-reply@hostea.org"
+DEFAULT_FROM_EMAIL = "no-reply@gna.org"
 
 vars().update(EMAIL_CONFIG)
 

dashboard/local_settings.example.py

@@ -53,17 +53,17 @@ PAYMENT_VARIANTS = {
 ### Dashbaord specific configuration options
 
 HOSTEA = {
-    "SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
-    "INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
+    "SOURCE_CODE": "https://gitea.gna.org/Hostea/dashboard",
+    "INSTANCE_MAINTAINER_CONTACT": "contact@gna.example.org",
     "ACCOUNTS": {
         "MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24,  # in seconds
         "SUDO_TTL": 60 * 5,
     },
     "META": {
-        "GITEA_INSTANCE": "https://gitea.hostea.org",  # meta Gitea insatnce
+        "GITEA_INSTANCE": "https://gitea.gna.org",  # meta Gitea insatnce
         "GITEA_ORG_NAME": "Hostea",  # Organisation name on Hostea meta instance
         # Repository dedicated for handling support
-        # ref: https://gitea.hostea.org/Hostea/july-mvp/issues/17
+        # ref: https://gitea.gna.org/Hostea/july-mvp/issues/17
         "SUPPORT_REPOSITORY": "support",
     },
     "INFRA": {
@@ -87,4 +87,4 @@ EMAIL_USE_SSL = False
 EMAIL_PORT = 10025
 EMAIL_HOST_USER = "admin"
 EMAIL_HOST_PASSWORD = "password"
-DEFAULT_FROM_EMAIL = "no-reply@hostea.org"
+DEFAULT_FROM_EMAIL = "no-reply@gna.org"

dashboard/settings.py

@@ -171,9 +171,9 @@ PAYMENT_VARIANTS = {
 ### Dashbaord specific configuration options
 
 HOSTEA = {
-    "SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
+    "SOURCE_CODE": "https://gitea.gna.org/Hostea/dashboard",
     "RESTRICT_NEW_INTEGRATION_INSTALLATION": True,
-    "INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
+    "INSTANCE_MAINTAINER_CONTACT": "contact@gna.example.org",
     "ACCOUNTS": {
         "MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24,  # in seconds
         "SUDO_TTL": 60 * 5,
@@ -182,7 +182,7 @@ HOSTEA = {
         "GITEA_INSTANCE": "http://localhost:3000",  # meta Gitea insatnce
         "GITEA_ORG_NAME": "Hostea",  # Organisation name on Hostea meta instance
         # Repository dedicated for handling support
-        # ref: https://gitea.hostea.org/Hostea/july-mvp/issues/17
+        # ref: https://gitea.gna.org/Hostea/july-mvp/issues/17
         "SUPPORT_REPOSITORY": "support",
     },
     "INFRA": {
@@ -194,7 +194,7 @@ HOSTEA = {
             # SSH key that can push to the Git repository remote mentioned above
             "SSH_KEY": "/srv/hostea/deploy",
         },
-        "HOSTEA_DOMAIN": "vm.hostea.org",  # domain at which Hostea VMs will be spun up
+        "HOSTEA_DOMAIN": "vm.gna.org",  # domain at which Hostea VMs will be spun up
     },
 }
 
@@ -206,7 +206,7 @@ EMAIL_USE_SSL = False
 EMAIL_PORT = 10025
 EMAIL_HOST_USER = "admin"
 EMAIL_HOST_PASSWORD = "password"
-DEFAULT_FROM_EMAIL: "no-reply@hostea.org"
+DEFAULT_FROM_EMAIL: "no-reply@gna.org"
 
 try:
     from dashboard.local_settings import *

docs/HACKING.md

@@ -15,7 +15,7 @@
 1. Clone the project
 
 ```bash
-git clone https://gitea.hostea.org/Hostea/dashboard.git && cd dashboard
+git clone https://gitea.gna.org/Hostea/dashboard.git && cd dashboard
 ```
 
 2. Create `virtualenv` and activate environment

docs/INSTALL.md

@@ -45,7 +45,7 @@ hence the current redundancy in configuration and cronjob duration.
 ## Support Platform Integration
 
 Hostea Dashbaord delegates support to Hostea's meta Gitea instance, as
-discussed [here](https://gitea.hostea.org/Hostea/july-mvp/issues/17).
+discussed [here](https://gitea.gna.org/Hostea/july-mvp/issues/17).
 
 To configure support platform integration , please set the following
 attributes in `settings.py`:
@@ -55,10 +55,10 @@ HOSTEA = {
 	# <--snip--->
     "META": {
 	# <--snip--->
-        "GITEA_INSTANCE": "https://gitea.hostea.org", # meta Gitea insatnce
+        "GITEA_INSTANCE": "https://gitea.gna.org", # meta Gitea insatnce
         "GITEA_ORG_NAME": "Hostea", # Organisation name on Hostea meta instance
         # Repository dedicated for handling support
-        # ref: https://gitea.hostea.org/Hostea/july-mvp/issues/17
+        # ref: https://gitea.gna.org/Hostea/july-mvp/issues/17
         "SUPPORT_REPOSITORY": "support",
     },
 }

support/templates/support/list.html

@@ -2,7 +2,7 @@
 <h2>{{ title }}</h2>
 
 <p>
-  You will be redirected to Hostea's issue tracker
+  You will be redirected to Gna!'s issue tracker
   <span id="timer">momentarily</span>. If not, please click
   <a id="redirect-url" href="{{ support.list }}">here.</a>
 </p>

support/templates/support/new.html

@@ -2,7 +2,7 @@
 <h2>{{ title }}</h2>
 
 <p>
-  You will be redirected to Hostea's issue tracker
+  You will be redirected to Gna!'s issue tracker
   <span id="timer">momentarily</span>. If not, please click
   <a id="redirect-url" href="{{ support.new }}">here.</a>
 </p>

support/tests.py

@@ -24,7 +24,7 @@ from .utils import IssueTracker
 
 hostea_issue_tracker_settings = settings.HOSTEA
 hostea_issue_tracker_settings["META"] = {
-    "GITEA_INSTANCE": "https://gitea.hostea.org",
+    "GITEA_INSTANCE": "https://gitea.gna.org",
     "GITEA_ORG_NAME": "Hostea",
     "SUPPORT_REPOSITORY": "support",
 }
@@ -41,7 +41,7 @@ class IssueTrackerTests(TestCase):
         Verify default credentials; all further tests are based on defaults set
         """
         it = IssueTracker()
-        self.assertEqual(it.config["GITEA_INSTANCE"], "https://gitea.hostea.org")
+        self.assertEqual(it.config["GITEA_INSTANCE"], "https://gitea.gna.org")
         self.assertEqual(it.config["GITEA_ORG_NAME"], "Hostea")
         self.assertEqual(it.config["SUPPORT_REPOSITORY"], "support")
 
@@ -51,10 +51,10 @@ class IssueTrackerTests(TestCase):
         """
         it = IssueTracker()
         self.assertEqual(
-            it.get_issue_tracker(), "https://gitea.hostea.org/Hostea/support/issues"
+            it.get_issue_tracker(), "https://gitea.gna.org/Hostea/support/issues"
         )
         self.assertEqual(
-            it.open_issue(), "https://gitea.hostea.org/Hostea/support/issues/new"
+            it.open_issue(), "https://gitea.gna.org/Hostea/support/issues/new"
         )