api/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ApiConfig(AppConfig):
-    name = 'api'

api/urls.py

@@ -1,16 +0,0 @@
-#!/usr/bin/env python3
-"""
-API URL configuration.
-"""
-from django.urls import path
-
-from . import views
-
-app_name = 'api'
-urlpatterns = [
-	path('', views.index, name='index'),
-	path('set_session', views.set_session, name='set_session'),
-	path('subscribe', views.subscribe, name='subscribe'),
-	path('clear_notification', views.clear_notification, name='clear_notification'),
-]
-

api/views.py

@@ -1,60 +0,0 @@
-#!/usr/bin/env python3
-"""
-API endpoints.
-"""
-from user_messages import api
-from django.http import HttpResponse
-from django.shortcuts import redirect
-from django.views.decorators.http import require_POST
-
-from quest.models import Quest
-
-def index(request):
-	"""An index page."""
-	return HttpResponse('Hello.')
-
-
-@require_POST
-def set_session(request):
-	"""
-	API endpoint for setting certain values in the users session.
-	"""
-	for key, value in request.POST.items():
-		if key not in ['hide_header', 'hide_chat']:
-			continue
-		if value == 'on':
-			request.session[key] = True
-		elif value == 'off':
-			request.session[key] = False
-
-	return HttpResponse('true')
-
-
-@require_POST
-def subscribe(request):
-	"""Endpoint for users to subscribe to a quest."""
-	if not request.user.is_authenticated:
-		return redirect('login:index')
-	quest_id = request.POST.get('quest_id')
-	try:
-		quest = Quest.objects.get(id=quest_id)
-	except Quest.DoesNotExist:
-		return redirect('quest:quest', quest_id=quest_id, page_num='0')
-	request.user.subscriptions.add(quest)
-	return redirect('quest:quest', quest_id=quest.id, page_num='0')
-
-
-@require_POST
-def clear_notification(request):
-	"""Endpoint for users to clear a message notification."""
-	if not request.user.is_authenticated:
-		return redirect('login:index')
-	msg_id = request.POST.get('msg_id')
-	messages = api.get_messages(user=request.user)
-	message = [m for m in messages if str(m.id) == msg_id]
-	if message:
-		message = message[0]
-	else:
-		return HttpResponse('false')
-	message.delete()
-	return HttpResponse('true')

homepage/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

jinja2/base.html

@@ -7,7 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="{{ static('base.css') }}">
 	<script type="text/javascript" src="{{ static('base.js') }}"></script>
 	<script>
-		const api_url = '{{ url("api:index") }}';
+		const set_session_url = '{{ url("set_session:index") }}';
 		const csrf_token = '{{ csrf_token }}';
 	</script>
 	{% block head %}{% endblock %}
@@ -17,21 +17,6 @@
 		<div id="header" class="header" style="{% if request.session.get("hide_header") == True %}display:none;{% else %}display:flex;{% endif %}">
 			<span><a onclick="toggle_header();" href="javascript:void(0);">↑</a></span>
 			<span><a href="{{ url('homepage:index') }}">Home</a></span>
-			{% if request.user.is_authenticated %}
-			<span id="profileLink"><a href="{{ url('user:profile', args=[request.user.id]) }}">{{ request.user.username }}</a></span>
-			<span id="subscriptions">
-				<button id="subbtn">{{ get_sub_msgs(request=request)|length }}</button>
-				<div id="subscriptionsContent">
-					{% for sub in get_sub_msgs(request=request) %}
-					<div id="notification-{{ sub.id }}" >
-						{{ sub.created_at.strftime('%Y-%m-%d') }} <a href="{{ sub.meta.url }}">{{ sub }}</a>
-						<a href="javascript:void(0);" onclick="clear_notification({{ sub.id }})">X</a>
-						<br>
-					</div>
-					{% endfor %}
-				</div>
-			</span>
-			{% endif %}
 			{% block header %}{% endblock %}
 		</div>
 		<div id="headerHidden" class="header" style="{% if request.session.get("hide_header") == True %}display:flex;{% else %}display:none;{% endif %}">

