fixed urls sometimes not using localhost in testing

Author: SharpBit

core/config.py

@@ -12,6 +12,7 @@ class SiteConfig(Config):
     DISCORD_CLIENT_SECRET = os.getenv('DISCORD_CLIENT_SECRET')
     PORT = int(os.getenv('PORT', 4000))
     DOMAIN = 'sharpbit.dev' if not DEV else f'127.0.0.1:{PORT}'
+    BASE_URL = f"http{'s' if not DEV else ''}://{DOMAIN}"
     DB_USERNAME = os.getenv('DB_USERNAME')
     DB_PASSWORD = os.getenv('DB_PASSWORD')
     DB_NAME = os.getenv('DB_NAME')

core/routes.py

@@ -82,6 +82,7 @@ async def dashboard_home(request: Request):
         request=request,
         title="Dashboard",
         description='Dashboard for your account.',
+        base_url=request.app.config.BASE_URL,
         urls=urls,
         pastes=pastes
     )
@@ -108,12 +109,11 @@ async def create_url(request: Request):
             if existing:
                 return add_message(request, 'error', 'That code is already taken. Try another one.', '/urlshortener')
         await conn.execute('INSERT INTO urls(user_id, code, url) VALUES ($1, $2, $3)', account, code, url)
-    secure = 's' if not request.app.config.DEV else ''
     return add_message(
         request,
         'success',
-        f"Shortened URL created at <a href=\"http{secure}://{request.app.config.DOMAIN}/{code}\">"
-        f"http{'s' if not request.app.config.DEV else ''}://{request.app.config.DOMAIN}/{code}</a>",
+        f"Shortened URL created at <a href=\"{request.app.config.BASE_URL}/{code}\">"
+        f"{request.app.config.BASE_URL}/{code}</a>",
         '/urlshortener'
     )
 

core/templates/dashboard.html

@@ -4,13 +4,13 @@ <h1 style="padding-top:20px">Dashboard</h1>
 <div class="content-section" style="padding-bottom:20px">
   <h3>Shortened URLs</h3>
   {% for url in urls %}
-    <a href="{{ url.url }}">https://sharpbit.dev/{{ url.code }}</a><br />
+    <a href="{{ url.url }}">{{ base_url }}/{{ url.code }}</a><br />
   {% endfor %}
 </div>
 <div class="content-section" style="padding-bottom:20px">
   <h3>Pastebins</h3>
   {% for p in pastes %}
-    <a href="https://sharpbit.dev/pastebin/{{ p.code }}">https://sharpbit.dev/pastebin/{{ p.code }}</a><br />
+    <a href="{{ base_url }}/pastebin/{{ p.code }}">{{ base_url }}/pastebin/{{ p.code }}</a><br />
   {% endfor %}
 </div>
 {% endblock content %}