Skip to content

Commit bb87278

Browse files
JeremyCaneyJeremyCaney
committed
Merge branch 'release/5.0.0' into master
The 5.0.0 release of GoldSim focuses on major upgrades to backend dependencies which introduced a number of breaking changes. Notably, this includes upgrading to .NET 5.0 and ASP.NET Core 5.0, as well as OnTopic 5.0.0 and OnTopic Editor 5.0.0. The updates to OnTopic, in particular, introduced a significant number of breaking changes which required updating quite a few API calls to maintain the existing functionality. This release does not include any significant design changes or new features.
2 parents 2b27ac2 + b4b004c commit bb87278

File tree

88 files changed

+13232
-2370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+13232
-2370
lines changed

wwwroot/app_initializing.htm renamed to App_Initializing.html

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@
1010
<meta name="google-site-verification" content="EX0ea3_txOh2GJkZZs_sVxxpIg_Yk7RHYB_xOzCv4Qo" />
1111
<meta name="msvalidate.01" content="502A7C1A613414AC1FCABAA10A8B17AA" />
1212
<link rel="canonical" href="https://www.goldsim.com/app_initializing.htm" />
13-
<link rel="apple-touch-icon" sizes="180x180" href="/Images/Favicons/apple-touch-icon.png" />
14-
<link rel="icon" type="image/png" sizes="32x32" href="/Images/Favicons/favicon-32x32.png" />
15-
<link rel="icon" type="image/png" sizes="16x16" href="/Images/Favicons/favicon-16x16.png" />
16-
<link rel="manifest" href="/Images/Favicons/manifest.json" />
17-
<link rel="mask-icon" href="/Images/Favicons/safari-pinned-tab.svg" color="#000000" />
18-
<link rel="shortcut icon" href="/Images/Favicons/favicon.ico" />
19-
<meta name="msapplication-config" content="/Images/Favicons/browserconfig.xml" />
13+
<link rel="apple-touch-icon" sizes="180x180" href="/wwwroot/Images/Favicons/apple-touch-icon.png" />
14+
<link rel="icon" type="image/png" sizes="32x32" href="/wwwroot/Images/Favicons/favicon-32x32.png" />
15+
<link rel="icon" type="image/png" sizes="16x16" href="/wwwroot/Images/Favicons/favicon-16x16.png" />
16+
<link rel="manifest" href="/wwwroot/Images/Favicons/site.webmanifest" />
17+
<link rel="mask-icon" href="/wwwroot/Images/Favicons/safari-pinned-tab.svg" color="#000000" />
18+
<link rel="shortcut icon" href="/wwwroot/Images/Favicons/favicon.ico" />
2019
<meta name="theme-color" content="#ffffff" />
21-
<link rel="stylesheet" type="text/css" href="/Shared/Styles/Style.min.css" />
20+
<link rel="stylesheet" type="text/css" href="/wwwroot/Shared/Styles/Style.css" />
2221

2322
<noscript id="DeferredStyles">
24-
<link rel="stylesheet" type="text/css" href="/Shared/Styles/Vendor/FontAwesome/font-awesome.min.css" />
23+
<link rel="stylesheet" type="text/css" href="/wwwroot/Shared/Styles/Vendor/FontAwesome/font-awesome.min.css" />
2524
</noscript>
2625
</head>
2726
<body vocab="http://schema.org/" typeof="WebPage">
@@ -35,7 +34,7 @@
3534
<!-- /Title Bar Left Area -->
3635
<!-- Logo -->
3736
<div class="title-bar-middle logo centered">
38-
<a href="/"><img src="/Images/Logo.svg" alt="GoldSim Technology Group" class="logo" /></a>
37+
<a href="/"><img src="/wwwroot/Images/Logo.svg" alt="GoldSim Technology Group" class="logo" /></a>
3938
</div>
4039
<!-- Title Bar Right Area -->
4140
<div class="title-bar-right search"></div>
@@ -45,23 +44,28 @@
4544
<!-- /Site Header Area -->
4645

4746
<!-- Main Site Content Area -->
48-
<main id="MainContentArea" class="page content" role="main">
47+
<main id="MainContentArea" role="main">
4948

