diff --git a/package.json b/package.json index b241e07..5cd1a38 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "plebeian-signer", - "version": "v1.0.10", + "version": "v1.0.11", "custom": { "chrome": { - "version": "v1.0.10" + "version": "v1.0.11" }, "firefox": { - "version": "v1.0.10" + "version": "v1.0.11" } }, "scripts": { diff --git a/projects/chrome/public/manifest.json b/projects/chrome/public/manifest.json index 3621975..c53f9e3 100644 --- a/projects/chrome/public/manifest.json +++ b/projects/chrome/public/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "Plebeian Signer - Nostr Identity Manager & Signer", "description": "Manage and switch between multiple identities while interacting with Nostr apps", - "version": "1.0.10", + "version": "1.0.11", "homepage_url": "https://github.com/PlebeianApp/plebeian-signer", "options_page": "options.html", "permissions": [ diff --git a/projects/chrome/public/prompt.html b/projects/chrome/public/prompt.html index 8bf219a..fbd8eae 100644 --- a/projects/chrome/public/prompt.html +++ b/projects/chrome/public/prompt.html @@ -27,11 +27,66 @@ .page { height: 100%; display: grid; - grid-template-rows: 1fr 60px; + grid-template-rows: 1fr auto; grid-template-columns: 1fr; overflow-y: hidden; } + .actions { + display: flex; + flex-direction: column; + gap: 8px; + padding: var(--size); + background: var(--background); + } + + .action-row { + display: flex; + align-items: center; + gap: 8px; + } + + .action-label { + width: 60px; + font-size: 13px; + font-weight: 500; + color: var(--muted-foreground); + } + + .action-buttons { + display: flex; + gap: 8px; + flex: 1; + } + + .action-buttons button { + flex: 1; + padding: 8px 12px; + border-radius: 6px; + font-size: 13px; + font-weight: 500; + cursor: pointer; + border: none; + } + + .btn-reject { + background: var(--muted); + color: var(--foreground); + } + + .btn-reject:hover { + background: var(--border); + } + + .btn-accept { + background: var(--primary); + color: var(--primary-foreground); + } + + .btn-accept:hover { + opacity: 0.9; + } + .card { padding: var(--size); background: var(--background-light); @@ -54,6 +109,12 @@ font-size: 12px; color: gray; } + + .description { + margin: 0; + text-align: center; + line-height: 1.5; + } @@ -63,64 +124,31 @@ - -
- - - is requesting permission to
-
- read your public key
-
- - for the selected identity - - - +

+ is requesting permission to + read your public key for the selected identity + . +

- - - is requesting permission to
-
- read your relays
-
- - for the selected identity - - - +

+ is requesting permission to + read your relays for the selected identity + . +

- - - is requesting permission to
-
- sign an event (kind - )
-
- - for the selected identity - - - +

+ is requesting permission to + sign an event (kind ) + for the selected identity . +

@@ -130,20 +158,11 @@
- - - is requesting permission to
-
- encrypt a text (NIP04)
-
- - for the selected identity - - - +

+ is requesting permission to + encrypt a text (NIP04) for the selected identity + . +

@@ -153,20 +172,11 @@
- - - is requesting permission to
-
- encrypt a text (NIP44)
-
- - for the selected identity - - - +

+ is requesting permission to + encrypt a text (NIP44) for the selected identity + . +

@@ -176,20 +186,11 @@
- - - is requesting permission to
-
- decrypt a text (NIP04)
-
- - for the selected identity - - - +

+ is requesting permission to + decrypt a text (NIP04) for the selected identity + . +

@@ -199,20 +200,11 @@
- - - is requesting permission to
-
- decrypt a text (NIP44)
-
- - for the selected identity - - - +

+ is requesting permission to + decrypt a text (NIP44) for the selected identity + . +

@@ -224,47 +216,20 @@ -
-
- - - +
+
+ Reject +
+ + +
- -
- - -
    -
  • - -
    • -
+
+ Accept +
+ + +
diff --git a/projects/chrome/src/app/components/home/backups/backups.component.html b/projects/chrome/src/app/components/home/backups/backups.component.html index 4180f69..95c096a 100644 --- a/projects/chrome/src/app/components/home/backups/backups.component.html +++ b/projects/chrome/src/app/components/home/backups/backups.component.html @@ -1,7 +1,14 @@
- +
+ + @if (devMode) { + + } +
diff --git a/projects/chrome/src/app/components/home/backups/backups.component.ts b/projects/chrome/src/app/components/home/backups/backups.component.ts index a0da66e..1381f9e 100644 --- a/projects/chrome/src/app/components/home/backups/backups.component.ts +++ b/projects/chrome/src/app/components/home/backups/backups.component.ts @@ -3,9 +3,9 @@ import { Router } from '@angular/router'; import { ConfirmComponent, LoggerService, + NavComponent, SignerMetaData_VaultSnapshot, StartupService, - StorageService, } from '@common'; import { getNewStorageServiceConfig } from '../../../common/data/get-new-storage-service-config'; @@ -15,9 +15,8 @@ import { getNewStorageServiceConfig } from '../../../common/data/get-new-storage styleUrl: './backups.component.scss', imports: [ConfirmComponent], }) -export class BackupsComponent implements OnInit { +export class BackupsComponent extends NavComponent implements OnInit { readonly #router = inject(Router); - readonly #storage = inject(StorageService); readonly #startup = inject(StartupService); readonly #logger = inject(LoggerService); @@ -27,11 +26,11 @@ export class BackupsComponent implements OnInit { ngOnInit(): void { this.loadBackups(); - this.maxBackups = this.#storage.getSignerMetaHandler().getMaxBackups(); + this.maxBackups = this.storage.getSignerMetaHandler().getMaxBackups(); } loadBackups(): void { - this.backups = this.#storage.getSignerMetaHandler().getBackups(); + this.backups = this.storage.getSignerMetaHandler().getBackups(); } async onMaxBackupsChange(event: Event): Promise { @@ -39,14 +38,14 @@ export class BackupsComponent implements OnInit { const value = parseInt(input.value, 10); if (!isNaN(value) && value >= 1 && value <= 20) { this.maxBackups = value; - await this.#storage.getSignerMetaHandler().setMaxBackups(value); + await this.storage.getSignerMetaHandler().setMaxBackups(value); } } async createManualBackup(): Promise { - const browserSyncData = this.#storage.getBrowserSyncHandler().browserSyncData; + const browserSyncData = this.storage.getBrowserSyncHandler().browserSyncData; if (browserSyncData) { - await this.#storage.getSignerMetaHandler().createBackup(browserSyncData, 'manual'); + await this.storage.getSignerMetaHandler().createBackup(browserSyncData, 'manual'); this.loadBackups(); } } @@ -55,22 +54,22 @@ export class BackupsComponent implements OnInit { this.restoringBackupId = backupId; try { // First, create a pre-restore backup of current state - const currentData = this.#storage.getBrowserSyncHandler().browserSyncData; + const currentData = this.storage.getBrowserSyncHandler().browserSyncData; if (currentData) { - await this.#storage.getSignerMetaHandler().createBackup(currentData, 'pre-restore'); + await this.storage.getSignerMetaHandler().createBackup(currentData, 'pre-restore'); } // Get the backup data - const backupData = this.#storage.getSignerMetaHandler().getBackupData(backupId); + const backupData = this.storage.getSignerMetaHandler().getBackupData(backupId); if (!backupData) { throw new Error('Backup not found'); } // Import the backup - await this.#storage.deleteVault(true); - await this.#storage.importVault(backupData); + await this.storage.deleteVault(true); + await this.storage.importVault(backupData); this.#logger.logVaultImport('Backup Restore'); - this.#storage.isInitialized = false; + this.storage.isInitialized = false; this.#startup.startOver(getNewStorageServiceConfig()); } catch (error) { console.error('Failed to restore backup:', error); @@ -79,7 +78,7 @@ export class BackupsComponent implements OnInit { } async deleteBackup(backupId: string): Promise { - await this.#storage.getSignerMetaHandler().deleteBackup(backupId); + await this.storage.getSignerMetaHandler().deleteBackup(backupId); this.loadBackups(); } @@ -120,7 +119,7 @@ export class BackupsComponent implements OnInit { async onClickLock(): Promise { this.#logger.logVaultLock(); - await this.#storage.lockVault(); + await this.storage.lockVault(); this.#router.navigateByUrl('/vault-login'); } } diff --git a/projects/chrome/src/app/components/home/bookmarks/bookmarks.component.html b/projects/chrome/src/app/components/home/bookmarks/bookmarks.component.html index cbc4076..114fbd0 100644 --- a/projects/chrome/src/app/components/home/bookmarks/bookmarks.component.html +++ b/projects/chrome/src/app/components/home/bookmarks/bookmarks.component.html @@ -1,9 +1,16 @@
- +
+ + @if (devMode) { + + } +
Bookmarks +
+ + @if (devMode) { + + } +
Identities +
+ + @if (devMode) { + + } +
You +
+ + @if (devMode) { + + } +
Plebeian Signer
diff --git a/projects/chrome/src/app/components/home/info/info.component.ts b/projects/chrome/src/app/components/home/info/info.component.ts index b8ae822..ba569a2 100644 --- a/projects/chrome/src/app/components/home/info/info.component.ts +++ b/projects/chrome/src/app/components/home/info/info.component.ts @@ -1,6 +1,6 @@ import { Component, inject } from '@angular/core'; import { Router } from '@angular/router'; -import { LoggerService, StorageService } from '@common'; +import { LoggerService, NavComponent } from '@common'; import packageJson from '../../../../../../../package.json'; @Component({ @@ -8,16 +8,15 @@ import packageJson from '../../../../../../../package.json'; templateUrl: './info.component.html', styleUrl: './info.component.scss', }) -export class InfoComponent { +export class InfoComponent extends NavComponent { readonly #logger = inject(LoggerService); - readonly #storage = inject(StorageService); readonly #router = inject(Router); version = packageJson.custom.chrome.version; async onClickLock() { this.#logger.logVaultLock(); - await this.#storage.lockVault(); + await this.storage.lockVault(); this.#router.navigateByUrl('/vault-login'); } } diff --git a/projects/chrome/src/app/components/home/logs/logs.component.html b/projects/chrome/src/app/components/home/logs/logs.component.html index 304ba55..40c94c0 100644 --- a/projects/chrome/src/app/components/home/logs/logs.component.html +++ b/projects/chrome/src/app/components/home/logs/logs.component.html @@ -1,7 +1,14 @@
- +
+ + @if (devMode) { + + } +
Logs
diff --git a/projects/chrome/src/app/components/home/logs/logs.component.ts b/projects/chrome/src/app/components/home/logs/logs.component.ts index cfd9789..40782d4 100644 --- a/projects/chrome/src/app/components/home/logs/logs.component.ts +++ b/projects/chrome/src/app/components/home/logs/logs.component.ts @@ -1,6 +1,6 @@ import { Component, inject, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { LoggerService, LogEntry, StorageService } from '@common'; +import { LoggerService, LogEntry, NavComponent } from '@common'; import { DatePipe } from '@angular/common'; @Component({ @@ -9,9 +9,8 @@ import { DatePipe } from '@angular/common'; styleUrl: './logs.component.scss', imports: [DatePipe], }) -export class LogsComponent implements OnInit { +export class LogsComponent extends NavComponent implements OnInit { readonly #logger = inject(LoggerService); - readonly #storage = inject(StorageService); readonly #router = inject(Router); get logs(): LogEntry[] { @@ -46,7 +45,7 @@ export class LogsComponent implements OnInit { async onClickLock() { this.#logger.logVaultLock(); - await this.#storage.lockVault(); + await this.storage.lockVault(); this.#router.navigateByUrl('/vault-login'); } } diff --git a/projects/chrome/src/app/components/home/settings/settings.component.html b/projects/chrome/src/app/components/home/settings/settings.component.html index 866cab9..d457de7 100644 --- a/projects/chrome/src/app/components/home/settings/settings.component.html +++ b/projects/chrome/src/app/components/home/settings/settings.component.html @@ -1,10 +1,39 @@
- +
+ + @if (devMode) { + + } +
Settings
+
+ + +
+ + + + + +
+ +
+ +
+
SYNC: {{ syncFlow }}

@@ -13,20 +42,6 @@

- - - - - - - - -
- +
+ + @if (devMode) { + + } +
@if (showBackButton) {
- -
- - - is requesting permission to
-
- read your public key
-
- - for the selected identity - - - +

+ is requesting permission to + read your public key for the selected identity + . +

- - - is requesting permission to
-
- read your relays
-
- - for the selected identity - - - +

+ is requesting permission to + read your relays for the selected identity + . +

- - - is requesting permission to
-
- sign an event (kind - )
-
- - for the selected identity - - - +

+ is requesting permission to + sign an event (kind ) + for the selected identity . +

@@ -130,20 +158,11 @@
- - - is requesting permission to
-
- encrypt a text (NIP04)
-
- - for the selected identity - - - +

+ is requesting permission to + encrypt a text (NIP04) for the selected identity + . +

@@ -153,20 +172,11 @@
- - - is requesting permission to
-
- encrypt a text (NIP44)
-
- - for the selected identity - - - +

+ is requesting permission to + encrypt a text (NIP44) for the selected identity + . +

@@ -176,20 +186,11 @@
- - - is requesting permission to
-
- decrypt a text (NIP04)
-
- - for the selected identity - - - +

+ is requesting permission to + decrypt a text (NIP04) for the selected identity + . +

@@ -199,20 +200,11 @@
- - - is requesting permission to
-
- decrypt a text (NIP44)
-
- - for the selected identity - - - +

+ is requesting permission to + decrypt a text (NIP44) for the selected identity + . +

@@ -224,47 +216,20 @@ -
-
- - -
    -
  • - -
    • -
+
+
+ Reject +
+ + +
- -
- - -
    -
  • - -
    • -
+
+ Accept +
+ + +
diff --git a/projects/firefox/src/app/components/home/backups/backups.component.html b/projects/firefox/src/app/components/home/backups/backups.component.html index 4180f69..95c096a 100644 --- a/projects/firefox/src/app/components/home/backups/backups.component.html +++ b/projects/firefox/src/app/components/home/backups/backups.component.html @@ -1,7 +1,14 @@
- +
+ + @if (devMode) { + + } +
diff --git a/projects/firefox/src/app/components/home/backups/backups.component.ts b/projects/firefox/src/app/components/home/backups/backups.component.ts index a0da66e..1381f9e 100644 --- a/projects/firefox/src/app/components/home/backups/backups.component.ts +++ b/projects/firefox/src/app/components/home/backups/backups.component.ts @@ -3,9 +3,9 @@ import { Router } from '@angular/router'; import { ConfirmComponent, LoggerService, + NavComponent, SignerMetaData_VaultSnapshot, StartupService, - StorageService, } from '@common'; import { getNewStorageServiceConfig } from '../../../common/data/get-new-storage-service-config'; @@ -15,9 +15,8 @@ import { getNewStorageServiceConfig } from '../../../common/data/get-new-storage styleUrl: './backups.component.scss', imports: [ConfirmComponent], }) -export class BackupsComponent implements OnInit { +export class BackupsComponent extends NavComponent implements OnInit { readonly #router = inject(Router); - readonly #storage = inject(StorageService); readonly #startup = inject(StartupService); readonly #logger = inject(LoggerService); @@ -27,11 +26,11 @@ export class BackupsComponent implements OnInit { ngOnInit(): void { this.loadBackups(); - this.maxBackups = this.#storage.getSignerMetaHandler().getMaxBackups(); + this.maxBackups = this.storage.getSignerMetaHandler().getMaxBackups(); } loadBackups(): void { - this.backups = this.#storage.getSignerMetaHandler().getBackups(); + this.backups = this.storage.getSignerMetaHandler().getBackups(); } async onMaxBackupsChange(event: Event): Promise { @@ -39,14 +38,14 @@ export class BackupsComponent implements OnInit { const value = parseInt(input.value, 10); if (!isNaN(value) && value >= 1 && value <= 20) { this.maxBackups = value; - await this.#storage.getSignerMetaHandler().setMaxBackups(value); + await this.storage.getSignerMetaHandler().setMaxBackups(value); } } async createManualBackup(): Promise { - const browserSyncData = this.#storage.getBrowserSyncHandler().browserSyncData; + const browserSyncData = this.storage.getBrowserSyncHandler().browserSyncData; if (browserSyncData) { - await this.#storage.getSignerMetaHandler().createBackup(browserSyncData, 'manual'); + await this.storage.getSignerMetaHandler().createBackup(browserSyncData, 'manual'); this.loadBackups(); } } @@ -55,22 +54,22 @@ export class BackupsComponent implements OnInit { this.restoringBackupId = backupId; try { // First, create a pre-restore backup of current state - const currentData = this.#storage.getBrowserSyncHandler().browserSyncData; + const currentData = this.storage.getBrowserSyncHandler().browserSyncData; if (currentData) { - await this.#storage.getSignerMetaHandler().createBackup(currentData, 'pre-restore'); + await this.storage.getSignerMetaHandler().createBackup(currentData, 'pre-restore'); } // Get the backup data - const backupData = this.#storage.getSignerMetaHandler().getBackupData(backupId); + const backupData = this.storage.getSignerMetaHandler().getBackupData(backupId); if (!backupData) { throw new Error('Backup not found'); } // Import the backup - await this.#storage.deleteVault(true); - await this.#storage.importVault(backupData); + await this.storage.deleteVault(true); + await this.storage.importVault(backupData); this.#logger.logVaultImport('Backup Restore'); - this.#storage.isInitialized = false; + this.storage.isInitialized = false; this.#startup.startOver(getNewStorageServiceConfig()); } catch (error) { console.error('Failed to restore backup:', error); @@ -79,7 +78,7 @@ export class BackupsComponent implements OnInit { } async deleteBackup(backupId: string): Promise { - await this.#storage.getSignerMetaHandler().deleteBackup(backupId); + await this.storage.getSignerMetaHandler().deleteBackup(backupId); this.loadBackups(); } @@ -120,7 +119,7 @@ export class BackupsComponent implements OnInit { async onClickLock(): Promise { this.#logger.logVaultLock(); - await this.#storage.lockVault(); + await this.storage.lockVault(); this.#router.navigateByUrl('/vault-login'); } } diff --git a/projects/firefox/src/app/components/home/bookmarks/bookmarks.component.html b/projects/firefox/src/app/components/home/bookmarks/bookmarks.component.html index cbc4076..114fbd0 100644 --- a/projects/firefox/src/app/components/home/bookmarks/bookmarks.component.html +++ b/projects/firefox/src/app/components/home/bookmarks/bookmarks.component.html @@ -1,9 +1,16 @@
- +
+ + @if (devMode) { + + } +
Bookmarks +
+ + @if (devMode) { + + } +
Identities +
+ + @if (devMode) { + + } +
You +
+ + @if (devMode) { + + } +
Plebeian Signer
diff --git a/projects/firefox/src/app/components/home/info/info.component.ts b/projects/firefox/src/app/components/home/info/info.component.ts index ee8cc6d..493ff16 100644 --- a/projects/firefox/src/app/components/home/info/info.component.ts +++ b/projects/firefox/src/app/components/home/info/info.component.ts @@ -1,6 +1,6 @@ import { Component, inject } from '@angular/core'; import { Router } from '@angular/router'; -import { LoggerService, StorageService } from '@common'; +import { LoggerService, NavComponent } from '@common'; import packageJson from '../../../../../../../package.json'; @Component({ @@ -8,16 +8,15 @@ import packageJson from '../../../../../../../package.json'; templateUrl: './info.component.html', styleUrl: './info.component.scss', }) -export class InfoComponent { +export class InfoComponent extends NavComponent { readonly #logger = inject(LoggerService); - readonly #storage = inject(StorageService); readonly #router = inject(Router); version = packageJson.custom.firefox.version; async onClickLock() { this.#logger.logVaultLock(); - await this.#storage.lockVault(); + await this.storage.lockVault(); this.#router.navigateByUrl('/vault-login'); } } diff --git a/projects/firefox/src/app/components/home/logs/logs.component.html b/projects/firefox/src/app/components/home/logs/logs.component.html index 304ba55..40c94c0 100644 --- a/projects/firefox/src/app/components/home/logs/logs.component.html +++ b/projects/firefox/src/app/components/home/logs/logs.component.html @@ -1,7 +1,14 @@
- +
+ + @if (devMode) { + + } +
Logs
diff --git a/projects/firefox/src/app/components/home/logs/logs.component.ts b/projects/firefox/src/app/components/home/logs/logs.component.ts index cfd9789..40782d4 100644 --- a/projects/firefox/src/app/components/home/logs/logs.component.ts +++ b/projects/firefox/src/app/components/home/logs/logs.component.ts @@ -1,6 +1,6 @@ import { Component, inject, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { LoggerService, LogEntry, StorageService } from '@common'; +import { LoggerService, LogEntry, NavComponent } from '@common'; import { DatePipe } from '@angular/common'; @Component({ @@ -9,9 +9,8 @@ import { DatePipe } from '@angular/common'; styleUrl: './logs.component.scss', imports: [DatePipe], }) -export class LogsComponent implements OnInit { +export class LogsComponent extends NavComponent implements OnInit { readonly #logger = inject(LoggerService); - readonly #storage = inject(StorageService); readonly #router = inject(Router); get logs(): LogEntry[] { @@ -46,7 +45,7 @@ export class LogsComponent implements OnInit { async onClickLock() { this.#logger.logVaultLock(); - await this.#storage.lockVault(); + await this.storage.lockVault(); this.#router.navigateByUrl('/vault-login'); } } diff --git a/projects/firefox/src/app/components/home/settings/settings.component.html b/projects/firefox/src/app/components/home/settings/settings.component.html index 1205464..b5978fd 100644 --- a/projects/firefox/src/app/components/home/settings/settings.component.html +++ b/projects/firefox/src/app/components/home/settings/settings.component.html @@ -1,10 +1,39 @@
- +
+ + @if (devMode) { + + } +
Settings
+
+ + +
+ + + + + +
+ +
+ +
+
SYNC: {{ syncFlow }}

@@ -13,25 +42,11 @@

- - - - - - - - -
- +
+ + @if (devMode) { + + } +
@if (showBackButton) {