Compare commits

...

53 Commits
0.0.7 ... 1.0.6

Author SHA1 Message Date
ducoterra
f9017ad302 sleep for pod to spin up 2020-10-12 16:55:24 -04:00
ducoterra
7bd7bde188 add secret true to values 2020-10-12 16:46:51 -04:00
ducoterra
5f9f4762a9 fix kubectl command 2020-10-12 16:37:17 -04:00
ducoterra
cead9d5aea fix helm upgrade command 2020-10-12 16:29:57 -04:00
ducoterra
03de5aacfb fix GET issue breaking test 2020-10-12 16:24:31 -04:00
ducoterra
5b9e568d54 fix postgres password 2020-06-08 21:02:25 -04:00
ducoterra
eafbffce25 add postgres password to env 2020-06-08 20:59:48 -04:00
ducoterra
06c49d551d add postgres service to test 2020-06-08 15:18:29 -04:00
ducoterra
8c9389ba1f just go for it 2020-06-08 08:42:42 -04:00
ducoterra
b9b948a8b5 fix ingress 2020-05-07 15:36:19 -04:00
ducoterra
a0e0afff1f switch to new ingress 2020-05-07 12:39:27 -04:00
ducoterra
8db4d5afed make the button red 2020-05-02 18:08:30 -04:00
ducoterra
f45e289ed8 proper mobile centering 2020-04-26 21:11:18 -04:00
ducoterra
43c48d5216 achievements tracking 2020-04-26 20:51:56 -04:00
ducoterra
0cb3896e4b nice 2020-04-26 14:49:03 -04:00
ducoterra
e102db9f38 achievements! 2020-04-26 14:27:33 -04:00
ducoterra
15c5f5293a position fixed, overflow auto 2020-04-25 19:41:55 -04:00
ducoterra
f11f9a0d97 attempt fix with overflow 2020-04-25 19:35:09 -04:00
ducoterra
c80ef7441d change user-scalable 2020-04-25 19:28:56 -04:00
ducoterra
a2e7a92280 prod deploy 2020-04-25 19:17:52 -04:00
ducoterra
b4ef050e1f test vars 2020-04-25 19:11:27 -04:00
ducoterra
c09558c0ff manual approval to prod 2020-04-25 19:04:21 -04:00
ducoterra
c3666783e4 disable zooming 2020-04-25 18:25:26 -04:00
ducoterra
54c6336e22 proper slash handling in button.js 2020-04-25 17:07:45 -04:00
ducoterra
7da888aa09 proper / on button 2020-04-25 16:37:53 -04:00
ducoterra
07d98bf11d remove admin panel 2020-04-25 15:54:10 -04:00
ducoterra
4584ba0143 split out helper functions from button.js 2020-04-25 15:23:12 -04:00
ducoterra
6feac7ef2e apply to html and body, not button 2020-04-25 15:14:01 -04:00
ducoterra
5efb93ea68 don't zoom on double tap 2020-04-25 15:03:03 -04:00
ducoterra
1ee6b890ef remove snippets urls for now 2020-04-25 12:58:31 -04:00
ducoterra
18aab648c6 you have got to be kidding me 2020-04-25 12:34:03 -04:00
ducoterra
57328a7fc8 need secret mounts 2020-04-25 12:30:04 -04:00
ducoterra
948569a659 spacing... spacing 2020-04-25 12:21:31 -04:00
ducoterra
50cdfd8180 wrong configmap 2020-04-25 12:14:42 -04:00
ducoterra
8393efa3a6 fix yaml find and replace 2020-04-25 12:08:03 -04:00
ducoterra
b3db1816bb list dir 2020-04-25 12:01:07 -04:00
ducoterra
7123f4c389 rogue ' 2020-04-25 11:57:16 -04:00
ducoterra
477ddfe165 forgot quote 2020-04-25 11:52:15 -04:00
ducoterra
6bc472f7fe fix default environment vars 2020-04-25 11:20:15 -04:00
ducoterra
41f4549ffd Merge branch 'master' of gitlab.ducoterra.net:ducoterra/ci_builder 2020-04-25 11:15:57 -04:00
ducoterra
7dd45cc2e8 explain how to use environment variables 2020-04-25 11:15:42 -04:00
ducoterra
8ec174b2c3 default secret in manage.py 2020-04-25 11:15:31 -04:00
ducoterra
7868867908 new standard deploy templates 2020-04-25 11:15:23 -04:00
Reese
d2bf889e1f Update .gitlab-ci.yml 2020-04-25 02:32:29 +00:00
Reese
a70aa8840f Update Dockerfile 2020-04-25 02:32:06 +00:00
ducoterra
8404d43222 use venv for tests 2020-04-24 22:10:36 -04:00
ducoterra
f31106dd29 add venv 2020-04-24 22:06:56 -04:00
ducoterra
fbd8b0e2a7 python -m 2020-04-24 21:59:30 -04:00
Reese
b04ef5a579 Security fix: don’t run as root 2020-04-25 01:43:46 +00:00
ducoterra
e01bf28646 collectstatic 2020-04-24 21:26:21 -04:00
ducoterra
f362194c5e add README 2020-04-24 21:20:12 -04:00
ducoterra
bdc4c90705 wrong port for the service 2020-04-24 21:18:28 -04:00
ducoterra
b309e5fa4a fail safe 2020-04-24 21:14:32 -04:00
36 changed files with 755 additions and 143 deletions

