upgrade makefile

Bump django from 4.0.6 to 4.0.7

.github/FUNDING.yml

@@ -1,2 +1,25 @@
-custom:
-- https://paypal.me/ValentinColin408
+# Platform:                                           Syntax:
+# LFX Mentorship (formerly CommunityBridge)           community_bridge: PROJECT-NAME
+# LFX Crowdfunding                                    lfx_crowdfunding: PROJECT-NAME
+# GitHub Sponsors (need to be registered)             github: USERNAME or github: [USERNAME, USERNAME, USERNAME, USERNAME]
+# IssueHunt                                           issuehunt: USERNAME
+# Ko-fi                                               ko_fi: USERNAME
+# Liberapay                                           liberapay: USERNAME
+# Open Collective                                     open_collective: USERNAME
+# Otechie                                             otechie: USERNAME
+# Patreon                                             patreon: USERNAME
+# Tidelift                                            tidelift: PLATFORM-NAME/PACKAGE-NAME
+# Custom URL                                          custom: LINK or custom: [LINK, LINK, LINK, LINK]
+
+# For Tidelift, use the platform-name/package-name syntax with the following platform names:
+# Language:           Platform name:
+# JavaScript          npm
+# Python              pypi
+# Ruby                rubygems
+# Java                maven
+# PHP                 packagist
+# C#                  nuget
+
+github: ValentinColin
+custom: 
+  - https://paypal.me/ValentinColin408

.github/labels.yml

@@ -0,0 +1,46 @@
+- name: 'good first issue'
+  color: '7057FF'
+  description: 'Good for newcomers'
+- name: 'help wanted'
+  color: '008672'
+  description: 'Extra attention is needed'
+
+- name: 'type: bug'
+  color: 'D73A4A'
+  description: "Something isn't working"
+- name: 'type: discussion'
+  color: 'D4C5F9'
+- name: 'type: documention'
+  color: '006B75'
+  description: 'Improvements or additions to documentation'
+- name: 'type: enhancement'
+  color: '84B6EB'
+  description: 'New feature or request'
+- name: 'type: feature request'
+  color: 'FBCA04'
+- name: 'type: question'
+  color: 'D876E3'
+  description: 'Futher information is requested'
+
+- name: 'priority: critical'
+  color: 'B60205'
+- name: 'priority: high'
+  color: 'D93F0B'
+- name: 'priority: medium'
+  color: 'FBCA04'
+- name: 'priority: low'
+  color: '0E8A16'
+
+- name: "status: can't reproduce"
+  color: 'FEC1C1'
+- name: 'status: confirmed'
+  color: '215CEA'
+- name: 'status: duplicate'
+  color: 'CFD3D7'
+  description: 'This issue or pull request already exists'
+- name: 'status: needs information'
+  color: 'FEF2C0'
+  description: 'Futher information is needed'
+- name: 'status: wont do/fix'
+  color: 'EEEEEE'
+  description: 'This will not be worked on'

.github/workflows/label-sync.yml

@@ -0,0 +1,25 @@
+name: Label Sync
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push: 
+    branches: 
+      - main
+    paths:
+      - '.github/labels.yml'
+  workflow_dispatch:
+
+jobs:
+  label-sync:
+    name: Label sync
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Sync labels
+        uses: crazy-max/ghaction-github-labeler@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-valentin.colin78@gmail.com.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

Makefile

@@ -13,6 +13,11 @@ DOCKER_COMPOSE_DEV	:= docker-compose-dev.yml
 DOCKER_COMPOSE_MARC	:= docker-compose-marc.yml
 DOCKER_COMPOSE_MARC_DEV	:= docker-compose-marc-dev.yml
 
+### Django
+SECRET_KEY := whatever
+HOST       := localhost
+PORT       := 9080
+
 ###############
 ### TARGETS ###
 ###############
@@ -37,9 +42,20 @@ down: ## Run down all servers (production and dev)
 	docker-compose --file $(DOCKER_COMPOSE_MARC) down
 	docker-compose --file $(DOCKER_COMPOSE_MARC_DEV) down
 
-local: ## Run server in local without docker
-	pip install -r requirements.txt
-	./entrypoint.sh
+build: ### Build from the ground up
+	docker-compose --file $(DOCKER_COMPOSE) build
+
+update:
+	pipenv update
+	pipenv lock -r > requirements.txt
+	SECRET_KEY=$(SECRET_KEY) ./manage.py collectstatic --noinput
+
+dev: ## Run dev server locally without docker
+	PRODUCTION=false HOST=$(HOST) PORT=$(PORT) SECRET_KEY=$(SECRET_KEY) ./entrypoint.sh
+
+prod: ## Run prod server locally without docker
+	PRODUCTION=true HOST=$(HOST) PORT=$(PORT) SECRET_KEY=$(SECRET_KEY) ./entrypoint.sh
+
 
 # Special target help
 help: ## Show this help

