admin/rockfish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-10-10 18:43:25 +00:00
parent 59318d73a5
commit 0290518a38
8 changed files with 73 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Controllers/RvlController.cs
View File

@@ -110,7 +110,7 @@ namespace rockfishCore.Controllers
newLicense.RegisteredTo = l.RegisteredTo; newLicense.RegisteredTo = l.RegisteredTo;
newLicense.DbId = l.DbId; newLicense.DbId = l.DbId;
newLicense.Perpetual=l.Perpetual; newLicense.Perpetual = l.Perpetual;
if (l.LicenseExpires) if (l.LicenseExpires)
newLicense.LicenseExpiration = DateUtil.EpochToDate(l.LicenseExpirationDate); newLicense.LicenseExpiration = DateUtil.EpochToDate(l.LicenseExpirationDate);
else else
@@ -144,16 +144,12 @@ namespace rockfishCore.Controllers
//If key is not revoked (don't warn them in that case) send notification to customer //If key is not revoked (don't warn them in that case) send notification to customer
if (l.RegisteredTo != RavenKeyFactory.REVOKED_TOKEN) if (l.RegisteredTo != RavenKeyFactory.REVOKED_TOKEN)
{ {
string licenseKeyType = "license";
var body = $"Thank you for your purchase!\nYour AyaNova license key is ready to be installed.\nAyaNova will fetch it automatically within 24 hours or you can force it to fetch immediately from the License page in AyaNova now.\n---\n{newLicense}"; if (!l.Perpetual)
licenseKeyType = "activation";
var body = $"Your AyaNova {licenseKeyType} key is ready to be installed.\nAyaNova will fetch it automatically within 24 hours or you can force it to fetch immediately from the License page in AyaNova now.\n---\n{newLicense}";
//send license email //send license email
#if (DEBUG) RfMail.SendMessage("support@ayanova.com", Customer.AdminEmail, $"AyaNova {licenseKeyType} key", body, false);
RfMail.SendMessage("support@ayanova.com", "cardjohn@ayanova.com", "AyaNova license key", body, false);
#else
//throw new System.Exception("UNCOMMENT THIS FOR PRODUCTION");
RfMail.SendMessage("support@ayanova.com", Customer.AdminEmail, "AyaNova license key", body, false);
#endif
} }
return Ok("ok"); return Ok("ok");
} }

2
notes/deploy.txt
View File

@@ -5,7 +5,7 @@
1) SET VERSION 1) SET VERSION
SET app.api RFVERSION property SET app.api RFVERSION property
RENAME ?rfv=6.25 parameter in default.htm to the new version so all files update on mobile RENAME ?rfv=6.26 parameter in default.htm to the new version so all files update on mobile
1.5) Run buildtemplates.bat if handlebars templates have changed at all 1.5) Run buildtemplates.bat if handlebars templates have changed at all

6
util/RavenKeyFactory.cs
View File