4
.gitignore vendored
View File

@@ -1,3 +1,5 @@
venv/
__pycache__/
db/
db/
staticfiles/
.vscode/settings.json

View File

@@ -1,7 +1,7 @@
variables:
CI_PROJECT_DIR: "."
CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/mysite
DEPLOY: test
CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/button
DEPLOY: button
stages:
- build
@@ -20,10 +20,15 @@ build:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
test:
stage: test
variables:
POSTGRES_PASSWORD: postgres
only:
variables:
- $CI_COMMIT_TAG
stage: test
services:
- name: postgres:12
alias: postgres
image:
name: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
entrypoint: [""]
@@ -31,20 +36,21 @@ test:
- python manage.py test
deploy:
variables:
DEPLOY: test
stage: deploy
only:
variables:
- $CI_COMMIT_TAG
stage: deploy
image:
name: debian:latest
name: debian:10
entrypoint: [""]
script:
- echo $CI_REGISTRY_IMAGE
- apt -qq update >> /dev/null && apt -qq install -y curl gettext >> /dev/null
- curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
- chmod +x ./kubectl
- envsubst < k8s/deploy.yaml > out.yaml
- mv out.yaml k8s/deploy.yaml
- ./kubectl apply -f k8s
- ./kubectl rollout status deploy $DEPLOY
- ./kubectl exec $(./kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}') -- python manage.py migrate
- curl -o /usr/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
- chmod +x /usr/bin/kubectl
- curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
- helm upgrade --install $DEPLOY ./helm --set image=$CI_REGISTRY_IMAGE --set tag=$CI_COMMIT_TAG
- sleep 10
- POD=$(kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}')
- kubectl exec $POD -- python manage.py migrate

22
.vscode/launch.json vendored
View File

@@ -5,14 +5,32 @@
"version": "0.2.0",
"configurations": [
{
"name": "Python: Django",
"name": "Test",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/manage.py",
"args": [
"test",
],
"django": true
"env": {
"DB_HOST": "localhost"
},
"django": true,
"preLaunchTask": "docker-compose up"
},
{
"name": "Run Server",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/manage.py",
"args": [
"runserver",
],
"env": {
"DB_HOST": "localhost"
},
"django": true,
"preLaunchTask": "docker-compose up"
}
]
}

10
.vscode/tasks.json vendored Normal file
View File

@@ -0,0 +1,10 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "docker-compose up",
"command": "docker-compose up -d",
"type": "shell"
}
]
}

View File

@@ -8,4 +8,10 @@ COPY manage.py manage.py
COPY requirements.txt requirements.txt
RUN pip install -r requirements.txt
RUN useradd -ms /bin/bash django
RUN chown -R django .
USER django
RUN python manage.py collectstatic
CMD ["gunicorn","-b",":8000", "-w", "4", "config.wsgi"]

5
README.md Normal file
View File

