Mods porter added to UI, mods link added

sidequestlegend · Jul 19, 2019 · 3f15ff4 · 3f15ff4
1 parent aff1660
commit 3f15ff4
Show file tree

Hide file tree

Showing 11 changed files with 697 additions and 656 deletions.
diff --git a/BeatOn/Assets/www/index.html b/BeatOn/Assets/www/index.html
@@ -13,5 +13,5 @@
 <link rel="stylesheet" href="styles.c6e01a63cc411e900bea.css"></head>
 <body fxLayout="column">
   <app-root fxLayout="column"></app-root>
-<script src="runtime-es2015.858f8dd898b75fe86926.js" type="module"></script><script src="polyfills-es2015.4aaaf8cdea71ba6ebdaf.js" type="module"></script><script src="runtime-es5.741402d1d47331ce975c.js" nomodule></script><script src="polyfills-es5.27d81060418231ff91d8.js" nomodule></script><script src="main-es2015.c463a2c58d5bd7fc4ea0.js" type="module"></script><script src="main-es5.cdde60106da1a196bd2b.js" nomodule></script></body>
+<script src="runtime-es2015.858f8dd898b75fe86926.js" type="module"></script><script src="polyfills-es2015.4aaaf8cdea71ba6ebdaf.js" type="module"></script><script src="runtime-es5.741402d1d47331ce975c.js" nomodule></script><script src="polyfills-es5.27d81060418231ff91d8.js" nomodule></script><script src="main-es2015.ec1293e4aafe7401ebad.js" type="module"></script><script src="main-es5.fba114a0e9a38eab8372.js" nomodule></script></body>
 </html>
diff --git a/...s/www/main-es2015.c463a2c58d5bd7fc4ea0.js → ...s/www/main-es2015.ec1293e4aafe7401ebad.js b/...s/www/main-es2015.c463a2c58d5bd7fc4ea0.js → ...s/www/main-es2015.ec1293e4aafe7401ebad.js
diff --git a/...sets/www/main-es5.cdde60106da1a196bd2b.js → ...sets/www/main-es5.fba114a0e9a38eab8372.js b/...sets/www/main-es5.cdde60106da1a196bd2b.js → ...sets/www/main-es5.fba114a0e9a38eab8372.js
diff --git a/BeatOn/BeatOn.csproj b/BeatOn/BeatOn.csproj
@@ -377,13 +377,13 @@
     <AndroidAsset Include="Assets\www\assets\note.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="Assets\www\main-es5.cdde60106da1a196bd2b.js" />
+    <AndroidAsset Include="Assets\www\styles.c6e01a63cc411e900bea.css" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="Assets\www\main-es2015.c463a2c58d5bd7fc4ea0.js" />
+    <AndroidAsset Include="Assets\www\main-es2015.ec1293e4aafe7401ebad.js" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="Assets\www\styles.c6e01a63cc411e900bea.css" />
+    <AndroidAsset Include="Assets\www\main-es5.fba114a0e9a38eab8372.js" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

diff --git a/BeatOn/ImportManager.cs b/BeatOn/ImportManager.cs
@@ -524,7 +524,7 @@ private void ExtractAndInstallMod(IFileProvider provider)
                 catch (Exception ex)
                 {
                     Log.LogErr($"Exception trying to load mod from provider {provider.SourceName}", ex);
-                    throw new ImportException($"Exception trying to load mod from provider {provider.SourceName}", $"Unable to load mod from {provider.SourceName}, it does not appear to be a valid mod file.", ex);
+                    throw new ImportException($"Exception trying to load mod from provider {provider.SourceName}", $"Unable to load mod from {provider.SourceName}, it may be an invalid file or another mod of the same type failed to uninstall.", ex);
                 }
             }
         }