login/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

logout/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

quest/jinja2/quest/quest_header.html

@@ -24,5 +24,8 @@
 		Live in: <span id="liveCountdown"></span> (<span id="liveTime">{% if quest.live_time %}{{ localtime(quest.live_time).strftime('%Y-%m-%d %H:%M') }}{% endif %}</span>)
 	</span>
 	<span id="space"></span>
+	{% if request.user.is_authenticated %}
+	<span id="profileLink"><a href="{{ url('user:profile', args=[request.user.id]) }}">{{ request.user.username }}</a></span>
+	{% endif %}
 	<span id="toggleChat"><a onclick="toggle_chat()" href="javascript:void(0);">{% if request.session.get("hide_chat") == True %}←{% else %}→{% endif %}</a></span>
 

quest/jinja2/quest/quest_homepage.html

@@ -38,10 +38,9 @@
 		</form>
 		{% endif %}
 		{% if request.user.is_authenticated %}
-		<form id="subscribe" method="post" action="{{ url('api:subscribe') }}">
+		<form id="subscribe" method="post" action="{{ url('quest:subscribe', kwargs={'quest_id': quest_id}) }}">
 			{{ csrf_input }}
-			<input type="hidden" name="quest_id" value="{{ quest_id }}">
+			<a onclick="document.getElementById('subscribe').submit()">Subscribe</a>
-			<a href="javascript:void(0);" onclick="document.getElementById('subscribe').submit()">Subscribe</a>
 		</form>
 		{% endif %}
 		<h3>Pages</h3>

quest/urls.py

@@ -10,6 +10,7 @@ app_name = 'quest'
 urlpatterns = [
 	path('', views.index, name='index'),
 	path('<int:quest_id>/new_tag', views.new_tag, name='new_tag'),
+	path('<int:quest_id>/subscribe', views.subscribe, name='subscribe'),
 	path('<int:quest_id>/edit_quest', views.edit_quest, name='edit_quest'),
 	path('<int:quest_id>/<page_num>/edit_quest', views.edit_quest, name='edit_quest'),
 	path('<int:quest_id>', views.quest, name='quest'),

quest/views.py

@@ -11,8 +11,6 @@ from django.contrib import messages
 from django.shortcuts import render, redirect
 from django.db.models import F
 from django.conf import settings
-from django.urls import reverse
-from django.http import HttpResponse
 
 from .models import Quest, DiceRoll, PollOption, PollVote, Page, Post
 from .forms import EditQuestForm, QuestForm, PostForm
@@ -130,13 +128,7 @@ def edit_quest(request, quest_id, page_num='0'):
 						subscriber,
 						f"{quest.title} has gone live!",
 						extra_tags='subscription',
-						meta={
+						deliver_once=False
-							'url': reverse(
-								'quest:quest',
-								args=(quest.id, 0),
-							),
-						},
-						deliver_once=False,
 					)
 			return redirect('quest:quest',quest_id=quest.id, page_num=page_num)
 		else:
@@ -195,3 +187,13 @@ def new_tag(request, quest_id):
 
 	quest.tags.add(tag)
 	return redirect('quest:quest', quest_id=quest_id, page_num='0')
+
+
+@require_POST
+def subscribe(request, quest_id):
+	"""Endpoint for users to subscribe to a quest."""
+	if not request.user.is_authenticated:
+		return redirect('login:index')
+	request.user.subscriptions.add(Quest.objects.get(id=quest_id))
+	messages.success(request, "Subscribed")
+	return redirect('quest:quest', quest_id=quest_id, page_num='0')

set_session/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class SetSessionConfig(AppConfig):
+    name = 'set_session'

set_session/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

