dylanleigh · AustinGrey · Dec 6, 2020 · Dec 7, 2020 · Dec 11, 2020 · Dec 11, 2020
diff --git a/pants/diary/serializers.py b/pants/diary/serializers.py
@@ -5,6 +5,12 @@
 class DiaryFoodSerializer(serializers.HyperlinkedModelSerializer):
    nutrition_data = serializers.ReadOnlyField()
 
+   def create(self, validated_data):
+      # Ensure the current user is specified
+      if 'user' not in validated_data:
+         validated_data['user'] = self.context['request'].user
+      return DiaryFood.objects.create(**validated_data)
+
    class Meta:
       model = DiaryFood
 

diff --git a/pants/diary/views.py b/pants/diary/views.py
@@ -51,6 +51,9 @@ class DiaryFoodViewSet(viewsets.ModelViewSet):
     serializer_class = DiaryFoodSerializer
     permission_classes = [permissions.DjangoModelPermissions]
     queryset = DiaryFood.objects.none()  # Required for DjangoModelPermissions to get Model
+    filterset_fields = {
+        'start_time': ['gte', 'lte', 'exact', 'gt', 'lt'],
+    }
 
     def get_queryset(self):
        user = self.request.user

diff --git a/pants/frontend/static/frontend/favicon.ico b/pants/frontend/static/frontend/favicon.ico
diff --git a/pants/frontend/static/frontend/js/app.js b/pants/frontend/static/frontend/js/app.js
diff --git a/pants/frontend/static/frontend/js/chunk-vendors.js b/pants/frontend/static/frontend/js/chunk-vendors.js
diff --git a/pants/frontend/templates/frontend/index.html b/pants/frontend/templates/frontend/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="/static/frontend/favicon.ico">
+    <title>Trouser - What goes over Pants</title>
+  <link href="/static/frontend/js/app.js" rel="preload" as="script"><link href="/static/frontend/js/chunk-vendors.js" rel="preload" as="script"></head>
+  <body>
+    <noscript>
+      <strong>We're sorry but Trouser - What goes over Pants doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  <script type="text/javascript" src="/static/frontend/js/chunk-vendors.js"></script><script type="text/javascript" src="/static/frontend/js/app.js"></script></body>
+</html>
diff --git a/pants/frontend/urls.py b/pants/frontend/urls.py
@@ -1,7 +1,6 @@
 from django.conf.urls import url
-from . import views
+from django.views.generic import TemplateView
 
 urlpatterns = [
-    url(r'^$', views.ingredient_manager, name='ingredient_manager'),
-    url(r'^recipe$', views.recipe_manager, name='recipe_manager')
+    url(r'^$', TemplateView.as_view(template_name="frontend/index.html"), name='frontend'),
 ]
diff --git a/pants/frontend/views.py b/pants/frontend/views.py
@@ -1,23 +1,2 @@
-from django.shortcuts import render
 
-def ingredient_manager(request):
-    context = {
-        #@todo austin Not sure how to handle this, the only way to define this template var is in python, but it will be executed in js, so it has to be a js string.
-        # Mask that ensures only 6 total digits, max 3 decimals
-        'nutrition_mask': r"{mask: /^(?=^[\d.]{0,7}$)\d{0,6}(\.\d{0,3})?$/}",
-        # Mask that ensures only lowercase letters, numbers and dashes
-        "slug_mask": r"{mask: /^[0-9a-z-]*$/}",
-        # Ensures only lowercase letters, numbers, dashes, and commas
-        "tag_mask": r"{mask: /^[0-9a-z,-]*$/}"
-    }
-    return render(request, 'frontend/ingredient_manager.html', context)
-
-def recipe_manager(request):
-    context = {
-        # Mask that ensures only lowercase letters, numbers and dashes
-        "slug_mask": r"{mask: /^[0-9a-z-]*$/}",
-        # Ensures only lowercase letters, numbers, dashes, and commas
-        "tag_mask": r"{mask: /^[0-9a-z,-]*$/}"
-    }
-    return render(request, 'frontend/recipe_manager.html', context)
 
diff --git a/pants/pants/settings.py b/pants/pants/settings.py
@@ -136,8 +136,8 @@
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'Australia/Melbourne'
-#TIME_ZONE = 'UTC'
+#TIME_ZONE = 'Australia/Melbourne'
+TIME_ZONE = 'UTC'
 
 USE_I18N = True
 

diff --git a/pants/pants/urls.py b/pants/pants/urls.py
@@ -19,6 +19,7 @@
 from django.contrib.auth import views as auth_views
 from rest_framework import routers
 
+from targets.views import TargetViewSet, DailyTargetViewSet
 from website import views as website
 
 # Viewsets for API added here, not in included 'app.urls' links
