the background "Nezuko" image has been added for better view

widget_aguandhischipmunks/calendar_app/models.py

@@ -21,11 +21,7 @@ class Location(models.Model):
 # Event
 # target_datetime; activity; estimated_hours; location; course
 class Event(models.Model):
-<<<<<<< HEAD
     target_datetime = models.DateTimeField("Date and Time: ", max_length = 50)
-=======
-    target_datetime = models.DateTimeField("Date and Time: ", max_length = 50, )
->>>>>>> origin/calendarv2
     activity = models.CharField("Activity: ", max_length = 50)
     estimated_hours = models.FloatField("Estimated Hours: ", max_length = 50)
     location = models.ForeignKey(Location, on_delete = models.CASCADE)

widget_aguandhischipmunks/calendar_app/views.py

@@ -2,14 +2,8 @@ from django.shortcuts import render, redirect
 from django.views.generic import DetailView, CreateView, UpdateView
 from .models import Event, Location
 
-<<<<<<< HEAD
-# calendar view from .models
-def calendarIndex(request):
-    title = 'Widget’s Calendar of Activities<br><br>'
-=======
 # calendar view for FBV implmentation
 def calendar_view(request):
->>>>>>> origin/calendarv2
     events = Event.objects.all()
     return render(request, 'calendar.html', {'events': events})
 

widget_aguandhischipmunks/static/styles.css

@@ -2,7 +2,7 @@
     grid-row: 1 / span 2;
 }
 
-ul li {
+li {
     list-style-type: none;
 }
 
@@ -13,9 +13,6 @@ h1 {
     color: blue;
 }
 
-form {
-    background-color: blanchedalmond;
-}
 
 button {
     background-color: #555;
@@ -24,4 +21,23 @@ button {
     border: none;
     border-radius: 4px;
     cursor: pointer;
+}
+
+body {
+    background-image: url("https://www.pngkey.com/png/full/979-9791878_cold-as-ice-but-has-a-warm-heart.png");
+    background-repeat: no-repeat;
+
+}
+
+@media (min-width: 308px) {
+    body {
+        background-position: 200px 20px;
+        
+    }
+}
+
+@media (max-width: 767px) {
+    body {
+        background-position: 140px 10px;
+    }
 }
\ No newline at end of file

widget_aguandhischipmunks/widget_aguandhischipmunks/urls.py

@@ -19,10 +19,7 @@ from django.urls import path, include
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("dashboard/", include("dashboard.urls", namespace="dashboard")),
-<<<<<<< HEAD
     path("widgetusers/", include("dashboard.urls", namespace="widgetusers")),
-=======
->>>>>>> origin/calendarv2
     path("assignments/", include("assignments.urls")),
     path("forum/", include("forum.urls")),
     path("calendar/", include("calendar_app.urls")),