From 1aac34878e9f99d469b3a2093a01089c41056d92 Mon Sep 17 00:00:00 2001 From: Ben Parsons <9parsonsb@gmail.com> Date: Tue, 10 Nov 2020 21:44:20 +1100 Subject: [PATCH] Initial Commit --- .directory | 6 + .gitignore | 371 +- Infrastructure/.keep | 0 .../Database/DbCommandInterceptor.cs | 166 + Infrastructure/Database/ExDbContext.cs | 37 + Infrastructure/Infrastructure.csproj | 33 + README.md | 3 - Web/Controllers/HomeController.cs | 28 + LICENSE => Web/LICENSE | 0 Web/NLog.config | 41 + Web/Program.cs | 44 + Web/Properties/launchSettings.json | 27 + Web/README.md | 22 + Web/Startup.cs | 119 + Web/Views/Error.cshtml | 25 + Web/Views/Home/Index.cshtml | 3 + Web/Views/Privacy.cshtml | 7 + Web/Views/Shared/_Layout.cshtml | 32 + .../Shared/_ValidationScriptsPartial.cshtml | 2 + Web/Views/_ViewImports.cshtml | 3 + Web/Views/_ViewStart.cshtml | 3 + Web/Web.csproj | 51 + Web/appsettings.Development.json | 20 + Web/appsettings.json | 15 + Web/gulpfile.js | 25 + Web/package.json | 71 + Web/rollup.config.js | 122 + Web/scripts/setupTypeScript.js | 128 + Web/src/App.svelte | 46 + Web/src/components/Link.svelte | 36 + Web/src/components/Nav.svelte | 72 + Web/src/main.ts | 17 + Web/src/routes/Button.svelte | 13 + Web/src/routes/Home.svelte | 65 + Web/src/routes/temp.svelte | 48 + Web/tsconfig.json | 6 + Web/wwwroot/build/bundle.css | 21087 ++++++++++++++++ Web/wwwroot/build/main.js | 19814 +++++++++++++++ Web/wwwroot/build/main.js.map | 1 + Web/wwwroot/bundle.css | 20991 +++++++++++++++ Web/wwwroot/favicon.png | Bin 0 -> 3127 bytes Web/wwwroot/site.scss | 2 + Web/yarn.lock | 7348 ++++++ exsvelte.sln | 22 + 44 files changed, 70899 insertions(+), 73 deletions(-) create mode 100644 .directory create mode 100644 Infrastructure/.keep create mode 100644 Infrastructure/Database/DbCommandInterceptor.cs create mode 100644 Infrastructure/Database/ExDbContext.cs create mode 100644 Infrastructure/Infrastructure.csproj delete mode 100644 README.md create mode 100644 Web/Controllers/HomeController.cs rename LICENSE => Web/LICENSE (100%) create mode 100644 Web/NLog.config create mode 100644 Web/Program.cs create mode 100644 Web/Properties/launchSettings.json create mode 100644 Web/README.md create mode 100644 Web/Startup.cs create mode 100644 Web/Views/Error.cshtml create mode 100644 Web/Views/Home/Index.cshtml create mode 100644 Web/Views/Privacy.cshtml create mode 100644 Web/Views/Shared/_Layout.cshtml create mode 100644 Web/Views/Shared/_ValidationScriptsPartial.cshtml create mode 100644 Web/Views/_ViewImports.cshtml create mode 100644 Web/Views/_ViewStart.cshtml create mode 100644 Web/Web.csproj create mode 100644 Web/appsettings.Development.json create mode 100644 Web/appsettings.json create mode 100644 Web/gulpfile.js create mode 100644 Web/package.json create mode 100644 Web/rollup.config.js create mode 100644 Web/scripts/setupTypeScript.js create mode 100644 Web/src/App.svelte create mode 100644 Web/src/components/Link.svelte create mode 100644 Web/src/components/Nav.svelte create mode 100644 Web/src/main.ts create mode 100644 Web/src/routes/Button.svelte create mode 100644 Web/src/routes/Home.svelte create mode 100644 Web/src/routes/temp.svelte create mode 100644 Web/tsconfig.json create mode 100644 Web/wwwroot/build/bundle.css create mode 100644 Web/wwwroot/build/main.js create mode 100644 Web/wwwroot/build/main.js.map create mode 100644 Web/wwwroot/bundle.css create mode 100644 Web/wwwroot/favicon.png create mode 100644 Web/wwwroot/site.scss create mode 100644 Web/yarn.lock create mode 100644 exsvelte.sln diff --git a/.directory b/.directory new file mode 100644 index 0000000..90ea67a --- /dev/null +++ b/.directory @@ -0,0 +1,6 @@ +[Dolphin] +Timestamp=2020,11,7,16,37,54 +Version=4 + +[Settings] +HiddenFilesShown=true diff --git a/.gitignore b/.gitignore index 50c28d3..33a368e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,12 @@ -# ---> VisualStudio + +# Created by https://www.toptal.com/developers/gitignore/api/visualstudio,aspnetcore,csharp,node,intellij +# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio,aspnetcore,csharp,node,intellij + +### ASPNETCore ### ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files -*.rsuser *.suo *.user *.userosscache @@ -14,9 +15,6 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs -# Mono auto generated files -mono_crash.* - # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -24,58 +22,42 @@ mono_crash.* [Rr]eleases/ x64/ x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ -[Ll]ogs/ -# Visual Studio 2015/2017 cache/options directory +# Visual Studio 2015 cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ -# Visual Studio 2017 auto generated files -Generated\ Files/ - # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -# NUnit +# NUNIT *.VisualState.xml TestResult.xml -nunit-*.xml # Build Results of an ATL Project [Dd]ebugPS/ [Rr]eleasePS/ dlldata.c -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core +# DNX project.lock.json project.fragment.lock.json artifacts/ -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio *_i.c *_p.c -*_h.h +*_i.h *.ilk *.meta *.obj -*.iobj *.pch *.pdb -*.ipdb *.pgc *.pgd *.rsp @@ -85,7 +67,6 @@ StyleCopReport.xml *.tlh *.tmp *.tmp_proj -*_wpftmp.csproj *.log *.vspscc *.vssscc @@ -114,9 +95,6 @@ ipch/ *.vspx *.sap -# Visual Studio Trace Files -*.e2e - # TFS 2012 Local Workspace $tf/ @@ -128,19 +106,15 @@ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user +# JustCode is a .NET coding add-in +.JustCode + # TeamCity is a build add-in _TeamCity* # DotCover is a Code Coverage Tool *.dotCover -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*[.json, .xml, .info] - # Visual Studio code coverage results *.coverage *.coveragexml @@ -176,7 +150,7 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, +# TODO: Comment the next line if you want to checkin your web deploy settings # but database connection strings (with potential passwords) will be unencrypted *.pubxml *.publishproj @@ -188,15 +162,13 @@ PublishScripts/ # NuGet Packages *.nupkg -# NuGet Symbol Packages -*.snupkg # The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* +**/packages/* # except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ +!**/packages/build/ # Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files *.nuget.props *.nuget.targets @@ -213,15 +185,12 @@ AppPackages/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt -*.appx -*.appxbundle -*.appxupload # Visual Studio cache files # files ending in .cache can be ignored *.[Cc]ache # but keep track of directories ending in .cache -!?*.[Cc]ache/ +!*.[Cc]ache/ # Others ClientBin/ @@ -232,12 +201,9 @@ ClientBin/ *.jfm *.pfx *.publishsettings +node_modules/ orleans.codegen.cs -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - # Since there are multiple workflows, uncomment next line to ignore bower_components # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) #bower_components/ @@ -252,22 +218,15 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak # SQL Server files *.mdf *.ldf -*.ndf # Business Intelligence projects *.rdl.data *.bim.layout *.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl # Microsoft Fakes FakesAssemblies/ @@ -277,7 +236,6 @@ FakesAssemblies/ # Node.js Tools for Visual Studio .ntvs_analysis.dat -node_modules/ # Visual Studio 6 build log *.plg @@ -285,9 +243,6 @@ node_modules/ # Visual Studio 6 workspace options file *.opt -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -303,13 +258,187 @@ paket-files/ # FAKE - F# Make .fake/ -# CodeRush personal settings -.cr/personal +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ # Python Tools for Visual Studio (PTVS) __pycache__/ *.pyc +# Cake - Uncomment if you are using it +# tools/ + +### Csharp ### +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser + +# User-specific files (MonoDevelop/Xamarin Studio) + +# Mono auto generated files +mono_crash.* + +# Build results +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +# Uncomment if you have tasks that create the project's static files in wwwroot + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results + +# NUnit +nunit-*.xml + +# Build Results of an ATL Project + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_h.h +*.iobj +*.ipdb +*_wpftmp.csproj + +# Chutzpah Test files + +# Visual C++ cache files + +# Visual Studio profiler + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace + +# Guidance Automation Toolkit + +# ReSharper is a .NET coding add-in + +# TeamCity is a build add-in + +# DotCover is a Code Coverage Tool + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + +# Visual Studio code coverage results + +# NCrunch + +# MightyMoose + +# Web workbench (sass) + +# Installshield output folder + +# DocProject is a documentation generator add-in + +# Click-Once directory + +# Publish Web Output +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted + +# NuGet Packages +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files + +# Microsoft Azure Build Output + +# Microsoft Azure Emulator + +# Windows Store app package directories and files +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) + +# RIA/Silverlight projects + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.ndf + +# Business Intelligence projects +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes + +# GhostDoc plugin setting file + +# Node.js Tools for Visual Studio + +# Visual Studio 6 build log + +# Visual Studio 6 workspace options file + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output + +# Paket dependency manager + +# FAKE - F# Make + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) + # Cake - Uncomment if you are using it # tools/** # !tools/packages.config @@ -353,10 +482,112 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ -# ---> Node +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +### Node ### # Logs logs -*.log npm-debug.log* yarn-debug.log* yarn-error.log* @@ -394,7 +625,6 @@ bower_components build/Release # Dependency directories -node_modules/ jspm_packages/ # TypeScript v1 declaration files @@ -427,9 +657,11 @@ typings/ # dotenv environment variables file .env .env.test +.env*.local # parcel-bundler cache (https://parceljs.org/) .cache +.parcel-cache # Next.js build output .next @@ -461,4 +693,3 @@ dist # Stores VSCode versions used for testing VSCode extensions .vscode-test - diff --git a/Infrastructure/.keep b/Infrastructure/.keep new file mode 100644 index 0000000..e69de29 diff --git a/Infrastructure/Database/DbCommandInterceptor.cs b/Infrastructure/Database/DbCommandInterceptor.cs new file mode 100644 index 0000000..153a201 --- /dev/null +++ b/Infrastructure/Database/DbCommandInterceptor.cs @@ -0,0 +1,166 @@ +using System.Collections.Generic; +using System.Data; +using System.Data.Common; +using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore.Diagnostics; + +namespace Infrastructure.Data.OliVerse +{ + public class OutputCommandInterceptor : IDbCommandInterceptor + { + public List NonQueries = new List(); + + public InterceptionResult CommandCreating(CommandCorrelatedEventData eventData, InterceptionResult result) + { + return result; + } + + public DbCommand CommandCreated(CommandEndEventData eventData, DbCommand result) + { + return result; + } + + public InterceptionResult ReaderExecuting( + DbCommand command, + CommandEventData eventData, + InterceptionResult result + ) + { + var cmd = command.CommandText; + + var paramRegex = new Regex("@\\w+"); + + var matches = paramRegex.Matches(cmd); + + //cmd = matches.Cast().Aggregate(cmd, (current, match) => current.Replace(match.Value, command.Parameters.Cast().First(p => p.ParameterName == match.Value).Value.ToString())); ; + + if (matches.Count > 0) + { + + } + + + NonQueries.Add(command.CommandText); + return result; + } + + public InterceptionResult ScalarExecuting(DbCommand command, CommandEventData eventData, InterceptionResult result) + { + return result; + } + + public InterceptionResult NonQueryExecuting(DbCommand command, CommandEventData eventData, InterceptionResult result) + { + var cmd = command.CommandText; + foreach (DbParameter parameter in command.Parameters) + { + cmd = parameter.DbType == DbType.String + ? cmd.Replace(parameter.ParameterName, "'" + parameter.Value + "'") + : cmd.Replace(parameter.ParameterName, parameter.Value.ToString()); + } + + NonQueries.Add(cmd); + + //(command as En SqlCeMultiCommand) + //command.Cancel(); + return result; + } + + public Task> ReaderExecutingAsync( + DbCommand command, + CommandEventData eventData, + InterceptionResult result, + CancellationToken cancellationToken = new CancellationToken() + ) + { + return Task.FromResult(result); + } + + public Task> ScalarExecutingAsync( + DbCommand command, + CommandEventData eventData, + InterceptionResult result, + CancellationToken cancellationToken = new CancellationToken() + ) + { + return Task.FromResult(result); + } + + public Task> NonQueryExecutingAsync( + DbCommand command, + CommandEventData eventData, + InterceptionResult result, + CancellationToken cancellationToken = new CancellationToken() + ) + { + return Task.FromResult(result); + } + + public DbDataReader ReaderExecuted(DbCommand command, CommandExecutedEventData eventData, DbDataReader result) + { + return result; + } + + public object ScalarExecuted(DbCommand command, CommandExecutedEventData eventData, object result) + { + return result; + } + + public int NonQueryExecuted(DbCommand command, CommandExecutedEventData eventData, int result) + { + NonQueries.Add(command.CommandText); + return result; + } + + public Task ReaderExecutedAsync( + DbCommand command, + CommandExecutedEventData eventData, + DbDataReader result, + CancellationToken cancellationToken = new CancellationToken() + ) + { + return Task.FromResult(result); + } + + public Task ScalarExecutedAsync( + DbCommand command, + CommandExecutedEventData eventData, + object result, + CancellationToken cancellationToken = new CancellationToken() + ) + { + return Task.FromResult(result); + } + + public Task NonQueryExecutedAsync( + DbCommand command, + CommandExecutedEventData eventData, + int result, + CancellationToken cancellationToken = new CancellationToken() + ) + { + return Task.FromResult(result); + } + + public void CommandFailed(DbCommand command, CommandErrorEventData eventData) + { + NonQueries.Add(command.CommandText); + } + + public Task CommandFailedAsync( + DbCommand command, + CommandErrorEventData eventData, + CancellationToken cancellationToken = new CancellationToken() + ) + { + return Task.CompletedTask; + } + + public InterceptionResult DataReaderDisposing(DbCommand command, DataReaderDisposingEventData eventData, InterceptionResult result) + { + return result; + } + } +} \ No newline at end of file diff --git a/Infrastructure/Database/ExDbContext.cs b/Infrastructure/Database/ExDbContext.cs new file mode 100644 index 0000000..81de40d --- /dev/null +++ b/Infrastructure/Database/ExDbContext.cs @@ -0,0 +1,37 @@ +using Microsoft.EntityFrameworkCore; + +namespace Infrastructure.Data +{ + public class ExDbContext : DbContext + { + private string connectionString; + + public ExDbContext() + { } + + public ExDbContext(DbContextOptions options) : base(options) + { } + + public ExDbContext(string connectionString) + { + this.connectionString = connectionString; + } + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + base.OnModelCreating(modelBuilder); + + } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + { + base.OnConfiguring(optionsBuilder); + if (!string.IsNullOrWhiteSpace(connectionString)) + { + optionsBuilder.UseSqlServer(connectionString); + } + + //optionsBuilder.UseSqlServer("Server=tcp:kyljx9pxvr-dev.database.windows.net,1433;Database=oliverse_db_dev;User ID=olipos_admin@kyljx9pxvr-dev;Password=Mentor21;Trusted_Connection=False;Encrypt=True;Connection Timeout=150;"); + } + } +} \ No newline at end of file diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj new file mode 100644 index 0000000..8cdda12 --- /dev/null +++ b/Infrastructure/Infrastructure.csproj @@ -0,0 +1,33 @@ + + + + netcoreapp3.1 + enable + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/README.md b/README.md deleted file mode 100644 index 3e7d7ed..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# exsvelte - -ProEX GUI in Svelte & ASP.NET Core MVC \ No newline at end of file diff --git a/Web/Controllers/HomeController.cs b/Web/Controllers/HomeController.cs new file mode 100644 index 0000000..a67dfbc --- /dev/null +++ b/Web/Controllers/HomeController.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Mvc; + +namespace Web.Controllers +{ + [Route("Home")] + public class HomeController : Controller + { + [Route("Hello")] + public JsonResult Hello(Hello request) + { + return new JsonResult(new HelloResponse() {Result = $"hello, {request?.Name ?? "System.NullReferenceException"}"}); + } + + public IActionResult Index() + { + return View(); + } + } + + public class Hello + { + public string Name { get; set; } + } + public class HelloResponse + { + public string Result { get; set; } + } +} \ No newline at end of file diff --git a/LICENSE b/Web/LICENSE similarity index 100% rename from LICENSE rename to Web/LICENSE diff --git a/Web/NLog.config b/Web/NLog.config new file mode 100644 index 0000000..7a0f3aa --- /dev/null +++ b/Web/NLog.config @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Web/Program.cs b/Web/Program.cs new file mode 100644 index 0000000..cfadf8f --- /dev/null +++ b/Web/Program.cs @@ -0,0 +1,44 @@ +using System; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using NLog; +using NLog.Web; +using LogLevel = Microsoft.Extensions.Logging.LogLevel; + +namespace Web +{ + public class Program + { + public static void Main(string[] args) + { + var logger = LogManager/*NLogBuilder/*.ConfigureNLog("nlog.config")*/.GetCurrentClassLogger(); + try + { + logger.Debug("init main"); + CreateHostBuilder(args).Build().Run(); + } + catch (Exception exception) + { + //NLog: catch setup errors + logger.Fatal(exception, "Program stopped due to exception"); + throw; + } + finally + { + NLog.LogManager.Shutdown(); + } + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) + .ConfigureLogging(logging => + { + // prefer NLog for logging + //logging.ClearProviders(); + logging.SetMinimumLevel(LogLevel.Trace); + }) + .UseNLog(); + } +} \ No newline at end of file diff --git a/Web/Properties/launchSettings.json b/Web/Properties/launchSettings.json new file mode 100644 index 0000000..f4b8e3e --- /dev/null +++ b/Web/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "https://localhost:5001/", + "sslPort": 0 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "MyApp": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001/" + } + } +} \ No newline at end of file diff --git a/Web/README.md b/Web/README.md new file mode 100644 index 0000000..2fdf85c --- /dev/null +++ b/Web/README.md @@ -0,0 +1,22 @@ +# exsvelte + +ProEX GUI in Svelte & ASP.NET Core MVC + + +### To setup dev: +Install Node.js, then, in a command prompt: + +If you do not have yarn, install that first: +``` +$ npm install --global yarn +``` +Then, after clone, navigate to Web/ and run: +``` +$ yarn install +``` + +###To dev: +Run in a command prompt: +``` +$ rollup -c -w +``` \ No newline at end of file diff --git a/Web/Startup.cs b/Web/Startup.cs new file mode 100644 index 0000000..a9cc679 --- /dev/null +++ b/Web/Startup.cs @@ -0,0 +1,119 @@ +using System.IO; +using Infrastructure.Data; +using Infrastructure.Data.OliVerse; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Rewrite; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Newtonsoft.Json; +using Westwind.AspNetCore.LiveReload; + +namespace Web +{ + public class Startup + { + public Startup(IConfiguration configuration, IWebHostEnvironment hostEnvironment) + { + Configuration = configuration; + Env = hostEnvironment; + } + + public IWebHostEnvironment Env { get; } + + public IConfiguration Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + services.AddLiveReload(config => + { + config.FolderToMonitor = Path.GetFullPath(Path.Combine(Env.ContentRootPath, "..")); + }); + + services.AddDbContext(opt => + opt.UseSqlServer(Configuration.GetConnectionString("" /*TODO*/)) + .AddInterceptors(new OutputCommandInterceptor())); + services.AddRazorPages(options => { }); + services.AddControllersWithViews(options => { }); //(options => options.EnableEndpointRouting = false); + + + + //.AddJsonOptions(options => { options.JsonSerializerOptions.; }); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + else + { + // dont redirect if in development + app.UseHttpsRedirection(); + app.UseExceptionHandler("/Error"); + + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + } + + app.UseLiveReload(); + + app.UseStaticFiles(new StaticFileOptions() {ServeUnknownFileTypes = true, }); + + app.UseRouting(); + +// app.UseRewriter(new RewriteOptions().AddRedirect("", "/")); + + // example of custom Endpoint-based routing examples: + // https://github.com/dotnet/aspnetcore/issues/4221#issuecomment-488596903 + // https://github.com/dotnet/aspnetcore/blob/master/src/Mvc/test/WebSites/RoutingWebSite/StartupForDynamic.cs + + // old way of doing routing, requires options => options.EnableEndpointRouting = false + // app.UseMvc(routes => + // { + // routes.MapRoute("default", "{controller=Home}"); + // routes.MapSpaFallbackRoute("spa-fallback", + // new + // { + // controller = "Home", + // action = "Index" + // }); + // }); + // + //*/ + + + app.UseEndpoints(endpoints => + { + //endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}"); + + // try and match the URL to razor pages first + endpoints.MapRazorPages(); + + // then try and map the URL to Controllers (including the API) + //endpoints.MapControllerRoute("default", "/{controller}/"); + endpoints.MapControllers(); + + // and if that doesnt work, send them the homepage, but leave their URI path intact as for handling by the SPA + endpoints.MapFallbackToController("Index", "Home"); + + // endpoints.MapFallbackToPage("/"); + //endpoints.MapToSpaCliProxy("/"); + + // Note: only use spacliproxy in development. + // Production should use "UseSpaStaticFiles()" + }); //*/ + + // app.UseEndpoints(endpoints => + // { + // endpoints.MapRazorPages(); + // endpoints.MapControllers(); + // }); + } + } +} \ No newline at end of file diff --git a/Web/Views/Error.cshtml b/Web/Views/Error.cshtml new file mode 100644 index 0000000..fbecae3 --- /dev/null +++ b/Web/Views/Error.cshtml @@ -0,0 +1,25 @@ +@page +@{ + ViewData["Title"] = "Error"; +} + +

