keerti1924 · WeslatiWalid · Aug 25, 2024 · Aug 25, 2024 · Aug 26, 2024 · Aug 26, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,168 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+*.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+env.py
+collectstatic
+migrations/*
+media/*
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,25 @@
+#dockerfile for django app
+FROM python:3.10-slim
+
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends \
+        libatlas-base-dev gfortran supervisor \
+        nano
+
+
+WORKDIR /app
+
+COPY . .
+
+RUN pip install -r requirements.txt
+
+RUN python3 manage.py makemigrations
+
+RUN python3 manage.py migrate
+
+RUN python manage.py collectstatic --noinput
+
+# CMD ["gunicorn", "--bind", "0.0.0.0:8000", "myproject.wsgi:application"]
+CMD ["gunicorn", "-c", "gunicorn_config.py", "myproject.wsgi:application"]
+
+# CMD ["python", "manage.py", "runserver"]
diff --git a/PREVIEW/IMG1.png b/PREVIEW/IMG1.png
diff --git a/PREVIEW/IMG2.png b/PREVIEW/IMG2.png
diff --git a/PREVIEW/IMG3.png b/PREVIEW/IMG3.png
diff --git a/PREVIEW/IMG4.png b/PREVIEW/IMG4.png
diff --git a/PREVIEW/IMG5.png b/PREVIEW/IMG5.png
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '3.3'
+
+services:
+  bizz2goo:
+    build:
+      context: ./
+      dockerfile: Dockerfile
+    ports:
+      - "3080:8000"
+    volumes:
+      - ./:/app
+      - /var/www/html/blogStatic/:/var/www/html/blogStatic/
diff --git a/gunicorn_config.py b/gunicorn_config.py
@@ -0,0 +1,7 @@
+bind = "0.0.0.0:8000"
+workers = 3  # Adjust the number of workers based on your needs
+worker_class = "sync"  # You can change this to "gevent" or "eventlet" if needed
+timeout = 30  # Timeout for workers
+loglevel = "info"  # Logging level
+accesslog = "./access.log"  # Log to stdout
+errorlog = "./error.log"  # Log to stderr
diff --git a/links.txt b/links.txt
@@ -0,0 +1,16 @@
+#UI
+
+https://demos.creative-tim.com/paper-kit-pro-react/#/profile-page
+
+https://demos.creative-tim.com/paper-kit-pro-react/#/presentation
+
+https://demos.creative-tim.com/nextjs-tailwind-blog-posts-page/?_ga=2.127420553.582448555.1730303848-180642451.1724699074#
+
+https://demos.creative-tim.com/material-kit/index.html?_ga=2.72870167.582448555.1730303848-180642451.1724699074
+
+For Articles :
+https://demos.creative-tim.com/paper-kit-pro-react/#/blog-post
+
+#Django
+
+https://django-ckeditor.readthedocs.io/en/latest/
diff --git a/media/author_pictures/grand-mec-fait-emotions-face-au-fou_144627-3567.jpg b/media/author_pictures/grand-mec-fait-emotions-face-au-fou_144627-3567.jpg
diff --git a/media/author_pictures/image_2024-11-22_151016045.png b/media/author_pictures/image_2024-11-22_151016045.png
diff --git a/media/images/posts/Florence-840x276.jpg b/media/images/posts/Florence-840x276.jpg
diff --git a/media/images/posts/Florence-840x276_BG6nSu8.jpg b/media/images/posts/Florence-840x276_BG6nSu8.jpg
diff --git a/media/images/posts/Florence-840x276_LqtNbqV.jpg b/media/images/posts/Florence-840x276_LqtNbqV.jpg
diff --git a/media/images/posts/Florence-840x276_RherTCi.jpg b/media/images/posts/Florence-840x276_RherTCi.jpg
diff --git a/media/images/posts/dsd-ecarteur.png b/media/images/posts/dsd-ecarteur.png
diff --git a/media/images/posts/foto-6-jpg.webp b/media/images/posts/foto-6-jpg.webp
diff --git a/media/images/posts/foto-6-jpg_gehcJdW.webp b/media/images/posts/foto-6-jpg_gehcJdW.webp
diff --git a/media/images/posts/grand-mec-fait-emotions-face-au-fou_144627-3567.jpg b/media/images/posts/grand-mec-fait-emotions-face-au-fou_144627-3567.jpg
diff --git a/media/images/posts/grand-mec-fait-emotions-face-au-fou_144627-3567_v8SnSAW.jpg b/media/images/posts/grand-mec-fait-emotions-face-au-fou_144627-3567_v8SnSAW.jpg
diff --git a/media/images/posts/téléchargement.jpg b/media/images/posts/téléchargement.jpg
diff --git a/media/images/posts/téléchargement_QKjuVw6.jpg b/media/images/posts/téléchargement_QKjuVw6.jpg
diff --git a/myapp/__pycache__/__init__.cpython-311.pyc b/myapp/__pycache__/__init__.cpython-311.pyc
diff --git a/myapp/__pycache__/__init__.cpython-38.pyc b/myapp/__pycache__/__init__.cpython-38.pyc
diff --git a/myapp/__pycache__/admin.cpython-311.pyc b/myapp/__pycache__/admin.cpython-311.pyc
diff --git a/myapp/__pycache__/admin.cpython-38.pyc b/myapp/__pycache__/admin.cpython-38.pyc
diff --git a/myapp/__pycache__/apps.cpython-311.pyc b/myapp/__pycache__/apps.cpython-311.pyc
diff --git a/myapp/__pycache__/apps.cpython-38.pyc b/myapp/__pycache__/apps.cpython-38.pyc
diff --git a/myapp/__pycache__/models.cpython-311.pyc b/myapp/__pycache__/models.cpython-311.pyc
diff --git a/myapp/__pycache__/models.cpython-38.pyc b/myapp/__pycache__/models.cpython-38.pyc
diff --git a/myapp/__pycache__/urls.cpython-311.pyc b/myapp/__pycache__/urls.cpython-311.pyc
diff --git a/myapp/__pycache__/urls.cpython-38.pyc b/myapp/__pycache__/urls.cpython-38.pyc
diff --git a/myapp/__pycache__/views.cpython-311.pyc b/myapp/__pycache__/views.cpython-311.pyc
diff --git a/myapp/__pycache__/views.cpython-38.pyc b/myapp/__pycache__/views.cpython-38.pyc
diff --git a/myapp/admin.py b/myapp/admin.py
@@ -1,13 +1,122 @@
+# blog/admin.py
+
 from django.contrib import admin
-from .models import Post,Comment,Contact
-# Register your models here.
+from django import forms
+from .models import Post, Comment, Contact, AuthorProfile, CKPost, SubCategory, Category, Advertisement
+from ckeditor.widgets import CKEditorWidget
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
+from django.utils.html import format_html # For custom JS in admin form
 
-admin.site.register(Post)
-admin.site.register(Comment)
-admin.site.register(Contact)
+class PostAdminForm(forms.ModelForm):
+    content = forms.CharField(widget=CKEditorWidget())
+
+    class Meta:
+        model = CKPost
+        fields = '__all__'
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['title'].widget.attrs.update({'class': 'form-control'})
+        self.fields['category'].widget.attrs.update({'class': 'form-control'})
+        self.fields['sub_category'].widget.attrs.update({'class': 'form-control'})
+        self.fields['content'].widget.attrs.update({'class': 'form-control'}) # content already uses CKEditorWidget
+        self.fields['image'].widget.attrs.update({'class': 'form-control-file'})
+        self.fields['slug'].widget.attrs.update({'class': 'form-control'})
+
+class PostAdmin(admin.ModelAdmin):
+    form = PostAdminForm
+    list_display = ('title', 'user', 'category', 'time')
+    list_filter = ('category', 'time', 'user')
+    search_fields = ('title', 'content', 'user__username', 'user__email')
+    prepopulated_fields = {'slug': ('title',)} # Auto-populate slug from title
+
+class AuthorProfileInline(admin.StackedInline):
+    model = AuthorProfile
+    can_delete = False
+    verbose_name_plural = 'Author Profile'
+    fk_name = 'user'
+
+class AdvertisementAdminForm(forms.ModelForm):
+    class Meta:
+        model = Advertisement
+        fields = '__all__'
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # JavaScript to show/hide category based on position
+        # This makes 'category' field more prominent when needed
+        self.fields['position'].widget.attrs['onchange'] = (
+            "var categoryRow = document.querySelector('.field-category');"
+            "if (this.value === 'bottom_banner_category' || this.value === 'sidebar') {"
+            "  categoryRow.style.display = '';"
+            "} else {"
+            "  categoryRow.style.display = 'none';"
+            "}"
+        )
+
+    # Include the script in the form's media
+    class Media:
+        js = ('admin/js/jquery.init.js', 'admin/js/dynamic_form_fields.js') # Example, ensure these paths are correct or provide inline script
 
+@admin.register(Advertisement)
+class AdvertisementAdmin(admin.ModelAdmin):
+    form = AdvertisementAdminForm
+    list_display = ('title', 'position', 'link_type', 'category', 'is_active', 'display_order', 'created_at')
+    list_filter = ('is_active', 'position', 'category', 'link_type')
+    search_fields = ('title',)
+    fieldsets = (
+        (None, {
+            'fields': ('title', 'image', 'is_active', 'position', 'display_order')
+        }),
+        ('Lien de l\'annonce', {
+            'fields': ('link_type', 'external_url'),
+            'description': ("Si un type de 'Formulaire Interne' est choisi, l'URL externe sera ignorée. " # Updated description
+                           "Si 'Lien Externe' est choisi, l'URL externe est requise.")
+        }),
+        ('Ciblage par Catégorie', {
+            'fields': ('category',),
+            'description': ("Requis pour 'Bottom Banner Category'. Optionnel pour 'Sidebar Ad' "
+                           "pour cibler une catégorie spécifique. Laisser vide pour les 'Sidebar Ad' généraux.")
+        }),
+    )
+    list_editable = ('is_active', 'display_order')
+
+class CustomUserAdmin(UserAdmin):
+    inlines = (AuthorProfileInline,)
+    list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff', 'is_active', 'get_is_author') # Renamed for consistency
+    list_filter = ('is_staff', 'is_active', 'authorprofile__is_author')
+    fieldsets = UserAdmin.fieldsets # Use default UserAdmin fieldsets
+    add_fieldsets = UserAdmin.add_fieldsets # Use default UserAdmin add_fieldsets
+
+
+    def get_is_author(self, obj):
+        if hasattr(obj, 'authorprofile'):
+            return obj.authorprofile.is_author
+        return False
+    get_is_author.boolean = True
+    get_is_author.short_description = 'Is Author'
+
+@admin.register(Category)
+class CategoryAdmin(admin.ModelAdmin):
+    list_display = ('name', 'slug', 'description')
+    prepopulated_fields = {'slug': ('name',)}
+
+@admin.register(SubCategory)
+class SubCategoryAdmin(admin.ModelAdmin):
+    list_display = ('name', 'category')
+    list_filter = ('category',)
+
+# --- Registration ---
+admin.site.unregister(User) # Unregister default User admin
+admin.site.register(User, CustomUserAdmin) # Register with custom admin
+
+admin.site.register(CKPost, PostAdmin)
+admin.site.register(Post) # Assuming this is your old Post model, keep if needed, otherwise remove
+admin.site.register(Comment)
+admin.site.register(Contact)
+# admin.site.register(AuthorProfile) # This is handled by the inline in CustomUserAdmin
 
-admin.site.site_header = 'BLOGSPOT | ADMIN PANEL'
-admin.site.site_title = 'BLOGSPOT | BLOGGING WEBSITE'
-admin.site.index_title= 'BlogSpot Site Administration'
+admin.site.site_header = 'GOZONE | ADMIN PANEL' # Updated name
+admin.site.site_title = 'GOZONE | Content Management' # Updated name
+admin.site.index_title = 'GoZone Site Administration' # Updated name