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
2020-06-09 21:41:20 +00:00
parent d46f5398c6
commit 1a7cea9272
9 changed files with 96 additions and 1321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Controllers/SiteController.cs
View File

@@ -119,7 +119,7 @@ namespace rockfishCore.Controllers
return BadRequest(ModelState); return BadRequest(ModelState);
} }
var site = await _context.Site.SingleOrDefaultAsync(m => m.Id == id); var site = await _context.Site.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id);
if (site == null) if (site == null)
{ {

23
Startup.cs
View File

@@ -1,32 +1,17 @@
using System; using Microsoft.AspNetCore.Builder;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.HttpsPolicy;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using rockfishCore.Models; using rockfishCore.Models;
using rockfishCore.Util; using rockfishCore.Util;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.IO;
using System.Reflection;
using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Microsoft.Extensions.Options;
namespace rockfishCore namespace rockfishCore
{ {
@@ -106,7 +91,7 @@ namespace rockfishCore
//Check schema //Check schema
RfSchema.CheckAndUpdate(dbContext); RfSchema.CheckAndUpdate(dbContext);
app.UseHttpsRedirection(); // app.UseHttpsRedirection();
app.UseRouting(); app.UseRouting();
@@ -116,6 +101,10 @@ namespace rockfishCore
endpoints.MapControllers(); endpoints.MapControllers();
}); });
//server ready
System.Diagnostics.Debug.WriteLine("BOOT COMPLETED - OPEN");
} }
} }
} }

7
util/RfSchema.cs
View File

