diff --git a/backend/account/urls.py b/backend/account/urls.py index 8d04a97..c01ce3a 100644 --- a/backend/account/urls.py +++ b/backend/account/urls.py @@ -1,5 +1,6 @@ from django.urls import path from . import views +from djoser.urls.jwt import views as djoser_jwt_views urlpatterns = [ path('profile', views.ProfileView.as_view()), diff --git a/backend/core/settings.py b/backend/core/settings.py index 9d3dc36..05712e2 100644 --- a/backend/core/settings.py +++ b/backend/core/settings.py @@ -200,8 +200,8 @@ REST_FRAMEWORK = { } SIMPLE_JWT = { - 'ACCESS_TOKEN_LIFETIME': timedelta(days=int(os.getenv("ACCESS_TOKEN_LIFETIME"))), - 'REFRESH_TOKEN_LIFETIME': timedelta(days=int(os.getenv("REFRESH_TOKEN_LIFETIME"))), + 'ACCESS_TOKEN_LIFETIME': timedelta(minutes=1), + 'REFRESH_TOKEN_LIFETIME': timedelta(days=1), 'ROTATE_REFRESH_TOKENS': True, 'BLACKLIST_AFTER_ROTATION': True, } diff --git a/backend/product/views.py b/backend/product/views.py index c21a5a1..63b1c5d 100644 --- a/backend/product/views.py +++ b/backend/product/views.py @@ -10,7 +10,7 @@ from rest_framework.permissions import IsAuthenticatedOrReadOnly from utils.pagination import StructurePagination from drf_spectacular.utils import extend_schema, OpenApiParameter from drf_spectacular.types import OpenApiTypes - +from rest_framework.permissions import AllowAny class AllCategories(APIView): serializer_class = CategorySerializer @@ -21,6 +21,7 @@ class AllCategories(APIView): class ProductView(APIView): serializer_class = ProductSerializer + permission_classes = [AllowAny] def get(self, request, pk): product = get_object_or_404(ProductModel, id=pk) product_ser = self.serializer_class(instance=product, many=False) diff --git a/frontend/components/ui/Button.vue b/frontend/components/global/Button.vue similarity index 100% rename from frontend/components/ui/Button.vue rename to frontend/components/global/Button.vue diff --git a/frontend/components/ui/ColorCircle.vue b/frontend/components/global/ColorCircle.vue similarity index 100% rename from frontend/components/ui/ColorCircle.vue rename to frontend/components/global/ColorCircle.vue diff --git a/frontend/components/ui/Input.vue b/frontend/components/global/Input.vue similarity index 100% rename from frontend/components/ui/Input.vue rename to frontend/components/global/Input.vue diff --git a/frontend/components/ui/OtpInput.vue b/frontend/components/global/OtpInput.vue similarity index 100% rename from frontend/components/ui/OtpInput.vue rename to frontend/components/global/OtpInput.vue diff --git a/frontend/components/global/Pagination.vue b/frontend/components/global/Pagination.vue new file mode 100644 index 0000000..4b90cf4 --- /dev/null +++ b/frontend/components/global/Pagination.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/frontend/components/global/ProductColor.vue b/frontend/components/global/ProductColor.vue index f500e02..8e23343 100644 --- a/frontend/components/global/ProductColor.vue +++ b/frontend/components/global/ProductColor.vue @@ -2,7 +2,7 @@ // types -import ColorCircle from "~/components/ui/ColorCircle.vue"; +import ColorCircle from "~/components/global/ColorCircle.vue"; type Props = { colors: string[]; diff --git a/frontend/components/ui/Rate.vue b/frontend/components/global/Rate.vue similarity index 100% rename from frontend/components/ui/Rate.vue rename to frontend/components/global/Rate.vue diff --git a/frontend/components/ui/Tag.vue b/frontend/components/global/Tag.vue similarity index 100% rename from frontend/components/ui/Tag.vue rename to frontend/components/global/Tag.vue diff --git a/frontend/components/ui/ToastContainer/ToastBox.vue b/frontend/components/global/ToastContainer/ToastBox.vue similarity index 100% rename from frontend/components/ui/ToastContainer/ToastBox.vue rename to frontend/components/global/ToastContainer/ToastBox.vue diff --git a/frontend/components/ui/ToastContainer/index.vue b/frontend/components/global/ToastContainer/index.vue similarity index 100% rename from frontend/components/ui/ToastContainer/index.vue rename to frontend/components/global/ToastContainer/index.vue diff --git a/frontend/components/ui/Tooltip.vue b/frontend/components/global/Tooltip.vue similarity index 100% rename from frontend/components/ui/Tooltip.vue rename to frontend/components/global/Tooltip.vue diff --git a/frontend/components/global/product/ProductCard.vue b/frontend/components/global/product/ProductCard.vue index 9de0525..3b63c85 100644 --- a/frontend/components/global/product/ProductCard.vue +++ b/frontend/components/global/product/ProductCard.vue @@ -1,9 +1,9 @@