Remove: code that is no longer necessary

andrea-chirillano · andrea-chirillano · commit 506f1ff46c29 · 2026-02-23T19:27:49.000Z
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -117,18 +117,18 @@ jobs:
                 sudo mkdir -p \$APP_DIR
                 sudo chown \$USER:\$USER \$APP_DIR
                 git clone -b master https://github.com/hotosm/umap.git \$APP_DIR
-                echo "✅ Cloned repository"
+                echo "Cloned repository"
             fi
             cd \$APP_DIR
             # Pull latest changes
             git fetch origin master
             git reset --hard origin/master
-            echo "✅ Updated to latest master"
+            echo "Updated to latest master"
             # Pull and deploy
             docker compose -f compose.yml pull
             docker compose -f compose.yml up -d --force-recreate
             # Cleanup
             docker image prune -af
-            echo "✅ Deployment complete"
+            echo "Deployment complete"
           ENDSSH
 
diff --git a/.github/workflows/build_and_deploy_dev.yml b/.github/workflows/build_and_deploy_dev.yml
@@ -116,19 +116,19 @@ jobs:
                 sudo mkdir -p \$APP_DIR
                 sudo chown \$USER:\$USER \$APP_DIR
                 git clone -b develop https://github.com/hotosm/umap.git \$APP_DIR
-                echo "✅ Cloned repository"
+                echo "Cloned repository"
             fi
             cd \$APP_DIR
             # Pull latest changes
             git fetch origin develop
             git reset --hard origin/develop
-            echo "✅ Updated to latest develop"
+            echo "Updated to latest develop"
             # Pull and deploy
             sed -i -e 's/umap.hotosm.org/umap-dev.hotosm.org/g' nginx/conf.d/umap.conf
             docker compose -f compose.dev.yml pull
             docker compose -f compose.dev.yml up -d --force-recreate
             # Cleanup
             docker image prune -af
-            echo "✅ Deployment complete"
+            echo "Deployment complete"
           ENDSSH
 
diff --git a/.github/workflows/issue-label.yml b/.github/workflows/issue-label.yml
@@ -1,7 +1,7 @@
 # We add a label `repo:repo-name` to each new issue,
 # for easier tracking in external systems
 
-name: 🏷️ Issue Label
+name: Issue Label
 
 on:
   issues:
diff --git a/app/custom/static/umap/js/hanko-auth.esm.js b/app/custom/static/umap/js/hanko-auth.esm.js
diff --git a/app/custom/templates/umap/content.html b/app/custom/templates/umap/content.html
@@ -22,7 +22,7 @@
   {% if MAINTENANCE_MODE %}
   <div class="wrapper hot-maintenance-banner">
     <div>
-      <p>🚧 We are currently working on this site and you may experience some issues. Thank you for your patience.</p>
+      <p>We are currently working on this site and you may experience some issues. Thank you for your patience.</p>
     </div>
   </div>
   {% endif %}
diff --git a/app/custom/templates/umap/hanko_auth.html b/app/custom/templates/umap/hanko_auth.html
@@ -8,7 +8,7 @@
   
   // Configure Hanko URL
   window.HANKO_URL = 'https://login.hotosm.test'
-  console.log('🔐 Hanko Auth Web Component loaded from:', window.HANKO_URL)
+  console.log('Hanko Auth Web Component loaded from:', window.HANKO_URL)
 </script>
 
 <!-- Container for the auth component -->
diff --git a/app/custom/templates/umap/header.html b/app/custom/templates/umap/header.html
@@ -15,37 +15,27 @@
 
 <!-- Matomo -->
 <script>
