tests fixed & centered navbar

u-shev · Jan 9, 2024 · 211cef7 · 211cef7
1 parent 1d6059f
commit 211cef7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-.celerybeat-schedule
+celerybeat-schedule
 .dbsqlite
 /upload
 /__pycache__

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,8 +2,6 @@ services:
   web-app:
     build:
       context: .
-    expose:
-      - 8000
     ports:
       - "8000:8000"
     volumes:
@@ -67,7 +65,7 @@ services:
     ports:
       - "80:8080"
     volumes:
-            - ./space-app/static:/var/www/space-app/static
-            - ./space-app/media:/var/www/space-app/media
+            - ./static:/var/www/space-app/static
+            - ./media:/var/www/space-app/media
     depends_on:
       - web-app
diff --git a/makefile b/makefile
@@ -1,12 +1,12 @@
 run:
-	poetry run python manage.py runserver 0.0.0.0:8000
+	poetry run python ./space_app/manage.py runserver 0.0.0.0:8000
 
 install: 
 	poetry install
 
 migrate:
-	poetry run python3 space_app/manage.py makemigrations
-	poetry run python3 space_app/manage.py migrate
+	poetry run python3 ./space_app/manage.py makemigrations
+	poetry run python3 ./space_app/manage.py migrate
 
 lint:
 	poetry run flake8 space_app
@@ -21,9 +21,9 @@ beat:
 	celery -A space_app beat -l info
 
 test:
-	poetry run python3 manage.py test
+	poetry run python3 ./space_app/manage.py test posts users
 
 test-coverage:
-	poetry run coverage run manage.py test
+	poetry run coverage run ./space_app/manage.py test posts users
 	poetry run coverage report -m --include=space_app/* --omit=space_app/settings.py
 	poetry run coverage xml --include=space_app/* --omit=space_app/settings.py
diff --git a/space_app/__init__.py b/space_app/__init__.py
diff --git a/space_app/posts/tests.py b/space_app/posts/tests.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
-from space_app.users.models import User
-from space_app.posts.models import Post
+from .models import User
+from .models import Post
 from django.urls import reverse_lazy
 # import json
 

diff --git a/space_app/space_app/settings.py b/space_app/space_app/settings.py
@@ -95,17 +95,22 @@
 # Database
 # https://docs.djangoproject.com/en/4.2/ref/settings/#databases
 
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.postgresql',
+#         'HOST': os.getenv('POSTGRES_HOST'),
+#         'NAME': os.getenv('POSTGRES_DB'),
+#         'USER': os.getenv('POSTGRES_USER'),
+#         'PASSWORD': os.getenv('POSTGRES_PASSWORD'),
+#     }
+# }
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'HOST': os.getenv('POSTGRES_HOST'),
-        'NAME': os.getenv('POSTGRES_DB'),
-        'USER': os.getenv('POSTGRES_USER'),
-        'PASSWORD': os.getenv('POSTGRES_PASSWORD'),
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
 
@@ -146,7 +151,7 @@
 STATIC_URL = 'static/'
 STATIC_ROOT = BASE_DIR / "staticfiles"
 
-FIXTURE_DIRS = ['space_app/fixtures']
+FIXTURE_DIRS = ['./space_app/fixtures']
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field

diff --git a/space_app/templates/navbar.html b/space_app/templates/navbar.html
@@ -1,11 +1,12 @@
 {% load django_bootstrap5 %}
 
 <nav class="navbar navbar-expand-lg navbar-light" data-bs-theme="dark">
-    <a class="navbar-brand" href="{% url 'home' %}">{{ 'Space for Children' }}</a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+
+    {% comment %} <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbarNav">
+    </button> {% endcomment %}
+    <div class="collapse navbar-collapse w-100 justify-content-center" id="navbarNav">
+      <a class="navbar-brand" href="{% url 'home' %}">{{ 'Space for Children' }}</a>
       <ul class="navbar-nav">
         {% if user.is_authenticated %}
         <li class="nav-item">

diff --git a/space_app/users/tests.py b/space_app/users/tests.py
@@ -1,6 +1,6 @@
 from django.urls import reverse_lazy
 from django.test import TestCase
-from space_app.users.models import User
+from .models import User
 
 
 class TestCreateUser(TestCase):