Merge pull request #81 from LaurierCS/minor_changes_v1

Minor changes v1

Author: aidantrabs

Pipfile

@@ -62,6 +62,7 @@ Django = "==3.1.5"
 ipython_genutils = "==0.2.0"
 Pillow = "==8.3.2"
 Pygments = "==2.9.0"
+python-dotenv = "*"
 
 [dev-packages]
 

Pipfile.lock

@@ -14,19 +14,20 @@
 import environ
 import django_heroku
 from pathlib import Path
+from dotenv import load_dotenv, find_dotenv
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-socapu5gn7i#(=9k1#aby#&65j@z0)e@1#)8=1@6-2^7gp!(l4'
+load_dotenv(find_dotenv())
+SECRET_KEY = os.environ['SECRET_KEY'] 
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = []
 ALLOWED_HOSTS = ['127.0.0.1', '0.0.0.0', 'techunt.herokuapp.com', ]

Wampus/settings.py

@@ -22,8 +22,9 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls), # Do Not Remove
-    path('', views.homepage_view),
+    path('', views.landing_view),
     path('login/', views.login_view),
+    path('home/', views.homepage_view),
     path('search/', views.search_projects_view, name='search-projects'),
     path('logout/', views.logout_view),
     path('register/', views.register_view),
@@ -32,8 +33,7 @@
     path('profile/', views.profilepage_view),
     path('about-us/', views.aboutus_view),
     path('create-project/', views.createproject_view),
-    path('edit-profile/', views.editprofile_view),
-    path('landing/', views.landing_view)
+    path('edit-profile/', views.editprofile_view)
 ]
 
 """

Wampus/urls.py

@@ -22,7 +22,7 @@
 <div class="landingBackground">
     <img style="width: 250px; margin: 2% 0 0 4%;" src="../static/images/Logo.png">
     <div class="landingInfo">
-        <h1 style="font-size:xx-large;font-family: Lora;color: #FFFFFF;font-style: italic;">A CATCHY SENTENCE HERE</h1>
+        <h1 style="font-size:xx-large;font-family: Lora;color: #FFFFFF;">Welcome!</h1>
         <a style="font-size:large;font-family: Karla;color: #868686;font-weight: lighter;">
             Tech Hunt gives you chance to connect with the people worldwide, to collaborate on projects they have created and/or you have created, in a quick and simple way. Find the right projects and find the right people.
         </a>

app/templates/landing.html

@@ -14,7 +14,7 @@ def login_view(request):
 
     # If the user is already logged in, redirect to homepage
     if request.user.is_authenticated:
-        return redirect('/')
+        return redirect('/homepage/')
 
     # Get user input from the login form
     if request.method == 'POST':
@@ -27,7 +27,7 @@ def login_view(request):
         # If the user is authenticated, log them in
         if user is not None:
             login(request, user)
-            return redirect('/')
+            return redirect('/homepage/')
 
         else:  # If the user is not authenticated, show an error message
             messages.error(request, 'Invalid username or password')
@@ -49,7 +49,7 @@ def register_view(request):
     if form.is_valid():    
         user = form.save() # If the form is valid, save the user
         login(request, user) # Log the user in
-        return redirect('/') # Redirect to homepage 
+        return redirect('/homepage/') # Redirect to homepage 
 
     context = {'form': form }
 
@@ -86,7 +86,7 @@ def search_projects_view(request):
     profile = Profile.objects.get(user=user) # Get the user's profile
 
     if request.method == "GET":
-        return redirect('/')
+        return redirect('/homepage/')
 
     if request.method == "POST":
         search_value = request.POST['search_value']
@@ -209,7 +209,7 @@ def deleteproject_view(request, project_id):
             project.delete()
             return redirect('/profile')
     else:
-        return redirect('/')
+        return redirect('/homepage/')
 
     template_name = 'delete-project.html'
 
@@ -257,18 +257,7 @@ def editprofile_view(request):
     return render(request, template_name, context)
 
 def landing_view(request):
-    object1 = """Some object queried from the Database, 
-                maybe a project or set of project objects"""
-
-    context = {
-        # You place objects in here that you want to bring
-        # to the front end. You do it just by adding them
-        # to this dictionary commonly called context -
-        # simply store key and value pairs
-        # For example:
-        'object1': object1
-    }
 
     template_name = 'landing.html'
 
-    return render(request, template_name, context)
+    return render(request, template_name)

app/views.py

@@ -56,3 +56,4 @@ urllib3==1.26.2
 wcwidth==0.2.5
 whitenoise==5.2.0
 wrapt==1.12.1
+python-dotenv==0.19.2