update Django version and ui fixes

Author: bahrom04

.dockerignore

@@ -0,0 +1,34 @@
+# Include any files or directories that you don't want to be copied to your
+# container here (e.g., local build artifacts, temporary files, etc.).
+#
+# For more help, visit the .dockerignore file reference guide at
+# https://docs.docker.com/go/build-context-dockerignore/
+
+**/.DS_Store
+**/__pycache__
+**/.venv
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose.y*ml
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

Dockerfile

@@ -0,0 +1,34 @@
+FROM python:3.10.12-alpine
+
+WORKDIR /usr/src/app
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
+
+# Install dependencies
+RUN apk update && apk add --no-cache nodejs npm postgresql-dev gettext
+
+# Create necessary directories
+RUN mkdir -p /home/app/web/static /home/app/web/media /home/app/web/locale
+
+# Set the app home directory
+ENV APP_HOME=/home/app/web
+
+WORKDIR $APP_HOME
+
+# Copy project files into the container
+COPY . .
+
+# Install Python dependencies
+RUN pip install pip --upgrade && pip install -r requirements/develop.txt
+
+# Ensure entrypoint.sh is executable
+RUN chmod +x /home/app/web/entrypoint.sh
+
+# Set the entrypoint script
+ENTRYPOINT ["sh", "/home/app/web/entrypoint.sh"]
+
+# Clean up
+RUN rm -rf /etc/apk/cache

compose.yaml

@@ -0,0 +1,41 @@
+services:
+  kediuz:
+    container_name: kediuz
+    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile
+    command: python manage.py runserver 8000
+    # security_opt:
+    #   - seccomp:unconfined
+    volumes:
+      - ./:/home/app/web
+      - ./media:/home/app/media
+      - ./static:/home/app/static
+      - ./locale:/home/app/locale
+      # - ./logs:/home/app/web/logs
+    env_file:
+      - .env
+    environment:
+      - TZ=Asia/Tashkent
+    # ports:
+    #   - ${DJANGO_WEB_PORT}:${DJANGO_WEB_PORT}
+    depends_on:
+      - db
+
+  db:
+    image: postgres:14
+    container_name: "kediuzDB"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    
+    environment:
+      - POSTGRES_USER=${DB_USER}
+      - POSTGRES_PASSWORD=${DB_PASSWORD}
+      - POSTGRES_HOST=${DB_HOST}
+      - POSTGRES_DB=${DB_NAME}
+      - POSTGRES_PORT=${DB_PORT}
+    restart: always
+
+volumes:
+  postgres_data:

entrypoint.sh

@@ -1,16 +1,30 @@
-#!/usr/bin/sh
+# !/usr/bin/sh
 
 # Activate the virtual environment
 activate_venv="$(pwd)/venv/bin/activate"
 source $activate_venv
 
+# python manage.py migrate
+# python manage.py tailwind install --no-input
+# python manage.py tailwind build --no-input
+# python manage.py collectstatic --no-input
+# python manage.py compilemessages
+
+# # Restart services
+# sudo systemctl restart gunicorn
+# sudo systemctl restart nginx
+# echo "gunicorn and nginx restarted ..."
+
+if [ "$DB_USER" = "postgres" ]; then
+    while ! nc -z $DB_HOST $DB_PORT; do
+      sleep 0.1
+    done
+fi
+
 python manage.py migrate
 python manage.py tailwind install --no-input
 python manage.py tailwind build --no-input
 python manage.py collectstatic --no-input
 python manage.py compilemessages
 
-# Restart services
-sudo systemctl restart gunicorn
-sudo systemctl restart nginx
-echo "gunicorn and nginx restarted ..."
+exec "$@"

requirements/base.txt

@@ -1,5 +1,5 @@
 # Django
-Django==4.2.16
+Django==4.2.18
 
 django-allauth==0.63.3
 cryptography==42.0.8

templates/redesign/home.html

@@ -13,7 +13,9 @@ <h1 class="font-bold text-3xl px-6">{% trans 'News' %}</h1>
             {% for post in posts %}
             <div class="overflow-hidden relative bg-zinc-900 rounded-md p-3">
                 <a href="{% url 'common:post' post.id %}" class="btn btn-primary">
-                    <img src="{{ post.image.url }}" class="w-full sm:h-32 object-cover rounded-md" alt="img">
+                    <!-- <img src="{{ post.image.url }}" class="w-full sm:h-32 object-cover rounded-md" alt="img"> -->
+                    <img src="{{ post.image.url }}" class="w-full object-cover h-64 md:h-10  rounded-md" alt="image">
+
                 </a>
                 <div>
                     <p class="opacity-50 mt-2">{{post.created_at}}</p>

templates/redesign/lost_animal_list.html

@@ -16,15 +16,10 @@
 {% endblock %}
 
 {% block content %}
-<main class="grid lg:grid-cols-4 max-w-screen-xl items-center mx-auto">
-    <div class="gap-10 lg:col-span-3 h-full">
-        <div class="flex justify-between items-center">
-            <h1 class="font-bold text-3xl px-6">Lost animals</h1>
-            <!-- <i class="fa-solid fa-magnifying-glass mr-9"></i> -->
-        </div>
-        
+<main class="grid lg:grid-cols-1 max-w-screen-xl items-center mx-auto">
+   
         <!-- lost animal list -->
-        <div class="grid gap-6 p-6 grid-cols-1 md:grid-cols-2 lg:grid-cols-3">
+        <div class="grid gap-6 p-6 grid-cols-1 md:grid-cols-2 lg:grid-cols-4">
             {% for post in posts %}
             <div class="relative bg-zinc-900 rounded-md flex flex-col  p-3 items-center">
 
@@ -57,7 +52,6 @@ <h1 class="font-bold text-3xl px-6">Lost animals</h1>
             </div>
             {% endfor %}
         </div>
-    </div>
 
 </main>
 {% endblock %}