-  var _paq = (window._paq = window._paq || []);
-  _paq.push(["disableCookies"]);
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-  (function () {
-    var u = "//matomo.hotosm.org/";
-    _paq.push(["setTrackerUrl", u + "matomo.php"]);
-    _paq.push(["setSiteId", "34"]);
-    var d = document,
-      g = d.createElement("script"),
-      s = d.getElementsByTagName("script")[0];
-    g.async = true;
-    g.src = u + "matomo.js";
-    s.parentNode.insertBefore(g, s);
-  })();
+  var _paq = window._paq = window._paq || [];
+    _paq.push(['disableCookies']);
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function () {
+      var u = "//matomo.hotosm.org/";
+      _paq.push(['setTrackerUrl', u + 'matomo.php']);
+      _paq.push(['setSiteId', '34']);
+      var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+      g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
+    })();
 
-  window.onload = function () {
+  window.onload = function() {
     /* Track download button clicks */
     if (U && "MAP" in U && "share" in U.MAP && "download") {
       const uMapShareDownload = U.MAP.share.download;
-      U.MAP.share.download = function (...args) {
-        _paq.push([
-          "trackEvent",
-          "Download",
-          "Click",
-          document.title.slice(0, 100),
-          1,
-        ]);
-        return uMapShareDownload.apply(this, args);
-      };
+      U.MAP.share.download = function(...args) {
+          _paq.push(['trackEvent', 'Download', 'Click', document.title.slice(0,100), 1]);
+          return uMapShareDownload.apply(this, args);
+      }
     }
-  };
+  }
 </script>
 <!-- End Matomo Code -->
diff --git a/app/custom/templates/umap/navigation.html b/app/custom/templates/umap/navigation.html
@@ -7,7 +7,7 @@
   </section>
   
   <section>
-    <button class="nav-hamburger" aria-label="Menu" onclick="this.closest('nav').querySelector('.nav-links').classList.toggle('open'); this.textContent = this.textContent.trim() === '✕' ? '☰' : '✕'">&#9776;</button>
+    <button class="nav-hamburger" aria-label="Menu" onclick="this.closest('nav').querySelector('.nav-links').classList.toggle('open'); this.setAttribute('aria-expanded', this.getAttribute('aria-expanded') !== 'true'); this.textContent = this.getAttribute('aria-expanded') === 'true' ? 'X' : 'Menu'" aria-expanded="false">Menu</button>
     <ul class="nav-links">
       {% if AUTH_PROVIDER != 'hanko' %}
         {% if user.is_authenticated %}<li><a href="{% url 'user_dashboard' %}">{% trans "My Dashboard" %} ({{ user }})</a></li><li><a href="{{ user.get_stars_url }}">{% trans "Starred maps" %}</a></li>{% else %}<li><a href="{% url 'login' %}" class="login">{% trans "Log in" %} / {% trans "Sign in" %}</a></li>{% endif %}
diff --git a/app/hotumap/admin_views.py b/app/hotumap/admin_views.py
@@ -1,7 +1,7 @@
 """
 Admin views for user mapping management.
 
-Compatible with fAIr's admin mapping endpoints.
+Compatible with uMap's admin mapping endpoints.
 Uses basic Django views without REST Framework.
 """
 
diff --git a/app/hotumap/auth_urls.py b/app/hotumap/auth_urls.py
@@ -1,7 +1,7 @@
 """
 Authentication module for uMap.
 
-Provides OSM OAuth login endpoints compatible with fAIr.
+Provides OSM OAuth login endpoints compatible with uMap.
 """
 
 from django.urls import path
diff --git a/app/hotumap/hanko_helpers.py b/app/hotumap/hanko_helpers.py
@@ -7,7 +7,7 @@
 3. Legacy user → Connect OSM to recover account
 4. New user → Create new Django user
 
-This follows the same pattern as fAIr but adapted for uMap's User model.
+This follows the same pattern as uMap but adapted for uMap's User model.
 """
 
 from typing import Optional, Tuple
diff --git a/app/hotumap/views.py b/app/hotumap/views.py
@@ -31,7 +31,7 @@
 class OSMLogin(APIView):
     """Generate OSM OAuth login URL.
     
