From 71ec2f99e1165d8cc66287c044bd4f051a9bd050 Mon Sep 17 00:00:00 2001 From: kitoy Date: Thu, 21 May 2026 22:27:23 +0200 Subject: [PATCH] replace name of methods and funtions --- app/models/blocs.py | 8 +- app/models/sites.py | 27 ++++--- app/routes.py | 77 ++++++++++--------- app/templates/admin/_menu-admin.html | 9 +++ app/templates/admin/_menu-edit.html | 75 ++---------------- app/templates/admin/login.html | 46 ++++++++--- app/templates/edit-tools/_form-base.html | 6 +- .../themes/creative/blocs/_presentation.html | 2 +- .../themes/creative/blocs/edit/_gallery.html | 2 +- .../creative/blocs/edit/_image-edit.html | 4 +- .../creative/blocs/edit/images_list.html | 2 +- 11 files changed, 118 insertions(+), 140 deletions(-) diff --git a/app/models/blocs.py b/app/models/blocs.py index 573da9c..53eaf06 100644 --- a/app/models/blocs.py +++ b/app/models/blocs.py @@ -18,17 +18,17 @@ class MyBlocs: mybloc['type'] = str(blocType) return mybloc - def makeForm(bloc): + def make_form(bloc): form = FormBloc() return form - def imgForm(): + def img_form(): return ImageForm() - def newImgForm(): + def new_img_form(): return ImageUpload() - def listTypeBlocs(theme): + def list_type_blocs(theme): typeBlocs = list() folders = Path(PurePosixPath('./app').joinpath('templates', theme, 'blocs')) for folder in folders.iterdir(): diff --git a/app/models/sites.py b/app/models/sites.py index 7745f8a..e51b9e1 100644 --- a/app/models/sites.py +++ b/app/models/sites.py @@ -26,7 +26,7 @@ class DataSite: self.static_path = Path(PurePosixPath(self.user_folder.joinpath('public'))) self.static_path.mkdir(parents=True, exist_ok=True) - def loadFile(self): + def load_file(self): if not self.filej.isfile(): raise FileNotFoundError(f"Le fichier ident.json n'existe pas : {self.filej}") @@ -36,7 +36,7 @@ class DataSite: - def getBlocs(self, page: str): + def get_blocs(self, page: str): if page != '': page = Path(self.user_folder.joinpath(page, 'page.json')) @@ -51,7 +51,7 @@ class DataSite: return datas - def updateBloc(self, bloc, form, files=None): + def update_bloc(self, bloc, form, files=None): print (form) for field in form(): print(field) @@ -68,7 +68,7 @@ class DataSite: return bloc - def updateImg(self, image, form): + def update_img(self, image, form): img = dict() img['title'] = form.title.data img['subtitle'] = form.subtitle.data @@ -77,7 +77,7 @@ class DataSite: img['file'] = image return img - def addImg(self, image_uploaded): + def add_img(self, image_uploaded): img = dict() img['title'] = "" @@ -89,7 +89,7 @@ class DataSite: return img - def delImg(self, bloc, img): + def del_img(self, bloc, img): if bloc['type'] == 'gallery': img_file = Path(PurePosixPath(self.user_folder).joinpath('public', 'img', bloc[img]['file'] )) @@ -107,12 +107,12 @@ class DataSite: return bloc - def saveMenu(self, menu:dict): + def save_menu(self, menu:dict): self.datas['menu'] = menu self.filej.write_text(json.dumps(self.datas, indent=5)) - def saveBlocs(self, page='', blocs=dict()): + def save_blocs(self, page='', blocs=dict()): if page != '': datas = dict() datas['blocs'] = blocs @@ -128,7 +128,10 @@ class DataSite: self.filej.write_text(json.dumps(self.datas, indent=5)) - def getPages(self): + def get_theme(self): + return self.datas['config']['theme'] + + def get_pages(self): mypages = list() folders = Path(self.user_folder) for folder in folders.iterdir(): @@ -194,7 +197,8 @@ class DataSite: userDir = Path(PurePosixPath(self.user_folder)) - command = "lftp -u \"{}\",\"{}\" -p {} {} -e ' mirror -R public {}; bye;'".format(user, + command = "lftp -u \"{}\",\"{}\" -p {} {} -e ' mirror -R public {}; chmod -R o+rx ./; bye;'".format(user, + password, serverPort, serverAddress, @@ -216,3 +220,6 @@ class DataSite: if path.exists((self.static_path+'img/portfolio/thumbnails/'+file)): remove(self.static_path+'img/portfolio/thumbnails/'+file) self.trash.clear() + + + diff --git a/app/routes.py b/app/routes.py index 8276005..de3f456 100644 --- a/app/routes.py +++ b/app/routes.py @@ -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//', methods=['GET', 'POST'], defaults={'page': ''}) @app.route('//edit/images//', 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//del/', methods=['GET'], defaults={'page': ''}) @app.route('//edit/images//del/', 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/', methods=['GET'], defaults={'page': ''}) @app.route('//imgs_list/', 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/', methods=['GET', 'POST'], defaults={'page': ''}) @app.route('//edit/', 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/', methods=['GET'], defaults={'page': ''}) @app.route('//view/', 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('//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/') @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')) + + diff --git a/app/templates/admin/_menu-admin.html b/app/templates/admin/_menu-admin.html index c8f9cd0..0c701d4 100644 --- a/app/templates/admin/_menu-admin.html +++ b/app/templates/admin/_menu-admin.html @@ -38,6 +38,14 @@ data-target="#publish"> Publier mes modifications + + + + + @@ -162,3 +170,4 @@ + diff --git a/app/templates/admin/_menu-edit.html b/app/templates/admin/_menu-edit.html index 93de479..d66e7a3 100644 --- a/app/templates/admin/_menu-edit.html +++ b/app/templates/admin/_menu-edit.html @@ -32,12 +32,15 @@
+ + +

Nouvelle entrée


- +

@@ -45,14 +48,15 @@
-
+ + +
- @@ -120,71 +124,6 @@ - -