diff --git a/src/MatBlazor.Demo/Demo/DemoMatSelect.razor b/src/MatBlazor.Demo/Demo/DemoMatSelect.razor index 51a55f81..7d69cb00 100644 --- a/src/MatBlazor.Demo/Demo/DemoMatSelect.razor +++ b/src/MatBlazor.Demo/Demo/DemoMatSelect.razor @@ -82,6 +82,47 @@ + + + MatSelect Guid? + + + + + + Bread, Cereal, Rice, and Pasta + Vegetables + Fruit + + + @guidValue + + @code + { + Guid? guidValue = new Guid("20A82054-F493-4C7B-81A4-4F9A1EDD7C2E"); + } + + + + + + Bread, Cereal, Rice, and Pasta + Vegetables + Fruit + + + @guidValue + + @code + { + Guid? guidValue = new Guid(""20A82054-F493-4C7B-81A4-4F9A1EDD7C2E""); + } + + ")> + + +
Helper Text
diff --git a/src/MatBlazor.Web/README.md b/src/MatBlazor.Web/README.md index de969943..c3c82162 100644 --- a/src/MatBlazor.Web/README.md +++ b/src/MatBlazor.Web/README.md @@ -1,4 +1,12 @@ -# es6-webpack2-starter +To deploy static web assets, one needs to use `npm`. If you have NPM installed, see the "Manual deploy with NPM" section. If you prefer running `npm` isolated in a docker container, run `deploy.ps1` (requires powershell). + +# Powershell deploy script + +In this folder, run `.\deploy.ps1`. + +⚠️ This overwrites the static web assets in `MatBlazor/src/MatBlazor/wwwroot/dist` ⚠️ + +# Manual deploy with NPM [![npm](https://img.shields.io/npm/v/es6-webpack2-starter.svg?maxAge=2592000?style=flat-square)](https://www.npmjs.com/package/es6-webpack2-starter) [![npm](https://img.shields.io/npm/l/es6-webpack2-starter.svg?maxAge=2592000?style=flat-square)](https://github.com/micooz/es6-webpack2-starter/blob/master/LICENSE) diff --git a/src/MatBlazor.Web/deploy.df b/src/MatBlazor.Web/deploy.df new file mode 100644 index 00000000..b94c3b92 --- /dev/null +++ b/src/MatBlazor.Web/deploy.df @@ -0,0 +1,8 @@ +FROM node +WORKDIR src +COPY package.json . +COPY .babelrc . +COPY .eslintrc.js . +RUN npm install +COPY . . +RUN npm run build \ No newline at end of file diff --git a/src/MatBlazor.Web/deploy.df.dockerignore b/src/MatBlazor.Web/deploy.df.dockerignore new file mode 100644 index 00000000..baab9a33 --- /dev/null +++ b/src/MatBlazor.Web/deploy.df.dockerignore @@ -0,0 +1,6 @@ +deploy.ps1 +deploy.df +deploy.df.dockerignore +README.md +LICENSE +test.html \ No newline at end of file diff --git a/src/MatBlazor.Web/deploy.ps1 b/src/MatBlazor.Web/deploy.ps1 new file mode 100644 index 00000000..afd8fa1d --- /dev/null +++ b/src/MatBlazor.Web/deploy.ps1 @@ -0,0 +1,3 @@ +docker build -t matblazor_deploy -f deploy.df . +docker run -it --rm matblazor_deploy cat /MatBlazor/wwwroot/dist/matBlazor.js | Set-Content -Encoding ASCII ..\MatBlazor\wwwroot\dist\matBlazor.js +docker run -it --rm matblazor_deploy cat /MatBlazor/wwwroot/dist/matBlazor.css | Set-Content -Encoding ASCII ..\MatBlazor\wwwroot\dist\matBlazor.css diff --git a/src/MatBlazor/Core/MatBlazorSwitchT.cs b/src/MatBlazor/Core/MatBlazorSwitchT.cs index 735603ab..667721b9 100644 --- a/src/MatBlazor/Core/MatBlazorSwitchT.cs +++ b/src/MatBlazor/Core/MatBlazorSwitchT.cs @@ -65,7 +65,9 @@ public virtual T FromBool(bool v) .Case>(new MatBlazorSwitchTDateTime()) .Case>(new MatBlazorSwitchTDateTimeNull()) .Case>(new MatBlazorSwitchTBool()) - .Case>(new MatBlazorSwitchTBoolNull()); + .Case>(new MatBlazorSwitchTBoolNull()) + .Case>(new MatBlazorSwitchTGuid()) + .Case>(new MatBlazorSwitchTGuidNull()); public static MatBlazorSwitchT Get() { diff --git a/src/MatBlazor/Core/MatBlazorSwitchTGuid.cs b/src/MatBlazor/Core/MatBlazorSwitchTGuid.cs new file mode 100644 index 00000000..1e2382ed --- /dev/null +++ b/src/MatBlazor/Core/MatBlazorSwitchTGuid.cs @@ -0,0 +1,67 @@ +using System; + +namespace MatBlazor +{ + public class MatBlazorSwitchTGuid : MatBlazorSwitchT + { + public override Guid Increase(Guid v, Guid step, Guid max) + { + throw new NotImplementedException(); + } + + public override Guid Decrease(Guid v, Guid step, Guid min) + { + throw new NotImplementedException(); + } + + public override Guid Round(Guid v, int dp) + { + throw new NotImplementedException(); + } + + public override Guid GetMinimum() + { + throw new NotImplementedException(); + } + + public override Guid GetMaximum() + { + throw new NotImplementedException(); + } + + public override Guid GetStep() + { + throw new NotImplementedException(); + } + + public override string FormatValueAsString(Guid v, string format) + { + return v.ToString(format); + } + + public override Guid ParseFromString(string v, string format) + { + return Guid.Parse(v); + } + + public override Guid FromDateTimeNull(DateTime? v) + { + throw new NotImplementedException(); + } + + public override DateTime? ToDateTimeNull(Guid v) + { + throw new NotImplementedException(); + } + + public override Guid FromBoolNull(bool? v, bool indeterminate) + { + throw new NotImplementedException(); + } + + public override Guid FromDecimal(decimal v) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/src/MatBlazor/Core/MatBlazorSwitchTGuidNull.cs b/src/MatBlazor/Core/MatBlazorSwitchTGuidNull.cs new file mode 100644 index 00000000..aa33d2ef --- /dev/null +++ b/src/MatBlazor/Core/MatBlazorSwitchTGuidNull.cs @@ -0,0 +1,72 @@ +using System; + +namespace MatBlazor +{ + public class MatBlazorSwitchTGuidNull : MatBlazorSwitchT + { + public override Guid? Increase(Guid? v, Guid? step, Guid? max) + { + throw new NotImplementedException(); + } + + public override Guid? Decrease(Guid? v, Guid? step, Guid? min) + { + throw new NotImplementedException(); + } + + public override Guid? Round(Guid? v, int dp) + { + throw new NotImplementedException(); + } + + public override Guid? GetMinimum() + { + throw new NotImplementedException(); + } + + public override Guid? GetMaximum() + { + throw new NotImplementedException(); + } + + public override Guid? GetStep() + { + throw new NotImplementedException(); + } + + public override string FormatValueAsString(Guid? v, string format) + { + return v?.ToString(format); + } + + public override Guid? ParseFromString(string v, string format) + { + if (Guid.TryParse(v, out var result)) + { + return result; + } + + return null; + } + + public override Guid? FromDateTimeNull(DateTime? v) + { + throw new NotImplementedException(); + } + + public override DateTime? ToDateTimeNull(Guid? v) + { + throw new NotImplementedException(); + } + + public override Guid? FromBoolNull(bool? v, bool indeterminate) + { + throw new NotImplementedException(); + } + + public override Guid? FromDecimal(decimal v) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file