@@ -0,0 +1,5 @@
# CI Builder
My CI testing pipeline for a django project.
[![pipeline status](http://gitlab.ducoterra.net/ducoterra/ci_builder/badges/master/pipeline.svg)](http://gitlab.ducoterra.net/ducoterra/ci_builder/-/commits/master)

View File

@@ -20,13 +20,13 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'b8fi9=f-qj=@-#1iru34-f@a6pzfysgrf(1n_&d=ur%!1w$q*w'
SECRET_KEY = os.getenv("SECRET_KEY")
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = ["localhost", "test.ducoterra.net"]
DEBUG = True if os.getenv("DEBUG") == "True" else False
LOGGING_CONFIG = None
ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", "localhost").split(",")
# Application definition
@@ -79,8 +79,12 @@ WSGI_APPLICATION = 'config.wsgi.application'
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db/db.sqlite3'),
'ENGINE': 'django.db.backends.postgresql',
'NAME': os.getenv('DB_NAME', 'postgres'),
'USER': os.getenv('POSTGRES_USER', 'postgres'),
'PASSWORD': os.getenv('POSTGRES_PASSWORD', 'postgres'),
'HOST': os.getenv('DB_HOST', 'postgres'),
'PORT': os.getenv('DB_PORT', '5432'),
}
}
@@ -122,3 +126,4 @@ USE_TZ = True
# https://docs.djangoproject.com/en/3.0/howto/static-files/
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')

View File

@@ -18,7 +18,7 @@ from django.urls import path, include
from django.http import JsonResponse
urlpatterns = [
path('', include('api.urls')),
# path('api/', include('api.urls')),
path('', include('ui.urls')),
path('admin/', admin.site.urls),
# path('admin/', admin.site.urls),
]

56
docker-compose.yml Executable file
View File

@@ -0,0 +1,56 @@
version: '3.5'
services:
button:
build: .
labels:
- "traefik.http.routers.button.rule=Host(`button.localhost`)"
- "traefik.http.services.button-service.loadbalancer.server.port=8000"
- "traefik.http.middlewares.btn-ratelimit.ratelimit.average=50"
- "traefik.http.middlewares.btn-ratelimit.ratelimit.burst=10"
- "traefik.http.routers.button.middlewares=btn-ratelimit@docker"
volumes:
- ./manage.py:/app/manage.py
- ./config:/app/config
- ./api:/app/api
environment:
- DEBUG=True
- SECRET_KEY=secret
- ALLOWED_HOSTS=button.localhost
- DJANGO_SUPERUSER_PASSWORD=django
postgres:
image: postgres:12
volumes:
- data:/var/lib/postgresql/data
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
ports:
- 5432:5432
pgadmin:
image: dpage/pgadmin4:4
labels:
- "traefik.http.routers.pgadmin.rule=Host(`pgadmin.localhost`)"
- "traefik.http.services.pgadmin-service.loadbalancer.server.port=80"
volumes:
- pgadmin:/var/lib/pgadmin
environment:
PGADMIN_DEFAULT_EMAIL: postgres
PGADMIN_DEFAULT_PASSWORD: postgres
traefik:
image: traefik:v2.2
labels:
- "traefik.http.routers.traefik.rule=Host(`traefik.localhost`)"
- "traefik.http.services.traefik-service.loadbalancer.server.port=8080"
command: --api.insecure=true --providers.docker --log.level=ERROR --accesslog=true
ports:
- 80:80
volumes:
- /var/run/docker.sock:/var/run/docker.sock
volumes:
data:
pgadmin:

38
heavy_load.py Normal file
View File

@@ -0,0 +1,38 @@
import getpass
import threading
import requests
import time
import sys
from requests.auth import HTTPBasicAuth
rate = int(sys.argv[1]) # /second
if rate == 0:
burst = True
print("Burst mode activated")
else:
burst = False
sleep = 1 / rate
print(f"Beginning load test at {rate} calls/second")
url = 'https://button.ducoterra.net/'
# url = 'http://button.localhost/'
def timer(func, *args, **kwargs):
then = time.time()
func(*args, **kwargs)
print(time.time() - then)
# init = requests.get('https://button.ducoterra.net/button/')
init = requests.get(url)
csrf = init.cookies.get('csrftoken')
session = init.cookies.get('sessionid')
me = lambda num: print(num) or print(requests.post(url, headers = {'Content-Type': 'application/json', 'X-CSRFToken': csrf, 'Cookie': f'csrftoken={csrf}; sessionid={session}'}).text)
threadme = lambda num: threading.Thread(target=timer, args=(me, num)).start()
if burst:
[threadme(num) for num in range(0,100)]
else:
num = 1
while True:
threadme(num)
num += 1
time.sleep(sleep)

