kitoy/monsiteperso
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace name of methods and funtions

Browse Source
This commit is contained in:
kitoy
2026-05-21 22:27:23 +02:00
committed by kitoy
parent 7709f6127b
commit bf43a417c8
11 changed files with 118 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/routes.py
View File

@@ -21,7 +21,7 @@ csrf = CSRFProtect(app)
app.secret_key = 'your_secret_key'
app.config.from_pyfile('config.py')
THEMES_FOLDER = './templates/themes/'
THEMES_FOLDER = '/themes/'
USERS_FOLDER = app.config['USERS_FOLDER']
bcrypt = Bcrypt(app)
@@ -53,7 +53,7 @@ def login():
return resp
@app.route( '/logout/', methods=['GET'] )
@app.route( '/logout', methods=['GET'] )
@login_required
def logout():
session.pop('username', None) # Supprimer username de la session s'il s'y trouve
@@ -68,10 +68,10 @@ def edit(page):
user = '%s'% escape(session['username'])
page = '%s' % escape(page)
db = DataSite(user, USERS_FOLDER)
mypages = db.getPages()
mypages = db.get_pages()
theme = db.datas['config']['theme']
menu = db.datas['menu']
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
return render_template('/edit.html.tpl',
blocEdit="",
@@ -87,7 +87,7 @@ def edit(page):
@app.route('/edit/images/<bloc>/<image>', methods=['GET', 'POST'], defaults={'page': ''})
@app.route('/<page>/edit/images/<bloc>/<image>', methods=['GET', 'POST'])
@login_required
def editPhoto(page, image, bloc):
def edit_photo(page, image, bloc):
user = '%s'% escape(session['username'])
page = '%s' % escape(page)
image = '%s' % escape(image)
@@ -96,12 +96,12 @@ def editPhoto(page, image, bloc):
db = DataSite(user, USERS_FOLDER)
theme = db.datas['config']['theme']
form = ImageForm()
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
if form.validate_on_submit():
if request.method == 'POST':
myblocs[bloc][image] = db.updateImg(image, form)
db.saveBlocs(page, myblocs)
myblocs[bloc][image] = db.update_img(image, form)
db.save_blocs(page, myblocs)
form = MyBlocs.makeForm(db.datas['blocs'][bloc])
if "hx-request" in request.headers:
return make_response(('Image modified', 200))
@@ -120,7 +120,7 @@ def drop_upload(page, bloc):
datas = dict()
file = request.files['file']
filename = secure_filename(file.filename)
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
ext = os.path.splitext(filename)[-1]
save_path = os.path.join(USERS_FOLDER, user, 'public', 'img' )
if ext not in EXT_IMG :
@@ -150,35 +150,35 @@ def drop_upload(page, bloc):
img.save(os.path.join(save_path, 'thumbnails', filename ) )
myblocs[bloc][filename] = db.addImg(filename)
db.saveBlocs(page, myblocs)
db.save_blocs(page, myblocs)
return make_response(('Chunk upload succesfull', 200))
@app.route('/edit/images/<bloc>/del/<image>', methods=['GET'], defaults={'page': ''})
@app.route('/<page>/edit/images/<bloc>/del/<image>', methods=['GET'])
@login_required
def delImage(page, bloc, image):
def del_image(page, bloc, image):
user = '%s'% escape(session['username'])
page = '%s' % escape(page)
db = DataSite(user, USERS_FOLDER)
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
myblocs[bloc] = db.delImg(myblocs[bloc], image)
db.saveBlocs(page, myblocs)
myblocs[bloc] = db.del_img(myblocs[bloc], image)
db.save_blocs(page, myblocs)
return make_response(('Image removed', 200))
@app.route('/imgs_list/<blocname>', methods=['GET'], defaults={'page': ''})
@app.route('/<page>/imgs_list/<blocname>', methods=['GET'])
@login_required
def imagesList(page, blocname):
def images_list(page, blocname):
user = '%s'% escape(session['username'])
page = '%s' % escape(page)
blocname = '%s' % escape(blocname)
db = DataSite(user, USERS_FOLDER)
theme = db.datas['config']['theme']
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
bloc = myblocs[blocname]
return render_template(THEMES_FOLDER+theme+'/blocs/edit/images_list.html',page=page,
@@ -187,29 +187,26 @@ def imagesList(page, blocname):
@app.route('/edit/<blocname>', methods=['GET', 'POST'], defaults={'page': ''})
@app.route('/<page>/edit/<blocname>', methods=['GET', 'POST'])
@login_required
def editBloc(page, blocname):
def edit_bloc(page, blocname):
user = '%s'% escape(session['username'])
page = '%s' % escape(page)
db = DataSite(user, USERS_FOLDER)
theme = db.datas['config']['theme']
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
bloc = myblocs[blocname]
form = MyBlocs.makeForm(bloc)
form = MyBlocs.make_form(bloc)
if request.method == 'POST':
datas=dict()
if form.validate_on_submit():
for field, value in request.form.items():
print (field)
if field != 'csrf_token' and field != 'image':
myblocs[blocname][field] = value
if 'image' in request.files.keys():
file = request.files['image']
print ('filename: '+ file.filename)
filename = secure_filename(file.filename)
bg_custom = 'bg_custom_'+bloc['name']+filename
print('bg_custom : '+ bg_custom)
file.save(os.path.join(USERS_FOLDER, user, 'public', 'img', bg_custom ))
if 'bg_img' in bloc.keys():
db.delImg(bloc, bloc['bg_img'])
@@ -217,7 +214,7 @@ def editBloc(page, blocname):
myblocs[blocname]['bg_img'] = bg_custom
db.saveBlocs(page, myblocs)
db.save_blocs(page, myblocs)
flash(u'Vos changements on été pris en compte et enregistré', 'success')
else:
print(form.errors)
@@ -251,13 +248,13 @@ def editBloc(page, blocname):
@app.route('/view/<bloc>', methods=['GET'], defaults={'page': ''})
@app.route('/<page>/view/<bloc>', methods=['GET'])
@login_required
def viewBloc(page, bloc):
def view_bloc(page, bloc):
user = '%s'% escape(session['username'])
page = '%s' % escape(page)
db = DataSite(user, USERS_FOLDER)
theme = db.datas['config']['theme']
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
bloc = myblocs[bloc]
return render_template(THEMES_FOLDER+theme+'/blocs/_'+bloc['type']+'.html',
@@ -266,13 +263,13 @@ def viewBloc(page, bloc):
@app.route('/addBloc', methods=['POST'], defaults={'page': ''})
@app.route('/<page>/addBloc', methods=['POST'])
@login_required
def addBloc(page):
def add_bloc(page):
user = '%s'% escape(session['username'])
page = '%s' % escape(page)
db = DataSite(user, USERS_FOLDER)
datas = dict()
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
blocName = '%s' % escape(request.form['blocName'])
blocType = request.form['blocType']
@@ -287,7 +284,7 @@ def addBloc(page):
else:
return make_response(('Invalid bloc Name', 500))
db.saveBlocs(page, myblocs)
db.save_blocs(page, myblocs)
if "hx-request" in request.headers:
return render_template('/admin/_blocs-list.html',
@@ -297,7 +294,7 @@ def addBloc(page):
@app.route('/addPage', methods=['POST'])
@login_required
def addPage():
def add_page():
user = '%s'% escape(session['username'])
db = DataSite(user, USERS_FOLDER)
@@ -317,12 +314,12 @@ def addPage():
return make_response(('Invalid type ', 500))
mypages = db.getPages()
mypages = db.get_pages()
return redirect(url_for('edit', page=pageName))
@app.route('/rmPage/<pageName>')
@login_required
def rmPage(pageName):
def rm_page(pageName):
pageName = '%s' % escape(pageName)
user = '%s'% escape(session['username'])
@@ -350,7 +347,7 @@ def sortblocs(page):
datas = dict()
myblocs = dict()
myblocs_orig = db.getBlocs(page)['blocs']
myblocs_orig = db.get_blocs(page)['blocs']
for bloc in request.form:
if bloc != 'csrf_token':
@@ -358,13 +355,13 @@ def sortblocs(page):
myblocs[bloc_name] = myblocs_orig[bloc_name]
flash (u'Les blocs ont été réagencés', 'succes');
db.saveBlocs(page, myblocs)
db.save_blocs(page, myblocs)
return redirect(url_for('edit'))
@app.route('/editmenu', methods=['POST'])
@login_required
def editMenu():
def edit_menu():
user = '%s'% escape(session['username'])
db = DataSite(user, USERS_FOLDER)
db.datas['menu']=dict()
@@ -381,7 +378,7 @@ def editMenu():
else:
db.datas['menu'][menu] = str(request.form[menu])
db.saveMenu(db.datas['menu'])
db.save_menu(db.datas['menu'])
flash (u'Le menu a bien été modifier', 'success');
return redirect(url_for('edit'))
@@ -401,17 +398,19 @@ def mythumbnails(filename):
@app.route('/favicon.ico', methods=['GET'])
@app.route('/favicon.ico/', methods=['GET'])
@login_required
def favicon():
return make_response(('Ok! ', 200))
@app.route('/publish', methods=['POST'])
@login_required
def publish():
user = '%s' % escape(session['username'])
db = DataSite(user, USERS_FOLDER)
listPages = db.getPages()
listPages = db.get_pages()
theme = db.datas['config']['theme']
menu = db.datas['menu']
test_alphanum = "^[A-Za-z0-9/_-]*$"
@@ -425,7 +424,7 @@ def publish():
for page in listPages:
myblocs = db.getBlocs(page)['blocs']
myblocs = db.get_blocs(page)['blocs']
htmlExport = render_template('/index.html.tpl',
config=db.datas['config'],
menu=menu,
@@ -435,7 +434,7 @@ def publish():
db.writeHTML(theme, page, htmlExport)
# Export index.html landing page
myblocs = db.getBlocs('')['blocs']
myblocs = db.get_blocs('')['blocs']
htmlExport = render_template('/index.html.tpl',
config=db.datas['config'],
menu=menu,
@@ -463,3 +462,5 @@ def publish():
return redirect(url_for('edit'))