xonecas.io
3517
Mt

meal_tracker / commit ab13372

Add user preferences model and user modal to UI

Adds a simple user preference model to allow for storing the max
calories per day value.

Add a simple UI to allow the user to create an account and set his max
calories per day.

xonecas2020-03-05 ab13372dc3d54e2b47e80a1625f6faea4d568973 parent ef6b80f

5 files changed

bmi_api/models.py+7−1
@@ -1,12 +1,18 @@
1+from django.contrib.auth.models import User
12 from django.db import models
23
34
5+class UserPreferences(models.Model):
6+ user = models.OneToOneField(User, on_delete=models.CASCADE)
7+ max_calories = models.IntegerField()
8+
9+
410 class Meal(models.Model):
11+ owner = models.ForeignKey('auth.User', related_name='meals', on_delete=models.CASCADE)
512 date = models.DateField("Meal date", auto_now_add=True)
613 time = models.TimeField("Meal time", auto_now_add=True)
714 text = models.TextField("Meal description or title")
815 calories = models.IntegerField()
9- owner = models.ForeignKey('auth.User', related_name='meals', on_delete=models.CASCADE)
1016
1117 def __str__(self):
1218 return self.text
bmi_api/serializers.py+17−5
@@ -1,22 +1,34 @@
11 from django.contrib.auth.models import User
22
3-from rest_framework import serializers, permissions
3+from rest_framework import serializers
44
5-from .models import Meal
5+from .models import Meal, UserPreferences
66
77
88 class UserSerializer(serializers.ModelSerializer):
9- meals = serializers.PrimaryKeyRelatedField(many=True, queryset=Meal.objects.all())
109
1110 class Meta:
1211 model = User
13- fields = ['id', 'username', 'meals']
12+ fields = ['id', 'username', 'password']
13+ read_only_fields = ['id']
14+ extra_kwargs = {'password': {'write_only': True}}
15+
16+ def create(self, validated_data):
17+ user = User.objects.create(
18+ username=validated_data['username'],
19+ )
20+ user.set_password(validated_data['password'])
21+ user.save()
22+
23+ # UserPreferences.objects.create(user=user, max_calories=validated_data['max_calories'])
24+
25+ return user
1426
1527
1628 class MealSerializer(serializers.ModelSerializer):
1729 owner = serializers.ReadOnlyField(source='owner.username')
18- permission_classes = [permissions.IsAuthenticatedOrReadOnly]
1930
2031 class Meta:
2132 model = Meal
2233 fields = '__all__'
34+ ordering = ['created']
bmi_api/views.py+1−1
@@ -8,7 +8,7 @@ from .serializers import MealSerializer, UserSerializer
88
99
1010 class UserViewSet(viewsets.ModelViewSet):
11- permission_classes = [permissions.IsAdminUser]
11+ permission_classes = [permissions.IsAdminUser, IsOwnerOrReadOnly]
1212 queryset = User.objects.all()
1313 serializer_class = UserSerializer
1414
bmi_ui/src/components/Home.js+1−1
@@ -15,7 +15,7 @@ class Home extends Component {
1515 }
1616
1717 getMeals = () => {
18- axios.get(API_URL + 'meals').then(res => {
18+ axios.get(API_URL + 'meals', { crossdomain: true }).then(res => {
1919 this.setState({
2020 user: this.state.user,
2121 meals: res.data
bmi_ui/src/components/UserForm.js+2−2
@@ -24,7 +24,7 @@ class UserForm extends React.Component {
2424
2525 createUser = e => {
2626 e.preventDefault();
27- axios.post(API_URL + 'users', this.state).then(() => {
27+ axios.post(API_URL + 'users/', this.state, { crossdomain: true }).then(() => {
2828 this.props.resetState();
2929 this.props.toggle();
3030 });
@@ -32,7 +32,7 @@ class UserForm extends React.Component {
3232
3333 editUser = e => {
3434 e.preventDefault();
35- axios.put(API_URL + 'users/' + this.state.id, this.state).then(() => {
35+ axios.put(API_URL + 'users/' + this.state.id, this.state, { crossdomain: true }).then(() => {
3636 this.props.resetState();
3737 this.props.toggle();
3838 });