Skip to content

Commit

Permalink
Merge pull request #7 from Fer-Bar/bug/collect-static-files
Browse files Browse the repository at this point in the history
Changed HTML text from English to Spanish and updated dockerfile to collect static file
  • Loading branch information
enrker authored Apr 12, 2024
2 parents 85fc855 + c2481c6 commit d60ad28
Show file tree
Hide file tree
Showing 9 changed files with 114 additions and 53 deletions.
4 changes: 2 additions & 2 deletions .docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ version: '3'
services:
web:
build: .
command: bash -c "python manage.py migrate && echo \"from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', '[email protected]', 'password_secret')\" | python manage.py shell && python manage.py runserver 0.0.0.0:8000"
command: ./entrypoint.sh
volumes:
- .:/code
ports:
- "8000:8000"
- "8000:8000"
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ ADD pyproject.toml poetry.lock /code/
RUN pip install poetry && poetry config virtualenvs.create false && poetry install --no-dev

ADD . /code/
RUN chmod +x /code/entrypoint.sh
2 changes: 1 addition & 1 deletion albercan_backend/templates/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<a class="nav-link" href="#">Testimonios</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Blog</a>
<a class="nav-link" href="#">Posts</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Contáctanos</a>
Expand Down
9 changes: 9 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

python manage.py migrate

echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', '[email protected]', 'password_secret')" | python manage.py shell

python manage.py collectstatic --no-input

python manage.py runserver 0.0.0.0:8000
8 changes: 4 additions & 4 deletions pet/templates/pet/blog_section.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<div class="container">
<div class="row justify-content-center mb-5">
<div class="col-md-8 text-center">
<h1 class="heading mb-4">Our blog article</h1>
<h1 class="heading mb-4">Nuestros posts</h1>
</div>
</div>

<div class="row g-0">
<div class="col-md-4">
<a href="#" class="link-thumbnail">
<h3>
<span class="date">February 8, 2021</span> Lorem ipsum dolor sit amet consectetur adipisicing elit.
<span class="date">Hace un mes</span> ¿Qué alimentos son peligrosos para los cachorros?
</h3>
<span class="fa fa-plus"></span>
<img src="https://fer-bar.github.io/AlberCan/images/pet4.jpg" alt="Image placeholder" class="img-fluid custom-image">
Expand All @@ -20,7 +20,7 @@ <h3>
<div class="col-md-4">
<a href="#" class="link-thumbnail">
<h3>
<span class="date">February 8, 2021</span> Lorem ipsum dolor sit amet consectetur adipisicing elit.
<span class="date">Hace 4 meses</span> La importancia de adoptar animales rescatados
</h3>
<span class="fa fa-plus"></span>
<img src="https://fer-bar.github.io/AlberCan/images/pet1.jpg" alt="Image placeholder" class="img-fluid custom-image">
Expand All @@ -30,7 +30,7 @@ <h3>
<div class="col-md-4">
<a href="#" class="link-thumbnail">
<h3>
<span class="date">February 8, 2021</span> Lorem ipsum dolor sit amet consectetur adipisicing elit.
<span class="date">27 de Octubre del 2003</span> Lucy, nos cuenta como ser voluntaria en el albergue cambió su vida.
</h3>
<span class="fa fa-plus"></span>
<img src="https://fer-bar.github.io/AlberCan/images/pet2.jpg" alt="Image placeholder" class="img-fluid custom-image">
Expand Down
34 changes: 19 additions & 15 deletions pet/templates/pet/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,45 @@
<div class="container">
<div class="row mb-5">
<div class="col-md-3 mb-5">
<h2>About us</h2>
<p>Lorem ipsum dolor sit amet consectetur, adipisicing elit. Vel, sunt quos voluptas, facere quo explicabo quibusdam dolorem amet distinctio voluptatibus optio excepturi culpa delectus minus asperiores! Eaque ipsam dolor voluptatem?</p>
<p><a href="#">Click here to learn more</a></p>
<h2>Sobre nosotros</h2>
<p>
Somos una organización que protege y cuida a las mascotas. Proporcionamos un hogar seguro para cada mascota
rescatada y aseguramos su bienestar. Creemos en el poder de la adopción y en el amor que una mascota puede
aportar. ¡Únete a nosotros y cambia la vida de una mascota hoy!
</p>
<p><a href="#">Haz clic aquí para aprender más</a></p>
</div>

