diff --git a/javascript/ui.js b/javascript/ui.js
index 2e4480f6993..8af4f126e5b 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -213,37 +213,8 @@ function restart_reload(){
}
function login(username) {
- var txt2img=gradioApp().querySelector('#tabs').querySelectorAll('button')[0];
- var img2img=gradioApp().querySelector('#tabs').querySelectorAll('button')[1];
- var extras=gradioApp().querySelector('#tabs').querySelectorAll('button')[2];
- var pnginfo=gradioApp().querySelector('#tabs').querySelectorAll('button')[3];
- var train=gradioApp().querySelector('#tabs').querySelectorAll('button')[4];
var user=gradioApp().querySelector('#tabs').querySelectorAll('button')[5];
- var extension=gradioApp().querySelector('#tabs').querySelectorAll('button')[6];
-
- txt2img.style.display=(username=='admin'?'none':'block')
- img2img.style.display=(username=='admin'?'none':'block')
- extras.style.display=(username=='admin'?'none':'block')
- pnginfo.style.display=(username=='admin'?'none':'block')
- train.style.display=(username=='admin'?'none':'block')
- user.style.display=(username=='admin'?'block':'none')
- extension.style.display=(username=='admin'?'none':'block')
-}
-
-function logout() {
- var txt2img=gradioApp().querySelector('#tabs').querySelectorAll('button')[0];
- var img2img=gradioApp().querySelector('#tabs').querySelectorAll('button')[1];
- var extras=gradioApp().querySelector('#tabs').querySelectorAll('button')[2];
- var pnginfo=gradioApp().querySelector('#tabs').querySelectorAll('button')[3];
- var train=gradioApp().querySelector('#tabs').querySelectorAll('button')[4];
- var user=gradioApp().querySelector('#tabs').querySelectorAll('button')[5];
- var extension=gradioApp().querySelector('#tabs').querySelectorAll('button')[6];
-
- txt2img.style.display='none'
- img2img.style.display='none'
- extras.style.display='none'
- pnginfo.style.display='none'
- train.style.display='none'
- user.style.display='block'
- extension.style.display='none'
-}
\ No newline at end of file
+
+ if(username=='admin')
+ user.click()
+}
diff --git a/localizations/zh_CN.json b/localizations/zh_CN.json
index 0f55a8e3a5e..ac5d190f679 100644
--- a/localizations/zh_CN.json
+++ b/localizations/zh_CN.json
@@ -777,6 +777,8 @@
"Create blank canvas": "创建空白画布",
"Preview annotator result": "预览标注结果",
"Hide annotator result": "隐藏标注结果",
+ "Current user :": "当前用户 : ",
+ "Reloading...": "重新载入...",
"--------": "--------"
}
diff --git a/localizations/zh_TW.json b/localizations/zh_TW.json
index 9402802ca28..4a008a69ed4 100644
--- a/localizations/zh_TW.json
+++ b/localizations/zh_TW.json
@@ -770,6 +770,8 @@
"Create blank canvas": "創建空白畫布",
"Preview annotator result": "預覽標註結果",
"Hide annotator result": "隱藏標註結果",
+ "Current user": "當前用戶 : ",
+ "Reloading...": "重新載入...",
"--------": "--------"
}
diff --git a/modules/ui.py b/modules/ui.py
index a302fa63ca0..0db1333678c 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -842,30 +842,7 @@ def run_settings_single(value, key, request : gr.Request):
with gr.Blocks(analytics_enabled=False) as settings_interface:
dummy_component = gr.Label(visible=False)
- with gr.Row():
- settings_submit = gr.Button(value="Apply settings", variant='primary')
- settings_logout = gr.Button(value="Logout")
- logout_prompt = gr.HTML(value="You have been logout, please refresh page manaully...", visible=False)
-
- def user_logout(request: gr.Request):
- tokens = shared.demo.server_app.tokens
- cookies = request.headers['cookie'].split('; ')
- access_token = None
- for cookie in cookies:
- if cookie.startswith('access-token'):
- access_token = cookie[len('access-token=') : ]
- print(access_token)
- tokens.pop(access_token)
- print(tokens)
- break
- return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
-
- settings_logout.click(
- fn=user_logout,
- inputs=[],
- outputs=[settings_submit, settings_logout, logout_prompt],
- _js="logout"
- )
+ settings_submit = gr.Button(value="Apply settings", variant='primary')
result = gr.HTML()
@@ -2001,14 +1978,6 @@ def sagemaker_train_hypernetwork(
)
with gr.Blocks(analytics_enabled=False) as user_interface:
- username_state = gr.Textbox(value="", elem_id="username", visible=False)
- username_state.change(
- fn=None,
- inputs=[username_state],
- outputs=None,
- _js="login"
- )
-
user_dataframe = gr.Dataframe(
headers=["Username", "Password", "Options"],
row_count=2,
@@ -2092,7 +2061,6 @@ def save_userdata(user_dataframe, request: gr.Request):
user_interface.load(update_sagemaker_endpoint, inputs=None, outputs=[shared.sagemaker_endpoint_component])
user_interface.load(update_sd_model_checkpoint, inputs=None, outputs=[shared.sd_model_checkpoint_component])
- user_interface.load(update_username, inputs=None, outputs=[username_state])
if cmd_opts.pureui:
interfaces += [
@@ -2141,6 +2109,38 @@ def save_userdata(user_dataframe, request: gr.Request):
component = create_setting_component(k, is_quicksettings=True)
component_dict[k] = component
+ with gr.Row():
+ with gr.Column(scale=4):
+ gr.HTML(value='Current user :
')
+ with gr.Column(scale=1):
+ username_state = gr.HTML()
+ username_state.change(
+ fn=None,
+ inputs=[username_state],
+ outputs=[],
+ _js="login"
+ )
+ user_interface.load(update_username, inputs=None, outputs=[username_state])
+ with gr.Column(scale=1):
+ logout_button = gr.Button(value="Logout")
+
+ def user_logout(request: gr.Request):
+ tokens = shared.demo.server_app.tokens
+ cookies = request.headers['cookie'].split('; ')
+ access_token = None
+ for cookie in cookies:
+ if cookie.startswith('access-token'):
+ access_token = cookie[len('access-token=') : ]
+ tokens.pop(access_token)
+ break
+
+ logout_button.click(
+ fn=user_logout,
+ inputs=[],
+ outputs=[],
+ _js="restart_reload"
+ )
+
parameters_copypaste.integrate_settings_paste_fields(component_dict)
parameters_copypaste.run_bind()
shared.default_options = shared.opts.data