Merge

server/apps/research/urls.py

@@ -3,12 +3,13 @@
 from .views import ArticleViewSet, index
 from django.conf import settings
 from django.conf.urls.static import static
+from .utils import astro_proxy
 
 router = DefaultRouter()
 router.register(r'articles', ArticleViewSet, basename='article')
 
 urlpatterns = [
-    path('', index, name='index'),  
+    path('', astro_proxy, name='astro_proxy'),  
     path('api/', include(router.urls)),
 
     # Custom URL for retrieving articles by slug or UUID

server/apps/research/utils.py

@@ -0,0 +1,6 @@
+from django.http import HttpResponse
+import requests
+
+def astro_proxy(request):
+    response = requests.get('http://localhost:4321' + request.path)
+    return HttpResponse(response.content, content_type=response.headers['Content-Type'])

server/apps/research/views.py

@@ -3,14 +3,15 @@
 from django.shortcuts import render
 from rest_framework import viewsets, status
 from rest_framework.response import Response
+from .utils import astro_proxy
 import uuid
 
 from .models import Article
 from .permissions import ArticleUserWritePermission
 from .serializers import ArticleSerializer, ArticleCreateUpdateSerializer
 
 def index(request):
-    return render(request, 'index.html')
+    return astro_proxy(request)
 
 
 class ArticleViewSet(viewsets.ModelViewSet):

server/core/config/base.py

@@ -190,3 +190,4 @@
 from .ckeditor import *
 from .celery_config import *
 from .mail import *
+

server/core/config/production.py

@@ -57,4 +57,7 @@
 
 SECURE_SSL_REDIRECT = False
 
-SESSION_COOKIE_SECURE = True
+SESSION_COOKIE_SECURE = True
+
+#PROXY_SETTING for Astro server
+PROXY_ASTERISK = True