diff --git a/RepostajesDj/Dockerfile b/RepostajesDj/Dockerfile index 0fcdbaf..4656433 100644 --- a/RepostajesDj/Dockerfile +++ b/RepostajesDj/Dockerfile @@ -67,7 +67,7 @@ COPY . $APP_HOME # change to the app user #USER app -WORKDIR $APP_HOME/biblioteca +WORKDIR $APP_HOME/vehiculos # run entrypoint.sh ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/RepostajesDj/K8S/db-deployment.yaml b/RepostajesDj/K8S/db-deployment.yaml index cf4ddf1..4d7666a 100644 --- a/RepostajesDj/K8S/db-deployment.yaml +++ b/RepostajesDj/K8S/db-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: io.kompose.service: db name: db - namespace: libros + namespace: vehiculos spec: replicas: 1 selector: diff --git a/RepostajesDj/K8S/db-service.yaml b/RepostajesDj/K8S/db-service.yaml index be32ea9..f7cbb46 100644 --- a/RepostajesDj/K8S/db-service.yaml +++ b/RepostajesDj/K8S/db-service.yaml @@ -7,7 +7,7 @@ metadata: labels: io.kompose.service: db name: db - namespace: libros + namespace: vehiculos spec: ports: - name: "5432" diff --git a/RepostajesDj/K8S/entra.sh b/RepostajesDj/K8S/entra.sh index 6ee7d2f..e924e42 100644 --- a/RepostajesDj/K8S/entra.sh +++ b/RepostajesDj/K8S/entra.sh @@ -1 +1 @@ -kubectl -n libros exec -ti deployment.apps/libros -- /bin/bash +kubectl -n vehiculos exec -ti deployment.apps/vehiculos -- /bin/bash diff --git a/RepostajesDj/K8S/entraPsql.sh b/RepostajesDj/K8S/entraPsql.sh index 7d647c5..85ef9d1 100644 --- a/RepostajesDj/K8S/entraPsql.sh +++ b/RepostajesDj/K8S/entraPsql.sh @@ -1 +1 @@ -kubectl -n libros exec -ti deployment.apps/db -- psql --username=creylopez --dbname=libros +kubectl -n vehiculos exec -ti deployment.apps/db -- psql --username=creylopez --dbname=vehiculos diff --git a/RepostajesDj/K8S/env-prod-configmap.yaml b/RepostajesDj/K8S/env-prod-configmap.yaml index 986d8d3..e1456bf 100644 --- a/RepostajesDj/K8S/env-prod-configmap.yaml +++ b/RepostajesDj/K8S/env-prod-configmap.yaml @@ -1,10 +1,10 @@ apiVersion: v1 data: DEBUG: "0" - DJANGO_ALLOWED_HOSTS: "libros.reymota.es k8s-server localhost 127.0.0.1 [::1]" - CSRF_TRUSTED_ORIGINS: "https://libros.reymota.es" + DJANGO_ALLOWED_HOSTS: "vehiculos.reymota.es k8s-server localhost 127.0.0.1 [::1]" + CSRF_TRUSTED_ORIGINS: "https://vehiculos.reymota.es" SECRET_KEY: change_me - SQL_DATABASE: libros + SQL_DATABASE: vehiculos SQL_ENGINE: django.db.backends.postgresql SQL_HOST: db SQL_PASSWORD: Dsa-0213 @@ -16,4 +16,4 @@ metadata: labels: io.kompose.service: web-env-prod name: env-prod - namespace: libros + namespace: vehiculos diff --git a/RepostajesDj/K8S/env-prod-db-configmap.yaml b/RepostajesDj/K8S/env-prod-db-configmap.yaml index 90e2104..5bc9ee2 100644 --- a/RepostajesDj/K8S/env-prod-db-configmap.yaml +++ b/RepostajesDj/K8S/env-prod-db-configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - POSTGRES_DB: libros + POSTGRES_DB: vehiculos POSTGRES_PASSWORD: Dsa-0213 POSTGRES_USER: creylopez kind: ConfigMap @@ -8,4 +8,4 @@ metadata: labels: io.kompose.service: db-env-prod-db name: env-prod-db - namespace: libros + namespace: vehiculos diff --git a/RepostajesDj/K8S/namespace.yaml b/RepostajesDj/K8S/namespace.yaml index 5f0c693..4649fab 100644 --- a/RepostajesDj/K8S/namespace.yaml +++ b/RepostajesDj/K8S/namespace.yaml @@ -4,4 +4,4 @@ apiVersion: v1 kind: Namespace metadata: - name: libros + name: vehiculos diff --git a/RepostajesDj/K8S/nginx-deployment.yaml b/RepostajesDj/K8S/nginx-deployment.yaml index b24df16..9e974be 100644 --- a/RepostajesDj/K8S/nginx-deployment.yaml +++ b/RepostajesDj/K8S/nginx-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: io.kompose.service: nginx name: nginx - namespace: libros + namespace: vehiculos spec: replicas: 1 selector: @@ -24,16 +24,16 @@ spec: io.kompose.service: nginx spec: containers: - - image: registry.reymota.es/nginx-libros-$ARQUITECTURA:$IMG_NGINX_VERSION + - image: registry.reymota.es/nginx-vehiculos-$ARQUITECTURA:$IMG_NGINX_VERSION name: nginx ports: - containerPort: 80 protocol: TCP volumeMounts: - - mountPath: /app/biblioteca/staticfiles + - mountPath: /app/vehiculos/staticfiles name: static-volume - - mountPath: /app/biblioteca/mediafiles - name: libros-media + - mountPath: /app/vehiculos/mediafiles + name: vehiculos-media imagePullSecrets: - name: myregistrykey restartPolicy: Always @@ -41,6 +41,6 @@ spec: - name: static-volume persistentVolumeClaim: claimName: static-volume - - name: libros-media + - name: vehiculos-media persistentVolumeClaim: - claimName: libros-media + claimName: vehiculos-media diff --git a/RepostajesDj/K8S/nginx-service.yaml b/RepostajesDj/K8S/nginx-service.yaml index e5d563f..ef126ae 100644 --- a/RepostajesDj/K8S/nginx-service.yaml +++ b/RepostajesDj/K8S/nginx-service.yaml @@ -7,7 +7,7 @@ metadata: labels: io.kompose.service: nginx name: nginx - namespace: libros + namespace: vehiculos spec: type: NodePort ports: diff --git a/RepostajesDj/K8S/postgres-data-persistentvolumeclaim.yaml b/RepostajesDj/K8S/postgres-data-persistentvolumeclaim.yaml index 5c04801..00e0e92 100644 --- a/RepostajesDj/K8S/postgres-data-persistentvolumeclaim.yaml +++ b/RepostajesDj/K8S/postgres-data-persistentvolumeclaim.yaml @@ -4,7 +4,7 @@ metadata: labels: io.kompose.service: postgres-data name: postgres-data - namespace: libros + namespace: vehiculos spec: accessModes: - ReadWriteOnce diff --git a/RepostajesDj/K8S/pv-local-libros.yaml b/RepostajesDj/K8S/pv-local-vehiculos.yaml similarity index 55% rename from RepostajesDj/K8S/pv-local-libros.yaml rename to RepostajesDj/K8S/pv-local-vehiculos.yaml index b92e7fa..f27b9b1 100644 --- a/RepostajesDj/K8S/pv-local-libros.yaml +++ b/RepostajesDj/K8S/pv-local-vehiculos.yaml @@ -1,59 +1,59 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: libros-media-folder - namespace: libros + name: vehiculos-media-folder + namespace: vehiculos labels: - app: libros + app: vehiculos spec: capacity: storage: 100Mi accessModes: - ReadWriteOnce hostPath: - path: "/mnt/Externo/libros/media" + path: "/mnt/Externo/vehiculos/media" --- apiVersion: v1 kind: PersistentVolume metadata: - name: libros-migrations-folder - namespace: libros + name: vehiculos-migrations-folder + namespace: vehiculos labels: - app: libros + app: vehiculos spec: capacity: storage: 50Mi accessModes: - ReadWriteOnce hostPath: - path: "/mnt/Externo/libros/migrations" + path: "/mnt/Externo/vehiculos/migrations" --- apiVersion: v1 kind: PersistentVolume metadata: - name: libros-static-folder - namespace: libros + name: vehiculos-static-folder + namespace: vehiculos labels: - app: libros + app: vehiculos spec: capacity: storage: 70Mi accessModes: - ReadWriteOnce hostPath: - path: "/mnt/Externo/libros/static" + path: "/mnt/Externo/vehiculos/static" --- apiVersion: v1 kind: PersistentVolume metadata: - name: libros-pg-folder - namespace: libros + name: vehiculos-pg-folder + namespace: vehiculos labels: - app: libros + app: vehiculos spec: capacity: storage: 200Mi accessModes: - ReadWriteOnce hostPath: - path: "/mnt/Externo/libros/pg" + path: "/mnt/Externo/vehiculos/pg" diff --git a/RepostajesDj/K8S/reg-secret.yaml b/RepostajesDj/K8S/reg-secret.yaml index fb66841..59d4ba0 100644 --- a/RepostajesDj/K8S/reg-secret.yaml +++ b/RepostajesDj/K8S/reg-secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: myregistrykey - namespace: libros + namespace: vehiculos data: .dockerconfigjson: ewoJImF1dGhzIjogewoJCSJyZWdpc3RyeS5yZXltb3RhLmVzIjogewoJCQkiYXV0aCI6ICJZM0psZVd4dmNHVjZPbEpsZVMweE1UYzIiCgkJfQoJfQp9 type: kubernetes.io/dockerconfigjson diff --git a/RepostajesDj/K8S/static-volume-persistentvolumeclaim.yaml b/RepostajesDj/K8S/static-volume-persistentvolumeclaim.yaml index e2330bb..edc00c9 100644 --- a/RepostajesDj/K8S/static-volume-persistentvolumeclaim.yaml +++ b/RepostajesDj/K8S/static-volume-persistentvolumeclaim.yaml @@ -4,7 +4,7 @@ metadata: labels: io.kompose.service: static-volume name: static-volume - namespace: libros + namespace: vehiculos spec: accessModes: - ReadWriteOnce diff --git a/RepostajesDj/K8S/libros-deployment.yaml b/RepostajesDj/K8S/vehiculos-deployment.yaml similarity index 78% rename from RepostajesDj/K8S/libros-deployment.yaml rename to RepostajesDj/K8S/vehiculos-deployment.yaml index b9baa69..5d1c025 100644 --- a/RepostajesDj/K8S/libros-deployment.yaml +++ b/RepostajesDj/K8S/vehiculos-deployment.yaml @@ -1,43 +1,43 @@ apiVersion: v1 kind: Service metadata: - name: libros - namespace: libros + name: vehiculos + namespace: vehiculos spec: ports: - name: "8000" port: 8000 targetPort: 8000 selector: - app: libros + app: vehiculos --- apiVersion: apps/v1 kind: Deployment metadata: - name: libros - namespace: libros + name: vehiculos + namespace: vehiculos labels: - app: libros + app: vehiculos spec: replicas: 1 selector: matchLabels: - app: libros + app: vehiculos strategy: type: Recreate template: metadata: labels: - app: libros + app: vehiculos spec: containers: - args: - gunicorn - - biblioteca.wsgi:application + - vehiculos.wsgi:application - --bind - 0.0.0.0:8000 - name: libros - image: registry.reymota.es/libros-$ARQUITECTURA:$IMG_VERSION + name: vehiculos + image: registry.reymota.es/vehiculos-$ARQUITECTURA:$IMG_VERSION env: - name: VERSION value: "$IMG_VERSION" @@ -102,22 +102,22 @@ spec: - containerPort: 8000 protocol: TCP volumeMounts: - - mountPath: /app/biblioteca/mediafiles - name: libros-media - - mountPath: /app/gestion/migrations - name: libros-migrations - - mountPath: /app/biblioteca/staticfiles + - mountPath: /app/vehiculos/mediafiles + name: vehiculos-media + - mountPath: /app/repostajes/migrations + name: vehiculos-migrations + - mountPath: /app/vehiculos/staticfiles name: static-volume imagePullSecrets: - name: myregistrykey restartPolicy: Always volumes: - - name: libros-media + - name: vehiculos-media persistentVolumeClaim: - claimName: libros-media - - name: libros-migrations + claimName: vehiculos-media + - name: vehiculos-migrations persistentVolumeClaim: - claimName: libros-migrations + claimName: vehiculos-migrations - name: static-volume persistentVolumeClaim: claimName: static-volume diff --git a/RepostajesDj/K8S/libros-prod-persistentvolumeclaim.yaml b/RepostajesDj/K8S/vehiculos-prod-persistentvolumeclaim.yaml similarity index 67% rename from RepostajesDj/K8S/libros-prod-persistentvolumeclaim.yaml rename to RepostajesDj/K8S/vehiculos-prod-persistentvolumeclaim.yaml index ee1e017..2bf7d88 100644 --- a/RepostajesDj/K8S/libros-prod-persistentvolumeclaim.yaml +++ b/RepostajesDj/K8S/vehiculos-prod-persistentvolumeclaim.yaml @@ -3,9 +3,9 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: libros-media - name: libros-media - namespace: libros + io.kompose.service: vehiculos-media + name: vehiculos-media + namespace: vehiculos spec: accessModes: - ReadWriteOnce @@ -19,9 +19,9 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: libros-migrations - name: libros-migrations - namespace: libros + io.kompose.service: vehiculos-migrations + name: vehiculos-migrations + namespace: vehiculos spec: accessModes: - ReadWriteOnce diff --git a/RepostajesDj/K8S/verImg.sh b/RepostajesDj/K8S/verImg.sh index 2c48332..4b8c6b6 100644 --- a/RepostajesDj/K8S/verImg.sh +++ b/RepostajesDj/K8S/verImg.sh @@ -1 +1 @@ -docker run -it registry.reymota.es/libros:1.19 bash +docker run -it registry.reymota.es/vehiculos:1.19 bash diff --git a/RepostajesDj/Makefile b/RepostajesDj/Makefile index b9af19b..3dad086 100644 --- a/RepostajesDj/Makefile +++ b/RepostajesDj/Makefile @@ -2,7 +2,7 @@ install: echo "Creando imagen con version ${IMG_VERSION}" - docker build --no-cache -t registry.reymota.es/libros-${ARQUITECTURA}:${IMG_VERSION} . - docker push registry.reymota.es/libros-${ARQUITECTURA}:${IMG_VERSION} + docker build --no-cache -t registry.reymota.es/vehiculos-${ARQUITECTURA}:${IMG_VERSION} . + docker push registry.reymota.es/vehiculos-${ARQUITECTURA}:${IMG_VERSION} diff --git a/RepostajesDj/nginx/Makefile b/RepostajesDj/nginx/Makefile index c472d52..ac286c5 100644 --- a/RepostajesDj/nginx/Makefile +++ b/RepostajesDj/nginx/Makefile @@ -2,7 +2,7 @@ install: echo "Creando imagen con version ${IMG_NGINX_VERSION} para la arquitectura ${ARQUITECTURA}" - docker build --no-cache -t registry.reymota.es/nginx-libros-${ARQUITECTURA}:${IMG_NGINX_VERSION} . - docker push registry.reymota.es/nginx-libros-${ARQUITECTURA}:${IMG_NGINX_VERSION} + docker build --no-cache -t registry.reymota.es/nginx-vehiculos-${ARQUITECTURA}:${IMG_NGINX_VERSION} . + docker push registry.reymota.es/nginx-vehiculos-${ARQUITECTURA}:${IMG_NGINX_VERSION} diff --git a/RepostajesDj/nginx/nginx.conf b/RepostajesDj/nginx/nginx.conf index 15353b2..2b05005 100644 --- a/RepostajesDj/nginx/nginx.conf +++ b/RepostajesDj/nginx/nginx.conf @@ -1,5 +1,5 @@ -upstream libros { - server libros:8000; +upstream vehiculos { + server vehiculos:8000; } server { @@ -7,7 +7,7 @@ server { listen 80; location / { - proxy_pass http://libros; + proxy_pass http://vehiculos; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_redirect off; @@ -15,11 +15,11 @@ server { } location /static/ { - alias /app/biblioteca/staticfiles/; + alias /app/vehiculos/staticfiles/; } location /media/ { - alias /app/biblioteca/mediafiles/; + alias /app/vehiculos/mediafiles/; } } diff --git a/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html b/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html index ecd9c48..09c071f 100644 --- a/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html +++ b/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html @@ -77,7 +77,7 @@
  • - + @@ -87,13 +87,13 @@ - Libros + Repostajes
  • - + @@ -128,8 +128,8 @@
    • diff --git a/RepostajesDj/vehiculos/repostajes/templates/_head.html b/RepostajesDj/vehiculos/repostajes/templates/_head.html index e7abf9b..44ae74c 100644 --- a/RepostajesDj/vehiculos/repostajes/templates/_head.html +++ b/RepostajesDj/vehiculos/repostajes/templates/_head.html @@ -3,7 +3,7 @@ - Biblioteca de libros + Registro de vehículos y sus repostajes diff --git a/RepostajesDj/vehiculos/repostajes/templates/repostajes/detalle_repostaje.html b/RepostajesDj/vehiculos/repostajes/templates/repostajes/detalle_repostaje.html index 77e4e0a..ee79a2e 100644 --- a/RepostajesDj/vehiculos/repostajes/templates/repostajes/detalle_repostaje.html +++ b/RepostajesDj/vehiculos/repostajes/templates/repostajes/detalle_repostaje.html @@ -6,25 +6,15 @@
    -
    - {% if libro.portada %} -

    {{ libro.titulo }}

    - {% else %} -

    No hay imágen disponible

    - {% endif %} - {% if libro.archivo %} -

    Descargar

    - {% endif %} -
    -

    {{ libro.titulo }}

    +

    {{ repostaje.fecha }}

    diff --git a/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_repostaje.html b/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_repostaje.html index 67ad68c..8d2be48 100644 --- a/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_repostaje.html +++ b/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_repostaje.html @@ -2,7 +2,7 @@ {% block content %}
    -

    {% if form.instance.pk %}Editar Libro{% else %}Nuevo Libro{% endif %}

    +

    {% if form.instance.pk %}Editar repostaje{% else %}Nuevo repostaje{% endif %}

    {% csrf_token %} diff --git a/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_vehiculo.html b/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_vehiculo.html index 727f242..f5905a2 100644 --- a/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_vehiculo.html +++ b/RepostajesDj/vehiculos/repostajes/templates/repostajes/form_vehiculo.html @@ -3,7 +3,7 @@ {% block content %}
    -

    {% if form.instance.pk %}Editar Autor{% else %}Nuevo Autor{% endif %}

    +

    {% if form.instance.pk %}Editar vehículo{% else %}Nuevo vehículo{% endif %}

    {% csrf_token %} diff --git a/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_repostajes.html b/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_repostajes.html index 2e15d52..f457205 100644 --- a/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_repostajes.html +++ b/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_repostajes.html @@ -6,33 +6,28 @@
    -

    Libros

    +

    Repostajes

    - Añadir libro + Añadir repostaje
    - {% for libro in libros %} + {% for repostaje in repostajes %}
    - {% if libro.portada %} - {{ libro.titulo }}, - {% else %} - Sin imágen - {% endif %} -

    {{ libro.titulo }}

    +

    {{ repostaje.fecha }}

    @@ -44,11 +39,11 @@
      -
    • +
    • Editar
      • -
    • +
    • Descargar
      • diff --git a/RepostajesDj/vehiculos/repostajes/views.py b/RepostajesDj/vehiculos/repostajes/views.py index 4d24d21..3411c67 100644 --- a/RepostajesDj/vehiculos/repostajes/views.py +++ b/RepostajesDj/vehiculos/repostajes/views.py @@ -4,6 +4,7 @@ from django.shortcuts import render, get_object_or_404, redirect from django.contrib.auth.decorators import login_required from .models import Vehiculo, Repostaje +from .forms import VehiculoForm, RepostajeForm @login_required def principal(request): @@ -27,3 +28,77 @@ def detalle_vehiculo(request, vehiculo_id): return render(request, 'repostajes/detalle_vehiculo.html', {'vehiculo': vehiculo, 'libros': libros}) +@login_required +def nuevo_vehiculo(request): + if request.method == 'POST': + form = VehiculoForm(request.POST, request.FILES) + if form.is_valid(): + form.save() + return redirect('lista_vehiculoes') + else: + form = VehiculoForm() + return render(request, 'repostajes/form_vehiculo.html', {'form': form}) + +@login_required +def editar_vehiculo(request, vehiculo_id): + vehiculo = get_object_or_404(Vehiculo, pk=vehiculo_id) + if request.method == 'POST': + form = VehiculoForm(request.POST, request.FILES, instance=vehiculo) + if form.is_valid(): + form.save() + return redirect('lista_vehiculoes') + else: + form = VehiculoForm(instance=vehiculo) + return render(request, 'repostajes/form_vehiculo.html', {'form': form}) + + +@login_required +def eliminar_vehiculo(request, vehiculo_id): + vehiculo = get_object_or_404(Vehiculo, pk=vehiculo_id) + vehiculo.delete() + return redirect('lista_vehiculoes') + + +# Vistas para los libros +@login_required +def lista_libros(request): + libros = Repostaje.objects.all() + return render(request, 'repostajes/lista_libros.html', {'libros': libros}) + + +@login_required +def detalle_libro(request, libro_id): + libro = get_object_or_404(Repostaje, pk=libro_id) + return render(request, 'repostajes/detalle_libro.html', {'libro': libro}) + + +@login_required +def nuevo_libro(request): + if request.method == 'POST': + form = RepostajeForm(request.POST, request.FILES) + if form.is_valid(): + form.save() + return redirect('lista_libros') + else: + form = RepostajeForm() + return render(request, 'repostajes/form_libro.html', {'form': form}) + + +@login_required +def editar_libro(request, libro_id): + libro = get_object_or_404(Repostaje, pk=libro_id) + if request.method == 'POST': + form = RepostajeForm(request.POST, request.FILES, instance=libro) + if form.is_valid(): + form.save() + return redirect('lista_libros') + else: + form = RepostajeForm(instance=libro) + return render(request, 'repostajes/form_libro.html', {'form': form}) + + +@login_required +def eliminar_libro(request, libro_id): + libro = get_object_or_404(Repostaje, pk=libro_id) + libro.delete() + return redirect('lista_libros')