paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modern #2

Merged
absurdo merged 38 commits from modern into master 2025-03-15 00:00:11 +00:00
Conversation 0 Commits 38 Files changed 163 +21 -23
2 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a18cf5504f - Show all commits

32
paramecio/modules/admin2/app.py
View file

@ -39,16 +39,17 @@ seconds_login=300
if hasattr(config, 'seconds_login'):
seconds_login=config.seconds_login
cookie_name='paramecio_session'
if hasattr(config, 'cookie_name'):
cookie_name=config.cookie_name
@admin_app.get('/test', skip=[check_login])
def test_session(session={}):
return session
admin_folder='/admin/'
@admin_app.get('/admin', name="admin_app.home_admin")
if hasattr(config, 'admin_folder'):
admin_folder=config.admin_folder
@app.get(admin_folder.rstrip('/'), name="admin_app.home_admin")
def home_admin(session={}):
#s=get_session()
@ -59,7 +60,7 @@ def home_admin(session={}):
#return {}
@admin_app.get('/admin/login', name="admin_app.login_admin", skip=[check_login])
@admin_app.get('/login', name="admin_app.login_admin", skip=[check_login])
def login_admin(session={}):
db=WebModel.connection()
@ -92,7 +93,7 @@ def login_admin(session={}):
return t.load_template('login.phtml', title=i18n.tlang('Login'))
@admin_app.get('/admin/signup', skip=[check_login], name='admin_app.signup_admin')
@admin_app.get('/signup', skip=[check_login], name='admin_app.signup_admin')
def signup_admin(session={}):
db=WebModel.connection()
@ -101,7 +102,7 @@ def signup_admin(session={}):
num_users=cursor.fetchone()['num_users']
if num_users>0:
redirect(app.url_path_for('login_admin'))
redirect(app.get_url('admin_app.login_admin'))
db.close()
@ -109,7 +110,7 @@ def signup_admin(session={}):
return t.load_template('signup.phtml', title=i18n.tlang('Signup'))
@admin_app.post('/admin/login', skip=[check_login], name='admin_app.check_login_admin')
@admin_app.post('/login', skip=[check_login], name='admin_app.check_login_admin')
def check_login_admin(session={}):
db=WebModel.connection()
@ -168,7 +169,7 @@ def check_login_admin(session={}):
return {'error': error, 'message': message, 'no_login': no_login}
@admin_app.post('/admin/signup', skip=[check_login], name='admin_app.signup_insert_admin')
@admin_app.post('/signup', skip=[check_login], name='admin_app.signup_insert_admin')
def signup_insert_admin(session={}):
i18n=I18n('admin2')
@ -193,6 +194,8 @@ def signup_insert_admin(session={}):
post['password']=final_password
post['privileges']=2
with db.query('select count(id) as num_users from useradmin2', []) as cursor:
num_users=cursor.fetchone()['num_users']
@ -214,7 +217,7 @@ def signup_insert_admin(session={}):
return {'error': error, 'message': message}
@admin_app.get('/admin/logout', name="admin_app.logout_admin", skip=[check_login])
@admin_app.get('/logout', name="admin_app.logout_admin", skip=[check_login])
def logout_admin(session={}):
if login_admin in session:
@ -234,7 +237,7 @@ def change_lang():
return {'error': 0, 'message': ''}
@admin_app.get('/admin/change_theme', name="admin_app.change_theme")
@admin_app.get('/change_theme', name="admin_app.change_theme")
def change_theme(session={}):
try:
@ -301,4 +304,5 @@ def check_login_tries(request, db):
return you_cannot_login
app.merge(admin_app)
app.mount(admin_folder, admin_app)

12
paramecio/modules/admin2/ausers.py
View file

@ -31,8 +31,8 @@ modules_admin.append(['admin_app.admin_users', 'people-circle'])
modules_admin_icons.append('<symbol id="people-circle" viewBox="0 0 16 16"><path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/><path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"/></symbol>')
@admin_app.get('/admin/ausers', name="admin_app.admin_users")
@admin_app.post('/admin/ausers', name="admin_app.admin_users")
@admin_app.get('/ausers', name="admin_app.admin_users")
@admin_app.post('/ausers', name="admin_app.admin_users")
def admin_users(session={}):
i18n=I18n('admin2')
@ -63,16 +63,10 @@ def admin_users(session={}):
admin.arr_fields_edit=['username', 'password', 'repeat_password', 'email', 'privileges', 'lang', 'dark_theme']
#slist=SimpleList(users, url, t)
#slist.fields_showed=['username', 'email', 'double_auth', 'last_login']
#slist=slist.show()
slist=admin.show()
db.close()
return t.load_template('users.phtml', title=i18n.tlang('Admin users'), tlang=i18n.tlang, module_selected='admin_app.admin_users', slist=slist, session=session)
app.merge(admin_app)