<div class="col-md-3 mb-5">
<h2>Contact &amp; Address</h2>
<h2>Contacto y dirección</h2>
<ul class="list-unstyled footer-link">
<li class="d-flex">
<span class="me-3">Addresse:</span><span class="text-white">28 Avenut Name, City name here , Country name here</span>
<span class="me-3">Dirección:</span><span class="text-white">Avenida 6 de Agosto #312, Sucre, Chuquisaca.</span>
</li>

<li class="d-flex">
<span class="me-3">Telephone:</span><span class="text-white">+591 74418613</span>
<span class="me-3">Teléfono:</span><span class="text-white">+591 69695061</span>
</li>

<li class="d-flex">
<span class="me-3">Email:</span><span class="text-white">youremail@yourdomain.com</span>
<span class="me-3">Email:</span><span class="text-white">josesaigua2001@gmail.com</span>
</li>
</ul>
</div>

<div class="col-md-3 mb-5">
<h2>Quick links</h2>
<h2>Accesos directos</h2>
<ul class="list-unstyled footer-link">
<li><a href="#">About us</a></li>
<li><a href="#">Testimonials</a></li>
<li><a href="#">Our pets</a></li>
<li><a href="#">Blog articles</a></li>
<li><a href="#">Contact us</a></li>
<li><a href="#">Sobre nosotros</a></li>
<li><a href="#">Testimonios</a></li>
<li><a href="#">Nuestras mascotas</a></li>
<li><a href="#">Nuestros posts</a></li>
<li><a href="#">Contáctanos</a></li>
</ul>
</div>

<div class="col-md-3">
<h2>Our social media</h2>
<h2>Nuestras redes sociales</h2>
<ul class="list-unstyled footer-link d-flex footer-social">
<li><a href="#"><span class="fa fa-facebook"></span></a></li>
<li><a href="#"><span class="fa fa-twitter"></span></a></li>
Expand All @@ -49,7 +53,7 @@ <h2>Our social media</h2>

<div class="row">
<div class="col-12 text-md-center text-left">
<p>This template is made with <i class="fa fa-heart-o"></i> by Coding River</p>
<p>Esta template esta hecha con <i class="fa fa-heart-o"></i> por Coding River</p>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions pet/templates/pet/mail_subscription.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
<div class="row justify-content-center align-items-center">
<div class="col md-12 mb-4">
<h1 class="heading">
Get news &amp; updates
Obtén noticias y actualizaciones
</h1>
</div>
<div class="col-md-12">
<form action="" method="POST">
<div class="row">
<div class="col-md-4 mb-4">
<input type="text" class="form-control" placeholder="Your Name here">
<input type="text" class="form-control" placeholder="Tu Nombre">
</div>

<div class="col-md-4 mb-4">
<input type="email" class="form-control" placeholder="Your email here">
<input type="email" class="form-control" placeholder="Tu correo">
</div>

<div class="col-md-4 mb-4">
<input type="submit" class="btn btn-secondary w-100" value="Subscribe">
<input type="submit" class="btn btn-secondary w-100" value="Suscribirse">
</div>

</div>
Expand Down
11 changes: 8 additions & 3 deletions pet/templates/pet/our_pets_section.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
<div class="container">
<div class="row justify-content-center mb-5">
<div class="col-md-8 text-center">
<h1 class="heading mb-4">Meet our adorable pets</h1>
<p class="mb-4 lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. Sunt non at praesentium fuga quisquam, tempora eos rerum soluta! Officiis soluta veritatis nostrum incidunt minus vel sunt excepturi? Alias, necessitatibus sed.</p>
<h1 class="heading mb-4">Conoce a nuestras adorables mascotas</h1>
<p class="mb-4 lead">
Cada día es una oportunidad para conocer a nuestras adorables mascotas. Cada una de ellas tiene una historia
única y está esperando a alguien especial como tú. Nuestras mascotas son cariñosas, juguetonas y están listas
para ser parte de tu familia. ¡Ven y descubre el amor incondicional que una mascota puede ofrecer! Recuerda,
adoptar una mascota no solo cambia la vida de la mascota, sino también la tuya.
</p>
<p class="mb-0">
<a href="#" class="btn btn-primary">Find out about our pets</a>
<a href="#" class="btn btn-primary">Descubre más sobre nuestras mascotas</a>
</p>
</div>
</div>
Expand Down
Loading

0 comments on commit d60ad28

Please sign in to comment.