Skip to content

Commit

Permalink
Data_entry
Browse files Browse the repository at this point in the history
  • Loading branch information
Shahriar-Tonmoy committed Sep 21, 2020
1 parent 2761e17 commit 10043a4
Show file tree
Hide file tree
Showing 145 changed files with 546 additions and 37 deletions.
7 changes: 5 additions & 2 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file modified artista/api/Serializers/__pycache__/UserSerializer.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/Serializers/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/ViewSets/__pycache__/ArtistArtViewSet.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/ViewSets/__pycache__/UserViewSet.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/ViewSets/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/api/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_artInfo/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_artInfo/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_artInfo/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_artInfo/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_artInfo/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_artInfo/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
21 changes: 1 addition & 20 deletions artista/app_artInfo/templates/all_reacted_art.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,7 @@
<div class="container my-5">
<div class="grid">
{% for data in allLovedArts %}
<!-- <div class="col-md-3 ">
<div class="card mx-1" >
<img class="card-img-top" src="{{ data.artist_art.image.url }}" alt="Card image cap">
<div class="card-body">
<h5 class="card-title">{{ data.artist_art.title }}</h5>
<p class="card-text">{{ data.artist_art.short_description }}</p>
<a href="{% url 'app_artInfo:artist_single_art_page' data.artist_art.uuid %}" class="card-link" >View Art</a>
</div>
</div>
</div> -->
<div class="grid-item ">
<!-- <div class="card mx-1" >
<img class="card-img-top" src="{{ data.image.url }}" alt="Card image cap">
<div class="card-body">
<h5 class="card-title">{{ data.title }}</h5>
<p class="card-text">{{ data.short_description }}</p>
<p class="card-text">view Count : {{ data.view_count }}</p>
<a href="{% url 'app_artInfo:artist_single_art_page' data.uuid %}" class="card-link" >View Art</a>
</div>
</div> -->
<a href="{% url 'app_artInfo:artist_single_art_page' data.artist_art.uuid %}">
<div class="post-img">

Expand All @@ -53,7 +34,7 @@ <h6>{{ data.artist_art.title }}</h6>


</div>
</a>


</div>
</a>
Expand Down
3 changes: 2 additions & 1 deletion artista/app_artInfo/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ def search__in(self, queryset, value, name):
queryset = queryset.filter(
Q(title__icontains=expression) |
Q(tags__icontains=expression) |
Q(short_description__icontains=expression)
Q(short_description__icontains=expression)|
Q(category__category_name__icontains=expression)
)
return queryset

Expand Down
Binary file modified artista/app_profileManagemant/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_profileManagemant/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_profileManagemant/__pycache__/forms.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_profileManagemant/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_profileManagemant/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/app_profileManagemant/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file modified artista/artist/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artist/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artist/__pycache__/forms.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artist/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artist/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artist/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artist/migrations/__pycache__/0001_initial.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file modified artista/artist/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
3 changes: 1 addition & 2 deletions artista/artist/templates/single_artist_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,8 @@ <h4 class="text-uppercase text-center">
<div class="row m-0 mb-5 py-5 review-box">
<div class="col flex-grow-0">

<a href="{% url 'app_artInfo:single_artist_info' data.user_reviewing.uuid %}">

<img class="profile-img img-small" src="{{ data.user_reviewing.avatar.url }}" alt="test">
</a>
</div>
<div class="col">
<h5 class="mb-3">{{ data.user_reviewing.display_name }}</h5>
Expand Down
Binary file modified artista/artistArt/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArt/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArt/__pycache__/forms.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArt/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArt/__pycache__/url_apis.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArt/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArt/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArt/__pycache__/views_api.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified artista/artistArt/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArtCategory/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArtCategory/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArtCategory/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArtCategory/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistArtCategory/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file modified artista/artistFollowing/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistFollowing/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistFollowing/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistFollowing/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artistFollowing/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified artista/artista/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artista/__pycache__/middleware.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artista/__pycache__/settings.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artista/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artista/__pycache__/utils.cpython-38.pyc
Binary file not shown.
Binary file modified artista/artista/__pycache__/wsgi.cpython-38.pyc
Binary file not shown.
Binary file modified artista/chat/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/chat/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/chat/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/client/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/client/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/client/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/client/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/client/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/client/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/dashboard/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/dashboard/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/dashboard/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/dashboard/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/dashboard/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/dashboard/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/db.sqlite3
Binary file not shown.
Binary file modified artista/forgotPass/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/forgotPass/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/forgotPass/__pycache__/forms.cpython-38.pyc
Binary file not shown.
Binary file modified artista/forgotPass/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/forgotPass/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified artista/forgotPass/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/forgotPass/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/getstart/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/getstart/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/getstart/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/getstart/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/getstart/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/login/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/login/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/login/__pycache__/forms.cpython-38.pyc
Binary file not shown.
Binary file modified artista/login/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/login/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file modified artista/login/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/register/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified artista/register/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified artista/register/__pycache__/apps.cpython-38.pyc
Binary file not shown.
Binary file modified artista/register/__pycache__/forms.cpython-38.pyc
Binary file not shown.
Binary file modified artista/register/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file modified artista/register/__pycache__/views.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified artista/register/migrations/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
6 changes: 3 additions & 3 deletions artista/register/templates/register_artist.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
{% block content %}

<div class="">
<div class="row mbl-reverse align-items-stretch fullscreen">
<div class="row mbl-reverse align-items-stretch fullscreen ">

<div class="col-md-5 p-5 d-flex align-items-center" data-aos="fade-right">
<div class="col-md-5 p-5 d-flex align-items-center ">
<div class="w-100 px-md-5">
<div class="text-center">
<img src="{% static 'images/Artista-logo.png' %}" alt="logo" class="form-logo">
Expand Down Expand Up @@ -44,7 +44,7 @@ <h5 class="text-center pb-4 text-uppercase font-weight-bold"> Create Account</h5
</form>
</div>
</div>
<div class="col-md-7 bg-regular" data-aos="fade-left" style="background-image: url({% static 'images/register-bg.jpg' %});"></div>
<div class="col-md-7 bg-regular" style="background-image: url({% static 'images/register-bg.jpg' %}); min-height: 300px;"></div>

</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions artista/register/templates/register_client.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

</style>
<div class="">
<div class="row mbl-reverese align-items-stretch fullscreen">
<div class="row mbl-reverse align-items-stretch fullscreen">

<div class="col-md-5 p-5 d-flex align-items-center" data-aos="fade-right">
<div class="col-md-5 p-5 d-flex align-items-center">
<div class="w-100 px-md-5">
<div class="text-center">
<img src="{% static 'images/Artista-logo.png' %}" alt="logo" class="form-logo">
Expand Down Expand Up @@ -46,7 +46,7 @@ <h5 class="text-center pb-4 text-uppercase font-weight-bold"> Create Account</h5
</form>
</div>
</div>
<div class="col-md-7 bg-regular" data-aos="fade-leftt" style="background-image: url({% static 'images/register-bg.jpg' %});"></div>
<div class="col-md-7 bg-regular" style="background-image: url({% static 'images/register-bg.jpg' %}); min-height: 300px;"></div>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion artista/static/css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion artista/static/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ input:-webkit-autofill:active {
-webkit-box-shadow: 0 0 0 30px white inset !important;
}
.fullscreen{
min-height: calc(100vh - 141px);
min-height: calc(100vh - 50px) !important;
}
.form-logo{
max-width: 18rem;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 10043a4

Please sign in to comment.