3 Commits

Author SHA1 Message Date
moscap
6869c3e6ba AUTH form were added to gui 2021-04-22 10:18:17 +03:00
moscap
d46867a03e 'nts' 2021-04-22 08:10:36 +03:00
moscap
9fd811363a Initial commit by moscap 2021-04-19 12:57:31 +03:00
23 changed files with 99 additions and 1470 deletions

6
.gitignore vendored
View File

@@ -65,10 +65,6 @@ target/
*.jsl *.jsl
*.db *.db
tmp* tmp*
test_*
.env* .env*
venv* venv*
# Doit
*.bak
*.dat
*.dir

View File

@@ -15,4 +15,4 @@ repos:
rev: 3.9.0 rev: 3.9.0
hooks: hooks:
- id: flake8 - id: flake8
args: ["--ignore=E203,W503,FI10,FI11,FI12,FI13,FI14,FI15,FI16,FI17,FI58,E501", "--builtins=_"] args: ["--ignore=E203,W503,FI10,FI11,FI12,FI13,FI14,FI15,FI16,FI17,FI58,E501"]

View File

@@ -32,14 +32,8 @@
## Как запустить проект ## Как запустить проект
### Frontend ### Frontend
Интерфейс на русском языке
```bash ```bash
python3 -m frontend python3 todo_tk.py
```
Интерфейс на английском языке
```bash
LANG=eng python3 -m frontend
``` ```
### backend ### backend
@@ -59,8 +53,3 @@ docker-compose up
```bash ```bash
docker-compose exec web python manage.py makemigrations backend docker-compose exec web python manage.py makemigrations backend
``` ```
Для запуска тестов использовать
```bash
docker-compose run -e DJANGO_SETTINGS_MODULE=backend.settings web pytest --cov=backend
```

View File

