Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/home_page/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

app_name = "home_page"
urlpatterns = [
path("", views.main.as_view(), name="home"),
path("", views.main, name="home"),
# path("api/mapbox/suggestions/", views.get_mapbox_suggestions, name="mapbox_suggestions"),
path("<int:pk>", views.PetDetail.as_view(), name="pet-details"),
]
7 changes: 5 additions & 2 deletions server/home_page/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from rest_framework.response import Response
from rest_framework.views import APIView
from django.conf import settings
from django.http import JsonResponse
from django.http import JsonResponse, HttpResponse
from django.views.decorators.http import require_http_methods
from django.apps import apps
from django.views import View
Expand All @@ -16,7 +16,10 @@

# Create your views here.

class main(View):
def main(request):
return HttpResponse("This is the homepage")

class PetTasks(View):
def get(self, request):
petTasks = tasks.objects.all().values()
return JsonResponse(list(petTasks), safe=False)
Expand Down
10 changes: 0 additions & 10 deletions server/landing_page/templates/landing_page/landing_page_html.html

This file was deleted.

3 changes: 2 additions & 1 deletion server/landing_page/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.http import HttpResponse
from django.shortcuts import render
from .models import Pricing, Feature

Expand All @@ -6,4 +7,4 @@

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