5049
<article itemscope itemtype="http://schema.org/WebPageElement" itemprop="mainContentOfPage" class="grid-container">
5150

5251
<!-- Long Title (Subtitle) -->
53-
<header class="grid-x" style="margin: 2rem 0;">
54-
<h1 class="page title long cell">
55-
One Moment, Please
52+
<header>
53+
<h1 class="title">
54+
Give us just a moment…
5655
</h1>
5756
</header>
5857
<!-- /Long Title (Subtitle) -->
5958

6059
<!-- Main Page Content -->
61-
<section class="panel body">
62-
<p>The GoldSim website is temporarily unavailable while it initializes. It should be available within two minutes. We apologize for the inconvenience!</p>
63-
</section>
64-
<!-- /Main Page Content -->
60+
<div class="grid-x">
61+
62+
<section class="panel">
63+
<p>The GoldSim website is temporarily unavailable while it initializes. It should be available within two minutes. We apologize for the inconvenience!</p>
64+
<cite>The GoldSim Technology Group</cite>
65+
</section>
66+
<!-- /Main Page Content -->
67+
68+
</div>
6569

6670
</article>
6771

‎App_Online.htm‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>GoldSim Maintenance</title>
5+
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
6+
<meta http-equiv="Pragma" content="no-cache" />
7+
<meta http-equiv="Expires" content="0" />
8+
<link href="https://fonts.googleapis.com/css?family=Oxygen:300,400" rel="stylesheet" />
9+
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet" />
10+
<style>
11+
body {
12+
margin : 5rem;
13+
font-family : 'Source Sans Pro', 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
14+
color : #202020;
15+
font-size : 1.125rem;
16+
line-height : 1.6;
17+
}
18+
h1, h2 {
19+
font-family : 'Oxygen', 'Source Sans Pro', 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
20+
margin : 0em;
21+
font-weight : 300;
22+
}
23+
h1 {
24+
color : #666;
25+
font-size : 3rem;
26+
}
27+
h2 {
28+
color : #999;
29+
font-size : 1.75rem;
30+
}
31+
</style>
32+
</head>
33+
<body>
34+
<h1>Give us just a moment…</h1>
35+
<h2>You've caught us during some routine maintenance.</h2>
36+
<p>Please allow us fifteen minutes to clean up. We'll be back online briefly.</p>
37+
<p>We do apologize for the inconvenience!</p>
38+
<cite>- GoldSim Technology Group</cite>
39+
</body>
40+
</html>

‎Areas/Administration/Controllers/InvoicesController.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@ await CreateEditViewModel(
7373
).ConfigureAwait(true);
7474

7575
private async Task<EditInvoiceViewModel> CreateEditViewModel(InvoiceTopicViewModel invoice = null) {
76-
var pageContent = _topicRepository.Load("Administration:Invoices:Edit");
77-
var viewModel = await _topicMappingService.MapAsync<EditInvoiceViewModel>(pageContent).ConfigureAwait(true);
78-
viewModel.Invoice = invoice;
76+
var pageContent = _topicRepository.Load("Administration:Invoices:Edit");
77+
var viewModel = new EditInvoiceViewModel {
78+
Invoice = invoice
79+
};
80+
viewModel = (EditInvoiceViewModel)await _topicMappingService.MapAsync(pageContent, viewModel).ConfigureAwait(true);
7981
return viewModel;
8082
}
8183