@@ -75,13 +75,13 @@ namespace rockfishCore.Util
{ {
System.Text.StringBuilder sb = new StringBuilder(); System.Text.StringBuilder sb = new StringBuilder();
sb.AppendLine("LICENSE DETAILS");
sb.AppendLine($"Registered to: {RegisteredTo}"); sb.AppendLine($"Registered to: {RegisteredTo}");
sb.AppendLine($"Database id: {DbId}"); sb.AppendLine($"Database id: {DbId}");
sb.AppendLine($"Type: {(Perpetual ? "Perpetual" : "Subscription")}"); sb.AppendLine($"Type: {(Perpetual ? "Perpetual" : "Subscription")}");
if (WillExpire) if (WillExpire)
sb.AppendLine($"License valid until: {LicenseExpiration.ToLongDateString()}"); sb.AppendLine($"Available for use until: {LicenseExpiration.ToLongDateString()}");
sb.AppendLine($"Maintenance until: {MaintenanceExpiration.ToLongDateString()}"); if (Perpetual)
sb.AppendLine($"Support and updates available until: {MaintenanceExpiration.ToLongDateString()}");
foreach (LicenseFeature f in Features) foreach (LicenseFeature f in Features)
{ {
if (f.Feature == TRIAL_FEATURE_NAME) if (f.Feature == TRIAL_FEATURE_NAME)

2
util/RfVersion.cs
View File

@@ -2,7 +2,7 @@ namespace rockfishCore.Util
{ {
public static class RfVersion public static class RfVersion
{ {
public const string NumberOnly="6.25"; public const string NumberOnly="6.26";
public const string Full = "Rockfish server " + NumberOnly; public const string Full = "Rockfish server " + NumberOnly;
} }
} }

116
wwwroot/default.htm
View File

@@ -11,76 +11,76 @@
<title>Rockfish loading....</title> <title>Rockfish loading....</title>
<!-- ICONS / MANIFEST --> <!-- ICONS / MANIFEST -->
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.25"> <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.26">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.25"> <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.26">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.25"> <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.26">
<link rel="manifest" href="/manifest.json?rfv=6.25"> <link rel="manifest" href="/manifest.json?rfv=6.26">
<link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.25" color="#5bbad5"> <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.26" color="#5bbad5">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<!-- 3rd party components fonts and icons --> <!-- 3rd party components fonts and icons -->
<link href="css/materialdesignicons.min.css?rfv=6.25" media="all" rel="stylesheet" type="text/css" /> <link href="css/materialdesignicons.min.css?rfv=6.26" media="all" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.25" type="text/css" /> <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.26" type="text/css" />
<link rel="stylesheet" href="css/app.css?rfv=6.25" type="text/css" /> <link rel="stylesheet" href="css/app.css?rfv=6.26" type="text/css" />
<link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.25" type="text/css" /> <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.26" type="text/css" />
<!-- third-party javascript --> <!-- third-party javascript -->
<script src="js/lib/jquery-3.3.1.min.js?rfv=6.25"></script> <script src="js/lib/jquery-3.3.1.min.js?rfv=6.26"></script>
<script src="js/lib/page.js?rfv=6.25"></script> <script src="js/lib/page.js?rfv=6.26"></script>
<script src="js/lib/jquery.event.gevent.js?rfv=6.25"></script> <script src="js/lib/jquery.event.gevent.js?rfv=6.26"></script>
<script src="js/lib/jquery.gzserialize.js?rfv=6.25"></script> <script src="js/lib/jquery.gzserialize.js?rfv=6.26"></script>
<script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.25"></script> <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.26"></script>
<script src="js/lib/store.min.js?rfv=6.25"></script> <script src="js/lib/store.min.js?rfv=6.26"></script>
<script src="js/lib/jquery.autocomplete.min.js?rfv=6.25"></script> <script src="js/lib/jquery.autocomplete.min.js?rfv=6.26"></script>
<script src="js/lib/moment.min.js?rfv=6.25"></script> <script src="js/lib/moment.min.js?rfv=6.26"></script>
<!-- our javascript --> <!-- our javascript -->
<script src="js/index.js?rfv=6.25"></script> <script src="js/index.js?rfv=6.26"></script>
<script src="js/app.util.js?rfv=6.25"></script> <script src="js/app.util.js?rfv=6.26"></script>
<script src="js/app.api.js?rfv=6.25"></script> <script src="js/app.api.js?rfv=6.26"></script>
<script src="js/app.utilB.js?rfv=6.25"></script> <script src="js/app.utilB.js?rfv=6.26"></script>
<script src="js/app.nav.js?rfv=6.25"></script> <script src="js/app.nav.js?rfv=6.26"></script>
<script src="js/app.shell.js?rfv=6.25"></script> <script src="js/app.shell.js?rfv=6.26"></script>
<script src="js/app.fourohfour.js?rfv=6.25"></script> <script src="js/app.fourohfour.js?rfv=6.26"></script>
<script src="js/app.authenticate.js?rfv=6.25"></script> <script src="js/app.authenticate.js?rfv=6.26"></script>
<script src="js/app.customers.js?rfv=6.25"></script> <script src="js/app.customers.js?rfv=6.26"></script>
<script src="js/app.customerEdit.js?rfv=6.25"></script> <script src="js/app.customerEdit.js?rfv=6.26"></script>
<script src="js/app.customerSites.js?rfv=6.25"></script> <script src="js/app.customerSites.js?rfv=6.26"></script>
<script src="js/app.customerSiteEdit.js?rfv=6.25"></script> <script src="js/app.customerSiteEdit.js?rfv=6.26"></script>
<script src="js/app.purchases.js?rfv=6.25"></script> <script src="js/app.purchases.js?rfv=6.26"></script>
<script src="js/app.purchaseEdit.js?rfv=6.25"></script> <script src="js/app.purchaseEdit.js?rfv=6.26"></script>
<script src="js/app.license.js?rfv=6.25"></script> <script src="js/app.license.js?rfv=6.26"></script>
<script src="js/app.licenseTemplates.js?rfv=6.25"></script> <script src="js/app.licenseTemplates.js?rfv=6.26"></script>
<script src="js/app.licenseRequestEdit.js?rfv=6.25"></script> <script src="js/app.licenseRequestEdit.js?rfv=6.26"></script>
<script src="js/app.licenses.js?rfv=6.25"></script> <script src="js/app.licenses.js?rfv=6.26"></script>
<script src="js/app.licenseView.js?rfv=6.25"></script> <script src="js/app.licenseView.js?rfv=6.26"></script>
<script src="js/app.reportData.js?rfv=6.25"></script> <script src="js/app.reportData.js?rfv=6.26"></script>
<script src="js/app.reportDataProdEmail.js?rfv=6.25"></script> <script src="js/app.reportDataProdEmail.js?rfv=6.26"></script>
<script src="js/app.reportDataExpires.js?rfv=6.25"></script> <script src="js/app.reportDataExpires.js?rfv=6.26"></script>
<script src="js/app.search.js?rfv=6.25"></script> <script src="js/app.search.js?rfv=6.26"></script>
<script src="js/app.subscription.js?rfv=6.25"></script> <script src="js/app.subscription.js?rfv=6.26"></script>
<script src="js/app.subnotify.js?rfv=6.25"></script> <script src="js/app.subnotify.js?rfv=6.26"></script>
<script src="js/app.templates.js?rfv=6.25"></script> <script src="js/app.templates.js?rfv=6.26"></script>
<script src="js/app.templateEdit.js?rfv=6.25"></script> <script src="js/app.templateEdit.js?rfv=6.26"></script>
<script src="js/app.inbox.js?rfv=6.25"></script> <script src="js/app.inbox.js?rfv=6.26"></script>
<script src="js/app.mailEdit.js?rfv=6.25"></script> <script src="js/app.mailEdit.js?rfv=6.26"></script>
<script src="js/app.rfcaseEdit.js?rfv=6.25"></script> <script src="js/app.rfcaseEdit.js?rfv=6.26"></script>
<script src="js/app.rfcases.js?rfv=6.25"></script> <script src="js/app.rfcases.js?rfv=6.26"></script>
<script src="js/app.rfsettings.js?rfv=6.25"></script> <script src="js/app.rfsettings.js?rfv=6.26"></script>
<script src="js/app.ops.js?rfv=6.25"></script> <script src="js/app.ops.js?rfv=6.26"></script>
<script src="js/app.trials.js?rfv=6.25"></script> <script src="js/app.trials.js?rfv=6.26"></script>
<script src="js/app.trialEdit.js?rfv=6.25"></script> <script src="js/app.trialEdit.js?rfv=6.26"></script>
<script src="js/app.ravLicenses.js?rfv=6.25"></script> <script src="js/app.ravLicenses.js?rfv=6.26"></script>
<script src="js/app.ravLicense.js?rfv=6.25"></script> <script src="js/app.ravLicense.js?rfv=6.26"></script>
<script src="js/app.vendorNotifications.js?rfv=6.25"></script> <script src="js/app.vendorNotifications.js?rfv=6.26"></script>
<script src="js/app.vendorNotification.js?rfv=6.25"></script> <script src="js/app.vendorNotification.js?rfv=6.26"></script>
<!-- handlebars templates --> <!-- handlebars templates -->
<script src="js/templates/templates.js?rfv=6.25"></script> <script src="js/templates/templates.js?rfv=6.26"></script>
<script> <script>
@@ -110,7 +110,7 @@ window.onerror = function ( error ) {
<body class="rf-body"> <body class="rf-body">
<div id="app" class="container"></div> <div id="app" class="container"></div>
<script src="js/lib/bootstrap.min.js?rfv=6.25"></script> <script src="js/lib/bootstrap.min.js?rfv=6.26"></script>
</body> </body>
</html> </html>

2
wwwroot/js/app.api.js
View File

@@ -30,7 +30,7 @@ app.api = (function () {
licenseEmailResponse, licenseEmailResponse,
test; test;
RockFishVersion = "6.25"; RockFishVersion = "6.26";
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
// NOT AUTHORIZED ERROR HANDLER // NOT AUTHORIZED ERROR HANDLER

4
wwwroot/js/templates/app.rfsettings.handlebars
View File

@@ -28,8 +28,8 @@
</div> </div>
</form> </form>
<hr /> {{!-- <hr />
<div class="app-frm-buttons mt-5"> <div class="app-frm-buttons mt-5">
<button id="btn-test" class="btn btn-warning">TEST THAT THING</button> <button id="btn-test" class="btn btn-warning">TEST THAT THING</button>
</div> </div> --}}
</div> </div>

2
wwwroot/js/templates/app.shell.handlebars
View File

@@ -1,7 +1,7 @@
<nav <nav
id="rf-nav" id="rf-nav"
class="navbar fixed-top navbar-expand-lg navbar-dark" class="navbar fixed-top navbar-expand-lg navbar-dark"
style="background-color: #00205B;" style="background-color: #6d00b6;"
> >
{{! navbar-dark bg-success }} {{! navbar-dark bg-success }}
<button <button