23
helm/.helmignore Normal file
View File

@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/

23
helm/Chart.yaml Normal file
View File

@@ -0,0 +1,23 @@
apiVersion: v2
name: helm
description: A Helm chart for Kubernetes
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 1.16.0

View File

@@ -0,0 +1,8 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}
labels:
app: {{ .Release.Name }}
data:
ALLOWED_HOSTS: {{ .Release.Name }}.ducoterra.net

View File

@@ -0,0 +1,33 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}
spec:
replicas: 1
selector:
matchLabels:
app: {{ .Release.Name }}
template:
metadata:
labels:
app: {{ .Release.Name }}
spec:
containers:
- image: {{ required "A valid .Values.image entry required!" .Values.image }}:{{ required "A valid .Values.tag entry required!" .Values.tag }}
name: {{ .Release.Name }}
ports:
- containerPort: 8080
envFrom:
- configMapRef:
name: {{ .Release.Name }}
- secretRef:
name: {{ .Release.Name }}
- secretRef:
name: postgres
resources:
limits:
memory: "500Mi"
cpu: "250m"
requests:
memory: "1Mi"
cpu: "100m"

18
helm/templates/hpa.yaml Normal file
View File

@@ -0,0 +1,18 @@
apiVersion: autoscaling/v2beta2
kind: HorizontalPodAutoscaler
metadata:
name: {{ .Release.Name }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ .Release.Name }}
minReplicas: 1
maxReplicas: 4
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 50

78
helm/templates/ingress.yaml Executable file
View File

@@ -0,0 +1,78 @@
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: {{ .Release.Name }}-internal-tls
annotations:
kubernetes.io/ingress.class: traefik-internal
spec:
entryPoints:
- websecure
tls:
certResolver: myresolver
domains:
- main: "*.ducoterra.net"
routes:
- match: Host(`{{ .Release.Name }}.ducoterra.net`)
kind: Rule
services:
- name: {{ .Release.Name }}
port: 8000
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: {{ .Release.Name }}-internal-web
annotations:
kubernetes.io/ingress.class: traefik-internal
spec:
entryPoints:
- web
routes:
- match: Host(`{{ .Release.Name }}.ducoterra.net`)
kind: Rule
services:
- name: {{ .Release.Name }}
port: 8000
middlewares:
- name: httpsredirect
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: {{ .Release.Name }}-external-tls
annotations:
kubernetes.io/ingress.class: traefik-external
spec:
entryPoints:
- websecure
tls:
certResolver: myresolver
routes:
- match: Host(`{{ .Release.Name }}.ducoterra.net`)
kind: Rule
services:
- name: {{ .Release.Name }}
port: 8000
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: {{ .Release.Name }}-external-web
annotations:
kubernetes.io/ingress.class: traefik-external
spec:
entryPoints:
- web
routes:
- match: Host(`{{ .Release.Name }}.ducoterra.net`)
kind: Rule
services:
- name: {{ .Release.Name }}
port: 8000
middlewares:
- name: httpsredirect

View File

@@ -0,0 +1,10 @@
{{ if and .Values.secret .Release.IsInstall }}
apiVersion: v1
kind: Secret
metadata:
name: {{ .Release.Name }}
type: generic
data:
SECRET_KEY: {{ randAlphaNum 64 | b64enc | quote }}
DJANGO_SUPERUSER_PASSWORD: {{ randAlphaNum 64 | b64enc | quote }}
{{ end }}

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: Service
metadata:
labels:
app: {{ .Release.Name }}
name: {{ .Release.Name }}
spec:
ports:
- port: 8000
protocol: TCP
name: {{ .Release.Name }}-web
targetPort: 8000
selector:
app: {{ .Release.Name }} # This selects the pod(s) that match the selector
type: ClusterIP