@@ -364,13 +364,12 @@ namespace rockfishCore.Util
//schema 16 RAVEN stuff //schema 16 RAVEN stuff
if (currentSchema < 16) if (currentSchema < 16)
{ {
exec("CREATE TABLE trialrequest (" + exec("CREATE TABLE trialrequest (" +
"id INTEGER PRIMARY KEY, dbid text not null, companyname text not null, contactname text not null, notes text, email text not null, " + "id INTEGER PRIMARY KEY, dbid text not null, companyname text not null, contactname text not null, notes text, email text not null, " +
"emailvalidated boolean default 0 NOT NULL CHECK (emailvalidated IN (0,1)) dtrequested integer, " + "emailvalidated boolean default 0 NOT NULL CHECK (emailvalidated IN (0,1)), dtrequested integer, " +
"dtprocessed integer, status integer default 0 not null, rejectreason text, key text, dtfetched integer, fetched boolean default 0 NOT NULL CHECK (fetched IN (0,1))" + "dtprocessed integer, status integer default 0 not null, rejectreason text, key text, dtfetched integer" +
")"); ")");
exec("alter table site add legacyv7 boolean default 0 NOT NULL CHECK (fetched IN (0,1))"); exec("alter table site add legacyv7 boolean default 0 NOT NULL CHECK (legacyv7 IN (0,1))");
exec("alter table site add dbid text default 'v7_no_dbid' NOT NULL"); exec("alter table site add dbid text default 'v7_no_dbid' NOT NULL");
exec("update site set legacyv7 = 1"); exec("update site set legacyv7 = 1");
exec("alter table license add dbid text default 'v7_no_dbid' NOT NULL"); exec("alter table license add dbid text default 'v7_no_dbid' NOT NULL");

104
wwwroot/default.htm
View File

@@ -11,69 +11,69 @@
<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.8"> <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.9">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.8"> <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.9">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.8"> <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.9">
<link rel="manifest" href="/manifest.json?rfv=6.8"> <link rel="manifest" href="/manifest.json?rfv=6.9">
<link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.8" color="#5bbad5"> <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.9" 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.8" media="all" rel="stylesheet" type="text/css" /> <link href="css/materialdesignicons.min.css?rfv=6.9" media="all" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.8" type="text/css" /> <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.9" type="text/css" />
<link rel="stylesheet" href="css/app.css?rfv=6.8" type="text/css" /> <link rel="stylesheet" href="css/app.css?rfv=6.9" type="text/css" />
<link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.8" type="text/css" /> <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.9" type="text/css" />
<!-- third-party javascript --> <!-- third-party javascript -->
<script src="js/lib/jquery-3.3.1.min.js?rfv=6.8"></script> <script src="js/lib/jquery-3.3.1.min.js?rfv=6.9"></script>
<script src="js/lib/page.js?rfv=6.8"></script> <script src="js/lib/page.js?rfv=6.9"></script>
<script src="js/lib/jquery.event.gevent.js?rfv=6.8"></script> <script src="js/lib/jquery.event.gevent.js?rfv=6.9"></script>
<script src="js/lib/jquery.gzserialize.js?rfv=6.8"></script> <script src="js/lib/jquery.gzserialize.js?rfv=6.9"></script>
<script src="js/lib/handlebars.runtime-v4.0.5.js?rfv=6.8"></script> <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.9"></script>
<script src="js/lib/store.min.js?rfv=6.8"></script> <script src="js/lib/store.min.js?rfv=6.9"></script>
<script src="js/lib/jquery.autocomplete.min.js?rfv=6.8"></script> <script src="js/lib/jquery.autocomplete.min.js?rfv=6.9"></script>
<script src="js/lib/moment.min.js?rfv=6.8"></script> <script src="js/lib/moment.min.js?rfv=6.9"></script>
<!-- our javascript --> <!-- our javascript -->
<script src="js/index.js?rfv=6.8"></script> <script src="js/index.js?rfv=6.9"></script>
<script src="js/app.util.js?rfv=6.8"></script> <script src="js/app.util.js?rfv=6.9"></script>
<script src="js/app.api.js?rfv=6.8"></script> <script src="js/app.api.js?rfv=6.9"></script>
<script src="js/app.utilB.js?rfv=6.8"></script> <script src="js/app.utilB.js?rfv=6.9"></script>
<script src="js/app.nav.js?rfv=6.8"></script> <script src="js/app.nav.js?rfv=6.9"></script>
<script src="js/app.shell.js?rfv=6.8"></script> <script src="js/app.shell.js?rfv=6.9"></script>
<script src="js/app.fourohfour.js?rfv=6.8"></script> <script src="js/app.fourohfour.js?rfv=6.9"></script>
<script src="js/app.authenticate.js?rfv=6.8"></script> <script src="js/app.authenticate.js?rfv=6.9"></script>
<script src="js/app.customers.js?rfv=6.8"></script> <script src="js/app.customers.js?rfv=6.9"></script>
<script src="js/app.customerEdit.js?rfv=6.8"></script> <script src="js/app.customerEdit.js?rfv=6.9"></script>
<script src="js/app.customerSites.js?rfv=6.8"></script> <script src="js/app.customerSites.js?rfv=6.9"></script>
<script src="js/app.customerSiteEdit.js?rfv=6.8"></script> <script src="js/app.customerSiteEdit.js?rfv=6.9"></script>
<script src="js/app.purchases.js?rfv=6.8"></script> <script src="js/app.purchases.js?rfv=6.9"></script>
<script src="js/app.purchaseEdit.js?rfv=6.8"></script> <script src="js/app.purchaseEdit.js?rfv=6.9"></script>
<script src="js/app.license.js?rfv=6.8"></script> <script src="js/app.license.js?rfv=6.9"></script>
<script src="js/app.licenseTemplates.js?rfv=6.8"></script> <script src="js/app.licenseTemplates.js?rfv=6.9"></script>
<script src="js/app.licenseRequestEdit.js?rfv=6.8"></script> <script src="js/app.licenseRequestEdit.js?rfv=6.9"></script>
<script src="js/app.licenses.js?rfv=6.8"></script> <script src="js/app.licenses.js?rfv=6.9"></script>
<script src="js/app.licenseView.js?rfv=6.8"></script> <script src="js/app.licenseView.js?rfv=6.9"></script>
<script src="js/app.reportData.js?rfv=6.8"></script> <script src="js/app.reportData.js?rfv=6.9"></script>
<script src="js/app.reportDataProdEmail.js?rfv=6.8"></script> <script src="js/app.reportDataProdEmail.js?rfv=6.9"></script>
<script src="js/app.reportDataExpires.js?rfv=6.8"></script> <script src="js/app.reportDataExpires.js?rfv=6.9"></script>
<script src="js/app.search.js?rfv=6.8"></script> <script src="js/app.search.js?rfv=6.9"></script>
<script src="js/app.subscription.js?rfv=6.8"></script> <script src="js/app.subscription.js?rfv=6.9"></script>
<script src="js/app.subnotify.js?rfv=6.8"></script> <script src="js/app.subnotify.js?rfv=6.9"></script>
<script src="js/app.templates.js?rfv=6.8"></script> <script src="js/app.templates.js?rfv=6.9"></script>
<script src="js/app.templateEdit.js?rfv=6.8"></script> <script src="js/app.templateEdit.js?rfv=6.9"></script>
<script src="js/app.inbox.js?rfv=6.8"></script> <script src="js/app.inbox.js?rfv=6.9"></script>
<script src="js/app.mailEdit.js?rfv=6.8"></script> <script src="js/app.mailEdit.js?rfv=6.9"></script>
<script src="js/app.rfcaseEdit.js?rfv=6.8"></script> <script src="js/app.rfcaseEdit.js?rfv=6.9"></script>
<script src="js/app.rfcases.js?rfv=6.8"></script> <script src="js/app.rfcases.js?rfv=6.9"></script>
<script src="js/app.rfsettings.js?rfv=6.8"></script> <script src="js/app.rfsettings.js?rfv=6.9"></script>
<script src="js/app.ops.js?rfv=6.8"></script> <script src="js/app.ops.js?rfv=6.9"></script>
<!-- handlebars templates --> <!-- handlebars templates -->
<script src="js/templates/templates.js?rfv=6.8"></script> <script src="js/templates/templates.js?rfv=6.9"></script>
<script> <script>
@@ -103,7 +103,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.8"></script> <script src="js/lib/bootstrap.min.js?rfv=6.9"></script>
</body> </body>
</html> </html>

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

@@ -27,7 +27,7 @@ app.api = (function() {
generateFromRequest, generateFromRequest,
licenseEmailResponse; licenseEmailResponse;
RockFishVersion = "6.8"; RockFishVersion = "6.9";
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
// NOT AUTHORIZED ERROR HANDLER // NOT AUTHORIZED ERROR HANDLER

1240
wwwroot/js/lib/handlebars.runtime-v4.0.5.js
View File

File diff suppressed because it is too large Load Diff

27
wwwroot/js/lib/handlebars.runtime.min-v4.7.6.js Normal file
View File

File diff suppressed because one or more lines are too long

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

@@ -33,7 +33,7 @@
<input class="form-control" type="text" id="dbType" name="dbType" value=""> <input class="form-control" type="text" id="dbType" name="dbType" value="">
</div> </div>
</div> </div>
<div class="col-sm-6"> {{!-- <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label for="serverOS">Server OS</label> <label for="serverOS">Server OS</label>
<input class="form-control" type="text" id="serverOS" name="serverOS" value=""> <input class="form-control" type="text" id="serverOS" name="serverOS" value="">
@@ -44,7 +44,7 @@
<label for="serverBits">Server bits</label> <label for="serverBits">Server bits</label>
<input class="form-control" type="text" id="serverBits" name="serverBits" value=""> <input class="form-control" type="text" id="serverBits" name="serverBits" value="">
</div> </div>
</div> </div> --}}
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-check"> <div class="form-check">
<label class="form-check-label" for="hosted"> <label class="form-check-label" for="hosted">

2
wwwroot/js/templates/templates.js
View File

File diff suppressed because one or more lines are too long