Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07d98bf11d | ||
|
|
4584ba0143 | ||
|
|
6feac7ef2e | ||
|
|
5efb93ea68 | ||
|
|
1ee6b890ef | ||
|
|
18aab648c6 | ||
|
|
57328a7fc8 | ||
|
|
948569a659 | ||
|
|
50cdfd8180 | ||
|
|
8393efa3a6 | ||
|
|
b3db1816bb | ||
|
|
7123f4c389 |
@@ -43,7 +43,8 @@ deploy:
|
|||||||
- curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
|
- 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
|
- chmod +x ./kubectl
|
||||||
- mkdir /deploy
|
- mkdir /deploy
|
||||||
- for f in $(find k8s -regex '.*\\.ya*ml'); do envsubst < $f > "/deploy/$(basename $f)"; done'
|
- for f in $(find k8s -regex '.*\.ya*ml'); do envsubst < $f > "/deploy/$(basename $f)"; done
|
||||||
- ./kubectl apply -f /deploy
|
- ./kubectl apply -f /deploy
|
||||||
- ./kubectl rollout status deploy $DEPLOY
|
- ./kubectl rollout status deploy $DEPLOY
|
||||||
- ./kubectl exec $(./kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}') -- python manage.py migrate
|
- POD=$(./kubectl get pods --selector=app=$DEPLOY --output=jsonpath='{.items[*].metadata.name}')
|
||||||
|
- ./kubectl exec $POD -- python manage.py migrate
|
||||||
13
.vscode/launch.json
vendored
13
.vscode/launch.json
vendored
@@ -5,7 +5,7 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "Python: Django",
|
"name": "Test",
|
||||||
"type": "python",
|
"type": "python",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"program": "${workspaceFolder}/manage.py",
|
"program": "${workspaceFolder}/manage.py",
|
||||||
@@ -13,6 +13,17 @@
|
|||||||
"test",
|
"test",
|
||||||
],
|
],
|
||||||
"django": true
|
"django": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Run Server",
|
||||||
|
"type": "python",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "${workspaceFolder}/manage.py",
|
||||||
|
"args": [
|
||||||
|
"runserver",
|
||||||
|
"--noreload"
|
||||||
|
],
|
||||||
|
"django": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,7 @@ from django.urls import path, include
|
|||||||
from django.http import JsonResponse
|
from django.http import JsonResponse
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('', include('api.urls')),
|
# path('api/', include('api.urls')),
|
||||||
path('', include('ui.urls')),
|
path('', include('ui.urls')),
|
||||||
path('admin/', admin.site.urls),
|
# path('admin/', admin.site.urls),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -16,7 +16,9 @@ spec:
|
|||||||
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
|
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: gitlab
|
name: $DEPLOY
|
||||||
|
- secretRef:
|
||||||
|
name: django-secrets
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /app/db
|
- mountPath: /app/db
|
||||||
name: $DEPLOY
|
name: $DEPLOY
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
html, body {
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
touch-action: manipulation;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section, .container {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.container {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
@@ -1,25 +1,11 @@
|
|||||||
function getCookie(name) {
|
const csrftoken = getCookie('csrftoken');
|
||||||
var cookieValue = null;
|
const button = document.getElementById("BUTTON");
|
||||||
if (document.cookie && document.cookie !== '') {
|
const count = document.getElementById("COUNT");
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
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.addEventListener("click", event => {
|
||||||
button.disabled = true;
|
button.disabled = true;
|
||||||
|
button.classList.add("is-loading");
|
||||||
fetch('/button', {
|
fetch('/button', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
@@ -34,7 +20,9 @@ button.addEventListener("click", event => {
|
|||||||
count.innerText = data.pressed;
|
count.innerText = data.pressed;
|
||||||
}).finally(() => {
|
}).finally(() => {
|
||||||
button.disabled = false;
|
button.disabled = false;
|
||||||
|
button.classList.remove("is-loading");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// when the page is loaded automatically select the button
|
||||||
button.focus();
|
button.focus();
|
||||||
16
ui/static/ui/helper.js
Normal file
16
ui/static/ui/helper.js
Normal 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;
|
||||||
|
}
|
||||||
@@ -7,10 +7,10 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block js %}
|
{% block js %}
|
||||||
|
<script src="{% static 'ui/helper.js' %}"></script>
|
||||||
<script src="{% static 'ui/button.js' %}"></script>
|
<script src="{% static 'ui/button.js' %}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<section class="section">
|
<section class="section">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|||||||
Reference in New Issue
Block a user