Merge pull request #8 from Lanxxxe/main

Request to pull changes

Author: exc3lr8

excelr8/admin_dashboard/templates/base_layout.html

@@ -65,12 +65,23 @@
       <a href="{% url 'admin_dashboard' %}" class="list-group-item {% if request.path == '/admin_dashboard/' %}active{% endif %} waves-effect">
         <i class="fas fa-chart-pie mr-3"></i>Dashboard
       </a>
+<<<<<<< HEAD
+      <a href="{% url 'team_members' %}" class="list-group-item {% if request.path == '/team_members/' %}active{% endif %} list-group-item-action waves-effect">
+        <i class="fas fa-users mr-3"></i>Team Members</a>
+      <a href="{% url 'admin_publications' %}" class="list-group-item {% if request.path == '/publications/' %}active{% endif %} list-group-item-action waves-effect">
+        <i class="fas fa-book mr-3"></i>Publications</a>
+      <a href="{% url 'projects' %}" class="list-group-item {% if request.path == '/projects/' %}active{% endif %} list-group-item-action waves-effect">
+        <i class="fas fa-project-diagram mr-3"></i>Projects</a>
+      <a href="{% url 'about_us' %}" class="list-group-item {% if request.path == '/about_us/' %}active{% endif %} list-group-item-action waves-effect">
+        <i class="fas fa-info-circle mr-3"></i>About Us</a>
+=======
       <a href="{% url 'add_team_members' %}" class="list-group-item {% if request.path == '/add_team_members/' %}active{% endif %} list-group-item-action waves-effect">
         <i class="fas fa-users mr-3"></i>Add Team Members</a>
       <a href="{% url 'add_publications' %}" class="list-group-item {% if request.path == '/add_publications/' %}active{% endif %} list-group-item-action waves-effect">
         <i class="fas fa-book mr-3"></i>Add Publications</a>
       <a href="{% url 'add_projects' %}" class="list-group-item {% if request.path == '/add_projects/' %}active{% endif %} list-group-item-action waves-effect">
         <i class="fas fa-project-diagram mr-3"></i>Add Projects</a>
+>>>>>>> b73a40eb92eadd4b65d51b19149f00ccc5c634c0
     </div>
 
   </div>

excelr8/admin_dashboard/urls.py

@@ -3,7 +3,14 @@
 
 urlpatterns = [
     path('', views.admin_dashboard, name='admin_dashboard'),
+<<<<<<< HEAD
+    path('/team_members', views.team_members, name='team_members'),
+    path('/publications', views.publications, name='admin_publications'),
+    path('/projects', views.projects, name='projects'),
+    path('/about_us', views.about_us, name='about_us'),
+=======
     path('add_team_members/', views.team_members, name='add_team_members'),
     path('add_publications/', views.publications, name='add_publications'),
     path('add_projects/', views.projects, name='add_projects'),
+>>>>>>> b73a40eb92eadd4b65d51b19149f00ccc5c634c0
 ]

excelr8/admin_dashboard/views.py

@@ -19,6 +19,7 @@ def team_members(request):
     members = TeamMember.objects.all()
     return render(request, 'add_team_members.html', {'team_members': members, 'form': form})
 
+
 def publications(request):
     if request.method == 'POST':
         form = PublicationForm(request.POST, request.FILES)

excelr8/db.sqlite3

@@ -59,7 +59,7 @@
 <title>EXCELR8 — Team</title>
 
 <div class="container team-container" style="margin-top: 100px;">
-    <div class="row">
+    <div class="row mt-5">
         {% for member in team_members %}
         <div class="col-md-6 team-member">
             {% if member.image %}