Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix merge issues for setup-wizard project

Browse Source
This commit is contained in:
waterplea
2024-08-10 14:26:15 +04:00
parent 81932c8cff
commit 657aac0d68
27 changed files with 322 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/projects/setup-wizard/src/app/services/live-api.service.ts
View File

@@ -1,23 +1,19 @@
import { DOCUMENT } from '@angular/common'
import { Inject, Injectable } from '@angular/core'
import {
DiskListResponse,
StartOSDiskInfo,
encodeBase64,
HttpService,
isRpcError,
Log,
RpcError,
RPCOptions,
SetupStatus,
FollowLogsRes,
FollowLogsReq,
StartOSDiskInfo,
} from '@start9labs/shared'
import { T } from '@start9labs/start-sdk'
import { ApiService } from './api.service'
import * as jose from 'node-jose'
import { Observable } from 'rxjs'
import { DOCUMENT } from '@angular/common'
import { webSocket } from 'rxjs/webSocket'
import { ApiService } from './api.service'
@Injectable({
providedIn: 'root',

21
web/projects/setup-wizard/src/app/services/mock-api.service.ts
View File

@@ -1,27 +1,14 @@
import { Injectable } from '@angular/core'
import {
DiskListResponse,
StartOSDiskInfo,
encodeBase64,
pauseFor,
StartOSDiskInfo,
} from '@start9labs/shared'
import { ApiService } from './api.service'
import * as jose from 'node-jose'
import { T } from '@start9labs/start-sdk'
import {
Observable,
concatMap,
delay,
from,
interval,
map,
mergeScan,
of,
startWith,
switchMap,
switchScan,
takeWhile,
} from 'rxjs'
import * as jose from 'node-jose'
import { Observable, of } from 'rxjs'
import { ApiService } from './api.service'
@Injectable({
providedIn: 'root',