Compare commits

..

1 Commits

Author SHA1 Message Date
ducoterra
6610c2896b add visitor model and api 2020-04-26 12:05:03 -04:00
24 changed files with 170 additions and 458 deletions

3
.gitignore vendored
View File

@@ -1,4 +1,3 @@
venv/
__pycache__/
db/
staticfiles/
db/

6
.vscode/launch.json vendored
View File

@@ -12,8 +12,7 @@
"args": [
"test",
],
"django": true,
"preLaunchTask": "Migrate"
"django": true
},
{
"name": "Run Server",
@@ -24,8 +23,7 @@
"runserver",
"--noreload"
],
"django": true,
"preLaunchTask": "Migrate"
"django": true
}
]
}

24
.vscode/tasks.json vendored
View File

@@ -1,24 +0,0 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Collect Static",
"command": "venv/bin/python manage.py collectstatic --no-input",
"type": "shell",
"presentation": {
"reveal": "always"
},
"group": "build"
},
{
"dependsOn": "Collect Static",
"label": "Migrate",
"command": "venv/bin/python manage.py migrate",
"type": "shell",
"presentation": {
"reveal": "always"
},
"group": "build"
}
]
}

View File

@@ -0,0 +1,25 @@
# Generated by Django 3.0.5 on 2020-04-26 15:17
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Visitor',
fields=[
('name', models.CharField(max_length=255, primary_key=True, serialize=False)),
('clicked', models.IntegerField(blank=True, default=0)),
('first_pressed', models.DateTimeField(auto_now_add=True)),
('last_pressed', models.DateTimeField(auto_now=True)),
],
),
migrations.DeleteModel(
name='Snippet',
),
]

View File

@@ -0,0 +1,23 @@
# Generated by Django 3.0.5 on 2020-04-26 15:26
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0002_auto_20200426_1517'),
]
operations = [
migrations.AlterField(
model_name='visitor',
name='first_pressed',
field=models.DateTimeField(blank=True, null=True),
),
migrations.AlterField(
model_name='visitor',
name='last_pressed',
field=models.DateTimeField(blank=True, null=True),
),
]

View File

@@ -1,19 +1,11 @@
from django.db import models
from pygments.lexers import get_all_lexers
from pygments.styles import get_all_styles
from datetime import datetime
LEXERS = [item for item in get_all_lexers() if item[1]]
LANGUAGE_CHOICES = sorted([(item[1][0], item[0]) for item in LEXERS])
STYLE_CHOICES = sorted([(item, item) for item in get_all_styles()])
class Snippet(models.Model):
created = models.DateTimeField(auto_now_add=True)
title = models.CharField(max_length=100, blank=True, default='')
code = models.TextField()
linenos = models.BooleanField(default=False)
language = models.CharField(choices=LANGUAGE_CHOICES, default='python', max_length=100)
style = models.CharField(choices=STYLE_CHOICES, default='friendly', max_length=100)
class Meta:
ordering = ['created']
class Visitor(models.Model):
name = models.CharField(
primary_key=True,
max_length = 255
)
clicked = models.IntegerField(default = 0, blank=True)
first_pressed = models.DateTimeField(blank=True, null=True)
last_pressed = models.DateTimeField(blank=True, null=True)

View File

@@ -1,29 +1,23 @@
from rest_framework import serializers
from .models import Snippet, LANGUAGE_CHOICES, STYLE_CHOICES
from .models import *
class SnippetSerializer(serializers.Serializer):
id = serializers.IntegerField(read_only=True)
title = serializers.CharField(required=False, allow_blank=True, max_length=100)
code = serializers.CharField(style={'base_template': 'textarea.html'})
linenos = serializers.BooleanField(required=False)
language = serializers.ChoiceField(choices=LANGUAGE_CHOICES, default='python')
style = serializers.ChoiceField(choices=STYLE_CHOICES, default='friendly')
class VisitorSerializer(serializers.Serializer):
name = serializers.CharField(required=True)
clicked = serializers.IntegerField(read_only=True)
first_pressed = serializers.DateTimeField(read_only=True)
last_pressed = serializers.DateTimeField(read_only=True)
def create(self, validated_data):
"""
Create and return a new `Snippet` instance, given the validated data.
Create and return a new `Visitor` instance, given the validated data.
"""
return Snippet.objects.create(**validated_data)
return Visitor.objects.create(**validated_data)
def update(self, instance, validated_data):
"""
Update and return an existing `Snippet` instance, given the validated data.
"""
instance.title = validated_data.get('title', instance.title)
instance.code = validated_data.get('code', instance.code)
instance.linenos = validated_data.get('linenos', instance.linenos)
instance.language = validated_data.get('language', instance.language)
instance.style = validated_data.get('style', instance.style)
instance.name = validated_data.get('name', instance.name)
instance.save()
return instance

