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
Binary file modified moto_user/.DS_Store
Binary file not shown.
47 changes: 0 additions & 47 deletions moto_user/migrations/0001_initial.py

This file was deleted.

44 changes: 0 additions & 44 deletions moto_user/migrations/0002_initial.py

This file was deleted.

Empty file removed moto_user/migrations/__init__.py
Empty file.
7 changes: 1 addition & 6 deletions moto_user/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,10 @@ class MotoUser(AbstractUser):
favorite_recipes = models.ManyToManyField('recipe.Recipe', symmetrical=False, related_name='+', blank=True)

avatar = models.ImageField(
default='/images/avatar/default.png',
upload_to='images/avatar/',
verbose_name='Avatar',
null=True
)

def __str__(self):
return self.display_name


def image_url(self):
if self.avatar and hasattr(self.avatar, 'url'):
return self.avatar.url
6 changes: 5 additions & 1 deletion moto_user/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from . import views



urlpatterns = [
path('profile/<int:user_id>/', views.MotoUserView, name='MotoUserView'),
path('edit/profile/<int:user_id>/', views.EditProfileView, name='EditProfileView'),
Expand All @@ -11,5 +12,8 @@
path("unfavorite_recipe/<int:recipe_pk>/", views.Remove_Favorite_Recipe, name='RemoveFaveRecipe'),
path("follow/<int:user_id>/", views.Follow_View, name='FollowView'),
path("unfollow/<int:user_id>/", views.Unfollow_View, name='UnfollowView'),
path('following/all/<int:user_id>/', views.Following_View, name='FollowingList')
path('following/all/<int:user_id>/', views.Following_View, name='FollowingList'),
path('favorites/all/<int:user_id>/', views.Favorites_View, name='FavoritesList'),
path('explore_users/<int:user_id>/', views.All_Users, name='AllUsers')

]
14 changes: 12 additions & 2 deletions moto_user/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
from .models import MotoUser
from .forms import EditProfileForm


# Create your views here.


def MotoUserView(request, user_id: int):

avatar = request.FILES
profile = MotoUser.objects.get(id=user_id)
return render(request, 'profile.html', {"profile": profile})
posts = Post.objects.filter(user=user_id)
return render(request, 'profile.html', {"profile": profile, "avatar": avatar, "posts": posts})


def EditProfileView(request, user_id: int):
Expand Down Expand Up @@ -114,3 +116,11 @@ def Unfollow_View(request, user_id: int):
def Following_View(request, user_id: int):
following = request.user.following.exclude(following=user_id)
return render(request, 'following.html', {'following': following})

def Favorites_View(request, user_id: int):
MotoUserView(request, user_id=user_id)
return render(request, 'favorites.html')

def All_Users(request, user_id:int):
all_users = MotoUser.objects.all().exclude(id=user_id)
return render(request, 'all_users.html',{'all_users':all_users})
7 changes: 2 additions & 5 deletions motogram/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True

# if DEBUG is False:
# ALLOWED_HOSTS = [
# '127.0.0.1:8000',
# # '*',
# ]
ALLOWED_HOSTS = []


# Application definition

Expand Down
28 changes: 0 additions & 28 deletions notification/migrations/0001_initial.py

This file was deleted.

77 changes: 0 additions & 77 deletions post/migrations/0001_initial.py

This file was deleted.

6 changes: 4 additions & 2 deletions post/urls.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from post.views import index, NewPost
from post.views import index, NewPost, post_detail_view
from django.urls import path

urlpatterns = [
path('', index, name='index'),
path('newpost/', NewPost, name='newpost')
path('newpost/', NewPost, name='newpost'),
path('post_detail/<int:post_id>/', post_detail_view)

]
7 changes: 6 additions & 1 deletion post/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

@login_required
def index(request):
avatar = request.FILES
posts = Post.objects.all().order_by('-id')
template = loader.get_template('index.html')
context = {'post_items': posts, }
context = {'post_items': posts, 'avatar': avatar }
return HttpResponse(template.render(context, request))


Expand Down Expand Up @@ -51,3 +52,7 @@ def handler404(request, exception, template_name="404.html"):

def handler500(request, *args, **argv):
return render(request, '500.html', status=500)

def post_detail_view(request, post_id:int):
post = Post.objects.get(id=post_id)
return render(request, 'post_detail.html',{'post':post})
39 changes: 0 additions & 39 deletions recipe/migrations/0001_initial.py

This file was deleted.

7 changes: 7 additions & 0 deletions templates/all_users.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% extends 'base.html' %}{% load static %} {% block content %}
<div>
{% for each in all_users %}
<h6><a href="/user/profile/{{each.id}}/">{{each.display_name}}</a></h6>
{%endfor%}
</div>
{% endblock content %}
Loading