cv

* 3.9

* crispy-bootstrap4

* 3.9 that works

* 3.9 in dockerfile

.dockerignore

@@ -4,12 +4,18 @@ run.sh
 runtime.txt
 Makefile
 heroku.yml
-docker-compose.*
+docker-compose.yml
+dev.yml
 db.sqlite3
 venv
 .env
 .github/
+.git
 .vim/
 .buildpacks
 *.pem
 *.crt
+.travis.yml
+.gitignore
+.dockerignore
+requirements.txt

.env.template

@@ -0,0 +1,9 @@
+DJANGO_SETTINGS_MODULE=django_project.settings
+SECRET_KEY=secret
+FTP_URL=0.0.0.0:21
+POSTGRES_NAME=website
+POSTGRESQL_USER=root
+POSTGRES_PASSWORD=password
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
+REDIS_URL=redis:6379

.github/FUNDING.yml

@@ -1 +1,7 @@
+liberapay: marcpartensky
 patreon: marcpartensky
+github: marcpartensky
+custom:
+  # - monero:43J2XmRtjDPRLD35UsYGH2AZamFBQz7dt4VdvZXVm3SuadTrvcoXUXBRUNHqukFte23Q5TWXqhbwaLJJgoVQzzbe2AJDANQ
+  - https://paypal.me/marcpartensky
+  - https://buymeacoffee.com/marcpartensky

.github/workflows/docker-build-test.yml

@@ -0,0 +1,45 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - "*"
+      - "!master"
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+env:
+  IMAGE_NAME: website
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build docker image
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: false
+        tags: marcpartensky/website:latest
+        # cache-from: type=local,src=/tmp/buildx
+        # cache-to: type=local,dest=/tmp/buildx
+        cache-from: type=gha
+        cache-to: type=gha

.github/workflows/docker-push.yml

@@ -15,47 +15,54 @@ env:
   IMAGE_NAME: website
 
 jobs:
-  build:
+  build-and-push:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Update apt
-      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
-    - name: Install Python3.7
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.7
-        architecture: x64
-    - name: Update pip
-      run: pip install -U pip
-    - name: Install pipenv
-      run: pip install pipenv
-    - name: Lock pip dependencies
-      run: pipenv lock --pre --clear
-    - name: Install dependencies
-      run: pipenv install
-    - name: Export to requirements.txt
-      run: pipenv lock -r > requirements.txt
-    - name: Collecting static
-      run: SECRET_KEY=secret pipenv run ./manage.py collectstatic --noinput
-    - name: Preparing migrations
-      run: SECRET_KEY=secret pipenv run ./manage.py makemigrations
-    - name: Updating package.json
-      run: npm update
-    - name: Fixing audit npm bugs
-      run: npm audit fix
+
+    - name: Build the tag
+      id: tag
+      run: echo "::set-output name=tag::$(git rev-parse --short HEAD).$(date +'%Y-%m-%d')"
+
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
+
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
+
     - name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Build and push
-      id: docker_build
+
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: true
+        tags:  marcpartensky/website:latest
+
+    - name: Build and push Docker images
       uses: docker/build-push-action@v2
       with:
+        context: .
         push: true
-        tags: marcpartensky/website:latest
+        tags:  marcpartensky/website:v${{ github.run_number }}.${{ steps.tag.outputs.tag }}
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs:
+      - build-and-push
+    steps:
+    - name: executing remote ssh commands using password
+      uses: appleboy/ssh-action@v1.0.0
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        key: ${{ secrets.KEY }}
+        port: ${{ secrets.PORT }}
+        script: |
+          cd ~/git/docker/services
+          docker compose -f website.yml pull
+          docker compose -f website.yml up -d

.gitignore

@@ -49,3 +49,6 @@ nohup.out
 
 # Staticfiles
 staticfiles
+
+# selenium
+geckodriver.log

.python-version

@@ -0,0 +1 @@
+3.9

Dockerfile

@@ -1,29 +1,79 @@
-FROM python:3.7.12
+FROM python:3.9-alpine as builder
 
-COPY . /app
-WORKDIR /app
+# Pre installations
+RUN apk update
+RUN apk add --update --virtual .tmp libffi-dev build-base linux-headers
+RUN apk add curl jpeg-dev zlib-dev npm
+RUN pip install poetry
 
-RUN apt-get update
+# Copy useful files
+WORKDIR /opt/website
+COPY pyproject.toml poetry.lock package.json package-lock.json ./
 
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
-RUN apt-get install -y nodejs
-RUN npm install -g npm@latest
+# Run updates
+# RUN poetry update
+RUN poetry export -f requirements.txt --without-hashes --output requirements.txt
+RUN npm update
 RUN npm install
 
+# Image of production
+FROM python:3.9-alpine
+# FROM alpine
+ENV SECRET_KEY=whatever
+# ARG timestamp
+# ARG commit
+# LABEL build.timestamp=timestamp
+# LABEL build.commit=commit
+
+# Labels
+LABEL maintainer="marc.partensky@gmail.com"
+LABEL image="https://hub.docker.com/r/marcpartensky/website"
+LABEL source="https://github.com/marcpartensky/website"
+LABEL website="https://marcpartensky.com"
+
+# Install curl and stuff for pillow
+RUN apk update
+RUN apk add --update --virtual .tmp libffi-dev build-base linux-headers
+RUN apk add python3 curl jpeg-dev zlib-dev py3-pip nodejs
+RUN apk add shadow
+
+# Setup home user website
+RUN useradd -m website
+USER website
+
+# Copy useful files
+WORKDIR /home/website
+COPY --chown=website website ./website
+COPY --chown=website --from=builder /opt/website/requirements.txt ./
+COPY LICENSE ./
+
 # No .pyo and easier debugging
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-RUN pip install -U pip
+# Install dependencies
+# RUN pip install -U pip
 RUN pip install -r requirements.txt
+RUN ./website/manage.py makemigrations
+RUN ./website/manage.py collectstatic --noinput
 
+USER root
+RUN apk del .tmp
+USER website
+
+# Setup env vars for entrypoint.sh
 ENV PORT 80
