Merge branch 'feature/v4' of https://github.com/tidusjar/Ombi into feature/v4

pull/3338/head
tidusjar 5 years ago
commit 0b37ee940a

@ -1,3 +1,6 @@
# ASP.NET Core # ASP.NET Core
# Build and test ASP.NET Core projects targeting .NET Core. # Build and test ASP.NET Core projects targeting .NET Core.
# Add steps that run tests, create a NuGet package, deploy, and more: # Add steps that run tests, create a NuGet package, deploy, and more:
@ -23,64 +26,21 @@ pool:
steps: steps:
- task: CmdLine@2 - task: Yarn@3
displayName: Run Build Script displayName: Install UI Dependancies
inputs:
script: './build.sh'
- task: CmdLine@2
inputs:
script: |
cd src/Ombi/bin/Release/netcoreapp3.0
ls
workingDirectory: '$(Build.SourcesDirectory)'
- task: CopyFiles@2
displayName: Upload Windows Build
inputs:
SourceFolder: '$(publishLocation)/windows.zip'
TargetFolder: '$(Build.ArtifactStagingDirectory)'
OverWrite: true
- task: CopyFiles@2
displayName: Upload OSX Build
inputs:
SourceFolder: '**/osx.tar.gz'
TargetFolder: '$(Build.ArtifactStagingDirectory)'
OverWrite: true
- task: CopyFiles@2
displayName: Upload Linux Build
inputs:
SourceFolder: '$(publishLocation)/linux.tar.gz'
TargetFolder: '$(Build.ArtifactStagingDirectory)'
OverWrite: true
- task: CopyFiles@2
displayName: Upload Linux-ARM Build
inputs:
SourceFolder: '$(publishLocation)/linux-arm.tar.gz'
TargetFolder: '$(Build.ArtifactStagingDirectory)'
OverWrite: true
- task: CopyFiles@2
displayName: Upload Windows 32Bit Build
inputs: inputs:
SourceFolder: '$(publishLocation)/windows-32bit.zip' projectDirectory: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/'
TargetFolder: '$(Build.ArtifactStagingDirectory)' arguments: 'install'
OverWrite: true
- task: CopyFiles@2 - task: DotNetCoreCLI@2
displayName: Upload Linux-ARM64 Build displayName: Run Unit Tests
inputs: inputs:
SourceFolder: '$(publishLocation)/linux-arm64.tar.gz' command: 'test'
TargetFolder: '$(Build.ArtifactStagingDirectory)' projects: '**/*Tests.csproj'
OverWrite: true
- task: PublishTestResults@2 - task: DotNetCoreCLI@2
displayName: Upload Test Results displayName: Publish Win10-x64
inputs: inputs:
testResultsFormat: 'VSTest' command: 'publish'
testResultsFiles: '**/Test.trx' publishWebProjects: true
mergeTestResults: true arguments: '-c $(buildConfiguration) -r "win10-x64"'
failTaskOnFailedTests: true
testRunTitle: 'Unit Tests'

@ -35,7 +35,6 @@
"angular-bootstrap-md": "^7.5.4", "angular-bootstrap-md": "^7.5.4",
"angular-router-loader": "^0.8.5", "angular-router-loader": "^0.8.5",
"angular2-template-loader": "^0.6.2", "angular2-template-loader": "^0.6.2",
"angularx-qrcode": "^1.7.0-beta.5",
"aspnet-prerendering": "^3.0.1", "aspnet-prerendering": "^3.0.1",
"awesome-typescript-loader": "^5.2.0", "awesome-typescript-loader": "^5.2.0",
"bootstrap": "^4.2.1", "bootstrap": "^4.2.1",

@ -14,8 +14,8 @@ export class UserPreferenceComponent implements OnInit {
public username: string; public username: string;
public selectedLang: string; public selectedLang: string;
public availableLanguages = AvailableLanguages; public availableLanguages = AvailableLanguages;
public qrCode: string; //public qrCode: string;
public qrCodeEnabled: boolean; //public qrCodeEnabled: boolean;
constructor(private authService: AuthService, constructor(private authService: AuthService,
private readonly translate: TranslateService, private readonly translate: TranslateService,
@ -31,13 +31,13 @@ export class UserPreferenceComponent implements OnInit {
const customization = await this.settingsService.getCustomization().toPromise(); const customization = await this.settingsService.getCustomization().toPromise();
const accessToken = await this.identityService.getAccessToken().toPromise(); const accessToken = await this.identityService.getAccessToken().toPromise();
this.qrCode = `${customization.applicationUrl}|${accessToken}`; //this.qrCode = `${customization.applicationUrl}|${accessToken}`;
if(!customization.applicationUrl) { //if(!customization.applicationUrl) {
this.qrCodeEnabled = false; // this.qrCodeEnabled = false;
} else { //} else {
this.qrCodeEnabled = true; // this.qrCodeEnabled = true;
} //}
const selectedLang = this.storage.get("Language"); const selectedLang = this.storage.get("Language");
if (selectedLang) { if (selectedLang) {

@ -1,6 +1,5 @@
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { RouterModule } from "@angular/router" import { RouterModule } from "@angular/router"
import { QRCodeModule } from 'angularx-qrcode';
import { MatCheckboxModule } from '@angular/material'; import { MatCheckboxModule } from '@angular/material';
@ -13,7 +12,6 @@ import * as fromComponents from './components';
imports: [ imports: [
RouterModule.forChild(fromComponents.routes), RouterModule.forChild(fromComponents.routes),
SharedModule, SharedModule,
QRCodeModule,
MatCheckboxModule, MatCheckboxModule,
], ],
declarations: [ declarations: [

Loading…
Cancel
Save