‎Areas/Administration/Models/Invoices/EditInvoiceViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace GoldSim.Web.Administration.Models.Invoices {
1313
/// <summary>
1414
/// A view model for rendering an invoice form page.
1515
/// </summary>
16-
public class EditInvoiceViewModel: PageTopicViewModel {
16+
public record EditInvoiceViewModel: PageTopicViewModel {
1717

1818
/*==========================================================================================================================
1919
| CONSTRUCTOR
@@ -31,7 +31,7 @@ public EditInvoiceViewModel() {}
3131
/// Provides a reference to the actual <see cref="InvoiceTopicViewModel"/> that the invoice page is editing.
3232
/// </summary>
3333
/// <returns>The <typeparamref name="T"/> binding model.</returns>
34-
public InvoiceTopicViewModel Invoice { get; set; }
34+
public InvoiceTopicViewModel Invoice { get; init; }
3535

3636
} // Class
3737
} // Namespace

‎Areas/Administration/Models/Invoices/InvoiceListViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace GoldSim.Web.Administration.Models.Invoices {
1515
/// <summary>
1616
/// A view model for rendering a page containing a list of invoices.
1717
/// </summary>
18-
public class InvoiceListViewModel: PageTopicViewModel {
18+
public record InvoiceListViewModel: PageTopicViewModel {
1919

2020
/*==========================================================================================================================
2121
| CONSTRUCTOR
@@ -32,7 +32,7 @@ public InvoiceListViewModel() {}
3232
/// <summary>
3333
/// Provides a list of invoices currently available in the system.
3434
/// </summary>
35-
[Relationship(RelationshipType.Children)]
35+
[Collection(CollectionType.Children)]
3636
public Collection<InvoiceTopicViewModel> Invoices { get; } = new();
3737

3838
} // Class

‎Areas/Administration/Models/Licenses/InstructorAcademicFormTopicViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace GoldSim.Web.Administration.Models.Licenses {
1212
/// <summary>
1313
/// A view model for rendering an academic licensing request.
1414
/// </summary>
15-
public class InstructorAcademicFormTopicViewModel: LicenseRequestTopicViewModel {
15+
public record InstructorAcademicFormTopicViewModel: LicenseRequestTopicViewModel {
1616

1717
} // Class
1818
} // Namespace

‎Areas/Administration/Models/Licenses/LicenseAdministrationTopicViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace GoldSim.Web.Administration.Models.Licenses {
1515
/// <summary>
1616
/// A view model for the license reporting tool.
1717
/// </summary>
18-
public class LicenseAdministrationTopicViewModel: PageTopicViewModel {
18+
public record LicenseAdministrationTopicViewModel: PageTopicViewModel {
1919

2020
/*==========================================================================================================================
2121
| REQUESTS

‎Areas/Administration/Models/Licenses/LicenseRequestTopicViewModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ namespace GoldSim.Web.Administration.Models.Licenses {
1414
/// <summary>
1515
/// A view model for rendering a license request.
1616
/// </summary>
17-
public class LicenseRequestTopicViewModel: CoreContact {
17+
public record LicenseRequestTopicViewModel: CoreContact {
1818

1919
/*==========================================================================================================================
2020
| ID
2121
\-------------------------------------------------------------------------------------------------------------------------*/
2222
/// <summary>
2323
/// The topic's unique identifier.
2424
/// </summary>
25-
public int Id { get; set; }
25+
public int Id { get; init; }
2626

2727
/*==========================================================================================================================
2828
| LAST MODIFIED
2929
\-------------------------------------------------------------------------------------------------------------------------*/
3030
/// <summary>
3131
/// The date the request was submitted.
3232
/// </summary>
33-
public DateTime LastModified { get; set; }
33+
public DateTime LastModified { get; init; }
3434

3535
} // Class
3636
} // Namespace

‎Areas/Administration/Models/Licenses/StudentAcademicFormTopicViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace GoldSim.Web.Administration.Models.Licenses {
1212
/// <summary>
1313
/// A view model for rendering an academic licensing request.
1414
/// </summary>
15-
public class StudentAcademicFormTopicViewModel: LicenseRequestTopicViewModel {
15+
public record StudentAcademicFormTopicViewModel: LicenseRequestTopicViewModel {
1616

1717
} // Class
1818
} // Namespace

‎Areas/Administration/Models/Licenses/TrialFormTopicViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace GoldSim.Web.Administration.Models.Licenses {
1212
/// <summary>
1313
/// A view model for rendering a license request.
1414
/// </summary>
15-
public class TrialFormTopicViewModel: LicenseRequestTopicViewModel {
15+
public record TrialFormTopicViewModel: LicenseRequestTopicViewModel {
1616

1717
} // Class
1818
} // Namespace

0 commit comments

Comments
 (0)