chore(updates): csrf token

client/src/components/Utils/Config.js

@@ -1,2 +1,3 @@
 export const backendBaseUrl = "http://127.0.0.1:8000";
 export const apiUrl = `${backendBaseUrl}/api/articles/`;
+

research/src/components/layout/BaseHead.astro

@@ -83,7 +83,7 @@ const { title, description, ogImage } = Astro.props;
     line-height: 1.7;
   }
 
-  .dark {
+  .dak {
     body {
       background: black;
       color: white;

research/src/layouts/Footer.astro

@@ -108,7 +108,7 @@
             </p>
         </div>
         <form
-            action="http://127.0.0.1:8000/newsletter/subscribe/"
+            action="https://cms.2077.xyz/newsletter/subscribe/"
             method="post"
             id="subscribe-form"
             class="flex justify-center"
@@ -132,65 +132,68 @@
     </div>
 
     <script>
-      document.addEventListener('DOMContentLoaded', function() {
-          const form = document.getElementById('subscribe-form');
-
-          // Fetch CSRF token from Django backend and handle form submission
-          if (form) {
-              fetch('http://127.0.0.1:8000/get-csrf-token/')
-                  .then(response => response.json())
-                  .then(data => {
-                      const csrfToken = data.csrfToken;
-
-                      // Add CSRF token as a hidden input field
-                      const input = document.createElement('input');
-                      input.type = 'hidden';
-                      input.name = 'csrfmiddlewaretoken';
-                      input.value = csrfToken;
-                      form.appendChild(input);
-
-                      // Handle form submission
-                      form.addEventListener('submit', function(event) {
-                          event.preventDefault();
-
-                          const formData = new FormData(form);
-
-                          fetch(form.action, {
-                              method: 'POST',
-                              body: formData,
-                              headers: {
-                                  'X-CSRFToken': csrfToken,
-                              },
-                          })
-                          .then(response => {
-                              if (response.ok) {
-                                  return response.json();
-                              } else {
-                                  return response.json().then(data => {
-                                      throw new Error(data.message || 'An error occurred');
-                                  });
-                              }
-                          })
-                          .then(data => {
-                              const messageElement = document.getElementById('response-message');
-                              messageElement.textContent = 'Subscription successful!';
-                              messageElement.style.color = 'green';
-                          })
-                          .catch(error => {
-                              const messageElement = document.getElementById('response-message');
-                              messageElement.textContent = error.message || 'An error occurred. Please try again.';
-                              messageElement.style.color = 'red';
-                          });
-                      });
-                  })
-                  .catch(error => {
-                      console.error('Error fetching CSRF token:', error);
-                      const messageElement = document.getElementById('response-message');
-                      messageElement.textContent = 'An error occurred while fetching the CSRF token. Please try again.';
-                      messageElement.style.color = 'red';
-                  });
-          }
+      document.addEventListener('DOMContentLoaded', () => {
+  const form = document.getElementById('subscribe-form') as HTMLFormElement;
+
+  if (form) {
+    fetch('https://cms.2077.xyz/get-csrf-token/')
+      .then(response => response.json())
+      .then((data: { csrfToken: string }) => {
+        const csrfToken = data.csrfToken;
+
+        const input = document.createElement('input');
+        input.type = 'hidden';
+        input.name = 'csrfmiddlewaretoken';
+        input.value = csrfToken;
+        form.appendChild(input);
+
+        form.addEventListener('submit', (event) => {
+          event.preventDefault();
+
+          const formData = new FormData(form);
+
+          fetch(form.action, {
+            method: 'POST',
+            body: formData,
+            headers: {
+              'X-CSRFToken': csrfToken,
+            },
+          })
+          .then(response => {
+            if (response.ok) {
+              return response.json();
+            } else {
+              return response.json().then((data: { message: string }) => {
+                throw new Error(data.message || 'An error occurred');
+              });
+            }
+          })
+          .then(() => {
+            const messageElement = document.getElementById('response-message') as HTMLElement;
+            if (messageElement) {
+              messageElement.textContent = 'Subscription successful!';
+              messageElement.style.color = 'green';
+            }
+          })
+          .catch((error: Error) => {
+            const messageElement = document.getElementById('response-message') as HTMLElement;
+            if (messageElement) {
+              messageElement.textContent = error.message || 'An error occurred. Please try again.';
+              messageElement.style.color = 'red';
+            }
+          });
+        });
+      })
+      .catch((error: Error) => {
+        console.error('Error fetching CSRF token:', error);
+        const messageElement = document.getElementById('response-message') as HTMLElement;
+        if (messageElement) {
+          messageElement.textContent = 'An error occurred while fetching the CSRF token. Please try again.';
+          messageElement.style.color = 'red';
+        }
       });
+  }
+});
   </script>
 </div>
 

research/src/layouts/Header.astro

@@ -2,10 +2,10 @@
   <nav class="flex justify-between">
 
     <div>
-      <a href="/" class="logo block light dark:hidden">
+      <a href="/" class="logo block light">
         <img src="/logo-black.webp" alt="" width="197" height="58" />
       </a>
-      <a href="/" class="logo hidden dark dark:block">
+      <a href="/" class="logo hidden">
         <img src="/logo-white.webp" alt="" width="197" height="58" />
       </a>
     </div>
@@ -180,7 +180,7 @@
         >
         <a
           href="#subscribe"
-          class="bg-green text-white dark:bg-greenLm dark:text-black px-8 py-2 rounded font-bold"
+          class="bg-greenLm text-black px-8 py-2 rounded font-bold"
         >
           Subscribe
         </a>

research/src/pages/[categories]/[category].astro

@@ -21,7 +21,7 @@ const category = Astro.params.category;
 
 try {
   const response = await fetch(
-    `http://127.0.0.1:8000/api/articles/category/${category}/`,
+    `https://cms.2077.xyz/api/articles/category/${category}/`,
   );
   if (!response.ok) {
     throw new Error(`HTTP error! status: ${response.status}`);

research/src/pages/[id].astro

@@ -26,7 +26,7 @@ const id = Astro.params.id;
 let article: Article | null = null;
 
 try {
-    const response = await fetch(`http://127.0.0.1:8000/api/articles/${id}`);
+    const response = await fetch(`https://cms.2077.xyz/api/articles/${id}`);
     if (!response.ok) {
         throw new Error(`HTTP error! status: ${response.status}`);
     }

research/src/pages/index.astro

@@ -13,13 +13,15 @@ interface Article {
   views: string;
   summary: string;
   categories: Category[];
-  thumb: string;
+  thumb: {
+    url: string;
+  };
 }
 
 let articles: Article[] = [];
 
 try {
-  const response = await fetch("http://127.0.0.1:8000/api/articles");
+  const response = await fetch("https://cms.2077.xyz/api/articles");
   articles = await response.json();
 } catch (error) {
   console.error(error);

server/apps/research/models/article.py

@@ -6,6 +6,11 @@
 from .category import Category
 from .author import Author
 from django.utils import timezone
+from django.conf import settings
+
+
+def get_default_thumb():
+    return f"{settings.MEDIA_URL}images/2077-Collective.png"
 
 class Article(BaseModel):
     """Model for articles."""
@@ -21,7 +26,7 @@ class Article(BaseModel):
     authors = models.ManyToManyField(Author, blank=True, related_name='articles')
     slug = models.SlugField(blank=True)
     categories = models.ManyToManyField(Category, blank=True, related_name='articles')
-    thumb = models.ImageField(upload_to='images/', default='../media/images/2077-Collective.png', blank=True)
+    thumb = models.ImageField(upload_to='images/', default=get_default_thumb, blank=True)
     views = models.PositiveBigIntegerField(default=0)
     status = models.CharField(max_length=10, choices=options, default='draft')
     scheduled_publish_time = models.DateTimeField(null=True, blank=True, db_index=True)    

server/core/config/base.py

@@ -160,7 +160,7 @@
 
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
-MEDIA_URL = '/media/'
+MEDIA_URL = 'https://cms.2077.xyz/media/'
 
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 

server/requirements.txt

@@ -5,12 +5,14 @@ attrs==24.1.0
 billiard==4.2.0
 celery==5.4.0
 certifi==2024.7.4
+cffi==1.17.0
 charset-normalizer==3.3.2
 click==8.1.7
 click-didyoumean==0.3.1
 click-plugins==1.1.1
 click-repl==0.3.0
 cron-descriptor==1.4.3
+cryptography==43.0.0
 Django==5.0.8
 django-celery-beat==2.6.0
 django-ckeditor==6.7.1
@@ -33,6 +35,8 @@ jsonschema-specifications==2023.12.1
 kombu==5.4.0
 pillow==10.4.0
 prompt_toolkit==3.0.47
+pycparser==2.22
+pyOpenSSL==24.2.1
 python-crontab==3.2.0
 python-dateutil==2.9.0.post0
 python-decouple==3.8