Merge branch 'master' of github.com:thirdeye-dev/thirdeye into 0x0ell…

…iot/stop-contract-monitoring

backend/authentication/views.py

@@ -162,18 +162,18 @@ def github_login(request):
     REPLACEMENT_DOMAIN = "localhost:3000"
 
     if settings.DEMO_INSTANCE:
-        REPLACEMENT_DOMAIN = settings.API_DOMAIN
+        REPLACEMENT_DOMAIN = settings.FRONTEND_DOMAIN
 
-    # REPLACEMENT_DOMAIN += "/api
+    REPLACEMENT_DOMAIN += "/api"
 
     current_domain = request.get_host()
 
     redirect_uri = request.build_absolute_uri(reverse("oauth_github_callback")).replace(
         current_domain, REPLACEMENT_DOMAIN
     )
 
-    # if settings.DEMO_INSTANCE:
-    #     redirect_uri = redirect_uri.replace("http://", "https://")
+    if settings.DEMO_INSTANCE:
+        redirect_uri = redirect_uri.replace("http://", "https://")
 
     try:
         return oauth.github.authorize_redirect(request, redirect_uri)

backend/backend/settings.py

@@ -166,11 +166,11 @@
 
 API_URL = f"http://{API_DOMAIN}/"
 
-FRONTEND_URL_MAIN = "https://thirdeyelabs.xyz/"
-FRONTEND_URL_IPFS = "https://ipfs.thirdeyelabs.xyz/"
+FRONTEND_DOMAIN = "demo.thirdeyelabs.xyz"
+FRONTEND_URL_MAIN = f"https://{FRONTEND_DOMAIN}/"
 
 FRONTEND_URL = (
-    FRONTEND_URL_IPFS
+    FRONTEND_URL_MAIN
     if DEMO_INSTANCE
     else os.environ.get("FRONTEND_URL", "http://localhost:3000/")
 )
@@ -312,3 +312,5 @@
         {"url": "http://localhost:3000/", "description": "Localhost API base URL"},
     ],
 }
+
+# Some change

frontend/README.md

@@ -1,3 +1,5 @@
+# ThirdEye
+
 This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
 
 ## Getting Started