Pipfile

@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "*"
+django = ">=4.1"
 dotmap = "*"
 
 [dev-packages]

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "93eacbc7402ec06406f5a08501ca90c9340719820ee980550c11b2d4477b1b46"
+            "sha256": "e13277184f83dc13a43f90e24b9cdae97e9db37c329dc63d76e1e6825d415bfd"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -18,27 +18,27 @@
     "default": {
         "asgiref": {
             "hashes": [
-                "sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0",
-                "sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9"
+                "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4",
+                "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==3.5.0"
+            "version": "==3.5.2"
         },
         "django": {
             "hashes": [
-                "sha256:1239218849e922033a35d2a2f777cb8bee18bd725416744074f455f34ff50d0c",
-                "sha256:77ff2e7050e3324c9b67e29b6707754566f58514112a9ac73310f60cd5261930"
+                "sha256:031ccb717782f6af83a0063a1957686e87cb4581ea61b47b3e9addf60687989a",
+                "sha256:032f8a6fc7cf05ccd1214e4a2e21dfcd6a23b9d575c6573cacc8c67828dbe642"
             ],
             "index": "pypi",
-            "version": "==4.0.3"
+            "version": "==4.1"
         },
         "dotmap": {
             "hashes": [
-                "sha256:6644faf2a9161db2f0136d5cc77b877cb1e87c17a46dbe345e5d4fea794fced2",
-                "sha256:cc87300f3a61d70f2bd18103ea2747dea846a2381a8321f43ce65cbd7afdfe3d"
+                "sha256:5821a7933f075fb47563417c0e92e0b7c031158b4c9a6a7e56163479b658b368",
+                "sha256:bd9fa15286ea2ad899a4d1dc2445ed85a1ae884a42effb87c89a6ecce71243c6"
             ],
             "index": "pypi",
-            "version": "==1.3.26"
+            "version": "==1.3.30"
         },
         "sqlparse": {
             "hashes": [

SECURITY.md

@@ -1,15 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only the versions tagged `release` are supported.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| > 1.0.0 | :white_check_mark: |
-| < 1.0.0 | :x:                |
-
-
-## Reporting a Vulnerability
-
-Please for a critical vulnerability do not create issues. Contact one of the authors of this repository directly, with the tag [SECURITY].

Website/settings.py

@@ -28,8 +28,8 @@ SECRET_KEY = os.environ["SECRET_KEY"]
 DEBUG = os.environ.get("PRODUCTION") != "True"
 
 ALLOWED_HOSTS = [
-    '0.0.0.0',
     '127.0.0.1',
+    'localhost',
     'valentin-colin.fr',
 ]
 
@@ -124,6 +124,8 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
 STATIC_URL = 'static/'
+PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
+STATIC_ROOT = os.path.join(PROJECT_DIR, 'staticfiles')
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

docker-compose-marc-dev.yml

@@ -17,6 +17,11 @@ services:
     labels:
       caddy: valentin-colin.fr
       caddy.reverse_proxy: "{{upstreams 80}}"
+      traefik.enable: "true"
+      traefik.http.routers.valentincolin_website.rule: Host(`valentin-colin.com`)
+      traefik.http.routers.valentincolin_website.entrypoints: websecure
+      traefik.http.routers.valentincolin_website.tls.certresolver: tls
+      traefik.http.services.valentincolin_website.loadbalancer.server.port: 80
 
 networks:
   caddy:

docker-compose-marc.yml

@@ -10,13 +10,16 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile
-    ports:
-      - "8000:80"
     networks:
       - caddy
     labels:
       caddy: valentin-colin.fr
       caddy.reverse_proxy: "{{upstreams 80}}"
+      traefik.enable: "true"
+      traefik.http.routers.valentincolin_website.rule: Host(`valentin-colin.com`)
+      traefik.http.routers.valentincolin_website.entrypoints: websecure
+      traefik.http.routers.valentincolin_website.tls.certresolver: tls
+      traefik.http.services.valentincolin_website.loadbalancer.server.port: 80
 
 networks:
   caddy:

requirements.txt

@@ -6,7 +6,7 @@
 #
 
 -i https://pypi.org/simple
-asgiref==3.5.0; python_version >= '3.7'
-django==4.0.3
-dotmap==1.3.26
+asgiref==3.5.2; python_version >= '3.7'
+django==4.1
+dotmap==1.3.30
 sqlparse==0.4.2; python_version >= '3.5'