fixed merge conflicts

widget_princessgabi/dashboard/models.py

@@ -17,7 +17,14 @@ class WidgetUser(models.Model):
     department = models.ForeignKey(Department, on_delete = models.CASCADE)
     
     def __str__(self):
+<<<<<<< HEAD
         return self.last_name + ' ' + self.first_name
     
     def get_absolute_url(self):
         return reverse("dashboard:widgetuser-details", kwargs={"pk": self.pk})
+=======
+        return self.first_name + ' ' + self.last_name
+    
+    def get_absolute_url(self):
+        return reverse("widgetusers:user-details", kwargs={"pk": self.pk})
+>>>>>>> 50c48d9 (created dashboard.html, updated models.py, views.py, urls.py to account for new dashboard page)

widget_princessgabi/dashboard/templates/dashboard/dashboard.html

@@ -11,12 +11,20 @@
     <ul>
         {% for user in users %}
             <li>
+<<<<<<< HEAD
                 <a href = "{{ user.get_absolute_url }}">{{ user.last_name }}, {{ user.first_name }}</a>
+=======
+                <a href = "{{ user.get_absoluteurl }}">{{ user.last_name }}, {{ user.first_name }}</a>
+>>>>>>> 50c48d9 (created dashboard.html, updated models.py, views.py, urls.py to account for new dashboard page)
             </li>
         {% endfor %}
     </ul>
 
+<<<<<<< HEAD
     <a href = "/dashboard/widgetusers/add">Add Widget User</a>
+=======
+    <a href = "../widgetusers/add">Add Widget User</a>
+>>>>>>> 50c48d9 (created dashboard.html, updated models.py, views.py, urls.py to account for new dashboard page)
 
     <div>
         <a href = "../announcements">Announcement Board</a>

widget_princessgabi/dashboard/urls.py

 from django.urls import path
 
+<<<<<<< HEAD
 from .views import dashboard, WidgetUserDetailView, WidgetUserCreateView, WidgetUserUpdateView
 
 urlpatterns = [
@@ -7,6 +8,12 @@ urlpatterns = [
     path('widgetusers/<int:pk>/details', WidgetUserDetailView.as_view(), name = 'widgetuser-details'),
     path('widgetusers/add', WidgetUserCreateView.as_view(), name = "widgetuser-add"),
     path('widgetusers/<int:pk>/edit', WidgetUserUpdateView.as_view(), name = "widgetuser-edit"),
+=======
+from .views import dashboard
+
+urlpatterns = [
+    path('', dashboard, name = 'dashboard'),
+>>>>>>> 50c48d9 (created dashboard.html, updated models.py, views.py, urls.py to account for new dashboard page)
 ]
 
 app_name = "dashboard"
\ No newline at end of file