Skip to content

Commit e59e19d

Browse files
Merge pull request #13 from codersforcauses/janelle-homepage-fix
landing_page and home_page are no longer empty/blank
2 parents 98d82d9 + 8b750c3 commit e59e19d

4 files changed

Lines changed: 8 additions & 14 deletions

File tree

server/home_page/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
app_name = "home_page"
55
urlpatterns = [
6-
path("", views.main.as_view(), name="home"),
6+
path("", views.main, name="home"),
77
# path("api/mapbox/suggestions/", views.get_mapbox_suggestions, name="mapbox_suggestions"),
88
path("<int:pk>", views.PetDetail.as_view(), name="pet-details"),
99
]

server/home_page/views.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from rest_framework.response import Response
44
from rest_framework.views import APIView
55
from django.conf import settings
6-
from django.http import JsonResponse
6+
from django.http import JsonResponse, HttpResponse
77
from django.views.decorators.http import require_http_methods
88
from django.apps import apps
99
from django.views import View
@@ -16,7 +16,10 @@
1616

1717
# Create your views here.
1818

19-
class main(View):
19+
def main(request):
20+
return HttpResponse("This is the homepage")
21+
22+
class PetTasks(View):
2023
def get(self, request):
2124
petTasks = tasks.objects.all().values()
2225
return JsonResponse(list(petTasks), safe=False)

server/landing_page/templates/landing_page/landing_page_html.html

Lines changed: 0 additions & 10 deletions
This file was deleted.

server/landing_page/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from django.http import HttpResponse
12
from django.shortcuts import render
23
from .models import Pricing, Feature
34

@@ -6,4 +7,4 @@
67

78
def main(request):
89
plans = Pricing.objects.prefetch_related("features").all()
9-
return render(request, "landing_page/landing_page_html.html", {"plans": plans})
10+
return HttpResponse("This is the landing page")

0 commit comments

Comments
 (0)