View File

@@ -1,42 +1,53 @@
from django.contrib.auth.models import AnonymousUser, User
from django.test import RequestFactory, TestCase
from django.db.utils import IntegrityError
from .views import SnippetList, SnippetDetail
from .views import *
class SimpleTest(TestCase):
def setUp(self):
# Every test needs access to the request factory.
self.factory = RequestFactory()
self.user = User.objects.create_user(
username='testuser', email='test@test.test', password='testpass')
# self.user = User.objects.create_user(
# username='testuser', email='test@test.test', password='testpass')
def test_snippets(self):
def test_list_visitors(self):
# Create an instance of a GET request.
request = self.factory.get('/snippets')
request = self.factory.get('/visitors')
# Recall that middleware are not supported. You can simulate a
# logged-in user by setting request.user manually.
request.user = self.user
# request.user = self.user
# Or you can simulate an anonymous user by setting request.user to
# an AnonymousUser instance.
# request.user = AnonymousUser()
# Test my_view() as if it were deployed at /customer/details
response = SnippetList.as_view()(request)
response = VisitorList.as_view()(request)
# Use this syntax for class-based views.
# response = MyView.as_view()(request)
self.assertEqual(response.status_code, 200)
request = self.factory.post('/snippets', data={
'title': 'test1',
'code': '() => {console.log("hello")};',
'lineos': False,
'language': 'js',
'style': 'abap'
def test_add_visitor(self):
request = self.factory.post('/visitors', data={
'name': 'test',
},
content_type='application/json'
)
response = SnippetList.as_view()(request)
self.assertEqual(response.status_code, 201)
response = VisitorList.as_view()(request)
self.assertEqual(response.status_code, 201)
vis = Visitor.objects.get(name='test')
self.assertEqual(vis.clicked, 0)
self.assertIsNone(vis.first_pressed)
self.assertIsNone(vis.last_pressed)
with self.assertRaises(IntegrityError):
request = self.factory.post('/visitors', data={
'name': 'test',
},
content_type='application/json'
)
response = VisitorList.as_view()(request)

View File

@@ -3,8 +3,8 @@ from rest_framework.urlpatterns import format_suffix_patterns
from . import views
urlpatterns = [
path('snippets/', views.SnippetList.as_view()),
path('snippets/<int:pk>/', views.SnippetDetail.as_view()),
path('visitor/', views.VisitorList.as_view()),
path('visitor/<str:pk>/', views.VisitorDetail.as_view()),
]
urlpatterns = format_suffix_patterns(urlpatterns)

View File

@@ -1,15 +1,15 @@
from .models import Snippet
from .serializers import SnippetSerializer
from .models import *
from .serializers import *
from rest_framework import generics
class SnippetList(generics.ListCreateAPIView):
class VisitorList(generics.ListCreateAPIView):
# Add comments here
queryset = Snippet.objects.all()
serializer_class = SnippetSerializer
queryset = Visitor.objects.all()
serializer_class = VisitorSerializer
class SnippetDetail(generics.RetrieveUpdateDestroyAPIView):
class VisitorDetail(generics.RetrieveUpdateDestroyAPIView):
# Add comments here
queryset = Snippet.objects.all()
serializer_class = SnippetSerializer
queryset = Visitor.objects.all()
serializer_class = VisitorSerializer

View File

@@ -24,7 +24,6 @@ SECRET_KEY = os.getenv("SECRET_KEY")
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True if os.getenv("DEBUG") == "True" else False
LOGGING_CONFIG = None
ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", "localhost").split(",")

View File

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

View File

@@ -1,42 +1,21 @@
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: $DEPLOY-internal-tls
annotations:
kubernetes.io/ingress.class: traefik-internal
ingress.kubernetes.io/ssl-redirect: "true"
name: $DEPLOY
spec:
entryPoints:
- websecure
tls:
certResolver: myresolver
domains:
- main: "*.ducoterra.net"
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 80
---
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: 80
middlewares:
- name: httpsredirect
- hosts:
- $DEPLOY.ducoterra.net
secretName: letsencrypt
rules:
- host: $DEPLOY.ducoterra.net
http:
paths:
- backend:
serviceName: $DEPLOY
servicePort: 8000
---
@@ -44,19 +23,17 @@ 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
secretName: letsencrypt
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 80
port: 8000
---
@@ -64,8 +41,6 @@ apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
metadata:
name: $DEPLOY-external-web
annotations:
kubernetes.io/ingress.class: traefik-external
spec:
entryPoints:
- web
@@ -74,6 +49,6 @@ spec:
kind: Rule
services:
- name: $DEPLOY
port: 80
port: 8000
middlewares:
- name: httpsredirect

View File

@@ -1,39 +1,18 @@
apiVersion: traefik.containo.us/v1alpha1
kind: IngressRoute
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: $DEPLOY-internal-tls
annotations:
kubernetes.io/ingress.class: traefik-internal
ingress.kubernetes.io/ssl-redirect: "true"
name: $DEPLOY
spec:
entryPoints:
- websecure
tls:
certResolver: myresolver
domains:
- main: "*.ducoterra.net"
routes:
- match: Host(`$DEPLOY.ducoterra.net`)
kind: Rule
services:
- name: $DEPLOY
port: 80
---
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: 80
middlewares:
- name: httpsredirect
- hosts:
- $DEPLOY.ducoterra.net
secretName: letsencrypt
rules:
- host: $DEPLOY.ducoterra.net
http:
paths:
- backend:
serviceName: $DEPLOY
servicePort: 8000

View File

@@ -1,41 +0,0 @@
.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

@@ -1,32 +1,18 @@
html, body {
height: 100%;
width: 100%;
position: fixed;
overflow: hidden;
}
.section, .container {
height: 100%;
}
.columns {
height: 100%;
}
.button-column {
.container {
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,25 +1,6 @@
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);
}
}
// when button is clicked submit an empty post request
button.addEventListener("click", event => {
@@ -37,7 +18,6 @@ button.addEventListener("click", event => {
})
.then((data) => {
count.innerText = data.pressed;
add_achievement(data.achievement);
}).finally(() => {
button.disabled = false;
button.classList.remove("is-loading");

View File

@@ -1,23 +0,0 @@
html, body, .section, .container {
height: 100%;
}
.container {
overflow-y: hidden;
}
.element::-webkit-scrollbar { width: 0 !important }
.element { overflow: -moz-scrollbars-none; }
.element { -ms-overflow-style: none; }
.hide-overflow {
overflow: hidden;
}
.h-100 {
height: 100%;
}
.w-100 {
width: 100%;
}

View File

@@ -1,39 +0,0 @@
// temp0.scrollIntoView({behavior: "smooth"});
const scroll0 = document.getElementById("scroll-0");
const scroll1 = document.getElementById("scroll-1");
const scroll2 = document.getElementById("scroll-2");
const scroll3 = document.getElementById("scroll-3");
window.addEventListener("scroll", function(event) {
window.addEventListener("mouseup", event => {
console.log("hello");
});
event.preventDefault();
document.querySelector("html").classList.add("hide-overflow");
if (scroll0.dataset.isScrolling != "true") {
scroll0.dataset.isScrolling = 'true';
if (scroll1.dataset.seen != "true") {
scroll1.dataset.seen = "true";
scroll1.scrollIntoView({behavior: "smooth"});
}
else if (scroll2.dataset.seen != "true") {
scroll2.dataset.seen = "true";
scroll2.scrollIntoView({behavior: "smooth"});
}
else if (scroll3.dataset.seen != "true") {
scroll3.dataset.seen = "true";
scroll3.scrollIntoView({behavior: "smooth"});
}
else {
scroll1.dataset.seen = "false";
scroll2.dataset.seen = "false";
scroll3.dataset.seen = "false";
scroll0.scrollIntoView({behavior: "smooth"});
}
setTimeout(() => {
scroll0.dataset.isScrolling = false;
document.querySelector("html").classList.remove("hide-overflow");
}, 1000)
}
});

View File

@@ -4,7 +4,6 @@
{% block css %}
<link rel="stylesheet" href="{% static 'ui/button.css' %}">
<link rel="stylesheet" href="{% static 'ui/achievement.css' %}">
{% endblock %}
{% block js %}
@@ -14,33 +13,16 @@
{% block body %}
<section class="section">
<div class="columns">
<div class="column">
<div class="container">
<div>
<h1 class="title">
The Button
</h1>
<button class="button is-primary" id="BUTTON">Press</button>
</div>
<div class="button-column column">
<div>
<h1 class="title">
The Button
</h1>
<button class="button is-danger" id="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><br></div>
<div>
<h1 class="title" id="COUNT">{{ pressed }}</h1>
</div>
</div>
</section>

View File

@@ -1,31 +0,0 @@
{% extends 'ui/base.html' %}
{% load static %}
{% block css %}
<link rel="stylesheet" href="{% static 'ui/smooth.css' %}">
{% endblock %}
{% block js %}
<script src="{% static 'ui/smooth.js' %}"></script>
{% endblock %}
{% block body %}
<div class="container">
<div id="scroll-0" class="h-100 w-100">
<h1 class="title">Hello There</h1>
</div>
<div id="scroll-1" class="h-100 w-100">
<h1 class="title">I'm an Apple Ad</h1>
</div>
<div id="scroll-2" class="h-100 w-100">
<h1 class="title">See me scroll</h1>
</div>
<div id="scroll-3" class="h-100 w-100">
<h1 class="title">You owe me $3,000 dollars for this</h1>
</div>
</div>
{% endblock %}

View File

@@ -1,5 +1,5 @@
from django.contrib.auth.models import AnonymousUser, User
from django.test import RequestFactory, TestCase, Client
from django.test import RequestFactory, TestCase
from .views import button
@@ -11,31 +11,24 @@ class SimpleTest(TestCase):
username='testuser', email='test@test.test', password='testpass')
def test_button(self):
# Test initial load
c = Client()
response = c.get('/button')
self.assertEqual(response.status_code, 301)
response = c.get('/button/')
# Test button page returns 200
request = self.factory.get('/button')
request.session = self.client.session
response = button(request)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context.get("achievement"), {})
# Test button post returns 200 and increments button to 1
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)
# Test first achievement
response = c.post('/button/', {})
# Test second click increments button to 2
response = button(request)
self.assertEqual(response.status_code, 200)
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('/button/', {})
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('/button/', {})
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)
self.assertEqual(request.session.get('pressed'), 2)

View File

@@ -3,5 +3,4 @@ from . import views
urlpatterns = [
path('button/', views.button, name = 'button'),
path('smooth/', views.smooth, name = 'smooth'),
]

View File

@@ -1,61 +1,8 @@
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",
69: "Nice",
100: "one hundred",
128: "2^7",
200: "two hundred",
250: "quarter thousand",
256: "2^8",
300: "three hundred",
400: "four hundred",
420: "Blaze it",
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'
ACHIEVE = 'achievement'
try:
request.session[PRESSED]
except KeyError:
@@ -63,17 +10,5 @@ def button(request):
if request.method == "POST":
request.session[PRESSED] += 1
response = {
PRESSED: request.session[PRESSED],
ACHIEVE: achievements.get(request.session[PRESSED])
}
return JsonResponse(response)
pressed = request.session[PRESSED]
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)
def smooth(request):
return render(request, "ui/smooth.html")
return JsonResponse({PRESSED: request.session[PRESSED]})
return render(request, "ui/button.html", {PRESSED: request.session[PRESSED]})