3
helm/values.yaml Normal file
View File

@@ -0,0 +1,3 @@
image: hub.ducoterra.net/ducoterra/button
tag: 1.0.2
secret: true

6
k8s/configmap.yaml Normal file
View File

@@ -0,0 +1,6 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: $DEPLOY
data:
ALLOWED_HOSTS: localhost,$DEPLOY.ducoterra.net

View File

@@ -1,22 +1,27 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: test
name: $DEPLOY
spec:
selector:
matchLabels:
app: test
app: $DEPLOY
template:
metadata:
labels:
app: test
app: $DEPLOY
spec:
containers:
- name: test
- name: $DEPLOY
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
envFrom:
- configMapRef:
name: $DEPLOY
- secretRef:
name: django-secrets
volumeMounts:
- mountPath: /app/db
name: test
name: $DEPLOY
resources:
limits:
memory: "256Mi"
@@ -27,6 +32,6 @@ spec:
ports:
- containerPort: 8000
volumes:
- name: test
- name: $DEPLOY
persistentVolumeClaim:
claimName: test
claimName: $DEPLOY

View File

@@ -1,54 +0,0 @@
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
annotations:
ingress.kubernetes.io/ssl-redirect: "true"
name: test
spec:
tls:
- hosts:
- test.ducoterra.net
secretName: letsencrypt
rules:
- host: test.ducoterra.net
http:
paths:
- backend:
serviceName: test
servicePort: 8000
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: test-external-tls
spec:
entryPoints:
- websecure
tls:
secretName: letsencrypt
routes:
- match: Host(`test.ducoterra.net`)
kind: Rule
services:
- name: test-web
port: 80
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: test-external-web
spec:
entryPoints:
- web
routes:
- match: Host(`test.ducoterra.net`)
kind: Rule
services:
- name: test-web
port: 80
middlewares:
- name: httpsredirect

79
k8s/prod/ingress.yaml Normal file
View File

@@ -0,0 +1,79 @@
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: $DEPLOY-internal-tls
annotations:
kubernetes.io/ingress.class: traefik-internal
spec:
entryPoints:
- websecure
tls:
certResolver: myresolver
domains:
- main: "*.ducoterra.net"
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 8000
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: $DEPLOY-internal-web
annotations:
kubernetes.io/ingress.class: traefik-internal
spec:
entryPoints:
- web
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 8000
middlewares:
- name: httpsredirect
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: $DEPLOY-external-tls
annotations:
kubernetes.io/ingress.class: traefik-external
spec:
entryPoints:
- websecure
tls:
certResolver: myresolver
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 8000
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: $DEPLOY-external-web
annotations:
kubernetes.io/ingress.class: traefik-external
spec:
entryPoints:
- web
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 8000
middlewares:
- name: httpsredirect

View File

@@ -1,7 +1,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: test
name: $DEPLOY
spec:
storageClassName: nfs-encrypted
accessModes:

View File

@@ -1,10 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: test
name: $DEPLOY
spec:
selector:
app: test
app: $DEPLOY
ports:
- port: 8000
targetPort: 8000

39
k8s/test/ingress.yaml Normal file
View File

@@ -0,0 +1,39 @@
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: $DEPLOY-internal-tls
annotations:
kubernetes.io/ingress.class: traefik-internal
spec:
entryPoints:
- websecure
tls:
certResolver: myresolver
domains:
- main: "*.ducoterra.net"
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 8000
---
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: $DEPLOY-internal-web
annotations:
kubernetes.io/ingress.class: traefik-internal
spec:
entryPoints:
- web
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 8000
middlewares:
- name: httpsredirect

View File

@@ -5,6 +5,8 @@ import sys
def main():
os.environ.setdefault('DEBUG', 'True')
os.environ.setdefault('SECRET_KEY', 'SeVOOxOHISQZv82RfCPds0B2l8M6jGju4G8F-GcuSrc')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
try:
from django.core.management import execute_from_command_line

View File

@@ -2,4 +2,5 @@ django
djangorestframework
pygments
gunicorn
whitenoise
whitenoise
psycopg2-binary

View File

