Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions app/migrations/0003_auto_20200217_2236.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.0.3 on 2020-02-17 17:06

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('app', '0002_auto_20190829_1937'),
]

operations = [
migrations.AlterField(
model_name='tutorial',
name='tags',
field=models.ManyToManyField(to='app.Tag'),
),
]
33 changes: 33 additions & 0 deletions app/migrations/0004_auto_20200218_1116.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 2.2 on 2020-02-18 05:46

from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
('app', '0003_auto_20200217_2236'),
]

operations = [
migrations.AddField(
model_name='tutorial',
name='total_hit_count',
field=models.IntegerField(default=0),
),
migrations.AlterField(
model_name='tutorial',
name='tags',
field=models.ManyToManyField(to='app.Tag'),
),
migrations.CreateModel(
name='TutorialHitCount',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_date', models.DateTimeField(default=django.utils.timezone.now)),
('tutorial', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='app.Tutorial')),
],
),
]
15 changes: 15 additions & 0 deletions app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@ class Tutorial(models.Model):
category = models.CharField(max_length=20, choices=CATEGORIES)
created_date = models.DateTimeField(default=timezone.now)
publish = models.BooleanField(default=False)
total_hit_count = models.IntegerField(default=0)

def __str__(self):
return self.title

class TutorialHitCount(models.Model):
tutorial = models.ForeignKey(Tutorial, on_delete=models.DO_NOTHING)
created_date = models.DateTimeField(default=timezone.now)

def __str__(self):
return self.tutorial.title + '-' + str(self.created_date)

def save(self, *args, **kwargs):
if self.tutorial.publish:
self.tutorial.total_hit_count = self.tutorial.total_hit_count + 1
self.tutorial.save()
super().save(*args, **kwargs)

17 changes: 17 additions & 0 deletions app/templates/includes/tutorial-list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{% for tutorial in tutorials %}
<div class="box">
<a href="{% url 'app:tutorial_redirect' tutorial.pk %}" target="_blank" id="tutorial-tag">{{ tutorial.title }}</a>
<div class="tile">
{% for tag in tutorial.tags.all %}
<span class="tag">
<b><a href="{% url 'app:tag-links' tag %}" > 📌 {{ tag }}</a></b>
</span>&nbsp;
{% endfor %}
<button class="fa fa-share-alt is-pulled-right" id="shareIcon"
onclick='share("{{ tutorial.title }}","{{ tutorial.link }}")'></button>
</div>
<br>
<span class="tag is-medium" style="background-color: rgb(0, 196, 167); color: white;"><b>{{ tutorial.category }}</b>
</span>
</div>
{% endfor %}
18 changes: 1 addition & 17 deletions app/templates/latest.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,7 @@
<div class="section">
<h3 class="title">Latest in tutorialdb </h3>
<div class="container">
{% for tutorial in tutorials %}
<div class="box">
<a href="{{ tutorial.link }}" target="_blank" id="tutorial-tag">{{ tutorial.title }}</a>
<div class="tile">
{% for tag in tutorial.tags.all %}
<span class="tag">
<b><a href="{% url 'app:tag-links' tag %}" > 📌 {{ tag }}</a></b>
</span>&nbsp;
{% endfor %}
<button class="fa fa-share-alt is-pulled-right" id="shareIcon"
onclick='share("{{ tutorial.title }}","{{ tutorial.link }}")'></button>
</div>
<br>
<span class="tag is-medium" style="background-color: rgb(0, 196, 167); color: white;"><b>{{ tutorial.category }}</b>
</span>
</div>
{% endfor %}
{% include 'includes/tutorial-list.html'%}
</div>
</div>
{% else %}
Expand Down
18 changes: 1 addition & 17 deletions app/templates/search_results.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,7 @@
<h3 class="subtitle">Search Results for "{{ query }}"</h3>
<p>About {{ total }} results ({{ time }} seconds)</p><br>
<div class="container">
{% for tutorial in tutorials %}
<div class="box">
<a href="{{ tutorial.link }}" target="_blank" id="tutorial-tag">{{ tutorial.title }}</a>
<div class="tile">
{% for tag in tutorial.tags.all %}
<span class="tag">
<b><a href="{% url 'app:tag-links' tag %}" > 📌 {{ tag }}</a></b>
</span>&nbsp;
{% endfor %}
<button class="fa fa-share-alt is-pulled-right" id="shareIcon"
onclick='share("{{ tutorial.title }}","{{ tutorial.link }}")'></button>
</div>
<br>
<span class="tag is-medium" style="background-color: rgb(0, 196, 167); color: white;"><b>{{ tutorial.category }}</b>
</span>
</div>
{% endfor %}
{% include 'includes/tutorial-list.html'%}
</div>
</div>
<div class="section">
Expand Down
18 changes: 1 addition & 17 deletions app/templates/taglinks.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,7 @@ <h2 class="title is-4">Tutorials Tagged
</span>
</h2>
<div class="container">
{% for tutorial in tutorials %}
<div class="box">
<a href="{{ tutorial.link }}" target="_blank" id="tutorial-tag">{{ tutorial.title }}</a>
<div class="tile">
{% for tag in tutorial.tags.all %}
<span class="tag">
<b><a href="{% url 'app:tag-links' tag %}" > 📌 {{ tag }}</a></b>
</span>&nbsp;
{% endfor %}
<button class="fa fa-share-alt is-pulled-right" id="shareIcon"
onclick='share("{{ tutorial.title }}","{{ tutorial.link }}")'></button>
</div>
<br>
<span class="tag is-medium" style="background-color: rgb(0, 196, 167); color: white;"><b>{{ tutorial.category }}</b>
</span>
</div>
{% endfor %}
{% include 'includes/tutorial-list.html'%}
<div class="field">
<button class="button is-pulled-left" onclick="window.history.back();">❮ Go Back</button>
</div>
Expand Down
1 change: 1 addition & 0 deletions app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
urlpatterns = [
path('', HomePageView.as_view(), name='home'),
path('search/', views.search_query, name='search-results'),
path('tutorial/<int:pk>', views.tutorial_redirect, name='tutorial_redirect'),
path('api/', include('api.urls'), name='api'),
path('latest/', views.latest, name='latest'),
path('tags/', views.tags, name='tags'),
Expand Down
9 changes: 7 additions & 2 deletions app/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from django.core.cache import cache
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
from django.db.models import Q
from django.shortcuts import render
from django.shortcuts import render, redirect
from django.views.generic import TemplateView
from taggie.parser import generate_tags
from .models import Tag, Tutorial
from .models import Tag, Tutorial, TutorialHitCount
from . import cache_constants


Expand Down Expand Up @@ -101,6 +101,11 @@ def about(request):
"""about view"""
return render(request, 'about.html', {'title': 'About'})

def tutorial_redirect(request, pk):
tutorial = Tutorial.objects.get(pk=pk, publish=True)
TutorialHitCount.objects.create(tutorial=tutorial)
return redirect(tutorial.link)


class ContributeView(TemplateView):
"""view for the tutorial contribution page"""
Expand Down