trevor/links
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new models, frontend functions, public pages

Browse Source
This commit is contained in:
trevor
2025-05-07 15:41:03 +09:00
parent 91f0d54563
commit 18497d4343
784 changed files with 124024 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/api/migrations/0002_linkgroup_description.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 5.2 on 2025-05-07 04:58
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='linkgroup',
name='description',
field=models.TextField(blank=True, null=True),
),
]

18
backend/api/migrations/0003_linkgroup_icon.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 5.2 on 2025-05-07 04:59
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0002_linkgroup_description'),
]
operations = [
migrations.AddField(
model_name='linkgroup',
name='icon',
field=models.ImageField(blank=True, help_text='Иконка группы ссылок', null=True, upload_to='link_groups/'),
),
]

35
backend/api/migrations/0004_linkgroup_created_at_linkgroup_is_favorite_and_more.py Normal file
View File

@@ -0,0 +1,35 @@
# Generated by Django 5.2 on 2025-05-07 05:00
import django.utils.timezone
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0003_linkgroup_icon'),
]
operations = [
migrations.AddField(
model_name='linkgroup',
name='created_at',
field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
preserve_default=False,
),
migrations.AddField(
model_name='linkgroup',
name='is_favorite',
field=models.BooleanField(default=False, help_text='Избранная группа ссылок'),
),
migrations.AddField(
model_name='linkgroup',
name='is_public',
field=models.BooleanField(default=False, help_text='Публичная группа ссылок'),
),
migrations.AddField(
model_name='linkgroup',
name='updated_at',
field=models.DateTimeField(auto_now=True),
),
]

28
backend/api/migrations/0005_alter_link_icon_alter_linkgroup_is_favorite_and_more.py Normal file
View File

@@ -0,0 +1,28 @@
# Generated by Django 5.2 on 2025-05-07 05:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0004_linkgroup_created_at_linkgroup_is_favorite_and_more'),
]
operations = [
migrations.AlterField(
model_name='link',
name='icon',
field=models.ImageField(blank=True, help_text='Иконка для этой ссылки', null=True, upload_to='links/'),
),
migrations.AlterField(
model_name='linkgroup',
name='is_favorite',
field=models.BooleanField(default=False),
),
migrations.AlterField(
model_name='linkgroup',
name='is_public',
field=models.BooleanField(default=False),
),
]

27
backend/api/models.py
View File

@@ -1,3 +1,5 @@
# backend/api/models.py
from django.db import models
from django.conf import settings
@@ -5,13 +7,25 @@ class LinkGroup(models.Model):
owner = models.ForeignKey(
settings.AUTH_USER_MODEL,
on_delete=models.CASCADE,
related_name='api_link_groups' # уникальное имя, чтобы не конфликтовать с links app
related_name='api_link_groups'
)
name = models.CharField(max_length=100)
order = models.PositiveIntegerField(default=0)
description = models.TextField(blank=True, null=True)
icon = models.ImageField(
upload_to='link_groups/',
null=True,
blank=True,
help_text='Иконка группы ссылок'
)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
is_public = models.BooleanField(default=False)
is_favorite = models.BooleanField(default=False)
def __str__(self):
return f"{self.owner.username} - {self.name}"
return f"{self.owner.username} — {self.name}"
class Link(models.Model):
owner = models.ForeignKey(
@@ -28,8 +42,13 @@ class Link(models.Model):
)
title = models.CharField(max_length=200)
url = models.URLField()
icon = models.URLField(blank=True, null=True)
icon = models.ImageField(
upload_to='links/',
null=True,
blank=True,
help_text='Иконка для этой ссылки'
)
order = models.PositiveIntegerField(default=0)
def __str__(self):
return self.title
return self.title

69
backend/api/serializers.py
View File

@@ -2,54 +2,47 @@
from rest_framework import serializers
from django.contrib.auth import get_user_model
from .models import Link, LinkGroup
from django.conf import settings
from .models import Link, LinkGroup
User = get_user_model()
class RegisterSerializer(serializers.ModelSerializer):
password = serializers.CharField(write_only=True)
password2 = serializers.CharField(write_only=True)
class Meta:
model = User
fields = ('username', 'email', 'password')
fields = ['username', 'email', 'first_name', 'last_name', 'password', 'password2']
extra_kwargs = {'password': {'write_only': True}}
def validate(self, attrs):
if attrs['password'] != attrs.pop('password2'):
raise serializers.ValidationError("Пароли не совпадают")
return attrs
def create(self, validated_data):
user = User(
username=validated_data['username'],
email=validated_data.get('email', '')
)
user.set_password(validated_data['password'])
user.save()
return user
# api/serializers.py
from rest_framework import serializers
from django.conf import settings
from .models import Link, LinkGroup
return User.objects.create_user(**validated_data)
# сериализатор для ссылок
class LinkSerializer(serializers.ModelSerializer):
class Meta:
model = Link
fields = ['id', 'title', 'url', 'icon', 'order', 'group']
# сериализатор для групп со вложенными ссылками
class LinkGroupSerializer(serializers.ModelSerializer):
# related_name у вас в модели LinkGroup.owner = 'api_link_groups',
# а у модели Link.group = 'links', так что у группы obj.links — это QuerySet ссылок
links = LinkSerializer(many=True, read_only=True)
class Meta:
model = LinkGroup
fields = ['id', 'name', 'order', 'links']
from django.contrib.auth import get_user_model
from rest_framework import serializers
User = get_user_model()
class UserSerializer(serializers.ModelSerializer):
class Meta:
model = User
# поля, которые хотите отдавать на фронт:
fields = ['id', 'username', 'email', 'full_name', 'bio', 'avatar', 'last_login', 'date_joined']
class LinkGroupSerializer(serializers.ModelSerializer):
icon = serializers.ImageField(required=False, allow_null=True)
class Meta:
model = LinkGroup
fields = ['id', 'name', 'description', 'icon', 'order', 'is_public', 'is_favorite',
'created_at', 'updated_at']
read_only_fields = ['id', 'created_at', 'updated_at']
class LinkSerializer(serializers.ModelSerializer):
icon = serializers.ImageField(required=False, allow_null=True)
class Meta:
model = Link
fields = ['id', 'title', 'url', 'icon', 'group', 'order']
read_only_fields = ['id']

