Compare commits

..

1 Commits

Author SHA1 Message Date
ducoterra
e102db9f38 achievements! 2020-04-26 14:27:33 -04:00
12 changed files with 139 additions and 108 deletions

View File

@@ -1,25 +0,0 @@
# 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

@@ -1,23 +0,0 @@
# 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,11 +1,19 @@
from django.db import models
from datetime import datetime
from pygments.lexers import get_all_lexers
from pygments.styles import get_all_styles
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)
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']

View File

@@ -1,23 +1,29 @@
from rest_framework import serializers
from .models import *
from .models import Snippet, LANGUAGE_CHOICES, STYLE_CHOICES
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)
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')
def create(self, validated_data):
"""
Create and return a new `Visitor` instance, given the validated data.
Create and return a new `Snippet` instance, given the validated data.
"""
return Visitor.objects.create(**validated_data)
return Snippet.objects.create(**validated_data)
def update(self, instance, validated_data):
"""
Update and return an existing `Snippet` instance, given the validated data.
"""
instance.name = validated_data.get('name', instance.name)
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.save()
return instance

View File

@@ -1,53 +1,42 @@
from django.contrib.auth.models import AnonymousUser, User
from django.test import RequestFactory, TestCase
from django.db.utils import IntegrityError
from .views import *
from .views import SnippetList, SnippetDetail
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_list_visitors(self):
def test_snippets(self):
# Create an instance of a GET request.
request = self.factory.get('/visitors')
request = self.factory.get('/snippets')
# 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 = VisitorList.as_view()(request)
response = SnippetList.as_view()(request)
# Use this syntax for class-based views.
# response = MyView.as_view()(request)
self.assertEqual(response.status_code, 200)
def test_add_visitor(self):
request = self.factory.post('/visitors', data={
'name': 'test',
request = self.factory.post('/snippets', data={
'title': 'test1',
'code': '() => {console.log("hello")};',
'lineos': False,
'language': 'js',
'style': 'abap'
},
content_type='application/json'
)
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)
response = SnippetList.as_view()(request)
self.assertEqual(response.status_code, 201)

View File

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

View File

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

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

@@ -0,0 +1,29 @@
.achievement {
width: 100%;
height: 100%;
text-align: center;
justify-content: center;
align-items: center;
display: flex;
position: absolute;
}
.achievement-animate {
animation-name: moveup;
animation-duration: 2s;
animation-fill-mode: forwards;
}
.achievement-text {
font-size: 4rem;
}
@keyframes moveup {
from {bottom: 0px;}
to {bottom: 200px; color: white;}
}
@keyframes fadeout {
from {}
to {color: transparent;}
}

View File

@@ -1,6 +1,47 @@
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 achievements = {
1: "Clicked!",
2: "Clicked Twice!",
4: "2^2",
8: "2^3",
16: "2^4",
32: "2^5",
64: "2^6",
69: "Sixty-Nine",
100: "one hundred",
128: "2^7",
200: "two hundred",
250: "quarter thousand",
256: "2^8",
420: "Blaze it",
500: "half thousand",
512: "2^9",
1000: "one thousand",
1024: "2^10",
2048: "2048!",
2500: "Keep going!",
4096: "2^11",
5000: "halfway to ten thousand"
}
function add_achievement(text) {
achievement.querySelector(".achievement-text").innerText = text;
achievement.classList.remove("achievement-animate");
void achievement.offsetWidth;
achievement.classList.add("achievement-animate");
}
function check_achievement(count) {
current_achievement = achievements[Number(count)]
if (current_achievement != undefined) {
add_achievement(current_achievement)
}
}
// when button is clicked submit an empty post request
button.addEventListener("click", event => {
@@ -18,6 +59,7 @@ button.addEventListener("click", event => {
})
.then((data) => {
count.innerText = data.pressed;
check_achievement(data.pressed);
}).finally(() => {
button.disabled = false;
button.classList.remove("is-loading");

View File

@@ -4,6 +4,7 @@
{% block css %}
<link rel="stylesheet" href="{% static 'ui/button.css' %}">
<link rel="stylesheet" href="{% static 'ui/achievement.css' %}">
{% endblock %}
{% block js %}
@@ -13,7 +14,12 @@
{% block body %}
<section class="section">
<div class="container">
<div id = "button-container" class="container">
<div id = "achievement" class="achievement">
<div>
<div class="achievement-text"></div>
</div>
</div>
<div>
<h1 class="title">
The Button

View File

@@ -11,13 +11,13 @@ class SimpleTest(TestCase):
username='testuser', email='test@test.test', password='testpass')
def test_button(self):
# Test button page returns 200
request = self.factory.get('/button')
# Create an instance of a GET request.
request = self.factory.get('/snippets')
request.user = self.user
request.session = self.client.session
response = button(request)
self.assertEqual(response.status_code, 200)
# Test button post returns 200 and increments button to 1
request = self.factory.post(
'/button',
data={},
@@ -28,7 +28,6 @@ class SimpleTest(TestCase):
self.assertEqual(response.status_code, 200)
self.assertEqual(request.session.get('pressed'), 1)
# Test second click increments button to 2
response = button(request)
self.assertEqual(response.status_code, 200)
self.assertEqual(request.session.get('pressed'), 2)