+ENV HOST 0.0.0.0
+ENV PATH="${PATH}:/home/website/.local/bin"
 EXPOSE 80
-# EXPOSE 443
 
-HEALTHCHECK --interval=5s \
-            --timeout=5s \
-             CMD curl -sf http://127.0.0.1:$PORT/robots.txt || exit 1
+# Check health
+HEALTHCHECK --interval=30s \
+            --timeout=10s \
+            --start-period=1m \
+            --retries=3 \
+             CMD curl -sSf http://localhost:$PORT/live || exit 1
 
-ENTRYPOINT ["/app/entrypoint.sh"]
+WORKDIR /home/website/website
+ENTRYPOINT ["./entrypoint.sh"]
 # ENTRYPOINT ["daphne", "-e", "ssl:443:privateKey=$KEY:certKey=$CERT", "django_project.asgi:application"]

LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Makefile

@@ -1,24 +1,36 @@
-run: update
-	pipenv run ./manage.py runserver 127.0.0.1:8000
-build: update
-	docker build . -t marcpartensky/website
-	docker push marcpartensky/website
-push: update build
-	git add -A
-	git commit -m "Makefile update"
-	git pushall
-	docker push marcpartensky/website
-update: install
+# HOST=localhost
+# PORT=8000
+PRODUCTION=false
+
+.PHONY: start list build push setup update init test up down migrate brewstart brewstop dev prod clean deploy
+
+start:
+	poetry run ./website/entrypoint.sh --nosetup
+list:
+	@LC_ALL=C $(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
+build:
+	docker-compose -f dev.yml build website
+push: build
+	docker-compose -f dev.yml push website
+setup: init update start
+update:
 	npm update
-	npm audit fix
-	pipenv lock --pre --clear
-	pipenv lock -r > requirements.txt
-	pipenv run ./manage.py collectstatic --noinput
-	pipenv run ./manage.py makemigrations
-install:
-	pip install --user pipenv
-	pipenv install --dev
+	npm audit fix || echo npm audit fix failed
+	poetry export -o requirements.txt
+	SECRET_KEY=secret poetry run ./website/manage.py collectstatic --noinput
+	SECRET_KEY=secret poetry run ./website/manage.py makemigrations
+init: .env
+	pip install --user poetry
+	poetry install --dev
 	npm install --save
+test:
+	pipenv run ./manage.py test
+runtest:
+	make start &
+	make test
+	make kill
+kill:
+	pipenv run ./website/entrypoint.sh kill
 up: init
 	docker-compose up -d
 down:
@@ -34,13 +46,21 @@ brewstop:
 	brew services stop mysql
 	brew services stop redis
 dev:
-	docker-compose -f dev.yml up -d
+	docker-compose -f dev.yml up -d --build --remove-orphans
 	exec docker-compose -f dev.yml logs -f
 prod:
-	docker-compose -f docker.compose.yml up -d
+	docker-compose -f docker-compose.yml up -d --build --remove-orphans
 clean:
 	docker-compose -f docker-compose.yml down
 	docker-compose -f dev.yml down
-deploy:
+testdeploy:
 	DOCKER_HOST=ssh://vps docker-compose -f dev.yml up -d --build --force-recreate --remove-orphans website-test
 	DOCKER_HOST=ssh://vps docker-compose -f docker-compose.dev.ym logs -f website-test
+deploy: push
+	DOCKER_HOST=ssh://vps docker service update vps_website
+.env:
+	echo HOST=localhost > .env
+	echo PORT=8000 >> .env
+	echo PRODUCTION=false >> .env
+	echo NOSETUP=true >> .env
+	echo SECRET=$$(date +%s | sha256sum | base64 | head -c 32 && echo) >> .env

Pipfile

@@ -4,159 +4,82 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-aioredis = "*"
-appdirs = "*"
-appnope = "*"
-arrow = "*"
-asgiref = "*"
-astroid = "*"
-async-timeout = "*"
-attrs = "*"
-autobahn = "*"
-backcall = "*"
-blessed = "*"
-boto3 = "*"
-botocore = "*"
-certifi = "*"
-cffi = "*"
-channels = "*"
-channels-redis = "*"
-chardet = "*"
-click = "*"
-colorama = "*"
-commonmark = "*"
-constantly = "*"
-coverage = "*"
-cryptography = "*"
-daphne = "*"
-decorator = "*"
-defusedxml = "*"
-dj-database-url = "*"
-django-503 = "*"
-django-admin = "*"
-django-allauth = "*"
-django-appconf = "*"
-django-avatar = "*"
-django-compressor = "*"
-django-cors-middleware = "*"
-django-crispy-forms = "*"
-django-excel-base = "*"
-django-excel-response2 = "*"
-django-extensions = "*"
-django-ftpserver = "*"
-django-heroku = "*"
-django-jsonfield-backport = "*"
-django-libsass = "*"
-django-markdown-view = "*"
-django-mdeditor = "*"
-django-picklefield = "*"
-django-q = "*"
-django-rename-app = "*"
-django-shortuuidfield = "*"
-django-six = "*"
-django-sql-explorer = "*"
-django-storages = "*"
-djangorestframework = "*"
-docopt = "*"
-docutils = "*"
-flake8 = "*"
-future = "*"
-graphviz = "*"
-gunicorn = "*"
-h2 = "*"
-hiredis = "*"
-hpack = "*"
-hyperframe = "*"
-hyperlink = "*"
-idna = "*"
-importlib-metadata = "*"
-incremental = "*"
-ipython = "*"
-isort = "*"
-jedi = "*"
-jeepney = "*"
-jmespath = "*"
-keyring = "*"
-"keyrings.alt" = "==3.2.0"
-lazy-object-proxy = "*"
-libsass = "*"
-mccabe = "*"
-mock = "*"
-msgpack = "*"
-msgpack-python = "*"
-mypy-extensions = "*"
-nose = "*"
-oauthlib = "*"
-parso = "*"
-pathspec = "*"
-pexpect = "*"
-pickleshare = "*"
-pip-autoremove = "*"
-pip-conflict-checker = "*"
-pip-review = "*"
-pipdeptree = "*"
-pipupgrade = "*"
-priority = "*"
-prompt-toolkit = "*"
-psycopg2-binary = "*"
-ptyprocess = "*"
-pyasn1 = "*"
-pyasn1-modules = "*"
-pycodestyle = "*"
-pycparser = "*"
-pyflakes = "*"
-pyftpdlib = "*"
-pylint = "*"
-pyparsing = "*"
-python-dateutil = "*"
-python-dotenv = "*"
-python3-openid = "*"
-pytz = "*"
-rcssmin = "*"
-redis = "*"
-regex = "*"
-requests = "*"
-requests-oauthlib = "*"
-rich = "*"
-rjsmin = "*"
-s3transfer = "*"
-screen = "*"
-shortuuid = "*"
-six = "*"
-sqlparse = "*"
-toml = "*"
-traitlets = "*"
-txaio = "*"
-typed-ast = "*"
-typing-extensions = "*"
-tzlocal = "*"
-urllib3 = "*"
-wcwidth = "*"
-whitenoise = "*"
-wrapt = "*"
-xlwt = "*"
-yarg = "*"
-zipp = "*"
-"zope.interface" = "*"
-Automat = "*"
-Django = "*"
-ipython_genutils = "*"
-Markdown = "*"
-Pillow = "*"
-Pygments = "*"
-PyHamcrest = "*"
-PyJWT = "*"
-pyOpenSSL = "*"
-PyYAML = "*"
-SecretStorage = "*"
-service_identity = "*"
-Twisted = "*"
-django-robots = "*"
+ansicon = "==1.89.0"
+arrow = "==1.2.2"
+asgiref = "==3.5.2"
+attrs = "==21.4.0"
+autobahn = "==22.4.2"
+blessed = "==1.19.1"
+certifi = "==2022.5.18.1"
+cffi = "==1.15.0"
+channels = "==3.0.4"
+charset-normalizer = "==2.0.12"
+commonmark = "==0.9.1"
+constantly = "==15.1.0"
+cryptography = "==37.0.2"
+daphne = "==3.0.2"
+defusedxml = "==0.7.1"
+dj-database-url = "==0.5.0"
+django-allauth = "==0.50.0"
+django-appconf = "==1.0.5"
+django-compressor = "==4.0"
+django-crispy-forms = "==1.14.0"
+django-extensions = "==3.1.5"
+django-ftpserver = "==0.8.0"
+django-heroku = "==0.3.1"
+django-jsonfield-backport = "==1.0.5"
+django-markdown-view = "==0.0.5"
+django-mdeditor = "==0.1.20"
+django-picklefield = "==3.0.1"
+django-q = "==1.3.9"
+django-robots = "==5.0"
+django-shortuuidfield = "==0.1.3"
+django-sql-explorer = "==2.4.1"
+django-storages = "==1.12.3"
+djangorestframework = "==3.13.1"
+hyperlink = "==21.0.0"
+idna = "==3.3"
+incremental = "==21.3.0"
+jinxed = "==1.2.0"
+oauthlib = "==3.2.0"
+psycopg2 = "==2.9.3"
+pyasn1-modules = "==0.2.8"
+pyasn1 = "==0.4.8"
+pycparser = "==2.21"
+pyftpdlib = "==1.5.6"
+python-dateutil = "==2.8.2"
+python-dotenv = "==0.20.0"
+python3-openid = "==3.2.0"
+pytz = "==2022.1"
+rcssmin = "==1.1.0"
+redis = "==3.5.3"
+requests-oauthlib = "==1.3.1"
+requests = "==2.27.1"
+rich = "==12.4.4"
+rjsmin = "==1.2.0"
+service-identity = "==21.1.0"
+shortuuid = "==1.0.9"
+six = "==1.16.0"
+sqlparse = "==0.4.2"
+twisted-iocpsupport = "==1.0.2"
+txaio = "==22.2.1"
+typing-extensions = "==4.2.0"
+tzdata = "==2022.1"
+urllib3 = "==1.26.9"
+wcwidth = "==0.2.5"
+whitenoise = "==6.1.0"
+"zope.interface" = "==5.4.0"
+Automat = "==20.2.0"
+Django = "==4.0.4"
+Markdown = "==3.3.7"
+Pillow = "==9.1.1"
+Pygments = "==2.12.0"
+PyJWT = "==2.4.0"
+pyOpenSSL = "==22.0.0"
+PyYAML = "==6.0"
+Twisted = "==22.4.0"
 
 [dev-packages]
-black = "*"
-jedi = "*"
-pylint = "*"
 
 [requires]
-python_version = "3.7.12"
+python_version = "3.10"

README.md

@@ -1,31 +1,32 @@
 [![Docker](https://github.com/MarcPartensky/Website/actions/workflows/docker-push.yml/badge.svg)](https://github.com/MarcPartensky/Website/actions/workflows/docker-push.yml)
 [![CodeQL](https://github.com/MarcPartensky/Website/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/MarcPartensky/Website/actions/workflows/codeql-analysis.yml)
+<img src="https://img.shields.io/liberapay/goal/marcpartensky.svg?logo=liberapay">
 
 # Website
 
 This is the code of my personal website.
 [https://marcpartensky.com/](https://marcpartensky.com/)
 
+[![website](https://cdn.discordapp.com/attachments/507519157387132940/937471879776710676/website.png)](https://marcpartensky.com)
+
+
 ## Light theme
-[![light theme](https://cdn.discordapp.com/attachments/702863598761803806/782335262499930112/light.png)](https://websiteofmarcpartensky.herokuapp.com)
+[![light theme](https://cdn.discordapp.com/attachments/507519157387132940/937472721015668766/website1.png)](https://marcpartensky.com)
 
 ## Dark theme
-[![dark theme](https://cdn.discordapp.com/attachments/702863598761803806/782334455385555014/dark.png)](https://websiteofmarcpartensky.herokuapp.com?theme=dark)
+[![dark theme](https://cdn.discordapp.com/attachments/507519157387132940/937472943422849044/website2.png)](https://marcpartensky.com?theme=dark)
 
 ## Install
 
 ### From [source](https://github.com/MarcPartensky/Website) (requires [git](https://git-scm.com/), [python](https://www.python.org/), [pip](https://pip.pypa.io/en/stable/installing/))
 ```sh
 git clone https://github.com/marcpartensky/website
-```
+cd website
 
-```sh
 pip install -r requirements.txt
 # or with pipenv (recommended, install pipenv with pip install pipenv)
 pipenv install
-```
 
-```sh
 ./manage.py runserver
 ```
 
@@ -37,9 +38,8 @@ pipenv install
 ```sh
 docker run -it \
 	-e SECRET_KEY=$(openssl rand -base64 32) \
-	-p 80:80 \
+	-p 8080:80 \
 	marcpartensky/website
-	./manage.py runserver
 ```
 
 #### or run with ssl certificate
@@ -48,7 +48,7 @@ docker run -it \
 	-env CERT \ # You must export a ssl certificate path
 	-env KEY \ # You must export a pem key path
 	-e SECRET_KEY=$(openssl rand -base64 32) \
-	-p 443:443 \
+	-p 8443:443 \
 	marcpartensky/website
 ```
 
@@ -59,10 +59,6 @@ cd website
 docker-compose up
 ```
 
-> If you’re using Docker natively on Linux, Docker Desktop for Mac, or Docker Desktop for Windows, then the web app should now be listening on port 443 on your Docker daemon host. Point your web browser to http://localhost:443 to find the Hello World message. If this doesn’t resolve, you can also try http://127.0.0.1:443.
-
-From https://docs.docker.com/compose/gettingstarted/
-
 ## Build the docker image from source
 ```sh
 docker build . -t marcpartensky/website
@@ -77,8 +73,7 @@ Build usually last 5 minutes.
 
 ## Notes
 author: Marc Partensky
-name: Website of Marc Partensky
-date: 8/10/2019
+created: 8/10/2019
 
 ## Heroku Buildpacks
 

api/admin.py

@@ -1,5 +0,0 @@
-from django.contrib import admin
-from .models import MarkdownModel
-
-# Register your models here.
-admin.site.register(MarkdownModel)

api/models.py.3840c2506362440667b85b89a668a44e.py

@@ -1,32 +0,0 @@
-from django.db import models
-
-
-class MarkdownModel(models.Model):
-    """A model to store markdown files"""
-
-    title = models.CharField(max_length=80)
-    file = models.FileField(upload_to="markdown/")
-
-    class Meta:
-        ordering = ["title"]
-
-    def __str__(self):
-        return f"{self.title}"
-
-    # def save(self, *args, **kwargs):
-    #     print('saving model somewhere')
-    #     print(args, kwargs)
-    #     return super().save(*args, **kwargs)
-
-
-class NotificationModel(models.Model):
-    """A model that represents a notification."""
-
-    message = models.TextField()
-    source = models.GenericIPAddressField()
-    timestamp = models.DateTimeField(auto_now_add=True)
-    seen = models.BooleanField(default=False)
-
-    def __str__(self):
-        """Return the notification sent."""
-        return f"{self.message}"

dev.yml

@@ -21,17 +21,8 @@ x-common:
     REDIS_URL: redis:6379
 
 services:
-  # nginx:
-  #   image: jwilder/nginx-proxy
-  #   restart: unless-stopped
-  #   networks:
-  #     - web
-  #   ports:
-  #     - "127.0.1.1:80:80"
-  #   volumes:
-  #     - /var/run/docker.sock:/tmp/docker.sock:ro
-
   website:
+    image: marcpartensky/website
     environment:
       <<: *website
       <<: *postgres
@@ -117,29 +108,29 @@ services:
   website-test:
     environment:
       <<: *website
-      <<: *postgres
+      # <<: *postgres
       <<: *redis
       VIRTUAL_HOST: website.dev
     build:
       context: .
       dockerfile: ./Dockerfile
-    working_dir: /app
-    entrypoint: /app/entrypoint.sh
     command: 80 0.0.0.0
-    volumes:
-      - ".:/app"
     networks:
       - web
-      - caddy
+    ports:
+      - "8080:80"
     healthcheck:
       test: ["CMD", "curl", "-fs", "http://website:80/robots.txt"]
       interval: 1m30s
       timeout: 10s
       retries: 3
       start_period: 40s
-    labels:
-      - "caddy=test.marcpartensky.com"
-      - "caddy.reverse_proxy={{upstreams http 80}}"
+
+  test:
+    image: jwilder/dockerize
+    networks:
+      - web
+    command: -wait http://website:8080/healthcheck -timeout 120s -wait-retry-interval 5s
 
 networks:
   web:

docker-compose.yml

@@ -1,34 +1,14 @@
 version: "3.9"
-x-common:
-  website:
-    &website
-    DJANGO_SETTINGS_MODULE: django_project.settings
-    SECRET_KEY: "${openssl rand -base64 64}"
-    FTP_URL: 0.0.0.0:21
-  postgres:
-    &postgres
-    POSTGRES_NAME: website
-    POSTGRESQL_USER: root
-    POSTGRES_PASSWORD: "${openssl rand -base64 64}"
-    POSTGRES_HOST: postgres
-    POSTGRES_PORT: 5432
-  redis:
-    &redis
-    REDIS_URL: redis:6379
-
 services:
   website:
-    environment:
-      <<: *website
-      <<: *postgres
-      <<: *redis
+    image: docker.io/marcpartensky/website:latest
+    env_file:
+      - .env
     build:
       context: .
       dockerfile: Dockerfile
     ports:
       - "8000:80"
-    working_dir: /app
-    entrypoint: /app/entrypoint.sh
     depends_on:
       - redis
       - postgres
@@ -37,17 +17,19 @@ services:
 
   redis:
     image: redis
-    environment:
-      <<: *redis
+    env_file:
+      - .env
     networks:
       - website
 
   postgres:
     image: postgres
-    environment:
-      <<: *postgres
+    env_file:
+      - .env
     networks:
       - website
 
 networks:
   website:
+  postgres:
+    external: true

entrypoint.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-port=${1:-$PORT}
-addr=${2:-$ADDR}
-port=${port:-"80"}
-addr=${addr:-"127.0.0.1"}
-username=${DJANGO_SUPERUSER_USERNAME:-"admin"}
-email=${DJANGO_SUPERUSER_EMAIL:-"admin@admin.com"}
-DJANGO_SUPERUSER_PASSWORD=${PASSWORD:-$(date +%s | sha256sum | base64 | head -c 32)}
-
-echo -e "Running \033[1mentrypoint.sh\033[0m using $ADDR:$PORT"
-./manage.py migrate
-echo -e "Creating \033[1msuper user\033[0m using:\n - username: \033[1m$username\033[0m\n - email: \033[1m$email\033[0m\n"
-./manage.py createsuperuser --user $username --email $email --noinput
-./manage.py collecstatic --noinput --clear
-daphne django_project.asgi:application --port $port --bind $addr -v2

manage.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_project.settings")
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        raise ImportError(
-            "Couldn't import Django. Are you sure it's installed and "
-            "available on your PYTHONPATH environment variable? Did you "
-            "forget to activate a virtual environment?"
-        ) from exc
-    execute_from_command_line(sys.argv)

package-lock.json

@@ -66,7 +66,7 @@
     "node_modules/clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "engines": {
         "node": ">=0.8"
       }
@@ -90,7 +90,7 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/core-util-is": {
       "version": "1.0.3",
@@ -126,7 +126,7 @@
     "node_modules/glob-parse": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/glob-parse/-/glob-parse-0.0.1.tgz",
-      "integrity": "sha1-N9Ml6xVTvpwfQnJzinVWZEWGbdY="
+      "integrity": "sha512-Um/XtCfPYhDdrlbsNAiakk6AxCpJSLwvF+a95Cmq0Nn/xF/AihHlsBo0EfoUqnKUqyrgoXzX+q5QsSKzH+/gvw=="
     },
     "node_modules/handlebars": {
       "version": "4.7.7",
@@ -173,9 +173,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -194,7 +194,7 @@
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -261,9 +261,9 @@
       "integrity": "sha1-oSvbAQNoHosSapsHHrpMRnx4//4="
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -272,9 +272,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/miniq": {
       "version": "1.0.1",
@@ -386,12 +386,16 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -453,6 +457,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/through2": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
@@ -483,9 +498,9 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.14.5",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz",
-      "integrity": "sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==",
+      "version": "3.15.5",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz",
+      "integrity": "sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -515,7 +530,7 @@
     "node_modules/wildglob/node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
     },
     "node_modules/wildglob/node_modules/readable-stream": {
       "version": "1.0.34",
@@ -646,7 +661,7 @@
     "clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="
     },
     "color-convert": {
       "version": "2.0.1",
@@ -664,7 +679,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "core-util-is": {
       "version": "1.0.3",
@@ -694,7 +709,7 @@
     "glob-parse": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/glob-parse/-/glob-parse-0.0.1.tgz",
-      "integrity": "sha1-N9Ml6xVTvpwfQnJzinVWZEWGbdY="
+      "integrity": "sha512-Um/XtCfPYhDdrlbsNAiakk6AxCpJSLwvF+a95Cmq0Nn/xF/AihHlsBo0EfoUqnKUqyrgoXzX+q5QsSKzH+/gvw=="
     },
     "handlebars": {
       "version": "4.7.7",
@@ -727,9 +742,9 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -742,7 +757,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
     "js-yaml": {
       "version": "4.1.0",
@@ -797,17 +812,17 @@
       "integrity": "sha1-oSvbAQNoHosSapsHHrpMRnx4//4="
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+      "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "miniq": {
       "version": "1.0.1",
@@ -920,12 +935,13 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "safe-buffer": {
@@ -961,6 +977,11 @@
         "ansi-regex": "^5.0.1"
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
     "through2": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
@@ -990,9 +1011,9 @@
       }
     },
     "uglify-js": {
-      "version": "3.14.5",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz",
-      "integrity": "sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==",
+      "version": "3.15.5",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz",
+      "integrity": "sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==",
       "optional": true
     },
     "util-deprecate": {
@@ -1016,7 +1037,7 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
         },
         "readable-stream": {
           "version": "1.0.34",

pyproject.toml

@@ -0,0 +1,44 @@
+[tool.poetry]
+name = "website"
+version = "0.1.0"
+description = ""
+authors = ["Marc Partensky <marc.partensky@gmail.com>"]
+
+[tool.poetry.dependencies]
+python = "^3.9"
+Django = "*"
+python-dotenv = "*"
+channels = "*"
+daphne = "*"
+django-storages = "*"
+django-crispy-forms = "*"
+django-extensions = "*"
+django-allauth = "*"
+django-compressor = "*"
+django-markdown-view = "*"
+django-mdeditor = "*"
+django-ftpserver = "*"
+django-sql-explorer = "*"
+django-q = "*"
+django-robots = "*"
+shortuuid = "*"
+django-shortuuidfield = "*"
+django-jsonfield-backport = "*"
+rich = "*"
+djangorestframework = "*"
+PyYAML = "*"
+django-cors-headers = "*"
+Pillow = "*"
+psycopg2-binary = "*"
+whitenoise = "*"
+crispy-bootstrap4 = "^2023.1"
+
+[tool.poetry.dev-dependencies]
+pytest = "*"
+pylint = "*"
+neovim = "*"
+black = "*"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

requirements.txt

@@ -1,165 +1,76 @@
-#
-# These requirements were autogenerated by pipenv
-# To regenerate from the project's Pipfile, run:
-#
-#    pipenv lock --requirements
-#
-
--i https://pypi.org/simple
-aioredis==1.3.1
-appdirs==1.4.4
-appnope==0.1.2
-arrow==1.2.1
-asgiref==3.4.1
-astroid==2.6.6
-async-timeout==4.0.1
-attrs==21.2.0
-autobahn==21.11.1
-automat==20.2.0
-backcall==0.2.0
-backports.zoneinfo==0.2.1; python_version < '3.9'
-blessed==1.19.0
-boto3==1.20.23
-botocore==1.23.23
-certifi==2021.10.8
-cffi==1.15.0
-channels-redis==3.3.1
-channels==3.0.4
-chardet==4.0.0
-charset-normalizer==2.0.9; python_version >= '3'
-click==8.0.3
-colorama==0.4.4
-commonmark==0.9.1
-constantly==15.1.0
-coverage==6.2
-cryptography==36.0.0
-daphne==3.0.2
-decorator==5.1.0
-defusedxml==0.7.1
-dj-database-url==0.5.0
-django-503==0.1
-django-admin==2.0.1
-django-allauth==0.47.0
-django-appconf==1.0.5
-django-avatar==5.0.0
-django-compressor==3.0
-django-cors-middleware==1.5.0
-django-crispy-forms==1.13.0
-django-excel-base==1.0.4
-django-excel-response2==3.0.2
-django-extensions==3.1.5
-django-ftpserver==0.7.0
+ansicon==1.89.0; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "2.7" and platform_system == "Windows"
+arrow==1.2.2; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "3.6"
+asgiref==3.5.2; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "3.7"
+attrs==22.1.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+autobahn==22.7.1; python_version >= "3.7"
+automat==20.2.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+blessed==1.19.1; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "2.7"
+certifi==2022.6.15; python_version >= "3.7" and python_version < "4"
+cffi==1.15.1; python_version >= "3.7"
+channels==3.0.5; python_version >= "3.7"
+charset-normalizer==2.1.1; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0"
+commonmark==0.9.1; python_full_version >= "3.6.3" and python_full_version < "4.0.0"
+constantly==15.1.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+cryptography==37.0.4
+daphne==3.0.2; python_version >= "3.7"
+defusedxml==0.7.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+dj-database-url==1.0.0
+django-allauth==0.51.0
+django-appconf==1.0.5; python_version >= "3.6"
+django-compressor==4.1
+django-cors-headers==3.13.0; python_version >= "3.7"
+django-crispy-forms==1.14.0; python_version >= "3.7"
+django-extensions==3.2.0; python_version >= "3.6"
+django-ftpserver==0.8.0
 django-heroku==0.3.1
-django-jsonfield-backport==1.0.4
-django-libsass==0.9
-django-markdown-view==0.0.4
-django-mdeditor==0.1.18
-django-picklefield==3.0.1
-django-q==1.3.9
-django-rename-app==0.1.3
-django-robots==4.0
+django-jsonfield-backport==1.0.5; python_version >= "3.5"
+django-markdown-view==0.0.5
+django-mdeditor==0.1.20
+django-picklefield==3.1; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "3"
+django-q==1.3.9; python_full_version >= "3.6.2" and python_version < "4"
+django-robots==5.0; python_version >= "3.7"
 django-shortuuidfield==0.1.3
-django-six==1.0.4
-django-sql-explorer==2.3
-django-storages==1.12.3
-django==3.2.10
-djangorestframework==3.13.0
-docopt==0.6.2
-docutils==0.18.1
-flake8==3.9.2
-future==0.18.2
-graphviz==0.19.1
-gunicorn==20.1.0
-h2==4.1.0
-hiredis==2.0.0
-hpack==4.0.0
-hyperframe==6.0.1
-hyperlink==21.0.0
-idna==3.3
-importlib-metadata==4.8.2
-incremental==21.3.0
-ipython-genutils==0.2.0
-ipython==7.30.1
-isort==5.10.1
-jedi==0.18.1
-jeepney==0.7.1
-jmespath==0.10.0
-keyring==23.4.0
-keyrings.alt==3.2.0
-lazy-object-proxy==1.6.0
-libsass==0.21.0
-markdown==3.2.2
-matplotlib-inline==0.1.3; python_version >= '3.5'
-mccabe==0.6.1
-mock==4.0.3
-msgpack-python==0.5.6
-msgpack==1.0.3
-mypy-extensions==0.4.3
-nose==1.3.7
-oauthlib==3.1.1
-packaging==21.3; python_version >= '3.6'
-parso==0.8.3
-pathspec==0.9.0
-pexpect==4.8.0
-pickleshare==0.7.5
-pillow==8.4.0
-pip-autoremove==0.10.0
-pip-conflict-checker==0.6.0
-pip-review==1.1.0
-pip==21.3.1; python_version >= '3.6'
-pipdeptree==2.2.0
-pipupgrade==1.11.0
-priority==2.0.0
-prompt-toolkit==3.0.24
-psycopg2-binary==2.9.2
-psycopg2==2.9.2; python_version >= '3.6'
-ptyprocess==0.7.0
-pyasn1-modules==0.2.8
-pyasn1==0.4.8
-pycodestyle==2.7.0
-pycparser==2.21
-pyflakes==2.3.1
+django-sql-explorer==2.4.1; python_version >= "3.6"
+django-storages==1.13.1; python_version >= "3.7"
+django==3.2.15; python_version >= "3.6"
+djangorestframework==3.13.1; python_version >= "3.6"
+hyperlink==21.0.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+idna==3.3; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.7"
+importlib-metadata==4.12.0; python_version < "3.10" and python_version >= "3.7"
+incremental==21.3.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+jinxed==1.2.0; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "2.7" and platform_system == "Windows"
+markdown==3.4.1; python_version >= "3.7"
+oauthlib==3.2.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6"
+pillow==9.2.0; python_version >= "3.7"
+psycopg2-binary==2.9.3; python_version >= "3.6"
+pyasn1-modules==0.2.8; python_full_version >= "3.6.7" and python_version >= "3.7"
+pyasn1==0.4.8; python_full_version >= "3.6.7" and python_version >= "3.7"
+pycparser==2.21; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version >= "3.4.0"
 pyftpdlib==1.5.6
-pygments==2.10.0
-pyhamcrest==2.0.3
-pyjwt==2.3.0
-pylint==3.0.0a4
-pyopenssl==21.0.0
-pyparsing==3.0.6
-python-dateutil==2.8.2
-python-dotenv==0.19.2
+pygments==2.13.0; python_full_version >= "3.6.3" and python_full_version < "4.0.0" and python_version >= "3.6"
+pyjwt==2.4.0; python_version >= "3.6"
+pyopenssl==22.0.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+python-dateutil==2.8.2; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "3.6"
+python-dotenv==0.20.0; python_version >= "3.5"
 python3-openid==3.2.0
-pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-pytz==2021.3
-pyyaml==6.0
+pytz==2022.2.1; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "3.7"
+pyyaml==6.0; python_version >= "3.6"
 rcssmin==1.1.0
-redis==3.5.3
-regex==2021.11.10
-requests-oauthlib==1.3.0
-requests==2.26.0
-rich==10.16.0
+redis==3.5.3; python_full_version >= "3.6.2" and python_version < "4"
+requests-oauthlib==1.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
+requests==2.28.1; python_version >= "3.7" and python_version < "4" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0")
+rich==12.5.1; python_full_version >= "3.6.3" and python_full_version < "4.0.0"
 rjsmin==1.2.0
-s3transfer==0.5.0
-screen==1.0.1
-secretstorage==3.3.1
-service-identity==21.1.0
-setuptools==59.6.0; python_version >= '3.6'
-shortuuid==1.0.8
-six==1.16.0
-sqlparse==0.4.2
-toml==0.10.2
-traitlets==5.1.1
-twisted==21.7.0
-txaio==21.2.1
-typed-ast==1.4.3
-typing-extensions==4.0.1
-tzdata==2021.5; python_version >= '3.6'
-tzlocal==4.1
-urllib3==1.26.7
-wcwidth==0.2.5
-whitenoise==5.3.0
-wrapt==1.12.1
-xlwt==1.3.0
-yarg==0.1.9
-zipp==3.6.0
-zope.interface==5.4.0
+service-identity==21.1.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+shortuuid==1.0.9; python_version >= "3.5"
+six==1.16.0; python_full_version >= "3.6.7" and python_version < "4" and python_version >= "3.7"
+sqlparse==0.4.2; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "3.7"
+twisted-iocpsupport==1.0.2; python_full_version >= "3.6.7" and python_version >= "3.7" and platform_system == "Windows"
+twisted==22.4.0; python_full_version >= "3.6.7" and python_version >= "3.7"
+txaio==22.2.1; python_version >= "3.7"
+typing-extensions==4.3.0; python_full_version >= "3.6.7" and python_full_version < "4.0.0" and python_version < "3.8" and python_version >= "3.7"
+urllib3==1.26.11; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7"
+wcwidth==0.2.5; python_full_version >= "3.6.2" and python_version < "4" and python_version >= "2.7"
+whitenoise==6.2.0; python_version >= "3.7"
+zipp==3.8.1; python_version < "3.10" and python_version >= "3.7"
+zope.interface==5.4.0; python_full_version >= "3.6.7" and python_version >= "3.7"

run.sh

@@ -27,21 +27,6 @@ django() {
 	pipenv run daphne -e "ssl:${PORT}:privateKey=${KEY}:certKey=${CERT}" django_project.asgi:application
 }
 
-alias run=django
-
-up() {
-	postgres
-	redis
-	django
-}
-
-down() {
-	docker-compose down
-	echo -e "Ended \e[31mRedis\e[0m"
-	echo -e "Ended \e[31mPostgreSQL\e[0m"
-	kill % && echo -e "Ended \e[31mDjango\e[0m"	&& echo -e "Ended \e[31mFTP\e[0m"
-}
-
 ftp() {
 	echo -e "Starting \e[92mFTP Server\e[0m"
 	pipenv run ./manage.py ftpserver $FTP_URL
@@ -53,23 +38,6 @@ all() {
 	down
 }
 
-
-# build the project for docker
-build() {
-	pipenv run ./manage.py collectstatic --noinput
-	docker build . -t marcpartensky/website
-	docker push marcpartensky/website
-	git pull --all
-	git push -ll
-}
-
-deploy() {
-	pipenv run ./manage.py collectstatic --noinput
-	pipenv run ./manage.py makemigrations
-	pipenv run ./manage.py migrate
-	run
-}
-
 updatepip() {
 	git pull
 	pipenv run pip install -U pip

templates/include/header.html

@@ -1,80 +0,0 @@
-{% include 'include/modal.html' %}
-{% load static %}
-  <header id="header" class="d-flex align-items-center">
-    <div class="container">
-
-      <!-- The main logo is shown in mobile version only. The centered nav-logo in nav menu is displayed in desktop view  -->
-      <div class="logo d-block d-lg-none">
-          <a data-aos="fade-down" class="icon-back-to-top" onclick="toggleTheme()"><img src="{% static 'home/assets/img/black-orchid.svg' %}" alt="" class="img-fluid"></a>
-      </div>
-
-      <nav class="nav-menu d-none d-lg-block">
-        <ul class="nav-inner">
-
-          <li class="drop-down"><a href="/">Explore</a>
-            <ul>
-							{% if not user.is_authenticated %}
-								<li><a href="{% url 'login' %}">Login</a></li>
-								<li><a href="{% url 'register' %}">Register</a></li>
-							{% else %}
-								<li><a href="{% url 'logout' %}">Logout</a></li>
-							{% endif %}
-              <li class="drop-down"><a href="{% url 'demo' %}">Demos</a>
-                <ul>
-									{% for demo in demos %}
-									<li><a href="/demo/{{ demo }}">{{ demo }}</a></li>
-									{% empty %}
-									<li>No demo loaded.</li>
-									{% endfor %}
-                </ul>
-							</li>
-              <li class="drop-down"><a href="{% url 'article' %}">Articles</a>
-                <ul>
-									{% for article in articles %}
-									<li><a href="/article/{{ article }}">{{ article }}</a></li>
-									{% empty %}
-									<li>No article loaded.</li>
-									{% endfor %}
-                </ul>
-							</li>
-              <li><a href="{% url 'touch-typing' %}">Touch typing</a></li>
-              <!-- <li><a href="% url 'planning' %">Planning</a></li> -->
-              <li><a href="{% url 'first-site' %}">First site</a></li>
-              <li class="drop-down"><a href="{% url 'game' %}">Games</a>
-								<ul>
-									{% for game in games %}
-									<li><a href="/game/{{ game }}">{{ game }}</a></li>
-									{% empty %}
-									<li>No game loaded.</li>
-									{% endfor %}
-								</ul>
-							</li>
-              <li><a href="{% url 'blog-home' %}">Blog</a></li>
-              <li class="drop-down"><a href="{% url 'cv' %}">Curriculum Vitae</a>
-                <ul>
-									<li><a href="/cv/1p">1 page version</a></li>
-									<li><a href="/cv/2p">2 pages version</a></li>
-                </ul>
-							</li>
-              <!-- <li class="drop-down"><a href="#">Projects</a> -->
-              <!--   <ul> -->
-              <!--     <li><a href="#">Not</a></li> -->
-              <!--     <li><a href="#">Available</a></li> -->
-              <!--   </ul> -->
-              </li>
-            </ul>
-          </li>
-          <li class="active"><a href="/#about">About me</a></li>
-          <li><a href="/#skills">Skills</a></li>
-
-					<li class="nav-logo" style="width: 15%; height: 15%"><a onclick="toggleTheme()"><img id="theme-img" src="{% static 'home/assets/img/black-orchid.svg' %}" alt="" class="img-fluid"></a></li>
-
-          <li><a href="/#portfolio">Portfolio</a></li>
-          <li><a href="/#certificates">Certificates</a></li>
-          <li><a href="/#contact">Contact</a></li>
-
-        </ul>
-      </nav><!-- .nav-menu -->
-
-    </div>
-  </header>

users/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

website/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.1.0'

website/api/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+from .models import MarkdownModel, NotificationModel, DataModel
+
+admin.site.register(MarkdownModel)
+admin.site.register(NotificationModel)
+admin.site.register(DataModel)

website/api/migrations/0003_datamodel.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.11 on 2022-01-30 15:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0002_notificationmodel'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DataModel',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.JSONField()),
+                ('source', models.GenericIPAddressField()),
+                ('view_count', models.PositiveIntegerField(default=0)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+    ]

website/api/models.py

@@ -30,3 +30,12 @@ class NotificationModel(models.Model):
     def __str__(self):
         """Return the notification sent."""
         return f"{self.message}"
+
+
+class DataModel(models.Model):
+    """A model that represents data sent by either POST or GET requests."""
+
+    content = models.JSONField()
+    source = models.GenericIPAddressField()
+    view_count = models.PositiveIntegerField(default=0)
+    created = models.DateTimeField(auto_now_add=True)

website/api/urls.py

@@ -19,4 +19,6 @@ urlpatterns = [
     path("todo/<str:id>", views.todo, name="api-todo"),
     path("port/<int:n>", views.port, name="port"),
     path("port", views.port, name="port"),
+    path("store", views.store, name="store"),
+    path("store/<int:id>", views.read_store, name="read-store"),
 ]

website/api/views.py

@@ -10,8 +10,16 @@ import subprocess
 
 from io import StringIO
 from django.shortcuts import render
-from django.http import HttpResponse, HttpRequest
+from django.http import (
+    HttpResponse,
+    HttpRequest,
+    HttpResponseBadRequest,
+    JsonResponse,
+    HttpResponseRedirect,
+)
 from django.core.exceptions import PermissionDenied
+from django.forms.models import model_to_dict
+from django.views.decorators.csrf import csrf_exempt
 
 from rest_framework.parsers import JSONParser, FileUploadParser
 from rest_framework.renderers import JSONRenderer
@@ -19,8 +27,7 @@ from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from .forms import UploadFileForm, UploadMarkdownForm, TodoForm
-from django.views.decorators.csrf import csrf_exempt
-from .models import MarkdownModel, NotificationModel
+from .models import MarkdownModel, NotificationModel, DataModel
 
 from todo.models import Todo
 
@@ -244,6 +251,7 @@ def port(request: HttpRequest, n: int = 1):
     print(result)
     return HttpResponse(result)
 
+
 @csrf_exempt
 def notify(request: HttpRequest):
     """Notify me with a get request container
@@ -251,6 +259,7 @@ def notify(request: HttpRequest):
     message = request.GET.get("message")
     return HttpResponse("")
 
+
 @csrf_exempt
 def notifications(request: HttpRequest):
     """Return the list of notifications."""
@@ -259,3 +268,39 @@ def notifications(request: HttpRequest):
         notification.seen = True
         notification.save()
     return JsonResponse(notifications)
+
+
+def get_client_ip(request: HttpRequest):
+    """Get the ip addresse of a client."""
+    x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
+    if x_forwarded_for:
+        return x_forwarded_for.split(",")[-1].strip()
+    else:
+        return request.META.get("REMOTE_ADDR")
+
+
+@csrf_exempt
+def store(request: HttpRequest):
+    """Store data sent."""
+    request_data: dict
+    if request.method == "POST":
+        request_data = request.POST
+    elif request.method == "GET":
+        request_data = {key: value[0] for key, value in request.GET.items()}
+    else:
+        return HttpResponseBadRequest("Only accept POST or GET requests.")
+    print(request_data)
+    data = DataModel(content=json.dumps(request_data), source=get_client_ip(request))
+    data.save()
+    print(data)
+    return JsonResponse(model_to_dict(data))
+
+
+@csrf_exempt
+def read_store(_: HttpRequest, id: int):
+    """Read data in the store."""
+    data = DataModel.objects.get(pk=id)
+    data.view_count += 1
+    data.save()
+    print(data)
+    return HttpResponse(data.content, content_type="application/json")