diff --git a/.docker/nginx.conf b/.docker/nginx.conf index 6502937..1e7b11d 100644 --- a/.docker/nginx.conf +++ b/.docker/nginx.conf @@ -24,7 +24,8 @@ server { } location /admin/ { - rewrite ^/admin/(.*) /admin/$1 break; + #rewrite ^/admin/(.*) /admin/$1 break; + rewrite ^/admin/(.*) /$1 break; proxy_pass http://127.0.0.1:8080/; include uwsgi_params; uwsgi_param UWSGI_SCHEME $scheme; diff --git a/.docker/run.sh b/.docker/run.sh index 04c9794..71237c5 100644 --- a/.docker/run.sh +++ b/.docker/run.sh @@ -4,4 +4,4 @@ echo "Starting TraineerBook.." echo "" service nginx start echo "" -exec python manage.py runserver 127.0.0.1:8080 +exec python manage.py runserver 0.0.0.0:8080 diff --git a/backend/traineerbook/settings.py b/backend/traineerbook/settings.py index db39921..524ed2f 100644 --- a/backend/traineerbook/settings.py +++ b/backend/traineerbook/settings.py @@ -81,7 +81,7 @@ CORS_ALLOW_ALL_ORIGINS = True CORS_ALLOW_CREDENTIALS = True CORS_ALLOW_PRIVATE_NETWORK = True -CSRF_TRUSTED_ORIGINS=['http://*', 'https://*'] +CSRF_TRUSTED_ORIGINS=['https://localhost:80', 'https://*'] MIDDLEWARE = [ 'traineerbook.middlewares.AddHeaderMiddleware', diff --git a/frontend/src/components/layout/CarritoHeader.vue b/frontend/src/components/layout/CarritoHeader.vue index 0833cd8..35cd43b 100644 --- a/frontend/src/components/layout/CarritoHeader.vue +++ b/frontend/src/components/layout/CarritoHeader.vue @@ -3,18 +3,15 @@ v-slot="{ navigate }" to="/cart" custom> - + - {{ cart.length }} + {{ cart.cart.length }} - + diff --git a/frontend/src/components/pages/clase/ComentariosActividad.vue b/frontend/src/components/pages/clase/ComentariosActividad.vue index 1962524..a1582ee 100644 --- a/frontend/src/components/pages/clase/ComentariosActividad.vue +++ b/frontend/src/components/pages/clase/ComentariosActividad.vue @@ -1,5 +1,7 @@