diff --git a/BeatOn/Properties/AssemblyInfo.cs b/BeatOn/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.9.8")]
-[assembly: AssemblyFileVersion("0.0.9.8")]
+[assembly: AssemblyVersion("0.0.9.9")]
+[assembly: AssemblyFileVersion("0.0.9.9")]
diff --git a/QuestomAssets b/QuestomAssets
diff --git a/frontend/src/app/browser-nav/browser-nav.component.ts b/frontend/src/app/browser-nav/browser-nav.component.ts
@@ -1,26 +1,24 @@
 import { Component, OnInit, Output, EventEmitter } from '@angular/core';
 
 @Component({
-  selector: 'app-browser-nav',
-  templateUrl: './browser-nav.component.html',
-  styleUrls: ['./browser-nav.component.scss']
+    selector: 'app-browser-nav',
+    templateUrl: './browser-nav.component.html',
+    styleUrls: ['./browser-nav.component.scss'],
 })
 export class BrowserNavComponent implements OnInit {
+    constructor() {}
+    browserLinks: any[] = [
+        { title: 'Beast Saber', url: 'https://bsaber.com' },
+        { title: 'Beat Saver', url: 'https://beatsaver.com' },
+        { title: 'Google', url: 'https://google.com' },
+        { title: 'Mods', url: 'https://github.com/RedBrumbler/BeatOnCustomSabers' },
+    ];
 
-  constructor() { }
-  browserLinks :any[] = [
-    { title: "Beast Saber", url: "https://bsaber.com"},
-    { title: "Beat Saver", url: "https://beatsaver.com"},
-    { title: "Google", url: "https://google.com"}
-  ]
-
-  @Output() linkSelected = new EventEmitter<string>();
+    @Output() linkSelected = new EventEmitter<string>();
 
-  clickLink(link) {
-    this.linkSelected.emit(link.url);
-  }
-
-  ngOnInit() {
-  }
+    clickLink(link) {
+        this.linkSelected.emit(link.url);
+    }
 
+    ngOnInit() {}
 }
diff --git a/frontend/src/app/main-mods/main-mods.component.html b/frontend/src/app/main-mods/main-mods.component.html
@@ -24,14 +24,14 @@
 </section>
 <section class="container" >
   <div *ngIf="!config">No Mods!</div>
-  <div fxFlex="50%">
+  <div fxFlex="60%">
     <mat-list>
       <!-- [class.selected]="mod === selectedMod" (click)="onSelect(mod); myModal.open()" -->
         <mat-list-item class="modContainer" *ngFor="let mod of config.Mods" >
           <div [ngStyle]="{'background-image': getModBG(mod)}" class="modCategory"></div>
           <div matTooltip="Delete the mod from Beat On." (click)="clickDeleteMod(mod)" class="deleteMod"><mat-icon>delete_forever</mat-icon></div>
-          <h1 matLine> {{ mod.Name }} <span class="version">v{{ mod.Version }}</span></h1>
-          <h3 matLine> by {{ mod.Author }}</h3>
+          <h1 matLine> {{ mod.Name }} <span class="version">{{ mod.Version }}</span></h1>
+          <h4 matLine> by {{ mod.Author }}<span *ngIf="mod.Porter">, ported by: {{ mod.Porter }}</span></h4>
           <div matLine class="description"> {{ mod.Description }}</div>
 
 
@@ -59,7 +59,7 @@ <h4 class="modal-title" id="myModalLabel2" *ngIf="selectedMod">{{ selectedMod.Na
     </div>
     <div class="modal-body">
       <section class="mat-typography">
-        <h3 class="mat-display-1" *ngIf="selectedMod"> Created by: {{ selectedMod.Author }} </h3>
+        <h3 class="mat-display-1" *ngIf="selectedMod"> Created by: {{ selectedMod.Author }}</h3>
         <p *ngIf="selectedMod"> {{ selectedMod.Description }} </p>
         <button mat-raised-button="" class="md-raised md-primary">Install</button>
         <a *ngIf="selectedMod" href="{{ selectedMod.InfoUrl }}" > More Info </a>

diff --git a/frontend/src/app/main-mods/main-mods.component.scss b/frontend/src/app/main-mods/main-mods.component.scss
@@ -2,7 +2,7 @@
   //   width: 600px;
   height: 49px;
   overflow-y: auto;
-  margin-left: 300px;
+  margin-left: 200px;
 }
 
 .modContainer {

diff --git a/frontend/src/app/models/ModDefinition.ts b/frontend/src/app/models/ModDefinition.ts
@@ -9,6 +9,7 @@ export class ModDefinition {
     TargetBeatSaberVersion: string;
     Version: string;
     CoverImageFilename: string;
+    Porter: string;
 }
 
 export enum ModStatusType {
+21 −5		QuestomAssets/Mods/ModDefinition.cs
+164 −0		QuestomAssets/beatonmod-schema.json