Merge branch 'main' into views/forms/final-sprint

Author: dhav15

Wampus/Wampus/urls.py

@@ -27,7 +27,7 @@
     path('search/', views.search_projects_view, name='search-projects'),
     path('logout/', views.logout_view),
     path('register/', views.register_view),
-    path('project/<str:project_name>', views.project_view, name='project-page'),
+    path('project/<slug:project_id>', views.project_view, name='project-page'),
     path('profile/', views.profilepage_view),
     path('about-us/', views.aboutus_view),
     path('create-project/', views.createproject_view),

Wampus/app/static/main.css

@@ -198,7 +198,7 @@ a {
 .projectCard {
   min-width: 330px;
   min-height: 225px;
-  width:360px;
+  width:330px;
   height: 225px;
   display: flex;
   margin: 2% 2% 2% 2%;
@@ -354,6 +354,7 @@ a {
   max-height: 500px;
   height: fit-content;
   margin: 2% 0 0 0;
+  padding: 0 auto 0 auto;
   overflow-x: auto;
 }
 
@@ -823,13 +824,11 @@ a {
   height: fit-content;
   min-height: 250px;
   margin: 2% 0 0 2%;
-  text-align: center;
 }
 
 .project__rows{
   display: flex;
   flex-direction: row;
-  justify-content: center;
 }
 
 .inputField--tags {

Wampus/app/templates/about.html

@@ -20,7 +20,7 @@ <h3 style="font-family: Lora">Meet The Team:</h3>
   {% with name="Dhavani Patel" github="//github.com/dhav15" linkedin="//linkedin.com/in/dhavani-patel/" image="../static/images/dhavani.jpeg" %}
     {% include "components/teamMemberComponent.html" %}
   {% endwith %}
-  {% with name="Jon O'Brien" github="//github.com/jonobrien99" linkedin="" image="../static/images/jon.jpeg"%}
+  {% with name="Jon O'Brien" github="//github.com/jonobrien99" linkedin="//linkedin.com/in/jon-anthony-obrien/" image="../static/images/jon.jpeg"%}
       {% include "components/teamMemberComponent.html" %}
   {% endwith %}
   {% with name="Mobina Tooranisama" github="//github.com/MobinaToorani" linkedin="//linkedin.com/in/mobina-tooranisama-029222202" image="../static/images/mobina.jpeg" %}

Wampus/app/templates/components/projectCardComponent.html

@@ -2,7 +2,7 @@
 
 <div class="projectCard">
     <div class="project__text">
-        <h2 class="projectCard__title"><a href="{% url 'project-page' name %}">{{ name }}</a></h2>
+        <h2 class="projectCard__title"><a href="{% url 'project-page' id %}">{{ name }}</a></h2>
         <h2 class="projectCard__description">{{ desc }}</h2>
     </div>
 

Wampus/app/templates/components/teamMemberComponent.html

@@ -4,7 +4,7 @@
     <div style="background-color:#eeeeee;background-image: url('{{ image }}'); background-size:contain;background-repeat:no-repeat;background-position:center center;" class="memberPic"></div>
     <div class="memberInfo">
       <a style="font-family: Karla;font-size: large;">{{ name }}<br></a>
-      <a href="{{ github }}" ><img style="width: 20px; height: 20px;" src="../../static/images/github-logo.png"></a>
-      <a href="{{ linkedin }}" ><img style="width: 20px; height: 20px;" src="../../static/images/linkedin-logo.png"></a>
+      <a href="{{ github }}" target="_blank"><img style="width: 20px; height: 20px;" src="../../static/images/github-logo.png"></a>
+      <a href="{{ linkedin }}" target="_blank"><img style="width: 20px; height: 20px;" src="../../static/images/linkedin-logo.png"></a>
     </div>
 </div>

Wampus/app/templates/homepage.html

@@ -12,7 +12,7 @@ <h1 style="font-family: Lora;">Your Projects</h1>
             <div class="contentContainer contentContainer--yourProjects--homepage">
                 {% if projects %}
                     {% for project in projects %}
-                        {% with name=project.name desc=project.description %}
+                        {% with name=project.name desc=project.description id=project.id %}
                             {% include "components/projectCardComponent.html" %}
                         {% endwith %}
                     {% endfor %}
@@ -47,13 +47,13 @@ <h3 style="font-family: Karla;font-size:small;">No Tags available</h3>
                 {% if popular_projects %}
                   {% for project in popular_projects %}
                     {% if forloop.counter|divisibleby:2 %}
-                            {% with name=project.name desc=project.description %}
+                            {% with name=project.name desc=project.description id=project.id %}
                                 {% include "components/projectCardComponent.html" %}
                             {% endwith %}
                         </div>
                     {% else %}
                         <div class="project__rows">
-                            {% with name=project.name desc=project.description %}
+                            {% with name=project.name desc=project.description id=project.id %}
                                 {% include "components/projectCardComponent.html" %}
                             {% endwith %}
                     {% endif %}
@@ -78,7 +78,7 @@ <h1 style="font-family: Lora;">Favourites</h1>
                 <div class="contentContainer contentContainer--favourite--homepage">
                     {% if favorites %}
                         {% for project in favorites %}
-                            {% with name=project.project.name desc=project.project.description %}
+                            {% with name=project.project.name desc=project.project.description id=project.id %}
                                 {% include "components/projectCardComponent.html" %}
                             {% endwith %}
                         {% endfor %}

Wampus/app/templates/profile.html

@@ -14,13 +14,18 @@ <h1 style="font-family: Lora;">Your Projects</h1>
                         {% with name=project.name desc=project.description id=project.id %}
                             {% include "components/projectCardComponent.html" %}
                         {% endwith %}
+                    </div>
                 {% else %}
                     <div class="project__rows">
                         {% with name=project.name desc=project.description id=project.id %}
                             {% include "components/projectCardComponent.html" %}
                         {% endwith %}
                 {% endif %}
             {% endfor %}
+            {% if popular_projects|length|divisibleby:2  %}
+            {% else %}
+                </div>
+            {% endif %}
         {% else %}
             <div class="yourprojects--noProjects">
               <h1 style="font-family: Karla;font-size: large;">No Projects?</h1>

Wampus/app/templates/project.html

@@ -34,7 +34,17 @@ <h2 style="font-family: Lora;">Description</h2>
 <div class="individualpage--bottom">
     <h2 style="font-family: Lora;">Tags</h2>
     <div class="contentContainer contentContainer--tags--individualproject">
-        {% include "components/tagComponent.html" %}
+        {% if tags %}
+            {% for tag in project.tags %}
+                {% with name=tag.name %}
+                    {% include "components/tagComponent.html" %}
+                {% endwith %}
+            {% endfor %}
+        {% else %}
+                <div class="noTags">
+                    <h3 style="font-family: Karla;font-size:small;">No Tags available</h3>
+                </div>
+        {% endif %}
     </div>
     {% with name="Delete Project" classes="btn btn--deleteProject" type="" click="" %}
         {% include "components/buttonComponent.html"  %}

Wampus/app/templates/search-projects.html

@@ -9,13 +9,13 @@
             <div class="contentContainer contentContainer--searched ">
                 {% for project in search_results %}
                     {% if forloop.counter|divisibleby:2 %}
-                            {% with name=project.name desc=project.description %}
+                            {% with name=project.name desc=project.description id=project.id %}
                                 {% include "components/projectCardComponent.html" %}
                             {% endwith %}
                         </div>
                     {% else %}
                         <div class="project__rows">
-                            {% with name=project.name desc=project.description %}
+                            {% with name=project.name desc=project.description id=project.id %}
                                 {% include "components/projectCardComponent.html" %}
                             {% endwith %}
                    {% endif %}

Wampus/app/views.py

@@ -125,11 +125,11 @@ def profilepage_view(request):
     return render(request, template_name, context)
 
 
-def project_view(request, project_name):
+def project_view(request, project_id):
     user = request.user # Get the user object
 
     profile = Profile.objects.get(user=user) # Get the user's profile
-    project = Project.objects.get(name=project_name)
+    project = Project.objects.get(id=project_id)
 
     form = CommentForm()
 
@@ -148,6 +148,8 @@ def project_view(request, project_name):
 
     template_name = 'project.html'
 
+    print(project.tags)
+
     return render(request, template_name, context)
 
 @login_required(login_url='/login/')
@@ -164,7 +166,7 @@ def createproject_view(request):
             project = form.save(commit=False)
             project.profile = profile
             project.save()
-            return redirect("/project/" + project.name)
+            return redirect("/project/" + str(project.id))
 
     context = {
         'profile': profile,