diff --git a/BH/settings.py b/BH/settings.py index 53d4c5d..558bcdb 100644 --- a/BH/settings.py +++ b/BH/settings.py @@ -34,7 +34,6 @@ INSTALLED_APPS = [ 'crispy_forms', 'crispy_bootstrap4', 'blog.apps.BlogConfig', - 'users.apps.UsersConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -80,11 +79,11 @@ WSGI_APPLICATION = 'BH.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': 'Name of the database Instance', - 'USER': 'USERNAME', - 'PASSWORD': 'PASSWORD of User', + 'NAME': 'BH', + 'USER': 'jukoga', + 'PASSWORD': '69420', 'HOST': 'localhost', - 'PORT': 'SET PORT NUMBER', + 'PORT': '3306', } } diff --git a/BH/urls.py b/BH/urls.py index 13801d3..ce5310a 100644 --- a/BH/urls.py +++ b/BH/urls.py @@ -20,7 +20,6 @@ from django.urls import path, include urlpatterns = [ path('', include('blog.urls')), - path('users/', include('users.urls')), path('admin/', admin.site.urls), ] diff --git a/blog/migrations/0002_delete_post.py b/blog/migrations/0002_delete_post.py new file mode 100644 index 0000000..0f93037 --- /dev/null +++ b/blog/migrations/0002_delete_post.py @@ -0,0 +1,16 @@ +# Generated by Django 5.0.2 on 2024-07-24 19:20 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0001_initial'), + ] + + operations = [ + migrations.DeleteModel( + name='Post', + ), + ] diff --git a/db.sqlite3 b/db.sqlite3 deleted file mode 100644 index 864b088..0000000 Binary files a/db.sqlite3 and /dev/null differ diff --git a/requirements.txt b/requirements.txt index 1d746c4..00e0c28 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/templates/base.html b/templates/base.html index 7cae3b3..476f3c9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -25,31 +25,6 @@ -
-
- -
{% block content %} diff --git a/templates/blog/blogDetail.html b/templates/blog/blogDetail.html index 9ea3223..73a5bbe 100644 --- a/templates/blog/blogDetail.html +++ b/templates/blog/blogDetail.html @@ -10,7 +10,7 @@

{{ object.content | markdown | safe }}

- By {{ object.author }} on {{ object.date_posted|date:"M j, o" }} + By on {{ object.date_posted|date:"M j, o" }}
diff --git a/templates/users/login.html b/templates/users/login.html deleted file mode 100644 index 32f4f16..0000000 --- a/templates/users/login.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load crispy_forms_tags %} -
-
- {% csrf_token %} -
-
- Login -
-
- {{ form | crispy }} -
- -
-
- - Don't Have An Account? Register - -
-
-
-
-{% endblock %} diff --git a/templates/users/logout.html b/templates/users/logout.html deleted file mode 100644 index d21303a..0000000 --- a/templates/users/logout.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load crispy_forms_tags %} -{% if messages %} -{% for message in messages %} -
{{ message }}
-{% endfor %} -{% endif %} -
-
-
- You have been Logged Out -
-
- Hope you enjoyed Today! - -
-
- - Go to Home or Log in Again? - -
-
-
-{% endblock %} diff --git a/templates/users/profile.html b/templates/users/profile.html deleted file mode 100644 index 3d7c056..0000000 --- a/templates/users/profile.html +++ /dev/null @@ -1,58 +0,0 @@ - - -{% extends 'base.html' %} -{% block content %} - - {% load markdown_extras %} - -
-
- -
-
-
-
- Latest Posts -
-
- {% for post in posts %} - {% if post.author == profileUser %} - -
-
-
{{ post.author.username }} @{{ post.author.id }}
-

{{ post.content | markdown | safe }}

- -
-
- - {% endif %} - {% endfor %} -
-
-
-
- - -
-
-
-
- Profile Image -
-
-

{{ profileUser.username }}

-

@{{ profileUser.id }}

-

Date Joined: Jan 1, 2022

