Skip to content

Commit 1d1c37b

Browse files
small code changes
1 parent 1fbce40 commit 1d1c37b

File tree

8 files changed

+22
-20
lines changed

8 files changed

+22
-20
lines changed
-19 Bytes
Binary file not shown.
27 Bytes
Binary file not shown.
10 Bytes
Binary file not shown.

gallery/loadFiles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class LoadFiles:
66

7-
PATH = "c:/Users/George/venv/myProjects/gallery-pic"
7+
PATH = "c:/Users/George/Pictures"
88

99
def __init__(self, path_to_scan = None):
1010
self.path_to_scan = path_to_scan if path_to_scan else self.PATH

gallery/pagination.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
class Pagination:
22

3-
MAX_ON_PAGE = 50
3+
MAX_ON_PAGE = 100
44

55
def __init__(self, last_page = None):
6-
self.__last_page = self.lastPageSetter(last_page, self.MAX_ON_PAGE)
7-
self.__next = self.nextSetter(self.__last_page, self.MAX_ON_PAGE)
8-
self.__prev = self.prevSetter(self.__last_page, self.MAX_ON_PAGE)
6+
self.__last_page = int(last_page) if last_page else 0
7+
self.nextSetter(self.__last_page, self.MAX_ON_PAGE)
8+
self.prevSetter(self.__last_page, self.MAX_ON_PAGE)
99

1010
@property
11-
def lastPage(self):
11+
def last_page(self):
1212
return self.__last_page
1313

1414
@property
@@ -19,16 +19,18 @@ def next(self):
1919
def prev(self):
2020
return self.__prev
2121

22-
# @prev.setter
23-
def lastPageSetter(self, value, max_pages):
24-
value = int(value) if value else max_pages
25-
return value if value > 0 else max_pages
22+
@last_page.setter
23+
def last_page(self):
24+
self.__last_page
2625

2726
# @next.setter
2827
def nextSetter(self, value, max_pages):
29-
return value + max_pages
28+
self.__next = int(int(value) + max_pages if value else max_pages)
29+
if self.__last_page == 0:
30+
self.__next = self.__next * 2
31+
self.__last_page = self.MAX_ON_PAGE
3032

3133
# @prev.setter
3234
def prevSetter(self, value, max_pages):
33-
prev_var = (value if value else 0) - max_pages
34-
return 0 if prev_var < 0 else prev_var
35+
prev_var = (int(value) if value else 0) - max_pages
36+
self.__prev = int(0 if prev_var < 0 else prev_var)

gallery/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
def index(request, last_item = None):
99
s = LoadFiles()
1010
r = Pagination(last_item)
11-
files = s.scanDirFunc()[r.prev:r.lastPage]
11+
files = s.scanDirFunc()[r.prev:int(r.last_page)]
1212
return render(request, 'index.html', {
1313
'complete_list': s.getFirstFile(files),
1414
'next': r.next,
@@ -19,7 +19,7 @@ def view(request, folder_name, last_item = None):
1919
s = LoadFiles()
2020
r = Pagination(last_item)
2121
return render(request, 'view.html', {
22-
'files_json': json.dumps(s.getPhotosFiles(folder_name)[r.prev:r.lastPage]),
22+
'files_json': json.dumps(s.getPhotosFiles(folder_name)[r.prev:r.last_page]),
2323
# 'files': json.dumps(s.getPhotosFiles(folder_name)[r.prev:r.lastPage]),
2424
'folder_name': folder_name,
2525
'next': r.next,

media/css/custom.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ body {
66
}
77

88
.ex2 {
9-
height: 388px;
9+
height: 200px;
1010
overflow: hidden;
1111
}
1212

1313
.ex3 {
14-
height: 50px;
14+
height: 40px;
1515
overflow: hidden;
1616
}
1717

templates/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<div id="app">
3737
<div class="row">
3838
{% for file in complete_list %}
39-
<div class="col-3 mb-2">
39+
<div class="col-3 mb-2 hover-overlay ripple shadow-1-strong rounded" data-mdb-ripple-color="light">
4040
<div class="ex2">
41-
<a target="_blank" href="{% url 'view_main' file.dir_name_encoded %}"><img width="250" src="{% static file.files_in_dir %}"></a>
41+
<a target="_blank" href="{% url 'view_main' file.dir_name_encoded %}"><img class="img-fluid rounded" src="{% static file.files_in_dir %}"></a>
4242
</div>
4343
<div class="ex3">
4444
<!-- <input v-model="checkedDirName"> -->
@@ -55,7 +55,7 @@
5555
</div>
5656
</div>
5757
<div style="background: #2a3744;">
58-
<div class="container mt-3" >
58+
<div class="container" >
5959
<div class="row pt-4 pl-3" >
6060
{% if prev != None %}
6161
<nav aria-label="...">

0 commit comments

Comments
 (0)