set_session/urls.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+"""
+set_session app URL configuration.
+"""
+from django.urls import path
+
+from . import views
+
+app_name = 'set_session'
+urlpatterns = [
+	path('', views.index, name='index'),
+]

set_session/views.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+"""
+/set_session app views.
+"""
+from django.http import HttpResponse
+from django.views.decorators.http import require_POST
+
+@require_POST
+def index(request):
+	"""
+	A simple API endpoint for setting certain values in the users session.
+	"""
+	for key, value in request.POST.items():
+		if key not in ['hide_header', 'hide_chat']:
+			continue
+		if value == 'on':
+			request.session[key] = True
+		elif value == 'off':
+			request.session[key] = False
+
+	return HttpResponse('true')

signup/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

static/base.css

@@ -55,30 +55,6 @@ a:hover {
 	padding-left: 0;
 }
 
-#subscriptions {
-	position: relative;
-	display: inline-block;
-}
-
-#subbtn {
-	width: 1.5em;
-	height: 1.5em;
-	background-color: orange;
-	border: none;
-}
-
-#subscriptionsContent {
-	display: none;
-	position: absolute;
-	background-color: #FAFAFA;
-	border: 1px solid #ccc;
-	min-width: 25em;
-}
-
-#subscriptions:hover #subscriptionsContent {
-	display: block;
-}
-
 #headerHidden {
 	width: 1em;
 	border-right: 1px solid #ccc;

static/base.js

@@ -1,6 +1,6 @@
 function toggle_cookie(cookie, state) {
 	let xhr = new XMLHttpRequest();
-	xhr.open('POST', api_url + '/set_session', true);
+	xhr.open('POST', set_session_url, true);
 	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
 	xhr.setRequestHeader('X-CSRFToken', csrf_token);
 	xhr.send(cookie + '=' + state);
@@ -17,15 +17,3 @@ function toggle_header() {
 		toggle_cookie('hide_header', 'off');
 	}
 }
-function clear_notification(msg_id) {
-	let xhr = new XMLHttpRequest();
-	xhr.open('POST', api_url + '/clear_notification', true);
-	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-	xhr.setRequestHeader('X-CSRFToken', csrf_token);
-	xhr.send('msg_id=' + msg_id);
-
-	let elem = document.getElementById('notification-' + msg_id);
-	elem.parentNode.removeChild(elem);
-	elem = document.getElementById('subbtn');
-	elem.innerText = elem.innerText - 1;
-}

titivillus/jinja2.py

@@ -8,15 +8,6 @@ from django.urls import reverse
 from django.utils.timezone import template_localtime
 from django.contrib.staticfiles.storage import staticfiles_storage
 
-def get_sub_msgs(**kwargs):
-	"""Returns all messages 'subscription' in the tag."""
-	messages = api.get_messages(**kwargs)
-	sub_msgs = []
-	for message in messages:
-		if 'subscription' in message.tags:
-			sub_msgs.insert(0, message)
-	return sub_msgs
-
 def environment(**options):
 	"""
 	Custom Jinja2 environment.
@@ -32,6 +23,5 @@ def environment(**options):
 		'static': staticfiles_storage.url,
 		'get_messages': api.get_messages,
 		'localtime': template_localtime,
-		'get_sub_msgs': get_sub_msgs,
 	})
 	return env

titivillus/urls.py

@@ -9,7 +9,7 @@ urlpatterns = [
 	path('', include('homepage.urls')),
 	path('admin/', admin.site.urls),
 	path('quest/', include('quest.urls')),
-	path('api/', include('api.urls')),
+	path('set_session/', include('set_session.urls')),
 	path('signup/', include('signup.urls')),
 	path('login/', include('login.urls')),
 	path('logout/', include('logout.urls')),

todo

@@ -14,4 +14,3 @@ Poll vote highlights entire option
 Total voters per poll
 Chat archives
 Adjust quote preview postioning
-Better API