@@ -0,0 +1,41 @@
.achievement {
position: absolute;
height: 100%;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
z-index: -1;
}
.achievement-animate {
animation-name: moveup;
animation-duration: 2s;
animation-fill-mode: forwards;
}
.achievment-column {
height: 100%;
overflow: auto;
text-align: center;
}
.achievement-text {
font-size: 4rem;
}
@media only screen and (max-width: 768px) {
.achievment-column {
height: 50%;
}
}
@keyframes moveup {
from {bottom: 0px;}
to {bottom: 200px; color: white;}
}
@keyframes fadeout {
from {}
to {color: transparent;}
}

View File

@@ -0,0 +1,32 @@
html, body {
height: 100%;
width: 100%;
}
.section, .container {
height: 100%;
}
.columns {
height: 100%;
}
.button-column {
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
text-align: center;
height: 100%;
}
@media only screen and (max-width: 768px) {
.button-column {
height: 50%;
}
}
.button-container {
position: absolute;
}

View File

@@ -1,26 +1,31 @@
function getCookie(name) {
var cookieValue = null;
if (document.cookie && document.cookie !== '') {
var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) {
var cookie = cookies[i].trim();
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) === (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
}
}
const csrftoken = getCookie('csrftoken');
const button = document.getElementById("BUTTON");
const count = document.getElementById("COUNT");
const button_container = document.getElementById("button-container");
const achievement = document.getElementById("achievement");
const achievement_list = document.getElementById("achievement-list");
const achievement_column = document.getElementById("achievement-column");
function add_achievement(text) {
if (text != undefined) {
achievement.querySelector(".achievement-text").innerText = text;
achievement.classList.remove("achievement-animate");
void achievement.offsetWidth;
achievement.classList.add("achievement-animate");
var elem = document.createElement("div");
elem.innerText = text;
achievement_list.appendChild(elem);
achievement_column.scrollTo(0, achievement_list.scrollHeight);
}
return cookieValue;
}
var csrftoken = getCookie('csrftoken');
var button = document.getElementById("BUTTON");
var count = document.getElementById("COUNT");
// when button is clicked submit an empty post request
button.addEventListener("click", event => {
button.disabled = true;
fetch('/button', {
button.classList.add("is-loading");
fetch(button.dataset.action, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -32,9 +37,12 @@ button.addEventListener("click", event => {
})
.then((data) => {
count.innerText = data.pressed;
add_achievement(data.achievement);
}).finally(() => {
button.disabled = false;
button.classList.remove("is-loading");
});
});
// when the page is loaded automatically select the button
button.focus();

16
ui/static/ui/helper.js Normal file
View File

@@ -0,0 +1,16 @@
// get cookies when fetching with django
function getCookie(name) {
var cookieValue = null;
if (document.cookie && document.cookie !== '') {
var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) {
var cookie = cookies[i].trim();
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) === (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
}
}
}
return cookieValue;
}

View File

@@ -4,25 +4,43 @@
{% block css %}
<link rel="stylesheet" href="{% static 'ui/button.css' %}">
<link rel="stylesheet" href="{% static 'ui/achievement.css' %}">
{% endblock %}
{% block js %}
<script src="{% static 'ui/helper.js' %}"></script>
<script src="{% static 'ui/button.js' %}"></script>
{% endblock %}
{% block body %}
<section class="section">
<div class="container">
<div>
<h1 class="title">
The Button
</h1>
<button class="button is-primary" id="BUTTON">Press</button>
<div class="columns">
<div class="column">
</div>
<div><br></div>
<div>
<h1 class="title" id="COUNT">{{ pressed }}</h1>
<div class="button-column column">
<div>
<h1 class="title">
The Button
</h1>
<button class="button is-danger" id="BUTTON" data-action = "{% url 'button' %}">Press</button>
</div>
<div><br></div>
<div>
<h1 class="title" id="COUNT">{{ pressed }}</h1>
</div>
<div id="achievement" class="achievement">
<div>
<div class="achievement-text"></div>
</div>
</div>
</div>
<div class="column achievment-column" id = "achievement-column">
<div class="achievements-list" id="achievement-list">
<h1 class="title">Achievements</h1>
{% for key,value in achievement.items %}
<div>{{ value }}</div>
{% endfor %}
</div>
</div>
</div>
</section>

View File

@@ -1,5 +1,5 @@
from django.contrib.auth.models import AnonymousUser, User
from django.test import RequestFactory, TestCase
from django.test import RequestFactory, TestCase, Client
from .views import button
@@ -11,23 +11,29 @@ class SimpleTest(TestCase):
username='testuser', email='test@test.test', password='testpass')
def test_button(self):
# Create an instance of a GET request.
request = self.factory.get('/snippets')
request.user = self.user
request.session = self.client.session
response = button(request)
# Test initial load
c = Client()
response = c.get('/')
self.assertEqual(response.status_code, 200)
request = self.factory.post(
'/button',
data={},
content_type='application/json'
)
request.session = self.client.session
response = button(request)
self.assertEqual(response.status_code, 200)
self.assertEqual(request.session.get('pressed'), 1)
self.assertEqual(response.context.get("achievement"), {})
response = button(request)
# Test first achievement
response = c.post('/', {})
self.assertEqual(response.status_code, 200)
self.assertEqual(request.session.get('pressed'), 2)
self.assertEqual(response.json().get("pressed"), 1)
self.assertEqual(response.json().get("achievement"), "Clicked!")
self.assertEqual(c.session.get('pressed'), 1)
# Test second achievement
response = c.post('/', {})
self.assertEqual(response.status_code, 200)
self.assertEqual(response.json().get("pressed"), 2)
self.assertEqual(response.json().get("achievement"), "Clicked Twice!")
self.assertEqual(c.session.get('pressed'), 2)
# Test no achievement
response = c.post('/', {})
self.assertEqual(response.status_code, 200)
self.assertEqual(response.json().get("pressed"), 3)
self.assertEqual(response.json().get("achievement"), None)
self.assertEqual(c.session.get('pressed'), 3)