- {% if profileUser == user %} - Edit Profile - {% endif %} -
-
-
-
- -
-
- -{% endblock %} diff --git a/templates/users/register.html b/templates/users/register.html deleted file mode 100644 index f79c17e..0000000 --- a/templates/users/register.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load crispy_forms_tags %} -
-
- {% csrf_token %} -
-
- Create an Account -
-
- {{ form | crispy }} -
- -
-
- - Already Have An Account? Sign In - -
-
-
-
-{% endblock %} \ No newline at end of file diff --git a/users/__init__.py b/users/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/users/admin.py b/users/admin.py deleted file mode 100644 index b5afd5a..0000000 --- a/users/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.contrib import admin -from .models import Profile - - -# Register your models here. diff --git a/users/apps.py b/users/apps.py deleted file mode 100644 index 0d276a3..0000000 --- a/users/apps.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.apps import AppConfig - - -class UsersConfig(AppConfig): - name = 'users' - - def ready(self): - import users.signals \ No newline at end of file diff --git a/users/forms.py b/users/forms.py deleted file mode 100644 index 17b30be..0000000 --- a/users/forms.py +++ /dev/null @@ -1,21 +0,0 @@ -from django import forms -from django.contrib.auth.models import User -from django.contrib.auth.forms import UserCreationForm -from .models import Profile - - -class UserRegisterForm(UserCreationForm): - email = forms.EmailField() - - class Meta: - model = User - fields = ['username', 'email', 'password1', 'password2'] - - -class UserUpdateForm(forms.ModelForm): - email = forms.EmailField() - - class Meta: - model = User - fields = ['username', 'email'] - diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py deleted file mode 100644 index f83696d..0000000 --- a/users/migrations/0001_initial.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 5.0.2 on 2024-07-06 16:24 - -import django.db.models.deletion -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Profile', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('about', models.TextField(default='Hi, I am new to TechBlog')), - ('gender', models.TextField(default='None')), - ('dob', models.DateField(default='1999-01-01')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/users/models.py b/users/models.py deleted file mode 100644 index 3802880..0000000 --- a/users/models.py +++ /dev/null @@ -1,16 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User - - -# Create your models here. -class Profile(models.Model): - user = models.OneToOneField(User, on_delete=models.CASCADE) - name = models.CharField(max_length=100) - about = models.TextField(default='Hi, I am new to TechBlog') - gender = models.TextField(default='None') - dob = models.DateField(default='1999-01-01') - # image = models.ImageField(default='default.png', name='profile_pic', upload_to='profile_pics') - - - def __str__(self): - return f"{self.user.username}'s Profile" diff --git a/users/signals.py b/users/signals.py deleted file mode 100644 index acb1b9e..0000000 --- a/users/signals.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db.models.signals import post_save -from django.contrib.auth.models import User -from django.dispatch import receiver diff --git a/users/tests.py b/users/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/users/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/users/urls.py b/users/urls.py deleted file mode 100644 index d90dc45..0000000 --- a/users/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.urls import path -from django.contrib.auth import views as login_view -from . import views - -urlpatterns = [ - path('profile/', views.profile, name='Profile'), - path('profile/', views.profile, name='NamedProfile'), - path('login/', login_view.LoginView.as_view(template_name='users/login.html'), name='Login'), - path('logout/', login_view.LogoutView.as_view(template_name='users/logout.html'), name='Logout'), - path('register/', views.register, name='Register') -] diff --git a/users/views.py b/users/views.py deleted file mode 100644 index b7b8940..0000000 --- a/users/views.py +++ /dev/null @@ -1,77 +0,0 @@ -from django.shortcuts import render, redirect -from django.contrib import messages -from django.contrib.auth.decorators import login_required -from .forms import UserRegisterForm -from blog.models import * -from .models import * -from django.views.generic import * - - -# Create your views here. -# def users(request): -# return render(request, 'users/users.html', {'title': 'Users'}) - -def getFromArr(arr, indices, *args, **kwargs): - x = [] - for i in indices: - x.append(arr[i]) - return x - - -@login_required -def profile(request, *args, **kwargs): - try: - user = User._default_manager.all()[kwargs['pk'] - 1] - except: - user = request.user - print(user.id) - - allow_empty = True - queryset = None - model = Post - paginate_by = None - paginate_orphans = 0 - context_object_name = 'posts' - ordering = ['-date_posted'] - - if queryset is not None: - queryset = queryset - if isinstance(queryset, QuerySet): - queryset = queryset.all() - elif model is not None: - queryset = model._default_manager.all() - else: - raise ImproperlyConfigured( - "%(cls)s is missing a QuerySet. Define " - "%(cls)s.model, %(cls)s.queryset, or override " - "%(cls)s.get_queryset()." % {"cls": self.__class__.__name__} - ) - - if ordering: - if isinstance(ordering, str): - ordering = (ordering,) - queryset = queryset.order_by(*ordering) - - return render(request, 'users/profile.html', {'title': 'Profile', 'profileUser': user, context_object_name: queryset}) - - -users = { - 'user': User.objects.all() -} - - -def login(request): - return render(request, 'users/login.html', {'title': 'Login'}) - - -def register(request): - if request.method == 'POST': - form = UserRegisterForm(request.POST) - if form.is_valid(): - form.save() - username = form.cleaned_data.get('username') - messages.success(request, f'{username}! Your account has been created.') - return redirect('Login') - else: - form = UserRegisterForm() - return render(request, 'users/register.html', {'title': 'Register', 'form': form})