From d4c392916c4ef86f7e3c97c09a98a9971ee1e70c Mon Sep 17 00:00:00 2001
From: Rushil Umaretiya <rushilwiz@gmail.com>
Date: Mon, 15 Feb 2021 16:10:14 -0500
Subject: [PATCH] fix: fixed urls for prod

---
 config/settings.py                       |  2 ++
 innovate/templates/innovate/confirm.html |  2 +-
 innovate/templates/innovate/index.html   |  2 +-
 launchx/templates/launchx/base.html      | 14 +++++++-------
 launchx/templatetags/launchx_extras.py   |  6 +++++-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/config/settings.py b/config/settings.py
index cfb01ca..f1ca51b 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -150,8 +150,10 @@ STATIC_URL = '/static/'
 
 if DEBUG:
     STATIC_PREFIX = STATIC_URL
+    URL_PREFIX = ''
 else:
     STATIC_PREFIX = '/launchx' + STATIC_URL
+    URL_PREFIX = '/launchx'
 
 CRISPY_TEMPLATE_PACK = 'bootstrap4'
 
diff --git a/innovate/templates/innovate/confirm.html b/innovate/templates/innovate/confirm.html
index b551a62..94800ec 100644
--- a/innovate/templates/innovate/confirm.html
+++ b/innovate/templates/innovate/confirm.html
@@ -9,6 +9,6 @@
     <main class="signup">
         <h1>Congrats!</h1>
         <h4>You've successfully signed up for InnovateTJ, please check your email for a confirmation. We'll see you there!</h4>
-        <a href="{% url 'landing' %}"><button class="btn btn-light">Back</button></a>
+        <a href="{% url '/' %}"><button class="btn btn-light">Back</button></a>
     </main>
 {% endblock %}
\ No newline at end of file
diff --git a/innovate/templates/innovate/index.html b/innovate/templates/innovate/index.html
index 90308ae..427b7e8 100644
--- a/innovate/templates/innovate/index.html
+++ b/innovate/templates/innovate/index.html
@@ -42,7 +42,7 @@
     </div>
     <div class="col-sm-4 sign-up">
         <h1>Sign up </h>
-            <a href="{% url 'competitor-signup' %}" class="btn btn-light signup">Here</a>
+            <a href="{% url '/innovate/signup' %}" class="btn btn-light signup">Here</a>
     </div>
 </section>
 {% endblock %}
\ No newline at end of file
diff --git a/launchx/templates/launchx/base.html b/launchx/templates/launchx/base.html
index 3bc7932..21a72df 100644
--- a/launchx/templates/launchx/base.html
+++ b/launchx/templates/launchx/base.html
@@ -22,23 +22,23 @@
     <header class="site-header">
       <nav class="navbar navbar-expand-lg navbar-dark">
         <div class="container">
-          <a class="navbar-brand mr-4" href="{% url 'landing' %}">LaunchX</a>
+          <a class="navbar-brand mr-4" href="{% url '/' %}">LaunchX</a>
           <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
           </button>
           <div class="collapse navbar-collapse" id="navbarToggle">
             <div class="navbar-nav mr-auto">
-              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'landing' %}active{% endif %}" href="{% url 'landing' %}">Home</a>
-              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'innovate-home' %}active{% endif %}" href="{% url 'innovate-home' %}">InnovateTJ</a>
-              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'calendar' %}active{% endif %}" href="{% url 'calendar' %}">Calendar</a>
-              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'officers' %}active{% endif %}" href="{% url 'officers' %}">Officers</a>
+              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'landing' %}active{% endif %}" href="{% url '/' %}">Home</a>
+              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'innovate-home' %}active{% endif %}" href="{% url '/innovate' %}">InnovateTJ</a>
+              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'calendar' %}active{% endif %}" href="{% url '/calendar' %}">Calendar</a>
+              <a class="nav-item nav-link {% if request.resolver_match.url_name == 'officers' %}active{% endif %}" href="{% url '/officers' %}">Officers</a>
             </div>
             <!-- Navbar Right Side -->
             <div class="navbar-nav">
               {% if user.is_authenticated %}
-              <a class="nav-item nav-link" href="{% url 'logout' %}">Logout</a>
+              <a class="nav-item nav-link" href="{% url '/logout' %}">Logout</a>
               {% else %}
-              <a class="nav-item nav-link" href="{% url 'login' %}">Login</a>
+              <a class="nav-item nav-link" href="{% url '/login' %}">Login</a>
               {% endif %}
             </div>
           </div>
diff --git a/launchx/templatetags/launchx_extras.py b/launchx/templatetags/launchx_extras.py
index 2aec285..9920543 100644
--- a/launchx/templatetags/launchx_extras.py
+++ b/launchx/templatetags/launchx_extras.py
@@ -5,4 +5,8 @@ register = template.Library()
 
 @register.simple_tag
 def static(file_location):
-    return settings.STATIC_PREFIX + file_location
\ No newline at end of file
+    return settings.STATIC_PREFIX + file_location
+
+@register.simple_tag
+def url(url):
+    return settings.URL_PREFIX + url
\ No newline at end of file