Skip to content

Commit 3f15ff4

Browse files
emulameremulamer
committed
Mods porter added to UI, mods link added
1 parent aff1660 commit 3f15ff4

File tree

11 files changed

+697
-656
lines changed

11 files changed

+697
-656
lines changed

‎BeatOn/Assets/www/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<link rel="stylesheet" href="styles.c6e01a63cc411e900bea.css"></head>
1414
<body fxLayout="column">
1515
<app-root fxLayout="column"></app-root>
16-
<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>
16+
<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>
1717
</html>

‎BeatOn/Assets/www/main-es2015.c463a2c58d5bd7fc4ea0.js renamed to ‎BeatOn/Assets/www/main-es2015.ec1293e4aafe7401ebad.js

Lines changed: 336 additions & 315 deletions
Large diffs are not rendered by default.

‎BeatOn/Assets/www/main-es5.cdde60106da1a196bd2b.js renamed to ‎BeatOn/Assets/www/main-es5.fba114a0e9a38eab8372.js

Lines changed: 332 additions & 311 deletions
Large diffs are not rendered by default.

‎BeatOn/BeatOn.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,13 @@
377377
<AndroidAsset Include="Assets\www\assets\note.png" />
378378
</ItemGroup>
379379
<ItemGroup>
380-
<AndroidAsset Include="Assets\www\main-es5.cdde60106da1a196bd2b.js" />
380+
<AndroidAsset Include="Assets\www\styles.c6e01a63cc411e900bea.css" />
381381
</ItemGroup>
382382
<ItemGroup>
383-
<AndroidAsset Include="Assets\www\main-es2015.c463a2c58d5bd7fc4ea0.js" />
383+
<AndroidAsset Include="Assets\www\main-es2015.ec1293e4aafe7401ebad.js" />
384384
</ItemGroup>
385385
<ItemGroup>
386-
<AndroidAsset Include="Assets\www\styles.c6e01a63cc411e900bea.css" />
386+
<AndroidAsset Include="Assets\www\main-es5.fba114a0e9a38eab8372.js" />
387387
</ItemGroup>
388388
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
389389
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎BeatOn/ImportManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ private void ExtractAndInstallMod(IFileProvider provider)
524524
catch (Exception ex)
525525
{
526526
Log.LogErr($"Exception trying to load mod from provider {provider.SourceName}", ex);
527-
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);
527+
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);
528528
}
529529
}
530530
}

‎BeatOn/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
// You can specify all the values or you can default the Build and Revision Numbers
2727
// by using the '*' as shown below:
2828
// [assembly: AssemblyVersion("1.0.*")]
29-
[assembly: AssemblyVersion("0.0.9.8")]
30-
[assembly: AssemblyFileVersion("0.0.9.8")]
29+
[assembly: AssemblyVersion("0.0.9.9")]
30+
[assembly: AssemblyFileVersion("0.0.9.9")]

‎QuestomAssets

‎frontend/src/app/browser-nav/browser-nav.component.ts

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
import { Component, OnInit, Output, EventEmitter } from '@angular/core';
22

33
@Component({
4-
selector: 'app-browser-nav',
5-
templateUrl: './browser-nav.component.html',
6-
styleUrls: ['./browser-nav.component.scss']
4+
selector: 'app-browser-nav',
5+
templateUrl: './browser-nav.component.html',
6+
styleUrls: ['./browser-nav.component.scss'],
77
})
88
export class BrowserNavComponent implements OnInit {
9+
constructor() {}
10+
browserLinks: any[] = [
11+
{ title: 'Beast Saber', url: 'https://bsaber.com' },
12+
{ title: 'Beat Saver', url: 'https://beatsaver.com' },
13+
{ title: 'Google', url: 'https://google.com' },
14+
{ title: 'Mods', url: 'https://github.com/RedBrumbler/BeatOnCustomSabers' },
15+
];
916

10-
constructor() { }
11-
browserLinks :any[] = [
12-
{ title: "Beast Saber", url: "https://bsaber.com"},
13-
{ title: "Beat Saver", url: "https://beatsaver.com"},
14-
{ title: "Google", url: "https://google.com"}
15-
]
16-
17-
@Output() linkSelected = new EventEmitter<string>();
17+
@Output() linkSelected = new EventEmitter<string>();
1818

19-
clickLink(link) {
20-
this.linkSelected.emit(link.url);
21-
}
22-
23-
ngOnInit() {
24-
}
19+
clickLink(link) {
20+
this.linkSelected.emit(link.url);
21+
}
2522

23+
ngOnInit() {}
2624
}

‎frontend/src/app/main-mods/main-mods.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
</section>
2525
<section class="container" >
2626
<div *ngIf="!config">No Mods!</div>
27-
<div fxFlex="50%">
27+
<div fxFlex="60%">
2828
<mat-list>
2929
<!-- [class.selected]="mod === selectedMod" (click)="onSelect(mod); myModal.open()" -->
3030
<mat-list-item class="modContainer" *ngFor="let mod of config.Mods" >
3131
<div [ngStyle]="{'background-image': getModBG(mod)}" class="modCategory"></div>
3232
<div matTooltip="Delete the mod from Beat On." (click)="clickDeleteMod(mod)" class="deleteMod"><mat-icon>delete_forever</mat-icon></div>
33-
<h1 matLine> {{ mod.Name }} <span class="version">v{{ mod.Version }}</span></h1>
34-
<h3 matLine> by {{ mod.Author }}</h3>
33+
<h1 matLine> {{ mod.Name }} <span class="version">{{ mod.Version }}</span></h1>
34+
<h4 matLine> by {{ mod.Author }}<span *ngIf="mod.Porter">, ported by: {{ mod.Porter }}</span></h4>
3535
<div matLine class="description"> {{ mod.Description }}</div>
3636

3737

@@ -59,7 +59,7 @@ <h4 class="modal-title" id="myModalLabel2" *ngIf="selectedMod">{{ selectedMod.Na
5959
</div>
6060
<div class="modal-body">
6161
<section class="mat-typography">
62-
<h3 class="mat-display-1" *ngIf="selectedMod"> Created by: {{ selectedMod.Author }} </h3>
62+
<h3 class="mat-display-1" *ngIf="selectedMod"> Created by: {{ selectedMod.Author }}</h3>
6363
<p *ngIf="selectedMod"> {{ selectedMod.Description }} </p>
6464
<button mat-raised-button="" class="md-raised md-primary">Install</button>
6565
<a *ngIf="selectedMod" href="{{ selectedMod.InfoUrl }}" > More Info </a>

‎frontend/src/app/main-mods/main-mods.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// width: 600px;
33
height: 49px;
44
overflow-y: auto;
5-
margin-left: 300px;
5+
margin-left: 200px;
66
}
77

88
.modContainer {

0 commit comments

Comments
 (0)