Error.

+

An error occurred while processing your request.

+@* +@if (Model.ShowRequestId) +{ +

+ Request ID: @Model.RequestId +

+} +*@ +

Development Mode

+

+ Swapping to the Development environment displays detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

diff --git a/Web/Views/Home/Index.cshtml b/Web/Views/Home/Index.cshtml new file mode 100644 index 0000000..7d9d0f6 --- /dev/null +++ b/Web/Views/Home/Index.cshtml @@ -0,0 +1,3 @@ +@{ + ViewData["Title"] = "Home"; +} \ No newline at end of file diff --git a/Web/Views/Privacy.cshtml b/Web/Views/Privacy.cshtml new file mode 100644 index 0000000..5c36d09 --- /dev/null +++ b/Web/Views/Privacy.cshtml @@ -0,0 +1,7 @@ +@page +@{ + ViewData["Title"] = "Privacy Policy"; +} +

@ViewData["Title"]

+ +

Use this page to detail your site's privacy policy.

diff --git a/Web/Views/Shared/_Layout.cshtml b/Web/Views/Shared/_Layout.cshtml new file mode 100644 index 0000000..f885c0c --- /dev/null +++ b/Web/Views/Shared/_Layout.cshtml @@ -0,0 +1,32 @@ + + + + + + + @ViewData["Title"] - Web + @* *@ + @* *@ + + @* *@ + + + + + + + + + +@RenderBody() + + + + + + +@RenderSection("scripts", required: false) + + \ No newline at end of file diff --git a/Web/Views/Shared/_ValidationScriptsPartial.cshtml b/Web/Views/Shared/_ValidationScriptsPartial.cshtml new file mode 100644 index 0000000..5a16d80 --- /dev/null +++ b/Web/Views/Shared/_ValidationScriptsPartial.cshtml @@ -0,0 +1,2 @@ + + diff --git a/Web/Views/_ViewImports.cshtml b/Web/Views/_ViewImports.cshtml new file mode 100644 index 0000000..6090905 --- /dev/null +++ b/Web/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@namespace Web.Pages +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Microsoft.AspNetCore.SpaServices diff --git a/Web/Views/_ViewStart.cshtml b/Web/Views/_ViewStart.cshtml new file mode 100644 index 0000000..a5f1004 --- /dev/null +++ b/Web/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/Web/Web.csproj b/Web/Web.csproj new file mode 100644 index 0000000..c12a841 --- /dev/null +++ b/Web/Web.csproj @@ -0,0 +1,51 @@ + + + + netcoreapp3.1 + enable + latest + Exe + 2.8 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ContentIncludedByDefault Remove="wwwroot\build\wwwroot\bundle.css" /> + <_ContentIncludedByDefault Remove="wwwroot\build\wwwroot\bundle.css.map" /> + + + diff --git a/Web/appsettings.Development.json b/Web/appsettings.Development.json new file mode 100644 index 0000000..f8c60cf --- /dev/null +++ b/Web/appsettings.Development.json @@ -0,0 +1,20 @@ +{ + "DebugMode": true, + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "Console": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } + } +} diff --git a/Web/appsettings.json b/Web/appsettings.json new file mode 100644 index 0000000..c851e12 --- /dev/null +++ b/Web/appsettings.json @@ -0,0 +1,15 @@ +{ + "Logging": { + "IncludeScopes": false, + "Debug": { + "LogLevel": { + "Default": "Warning" + } + }, + "Console": { + "LogLevel": { + "Default": "Warning" + } + } + } +} diff --git a/Web/gulpfile.js b/Web/gulpfile.js new file mode 100644 index 0000000..48c0e72 --- /dev/null +++ b/Web/gulpfile.js @@ -0,0 +1,25 @@ +(function () { + var SCRIPTS = { + 'dev': 'npm run dev', + 'dtos': 'npm run dtos', + 'build': 'npm run build', + 'publish': 'npm run publish' + }; + + var gulp = require('gulp'); + var exec = require('child_process').exec; + + function runScript(script, done) { + process.env.FORCE_COLOR = 1; + var proc = exec(script + (script.startsWith("npm") ? " --silent" : "")); + proc.stdout.pipe(process.stdout); + proc.stderr.pipe(process.stderr); + proc.on('exit', () => done()); + } + + // Tasks + Object.keys(SCRIPTS).forEach(name => { + gulp.task(name, done => runScript(SCRIPTS[name], done)); + }); + +})(); \ No newline at end of file diff --git a/Web/package.json b/Web/package.json new file mode 100644 index 0000000..29e1475 --- /dev/null +++ b/Web/package.json @@ -0,0 +1,71 @@ +{ + "name": "exsvelte", + "version": "0.1.0", + "repository": "https://quartznet.info/git/MiniJack/exsvelte", + "author": "Ben Parsons <9parsonsb@gmail.com>", + "license": "MIT", + "scripts": { + "build": "rollup -c", + "dev": "rollup -c -w", + "start": "sirv wwwroot" + }, + "devDependencies": { + "@babel/core": "^7.12.3", + "@babel/preset-env": "^7.8.3", + "@beyonk/svelte-toggle": "^0.1.2", + "@rollup/plugin-commonjs": "^11.0.1", + "@rollup/plugin-json": "^4.0.1", + "@rollup/plugin-node-resolve": "^10.0.0", + "@rollup/plugin-typescript": "^2.1.0", + "@types/node": "^13.1.8", + "aspnet-webpack": "^3.0.0", + "autoprefixer": "^10.0.1", + "babel-cli": "^6.23.0", + "css-loader": "^3.4.2", + "eslint-plugin-svelte3": "^2.7.3", + "event-source-polyfill": "^1.0.12", + "file-loader": "^5.0.2", + "gulp": "^4.0.2", + "install": "^0.13.0", + "isomorphic-fetch": "^2.2.1", + "jquery": "^3.5.1", + "node-sass": "^5.0.0", + "rollup": "^2.33.1", + "rollup-plugin-babel": "^4.4.0", + "rollup-plugin-livereload": "^2.0.0", + "rollup-plugin-node-builtins": "^2.1.2", + "rollup-plugin-node-globals": "^1.4.0", + "rollup-plugin-sass": "^1.2.2", + "rollup-plugin-scss": "^2.6.1", + "rollup-plugin-svelte": "^6.0.0", + "rollup-plugin-terser": "^7.0.0", + "sass": "^1.29.0", + "sirv": "^1.0.7", + "sirv-cli": "^1.0.0", + "svelte": "^3.29.4", + "svelte-loader": "^2.13.6", + "svelte-navaid": "^0.1.1", + "svelte-preprocess": "^4.5.2", + "ts-loader": "^6.2.1", + "tslib": "^1.10.0", + "typescript": "^3.7.5", + "uglifyjs-webpack-plugin": "^2.2.0", + "url-loader": "^3.0.0", + "webpack": "^4.41.5", + "webpack-cli": "^3.3.10", + "webpack-dev-middleware": "^3.7.2", + "webpack-hot-middleware": "^2.25.0", + "webpack-virtual-modules": "^0.2.1" + }, + "dependencies": { + "@beyonk/svelte-carousel": "^2.8.0", + "bootstrap": "^4.5.3", + "jquery": "^3.5.1", + "popper.js": "^1.16.1", + "postcss": "^8.1.6", + "scss": "^0.2.4", + "siema": "^1.5.1", + "svelte-feather-icons": "^3.3.0", + "svelte-swipe": "^1.7.1" + } +} diff --git a/Web/rollup.config.js b/Web/rollup.config.js new file mode 100644 index 0000000..6814b17 --- /dev/null +++ b/Web/rollup.config.js @@ -0,0 +1,122 @@ +import babel from 'rollup-plugin-babel'; +import svelte from 'rollup-plugin-svelte'; +import resolve from '@rollup/plugin-node-resolve'; +import commonjs from '@rollup/plugin-commonjs'; +import livereload from 'rollup-plugin-livereload'; +import { terser } from 'rollup-plugin-terser'; +import builtins from 'rollup-plugin-node-builtins'; +import globals from 'rollup-plugin-node-globals'; +import sveltePreprocess from 'svelte-preprocess'; +import typescript from '@rollup/plugin-typescript'; +import json from "@rollup/plugin-json"; +import scss from 'rollup-plugin-scss' +import { nodeResolve } from '@rollup/plugin-node-resolve'; + +const production = !process.env.ROLLUP_WATCH; +const port = process.env.PORT; +const buildDir = 'wwwroot/build'; + +function serve() { + let server; + + function toExit() { + if (server) server.kill(0); + } + + return { + writeBundle() { + if (server) return; + server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], { + stdio: ['ignore', 'inherit', 'inherit'], + shell: true + }); + + process.on('SIGTERM', toExit); + process.on('exit', toExit); + } + }; +} + +export default { + input: 'src/main.ts', + output: { + sourcemap: true, + format: 'esm', + name: 'app', + //file: 'wwwroot/bundle.js' + dir: buildDir, + }, + plugins: [ + svelte({ + // enable run-time checks when not in production + dev: !production, + // // we'll extract any component CSS out into + // // a separate file - better for performance + // css: css => { + // css.write('bundle.css'); + // }, + preprocess: sveltePreprocess({ + scss: { + includePaths: ['src'], + excludePaths: ['wwwroot', 'node_modules'], + minify: !production + }, + postcss: { + plugins: [require('autoprefixer')], + }, + }), + emitCss: true + }), + + // If you have external dependencies installed from + // npm, you'll most likely need these plugins. In + // some cases you'll need additional configuration - + // consult the documentation for details: + // https://github.com/rollup/plugins/tree/master/packages/commonjs + resolve({ + browser: true, + dedupe: importee => importee === 'svelte' || importee.startsWith('svelte/') + }), + commonjs({ + extensions: ['.js'], + namedExports: { + 'node_modules/bootstrap/dist/js/bootstrap.min.js' : ['bootstrap'], + jquery : 'jQuery', + 'popper.js': 'Popper' + }, + exclude: "node_modules/**" + }), + json(), + globals(), + builtins(), + babel({exclude: "node_modules/**"}), + nodeResolve(), + typescript({ sourceMap: !production }), + scss({ + exclude: ['node_modules'], + sass: require('sass'), + minify: !production, + output: 'wwwroot/build/bundle.css', + sourcemap: true + }), + + // In dev mode, call `npm run start` once + // the bundle has been generated + //!production && serve(), + + // Watch the `wwwroot` directory and refresh the + // browser on changes when not in production + // note that livereload will not work when running under aspnetcore. use the livereload nuget package when running under aspnetcore + !production && livereload({ + watch: './wwwroot', + port, + }), + + // If we're building for production (npm run build + // instead of npm run dev), minify + production && terser() + ], + watch: { + clearScreen: false + } +}; diff --git a/Web/scripts/setupTypeScript.js b/Web/scripts/setupTypeScript.js new file mode 100644 index 0000000..71efddf --- /dev/null +++ b/Web/scripts/setupTypeScript.js @@ -0,0 +1,128 @@ +// @ts-check + +/** This script modifies the project to support TS code in .svelte files like: + + + + As well as validating the code for CI. + */ + +/** To work on this script: + rm -rf test-template template && git clone sveltejs/template test-template && node scripts/setupTypeScript.js test-template +*/ + +const fs = require("fs") +const path = require("path") +const { argv } = require("process") + +const projectRoot = argv[2] || path.join(__dirname, "..") + +// Add deps to pkg.json +const packageJSON = JSON.parse(fs.readFileSync(path.join(projectRoot, "package.json"), "utf8")) +packageJSON.devDependencies = Object.assign(packageJSON.devDependencies, { + "svelte-check": "^1.0.0", + "svelte-preprocess": "^4.0.0", + "@rollup/plugin-typescript": "^6.0.0", + "typescript": "^3.9.3", + "tslib": "^2.0.0", + "@tsconfig/svelte": "^1.0.0" +}) + +// Add script for checking +packageJSON.scripts = Object.assign(packageJSON.scripts, { + "validate": "svelte-check" +}) + +// Write the package JSON +fs.writeFileSync(path.join(projectRoot, "package.json"), JSON.stringify(packageJSON, null, " ")) + +// mv src/main.js to main.ts - note, we need to edit rollup.config.js for this too +const beforeMainJSPath = path.join(projectRoot, "src", "main.js") +const afterMainTSPath = path.join(projectRoot, "src", "main.ts") +fs.renameSync(beforeMainJSPath, afterMainTSPath) + +// Switch the app.svelte file to use TS +const appSveltePath = path.join(projectRoot, "src", "App.svelte") +let appFile = fs.readFileSync(appSveltePath, "utf8") +appFile = appFile.replace(" + + + +