`,
@@ -115,7 +82,7 @@ import { ClearnetDomain } from './interface.service'
TuiBadge,
],
})
-export class DomainComponent {
+export class InterfaceClearnetDomainsItemComponent {
private readonly dialog = inject(DialogService)
private readonly loader = inject(LoadingService)
private readonly errorService = inject(ErrorService)
@@ -124,12 +91,6 @@ export class DomainComponent {
readonly domain = input.required()
- open = false
-
- toggle() {}
-
- edit() {}
-
remove() {
this.dialog
.openConfirm({ label: 'Are you sure?', size: 's' })
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.component.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.component.ts
index a06a4d91a..86769f728 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.component.ts
@@ -3,7 +3,7 @@ import { tuiButtonOptionsProvider } from '@taiga-ui/core'
import { MappedServiceInterface } from './interface.service'
import { InterfaceGatewaysComponent } from './gateways.component'
import { InterfaceTorDomainsComponent } from './tor-domains.component'
-import { InterfaceClearnetDomainsComponent } from './clearnet-domains.component'
+import { InterfaceClearnetDomainsComponent } from './clearnet-domains/clearnet-domains.component'
import { InterfaceAddressesComponent } from './addresses/addresses.component'
@Component({
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts
index 2fd09fd7b..a6ae68b49 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.service.ts
@@ -3,7 +3,7 @@ import { T, utils } from '@start9labs/start-sdk'
import { ConfigService } from 'src/app/services/config.service'
import { toAuthorityName } from 'src/app/utils/acme'
import { GatewayPlus } from 'src/app/services/gateway.service'
-import { DialogService, i18nKey } from '@start9labs/shared'
+import { i18nKey } from '@start9labs/shared'
type AddressWithInfo = {
url: URL
@@ -134,7 +134,9 @@ function toDisplayAddress(
]
// Tor (HTTP)
} else {
- bullets.unshift('Ideal for anonymous, remote connectivity')
+ bullets.unshift(
+ 'Ideal for anonymous, censorship-resistant hosting and remote access',
+ )
type = `${type} (HTTP)`
}
// ** Not Tor **
@@ -143,7 +145,7 @@ function toDisplayAddress(
const gateway = gateways.find(g => g.id === info.gatewayId)!
gatewayName = gateway.ipInfo.name
- const gatewayIpv4 = gateway.ipInfo.subnets[0]
+ const gatewayIpv4 = gateway.ipv4[0]
const isWireguard = gateway.ipInfo.deviceType === 'wireguard'
const localIdeal = 'Ideal for local access'
@@ -158,7 +160,7 @@ function toDisplayAddress(
access = 'private'
bullets = [
localIdeal,
- 'Not recommended for VPN access. VPNs do not support ".local" domains without extra configuration',
+ 'Not recommended for VPN access. VPNs do not support ".local" domains without advanced configuration',
lanRequired,
rootCaRequired,
]
@@ -174,7 +176,7 @@ function toDisplayAddress(
]
if (!gateway.public) {
bullets.push(
- `Requires creating a port forwarding rule in gateway "${gatewayName}": ${port} -> ${info.hostname.value}:${port}`,
+ `Requires port forwarding in gateway "${gatewayName}": ${port} -> ${info.hostname.value}:${port}`,
)
}
} else {
@@ -203,8 +205,8 @@ function toDisplayAddress(
if (info.public) {
access = 'public'
bullets = [
- `Requires creating DNS records for "${domains[info.hostname.value]?.root}", as shown in System -> Domains`,
- `Requires creating a port forwarding rule in gateway "${gatewayName}": ${port} -> ${info.hostname.value}:${port === 443 ? 5443 : port}`,
+ `Requires DNS record(s) for ${domains[info.hostname.value]?.root}, as shown in System -> Domains`,
+ `Requires port forwarding in gateway "${gatewayName}": ${port} -> ${info.hostname.value}:${port === 443 ? 5443 : port}`,
]
if (domain.acme) {
bullets.unshift('Ideal for public access via the Internet')
@@ -218,7 +220,7 @@ function toDisplayAddress(
} else {
access = 'private'
const ipPortBad = 'when using IP addresses and ports is undesirable'
- const customDnsRequired = `Requires creating custom DNS records for ${info.hostname.value} that resolve to ${gatewayIpv4}`
+ const customDnsRequired = `Requires DNS record for ${info.hostname.value} that resolve to ${gatewayIpv4}`
if (isWireguard) {
bullets = [
`${vpnAccess} StartTunnel (or similar) ${ipPortBad}`,
@@ -463,18 +465,9 @@ export type InterfaceGateway = GatewayPlus & {
enabled: boolean
}
-// export type InterfaceGateway = {
-// id: string
-// name: string
-// enabled: boolean
-// public: boolean
-// type: T.NetworkInterfaceType
-// lanIpv4: string | null
-// }
-
export type ClearnetDomain = {
fqdn: string
- authority: string | null
+ authority: string
public: boolean
}
diff --git a/web/projects/ui/src/app/routes/portal/routes/sideload/sideload.component.ts b/web/projects/ui/src/app/routes/portal/routes/sideload/sideload.component.ts
index 091fabd3d..8673e7c95 100644
--- a/web/projects/ui/src/app/routes/portal/routes/sideload/sideload.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/sideload/sideload.component.ts
@@ -57,10 +57,7 @@ import { MarketplacePkgSideload, validateS9pk } from './sideload.utils'
{{ 'Upload .s9pk package file' | i18n }}
@if (isTor) {
- {{
- 'Warning: package upload will be slow over Tor. Switch to local for a better experience.'
- | i18n
- }}
+ {{ 'Warning: package upload will be slow over Tor.' | i18n }}