17
backend/api/urls.py
View File

@@ -4,9 +4,11 @@ from .views import (
RegisterView,
UserProfileView,
LinkViewSet,
LinkGroupViewSet
LinkGroupViewSet,
PublicUserGroupsView
)
from rest_framework.routers import DefaultRouter
from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
router = DefaultRouter()
router.register('links', LinkViewSet, basename='link')
@@ -17,4 +19,17 @@ urlpatterns = [
path('auth/login/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
path('auth/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
path('auth/user/', UserProfileView.as_view(), name='user-profile'), # ← новый
path('users/<str:username>/public/',
PublicUserGroupsView.as_view(),
name='public-user-groups'
),
# схема OpenAPI
path('schema/', SpectacularAPIView.as_view(), name='schema'),
# Swagger UI, берёт шаблон из drf_spectacular_sidecar
path(
'swagger/',
SpectacularSwaggerView.as_view(url_name='schema'),
name='swagger-ui'
),
] + router.urls

102
backend/api/views.py
View File

@@ -1,32 +1,52 @@
# api/views.py
from rest_framework import generics, viewsets, permissions
from django.contrib.auth import get_user_model
# coding: utf-8
from rest_framework import generics, viewsets, permissions, status
from rest_framework.parsers import MultiPartParser, FormParser, JSONParser
from rest_framework_simplejwt.views import TokenObtainPairView
from .serializers import RegisterSerializer, LinkSerializer, LinkGroupSerializer
from rest_framework.views import APIView
from rest_framework.response import Response
from django.shortcuts import get_object_or_404
from drf_spectacular.utils import extend_schema, OpenApiParameter
from django.contrib.auth import get_user_model
from .models import Link, LinkGroup
from .serializers import (
RegisterSerializer,
UserSerializer,
LinkSerializer,
LinkGroupSerializer,
)
User = get_user_model()
class RegisterView(generics.CreateAPIView):
queryset = User.objects.all()
permission_classes = (permissions.AllowAny,)
permission_classes = [permissions.AllowAny]
serializer_class = RegisterSerializer
class LoginView(TokenObtainPairView):
permission_classes = (permissions.AllowAny,)
permission_classes = [permissions.AllowAny]
class LinkGroupViewSet(viewsets.ModelViewSet):
queryset = LinkGroup.objects.all()
serializer_class = LinkGroupSerializer
permission_classes = [permissions.IsAuthenticated]
parser_classes = [MultiPartParser, FormParser, JSONParser]
def get_queryset(self):
# возвращаем только группы текущего пользователя
return self.queryset.filter(owner=self.request.user).order_by('order')
def perform_create(self, serializer):
serializer.save(owner=self.request.user)
class LinkViewSet(viewsets.ModelViewSet):
queryset = Link.objects.all()
serializer_class = LinkSerializer
permission_classes = (permissions.IsAuthenticated,)
permission_classes = [permissions.IsAuthenticated]
parser_classes = [MultiPartParser, FormParser, JSONParser]
def get_queryset(self):
return Link.objects.filter(owner=self.request.user).order_by('order')
@@ -34,26 +54,66 @@ class LinkViewSet(viewsets.ModelViewSet):
def perform_create(self, serializer):
serializer.save(owner=self.request.user)
class UserProfileView(generics.RetrieveAPIView):
serializer_class = UserSerializer
permission_classes = [permissions.IsAuthenticated]
def get_object(self):
return self.request.user
class UserLinksListView(generics.ListAPIView):
serializer_class = LinkSerializer
permission_classes = (permissions.AllowAny,)
permission_classes = [permissions.AllowAny]
def get_queryset(self):
username = self.kwargs['username']
return Link.objects.filter(owner__username=username).order_by('order')
from .serializers import UserSerializer # нужно завести сериализатор для пользователя
User = get_user_model()
class UserProfileView(generics.RetrieveAPIView):
class PublicUserGroupsView(APIView):
"""
Возвращает данные авторизованного пользователя.
GET /api/auth/user/
GET /api/users/{username}/public/
"""
serializer_class = UserSerializer
permission_classes = [permissions.IsAuthenticated]
permission_classes = [permissions.AllowAny]
def get_object(self):
return self.request.user
def get(self, request, username):
# 1. Ищем пользователя
user = get_object_or_404(User, username=username)
# 2. Берём его группы со ссылками
groups_qs = LinkGroup.objects.filter(owner=user).prefetch_related('links')
result = {
"username": user.username,
"groups": []
}
for grp in groups_qs:
# icon у группы (абсолютный URL)
grp_icon_url = None
if grp.icon:
grp_icon_url = request.build_absolute_uri(grp.icon.url)
grp_data = {
"id": grp.id,
"name": grp.name,
"icon": grp_icon_url,
"links": [],
}
for ln in grp.links.all():
# icon у ссылки
ln_icon_url = None
if ln.icon:
ln_icon_url = request.build_absolute_uri(ln.icon.url)
grp_data["links"].append({
"id": ln.id,
"title": ln.title,
"url": ln.url,
"icon": ln_icon_url,
})
result["groups"].append(grp_data)
return Response(result, status=status.HTTP_200_OK)