Changed to use linq-es5 react package so it could be built withn NPM.…

… Web interface now taking Env params for the db location as well as listen port. Docker build file working.

HolidayShow.Data.Core/EfHolidayContext.cs

@@ -10,14 +10,19 @@ public class EfHolidayContext : DbContext
 
         public EfHolidayContext()
         {
-            _connectionString = "Server=10.64.128.100,1401;Database=HolidayShow_Dev;User Id=dev;Password=dev123;Trusted_Connection=False;";
+            //_connectionString = "Server=10.64.128.100,1401;Database=HolidayShow_Dev;User Id=dev;Password=dev123;Trusted_Connection=False;";
         }
 
         public EfHolidayContext(string cs)
         {
             _connectionString = cs;
         }
 
+        public EfHolidayContext(DbContextOptions<EfHolidayContext> options) : base(options)
+        {
+
+        }
+
         public void UpdateDatabase()
         {
             //this.Database.ExecuteSqlCommand(Resources.HolidayShow);

HolidayShowWeb/ClientApp/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@material-ui/core": "^1.5.1",
     "@material-ui/icons": "^2.0.3",
-    "linq-es2015": "^2.4.33",
+    "linq-es5": "^1.11.14",
     "proptypes": "^1.1.0",
     "react": "^16.4.2",
     "react-beautiful-dnd": "^9.0.2",

HolidayShowWeb/ClientApp/src/components/DeviceEditor.js

@@ -11,7 +11,7 @@ import FormControl from '@material-ui/core/FormControl';
 import Select from '@material-ui/core/Select';
 import InputLabel from '@material-ui/core/InputLabel';
 import MenuItem from '@material-ui/core/MenuItem';
-import * as Enumerable from "linq-es2015";
+import * as Enumerable from "linq-es5";
 
 const styles = theme => ({
     formControl: {

HolidayShowWeb/ClientApp/src/components/DeviceIoPortEditor.js

@@ -9,7 +9,7 @@ import Switch from '@material-ui/core/Switch';
 import BusyContent from './controls/BusyContent';
 import Button from '@material-ui/core/Button';
 import FindReplace from '@material-ui/icons/FindReplace'
-import * as Enumerable from "linq-es2015";
+import * as Enumerable from "linq-es5";
 import ErrorContent from './controls/ErrorContent';
 
 const styles = theme => ({});

HolidayShowWeb/ClientApp/src/components/DevicePatternEditor.js

@@ -13,7 +13,7 @@ import InputLabel from '@material-ui/core/InputLabel';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormControl from '@material-ui/core/FormControl';
 import TextField from '@material-ui/core/TextField';
-import * as Enumerable from "linq-es2015";
+import * as Enumerable from "linq-es5";
 import IconButton from '@material-ui/core/IconButton';
 import DeleteIcon from '@material-ui/icons/Delete';
 import AddIcon from '@material-ui/icons/Add';

HolidayShowWeb/ClientApp/src/components/EffectsEditor.js

@@ -11,7 +11,7 @@ import InputLabel from '@material-ui/core/InputLabel';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormControl from '@material-ui/core/FormControl';
 import TextField from '@material-ui/core/TextField';
-import * as Enumerable from "linq-es2015";
+import * as Enumerable from "linq-es5";
 import IconButton from '@material-ui/core/IconButton';
 import DeleteIcon from '@material-ui/icons/Delete';
 import AddIcon from '@material-ui/icons/Add';

HolidayShowWeb/ClientApp/src/components/Home.js

@@ -8,7 +8,7 @@ import Button from '@material-ui/core/Button';
 import Typography from '@material-ui/core/Typography';
 import BusyContent from './controls/BusyContent';
 import ErrorContent from './controls/ErrorContent';
-import * as Enumerable from "linq-es2015";
+import * as Enumerable from "linq-es5";
 
 const styles = theme => ({
   button: {

HolidayShowWeb/ClientApp/src/components/SetsEditor.js

@@ -13,7 +13,7 @@ import InputLabel from '@material-ui/core/InputLabel';
 import MenuItem from '@material-ui/core/MenuItem';
 import FormControl from '@material-ui/core/FormControl';
 import TextField from '@material-ui/core/TextField';
-import * as Enumerable from "linq-es2015";
+import * as Enumerable from "linq-es5";
 import IconButton from '@material-ui/core/IconButton';
 import DeleteIcon from '@material-ui/icons/Delete';
 import AddIcon from '@material-ui/icons/Add';

HolidayShowWeb/ClientApp/src/components/SettingsEditor.js

@@ -7,7 +7,7 @@ import FormControlLabel from '@material-ui/core/FormControlLabel';
 import Switch from '@material-ui/core/Switch';
 import BusyContent from './controls/BusyContent';
 import ErrorContent from './controls/ErrorContent';
-import * as Enumerable from "linq-es2015";
+import * as Enumerable from "linq-es5";
 
 const delayMs = "SetDelayMs";
 const audioTimeOffAt = "AudioTimeOffAt";

HolidayShowWeb/Controllers/DeviceIoPortsController.cs

@@ -110,52 +110,50 @@ public async Task<IActionResult> PutDeviceIoPortIdentify([FromRoute] int id)
 
             try
             {
-                using (var dc = new EfHolidayContext())
-                {
-
-                    var ioPort = await dc.DeviceIoPorts.Where(x => x.DeviceIoPortId == id).FirstOrDefaultAsync();
+
+                    var ioPort = await _context.DeviceIoPorts.Where(x => x.DeviceIoPortId == id).FirstOrDefaultAsync();
                     if (ioPort == null) return BadRequest(ModelState);
 
-                    var existingSetting = await dc.Settings.Where(x => x.SettingName == SettingKeys.DetectDevicePin)
+                    var existingSetting = await _context.Settings.Where(x => x.SettingName == SettingKeys.DetectDevicePin)
                         .FirstOrDefaultAsync();
                     if (existingSetting == null)
                     {
                         existingSetting = new Settings()
                         {
                             SettingName = SettingKeys.DetectDevicePin
                         };
-                        dc.Settings.Add(existingSetting);
+                        _context.Settings.Add(existingSetting);
                     }
 
                     existingSetting.ValueString = $"{ioPort.DeviceId}:{ioPort.CommandPin}";
-                    await dc.SaveChangesAsync();
+                    await _context.SaveChangesAsync();
 
-                    var option = await dc.Settings.Where(x => x.SettingName == SettingKeys.SetPlaybackOption)
+                    var option = await _context.Settings.Where(x => x.SettingName == SettingKeys.SetPlaybackOption)
                         .FirstOrDefaultAsync();
                     if (option == null)
                     {
                         option = new Settings {SettingName = SettingKeys.SetPlaybackOption};
-                        dc.Settings.Add(option);
+                        _context.Settings.Add(option);
                     }
 
                     option.ValueDouble = (double) SetPlaybackOptionEnum.DevicePinDetect;
-                    await dc.SaveChangesAsync();
+                    await _context.SaveChangesAsync();
 
-                    var setting = await dc.Settings.Where(x => x.SettingName == SettingKeys.Refresh).FirstOrDefaultAsync();
+                    var setting = await _context.Settings.Where(x => x.SettingName == SettingKeys.Refresh).FirstOrDefaultAsync();
 
                     if (setting == null)
                     {
                         setting = new Settings
                         {
                             SettingName = SettingKeys.Refresh,
                         };
-                        dc.Settings.Add(setting);
+                        _context.Settings.Add(setting);
                     }
 
                     setting.ValueString = "None";
 
-                    await dc.SaveChangesAsync();
-                }
+                    await _context.SaveChangesAsync();
+
             }
             catch (DbUpdateConcurrencyException)
             {

HolidayShowWeb/Dockerfile

@@ -1,8 +1,8 @@
 FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
 WORKDIR /app
 
-#Default Container Port 5555 will be used.
-ARG DEFAULTPORT=5555
+#Default Container Port 5001 will be used.
+ARG DEFAULTPORT=5001
 
 EXPOSE $DEFAULTPORT
 
@@ -15,8 +15,6 @@ ENV PORT=$DEFAULTPORT
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-ENV ASPNETCORE_URLS http://+:80
-
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /src
 
@@ -42,7 +40,6 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
 
-EXPOSE 80
 ENTRYPOINT ["dotnet", "HolidayShowWeb.dll"]
 
 

HolidayShowWeb/Program.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Options;
 
 namespace HolidayShowWeb
 {
@@ -12,10 +11,20 @@ public static void Main(string[] args)
             CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+        {
+            // get the environment var
+            var portStr = System.Environment.GetEnvironmentVariable("PORT");
+            if (!int.TryParse(portStr, out var port))
+            {
+                port = 5001;
+            }
+
+            return WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseUrls($"http://*:5001");
+                .UseUrls($"http://*:{port}");
+        }
+
 
     }
 }

HolidayShowWeb/Startup.cs

@@ -1,3 +1,4 @@
+using System;
 using HolidayShow.Data;
 using HolidayShowWeb.Resovlers;
 using Microsoft.AspNetCore.Builder;
@@ -31,8 +32,23 @@ public void ConfigureServices(IServiceCollection services)
                 configuration.RootPath = "ClientApp/build";
             });
 
+            var server = System.Environment.GetEnvironmentVariable("DBSERVER");
+            var database = System.Environment.GetEnvironmentVariable("DBNAME");
+            var username = System.Environment.GetEnvironmentVariable("DBUSER");
+            var password = System.Environment.GetEnvironmentVariable("DBPASS");
+
+            var connectionString = Configuration.GetConnectionString("EfHolidayContext");
+            if (!string.IsNullOrWhiteSpace(server))
+            {
+                connectionString = $"Server={server};Database={database};User Id={username};Password={password};";
+            }
+            else
+            {
+                throw new Exception("Environment Variables Not Set! Set for DB Connection Information!");
+            }
+
             services.AddDbContext<EfHolidayContext>(options =>
-                options.UseSqlServer(Configuration.GetConnectionString("EfHolidayContext")));
+                options.UseSqlServer(connectionString));
 
             services.AddMvc().AddJsonOptions(options => {
                 //options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();

HolidayShowWeb/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "EfHolidayContext": "Server=10.64.128.100,1401;Database=HolidayShow_Dev;User Id=dev;Password=dev123;Trusted_Connection=False;"
+    "EfHolidayContext": ""
   },
   "Logging": {
     "LogLevel": {

docker-compose.yml

@@ -1,15 +1,21 @@
 version: '3.4'
 
 services:
-  HolidayShowClient:
-    image: holidayshowclient
-    build:
-      context: .
-      dockerfile: HolidayShowClient.Core/Dockerfile
+ # HolidayShowClient:
+ #   image: holidayshowclient
+ #   build:
+ #     context: .
+ #     dockerfile: HolidayShowClient.Core/Dockerfile
 
 
-  HolidayShowServer:
-   image: holidayshowserver
+  #HolidayShowServer:
+  # image: holidayshowserver
+  # build:
+  #   context: .
+  #   dockerfile: HolidayShowServer.Core/Dockerfile
+
+  HolidayShowEdit:
+   image: holidayshowedit
    build:
      context: .
-     dockerfile: HolidayShowServer.Core/Dockerfile
+     dockerfile: HolidayShowWeb/Dockerfile