@@ -35,6 +36,8 @@
 router.register(r'recipe_tag', RecipeTagViewSet, 'recipe_tag')
 router.register(r'recipe_flag', RecipeFlagViewSet, 'recipe_flag')
 router.register(r'diaryfood', DiaryFoodViewSet, 'diaryfood')
+router.register(r'target', TargetViewSet, 'target')
+router.register(r'daily_target', DailyTargetViewSet, 'daily_target')
 router.register(r'user', UserViewSet, 'user')
 
 urlpatterns = [

diff --git a/pants/targets/serializers.py b/pants/targets/serializers.py
@@ -0,0 +1,66 @@
+from django.db import transaction
+from rest_framework import serializers
+
+from targets.models import Target, Minimums, Maximums
+
+
+class MaximumsSerializer(serializers.ModelSerializer):
+   class Meta:
+      model = Maximums
+      exclude = ['of_target', 'id']
+
+
+class MinimumsSerializer(serializers.ModelSerializer):
+   class Meta:
+      model = Minimums
+      exclude = ['of_target', 'id']
+
+
+class TargetSerializer(serializers.HyperlinkedModelSerializer):
+   """
+   Serialize a target
+   """
+   minimum = MinimumsSerializer()
+   maximum = MaximumsSerializer()
+
+   class Meta:
+      model = Target
+      fields = '__all__'
+      read_only_fields = ['user']
+
+   @transaction.atomic
+   def create(self, validated_data):
+      user = self.context['request'].user  # FIXME needs to be passed as extra context
+      # Take min and max data off, save remainder as target, then save min and max
+      min_data = validated_data.pop('minimum')
+      max_data = validated_data.pop('maximum')
+      target = Target.objects.create(
+         user=user,
+         **validated_data)
+      min_data["of_target_id"] = target.id
+      max_data["of_target_id"] = target.id
+      min = Minimums.objects.create(**min_data)
+      target.minimum = min
+      max = Maximums.objects.create(**max_data)
+      target.maximum = max
+      return target
+
+   @transaction.atomic
+   def update(self, target, validated_data):
+      # Get all the requested update fields except for the nested objects
+      update_fields = [key for key in validated_data.keys() if key not in ['minimum', 'maximum']]
+      for key in update_fields:
+         setattr(target, key, validated_data[key])
+      target.save(update_fields=update_fields)
+
+      if ('minimum' in validated_data):
+         for key in validated_data['minimum']:
+            setattr(target.minimum, key, validated_data['minimum'][key])
+         target.minimum.save()
+
+      if ('maximum' in validated_data):
+         for key in validated_data['maximum']:
+            setattr(target.maximum, key, validated_data['maximum'][key])
+         target.maximum.save()
+
+      return target
diff --git a/pants/targets/views.py b/pants/targets/views.py
@@ -4,12 +4,15 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic.detail import DetailView
 from django.views.generic.list import ListView
+from rest_framework import viewsets, permissions
 
 from .models import Target
 
 # Basic class views. Targets are used more from other models to
 # compare to.
 # TODO templates
+from .serializers import TargetSerializer
+
 
 class TargetListView(LoginRequiredMixin, ListView):
    model = Target
@@ -25,3 +28,27 @@ def get_context_data(self, **kwargs):
        context = super(IngredientDetailView, self).get_context_data(**kwargs)
        return context
 
+class TargetViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows targets to be viewed and altered.
+    """
+    serializer_class = TargetSerializer
+    permission_classes = [permissions.DjangoModelPermissions]
+    queryset = Target.objects.none()  # Required for DjangoModelPermissions to get Model
+
+    def get_queryset(self):
+       user = self.request.user
+       return Target.objects.filter(user=user)
+
+class DailyTargetViewSet(viewsets.ReadOnlyModelViewSet):
+    """
+    API endpoint to get current daily target
+    """
+    serializer_class = TargetSerializer
+    permission_classes = [permissions.DjangoModelPermissions]
+    queryset = Target.objects.none()  # Required for DjangoModelPermissions to get Model
+
+    def get_queryset(self):
+       user = self.request.user
+       # @todo how to return just the exact daily target, or limit the results to 1
+       return Target.objects.filter(user=user, daily_target=True)
diff --git a/trouser/.env.production b/trouser/.env.production
@@ -0,0 +1 @@
+VUE_APP_STATIC_URL=/static/frontend/
diff --git a/trouser/.env.staging b/trouser/.env.staging
@@ -0,0 +1 @@
+VUE_APP_STATIC_URL=/static/frontend/
diff --git a/trouser/.gitignore b/trouser/.gitignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/trouser/README.md b/trouser/README.md
@@ -0,0 +1,24 @@
+# trouser
+
+## Project setup
+```
+yarn install
+```
+
+### Compiles and hot-reloads for development
+```
+yarn serve
+```
+
+### Compiles and minifies for production
+```
+yarn build
+```
+
+### Lints and fixes files
+```
+yarn lint
+```
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).
diff --git a/trouser/babel.config.js b/trouser/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}