update project

Author: 3bbaas

manage.py

@@ -2,10 +2,16 @@
 """Django's command-line utility for administrative tasks."""
 import os
 import sys
+from dotenv import load_dotenv
+from pathlib import Path
 
 
 def main():
     """Run administrative tasks."""
+    # Load environment variables from .env
+    BASE_DIR = Path(__file__).resolve().parent.parent
+    load_dotenv(dotenv_path=BASE_DIR / '.env')
+
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'url_shortener.settings')
     try:
         from django.core.management import execute_from_command_line

url_shortener/asgi.py

@@ -8,9 +8,15 @@
 """
 
 import os
+from dotenv import load_dotenv
+from pathlib import Path
 
 from django.core.asgi import get_asgi_application
 
+# Load environment variables from .env
+BASE_DIR = Path(__file__).resolve().parent.parent
+load_dotenv(dotenv_path=BASE_DIR / '.env')
+
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'url_shortener.settings')
 
 application = get_asgi_application()

url_shortener/settings.py

@@ -10,22 +10,26 @@
 https://docs.djangoproject.com/en/5.1/ref/settings/
 """
 
+import os
 from pathlib import Path
+from dotenv import load_dotenv
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
+load_dotenv(dotenv_path=BASE_DIR / '.env')
 
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure--wx4z5k+&&f%(gr@a4sf$ukenexsr@=ff5uq4(psr9q#$+&)19'
+SECRET_KEY = os.getenv('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
+# DEBUG = os.getenv('DEBUG', 'False').lower() in ['true', '1', 't']
 DEBUG = True
-
-ALLOWED_HOSTS = []
+# ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', '').split(',')
+ALLOWED_HOSTS = ['*']
 
 
 # Application definition
@@ -122,3 +126,12 @@
 # https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+# Additional settings
+BITLY_API_KEY = os.getenv('BITLY_API_KEY')
+CUTLLY_API_KEY = os.getenv('CUTLLY_API_KEY')
+
+
+print(f"SECRET_KEY: {SECRET_KEY}")
+print(f"BITLY_API_KEY: {BITLY_API_KEY}")
+print(f"CUTLLY_API_KEY: {CUTLLY_API_KEY}")

url_shortener/views.py

@@ -1,3 +1,4 @@
+import os
 import re
 
 import pyshorteners
@@ -7,6 +8,9 @@
 
 from .forms import get_url
 
+BITLY_API_KEY = os.environ.get("BITLY_API_KEY")
+CUTLLY_API_KEY = os.environ.get("CUTLLY_API_KEY")
+
 
 def generate_url(request):
     form = get_url(request.POST or None)
@@ -46,7 +50,7 @@ def generate_url(request):
                     s = pyshorteners.Shortener()
                     shortened_url = s.tinyurl.short(long_url)
                 elif site == "bitly":
-                    s = pyshorteners.Shortener(api_key='de36c105ae76331609a19ff1ce2d391012d5710a')
+                    s = pyshorteners.Shortener(api_key=BITLY_API_KEY)
                     shortened_url = s.bitly.short(long_url)
                 elif site == "chilpit":
                     s = pyshorteners.Shortener()
@@ -55,7 +59,7 @@ def generate_url(request):
                     s = pyshorteners.Shortener()
                     shortened_url = s.clckru.short(long_url)
                 elif site == "cuttly":
-                    s = pyshorteners.Shortener(api_key='3745d515279a2c9396a5144c99c0017ed81b9')
+                    s = pyshorteners.Shortener(api_key=CUTLLY_API_KEY)
                     shortened_url = s.cuttly.short(long_url)
                 elif site == "dagd":
                     s = pyshorteners.Shortener()
@@ -66,4 +70,4 @@ def generate_url(request):
             except pyshorteners.exceptions.ShorteningErrorException as e:
                 error_message = "Failed to shorten the URL. Please try again later."
 
-    return render(request, 'home.html', {'form': form, 'shortened_url': shortened_url, 'error_message': error_message})
+    return render(request, 'home.html', {'form': form, 'shortened_url': shortened_url, 'error_message': error_message})

url_shortener/wsgi.py

@@ -8,9 +8,15 @@
 """
 
 import os
+from dotenv import load_dotenv
+from pathlib import Path
 
 from django.core.wsgi import get_wsgi_application
 
+# Load environment variables from .env
+BASE_DIR = Path(__file__).resolve().parent.parent
+load_dotenv(dotenv_path=BASE_DIR / '.env')
+
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'url_shortener.settings')
 
 application = get_wsgi_application()