mirror of
https://github.com/believethehype/nostrdvm.git
synced 2025-09-20 16:01:47 +02:00
noogle: update nostr-login
This commit is contained in:
@@ -7,9 +7,9 @@ from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv
|
|||||||
from nostr_dvm.utils.admin_utils import AdminConfig
|
from nostr_dvm.utils.admin_utils import AdminConfig
|
||||||
from nostr_dvm.utils.definitions import EventDefinitions
|
from nostr_dvm.utils.definitions import EventDefinitions
|
||||||
from nostr_dvm.utils.dvmconfig import DVMConfig, build_default_config
|
from nostr_dvm.utils.dvmconfig import DVMConfig, build_default_config
|
||||||
|
from nostr_dvm.utils.mediasource_utils import organize_input_media_data
|
||||||
from nostr_dvm.utils.nip88_utils import NIP88Config
|
from nostr_dvm.utils.nip88_utils import NIP88Config
|
||||||
from nostr_dvm.utils.nip89_utils import NIP89Config
|
from nostr_dvm.utils.nip89_utils import NIP89Config
|
||||||
from nostr_dvm.utils.mediasource_utils import organize_input_media_data
|
|
||||||
from nostr_dvm.utils.output_utils import upload_media_to_hoster
|
from nostr_dvm.utils.output_utils import upload_media_to_hoster
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@@ -62,7 +62,7 @@ class MediaConverter(DVMTaskInterface):
|
|||||||
media_format = tag.as_vec()[2]
|
media_format = tag.as_vec()[2]
|
||||||
|
|
||||||
filepath = await organize_input_media_data(url, input_type, start_time, end_time, dvm_config, client, True,
|
filepath = await organize_input_media_data(url, input_type, start_time, end_time, dvm_config, client, True,
|
||||||
media_format)
|
media_format)
|
||||||
options = {
|
options = {
|
||||||
"filepath": filepath
|
"filepath": filepath
|
||||||
}
|
}
|
||||||
|
@@ -1,8 +1,9 @@
|
|||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, NostrDatabase, \
|
|
||||||
ClientBuilder, Filter, NegentropyOptions, NegentropyDirection, init_logger, LogLevel, Kind
|
from nostr_sdk import Timestamp, Tag, Keys, Options, SecretKey, NostrSigner, NostrDatabase, \
|
||||||
|
ClientBuilder, Filter, NegentropyOptions, NegentropyDirection, Kind
|
||||||
|
|
||||||
from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv
|
from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv
|
||||||
from nostr_dvm.utils.admin_utils import AdminConfig
|
from nostr_dvm.utils.admin_utils import AdminConfig
|
||||||
@@ -10,7 +11,7 @@ from nostr_dvm.utils.definitions import EventDefinitions
|
|||||||
from nostr_dvm.utils.dvmconfig import DVMConfig, build_default_config
|
from nostr_dvm.utils.dvmconfig import DVMConfig, build_default_config
|
||||||
from nostr_dvm.utils.nip88_utils import NIP88Config
|
from nostr_dvm.utils.nip88_utils import NIP88Config
|
||||||
from nostr_dvm.utils.nip89_utils import NIP89Config, check_and_set_d_tag
|
from nostr_dvm.utils.nip89_utils import NIP89Config, check_and_set_d_tag
|
||||||
from nostr_dvm.utils.output_utils import post_process_list_to_events, post_process_list_to_users
|
from nostr_dvm.utils.output_utils import post_process_list_to_users
|
||||||
|
|
||||||
"""
|
"""
|
||||||
This File contains a Module to search for notes
|
This File contains a Module to search for notes
|
||||||
|
@@ -19,7 +19,7 @@
|
|||||||
"bootstrap": "^5.3.2",
|
"bootstrap": "^5.3.2",
|
||||||
"daisyui": "^4.6.0",
|
"daisyui": "^4.6.0",
|
||||||
"mini-toastr": "^0.8.1",
|
"mini-toastr": "^0.8.1",
|
||||||
"nostr-login": "^1.5.2",
|
"nostr-login": "^1.6.6",
|
||||||
"nostr-tools": "^2.4.0",
|
"nostr-tools": "^2.4.0",
|
||||||
"vue": "^3.4.15",
|
"vue": "^3.4.15",
|
||||||
"vue-notifications": "^1.0.2",
|
"vue-notifications": "^1.0.2",
|
||||||
|
@@ -141,29 +141,29 @@
|
|||||||
<div className="card-body">
|
<div className="card-body">
|
||||||
<h3 className="card-title">Login</h3>
|
<h3 className="card-title">Login</h3>
|
||||||
<p>Use a Browser Nip07 Extension like getalby, nos2x or nsec.app, a nsec or ncryptsec or use Amber on Android to sign-in</p>
|
<p>Use a Browser Nip07 Extension like getalby, nos2x or nsec.app, a nsec or ncryptsec or use Amber on Android to sign-in</p>
|
||||||
<button className="btn" @click="sign_in_nip07()">Browser Extension</button>
|
<!-- <button className="btn" @click="sign_in_nip07()">Browser Extension</button>-->
|
||||||
<button className="btn" @click="sign_in_nostr_login()">Nostr Login</button>
|
<button className="btn" @click="sign_in_nostr_login()">Nostr Login</button>
|
||||||
|
|
||||||
<template v-if="supports_android_signer">
|
<!-- <template v-if="supports_android_signer">-->
|
||||||
<button className="btn" @click="sign_in_amber()">Amber Sign in</button>
|
<!-- <button className="btn" @click="sign_in_amber()">Amber Sign in</button>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
<button className="btn" onclick="nsecmodal.showModal()">NSec/NCryptSec</button>
|
<!-- <button className="btn" onclick="nsecmodal.showModal()">NSec/NCryptSec</button>-->
|
||||||
<dialog id="nsecmodal" class="modal">
|
<!-- <dialog id="nsecmodal" class="modal">-->
|
||||||
<div class="modal-box">
|
<!-- <div class="modal-box">-->
|
||||||
<h3 class="font-bold text-lg">Login with key</h3>
|
<!-- <h3 class="font-bold text-lg">Login with key</h3>-->
|
||||||
<p class="py-4">Login with nsec or ncryptsec. Your keys will be stored in your Browser. This is the least recommended sign-in method</p>
|
<!-- <p class="py-4">Login with nsec or ncryptsec. Your keys will be stored in your Browser. This is the least recommended sign-in method</p>-->
|
||||||
<input class="u-Input" style="margin-left: 10px" type="search" name="user" autofocus placeholder="nsec.../ncryptsec..." v-model="this.ncryptsec">
|
<!-- <input class="u-Input" style="margin-left: 10px" type="search" name="user" autofocus placeholder="nsec.../ncryptsec..." v-model="this.ncryptsec">-->
|
||||||
<input v-if="ncryptsec.startsWith('ncryptsec')" class="u-Input" style="margin-left: 10px" type="password" name="user" autofocus placeholder="password..." v-model="this.pw">
|
<!-- <input v-if="ncryptsec.startsWith('ncryptsec')" class="u-Input" style="margin-left: 10px" type="password" name="user" autofocus placeholder="password..." v-model="this.pw">-->
|
||||||
|
|
||||||
<div class="modal-action">
|
<!-- <div class="modal-action">-->
|
||||||
<form method="dialog">
|
<!-- <form method="dialog">-->
|
||||||
<button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
|
<!-- <button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>-->
|
||||||
<!-- if there is a button in form, it will close the modal -->
|
<!-- <!– if there is a button in form, it will close the modal –>-->
|
||||||
<button class="btn" @click="sign_in_key()">Login</button>
|
<!-- <button class="btn" @click="sign_in_key()">Login</button>-->
|
||||||
</form>
|
<!-- </form>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
</dialog>
|
<!--</dialog>-->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -343,7 +343,7 @@ export default {
|
|||||||
|
|
||||||
// launch signup screen
|
// launch signup screen
|
||||||
if (launch){
|
if (launch){
|
||||||
await initNostrLogin({bunkers: 'nsec.app,highlighter.com', iife: true})
|
await initNostrLogin({bunkers: 'nsec.app,highlighter.com', iife: true, noBanner: true})
|
||||||
if (!localStorage.getItem('__nostrlogin_nip46')){
|
if (!localStorage.getItem('__nostrlogin_nip46')){
|
||||||
await new launchNostrLoginDialog({
|
await new launchNostrLoginDialog({
|
||||||
bunkers: 'nsec.app,highlighter.com'
|
bunkers: 'nsec.app,highlighter.com'
|
||||||
|
Reference in New Issue
Block a user