-    Compatible endpoint with fAIr. Returns login URL for OSM OAuth.
+    Compatible endpoint with uMap. Returns login URL for OSM OAuth.
     """
     renderer_classes = [JSONRenderer]
     
diff --git a/app/settings.py b/app/settings.py
@@ -59,13 +59,11 @@
         "staticfiles": { "BACKEND": "umap.storage.staticfiles.UmapManifestStaticFilesStorage" }
     }
 
-# Ensure hotumap is registered only once (base settings may already add it)
-INSTALLED_APPS = tuple(
-    app for app in INSTALLED_APPS if app not in ("hotumap", "hotumap.apps.HotumapConfig")
+INSTALLED_APPS += (
+    "rest_framework",
+    "hotumap",
+    'dbbackup',
 )
-for _app in ("hotumap.apps.HotumapConfig", "dbbackup", "rest_framework"):
-    if _app not in INSTALLED_APPS:
-        INSTALLED_APPS += (_app,)
 
 if AUTH_PROVIDER == 'hanko':
     INSTALLED_APPS += ("hotosm_auth_django",)
@@ -104,17 +102,16 @@
 SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_KEY=os.environ.get('UMAP_OSM_KEY')
 SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_SECRET=os.environ.get('UMAP_OSM_SECRET')
 
-MIDDLEWARE = list(MIDDLEWARE)
 MIDDLEWARE += ("social_django.middleware.SocialAuthExceptionMiddleware",)
 
 if AUTH_PROVIDER == 'hanko':
+    MIDDLEWARE = list(MIDDLEWARE)
     auth_middleware_index = MIDDLEWARE.index("django.contrib.auth.middleware.AuthenticationMiddleware")
     MIDDLEWARE.insert(auth_middleware_index, "hotosm_auth_django.HankoAuthMiddleware")
     # Add our custom middleware AFTER AuthenticationMiddleware to set request.user
     # This makes @login_required and is_authenticated work with Hanko
     MIDDLEWARE.append("hotumap.middleware.HankoUserMiddleware")
-
-MIDDLEWARE = tuple(MIDDLEWARE)
+    MIDDLEWARE = tuple(MIDDLEWARE)
 
 SOCIAL_AUTH_REDIRECT_IS_HTTPS = os.getenv('UMAP_SOCIAL_AUTH_REDIRECT_IS_HTTPS', 'False').lower() == 'true'
 SOCIAL_AUTH_RAISE_EXCEPTIONS = False
diff --git a/app/test_usermapping.sh b/app/test_usermapping.sh
@@ -7,7 +7,7 @@ set -e
 UMAP_URL="https://umap.hotosm.test"
 LOGIN_URL="https://login.hotosm.test/app"
 
-echo "🔧 uMap User Mapping Test Script"
+echo "uMap User Mapping Test Script"
 echo "=================================="
 echo ""
 
@@ -22,9 +22,9 @@ NC='\033[0m' # No Color
 echo -e "${BLUE}1. Verificando si uMap está respondiendo...${NC}"
 HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -k "$UMAP_URL")
 if [ "$HTTP_CODE" = "302" ] || [ "$HTTP_CODE" = "200" ]; then
-    echo -e "${GREEN}✅ uMap respondiendo (HTTP $HTTP_CODE)${NC}"
+    echo -e "${GREEN}OK uMap respondiendo (HTTP $HTTP_CODE)${NC}"
 else
-    echo -e "${RED}❌ uMap no respondiendo (HTTP $HTTP_CODE)${NC}"
+    echo -e "${RED}FAIL uMap no respondiendo (HTTP $HTTP_CODE)${NC}"
     exit 1
 fi
 echo ""
@@ -35,9 +35,9 @@ RESPONSE=$(curl -s -k "$UMAP_URL/api/auth/status/")
 echo "$RESPONSE" | python -m json.tool 2>/dev/null || echo "$RESPONSE"
 AUTH_PROVIDER=$(echo "$RESPONSE" | python -c "import sys, json; print(json.load(sys.stdin).get('auth_provider', 'unknown'))" 2>/dev/null)
 if [ "$AUTH_PROVIDER" = "hanko" ]; then
-    echo -e "${GREEN}✅ AUTH_PROVIDER=hanko configurado${NC}"
+    echo -e "${GREEN} AUTH_PROVIDER=hanko configurado${NC}"
 else
-    echo -e "${RED}❌ AUTH_PROVIDER no es 'hanko'${NC}"
+    echo -e "${RED} AUTH_PROVIDER no es 'hanko'${NC}"
 fi
 echo ""
 
@@ -48,9 +48,9 @@ echo "GET /api/auth/onboarding/ → HTTP $ONBOARDING_STATUS"
 ONBOARDING_NEW=$(curl -s -o /dev/null -w "%{http_code}" -k "$UMAP_URL/api/auth/onboarding/?new_user=true")
 echo "GET /api/auth/onboarding/?new_user=true → HTTP $ONBOARDING_NEW"
 if [ "$ONBOARDING_STATUS" != "404" ] && [ "$ONBOARDING_NEW" != "404" ]; then
-    echo -e "${GREEN}✅ Rutas de onboarding disponibles${NC}"
+    echo -e "${GREEN} Rutas de onboarding disponibles${NC}"
 else
-    echo -e "${RED}❌ Rutas de onboarding no encontradas${NC}"
+    echo -e "${RED} Rutas de onboarding no encontradas${NC}"
 fi
 echo ""
 
@@ -59,20 +59,20 @@ echo -e "${BLUE}4. Verificando ruta admin...${NC}"
 ADMIN_STATUS=$(curl -s -o /dev/null -w "%{http_code}" -k "$UMAP_URL/api/admin/mappings")
 echo "GET /api/admin/mappings → HTTP $ADMIN_STATUS"
 if [ "$ADMIN_STATUS" != "404" ]; then
-    echo -e "${GREEN}✅ Admin routes disponibles${NC}"
+    echo -e "${GREEN} Admin routes disponibles${NC}"
 else
-    echo -e "${RED}❌ Admin routes no encontradas${NC}"
+    echo -e "${RED} Admin routes no encontradas${NC}"
 fi
 echo ""
 
 # 5. Ask for JWT token
-echo -e "${YELLOW}📋 Para completar la prueba necesitas un JWT token:${NC}"
+echo -e "${YELLOW} Para completar la prueba necesitas un JWT token:${NC}"
 echo ""
-echo "   1. Abre: $LOGIN_URL"
-echo "   2. Crea una cuenta o inicia sesión"
-echo "   3. Abre DevTools (F12)"
-echo "   4. Ve a Aplicación → Cookies → login.hotosm.test"
-echo "   5. Copia el valor de la cookie 'hanko'"
+echo " 1. Abre: $LOGIN_URL"
+echo " 2. Crea una cuenta o inicia sesión"
+echo " 3. Abre DevTools (F12)"
+echo " 4. Ve a Aplicación → Cookies → login.hotosm.test"
+echo " 5. Copia el valor de la cookie 'hanko'"
 echo ""
 read -p "Pega el JWT token (o presiona Enter para saltar): " JWT_TOKEN
 echo ""
@@ -88,11 +88,11 @@ if [ -n "$JWT_TOKEN" ]; then
     # Check if authenticated
     IS_AUTHENTICATED=$(echo "$RESPONSE_WITH_JWT" | python -c "import sys, json; print(json.load(sys.stdin).get('authenticated', False))" 2>/dev/null)
     if [ "$IS_AUTHENTICATED" = "True" ]; then
-        echo -e "${GREEN}✅ Usuario autenticado en uMap${NC}"
+        echo -e "${GREEN} Usuario autenticado en uMap${NC}"
     else
         NEEDS_ONBOARDING=$(echo "$RESPONSE_WITH_JWT" | python -c "import sys, json; print(json.load(sys.stdin).get('needs_onboarding', False))" 2>/dev/null)
         if [ "$NEEDS_ONBOARDING" = "True" ]; then
-            echo -e "${YELLOW}⚠️  Usuario necesita completar onboarding${NC}"
+            echo -e "${YELLOW}  Usuario necesita completar onboarding${NC}"
             echo ""
             echo -e "${BLUE}6. Intentando completar onboarding para nuevo usuario...${NC}"
             ONBOARDING_RESPONSE=$(curl -sL -k "$UMAP_URL/api/auth/onboarding/?new_user=true" \
@@ -102,43 +102,43 @@ if [ -n "$JWT_TOKEN" ]; then
             echo "Onboarding response: HTTP $HTTP_CODE"
             
             if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "302" ]; then
-                echo -e "${GREEN}✅ Onboarding completado${NC}"
+                echo -e "${GREEN} Onboarding completado${NC}"
                 echo ""
                 echo -e "${BLUE}7. Verificando nuevo estado...${NC}"
                 RESPONSE_AFTER=$(curl -s -k "$UMAP_URL/api/auth/status/" \
                     -H "Cookie: hanko=$JWT_TOKEN" \
                     -H "Accept: application/json")
                 echo "$RESPONSE_AFTER" | python -m json.tool 2>/dev/null || echo "$RESPONSE_AFTER"
             else
-                echo -e "${RED}❌ Error en onboarding (HTTP $HTTP_CODE)${NC}"
+                echo -e "${RED} Error en onboarding (HTTP $HTTP_CODE)${NC}"
             fi
         else
-            echo -e "${RED}❌ Usuario no autenticado pero no necesita onboarding${NC}"
+            echo -e "${RED} Usuario no autenticado pero no necesita onboarding${NC}"
         fi
     fi
     echo ""
 else
-    echo -e "${YELLOW}⚠️  JWT token no proporcionado, saltando prueba autenticada${NC}"
+    echo -e "${YELLOW}  JWT token no proporcionado, saltando prueba autenticada${NC}"
 fi
 
 echo ""
 echo -e "${BLUE}=================================="
 echo "Resumen de Endpoints Disponibles:"
 echo -e "==================================${NC}"
 echo ""
-echo "📌 STATUS: GET /api/auth/status/"
-echo "   → Sin JWT: Muestra auth_provider y estado"
-echo "   → Con JWT: Muestra usuario y mapping"
+echo " STATUS: GET /api/auth/status/"
+echo " → Sin JWT: Muestra auth_provider y estado"
+echo " → Con JWT: Muestra usuario y mapping"
 echo ""
-echo "📌 ONBOARDING: GET /api/auth/onboarding/?new_user=true"
-echo "   → Crea user mapping para nuevo usuario"
-echo "   → Requiere JWT con nuevo usuario sin mapping"
+echo " ONBOARDING: GET /api/auth/onboarding/?new_user=true"
+echo " → Crea user mapping para nuevo usuario"
+echo " → Requiere JWT con nuevo usuario sin mapping"
 echo ""
-echo "📌 ONBOARDING LEGACY: GET /api/auth/onboarding/"
-echo "   → Crea user mapping para usuario con OSM anterior"
-echo "   → Requiere JWT + OSM connection"
+echo " ONBOARDING LEGACY: GET /api/auth/onboarding/"
+echo " → Crea user mapping para usuario con OSM anterior"
+echo " → Requiere JWT + OSM connection"
 echo ""
-echo "📌 ADMIN: GET /api/admin/mappings"
-echo "   → Lista todos los user mappings (requiere admin)"
+echo " ADMIN: GET /api/admin/mappings"
+echo " → Lista todos los user mappings (requiere admin)"
 echo ""
-echo -e "${GREEN}✅ Test completado${NC}"
+echo -e "${GREEN} Test completado${NC}"
diff --git a/app/urls.py b/app/urls.py
@@ -17,7 +17,7 @@
    # API routes
    path('api/get_map/<path:map_id>', api.get_map, name='api_get_map'),
 
-   # Auth API routes (compatible with fAIr)
+   # Auth API routes (compatible with uMap)
    path('api/v1/auth/', include('hotumap.auth_urls')),
 ]
 
