diff --git a/accounts/__pycache__/__init__.cpython-37.pyc b/accounts/__pycache__/__init__.cpython-37.pyc
index eccf5e2a13550da4a41da1b441c8a99d7f5919c2..67e33fa41a04edd0b14429831cb595326765d126 100644
Binary files a/accounts/__pycache__/__init__.cpython-37.pyc and b/accounts/__pycache__/__init__.cpython-37.pyc differ
diff --git a/accounts/__pycache__/admin.cpython-37.pyc b/accounts/__pycache__/admin.cpython-37.pyc
index 0e09fdcfbfb405e59223c7bf8dfc7f6094d6aeaf..9d4fa6482548ae0cfa2ec0ff5afef9542041dda5 100644
Binary files a/accounts/__pycache__/admin.cpython-37.pyc and b/accounts/__pycache__/admin.cpython-37.pyc differ
diff --git a/accounts/__pycache__/models.cpython-37.pyc b/accounts/__pycache__/models.cpython-37.pyc
index 7c6292b87d4061b4197fcfd887e7bff9ccf4bf19..7a15529d353a2dbd4a2255c8cfe4834cde317bf0 100644
Binary files a/accounts/__pycache__/models.cpython-37.pyc and b/accounts/__pycache__/models.cpython-37.pyc differ
diff --git a/accounts/__pycache__/urls.cpython-37.pyc b/accounts/__pycache__/urls.cpython-37.pyc
index df585f663b15326b7fe91976cb3835c605419798..bd3addbe7f63cbeef32b7fe04cf1adab60fbc674 100644
Binary files a/accounts/__pycache__/urls.cpython-37.pyc and b/accounts/__pycache__/urls.cpython-37.pyc differ
diff --git a/accounts/__pycache__/views.cpython-37.pyc b/accounts/__pycache__/views.cpython-37.pyc
index a57848d2696180fbae3aeb0b1f19844a87bfc3a6..d1fd2acbfcf7521a9ae1eda43fefef9ccc7e2f1f 100644
Binary files a/accounts/__pycache__/views.cpython-37.pyc and b/accounts/__pycache__/views.cpython-37.pyc differ
diff --git a/accounts/migrations/__pycache__/__init__.cpython-37.pyc b/accounts/migrations/__pycache__/__init__.cpython-37.pyc
index 31f20cd4434a2928855e203203d06d0cc077c818..c82e28bba6d986345c2f64f4f37578a7f5ad83d9 100644
Binary files a/accounts/migrations/__pycache__/__init__.cpython-37.pyc and b/accounts/migrations/__pycache__/__init__.cpython-37.pyc differ
diff --git a/accounts/templates/accounts/login.html b/accounts/templates/accounts/login.html
index 64fe133588eedcd0019d4a1c08242a03f09a4d3d..1a50d6eb63f9a903b3033864d22e46860970ade1 100644
--- a/accounts/templates/accounts/login.html
+++ b/accounts/templates/accounts/login.html
@@ -12,7 +12,3 @@
</form>
<p>Not got an account? <a href="{% url 'accounts:signup' %}">Sign Up</a></p>
{% endblock %}
-
-
-
-#5 in the accounts url i want to use login url
diff --git a/accounts/templates/accounts/signup.html b/accounts/templates/accounts/signup.html
index 2a81b105d630eb4709c97db7b69c9c00b63d0d0b..c4021c843678fbd44b93441bc110c550209f0058 100644
--- a/accounts/templates/accounts/signup.html
+++ b/accounts/templates/accounts/signup.html
@@ -2,11 +2,9 @@
{% block content %}
<h1>Signup</h1>
- <form class="site-form" action="/accounts/signup/" method="post">
+ <form class="site-form" action="{% url 'accounts:signup' %}" method="post">
{% csrf_token %}
{{ form }}
<input type="submit" value="Signup">
</form>
-{% endblock %}
-
-#6 is the security csrf_token which server gets and knows that data is comming from your application
+{% endblock %}
\ No newline at end of file
diff --git a/accounts/urls.py b/accounts/urls.py
index 5ac094159a429f15c2127d808582d97bf68b79cb..0fd1256fef5b400c79996cbe39a99c5c2646facb 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -7,4 +7,4 @@ urlpatterns = [
url(r'^signup/$', views.signup_view, name="signup"),
url(r'^login/$', views.login_view, name="login"),
url(r'^logout/$', views.logout_view, name="logout"),
-]
+]
\ No newline at end of file
diff --git a/accounts/views.py b/accounts/views.py
index 391aa97a7eccffbf02113d1684072a95ca21920d..710a3347c50099d12a1b49765697d14433856389 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -21,7 +21,10 @@ def login_view(request):
# log the user in
user = form.get_user()
login(request, user)
- return redirect('articles:list')
+ if 'next' in request.POST:
+ return redirect(request.POST.get('next'))
+ else:
+ return redirect('articles:list')
else:
form = AuthenticationForm()
return render(request, 'accounts/login.html', { 'form': form })
@@ -29,10 +32,4 @@ def login_view(request):
def logout_view(request):
if request.method == 'POST':
logout(request)
- return redirect('articles:list')
-
-
-
-#user is varialbe in 22 which is going to retrieve the info of the user trying to login
-
- #on 10 and 21 we are not logging in the users but redirecting them
+ return redirect('articles:list')
\ No newline at end of file
diff --git a/articles/__pycache__/__init__.cpython-37.pyc b/articles/__pycache__/__init__.cpython-37.pyc
index 390612bd9f75cfa1447b1c5eb08623942c24509a..fc67c359c7e42816d3ff4bc432533ac075eafb80 100644
Binary files a/articles/__pycache__/__init__.cpython-37.pyc and b/articles/__pycache__/__init__.cpython-37.pyc differ
diff --git a/articles/__pycache__/admin.cpython-37.pyc b/articles/__pycache__/admin.cpython-37.pyc
index 98cfc9723b26a5696879ca6b9ea6d6512c01826e..1c5b9d369fbd53bba1fcdf3b3cbbf7c85cdaf1cc 100644
Binary files a/articles/__pycache__/admin.cpython-37.pyc and b/articles/__pycache__/admin.cpython-37.pyc differ
diff --git a/articles/__pycache__/forms.cpython-37.pyc b/articles/__pycache__/forms.cpython-37.pyc
index f0f620fa03949dc7005e4b36bfabbeb459568c37..a3447729af49629112dd2e3320200e60570aa177 100644
Binary files a/articles/__pycache__/forms.cpython-37.pyc and b/articles/__pycache__/forms.cpython-37.pyc differ
diff --git a/articles/__pycache__/models.cpython-37.pyc b/articles/__pycache__/models.cpython-37.pyc
index 25e683bfb970a20ec7f5ec27d9d7fa5ca36e15a7..82c561f6a0c04919808651aa65eb1f830149cd20 100644
Binary files a/articles/__pycache__/models.cpython-37.pyc and b/articles/__pycache__/models.cpython-37.pyc differ
diff --git a/articles/__pycache__/urls.cpython-37.pyc b/articles/__pycache__/urls.cpython-37.pyc
index f6bf1db572e69c31b6d3b5a3f2f8b346fbe7f8cc..f9de492cd4f36b108d4dd0804a927af6dc097907 100644
Binary files a/articles/__pycache__/urls.cpython-37.pyc and b/articles/__pycache__/urls.cpython-37.pyc differ
diff --git a/articles/__pycache__/views.cpython-37.pyc b/articles/__pycache__/views.cpython-37.pyc
index 53c38113ae4f1f0ee6fe612ebc942676d9b118db..26a0b68557c47b7c16a4345336a41f19e12452a0 100644
Binary files a/articles/__pycache__/views.cpython-37.pyc and b/articles/__pycache__/views.cpython-37.pyc differ
diff --git a/articles/admin.py b/articles/admin.py
index 93e0da20fb729ea2ebc02a86e7d7efe9a9d2ca03..dfb4a9cf0598c4c20464219e189af1c5cea6a3e6 100644
--- a/articles/admin.py
+++ b/articles/admin.py
@@ -1,17 +1,5 @@
-
from django.contrib import admin
from .models import Article, Comment
-class ArticleAdmin(admin.ModelAdmin):
- list_display = ('title', 'author')
- search_fields = ('title', 'content')
- prepopulated_fields = {'slug': ('title',)}
-
-admin.site.register(Article, ArticleAdmin)
-
-class CommentAdmin(admin.ModelAdmin):
- list_display = ('user', 'email', 'approved')
-
-admin.site.register(Comment, CommentAdmin)
-
-# Register your models here.
+admin.site.register(Article)
+admin.site.register(Comment)
diff --git a/articles/forms.py b/articles/forms.py
index babd23777b7aea2f2ecf47ba6201d8ff5de660ea..b172bc298eaaeaeaeb9cadc578c350f1474b87f6 100644
--- a/articles/forms.py
+++ b/articles/forms.py
@@ -1,9 +1,14 @@
from django import forms
-from .models import Article
-
+from . import models
+from .models import Article, Comment
+from django.contrib.auth.models import User
class CreateArticle(forms.ModelForm):
class Meta:
- model = Article
- fields = ['title', 'body', 'slug', 'thumb']
+ model = models.Article
+ fields = ['title', 'body', 'slug', 'thumb',]
+class CommentForm(forms.ModelForm):
+ class Meta:
+ model = Comment
+ fields = ('content',)
\ No newline at end of file
diff --git a/articles/migrations/0001_initial.py b/articles/migrations/0001_initial.py
index 5e2c09b848cbb02cfede91757c88118b4a505a90..f00b5f18644cd6137e9045e9a475fc75e6662e6a 100644
--- a/articles/migrations/0001_initial.py
+++ b/articles/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.1 on 2019-05-12 11:25
+# Generated by Django 2.2 on 2019-05-19 12:29
from django.db import migrations, models
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
name='Article',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title', models.CharField(max_length=30)),
+ ('title', models.CharField(max_length=100)),
('slug', models.SlugField()),
('body', models.TextField()),
('date', models.DateTimeField(auto_now_add=True)),
diff --git a/articles/migrations/0002_article_thumb.py b/articles/migrations/0002_article_thumb.py
index ceb57c2dd4072b2135a8cac08302ee750e84b392..fab11d0cdbbf73184395dec188028fd47d94d3f9 100644
--- a/articles/migrations/0002_article_thumb.py
+++ b/articles/migrations/0002_article_thumb.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.1 on 2019-05-18 23:16
+# Generated by Django 2.2 on 2019-06-02 10:59
from django.db import migrations, models
diff --git a/articles/migrations/__pycache__/0001_initial.cpython-37.pyc b/articles/migrations/__pycache__/0001_initial.cpython-37.pyc
index 5189c1b9377bcbc11b8c9fe6727a027910a5f9f7..0638003fad343903efe47b814392b7d25180e4b1 100644
Binary files a/articles/migrations/__pycache__/0001_initial.cpython-37.pyc and b/articles/migrations/__pycache__/0001_initial.cpython-37.pyc differ
diff --git a/articles/migrations/__pycache__/0002_article_thumb.cpython-37.pyc b/articles/migrations/__pycache__/0002_article_thumb.cpython-37.pyc
index 8bfce0719b792380e7cccf240825f94ef5743c06..6d02452dd51deefd477e390a2c10ecc86802b8ae 100644
Binary files a/articles/migrations/__pycache__/0002_article_thumb.cpython-37.pyc and b/articles/migrations/__pycache__/0002_article_thumb.cpython-37.pyc differ
diff --git a/articles/migrations/__pycache__/__init__.cpython-37.pyc b/articles/migrations/__pycache__/__init__.cpython-37.pyc
index c12a98dd9c8997a74c75f58a56bf28beedf023f3..f66341432c1c53036d9697a7aa75e092dd59ddac 100644
Binary files a/articles/migrations/__pycache__/__init__.cpython-37.pyc and b/articles/migrations/__pycache__/__init__.cpython-37.pyc differ
diff --git a/articles/models.py b/articles/models.py
index 15a1df6365f2f630e5f50a3c3f9b74c3a9b6ea56..b8cee1c464a03fae579fe4e1e48b9864cbf303d7 100644
--- a/articles/models.py
+++ b/articles/models.py
@@ -1,6 +1,4 @@
from django.db import models
-from django.utils import timezone
-
from django.contrib.auth.models import User
# Create your models here.
@@ -18,35 +16,13 @@ class Article(models.Model):
def snippet(self):
return self.body[:50] + '...'
-class Comment(models.Model):
- post = models.ForeignKey(Article, on_delete=models.SET_DEFAULT, default=1, related_name='comments')
- user = models.CharField(max_length=250)
- email = models.TextField()
- created = models.DateTimeField(auto_now_add=True)
- approved = models.BooleanField(default=False)
- def approved(self):
- self.approved = True
- self.save()
+class Comment(models.Model):
+ article = models.ForeignKey(Article, on_delete=models.PROTECT)
+ user = models.ForeignKey(User, on_delete=models.PROTECT)
+ content = models.TextField(max_length=150)
+ timestamp = models.DateTimeField(auto_now_add=True)
def __str__(self):
- return self.user
-
-
-
-
-
-
-#add in thumbnail later
-#add in author later
-
-#python manage.py makemigrations
-#python manage.py makemigrations
-#use the upper two commands whenever you make changes in the model
-#whenever we make channges to the models when need to migrate kit
-#11 theres alway error when you migrate so the fix is simply to add "on_delete=models.PROTECT"
-
+ return '{}.{}'.format(self.article.title, str(self.user.username))
-#we create a snippet which is a model whose function is to cut the number of words to let say 100
-#to add ... at the end
-#9 blank = true beacuse the if a doesnt want to upload anythingits ok
diff --git a/articles/templates/articles/article_create.html b/articles/templates/articles/article_create.html
index 8ed3ec8f5ccd5e4879e1b938c6865a73ac82bfd2..f2d84ad8bf243136e059f1bfd1b2ac3db7a67172 100644
--- a/articles/templates/articles/article_create.html
+++ b/articles/templates/articles/article_create.html
@@ -9,4 +9,17 @@
<input type="submit" value="Create">
</form>
</div>
+ <script src="/static/slugify.js"></script>
{% endblock %}
+
+
+<hr>
+<div class="main-comment-section">
+ {{ comments.count}} Comment{{ comments|pluralize }}
+ {% for comment in comments %}
+ <blockquote class="blockquote">
+ <p class="mb-0">{{ comment.content }}</p>
+ <footer class="blockquote-footer">by <cite title="Source Title">{{ comment.user|capfirst}}</cite></footer>
+</blockquote>
+ {% endfor %}
+</div>
\ No newline at end of file
diff --git a/articles/templates/articles/article_detail.html b/articles/templates/articles/article_detail.html
index 032e6803ba180fef7bf173a790fa999ac80229a9..c2d223bf4f6dffd969c35f93194b9e2df40c4b07 100644
--- a/articles/templates/articles/article_detail.html
+++ b/articles/templates/articles/article_detail.html
@@ -1,32 +1,34 @@
{% extends 'base_layout.html' %}
-{% block content%}
-<body>
- <div class="article-detail">
- <div class="article">
+{% block content %}
+<div class="article-detail">
+ <div class="article">
<img src="{{ article.thumb.url }}" />
<h2>{{ article.title }}</h2>
<p>{{ article.body }}</p>
<p>{{ article.date }}</p>
- </div>
</div>
+</div>
- <hr>
+<br><br>
+<hr>
- <h1>Leave a Comment</h1>
- <p>Total No of Comments {{post.comments.count}}</p>
- <a href="{% url 'articles:add_comment' slug=post.slug}">Leave A Comment</a>
- {% for comment in post.comments.all %}
- <p>{{comment.created}}</p>
- <p>{{comment.user}}</p>
- <p>{{comment.body}}</p>
- {% empty %}
- <p> There is no comment </p>
- {% endfor %}
-
+<form method="article">
+ {% csrf_token %}
+ {{ comment_form.as_p }}
+ <input type="submit" value = "submit" class="btn btn-outline-success">
+</form>
+<div class="main-comment-section">
+ {{ comments.count }} Comment{{ comments|pluralize }}
+ {% for comment in comments %}
+ <blockquote class="blockquote">
+ <p class="mb-0">{{ comments.content }}</p>
+ <footer class="blockquote-footer">by <cite title="Source Title">{{ comment.user|capfirst }}</cite></footer>
+ </blockquote>
+ {% endfor %}
+</div>
-<body/>
{% endblock %}
\ No newline at end of file
diff --git a/articles/templates/articles/article_list.html b/articles/templates/articles/article_list.html
index edf6c504c63e42164adc970ff4abf29783f705d4..ec167c19a5c159cd6e456bc03042eac7bc8afabe 100644
--- a/articles/templates/articles/article_list.html
+++ b/articles/templates/articles/article_list.html
@@ -1,5 +1,4 @@
{% extends 'base_layout.html' %}
-< !-- this file extends from base layout template -->
{% block content%}
<h1>Articles List</h1>
@@ -9,10 +8,8 @@
<h2><a href="{% url 'articles:detail' slug=article.slug %}">{{ article.title }}</a></h2>
<p>{{ article.snippet }}</p>
<p>{{ article.date }}</p>
+ <p class="author">added by {{ article.author.username }}</p>
</div>
{% endfor %}
</div>
-{% endblock %}
-
-< !-- extending a base template, a base template has all of the stuff eg header footer etc all goes in to the base template -->
-< !-- so that is how we extend template ie you dont have to add header and footer etc which are saved in base template -->
+{% endblock %}
\ No newline at end of file
diff --git a/articles/urls.py b/articles/urls.py
index 7067afcf48a86352a8d3726137239221161d4f5f..5f9e10edf6a5f433d13aee80c3cc69464e3eda89 100644
--- a/articles/urls.py
+++ b/articles/urls.py
@@ -1,16 +1,10 @@
from django.conf.urls import url
-from .import views
+from . import views
app_name = 'articles'
urlpatterns = [
url(r'^$', views.article_list, name="list"),
url(r'^create/$', views.article_create, name="create"),
-
-
-]
-
-#?P<slug> this whole thing a name capturing group
-#\w is anynumber or any alphabet then - then + for any length and then $ for end
-#7 naming so that all may be different eg naming = list
-#8 #here we get slug from views.py and use here
+ url(r'^(?P<slug>[\w-]+)/$', views.article_detail, name="detail"),
+]
\ No newline at end of file
diff --git a/articles/views.py b/articles/views.py
index 0ff1b6b407986e0a1c8d22f8e77fcc1f63a7a539..a4170ec67b192d85833b34e67cd111f4fe5a2973 100644
--- a/articles/views.py
+++ b/articles/views.py
@@ -1,10 +1,9 @@
-from django.http import HttpResponse
-from django.shortcuts import render, redirect
-from .models import Article
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render, get_object_or_404, redirect
+from .models import Article, Comment
from django.contrib.auth.decorators import login_required
-from .import forms
-
-
+from . import forms
+from .forms import *
def article_list(request):
articles = Article.objects.all().order_by('date');
@@ -12,8 +11,25 @@ def article_list(request):
def article_detail(request, slug):
# return HttpResponse(slug)
- article = Article.objects.get(slug=slug)
- return render(request, 'articles/article_detail.html', { 'article': article })
+ article = get_object_or_404(Article, slug=slug)
+ comments = Comment.objects.filter(article=article)
+ if request.method=="POST":
+ comment_form = CommentForm(request.POST or None)
+ if comment_form.is_valid():
+ content = request.POST.get('content')
+ Comment.objects.create(article=article, user=request.user, content=content)
+ Comment.save()
+ return HttpResponseRedirect(article.get_absolute_url())
+ else:
+ comment_form= CommentForm()
+
+
+ context = {
+ 'article' : article,
+ 'comments' : comments,
+ #'comment_form' : comment_form,
+ }
+ return render(request, 'articles/article_detail.html', context)
@login_required(login_url="/accounts/login/")
def article_create(request):
@@ -27,19 +43,4 @@ def article_create(request):
return redirect('articles:list')
else:
form = forms.CreateArticle()
- return render(request, 'articles/article_create.html', { 'form': form })
-
-
-
-
-
-
-#this variable 'articles' saves all objects in Article and by .order by it sorts it by
-#field date which is already an element in models.py under Article
-
- #third parameter in this render function is the data that we want to send to the view
-#or template,inside curly brackets we write a Dictionary,"articles" is the property here,whereas the articles on the right is articles on the 7th line,
-#this Dictionary will be sended to the template
-#so when we render line 9 we display at the output the data
-#we cature that slug vairable and use it in url.py url of slug
- # return HttpResponse(slug)
+ return render(request, 'articles/article_create.html', { 'form': form })
\ No newline at end of file
diff --git a/assets/styles.css b/assets/styles.css
index 0993bcb0648092c8fd8d69f2145e70a3604b631b..99e634814c4ceccb7e4fcde45e62525dbe1cbeaf 100644
--- a/assets/styles.css
+++ b/assets/styles.css
@@ -18,3 +18,87 @@ a, a:hover, a:visited{
color: #fff;
text-decoration: none;
}
+
+.wrapper{
+ max-width: 960px;
+ margin: 0 auto;
+}
+
+div.wrapper > h1{
+ text-align: center;
+ margin: 100px auto;
+ font-size: 2.4em
+}
+
+header{
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ padding: 20px 0;
+}
+
+nav{
+ justify-self: end;
+}
+
+nav li{
+ display: inline-block;
+ list-style-type: none;
+ margin-left: 20px;
+}
+
+nav button{
+ background: none;
+ color: #fff;
+ cursor: pointer;
+ border: 0;
+ font-size: 16px;
+}
+
+.articles{
+ display: grid;
+ grid-template-columns: 1fr 1fr 1fr;
+ grid-gap: 30px;
+}
+
+.article{
+ padding: 10px;
+ border: 1px solid #00dba0;
+ position: relative;
+ padding-bottom: 40px;
+}
+
+.article h2{
+ font-size: 1.2em;
+}
+
+.article .author{
+ padding: 10px;
+ background: #00dba0;
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ margin: 0;
+ color: #0f121f;
+}
+
+.article-detail .article{
+ padding: 0;
+}
+
+.article-detail .article img{
+ max-width: 100%;
+}
+
+.article-detail .article h2{
+ text-align: center;
+ margin: 20px auto;
+ font-size: 2em
+}
+
+.article-detail .article h3{
+ text-align: center;
+}
+
+.article-detail .article p{
+ margin: 10px 20px
+}
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
index 358f7aaeb9e62fb50c5b9c721b2c6dbeec05cf7c..f01b350e969d312554a2f1bed08c16683f19353b 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/manage.py b/manage.py
index 65c07359b99278a0cf71b0c2bf8903ecd603f472..6bb37612456276332f61afdbc5239141f310147b 100644
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@ import sys
def main():
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djangonautic.settings')
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myproject.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
diff --git a/templates/about.html b/templates/about.html
index 1b0ec713dfa4afa77d4ed9386aa498e8e55bff88..c1131b8c4b26dfb5d835dd3736cd71d381628fe0 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -1,72 +1,11 @@
<!DOCTYPE html>
-<html lang="en" dir="ltr">
- <head>
- <meta charset="utf-8">
- <meta name="viewport" content="width-device-width">
- <meta name="description" content="Articles and Published Blogs">
- <meta name="keywords" content="web design, fitness , meditation , professional, others">
- <meta name="author" content="Saif Ali">
- <title>Blogs| About</title>
- <link rel="stylesheet" href="./css/style.css">
- </head>
- <body>
-<header>
- <div class="container">
- <div id="branding">
- <h1><span class="highlight">Articles</span> and Blogs</h1>
- </div>
- <nav>
- <ul>
- <li ><a href="index.html">Home</a></li>
- <li class="current"><a href="About.html">About</a></li>
- <li><a href="Services.html">Services</a></li
- <li><a href="login.html">Login</a></li>
- </ul>
- </nav>
- </div>
-</header>
-
-
- <section id="newsletter">
- <div class="container">
- <h1>Subscribe to our Blogs</h1>
- <form>
- <input type="email" placeholder="Enter Username....">
- <button type="submit" class="button_1">Subscribe</button>
- </form>
-
- </div>
-
- </section>
-
- <section id="main">
-<div class="container">
- <article id="main-col">
- <h1 class="page-title">About Us</h1>
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec aliquet, enim tincidunt tristique lacinia, ex sapien ultrices nulla, nec rhoncus sem sapien ac risus. Sed dignissim est quis mi molestie mattis. Integer sollicitudin pellentesque lorem, id sollicitudin arcu dapibus vitae. Pellentesque sit amet dolor sed odio euismod ultrices vel in diam. Nullam euismod lectus non ex auctor pulvinar. Praesent a lorem pharetra, vestibulum lacus in, luctus diam. Mauris nibh odio, mollis in tincidunt ac, lobortis quis mi. Pellentesque vestibulum venenatis felis eu condimentum. Praesent enim nulla, eleifend sit amet mauris in, luctus aliquet dolor. Nullam vulputate mattis imperdiet. Vestibulum augue nisi, aliquet in lectus sit amet, tincidunt tempus diam. Vivamus ac magna nunc. Sed sit amet pellentesque risus. Mauris sodales in eros mattis egestas.
-</p>
-<p class="dark">
-Pellentesque est tortor, tempus quis erat sit amet, dictum interdum arcu. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce fermentum interdum venenatis. Etiam ac nisi libero. Suspendisse est magna, vulputate eu efficitur sit amet, ullamcorper vitae ex. Donec hendrerit eros nunc, sed vulputate leo pellentesque sed. Vestibulum rutrum bibendum lacus sit amet dictum. Proin eget lorem vel felis feugiat accumsan. Nam et lobortis velit.
-</p>
-
-
- </article>
- <aside id="sidebar">
-<div class="dark">
-<h3>What We Do</h3>
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec aliquet, enim tincidunt tristique lacinia, ex sapien ultrices nulla, nec rhoncus .
- </p>
- </div>
- </aside>
- </div>
-
- </section>
-
-<footer>
- <p>Tech-Science Blog, Copyright © 2019</p>
-</footer>
-
-
-
- </body>
-</html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>About</title>
+</head>
+<body>
+ <h1>About us</h1>
+ <p1>We are Django blog developers</p1>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/base_layout.html b/templates/base_layout.html
index b9696e7fd85eae33456382833f170d53fe1ecd55..36cb0232967428d2d93e348b2a3cc90d3bad83d6 100644
--- a/templates/base_layout.html
+++ b/templates/base_layout.html
@@ -1,160 +1,34 @@
{% load static from staticfiles %}
<!DOCTYPE html>
-<html lang="en">
-<title>W3.CSS Template</title>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
-<link rel="stylesheet" href="https://www.w3schools.com/lib/w3-theme-black.css">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-<style>
-html,body,h1,h2,h3,h4,h5,h6 {font-family: "Roboto", sans-serif;}
-.w3-sidebar {
- z-index: 3;
- width: 250px;
- top: 43px;
- bottom: 0;
- height: inherit;
-}
-</style>
-<body>
-
-<!-- Navbar -->
-<div class="w3-top">
- <div class="w3-bar w3-theme w3-top w3-left-align w3-large">
- <a class="w3-bar-item w3-button w3-right w3-hide-large w3-hover-white w3-large w3-theme-l1" href="javascript:void(0)" onclick="w3_open()"><i class="fa fa-bars"></i></a>
- <a href="#" class="w3-bar-item w3-button w3-theme-l1">Home</a>
- <a href="about/" class="w3-bar-item w3-button w3-hide-small w3-hover-white">About</a>
- <a href="articles/" class="w3-bar-item w3-button w3-hide-small w3-hover-white">Articles</a>
- <a href="#" class="w3-bar-item w3-button w3-hide-small w3-hover-white">News</a>
- <a href="#" class="w3-bar-item w3-button w3-hide-small w3-hover-white">Contact</a>
- <a href="#" class="w3-bar-item w3-button w3-hide-small w3-hide-medium w3-hover-white">Clients</a>
- <a href="#" class="w3-bar-item w3-button w3-hide-small w3-hide-medium w3-hover-white">Partners</a>
- <a href="/accounts/signup" class="w3-bar-item w3-button w3-hide-small w3-hide-medium w3-hover-white w3-right">Sign Up</a>
- <a href="accounts/login/" class="w3-bar-item w3-button w3-hide-small w3-hide-medium w3-hover-white w3-right">Sign In</a>
- <a href="logout/" class="w3-bar-item w3-button w3-hide-small w3-hide-medium w3-hover-white w3-right">logout</a>
- </div>
-</div>
-
-<!-- Sidebar -->
-<!--<nav class="w3-sidebar w3-bar-block w3-collapse w3-large w3-theme-l5 w3-animate-left" id="mySidebar">
- <a href="javascript:void(0)" onclick="w3_close()" class="w3-right w3-xlarge w3-padding-large w3-hover-black w3-hide-large" title="Close Menu">
- <i class="fa fa-remove"></i>
- </a>
- <h4 class="w3-bar-item"><b>Menu</b></h4>
- <a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
- <a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
- <a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
- <a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
-</nav> -->
-
-
-<div class="wrapper">
- {% block content %}
- {% endblock %}
-</div>
-
-<!-- Overlay effect when opening sidebar on small screens -->
-<div class="w3-overlay w3-hide-large" onclick="w3_close()" style="cursor:pointer" title="close side menu" id="myOverlay"></div>
-
-<!-- Main content: shift it to the right by 250 pixels when the sidebar is visible -->
-<div class="w3-main" style="margin-left:250px">
-
- <div class="w3-row w3-padding-64">
- <div class="w3-twothird w3-container">
- <h1 class="w3-text-teal">Heading</h1>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum
- dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
- </div>
- <div class="w3-third w3-container">
- <p class="w3-border w3-padding-large w3-padding-32 w3-center">AD</p>
- <p class="w3-border w3-padding-large w3-padding-64 w3-center">AD</p>
- </div>
- </div>
-
- <div class="w3-row">
- <div class="w3-twothird w3-container">
- <h1 class="w3-text-teal">Heading</h1>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum
- dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
- </div>
- <div class="w3-third w3-container">
- <p class="w3-border w3-padding-large w3-padding-32 w3-center">AD</p>
- <p class="w3-border w3-padding-large w3-padding-64 w3-center">AD</p>
- </div>
- </div>
-
- <div class="w3-row w3-padding-64">
- <div class="w3-twothird w3-container">
- <h1 class="w3-text-teal">Heading</h1>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum
- dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
- </div>
- <div class="w3-third w3-container">
- <p class="w3-border w3-padding-large w3-padding-32 w3-center">AD</p>
- <p class="w3-border w3-padding-large w3-padding-64 w3-center">AD</p>
- </div>
- </div>
-
- <!-- Pagination -->
- <div class="w3-center w3-padding-32">
- <div class="w3-bar">
- <a class="w3-button w3-black" href="#">1</a>
- <a class="w3-button w3-hover-black" href="#">2</a>
- <a class="w3-button w3-hover-black" href="#">3</a>
- <a class="w3-button w3-hover-black" href="#">4</a>
- <a class="w3-button w3-hover-black" href="#">5</a>
- <a class="w3-button w3-hover-black" href="#">»</a>
- </div>
- </div>
-
- <footer id="myFooter">
- <div class="w3-container w3-theme-l2 w3-padding-32">
- <h4>Footer</h4>
- </div>
-
- <div class="w3-container w3-theme-l1">
- <p>Powered by <a href="https://www.w3schools.com/w3css/default.asp" target="_blank">w3.css</a></p>
- </div>
- </footer>
-
-<!-- END MAIN -->
-</div>
-
-<script>
-// Get the Sidebar
-var mySidebar = document.getElementById("mySidebar");
-
-// Get the DIV with overlay effect
-var overlayBg = document.getElementById("myOverlay");
-
-// Toggle between showing and hiding the sidebar, and add overlay effect
-function w3_open() {
- if (mySidebar.style.display === 'block') {
- mySidebar.style.display = 'none';
- overlayBg.style.display = "none";
- } else {
- mySidebar.style.display = 'block';
- overlayBg.style.display = "block";
- }
-}
-
-// Close the sidebar with the close button
-function w3_close() {
- mySidebar.style.display = "none";
- overlayBg.style.display = "none";
-}
-</script>
-
-</body>
-</html>
-
-
-
-<!-- this serves as a base and will appear in all and every template-->
-
-<!-- this base template will appeearr everywhere -->
-
-<!-- 1. by this we dont have to change the source attribute,and thats a better way to load style -->
-<!-- 11. if there were two detail urls is in two different apps..django knows to look in articles url -->
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Djangonauts</title>
+ <link rel="stylesheet" href="{% static 'styles.css' %}">
+ </head>
+ <body>
+ <header class="wrapper">
+ <h1><a href="{% url 'articles:list' %}"><img src="{% static 'logo.png' %}" alt="djangonautic" /></a></h1>
+ <nav>
+ <ul>
+ {% if user.is_authenticated %}
+ <li>
+ <form class="logout-link" action="{% url 'accounts:logout' %}" method="post">
+ {% csrf_token %}
+ <button type="submit">Logout</button>
+ </form>
+ </li>
+ <li><a href="{% url 'articles:create' %}" class="highlight">New Article</a></li>
+ {% else %}
+ <li><a href="{% url 'accounts:login' %}">Login</a></li>
+ <li><a href="{% url 'accounts:signup' %}">Signup</a></li>
+ {% endif %}
+ </ul>
+ </nav>
+ </header>
+ <div class="wrapper">
+ {% block content %}
+ {% endblock %}
+ </div>
+ </body>
+</html>
\ No newline at end of file