From b43e2e2a2baeb802c2dfa1c959b391f7b0b5bca8 Mon Sep 17 00:00:00 2001
From: Hell13Cat <46496367+Hell13Cat@users.noreply.github.com>
Date: Wed, 29 Dec 2021 01:03:50 +0300
Subject: [PATCH] build0009
---
main.py | 3 ++-
server.py | 16 +++++++++++++++-
templates/add_page.html | 2 +-
templates/blanks.html | 24 ++++++++++++++++++++++++
4 files changed, 42 insertions(+), 3 deletions(-)
create mode 100644 templates/blanks.html
diff --git a/main.py b/main.py
index 1195287..c53b1a0 100644
--- a/main.py
+++ b/main.py
@@ -22,7 +22,7 @@ def save_data(datas):
data = {"0":{"url":"0", "title":"0", "text":""}}
for one_page in data.keys():
if datas["url"] == data[one_page]["url"]:
- return {"code":1}
+ return {"code":0, "uid":one_page, "data":data[one_page]}
add_page = 1
while add_page == 1:
id_page = extf.gen_id()
@@ -31,6 +31,7 @@ def save_data(datas):
data[id_page] = datas
print(data)
db.save("pages", data)
+ return {"code":1, "uid":id_page, "data":datas}
def load_data(text):
try:
diff --git a/server.py b/server.py
index 2b73f50..75d391d 100644
--- a/server.py
+++ b/server.py
@@ -1,4 +1,4 @@
-from flask import Flask, render_template, send_from_directory
+from flask import Flask, render_template, send_from_directory, request
import os
import main
@@ -12,6 +12,20 @@ def hello():
@app.route('/add_page')
def add_page():
return render_template('add_page.html')
+
+@app.route('/add_page', methods=('GET', 'POST'))
+def add_page_r():
+ url = request.form['url']
+ datas = main.get_data(url)
+ data = main.save_data(datas)
+ html_page = open("templates/blanks.html", "r").read()
+ if data["code"] == 0:
+ title = "Страница присутсвует в каталоге"
+ text = "" + data["uid"] + " - " + data["data"]["title"] + "
" + data["data"]["url"] + "
"
+ else:
+ title = "Страница добавлена в каталог"
+ text = "" + data["uid"] + " - " + data["data"]["title"] + "
" + data["data"]["url"] + "
"
+ return html_page.format(title=title, text=text)
@app.route('/statics/')
def statics(file_name):
diff --git a/templates/add_page.html b/templates/add_page.html
index b580633..d60ced7 100644
--- a/templates/add_page.html
+++ b/templates/add_page.html
@@ -19,7 +19,7 @@
diff --git a/templates/blanks.html b/templates/blanks.html
new file mode 100644
index 0000000..332bf91
--- /dev/null
+++ b/templates/blanks.html
@@ -0,0 +1,24 @@
+
+
+ Nyako Page
+
+
+
+
+
+
+
+
+
+
{title}
+
+
+ {text}
+
+
+