@@ -1,3 +0,0 @@
[run]
omit =
backend/migrations/*

View File

@@ -28,7 +28,7 @@ DEBUG = True
ALLOWED_HOSTS = [] ALLOWED_HOSTS = []
if DEBUG: if DEBUG:
ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1", "ALLOWED_HOSTS", "testserver"] ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"]
# Application definition # Application definition

View File

@@ -15,7 +15,7 @@ from .api import router
schema_view = get_schema_view( schema_view = get_schema_view(
openapi.Info( openapi.Info(
title="ToDo List", title="ToDo List",
default_version="v1", default_version='v1',
description="Swagger Interface for ToDo List", description="Swagger Interface for ToDo List",
), ),
public=True, public=True,
@@ -28,5 +28,5 @@ urlpatterns = [
path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"), path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
path("api/", include(router.urls)), path("api/", include(router.urls)),
path("api-auth/", include("rest_framework.urls", namespace="rest_framework")), path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
path("swagger/", schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui"), path('swagger/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
] ]

View File

@@ -1,5 +1,3 @@
pytest==6.2.3
pytest-cov==2.11.1
djangorestframework==3.12.4 djangorestframework==3.12.4
django-filter==2.4.0 django-filter==2.4.0
markdown==3.3.4 markdown==3.3.4

View File

@@ -1,3 +0,0 @@
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()

View File

@@ -1,154 +0,0 @@
from django.urls import reverse
from rest_framework import status
from rest_framework.test import APITestCase
from django.contrib.auth.models import User
from .test_todo import create_todo
class ItemTest(APITestCase):
"""Tests API for items."""
def prepare(self):
user = User.objects.create_user("test_user4", "test@test.com", "test_password")
self.client.force_authenticate(user=user)
to_do_id_1 = create_todo(self.client, "ToDoList1").data["id"]
to_do_id_2 = create_todo(self.client, "ToDoList2").data["id"]
return to_do_id_1, to_do_id_2
def get(self, expected_titles, todo_id=None, finished=None):
url = reverse("ToDoItems-list")
data = {}
if finished is not None:
data["finished"] = finished
if todo_id is not None:
data["parent"] = todo_id
response = self.client.get(url, data, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
real_titles = [(d["text"], d["parent"]) for d in response.data["results"]]
self.assertEqual(real_titles, expected_titles)
if finished is not None:
item_status = [data["finished"] for data in response.data["results"]]
self.assertEqual(finished, all(item_status))
def post(self, item_text, todo_id, finished=None):
url = reverse("ToDoItems-list")
if finished is not None:
data = {"text": item_text, "parent": todo_id, "finished": finished}
else:
data = {"text": item_text, "parent": todo_id}
response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
check_finished = False if (finished is None) else finished
self.assertEqual(response.data["text"], item_text)
self.assertEqual(response.data["parent"], todo_id)
self.assertEqual(response.data["finished"], check_finished)
return response.data["id"], response.data["finished"]
def get_by_id(self, id, text, finished, parent):
url_with_id = reverse("ToDoItems-detail", args=(id,))
response = self.client.get(url_with_id, {id: id}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["text"], text)
self.assertEqual(response.data["finished"], finished)
self.assertEqual(response.data["parent"], parent)
def put(self, id, text, parent, finished=None):
url_with_id = reverse("ToDoItems-detail", args=(id,))
data = {"text": text, "parent": parent}
if finished is not None:
data["finished"] = finished
response = self.client.put(url_with_id, data, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["text"], text)
self.assertEqual(response.data["parent"], parent)
if finished is not None:
self.assertEqual(response.data["finished"], finished)
def patch(self, id, text=None, finished=None, parent=None):
url_with_id = reverse("ToDoItems-detail", args=(id,))
data = {}
if text is not None:
data["text"] = text
if finished is not None:
data["finished"] = finished
if parent is not None:
data["parent"] = parent
response = self.client.patch(url_with_id, data, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
if text is not None:
self.assertEqual(response.data["text"], text)
if finished is not None:
self.assertEqual(response.data["finished"], finished)
if parent is not None:
self.assertEqual(response.data["parent"], parent)
def delete(self, id, title, finished, to_do_id):
self.get_by_id(id, title, finished, to_do_id)
url_with_id = reverse("ToDoItems-detail", args=(id,))
response = self.client.delete(url_with_id, {}, format="json")
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
def test_create_delete(self):
"""
/todo_items/: get, post (create)
/todo_items/{id}/: get (read), delete
"""
to_do_id_1, to_do_id_2 = self.prepare()
self.get([], to_do_id_1)
item_text_1, item_text_2, item_text_3, item_text_4 = "Item1", "Item2", "Item3", "Item4"
item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1)
self.get([(item_text_1, to_do_id_1)], to_do_id_1)
item_id_2, item_finished_2 = self.post(item_text_2, to_do_id_1, finished=False)
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1)
item_id_3, item_finished_3 = self.post(item_text_3, to_do_id_1, finished=True)
self.get(
[(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)],
to_do_id_1,
)
item_id_4, item_finished_4 = self.post(item_text_4, to_do_id_2, finished=False)
self.get(
[
(item_text_1, to_do_id_1),
(item_text_2, to_do_id_1),
(item_text_3, to_do_id_1),
(item_text_4, to_do_id_2),
]
)
self.get(
[(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)],
to_do_id_1,
)
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1, finished=False)
self.get([(item_text_3, to_do_id_1)], to_do_id_1, finished=True)
self.get_by_id(item_id_1, item_text_1, item_finished_1, to_do_id_1)
self.get_by_id(item_id_2, item_text_2, item_finished_2, to_do_id_1)
self.get_by_id(item_id_3, item_text_3, item_finished_3, to_do_id_1)
self.delete(item_id_3, item_text_3, item_finished_3, to_do_id_1)
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1)
def test_update(self):
"""
/todo_items/{id}/: put (update), patch (partial_update)
"""
to_do_id_1, to_do_id_2 = self.prepare()
item_text_1 = "Item1"
item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1)
item_text_1_2 = "Item5"
self.put(item_id_1, item_text_1_2, to_do_id_2)
self.put(item_id_1, item_text_1_2, to_do_id_2, finished=False)
self.put(item_id_1, item_text_1_2, to_do_id_2, finished=True)
item_text_1_3 = "Item6"
self.patch(item_id_1, parent=to_do_id_1)
self.patch(item_id_1, finished=True)
self.patch(item_id_1, text=item_text_1_3)

View File

@@ -1,85 +0,0 @@
from django.urls import reverse
from rest_framework import status
from rest_framework.test import APITestCase
from django.contrib.auth.models import User
def create_todo(client, title):
url = reverse("ToDoLists-list")
response = client.post(url, {"title": title}, format="json")
return response
class ToDoTest(APITestCase):
"""Tests API for todo."""
def get(self, expected_titles):
url = reverse("ToDoLists-list")
response = self.client.get(url, {}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
real_titles = [data["title"] for data in response.data["results"]]
self.assertEqual(real_titles, expected_titles)
def post(self, to_do_title):
response = create_todo(self.client, to_do_title)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.data["title"], to_do_title)
return response.data["id"]
def get_by_id(self, id, expected_title):
url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.get(url_with_id, {id: id}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["title"], expected_title)
def put(self, id, new_title):
url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.put(url_with_id, {"title": new_title}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["title"], new_title)
def patch(self, id, new_title):
url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.patch(url_with_id, {"title": new_title}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["title"], new_title)
def delete(self, id, title):
self.get_by_id(id, title)
url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.delete(url_with_id, {}, format="json")
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
def prepare(self):
user = User.objects.create_user("test_user", "test@test.com", "test_password")
self.client.force_authenticate(user=user)
def test_create_delete(self):
"""
lists/{id}/: put (update), patch (partial_update)
"""
self.prepare()
to_do_title_1 = "ToDoList1"
to_do_id1 = self.post(to_do_title_1)
self.put(to_do_id1, "ToDoList11")
self.patch(to_do_id1, "ToDoList12")
def test_todo(self):
"""
lists/: get, post
lists/{id}/: get, delete
"""
self.prepare()
self.get([])
to_do_title_1, to_do_title_2 = "ToDoList1", "ToDoList2"
to_do_id1 = self.post(to_do_title_1)
self.get([to_do_title_1])
to_do_id2 = self.post(to_do_title_2)
self.get([to_do_title_1, to_do_title_2])
self.get_by_id(to_do_id1, to_do_title_1)
self.get_by_id(to_do_id2, to_do_title_2)
self.delete(to_do_id2, to_do_title_2)
self.get([to_do_title_1])

19
dodo.py
View File

@@ -1,19 +0,0 @@
#!usr/bin/env python3
"""
"""
def task_mo():
"""Create bynary wheel distribution"""
return {
"actions": [
"""pybabel compile -D todo -i frontend/po/eng/LC_MESSAGES/todo.po -o frontend/po/eng/LC_MESSAGES/todo.mo"""
],
"file_dep": ["frontend/po/eng/LC_MESSAGES/todo.po"],
"targets": ["frontend/po/eng/LC_MESSAGES/todo.mo"],
}
def task_wheel():
"""Create bynary wheel distribution"""
return {"actions": ["python3 -m build -w"], "task_dep": ["mo"]}

View File

View File

@@ -1,8 +0,0 @@
#!/usr/bin/env python3
"""django-todo application launcher"""
from .todo_tk import Application
if __name__ == "__main__":
app = Application()
app.main(app.login())

View File

@@ -1,333 +0,0 @@
from types import SimpleNamespace
import urllib
import requests
DEFAULT_URL = "http://127.0.0.1:8000"
API_TODO_ITEMS_LIST = "api/todo_items/"
API_TODO_ITEMS_CREATE = "api/todo_items/"
API_TODO_ITEMS_READ = "api/todo_items/{0}/"
API_TODO_ITEMS_UPDATE = "api/todo_items/{0}/"
API_TODO_ITEMS_PARTIAL_UPDATE = "api/todo_items/{0}/"
API_TODO_ITEMS_DELETE = "api/todo_items/{0}/"
API_LISTS_LIST = "api/lists/"
API_LISTS_CREATE = "api/lists/"
API_LISTS_READ = "api/lists/{0}/"
API_LISTS_UPDATE = "api/lists/{0}/"
API_LISTS_PARTIAL_UPDATE = "api/lists/{0}/"
API_LISTS_DELETE = "api/lists/{0}/"
API_TOKEN_CREATE = "api/token/"
API_TOKEN_REFRESH = "api/token/refresh/"
class UserApi(object):
def __init__(self, url=DEFAULT_URL, token=None):
"""
Constructor
Parameters
----------
url : str, optional
Server url. The default is DEFAULT_URL.
token : dict, optional
Existing user tokens to bypass authorization.
The default is None.
Returns
-------
None.
"""
self.token = token
self.get_api = lambda x: urllib.parse.urljoin(url, x)
# ToDo - store tokens in config
def auth(self, user, passwd):
"""
Authosization
Parameters
----------
user : str
Login.
passwd : str
Password.
Returns
-------
dict
Generated auth token.
"""
token = UserApi._raise_or_return_(
requests.post(
url=self.get_api(API_TOKEN_CREATE), json={"username": user, "password": passwd}
)
)
self.token = SimpleNamespace(**token)
return self.token
def refresh(self):
"""
Refresh existing token
"""
token = UserApi._raise_or_return_(
requests.post(url=self.get_api(API_TOKEN_REFRESH), json={"refresh": self.token.refresh})
)
self.token.access = token["access"]
return self.token
def lists_list(self, **argv):
"""
List all the exsiting to-do lists.
Auth required
Returns
-------
list
to-do lists.
"""
return UserApi._raise_or_return_(
requests.get(
url=self.get_api(API_LISTS_LIST), headers=self._access_token_(), params=argv
)
)
def lists_create(self, title="Untitled"):
"""
Create a new to-do list
Auth required
Parameters
----------
title : str, optional
New list name. The default is "Untitled".
"""
return UserApi._raise_or_return_(
requests.post(
url=self.get_api(API_LISTS_CREATE),
json={"title": title},
headers=self._access_token_(),
)
)
def lists_delete(self, id):
"""
Auth required
Deletes a to-do list by id
Parameters
----------
id: to-do list id to delete
"""
return UserApi._raise_or_return_(
requests.delete(
url=self.get_api(API_LISTS_DELETE.format(id)),
headers=self._access_token_(),
)
)
def lists_update(self, title, id):
"""
Rename a new to-do list
Auth required
Parameters
----------
title : str
New name for a list.
id : int
"""
return UserApi._raise_or_return_(
requests.put(
url=self.get_api(API_LISTS_UPDATE.format(id)),
json={"title": title},
headers=self._access_token_(),
)
)
def todo_items_list(self, **argv):
"""
List all the exsiting to-do items.
Auth required
Returns
-------
list
to-do items.
"""
return UserApi._raise_or_return_(
requests.get(
url=self.get_api(API_TODO_ITEMS_LIST), headers=self._access_token_(), params=argv
)
)
def todo_items_create(self, parent, text="Note"):
"""
Create a new to-do item
Auth required
Parameters
----------
parent : id of parent list
text : str, optional
New note. The default is "Note".
"""
return UserApi._raise_or_return_(
requests.post(
url=self.get_api(API_TODO_ITEMS_CREATE),
json={"text": text, "parent": parent, "finished": False},
headers=self._access_token_(),
)
)
def todo_items_delete(self, id):
"""
Auth required
Deletes a to-do item by id
Parameters
----------
id: to-do item id to delete
"""
return UserApi._raise_or_return_(
requests.delete(
url=self.get_api(API_TODO_ITEMS_DELETE.format(id)),
headers=self._access_token_(),
)
)
def todo_items_update(self, id, text, finished, parent):
"""
Rename a new to-do list
Auth required
Parameters
----------
id : int
Note id
text : str
New note for the item.
finished : bool
New state for the item
parent : int
Parent list id
"""
return UserApi._raise_or_return_(
requests.put(
url=self.get_api(API_TODO_ITEMS_UPDATE.format(id)),
json={"text": text, "finished": finished, "parent": parent},
headers=self._access_token_(),
)
)
# def create(self, title="Untitled"):
# """
# Create a new to-do list
# Auth required
# Parameters
# ----------
# title : str, optional
# New list name. The default is "Untitled".
# """
# response = requests.post(
# url=self.get_api(API_LISTS_CREATE), json={"title": title}, headers=self._access_token_()
# url=self.get_api(API_TODO_ITEMS_CREATE), json={"title": title}, headers=self._access_token_()
# )
# response.raise_for_status()
# return response.json()
# def read(self, id):
# """
# Read a to-do list contents
# Parameters
# ----------
# id : int
# List id.
# Returns
# -------
# list
# Requested contents
# """
# response = requests.post(
# url=self.get_api(API_LISTS_READ).format(id), headers=self._access_token_()
# )
# response.raise_for_status()
# return response.json()
# def update(self, id, title="Untitled"):
# """
# Add a to-do item to the list
# Parameters
# ----------
# id : int
# List id.
# title : str, optional
# To-do item title. The default is "Untitled".
# """
# response = requests.put(
# json={"title": title},
# url=self.get_api(API_LISTS_UPDATE).format(id),
# headers=self._access_token_(),
# )
# response.raise_for_status()
# return response.json()
# def partial_update(self, id, title="Untitled"):
# """
# Update list item - untrusted
# """
# response = requests.patch(
# json={"title": title},
# url=self.get_api(API_LISTS_PARTIAL_UPDATE).format(id),
# headers=self._access_token_(),
# )
# response.raise_for_status()
# return response.json()
# def delete(self, id):
# """
# Delete list
# Parameters
# ----------
# id : int
# List id to delete.
# """
# response = requests.delete(
# url=self.get_api(API_LISTS_DELETE).format(id), headers=self._access_token_()
# )
# response.raise_for_status()
# return response.json()
def _access_token_(self):
if self.token is None:
raise RuntimeError("Authosization required for requested operation!")
return {"Authorization": f"Bearer {self.token.access}"}
@staticmethod
def _raise_or_return_(response):
response.raise_for_status()
try:
return response.json()
except Exception as e:
print(e)
return response.content

View File

@@ -1,50 +0,0 @@
import random
from .user import User
def print_lists(lists):
for item in lists:
print(
f"List: '{item.title}'", f"Id: {item.id}", "|", "|".join([str(x) for x in item.items_])
)
DEFAULT_URL = "http://127.0.0.1:8000"
user = User(url=DEFAULT_URL)
user.auth("root", "root")
user.refresh()
# Fetch existing lists:
print_lists(user.fetchUserLists())
# Append a new list to user:
print("Appending list...")
scroll = user.appendUserList(title="a new list!")
print_lists(user.fetchUserLists())
# Modify list 0:
print("Modifyng list...")
user.lists_[0].modify(title=f"A new title №{random.random()}")
print_lists(user.fetchUserLists())
# Append item to list:
print("Appending item to last list...")
item = user.lists_[-1].append(text="this is an item")
print_lists(user.fetchUserLists())
# Modifying item
print("Modifyng appended item...")
item.modify(finished=True, text="this is an updated item")
print_lists(user.fetchUserLists())
# Removing item at from last list
print("Removing the last item from the last list...")
user.lists_[-1].remove(-1)
print_lists(user.fetchUserLists())
# Remove user list by id:
i = user.lists_[0].id
print(f"Removing {i}...")
user.removeUserList(i)
print_lists(user.fetchUserLists())

View File

@@ -1,93 +0,0 @@
import gettext
import os
import tkinter as tk
from .user import User
from . import message
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
class LoginFrame(tk.Frame):
loggedIn = False
def __init__(self, master=None, url=None) -> None:
"""
Функция инициаизации класса
"""
super().__init__(master)
# Иницализируем параметры окна
self.master = master
self.pack(fill=tk.BOTH, expand=1)
# self.grid(row=0, column=0, sticky=tk.N + tk.S + tk.E + tk.W)
# tk.Grid.rowconfigure(master, 0, weight=1)
# tk.Grid.columnconfigure(master, 0, weight=1)
# Иницализируем параметры пользователя
self.user = User(url=url)
# Настраиваем размеры и включаем иницализацию
self.initAUTH()
def login_clicked(self) -> None:
"""
Функция авторизации
"""
try:
self.user.auth(self.login.get(), self.password.get())
self.loggedIn = True
except Exception as ex:
print(ex)
message.invalid_login()
# Если захочется реализовать в логине
"""
@property
def remember(self):
return self.rbtn_var.get()
"""
def initAUTH(self) -> None:
"""
Создает окно авторизации программы
"""
# Конфигурируем сетку
for rows in range(25):
tk.Grid.rowconfigure(self, rows, weight=1)
for columns in range(25):
tk.Grid.columnconfigure(self, columns, weight=1)
# Подпись и поле ввода для логина
t = _("Введите логин")
login_label = tk.Label(self, text=t)
login_label.grid(row=9, column=12, columnspan=3, rowspan=1, sticky="nsew")
self.login = tk.Entry(self)
self.login.grid(row=10, column=12, columnspan=3, rowspan=1, sticky="nsew")
# Подпись и поле ввода для пароля
password_label = tk.Label(self, text=_("Введите пароль"))
password_label.grid(row=11, column=12, columnspan=3, rowspan=1, sticky="nsew")
self.password = tk.Entry(self, show="*")
self.password.grid(row=12, column=12, columnspan=3, rowspan=1, sticky="nsew")
# Кнопка авториазции
btn = tk.Button(self, text=_("Войти"), command=self.login_clicked)
btn.grid(row=14, column=12, columnspan=3, rowspan=1, sticky="nsew")
# Если захочется реализовать в логине
"""
# Запомнить пользователя
self.rbtn_var = tk.IntVar(value=0)
rbtn = tk.Checkbutton(
self,
text="Запомнить меня",
variable=self.rbtn_var,
command=None
)
rbtn.grid(row=15, column=12, columnspan=3, rowspan=1, sticky="nsew")
"""

View File

@@ -1,24 +0,0 @@
import gettext
import os
from tkinter import messagebox as mb
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
TITLE_INFO_BOX = _("Сообщение!")
MESSAGE_INVALID_LOGIN = _("Неправильный логин или пароль")
MESSAGE_EMPTY = _("Сдесь могло быть ваше сообщение")
def infobox(msg: str = None) -> None:
"""
Показывает передаваемое сообщение в messagebox
:param msg: передаваемое сообщение
"""
if msg is None:
msg = MESSAGE_EMPTY
mb.showinfo(TITLE_INFO_BOX, msg)
def invalid_login():
infobox(MESSAGE_INVALID_LOGIN)

View File

@@ -1,83 +0,0 @@
# English (United States) translations for PROJECT.
# Copyright (C) 2021 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
#
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-06-06 23:42+0300\n"
"PO-Revision-Date: 2021-06-07 00:24+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en_US\n"
"Language-Team: en_US <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.8.1\n"
#: todo_tk.py:20
msgid "Приложение для планирования"
msgstr "ToDo Application"
#: message.py:6
msgid "Сообщение!"
msgstr "Message!"
#: message.py:7
msgid "Неправильный логин или пароль"
msgstr "Wrong login or password"
#: message.py:8
msgid "Сдесь могло быть ваше сообщение"
msgstr "This could have been your message"
#: login.py:63
msgid "Введите логин"
msgstr "Enter your username"
#: login.py:71
msgid "Введите пароль"
msgstr "Enter your password"
#: login.py:78
msgid "Войти"
msgstr "Enter"
#: workspace.py:17
msgid "Не реализовано"
msgstr "Not implemented"
#: workspace.py:25
msgid "Текст"
msgstr "Text"
#: workspace.py:28
msgid "Выполнено"
msgstr "Done"
#: workspace.py:31
msgid "Создано"
msgstr "Created"
#: workspace.py:60
msgid "Удалить"
msgstr "Delete"
#: workspace.py:88
msgid "Добавить заметку"
msgstr "Add note"
#: workspace.py:91
msgid "Удалить лист"
msgstr "Delete list"
#: workspace.py:149
msgid "Запомнить меня"
msgstr "Remember me"
#: workspace.py:158
msgid "Добавить лист"
msgstr "Add list"

View File

@@ -1,70 +1,113 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import gettext
import os
import sys import sys
import tkinter as tk import tkinter as tk
from .login import LoginFrame from tkinter import messagebox as mb
from .workspace import WorkSpaceFrame from user import User
from .user import User
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po")) if 'win' in sys.platform.lower():
if "win" in sys.platform.lower():
DEFAULT_URL = "http://localhost:8000" DEFAULT_URL = "http://localhost:8000"
else: else:
DEFAULT_URL = "http://0.0.0.0:8000" DEFAULT_URL = "http://0.0.0.0:8000"
BASE_W = 900 BASE_W = 580
BASE_H = 400 BASE_H = 400
TITLE_APP = _("Приложение для планирования")
class Application(tk.Frame):
def __init__(self,
master=None
) -> None:
"""
Функция инициаизации класса
"""
super().__init__(master)
class Application(tk.Tk): #Иницализируем параметры окна
def __init__(self): self.master = master
super().__init__() self.pack(fill=tk.BOTH, expand=1)
self.center_window()
self.title(TITLE_APP)
def login(self): self.grid(row=0, column=0, sticky=tk.N + tk.S + tk.E + tk.W)
"""Возвращает пользователя - его можно потом сериализовать""" tk.Grid.rowconfigure(master, 0, weight=1)
# Пользователь сохранен! Авторизация не нужна! tk.Grid.columnconfigure(master, 0, weight=1)
try:
user = User.load()
if user is not None:
return user
except Exception as e:
print("Failed to restore login:", e)
# Не удалось - нужен логин
self.frame = LoginFrame(master=self, url=DEFAULT_URL)
while not self.frame.loggedIn:
self.update_idletasks()
self.update()
self.frame.destroy()
# Нужно запомнить пользователя
# if self.frame.remember:
# self.frame.user.save()
return self.frame.user
def main(self, user): # Иницализируем параметры пользователя
self.frame = WorkSpaceFrame(master=self, user=user) self.user = User(url=DEFAULT_URL)
self.mainloop()
def center_window(self, width: str = BASE_W, heigh: str = BASE_H) -> None: # Настраиваем размеры и включаем иницализацию
self.centerWindow()
self.initAUTH()
def centerWindow(self,
width: str = BASE_W,
heigh: str = BASE_H
) -> None:
""" """
Центрирует приложение по центру экрана Центрирует приложение по центру экрана
:param width: ширина окна :param width: ширина окна
:param heigh: высота окна :param heigh: высота окна
""" """
sw = self.winfo_screenwidth() sw = self.master.winfo_screenwidth()
sh = self.winfo_screenheight() sh = self.master.winfo_screenheight()
x = (sw - width) / 2 x = (sw - width) / 2
y = (sh - heigh) / 2 y = (sh - heigh) / 2
self.geometry("%dx%d+%d+%d" % (width, heigh, x, y)) self.master.geometry('%dx%d+%d+%d' % (width, heigh, x, y))
def login_clicked(self) -> None:
"""
Функция авторизации
"""
try:
self.user.auth(self.login.get(), self.password.get())
except Exception as ex:
print(ex)
self.show_info()
def show_info(selfб,
msg: str = None
) -> None:
"""
Показывает передаваемое сообщение в messagebox
:param msg: передаваемое сообщение
"""
if msg is None:
msg = "Неправильный логин или пароль"
mb.showinfo("Информация", msg)
def initAUTH(self) -> None:
"""
Создает окно авторизации программы
"""
#Конфигурируем сетку
for rows in range(25):
tk.Grid.rowconfigure(self, rows, weight=1)
for columns in range(25):
tk.Grid.columnconfigure(self, columns, weight=1)
# Подпись и поле ввода для логина
login_label = tk.Label(self, text="Введите логин")
login_label.grid(row=9, column=12, columnspan=3, rowspan=1, sticky="nsew")
self.login = tk.Entry(self)
self.login.grid(row=10, column=12, columnspan=3, rowspan=1, sticky="nsew")
# Подпись и поле ввода для пароля
password_label = tk.Label(self, text="Введите пароль")
password_label.grid(row=11, column=12, columnspan=3, rowspan=1, sticky="nsew")
self.password = tk.Entry(self, show="*")
self.password.grid(row=12, column=12, columnspan=3, rowspan=1, sticky="nsew")
# Кнопка авториазции
btn = tk.Button(self, text="Войти", command=self.login_clicked)
btn.grid(row=14, column=12, columnspan=3, rowspan=1, sticky="nsew")
if __name__ == "__main__": if __name__ == "__main__":
app = Application() master = tk.Tk()
app.main(app.login()) app = Application(master)
app.master.title("ToDo")
app.mainloop()

View File

@@ -1,252 +0,0 @@
import os
import random
from datetime import datetime
from types import SimpleNamespace
from pathlib import Path
import json
from .api import UserApi
LIST_UPDATEBLE = ["title"]
TODO_ITEM_UPDATEBLE = ["text", "finished"]
UPDATE_ERROR = "Failed to update property: {0}"
DATETIME_STR = "%Y-%m-%dT%H:%M:%S.%fZ"
USER_TOKEN_PATH = os.path.join(Path.home(), ".todo_config.json")
def bad_arguments(x, d):
return list((set(x) - set(d)))
def date_or_str(inpt):
if type(inpt) is datetime:
return inpt
elif type(inpt) is str:
return datetime.strptime(inpt, DATETIME_STR)
else:
return datetime.now()
class ToDoList(object):
def __init__(self, id, title, created_at=None, items=None, parent=None, user=None):
self.id = id
self.title = title
self.items_ = [] if items is None else items
self.created_at = date_or_str(created_at)
self.user = user
def __iter__(self):
for item in self.items_:
yield item
def __getitem__(self, index):
return self.items_[index]
def __len__(self):
return len(self.items_)
def __str__(self):
return f"[{self.id}] {self.title}"
def index(self, value):
return self.items_.index(value)
def remove(self, index):
"""
Remove item AT INDEX from db
"""
item = self.items_[index]
self.items_.remove(item)
item.dispose()
def append(self, text):
"""
Add a new item to db
"""
if "DEBUG" in os.environ:
created_item = ToDoItem(id=random.randint(100, 1000), text=text, user=self.user)
else:
created_item = self.user.todo_items_create(parent=self.id, text=text)
created_item = ToDoItem(**created_item, user=self.user)
self.items_.append(created_item)
return created_item
def modify(self, **argv):
bad = bad_arguments(argv.keys(), LIST_UPDATEBLE)
if len(bad) > 0:
raise RuntimeError(UPDATE_ERROR.format(bad[0]))
for key, value in argv.items():
setattr(self, key, value)
self.sync()
def dispose(self):
print(f"To-do list id '{self.id}' is being disposed of...")
for item in self.items_:
item.dispose()
if "DEBUG" in os.environ:
return
self.user.lists_delete(self.id)
def sync(self):
print(f"Item '{self}' is being synchronized...")
if "DEBUG" in os.environ:
return
self.user.lists_update(title=self.title, id=self.id)
class ToDoItem(object):
def __init__(self, id, text, finished=False, created_at=None, parent=None, user=None):
self.id = id
self.text = text
self.finished = finished
self.created_at = date_or_str(created_at)
self.parent = parent
self.user = user
def __str__(self):
return f"[{self.id}] {self.text}"
def modify(self, **argv):
bad = bad_arguments(argv.keys(), TODO_ITEM_UPDATEBLE)
if len(bad) > 0:
raise RuntimeError(UPDATE_ERROR.format(bad[0]))
for key, value in argv.items():
setattr(self, key, value)
self.sync()
def dispose(self):
print(f"To-do item id '{self.id}' is being disposed of...")
if "DEBUG" in os.environ:
return
self.user.todo_items_delete(self.id)
def sync(self):
print(f"Item '{self}' is being synchronized...")
if "DEBUG" in os.environ:
return
self.user.todo_items_update(
id=self.id, text=self.text, finished=self.finished, parent=self.parent
)
def make_debug_lists():
return [
ToDoList(
id=i,
title=f"List {i}",
created_at=datetime.now(),
items=[
ToDoItem(id=i * 10 + j, text=f"Item {i*10+j}", created_at=datetime.now())
for j in range(10)
],
)
for i in range(10)
]
class User(UserApi):
def auth(self, user, passwd):
"""
Basic authentification
"""
if "DEBUG" in os.environ:
return
return UserApi.auth(self, user, passwd)
def remove(self):
"""
Remove the login file from homedir
"""
if "DEBUG" in os.environ:
print("Debug mode is on - no login storing")
return
if not os.path.exists(USER_TOKEN_PATH):
return
try:
os.remove(USER_TOKEN_PATH)
except Exception as e:
raise RuntimeError("Failed to remove tokens:", e)
def save(self):
"""
Store user token in homedir
"""
if "DEBUG" in os.environ:
print("Debug mode is on - no login storing")
return
try:
with open(USER_TOKEN_PATH, "w") as handler:
json.dump(self.token.__dict__, handler)
except Exception as e:
raise RuntimeError("Failed to store tokens:", e)
@staticmethod
def load():
"""
Restore user token from the file in homedir
"""
if "DEBUG" in os.environ:
raise RuntimeError("Debug mode is on - no login storing")
if os.path.exists(USER_TOKEN_PATH):
try:
with open(USER_TOKEN_PATH, "r") as handler:
user = User(token=SimpleNamespace(**json.load(handler)))
user.refresh()
return user
except Exception as e:
raise RuntimeError("Failed to restore tokens:", e)
return None
# Storing lists - mostly for debug purposes
lists_ = make_debug_lists()
def fetchUserLists(self):
"""
Fetch existing user lists from the server
returns: fetched list of ToDoList sorted by creation datetime
"""
print("Fetching lists...")
if "DEBUG" in os.environ:
return self.lists_
user_lists = self.lists_list()["results"]
user_items = self.todo_items_list()["results"]
todo_lists = {x["id"]: ToDoList(**x, user=self) for x in user_lists}
todo_items = [ToDoItem(**x, user=self) for x in user_items]
for todo_item in todo_items:
# Catching stray items
# if not hasattr(toDoItem, "parent"):
# toDoItem.dispose()
# continue
todo_lists[todo_item.parent].items_.append(todo_item)
for todo_list in todo_lists.values():
todo_list.items_ = sorted(todo_list.items_, key=lambda x: x.created_at)
self.lists_ = sorted(todo_lists.values(), key=lambda x: x.created_at)
return self.lists_
def removeUserList(self, id):
"""
Remove existing user to-do list BY ID from the serverreturns:
"""
to_remove = [item for item in self.lists_ if item.id == id][0]
self.lists_.remove(to_remove)
# if not ("DEBUG" in os.environ):
to_remove.dispose()
return self.lists_
def appendUserList(self, title):
"""
Create a new user list
title: title of list to create
returns: created item
"""
if "DEBUG" in os.environ:
item = ToDoList(id=random.randint(100, 1000), title=title, created_at=datetime.now())
self.lists_.append(item)
return item
created_list = self.lists_create(title=title)
created_list = ToDoList(**created_list)
return created_list

View File

@@ -1,267 +0,0 @@
import gettext
import os
import tkinter as tk
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
def str_time(time):
return time.strftime("%Y-%m-%d %H:%M:%S")
TODO_ITEM_TABLE_TEXT_WIDTH = 25
TODO_ITEM_TABLE_FINISHED_WIDTH = 20
TODO_ITEM_TABLE_CREATED_AT_WIDTH = 25
def placeholder():
print(_("Не реализовано"))
class ToDoItemWidget(tk.Frame):
def __init__(self, *args, row_number, item, table, **argv):
super().__init__(*args, **argv)
self.parent = self.master
self.item = item
self.noteLabel = tk.Label(
table,
text=item.text,
width=TODO_ITEM_TABLE_TEXT_WIDTH,
justify="center",
font=("Arial", 8),
)
self.noteLabel.grid(row=row_number, column=0)
self.finished = tk.IntVar(value=int(item.finished))
self.finishedButton = tk.Checkbutton(
table,
variable=self.finished,
command=self.finishedButton_command,
width=TODO_ITEM_TABLE_FINISHED_WIDTH,
justify="center",
)
self.finishedButton.grid(row=row_number, column=1)
self.createdAt = tk.Label(
table,
text=str_time(item.created_at),
width=TODO_ITEM_TABLE_CREATED_AT_WIDTH,
justify="center",
)
self.createdAt.grid(row=row_number, column=2)
self.remove = tk.Button(
table,
text=_("Удалить"),
command=lambda: self.parent.remove(self.item),
justify="center",
)
self.remove.grid(row=row_number, column=3)
def finishedButton_command(self):
self.item.modify(finished=self.finished.get() > 0)
class ToDoListWidget(tk.Frame):
def __init__(self, *args, delete_list, **argv):
super().__init__(*args, **argv)
self.delete_list = delete_list
def create_table_header(self, body):
header_font = ("Arial", "10", "bold")
text = tk.Label(
body,
text=_("Текст"),
width=TODO_ITEM_TABLE_TEXT_WIDTH,
justify="center",
font=header_font,
)
text.grid(row=0, column=0)
done = tk.Label(
body,
text=_("Выполнено"),
width=TODO_ITEM_TABLE_FINISHED_WIDTH,
justify="center",
font=header_font,
)
done.grid(row=0, column=1)
created = tk.Label(
body,
text=_("Создано"),
width=TODO_ITEM_TABLE_CREATED_AT_WIDTH,
justify="center",
font=header_font,
)
created.grid(row=0, column=2)
def create_table(self, itemList):
table = tk.LabelFrame(self, relief=tk.GROOVE)
table.grid()
self.create_table_header(table)
self.itemList = itemList
row_number = 1
for item in itemList:
item = ToDoItemWidget(self, row_number=row_number, item=item, table=table)
row_number += 1
return table
def create_new_item(self):
table = tk.LabelFrame(self, relief=tk.GROOVE)
table.grid()
self.itemToAdd = tk.Text(table, width=15, height=1)
self.itemToAdd.grid(row=0, column=0)
add = tk.Button(table, text=_("Добавить заметку"), command=self.add_command)
add.grid(row=0, column=1)
return table
def fill(self, itemList):
self.frame = tk.LabelFrame(self, relief=tk.GROOVE)
self.frame.grid(sticky="NEWS")
table = self.create_table(itemList)
table.grid(row=0, column=0)
new = self.create_new_item()
new.grid(row=2, column=0)
delete = tk.Button(self, text=_("Удалить лист"), command=self.delete_list)
delete.grid(row=4, column=0)
def update(self, itemList=None):
self.clear()
if itemList is None:
self.fill(self.itemList)
else:
self.fill(itemList)
def add_command(self):
self.itemList.append(self.itemToAdd.get(1.0, "end"))
self.update()
def remove(self, item):
self.itemList.remove(self.itemList.index(item))
self.update()
def clear(self):
for widget in self.winfo_children():
widget.destroy()
class WorkSpaceFrame(tk.Frame):
def delete_list(self, *args):
selection = self.listBox.curselection()
cur = selection[0]
self.user.removeUserList(self.lists[cur].id)
self.lists = self.user.fetchUserLists()
self.update_lists()
if len(self.lists) > 1:
self.listBox.selection_set(first=cur - 1)
elif len(self.lists) > 0:
self.listBox.selection_set(first=0)
def __init__(self, user, master=None, url=None) -> None:
"""
Функция инициаизации класса
"""
super().__init__(master)
self.master = master
self.user = user
self.pack(fill=tk.BOTH, expand=1)
self.initLayout(user)
def destroy(self):
tk.Tk.destroy(self)
if self.rbtn_var.get() > 0:
self.user.save()
else:
self.user.remove()
def initLayout(self, user):
# Запомнить пользователя
self.rbtn_var = tk.IntVar(value=1)
rbtn = tk.Checkbutton(self, text=_("Запомнить меня"), variable=self.rbtn_var, command=None)
rbtn.pack(anchor="n")
# data
self.lists = user.fetchUserLists()
self.add_list_text = tk.Text(self, width=15, height=1)
self.add_list_text.pack(anchor="sw")
add = tk.Button(self, text=_("Добавить лист"), command=self.add_list)
add.pack(anchor="sw")
# select list box
self.listBox = tk.Listbox(self, width=30, selectmode=tk.SINGLE)
self.listBox.pack(side="left", fill="y")
self.listBox.bind("<<ListboxSelect>>", self.listBox_selected)
# scroll bar
scrollbar = tk.Scrollbar(self, orient="vertical")
scrollbar.config(command=self.listBox.yview)
scrollbar.pack(side="left", fill="y")
# add scroll bar to list box
self.listBox.config(yscrollcommand=scrollbar.set)
# init list view
self.update_lists()
# canvas for todo lists
canvas = tk.Canvas(self)
canvas.pack(side="left", fill="both", expand=1)
scrollbar = tk.Scrollbar(self, orient="vertical")
scrollbar.config(command=canvas.yview)
scrollbar.pack(side="left", fill="y")
canvas.configure(yscrollcommand=scrollbar.set)
# todo lists
self.toDoList = ToDoListWidget(self, delete_list=self.delete_list)
self.toDoList.grid_propagate(True)
# self.toDoList = ToDoListWidget(canvas)
self.toDoList.pack(side="left", fill="y")
canvas.bind("<Configure>", lambda *argv: canvas.configure(scrollregion=canvas.bbox("all")))
canvas.create_window((0, 0), window=self.toDoList, anchor="nw")
# select list!
if len(self.lists) > 0:
self.listBox.selection_set(first=0)
self.listBox_selected()
def update_lists(self):
self.listBox.delete(0, "end")
for item in self.lists:
s = f"{str(item)}: {item.created_at.strftime('%Y-%m-%d %H:%M:%S')}"
self.listBox.insert(tk.END, s)
self.listBox.pack()
return len(self.lists)
def add_list(self, *args):
text = self.add_list_text.get(1.0, "end").strip()
if len(text) == 0:
print("empty name! Not adding!")
return
self.user.appendUserList(title=text)
self.lists = self.user.fetchUserLists()
# fill list box
self.update_lists()
len(self.lists) > 0 and self.listBox.selection_set(first=len(self.lists) - 1)
def listBox_selected(self, *args):
self.toDoList.clear()
selection = self.listBox.curselection()
cur = selection[0]
self.toDoList.fill(self.lists[cur])

View File

@@ -21,15 +21,3 @@ exclude = '''
| profiling | profiling
)/ )/
''' '''
[build-system]
requires = [
"setuptools",
"wheel",
"requests",
"build",
"coverage",
"doit"
]
build-backend = "setuptools.build_meta"

View File

@@ -1,11 +0,0 @@
[metadata]
name = django-todo
version = 0.0.1
[options]
packages = frontend
install_requires =
requests; python_version >= "3.6"
[options.package_data]
frontend = */*/*/todo.mo