Merge pull request #137 from mapswipe/feat/project-website-url

Add link to project in mapswipe website (query)

Author: susilnem

apps/project/graphql/types/types.py

@@ -12,6 +12,7 @@
 from apps.contributor.graphql.types import ContributorTeamType
 from apps.project.models import Organization, Project, ProjectAsset, ProjectAssetInputTypeEnum
 from apps.tutorial.graphql.types.types import TutorialType
+from main.config import Config
 from main.graphql.context import Info
 from project_types.tile_map_service.compare import project as compare_project
 from project_types.tile_map_service.completeness import project as completeness_project
@@ -173,6 +174,10 @@ def name(self, project: strawberry.Parent[Project]) -> str:
         # This is used for mutation response
         return project.generate_name()
 
+    @strawberry_django.field(only=["firebase_id"])
+    def website_url(self, project: strawberry.Parent[Project]) -> str:
+        return Config.WebsiteKeys.project(project.firebase_id)
+
     @strawberry_django.field(only=["project_type_specifics", "project_type"])
     async def project_type_specifics(
         self,

docker-compose.yaml

@@ -23,7 +23,8 @@ x-server: &base_server_setup
     # Domain configs
     APP_DOMAIN: ${APP_DOMAIN:-http://localhost:8000}
     MANAGER_DASHBOARD_DOMAIN: ${MANAGER_DASHBOARD_DOMAIN:-http://localhost:3000}
-    COMMUNITY_DASHBOARD_DOMAIN: ${COMMUNITY_DASHBOARD_DOMAIN:-http://localhost:3100}
+    COMMUNITY_DASHBOARD_DOMAIN: ${COMMUNITY_DASHBOARD_DOMAIN:-http://localhost:3020}
+    WEBSITE_DOMAIN: ${WEBSITE_DOMAIN:-http://localhost:3200}
     SESSION_COOKIE_DOMAIN: ${SESSION_COOKIE_DOMAIN:-localhost}
     CSRF_COOKIE_DOMAIN: ${CSRF_COOKIE_DOMAIN:-localhost}
     # Postgres

main/config.py

@@ -26,6 +26,7 @@ class Config:
     # Client domains
     MANAGER_DASHBOARD_DOMAIN = typing.cast("URLParseResult", settings.MANAGER_DASHBOARD_DOMAIN)
     COMMUNITY_DASHBOARD_DOMAIN = typing.cast("URLParseResult", settings.COMMUNITY_DASHBOARD_DOMAIN)
+    WEBSITE_DOMAIN = typing.cast("URLParseResult", settings.WEBSITE_DOMAIN)
 
     # NOTE: We get AOI for validate from HOT tasking manager
     HOT_TASKING_MANAGER_PROJECT_API_LINK = "https://tasking-manager-production-api.hotosm.org/api/v2/"
@@ -60,6 +61,11 @@ def contributor_user(firebae_id: str):
         def contributor_user_group(firebase_id: str):
             return f"{Config.COMMUNITY_DASHBOARD_DOMAIN.geturl()}/user-group/{firebase_id}"
 
+    class WebsiteKeys:
+        @staticmethod
+        def project(firebase_id: str):
+            return f"{Config.WEBSITE_DOMAIN.geturl()}/en/projects/{firebase_id}"
+
     class FirebaseKeys:
         @staticmethod
         def backend_wait():

main/settings.py

@@ -46,9 +46,9 @@ def urlparse(value) -> ParseResult:
     # Domain configs
     APP_DOMAIN=str,  # Eg: https://api.example.org
     MEDIA_STORAGE_DOMAIN=(str, None),
-    FRONTEND_DOMAIN=str,  # Eg: https://web.example.org
     MANAGER_DASHBOARD_DOMAIN=str,  # Eg: https://managers.mapswipe.org
-    COMMUNITY_DASHBOARD_DOMAIN=str,  # Eg: https://community.mapswipe.org/
+    COMMUNITY_DASHBOARD_DOMAIN=str,  # Eg: https://community.mapswipe.org
+    WEBSITE_DOMAIN=str,  # Eg: https://mapswipe.org
     SESSION_COOKIE_DOMAIN=str,  # .example.com
     CSRF_COOKIE_DOMAIN=str,  # .example.com
     MAPSWIPE_ADDITIONAL_TRUSTED_ORIGINS=(list, []),  # https://app1.example.com,https://app2.example.com
@@ -143,6 +143,7 @@ def urlparse(value) -> ParseResult:
 MEDIA_STORAGE_DOMAIN = urlparse(env("MEDIA_STORAGE_DOMAIN")) or APP_DOMAIN
 MANAGER_DASHBOARD_DOMAIN = urlparse(env("MANAGER_DASHBOARD_DOMAIN"))
 COMMUNITY_DASHBOARD_DOMAIN = urlparse(env("COMMUNITY_DASHBOARD_DOMAIN"))
+WEBSITE_DOMAIN = urlparse(env("WEBSITE_DOMAIN"))
 APP_ENVIRONMENT = env("APP_ENVIRONMENT").upper()
 APP_TYPE = env("APP_TYPE").upper()
 APP_RELEASE = env("APP_RELEASE") or GIT_HELPER.commit_sha
@@ -434,6 +435,8 @@ def urlparse(value) -> ParseResult:
     APP_DOMAIN.geturl(),
     MANAGER_DASHBOARD_DOMAIN.geturl(),
     COMMUNITY_DASHBOARD_DOMAIN.geturl(),
+    # NOTE: We might not need to enable trusted origin for website
+    # WEBSITE_DOMAIN.geturl(),
     *env("MAPSWIPE_ADDITIONAL_TRUSTED_ORIGINS"),
 ]
 

schema.graphql

@@ -1664,6 +1664,7 @@ type ProjectType implements UserResourceTypeMixin & ProjectExportAssetTypeMixin
   How many people do you want to see every tile before you consider it finished?
   """
   verificationNumber: Int!
+  websiteUrl: String!
 }
 
 type ProjectTypeAreaStatsType {