View File

@@ -2,5 +2,5 @@ from django.urls import path
from . import views
urlpatterns = [
path('button', views.button, name = 'button'),
path('', views.button, name = 'button'),
]

View File

@@ -1,14 +1,70 @@
from django.shortcuts import render
from django.http import JsonResponse
achievements = {
1: "Clicked!",
2: "Clicked Twice!",
4: "2^2",
8: "2^3",
16: "2^4",
24: "I'm that old",
32: "2^5",
64: "2^6",
100: "one hundred",
128: "2^7",
200: "two hundred",
250: "quarter thousand",
256: "2^8",
300: "three hundred",
400: "four hundred",
500: "half thousand",
512: "2^9",
600: "six hundred",
700: "seven hundred",
800: "eight hundred",
900: "nine hundred",
1000: "full thousand",
1024: "2^10",
1776: "America",
1914: "Some War here",
1938: "Some more war here",
1950: "Lots of war in here",
2000: "Computers die",
2008: "Houses die",
2019: "People die",
2048: "2048!",
2500: "Keep going!",
3000: "three thousand",
4000: "four thousand",
4096: "2^11",
5000: "halfway to ten thousand",
10001: "ten thousand one",
100000: "one hundred thousand",
1000000: "one million?",
10000000: "ten millions???",
100000000: "one hundo billion",
1000000000: "JK this is actually a billion though",
10000000000: "I'm not going to create another achievement",
100000000000: "one hundred billion",
1000000000000: "It's physically impossible to click this high"
}
def button(request):
PRESSED = 'pressed'
try:
request.session[PRESSED]
except KeyError:
request.session[PRESSED] = 0
ACHIEVE = 'achievement'
pressed = request.session.get(PRESSED, 0)
if request.method == "POST":
request.session[PRESSED] += 1
return JsonResponse({PRESSED: request.session[PRESSED]})
return render(request, "ui/button.html", {PRESSED: request.session[PRESSED]})
pressed = pressed + 1
request.session[PRESSED] = pressed
response = {
PRESSED: pressed,
ACHIEVE: achievements.get(pressed)
}
return JsonResponse(response)
response = {PRESSED: pressed}
achieved = {k:v for k,v in achievements.items() if k <= pressed}
response.update({ACHIEVE: achieved})
return render(request, "ui/button.html", response)