diff --git a/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Horizontal.razor b/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Horizontal.razor index c8f58df9..9d4443fe 100644 --- a/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Horizontal.razor +++ b/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Horizontal.razor @@ -1,5 +1,5 @@ @page "/charts/bar/horizontal" -@using ChartJS.BarChart +@using ChartJs.Blazor.BarChart @using System.Drawing @layout SampleLayout diff --git a/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Stacked.razor b/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Stacked.razor index 37e0d5d2..48dd69e1 100644 --- a/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Stacked.razor +++ b/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Stacked.razor @@ -1,6 +1,6 @@ @page "/charts/bar/stacked" -@using ChartJS.BarChart -@using ChartJs.Blazor.ChartJS.BarChart.Axes +@using ChartJs.Blazor.BarChart +@using ChartJs.Blazor.BarChart.Axes @layout SampleLayout diff --git a/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Vertical.razor b/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Vertical.razor index 28e53407..7cd50066 100644 --- a/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Vertical.razor +++ b/ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Vertical.razor @@ -1,5 +1,5 @@ @page "/charts/bar/vertical" -@using ChartJS.BarChart +@using ChartJs.Blazor.BarChart @using System.Drawing @layout SampleLayout diff --git a/ChartJs.Blazor.Samples/Client/Pages/Charts/Line/Basic.razor b/ChartJs.Blazor.Samples/Client/Pages/Charts/Line/Basic.razor index 9c2e524c..d347c8db 100644 --- a/ChartJs.Blazor.Samples/Client/Pages/Charts/Line/Basic.razor +++ b/ChartJs.Blazor.Samples/Client/Pages/Charts/Line/Basic.razor @@ -1,5 +1,5 @@ @page "/charts/line/basic" -@using ChartJS.LineChart +@using ChartJs.Blazor.LineChart @layout SampleLayout diff --git a/ChartJs.Blazor.Samples/Client/_Imports.razor b/ChartJs.Blazor.Samples/Client/_Imports.razor index 78befd47..25991866 100644 --- a/ChartJs.Blazor.Samples/Client/_Imports.razor +++ b/ChartJs.Blazor.Samples/Client/_Imports.razor @@ -8,14 +8,13 @@ @using ChartJs.Blazor.Samples.Client @using ChartJs.Blazor.Samples.Client.Shared @using ChartJs.Blazor.Samples.Shared -@using ChartJS.Common -@using ChartJS.Common.Axes -@using ChartJS.Common.Axes.Ticks -@using ChartJS.Common.Enums -@using ChartJS.Common.Properties -@using ChartJS.Common.Handlers -@using ChartJS.Common.Time -@using ChartJs.Blazor.Charts +@using ChartJs.Blazor +@using ChartJs.Blazor.Common +@using ChartJs.Blazor.Common.Axes +@using ChartJs.Blazor.Common.Axes.Ticks +@using ChartJs.Blazor.Common.Enums +@using ChartJs.Blazor.Common.Handlers +@using ChartJs.Blazor.Common.Time @using ChartJs.Blazor.Util @using ChartJs.Blazor.Interop @using static ChartJs.Blazor.Samples.Shared.SampleUtils diff --git a/ChartJs.Blazor.Tests/ClippingTests.Deserialization.cs b/ChartJs.Blazor.Tests/ClippingTests.Deserialization.cs index cb07e407..b1191240 100644 --- a/ChartJs.Blazor.Tests/ClippingTests.Deserialization.cs +++ b/ChartJs.Blazor.Tests/ClippingTests.Deserialization.cs @@ -1,5 +1,5 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.LineChart; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.LineChart; using Newtonsoft.Json; using System; using System.Collections.Generic; diff --git a/ChartJs.Blazor.Tests/ClippingTests.Equality.cs b/ChartJs.Blazor.Tests/ClippingTests.Equality.cs index 59b096f5..01c654a7 100644 --- a/ChartJs.Blazor.Tests/ClippingTests.Equality.cs +++ b/ChartJs.Blazor.Tests/ClippingTests.Equality.cs @@ -1,5 +1,5 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.LineChart; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.LineChart; using System; using System.Collections.Generic; using System.Text; diff --git a/ChartJs.Blazor.Tests/ClippingTests.Serialization.cs b/ChartJs.Blazor.Tests/ClippingTests.Serialization.cs index d710686d..2022173c 100644 --- a/ChartJs.Blazor.Tests/ClippingTests.Serialization.cs +++ b/ChartJs.Blazor.Tests/ClippingTests.Serialization.cs @@ -1,5 +1,5 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.LineChart; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.LineChart; using Newtonsoft.Json; using System; using System.Collections.Generic; diff --git a/ChartJs.Blazor.Tests/ObjectEnumTests.Deserialization.cs b/ChartJs.Blazor.Tests/ObjectEnumTests.Deserialization.cs index 9a54ecf4..871b6523 100644 --- a/ChartJs.Blazor.Tests/ObjectEnumTests.Deserialization.cs +++ b/ChartJs.Blazor.Tests/ObjectEnumTests.Deserialization.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; @@ -119,4 +119,4 @@ public void Deserialize_Undefined_ReturnsNull() Assert.Null(objEnum); } } -} \ No newline at end of file +} diff --git a/ChartJs.Blazor.Tests/ObjectEnumTests.Equality.cs b/ChartJs.Blazor.Tests/ObjectEnumTests.Equality.cs index a495d1a0..bf4976a5 100644 --- a/ChartJs.Blazor.Tests/ObjectEnumTests.Equality.cs +++ b/ChartJs.Blazor.Tests/ObjectEnumTests.Equality.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; @@ -242,4 +242,4 @@ public void GetHashCode_EnumAndEnum_Equals(object value) Assert.Equal(hashA, hashB); } } -} \ No newline at end of file +} diff --git a/ChartJs.Blazor.Tests/ObjectEnumTests.General.cs b/ChartJs.Blazor.Tests/ObjectEnumTests.General.cs index 5d5f498b..e2397ace 100644 --- a/ChartJs.Blazor.Tests/ObjectEnumTests.General.cs +++ b/ChartJs.Blazor.Tests/ObjectEnumTests.General.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; diff --git a/ChartJs.Blazor.Tests/ObjectEnumTests.Serialization.cs b/ChartJs.Blazor.Tests/ObjectEnumTests.Serialization.cs index 53ba9234..aacfc2d0 100644 --- a/ChartJs.Blazor.Tests/ObjectEnumTests.Serialization.cs +++ b/ChartJs.Blazor.Tests/ObjectEnumTests.Serialization.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; @@ -102,4 +102,4 @@ public void Serialize_BoolEnum_AsRoot(bool value) Assert.Equal(escapedValue, serialized); } } -} \ No newline at end of file +} diff --git a/ChartJs.Blazor.Tests/ObjectEnumTests.TestClasses.cs b/ChartJs.Blazor.Tests/ObjectEnumTests.TestClasses.cs index a7628fe7..16d982dc 100644 --- a/ChartJs.Blazor.Tests/ObjectEnumTests.TestClasses.cs +++ b/ChartJs.Blazor.Tests/ObjectEnumTests.TestClasses.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; @@ -45,4 +45,4 @@ private class EnumWithoutConstructor : ObjectEnum private EnumWithoutConstructor(object value) : base(value) { } } } -} \ No newline at end of file +} diff --git a/ChartJs.Blazor.Tests/StringEnumTests.Deserialization.cs b/ChartJs.Blazor.Tests/StringEnumTests.Deserialization.cs index df1e6f2f..dcf6d4e9 100644 --- a/ChartJs.Blazor.Tests/StringEnumTests.Deserialization.cs +++ b/ChartJs.Blazor.Tests/StringEnumTests.Deserialization.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; diff --git a/ChartJs.Blazor.Tests/StringEnumTests.Equality.cs b/ChartJs.Blazor.Tests/StringEnumTests.Equality.cs index 1f0875f5..dddb0882 100644 --- a/ChartJs.Blazor.Tests/StringEnumTests.Equality.cs +++ b/ChartJs.Blazor.Tests/StringEnumTests.Equality.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; diff --git a/ChartJs.Blazor.Tests/StringEnumTests.General.cs b/ChartJs.Blazor.Tests/StringEnumTests.General.cs index 3a54edfb..3e38a315 100644 --- a/ChartJs.Blazor.Tests/StringEnumTests.General.cs +++ b/ChartJs.Blazor.Tests/StringEnumTests.General.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; diff --git a/ChartJs.Blazor.Tests/StringEnumTests.Serialization.cs b/ChartJs.Blazor.Tests/StringEnumTests.Serialization.cs index aa06e268..67ef20bb 100644 --- a/ChartJs.Blazor.Tests/StringEnumTests.Serialization.cs +++ b/ChartJs.Blazor.Tests/StringEnumTests.Serialization.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; diff --git a/ChartJs.Blazor.Tests/StringEnumTests.TestClasses.cs b/ChartJs.Blazor.Tests/StringEnumTests.TestClasses.cs index 3a72d242..3ae2b6df 100644 --- a/ChartJs.Blazor.Tests/StringEnumTests.TestClasses.cs +++ b/ChartJs.Blazor.Tests/StringEnumTests.TestClasses.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Globalization; diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarCategoryAxis.cs b/src/ChartJs.Blazor/BarChart/Axes/BarCategoryAxis.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarCategoryAxis.cs rename to src/ChartJs.Blazor/BarChart/Axes/BarCategoryAxis.cs index 1f3a6d1a..e069e9d2 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarCategoryAxis.cs +++ b/src/ChartJs.Blazor/BarChart/Axes/BarCategoryAxis.cs @@ -1,8 +1,8 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.BarChart.Axes +namespace ChartJs.Blazor.BarChart.Axes { /// /// Extended version of for use in a bar chart. diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarLinearCartesianAxis.cs b/src/ChartJs.Blazor/BarChart/Axes/BarLinearCartesianAxis.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarLinearCartesianAxis.cs rename to src/ChartJs.Blazor/BarChart/Axes/BarLinearCartesianAxis.cs index 96878ac0..439dbb67 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarLinearCartesianAxis.cs +++ b/src/ChartJs.Blazor/BarChart/Axes/BarLinearCartesianAxis.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.BarChart.Axes +namespace ChartJs.Blazor.BarChart.Axes { /// /// Extended version of for use in a bar chart. diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarLogarithmicAxis.cs b/src/ChartJs.Blazor/BarChart/Axes/BarLogarithmicAxis.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarLogarithmicAxis.cs rename to src/ChartJs.Blazor/BarChart/Axes/BarLogarithmicAxis.cs index 93de986a..bc874a27 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarLogarithmicAxis.cs +++ b/src/ChartJs.Blazor/BarChart/Axes/BarLogarithmicAxis.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.BarChart.Axes +namespace ChartJs.Blazor.BarChart.Axes { /// /// Extended version of for use in a bar chart. diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarTimeAxis.cs b/src/ChartJs.Blazor/BarChart/Axes/BarTimeAxis.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarTimeAxis.cs rename to src/ChartJs.Blazor/BarChart/Axes/BarTimeAxis.cs index f50b01af..89d91ae1 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/BarTimeAxis.cs +++ b/src/ChartJs.Blazor/BarChart/Axes/BarTimeAxis.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.BarChart.Axes +namespace ChartJs.Blazor.BarChart.Axes { /// /// Extended version of for use in a bar chart. diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/ExtendedCartesianAxes.tt b/src/ChartJs.Blazor/BarChart/Axes/ExtendedCartesianAxes.tt similarity index 95% rename from src/ChartJs.Blazor/ChartJS/BarChart/Axes/ExtendedCartesianAxes.tt rename to src/ChartJs.Blazor/BarChart/Axes/ExtendedCartesianAxes.tt index f5169a75..85f09873 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/Axes/ExtendedCartesianAxes.tt +++ b/src/ChartJs.Blazor/BarChart/Axes/ExtendedCartesianAxes.tt @@ -10,10 +10,10 @@ { string className = "Bar" + baseName; #> -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.BarChart.Axes +namespace ChartJs.Blazor.BarChart.Axes { /// /// Extended version of for use in a bar chart. @@ -91,11 +91,11 @@ namespace ChartJs.Blazor.ChartJS.BarChart.Axes } #> <#+ -private void SaveOutput(string outputFileName) +private void SaveOutput(string outputFileName) { string templateDirectory = Path.GetDirectoryName(Host.TemplateFile); string outputFilePath = Path.Combine(templateDirectory, outputFileName); - File.WriteAllText(outputFilePath, this.GenerationEnvironment.ToString()); + File.WriteAllText(outputFilePath, this.GenerationEnvironment.ToString()); this.GenerationEnvironment.Remove(0, this.GenerationEnvironment.Length); } -#> \ No newline at end of file +#> diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/BarConfig.cs b/src/ChartJs.Blazor/BarChart/BarConfig.cs similarity index 74% rename from src/ChartJs.Blazor/ChartJS/BarChart/BarConfig.cs rename to src/ChartJs.Blazor/BarChart/BarConfig.cs index 7c73c1a2..904df5cc 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/BarConfig.cs +++ b/src/ChartJs.Blazor/BarChart/BarConfig.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.BarChart +namespace ChartJs.Blazor.BarChart { /// /// Config for a . diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/BarDataset.cs b/src/ChartJs.Blazor/BarChart/BarDataset.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/BarChart/BarDataset.cs rename to src/ChartJs.Blazor/BarChart/BarDataset.cs index 661b6acd..3193082b 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/BarDataset.cs +++ b/src/ChartJs.Blazor/BarChart/BarDataset.cs @@ -1,10 +1,10 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; using ChartJs.Blazor.Util; using Newtonsoft.Json; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.BarChart +namespace ChartJs.Blazor.BarChart { /// /// Represents a dataset for a bar chart. diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/BarOptions.cs b/src/ChartJs.Blazor/BarChart/BarOptions.cs similarity index 74% rename from src/ChartJs.Blazor/ChartJS/BarChart/BarOptions.cs rename to src/ChartJs.Blazor/BarChart/BarOptions.cs index 410092ff..50ea76a2 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/BarOptions.cs +++ b/src/ChartJs.Blazor/BarChart/BarOptions.cs @@ -1,7 +1,6 @@ -using ChartJs.Blazor.Charts; -using ChartJs.Blazor.ChartJS.Common; +using ChartJs.Blazor.Common; -namespace ChartJs.Blazor.ChartJS.BarChart +namespace ChartJs.Blazor.BarChart { /// /// The options-subconfig of a . @@ -13,4 +12,4 @@ public class BarOptions : BaseConfigOptions /// public BarScales Scales { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/BarScales.cs b/src/ChartJs.Blazor/BarChart/BarScales.cs similarity index 90% rename from src/ChartJs.Blazor/ChartJS/BarChart/BarScales.cs rename to src/ChartJs.Blazor/BarChart/BarScales.cs index 7b0e1619..f60f222b 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/BarScales.cs +++ b/src/ChartJs.Blazor/BarChart/BarScales.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using Newtonsoft.Json; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.BarChart +namespace ChartJs.Blazor.BarChart { /// /// Defines the scales for bar charts by holding the x and y axes. @@ -11,7 +11,7 @@ public class BarScales { /// /// Gets or sets the configurations for the x-axes. - /// You can use any but there are extended axes in the namespace which contain additional properties to customize the bar chart axes. + /// You can use any but there are extended axes in the namespace which contain additional properties to customize the bar chart axes. /// [JsonProperty("xAxes")] public IList XAxes { get; set; } diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/BarThickness.cs b/src/ChartJs.Blazor/BarChart/BarThickness.cs similarity index 90% rename from src/ChartJs.Blazor/ChartJS/BarChart/BarThickness.cs rename to src/ChartJs.Blazor/BarChart/BarThickness.cs index 5e2076e3..139c838f 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/BarThickness.cs +++ b/src/ChartJs.Blazor/BarChart/BarThickness.cs @@ -1,9 +1,9 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.BarChart +namespace ChartJs.Blazor.BarChart { /// - /// The bar thickness used to customize all bar axes (extended cartesian axes in ). + /// The bar thickness used to customize all bar axes (extended cartesian axes in ). /// As per documentation here https://www.chartjs.org/docs/latest/charts/bar.html#barthickness /// public class BarThickness : ObjectEnum @@ -34,7 +34,7 @@ private BarThickness(double doubleValue) : base(doubleValue) { } public static implicit operator BarThickness(double thickness) => new BarThickness(thickness); /// - /// If set to , the base sample widths are calculated automatically + /// If set to , the base sample widths are calculated automatically /// based on the previous and following samples so that they take the full available widths without overlap. /// public static BarThickness Flex => new BarThickness("flex"); diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/FloatingBarPoint.cs b/src/ChartJs.Blazor/BarChart/FloatingBarPoint.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/BarChart/FloatingBarPoint.cs rename to src/ChartJs.Blazor/BarChart/FloatingBarPoint.cs index 779d4117..3617efc9 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/FloatingBarPoint.cs +++ b/src/ChartJs.Blazor/BarChart/FloatingBarPoint.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace ChartJs.Blazor.ChartJS.BarChart +namespace ChartJs.Blazor.BarChart { /// /// Represents a floating bar within a bar chart (use in ). diff --git a/src/ChartJs.Blazor/ChartJS/BarChart/FloatingBarPointConverter.cs b/src/ChartJs.Blazor/BarChart/FloatingBarPointConverter.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/BarChart/FloatingBarPointConverter.cs rename to src/ChartJs.Blazor/BarChart/FloatingBarPointConverter.cs index 323ec340..7fb9469c 100644 --- a/src/ChartJs.Blazor/ChartJS/BarChart/FloatingBarPointConverter.cs +++ b/src/ChartJs.Blazor/BarChart/FloatingBarPointConverter.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace ChartJs.Blazor.ChartJS.BarChart +namespace ChartJs.Blazor.BarChart { internal class FloatingBarPointConverter : JsonConverter { diff --git a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleConfig.cs b/src/ChartJs.Blazor/BubbleChart/BubbleConfig.cs similarity index 51% rename from src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleConfig.cs rename to src/ChartJs.Blazor/BubbleChart/BubbleConfig.cs index f2c2f811..630ab632 100644 --- a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleConfig.cs +++ b/src/ChartJs.Blazor/BubbleChart/BubbleConfig.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.BubbleChart +namespace ChartJs.Blazor.BubbleChart { public class BubbleConfig : ConfigBase { diff --git a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleDataset.cs b/src/ChartJs.Blazor/BubbleChart/BubbleDataset.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleDataset.cs rename to src/ChartJs.Blazor/BubbleChart/BubbleDataset.cs index df5cf24a..998f3f24 100644 --- a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleDataset.cs +++ b/src/ChartJs.Blazor/BubbleChart/BubbleDataset.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.BubbleChart +namespace ChartJs.Blazor.BubbleChart { /// /// Represents a dataset for a bubble chart. diff --git a/src/ChartJs.Blazor/BubbleChart/BubbleOptions.cs b/src/ChartJs.Blazor/BubbleChart/BubbleOptions.cs new file mode 100644 index 00000000..19c297ea --- /dev/null +++ b/src/ChartJs.Blazor/BubbleChart/BubbleOptions.cs @@ -0,0 +1,8 @@ +using ChartJs.Blazor.Common; + +namespace ChartJs.Blazor.BubbleChart +{ + public class BubbleOptions : BaseConfigOptions + { + } +} diff --git a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubblePoint.cs b/src/ChartJs.Blazor/BubbleChart/BubblePoint.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/BubbleChart/BubblePoint.cs rename to src/ChartJs.Blazor/BubbleChart/BubblePoint.cs index 6215cb59..67277cb2 100644 --- a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubblePoint.cs +++ b/src/ChartJs.Blazor/BubbleChart/BubblePoint.cs @@ -1,6 +1,6 @@ using System; -namespace ChartJs.Blazor.ChartJS.BubbleChart +namespace ChartJs.Blazor.BubbleChart { /// /// Represents a bubble on a plane with an X, Y and radius value. diff --git a/src/ChartJs.Blazor/Charts/Chart.razor b/src/ChartJs.Blazor/Chart.razor similarity index 100% rename from src/ChartJs.Blazor/Charts/Chart.razor rename to src/ChartJs.Blazor/Chart.razor diff --git a/src/ChartJs.Blazor/Charts/Chart.razor.cs b/src/ChartJs.Blazor/Chart.razor.cs similarity index 96% rename from src/ChartJs.Blazor/Charts/Chart.razor.cs rename to src/ChartJs.Blazor/Chart.razor.cs index 9b93c3a0..77b41445 100644 --- a/src/ChartJs.Blazor/Charts/Chart.razor.cs +++ b/src/ChartJs.Blazor/Chart.razor.cs @@ -1,11 +1,11 @@ -using ChartJs.Blazor.ChartJS.Common; +using ChartJs.Blazor.Common; using ChartJs.Blazor.Interop; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using System; using System.Threading.Tasks; -namespace ChartJs.Blazor.Charts +namespace ChartJs.Blazor { /// /// Represents a ChartJs chart diff --git a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleOptions.cs b/src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleOptions.cs deleted file mode 100644 index bf651478..00000000 --- a/src/ChartJs.Blazor/ChartJS/BubbleChart/BubbleOptions.cs +++ /dev/null @@ -1,8 +0,0 @@ -using ChartJs.Blazor.ChartJS.Common; - -namespace ChartJs.Blazor.ChartJS.BubbleChart -{ - public class BubbleOptions : BaseConfigOptions - { - } -} \ No newline at end of file diff --git a/src/ChartJs.Blazor/ChartJS/Common/Properties/Animation.cs b/src/ChartJs.Blazor/Common/Animation.cs similarity index 87% rename from src/ChartJs.Blazor/ChartJS/Common/Properties/Animation.cs rename to src/ChartJs.Blazor/Common/Animation.cs index a5f1d537..d750c8b0 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Properties/Animation.cs +++ b/src/ChartJs.Blazor/Common/Animation.cs @@ -1,6 +1,6 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.Common.Properties +namespace ChartJs.Blazor.Common { /// /// The animation-subconfig of . @@ -22,4 +22,4 @@ public class Animation // TODO OnProgress Callback called on each step of an animation. // TODO OnComplete Callback called at the end of an animation. } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Properties/ArcAnimation.cs b/src/ChartJs.Blazor/Common/ArcAnimation.cs similarity index 91% rename from src/ChartJs.Blazor/ChartJS/Common/Properties/ArcAnimation.cs rename to src/ChartJs.Blazor/Common/ArcAnimation.cs index 4db2e0f5..f2bb377e 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Properties/ArcAnimation.cs +++ b/src/ChartJs.Blazor/Common/ArcAnimation.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Properties +namespace ChartJs.Blazor.Common { /// /// The animation-subconfig of the options for a radial chart. @@ -17,4 +17,4 @@ public class ArcAnimation : Animation /// public bool? AnimateScale { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/AngleLines.cs b/src/ChartJs.Blazor/Common/Axes/AngleLines.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/AngleLines.cs rename to src/ChartJs.Blazor/Common/Axes/AngleLines.cs index 63cd4171..72ae6fba 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/AngleLines.cs +++ b/src/ChartJs.Blazor/Common/Axes/AngleLines.cs @@ -1,6 +1,6 @@ using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// /// The angle lines sub-config of the linear-radial-axis-configuration (see ). @@ -36,4 +36,4 @@ public class AngleLines /// public double BorderDashOffset { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Axis.cs b/src/ChartJs.Blazor/Common/Axes/Axis.cs similarity index 89% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Axis.cs rename to src/ChartJs.Blazor/Common/Axes/Axis.cs index 52caa0c0..d8a396a1 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Axis.cs +++ b/src/ChartJs.Blazor/Common/Axes/Axis.cs @@ -1,6 +1,6 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/#common-configuration. @@ -8,7 +8,7 @@ namespace ChartJs.Blazor.ChartJS.Common.Axes public abstract class Axis { /// - /// Controls the axis global visibility (visible when , hidden when ). + /// Controls the axis global visibility (visible when , hidden when ). /// When display: , the axis is visible only if at least one associated dataset is visible. /// public AxisDisplay Display { get; set; } = AxisDisplay.True; diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/CartesianAxis.cs b/src/ChartJs.Blazor/Common/Axes/CartesianAxis.cs similarity index 90% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/CartesianAxis.cs rename to src/ChartJs.Blazor/Common/Axes/CartesianAxis.cs index 86f1e624..2c3eaaf5 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/CartesianAxis.cs +++ b/src/ChartJs.Blazor/Common/Axes/CartesianAxis.cs @@ -1,9 +1,9 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Axes.Ticks; -using ChartJs.Blazor.ChartJS.LineChart; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Axes.Ticks; +using ChartJs.Blazor.LineChart; using Newtonsoft.Json; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/#common-configuration @@ -28,7 +28,7 @@ public abstract class CartesianAxis : Axis public Position Position { get; set; } /// - /// If true, extra space is added to the both edges and the axis is scaled to fit into the chart area. + /// If true, extra space is added to the both edges and the axis is scaled to fit into the chart area. /// This is set to true for a category scale in a bar chart by default. /// public bool Offset { get; set; } = false; diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/CategoryAxis.cs b/src/ChartJs.Blazor/Common/Axes/CategoryAxis.cs similarity index 80% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/CategoryAxis.cs rename to src/ChartJs.Blazor/Common/Axes/CategoryAxis.cs index 14e23435..cc18917d 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/CategoryAxis.cs +++ b/src/ChartJs.Blazor/Common/Axes/CategoryAxis.cs @@ -1,8 +1,8 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Axes.Ticks; -using ChartJs.Blazor.ChartJS.LineChart; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Axes.Ticks; +using ChartJs.Blazor.LineChart; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// /// This axis is to be used when you want to display values for an axis. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/LinearCartesianAxis.cs b/src/ChartJs.Blazor/Common/Axes/LinearCartesianAxis.cs similarity index 78% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/LinearCartesianAxis.cs rename to src/ChartJs.Blazor/Common/Axes/LinearCartesianAxis.cs index 6e7f5d0e..0cd9f9b6 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/LinearCartesianAxis.cs +++ b/src/ChartJs.Blazor/Common/Axes/LinearCartesianAxis.cs @@ -1,10 +1,10 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Axes.Ticks; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Axes.Ticks; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// - /// The linear scale is use to chart numerical data. It can be placed on either the x or y axis. + /// The linear scale is use to chart numerical data. It can be placed on either the x or y axis. /// As the name suggests, linear interpolation is used to determine where a value lies on the axis. /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/linear.html /// diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/LinearRadialAxis.cs b/src/ChartJs.Blazor/Common/Axes/LinearRadialAxis.cs similarity index 93% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/LinearRadialAxis.cs rename to src/ChartJs.Blazor/Common/Axes/LinearRadialAxis.cs index 9da94412..3e7f56f7 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/LinearRadialAxis.cs +++ b/src/ChartJs.Blazor/Common/Axes/LinearRadialAxis.cs @@ -1,6 +1,6 @@ -using ChartJs.Blazor.ChartJS.Common.Axes.Ticks; +using ChartJs.Blazor.Common.Axes.Ticks; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// /// A linear radial axis. @@ -32,4 +32,4 @@ public class LinearRadialAxis /// public LinearRadialTicks Ticks { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/LogarithmicAxis.cs b/src/ChartJs.Blazor/Common/Axes/LogarithmicAxis.cs similarity index 78% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/LogarithmicAxis.cs rename to src/ChartJs.Blazor/Common/Axes/LogarithmicAxis.cs index c4bfa7ec..70c57355 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/LogarithmicAxis.cs +++ b/src/ChartJs.Blazor/Common/Axes/LogarithmicAxis.cs @@ -1,10 +1,10 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Axes.Ticks; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Axes.Ticks; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// - /// The logarithmic scale is use to chart numerical data. It can be placed on either the x or y axis. + /// The logarithmic scale is use to chart numerical data. It can be placed on either the x or y axis. /// As the name suggests, logarithmic interpolation is used to determine where a value lies on the axis. /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/logarithmic.html /// diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/PointLabels.cs b/src/ChartJs.Blazor/Common/Axes/PointLabels.cs similarity index 90% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/PointLabels.cs rename to src/ChartJs.Blazor/Common/Axes/PointLabels.cs index de4e0a19..4f4a4c36 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/PointLabels.cs +++ b/src/ChartJs.Blazor/Common/Axes/PointLabels.cs @@ -1,8 +1,8 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// /// The point labels sub-config of the linear-radial-axis-configuration (see ). @@ -32,4 +32,4 @@ public class PointLabels /// public double LineHeight { get; set; } = 1.2; } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/ScaleLabel.cs b/src/ChartJs.Blazor/Common/Axes/ScaleLabel.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/ScaleLabel.cs rename to src/ChartJs.Blazor/Common/Axes/ScaleLabel.cs index fc6e5832..0f39afbe 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/ScaleLabel.cs +++ b/src/ChartJs.Blazor/Common/Axes/ScaleLabel.cs @@ -1,6 +1,6 @@ using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// /// Defines options for how to display an axis title. @@ -37,4 +37,4 @@ public ScaleLabel(string labelString = null) /// public int? FontSize { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/CartesianTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/CartesianTicks.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/CartesianTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/CartesianTicks.cs index edc8a353..68d74ef1 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/CartesianTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/CartesianTicks.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The base class for all tick mark configurations of cartesian axes (see ). Ticks-subconfig of . @@ -23,7 +23,7 @@ public abstract class CartesianTicks : Ticks public int? SampleSize { get; set; } /// - /// If true, automatically calculates how many labels can be shown and hides labels accordingly. + /// If true, automatically calculates how many labels can be shown and hides labels accordingly. /// Labels will be rotated up to maxRotation before skipping any. Turn off to show all labels no matter what. /// public bool AutoSkip { get; set; } = true; @@ -58,4 +58,4 @@ public abstract class CartesianTicks : Ticks /// public bool? Mirror { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/CategoryTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/CategoryTicks.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/CategoryTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/CategoryTicks.cs index 0a78e49a..0ec7489d 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/CategoryTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/CategoryTicks.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The ticks-subconfig of . diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LinearCartesianTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/LinearCartesianTicks.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LinearCartesianTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/LinearCartesianTicks.cs index 1cb23126..22eb0c0f 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LinearCartesianTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/LinearCartesianTicks.cs @@ -1,5 +1,5 @@  -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The ticks-subconfig of . diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LinearRadialTicks .cs b/src/ChartJs.Blazor/Common/Axes/Ticks/LinearRadialTicks .cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LinearRadialTicks .cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/LinearRadialTicks .cs index dc9810ce..0f6cc07a 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LinearRadialTicks .cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/LinearRadialTicks .cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; +using ChartJs.Blazor.Common; using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The ticks sub-config of the . @@ -75,4 +75,4 @@ public class LinearRadialTicks : Ticks /// public bool ShowLabelBackdrop { get; set; } = true; } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LogarithmicTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/LogarithmicTicks.cs similarity index 86% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LogarithmicTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/LogarithmicTicks.cs index 8b412c44..8c098d89 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/LogarithmicTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/LogarithmicTicks.cs @@ -1,5 +1,5 @@  -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The ticks-subconfig of . It has the same members as . diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/MajorTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/MajorTicks.cs similarity index 90% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/MajorTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/MajorTicks.cs index 10b38b03..e36bb234 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/MajorTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/MajorTicks.cs @@ -1,5 +1,5 @@  -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The major ticks sub-config of the tick-configuration (see ). @@ -12,4 +12,4 @@ public class MajorTicks : SubTicks /// public bool Enabled { get; set; } = false; } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/MinorTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/MinorTicks.cs similarity index 85% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/MinorTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/MinorTicks.cs index 88b47171..fc20f360 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/MinorTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/MinorTicks.cs @@ -1,5 +1,5 @@  -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The minor ticks sub-config of the tick-configuration (see ). @@ -8,4 +8,4 @@ namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks public class MinorTicks : SubTicks { } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/SubTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/SubTicks.cs similarity index 92% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/SubTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/SubTicks.cs index 3c47c173..65e0f1fc 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/SubTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/SubTicks.cs @@ -1,7 +1,7 @@ using ChartJs.Blazor.Util; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The ultimate base class for tick mark configurations. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/Ticks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/Ticks.cs similarity index 93% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/Ticks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/Ticks.cs index d52d5ab1..9212f578 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/Ticks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/Ticks.cs @@ -1,9 +1,9 @@ using ChartJs.Blazor.Util; -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Handlers; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Handlers; using ChartJs.Blazor.Interop; -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The base class for all tick mark configurations. Ticks-subconfig of the common . @@ -49,4 +49,4 @@ public abstract class Ticks : SubTicks /// public IMethodHandler Callback { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/TimeTicks.cs b/src/ChartJs.Blazor/Common/Axes/Ticks/TimeTicks.cs similarity index 75% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/TimeTicks.cs rename to src/ChartJs.Blazor/Common/Axes/Ticks/TimeTicks.cs index ecb04acc..88af8b03 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/Ticks/TimeTicks.cs +++ b/src/ChartJs.Blazor/Common/Axes/Ticks/TimeTicks.cs @@ -1,6 +1,6 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.Common.Axes.Ticks +namespace ChartJs.Blazor.Common.Axes.Ticks { /// /// The ticks-subconfig of a . diff --git a/src/ChartJs.Blazor/ChartJS/Common/Axes/TimeAxis.cs b/src/ChartJs.Blazor/Common/Axes/TimeAxis.cs similarity index 82% rename from src/ChartJs.Blazor/ChartJS/Common/Axes/TimeAxis.cs rename to src/ChartJs.Blazor/Common/Axes/TimeAxis.cs index 9763ea08..b3f06ce5 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Axes/TimeAxis.cs +++ b/src/ChartJs.Blazor/Common/Axes/TimeAxis.cs @@ -1,11 +1,11 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Axes.Ticks; -using ChartJs.Blazor.ChartJS.Common.Time; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Axes.Ticks; +using ChartJs.Blazor.Common.Time; -namespace ChartJs.Blazor.ChartJS.Common.Axes +namespace ChartJs.Blazor.Common.Axes { /// - /// The time scale is used to display times and dates. + /// The time scale is used to display times and dates. /// When building its ticks, it will automatically calculate the most comfortable unit base on the size of the scale. /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html /// diff --git a/src/ChartJs.Blazor/ChartJS/Common/BaseConfigOptions.cs b/src/ChartJs.Blazor/Common/BaseConfigOptions.cs similarity index 93% rename from src/ChartJs.Blazor/ChartJS/Common/BaseConfigOptions.cs rename to src/ChartJs.Blazor/Common/BaseConfigOptions.cs index 4ee3d452..36bec107 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/BaseConfigOptions.cs +++ b/src/ChartJs.Blazor/Common/BaseConfigOptions.cs @@ -1,11 +1,10 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Handlers; -using ChartJs.Blazor.ChartJS.Common.Properties; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Handlers; using System; using System.Collections.Generic; using ChartJs.Blazor.Interop; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// The base config for the options-subconfig of a chart. @@ -24,7 +23,7 @@ public class BaseConfigOptions public bool Responsive { get; set; } = true; /// - /// Gets or sets the canvas aspect ratio (i.e. width / height, a value of 1 representing a square canvas). + /// Gets or sets the canvas aspect ratio (i.e. width / height, a value of 1 representing a square canvas). /// Note that this option is ignored if the height is explicitly defined either as attribute (of the canvas) or via the style. /// public double AspectRatio { get; set; } = 2; @@ -58,7 +57,7 @@ public class BaseConfigOptions /// Gets the plugin options. The key has to be the unique /// identification of the plugin. /// - /// Reference for chart.js plugin options: + /// Reference for chart.js plugin options: /// /// /// diff --git a/src/ChartJs.Blazor/ChartJS/Common/ChartData.cs b/src/ChartJs.Blazor/Common/ChartData.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/Common/ChartData.cs rename to src/ChartJs.Blazor/Common/ChartData.cs index f7df8296..b8c50e74 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/ChartData.cs +++ b/src/ChartJs.Blazor/Common/ChartData.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using ChartJs.Blazor.ChartJS.Common; +using ChartJs.Blazor.Common; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// Represents the data-subconfig of any . @@ -46,7 +46,7 @@ public ChartData() /// /// public virtual IList YLabels { get; } - + /// /// Gets the datasets displayed in this chart. /// diff --git a/src/ChartJs.Blazor/ChartJS/Common/Clipping.cs b/src/ChartJs.Blazor/Common/Clipping.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Clipping.cs rename to src/ChartJs.Blazor/Common/Clipping.cs index 0d41fd4e..514000ef 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Clipping.cs +++ b/src/ChartJs.Blazor/Common/Clipping.cs @@ -7,12 +7,12 @@ using System.Diagnostics.CodeAnalysis; using System.Text; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// Represents how lines are clipped relative to the chart area. /// As per documentation here (Chart.js). - /// For any given edge: + /// For any given edge: /// /// 0 means clipping at the chart area. /// negative values mean clipping inside the chart area. diff --git a/src/ChartJs.Blazor/ChartJS/Common/ConfigBase.cs b/src/ChartJs.Blazor/Common/ConfigBase.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/ConfigBase.cs rename to src/ChartJs.Blazor/Common/ConfigBase.cs index 9a649cb2..66ed5b70 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/ConfigBase.cs +++ b/src/ChartJs.Blazor/Common/ConfigBase.cs @@ -1,8 +1,8 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using System; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// Base class for chart-configs @@ -37,7 +37,7 @@ protected ConfigBase(ChartType chartType) /// since these plugins work mostly with method hooks and methods /// can't be serialized. It could be supported, but just isn't yet. /// - /// Reference for chart.js inline plugins: + /// Reference for chart.js inline plugins: /// /// /// @@ -46,7 +46,7 @@ protected ConfigBase(ChartType chartType) /// /// public IList Plugins { get; } = new List(); - + /// /// This method tells json.net to only serialize the plugins when there /// are plugins, don't call it directly. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Dataset.cs b/src/ChartJs.Blazor/Common/Dataset.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Dataset.cs rename to src/ChartJs.Blazor/Common/Dataset.cs index 9ee0f499..b119a384 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Dataset.cs +++ b/src/ChartJs.Blazor/Common/Dataset.cs @@ -1,11 +1,11 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Text; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// Represents a dataset containing a collection of values. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/AxisDisplay.cs b/src/ChartJs.Blazor/Common/Enums/AxisDisplay.cs similarity index 94% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/AxisDisplay.cs rename to src/ChartJs.Blazor/Common/Enums/AxisDisplay.cs index 69afa3a7..14121b56 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/AxisDisplay.cs +++ b/src/ChartJs.Blazor/Common/Enums/AxisDisplay.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/#common-configuration diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/AxisType.cs b/src/ChartJs.Blazor/Common/Enums/AxisType.cs similarity index 86% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/AxisType.cs rename to src/ChartJs.Blazor/Common/Enums/AxisType.cs index c2216bee..d5abd83e 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/AxisType.cs +++ b/src/ChartJs.Blazor/Common/Enums/AxisType.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/ @@ -6,16 +6,16 @@ public sealed class AxisType : StringEnum { /// - /// The linear scale is use to chart numerical data. + /// The linear scale is use to chart numerical data. /// As the name suggests, linear interpolation is used to determine where a value lies on the axis. /// Can be used both for Radial and for Cartesian Axes - /// For cartesian: It can be placed on either the x or y axis. + /// For cartesian: It can be placed on either the x or y axis. /// The scatter chart type automatically configures a line chart to use one of these scales for the x axis. /// public static AxisType Linear => new AxisType("linear"); /// - /// The logarithmic scale is use to chart numerical data. It can be placed on either the x or y axis. + /// The logarithmic scale is use to chart numerical data. It can be placed on either the x or y axis. /// As the name suggests, logarithmic interpolation is used to determine where a value lies on the axis. /// public static AxisType Logarithmic => new AxisType("logarithmic"); @@ -23,10 +23,10 @@ public sealed class AxisType : StringEnum // TODO: rewrite this summary and add references to the correct properties /// - /// If global configuration is used, labels are drawn from one of the label arrays included in the chart data. - /// If only data.labels is defined, this will be used. If data.xLabels is defined and the axis is horizontal, this will be used. + /// If global configuration is used, labels are drawn from one of the label arrays included in the chart data. + /// If only data.labels is defined, this will be used. If data.xLabels is defined and the axis is horizontal, this will be used. /// Similarly, if data.yLabels is defined and the axis is vertical, this property will be used. - /// Using both xLabels and yLabels together can create a chart that uses strings for both the X and Y axes. + /// Using both xLabels and yLabels together can create a chart that uses strings for both the X and Y axes. /// Specifying any of the settings above defines the x axis as type: if not defined otherwise. /// For more fine-grained control of category labels it is also possible to add labels as part of the category axis definition. /// Doing so does not apply the global defaults. @@ -35,7 +35,7 @@ public sealed class AxisType : StringEnum public static AxisType Category => new AxisType("category"); /// - /// The time scale is used to display times and dates. + /// The time scale is used to display times and dates. /// When building its ticks, it will automatically calculate the most comfortable unit base on the size of the scale. /// public static AxisType Time => new AxisType("time"); @@ -43,4 +43,4 @@ public sealed class AxisType : StringEnum private AxisType(string stringRep) : base(stringRep) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderAlign.cs b/src/ChartJs.Blazor/Common/Enums/BorderAlign.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/BorderAlign.cs rename to src/ChartJs.Blazor/Common/Enums/BorderAlign.cs index 85cd4676..d5400968 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderAlign.cs +++ b/src/ChartJs.Blazor/Common/Enums/BorderAlign.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies the border alignment of a and a . diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderCapStyle.cs b/src/ChartJs.Blazor/Common/Enums/BorderCapStyle.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/BorderCapStyle.cs rename to src/ChartJs.Blazor/Common/Enums/BorderCapStyle.cs index b1b8f731..0f872ba6 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderCapStyle.cs +++ b/src/ChartJs.Blazor/Common/Enums/BorderCapStyle.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies the border cap style. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderJoinStyle.cs b/src/ChartJs.Blazor/Common/Enums/BorderJoinStyle.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/BorderJoinStyle.cs rename to src/ChartJs.Blazor/Common/Enums/BorderJoinStyle.cs index 31284b8d..b0f139df 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderJoinStyle.cs +++ b/src/ChartJs.Blazor/Common/Enums/BorderJoinStyle.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies the border join style. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderSkipped.cs b/src/ChartJs.Blazor/Common/Enums/BorderSkipped.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/BorderSkipped.cs rename to src/ChartJs.Blazor/Common/Enums/BorderSkipped.cs index ba78dd7f..a7e494c1 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/BorderSkipped.cs +++ b/src/ChartJs.Blazor/Common/Enums/BorderSkipped.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// This setting is used to avoid drawing the bar stroke at the base of the fill. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/BrowserEvent.cs b/src/ChartJs.Blazor/Common/Enums/BrowserEvent.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/BrowserEvent.cs rename to src/ChartJs.Blazor/Common/Enums/BrowserEvent.cs index dc1f571c..a946cc4a 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/BrowserEvent.cs +++ b/src/ChartJs.Blazor/Common/Enums/BrowserEvent.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Represents a browser event. Not all browser events are listed diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/ChartType.cs b/src/ChartJs.Blazor/Common/Enums/ChartType.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/ChartType.cs rename to src/ChartJs.Blazor/Common/Enums/ChartType.cs index 9c2249f6..72887a9b 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/ChartType.cs +++ b/src/ChartJs.Blazor/Common/Enums/ChartType.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Defines the chart types. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/CubicInterpolationMode.cs b/src/ChartJs.Blazor/Common/Enums/CubicInterpolationMode.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/CubicInterpolationMode.cs rename to src/ChartJs.Blazor/Common/Enums/CubicInterpolationMode.cs index 1a719128..b334b63d 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/CubicInterpolationMode.cs +++ b/src/ChartJs.Blazor/Common/Enums/CubicInterpolationMode.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies the cubic interpolation mode. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/Easing.cs b/src/ChartJs.Blazor/Common/Enums/Easing.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/Easing.cs rename to src/ChartJs.Blazor/Common/Enums/Easing.cs index f57d1790..af489e86 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/Easing.cs +++ b/src/ChartJs.Blazor/Common/Enums/Easing.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Represents an easing function supported by chart.js. Details about the different diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/FillingMode.cs b/src/ChartJs.Blazor/Common/Enums/FillingMode.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/FillingMode.cs rename to src/ChartJs.Blazor/Common/Enums/FillingMode.cs index 5b41deae..516ca9d5 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/FillingMode.cs +++ b/src/ChartJs.Blazor/Common/Enums/FillingMode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// The filling mode is used in area charts (like line and radar) to define how the area around diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/FontStyle.cs b/src/ChartJs.Blazor/Common/Enums/FontStyle.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/FontStyle.cs rename to src/ChartJs.Blazor/Common/Enums/FontStyle.cs index ee5eeea3..9eb8a8f7 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/FontStyle.cs +++ b/src/ChartJs.Blazor/Common/Enums/FontStyle.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies the css font style of text. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/InteractionMode.cs b/src/ChartJs.Blazor/Common/Enums/InteractionMode.cs similarity index 92% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/InteractionMode.cs rename to src/ChartJs.Blazor/Common/Enums/InteractionMode.cs index d2252d45..5f4c084b 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/InteractionMode.cs +++ b/src/ChartJs.Blazor/Common/Enums/InteractionMode.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// As per documentation here https://www.chartjs.org/docs/latest/general/interactions/modes.html @@ -11,8 +11,8 @@ public sealed class InteractionMode : StringEnum public static InteractionMode Point => new InteractionMode("point"); /// - /// Gets the items that are at the nearest distance to the point. - /// The nearest item is determined based on the distance to the center of the chart item (point, bar). + /// Gets the items that are at the nearest distance to the point. + /// The nearest item is determined based on the distance to the center of the chart item (point, bar). /// public static InteractionMode Nearest => new InteractionMode("nearest"); @@ -27,8 +27,8 @@ public sealed class InteractionMode : StringEnum public static InteractionMode Dataset => new InteractionMode("dataset"); /// - /// Returns all items that would intersect based on the X coordinate of the position only. - /// Would be useful for a vertical cursor implementation. + /// Returns all items that would intersect based on the X coordinate of the position only. + /// Would be useful for a vertical cursor implementation. /// Note that this only applies to cartesian charts. /// public static InteractionMode X => new InteractionMode("x"); @@ -41,4 +41,4 @@ public sealed class InteractionMode : StringEnum private InteractionMode(string stringRep) : base(stringRep) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/ObjectEnum.cs b/src/ChartJs.Blazor/Common/Enums/ObjectEnum.cs similarity index 99% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/ObjectEnum.cs rename to src/ChartJs.Blazor/Common/Enums/ObjectEnum.cs index a159cd51..ddd9176e 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/ObjectEnum.cs +++ b/src/ChartJs.Blazor/Common/Enums/ObjectEnum.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// The base class for enums that can represent different types. We also use these diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/PointStyle.cs b/src/ChartJs.Blazor/Common/Enums/PointStyle.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/PointStyle.cs rename to src/ChartJs.Blazor/Common/Enums/PointStyle.cs index 45010fa8..0c915067 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/PointStyle.cs +++ b/src/ChartJs.Blazor/Common/Enums/PointStyle.cs @@ -1,5 +1,5 @@  -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies how a data-point on the chart will be styled. @@ -67,4 +67,4 @@ public sealed class PointStyle : StringEnum /// The value to set. private PointStyle(string stringValue) : base(stringValue) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/Position.cs b/src/ChartJs.Blazor/Common/Enums/Position.cs similarity index 92% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/Position.cs rename to src/ChartJs.Blazor/Common/Enums/Position.cs index d8915460..fb09ec10 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/Position.cs +++ b/src/ChartJs.Blazor/Common/Enums/Position.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Represents a relative direction or position on a 2D canvas. @@ -14,4 +14,4 @@ public sealed class Position : StringEnum private Position(string stringRep) : base(stringRep) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBound.cs b/src/ChartJs.Blazor/Common/Enums/ScaleBound.cs similarity index 93% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBound.cs rename to src/ChartJs.Blazor/Common/Enums/ScaleBound.cs index 20fec76b..4ebe0098 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/ScaleBound.cs +++ b/src/ChartJs.Blazor/Common/Enums/ScaleBound.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies the scale boundary strategy. @@ -18,4 +18,4 @@ public sealed class ScaleBound : StringEnum private ScaleBound(string stringRep) : base(stringRep) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/JsonObjectEnumConverter.cs b/src/ChartJs.Blazor/Common/Enums/Serialization/JsonObjectEnumConverter.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/JsonObjectEnumConverter.cs rename to src/ChartJs.Blazor/Common/Enums/Serialization/JsonObjectEnumConverter.cs index eb72f140..6235e812 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/JsonObjectEnumConverter.cs +++ b/src/ChartJs.Blazor/Common/Enums/Serialization/JsonObjectEnumConverter.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; -namespace ChartJs.Blazor.ChartJS.Common.Enums.Serialization +namespace ChartJs.Blazor.Common.Enums.Serialization { internal class JsonObjectEnumConverter : JsonConverter { @@ -34,7 +34,7 @@ public override ObjectEnum ReadJson(JsonReader reader, Type objectType, [AllowNu * * Currently we cast down long to int and ignore BigInteger. This means that only int is supported * and we don't waste time checking for other options and converting between types. - * + * * Another option would be to check for a suitable constructor and if there isn't one try to find the * most optimal conversion. Even though that sounds nice, it's really not necessary at the moment. There's * no need for BigInteger support in the enums and it would hurt performance a bit. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/JsonStringEnumConverter.cs b/src/ChartJs.Blazor/Common/Enums/Serialization/JsonStringEnumConverter.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/JsonStringEnumConverter.cs rename to src/ChartJs.Blazor/Common/Enums/Serialization/JsonStringEnumConverter.cs index fef096fe..e987eb7c 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/JsonStringEnumConverter.cs +++ b/src/ChartJs.Blazor/Common/Enums/Serialization/JsonStringEnumConverter.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Reflection; -namespace ChartJs.Blazor.ChartJS.Common.Enums.Serialization +namespace ChartJs.Blazor.Common.Enums.Serialization { internal class JsonStringEnumConverter : JsonConverter { diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/ObjectEnumFactory.cs b/src/ChartJs.Blazor/Common/Enums/Serialization/ObjectEnumFactory.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/ObjectEnumFactory.cs rename to src/ChartJs.Blazor/Common/Enums/Serialization/ObjectEnumFactory.cs index 141fb892..8a0ac527 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/Serialization/ObjectEnumFactory.cs +++ b/src/ChartJs.Blazor/Common/Enums/Serialization/ObjectEnumFactory.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Text; -namespace ChartJs.Blazor.ChartJS.Common.Enums.Serialization +namespace ChartJs.Blazor.Common.Enums.Serialization { /* We favour using a non-generic design here because the "entry point" where this class is used * is a JsonConverter that has to work for all types of ObjectEnum. Therefore the converter isn't @@ -15,7 +15,7 @@ namespace ChartJs.Blazor.ChartJS.Common.Enums.Serialization internal class ObjectEnumFactory { private static readonly ConcurrentDictionary _factorySingletons = new ConcurrentDictionary(); - + private readonly Dictionary _constructorCache; private readonly Type _enumType; diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/SteppedLine.cs b/src/ChartJs.Blazor/Common/Enums/SteppedLine.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/SteppedLine.cs rename to src/ChartJs.Blazor/Common/Enums/SteppedLine.cs index 726e15ec..56c76210 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/SteppedLine.cs +++ b/src/ChartJs.Blazor/Common/Enums/SteppedLine.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// As per documentation here https://www.chartjs.org/docs/latest/charts/line.html#stepped-line diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/StringEnum.cs b/src/ChartJs.Blazor/Common/Enums/StringEnum.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/StringEnum.cs rename to src/ChartJs.Blazor/Common/Enums/StringEnum.cs index 72ad380f..8ae36530 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/StringEnum.cs +++ b/src/ChartJs.Blazor/Common/Enums/StringEnum.cs @@ -1,6 +1,6 @@ using System; -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// The base class for enums that are meant to be serialized. They are more flexible diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/TickSource.cs b/src/ChartJs.Blazor/Common/Enums/TickSource.cs similarity index 94% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/TickSource.cs rename to src/ChartJs.Blazor/Common/Enums/TickSource.cs index b541229a..20964239 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/TickSource.cs +++ b/src/ChartJs.Blazor/Common/Enums/TickSource.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#ticks-source diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/TimeDistribution.cs b/src/ChartJs.Blazor/Common/Enums/TimeDistribution.cs similarity index 92% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/TimeDistribution.cs rename to src/ChartJs.Blazor/Common/Enums/TimeDistribution.cs index 6ec67f5e..38d91893 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/TimeDistribution.cs +++ b/src/ChartJs.Blazor/Common/Enums/TimeDistribution.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#scale-distribution @@ -9,7 +9,7 @@ public sealed class TimeDistribution : StringEnum /// Data are spread according to their time (distances can vary) /// public static TimeDistribution Linear => new TimeDistribution("linear"); - + /// /// Data are spread at the same distance from each other /// diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/TimeMeasurement.cs b/src/ChartJs.Blazor/Common/Enums/TimeMeasurement.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/TimeMeasurement.cs rename to src/ChartJs.Blazor/Common/Enums/TimeMeasurement.cs index 3fff5b77..a36e65ea 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/TimeMeasurement.cs +++ b/src/ChartJs.Blazor/Common/Enums/TimeMeasurement.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#time-units @@ -19,4 +19,4 @@ public sealed class TimeMeasurement : StringEnum private TimeMeasurement(string stringRep) : base(stringRep) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Enums/TooltipPosition.cs b/src/ChartJs.Blazor/Common/Enums/TooltipPosition.cs similarity index 94% rename from src/ChartJs.Blazor/ChartJS/Common/Enums/TooltipPosition.cs rename to src/ChartJs.Blazor/Common/Enums/TooltipPosition.cs index 2e8fcee7..5b7e3eed 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Enums/TooltipPosition.cs +++ b/src/ChartJs.Blazor/Common/Enums/TooltipPosition.cs @@ -1,4 +1,4 @@ -namespace ChartJs.Blazor.ChartJS.Common.Enums +namespace ChartJs.Blazor.Common.Enums { /// /// Specifies where the tooltip will be displayed. @@ -18,4 +18,4 @@ public sealed class TooltipPosition : StringEnum private TooltipPosition(string stringRep) : base(stringRep) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/GridLines.cs b/src/ChartJs.Blazor/Common/GridLines.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/GridLines.cs rename to src/ChartJs.Blazor/Common/GridLines.cs index 785783f4..61f4f329 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/GridLines.cs +++ b/src/ChartJs.Blazor/Common/GridLines.cs @@ -1,6 +1,6 @@ using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// The grid lines sub-config of the axis-configuration (see ). @@ -68,7 +68,7 @@ public class GridLines public string ZeroLineColor { get; set; } /// - /// Length and spacing of dashes of the grid line for the first index (index 0). + /// Length and spacing of dashes of the grid line for the first index (index 0). /// See https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash for details /// public int[] ZeroLineBorderDash { get; set; } @@ -84,4 +84,4 @@ public class GridLines /// public bool OffsetGridLines { get; set; } = false; } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Handlers/AxisTickCallback.cs b/src/ChartJs.Blazor/Common/Handlers/AxisTickCallback.cs similarity index 94% rename from src/ChartJs.Blazor/ChartJS/Common/Handlers/AxisTickCallback.cs rename to src/ChartJs.Blazor/Common/Handlers/AxisTickCallback.cs index cb8e3494..b339e330 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Handlers/AxisTickCallback.cs +++ b/src/ChartJs.Blazor/Common/Handlers/AxisTickCallback.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace ChartJs.Blazor.ChartJS.Common.Handlers +namespace ChartJs.Blazor.Common.Handlers { /// /// A delegate used for customizing tick marks on an axis. @@ -13,4 +13,4 @@ namespace ChartJs.Blazor.ChartJS.Common.Handlers /// they have a 'label' () and a 'major' () field. /// The new value of the tick mark or if you want to hide that grid line. public delegate string AxisTickCallback(JValue value, int index, JArray values); -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Handlers/ChartMouseEvent.cs b/src/ChartJs.Blazor/Common/Handlers/ChartMouseEvent.cs similarity index 87% rename from src/ChartJs.Blazor/ChartJS/Common/Handlers/ChartMouseEvent.cs rename to src/ChartJs.Blazor/Common/Handlers/ChartMouseEvent.cs index 42d9fe7d..51981c02 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Handlers/ChartMouseEvent.cs +++ b/src/ChartJs.Blazor/Common/Handlers/ChartMouseEvent.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace ChartJs.Blazor.ChartJS.Common.Handlers +namespace ChartJs.Blazor.Common.Handlers { /// /// A delegate for all sorts of mouse events on a chart. @@ -8,4 +8,4 @@ namespace ChartJs.Blazor.ChartJS.Common.Handlers /// The mouse event. /// The active elements. public delegate void ChartMouseEvent(JObject mouseEvent, JArray activeElements); -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendItemMouseEvent.cs b/src/ChartJs.Blazor/Common/Handlers/LegendItemMouseEvent.cs similarity index 87% rename from src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendItemMouseEvent.cs rename to src/ChartJs.Blazor/Common/Handlers/LegendItemMouseEvent.cs index d75f4c73..f1ed9874 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendItemMouseEvent.cs +++ b/src/ChartJs.Blazor/Common/Handlers/LegendItemMouseEvent.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace ChartJs.Blazor.ChartJS.Common.Handlers +namespace ChartJs.Blazor.Common.Handlers { /// /// A delegate for all sorts of mouse events on a legend item. @@ -8,4 +8,4 @@ namespace ChartJs.Blazor.ChartJS.Common.Handlers /// The mouse event. /// The affected legend item. public delegate void LegendItemMouseEvent(JObject mouseEvent, LegendItem legendItem); -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendLabelFilter.cs b/src/ChartJs.Blazor/Common/Handlers/LegendLabelFilter.cs similarity index 93% rename from src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendLabelFilter.cs rename to src/ChartJs.Blazor/Common/Handlers/LegendLabelFilter.cs index 09d8ea17..f183260f 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendLabelFilter.cs +++ b/src/ChartJs.Blazor/Common/Handlers/LegendLabelFilter.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace ChartJs.Blazor.ChartJS.Common.Handlers +namespace ChartJs.Blazor.Common.Handlers { /// /// A filter for legend items. Should return if you want to show the legend item; @@ -11,4 +11,4 @@ namespace ChartJs.Blazor.ChartJS.Common.Handlers /// if you don't use the value. /// if you want to show the legend item; if not. public delegate bool LegendLabelFilter(LegendItem legendItem, JObject chartData); -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendLabelsGenerator.cs b/src/ChartJs.Blazor/Common/Handlers/LegendLabelsGenerator.cs similarity index 88% rename from src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendLabelsGenerator.cs rename to src/ChartJs.Blazor/Common/Handlers/LegendLabelsGenerator.cs index cfd05936..fd58cc58 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Handlers/LegendLabelsGenerator.cs +++ b/src/ChartJs.Blazor/Common/Handlers/LegendLabelsGenerator.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json.Linq; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.Common.Handlers +namespace ChartJs.Blazor.Common.Handlers { /// /// A generator for legend labels. @@ -9,4 +9,4 @@ namespace ChartJs.Blazor.ChartJS.Common.Handlers /// The chart for which to generate the labels. /// The s the chart should display. public delegate ICollection LegendLabelsGenerator(JObject chart); -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Hover.cs b/src/ChartJs.Blazor/Common/Hover.cs similarity index 90% rename from src/ChartJs.Blazor/ChartJS/Common/Hover.cs rename to src/ChartJs.Blazor/Common/Hover.cs index 7a504352..40b15efc 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Hover.cs +++ b/src/ChartJs.Blazor/Common/Hover.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Handlers; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Handlers; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// The hover configuration contains general settings regarding hovering over a chart. @@ -31,4 +31,4 @@ public class Hover /// public long? AnimationDuration { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/IDataset.cs b/src/ChartJs.Blazor/Common/IDataset.cs similarity index 92% rename from src/ChartJs.Blazor/ChartJS/Common/IDataset.cs rename to src/ChartJs.Blazor/Common/IDataset.cs index 0ddb2f8e..f2b51db2 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/IDataset.cs +++ b/src/ChartJs.Blazor/Common/IDataset.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// Represents a dataset with an id and a type. @@ -33,4 +33,4 @@ public interface IDataset : IDataset, IList /// IReadOnlyList Data { get; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/IgnoreDatasetCountContractResolver.cs b/src/ChartJs.Blazor/Common/IgnoreDatasetCountContractResolver.cs similarity index 96% rename from src/ChartJs.Blazor/ChartJS/Common/IgnoreDatasetCountContractResolver.cs rename to src/ChartJs.Blazor/Common/IgnoreDatasetCountContractResolver.cs index 280e0216..9ff122c4 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/IgnoreDatasetCountContractResolver.cs +++ b/src/ChartJs.Blazor/Common/IgnoreDatasetCountContractResolver.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { internal class IgnoreDatasetCountContractResolver : DefaultContractResolver { diff --git a/src/ChartJs.Blazor/ChartJS/Common/IndexableOption.cs b/src/ChartJs.Blazor/Common/IndexableOption.cs similarity index 99% rename from src/ChartJs.Blazor/ChartJS/Common/IndexableOption.cs rename to src/ChartJs.Blazor/Common/IndexableOption.cs index 4071ffd3..105466ed 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/IndexableOption.cs +++ b/src/ChartJs.Blazor/Common/IndexableOption.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// Represents an object that can be either a single value or an array of values. This is used for type safe js-interop. @@ -183,4 +183,4 @@ public override int GetHashCode() /// true if the value of a is different from the value of b; otherwise, false. public static bool operator !=(IndexableOption a, IndexableOption b) => !(a == b); } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/IndexableOptionConverter.cs b/src/ChartJs.Blazor/Common/IndexableOptionConverter.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/IndexableOptionConverter.cs rename to src/ChartJs.Blazor/Common/IndexableOptionConverter.cs index 902a4130..2fc3ddfb 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/IndexableOptionConverter.cs +++ b/src/ChartJs.Blazor/Common/IndexableOptionConverter.cs @@ -3,7 +3,7 @@ using System; using System.Reflection; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { internal class IndexableOptionConverter : JsonConverter { diff --git a/src/ChartJs.Blazor/ChartJS/Common/JsonWriteOnlyConverter.cs b/src/ChartJs.Blazor/Common/JsonWriteOnlyConverter.cs similarity index 93% rename from src/ChartJs.Blazor/ChartJS/Common/JsonWriteOnlyConverter.cs rename to src/ChartJs.Blazor/Common/JsonWriteOnlyConverter.cs index 0390faac..2ab3121e 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/JsonWriteOnlyConverter.cs +++ b/src/ChartJs.Blazor/Common/JsonWriteOnlyConverter.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using System; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { internal abstract class JsonWriteOnlyConverter : JsonConverter { diff --git a/src/ChartJs.Blazor/ChartJS/Common/Properties/Legend.cs b/src/ChartJs.Blazor/Common/Legend.cs similarity index 92% rename from src/ChartJs.Blazor/ChartJS/Common/Properties/Legend.cs rename to src/ChartJs.Blazor/Common/Legend.cs index 1fafbaa6..6b2420ee 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Properties/Legend.cs +++ b/src/ChartJs.Blazor/Common/Legend.cs @@ -1,8 +1,8 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Handlers; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Handlers; using ChartJs.Blazor.Interop; -namespace ChartJs.Blazor.ChartJS.Common.Properties +namespace ChartJs.Blazor.Common { /// /// The chart legend displays data about the datasets that are appearing on the chart. @@ -48,4 +48,4 @@ public class Legend /// public LegendLabels Labels { get; set; } = new LegendLabels(); } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/LegendItem.cs b/src/ChartJs.Blazor/Common/LegendItem.cs similarity index 94% rename from src/ChartJs.Blazor/ChartJS/Common/LegendItem.cs rename to src/ChartJs.Blazor/Common/LegendItem.cs index cfb3083e..3016d8b7 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/LegendItem.cs +++ b/src/ChartJs.Blazor/Common/LegendItem.cs @@ -1,10 +1,6 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Properties; -using System; -using System.Collections.Generic; -using System.Text; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// The model of the legend items which are displayed in the chart-legend. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Properties/LegendLabels.cs b/src/ChartJs.Blazor/Common/LegendLabels.cs similarity index 93% rename from src/ChartJs.Blazor/ChartJS/Common/Properties/LegendLabels.cs rename to src/ChartJs.Blazor/Common/LegendLabels.cs index 7d8c708a..67384a4d 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Properties/LegendLabels.cs +++ b/src/ChartJs.Blazor/Common/LegendLabels.cs @@ -1,9 +1,9 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.Common.Handlers; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.Common.Handlers; using ChartJs.Blazor.Util; using ChartJs.Blazor.Interop; -namespace ChartJs.Blazor.ChartJS.Common.Properties +namespace ChartJs.Blazor.Common { /// /// The legend label configuration is nested below the legend configuration @@ -56,4 +56,4 @@ public class LegendLabels /// public bool UsePointStyle { get; set; } = false; } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Properties/OptionsTitle.cs b/src/ChartJs.Blazor/Common/OptionsTitle.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/Properties/OptionsTitle.cs rename to src/ChartJs.Blazor/Common/OptionsTitle.cs index 31a314f1..fe053b96 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Properties/OptionsTitle.cs +++ b/src/ChartJs.Blazor/Common/OptionsTitle.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.Common.Properties +namespace ChartJs.Blazor.Common { /// /// The title-subconfig of . Specifies how the chart title is displayed. @@ -55,4 +55,4 @@ public class OptionsTitle /// public IndexableOption Text { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/Common/Point.cs b/src/ChartJs.Blazor/Common/Point.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Point.cs rename to src/ChartJs.Blazor/Common/Point.cs index 4b1798cc..c046cef2 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Point.cs +++ b/src/ChartJs.Blazor/Common/Point.cs @@ -1,6 +1,6 @@ using System; -namespace ChartJs.Blazor.ChartJS.Common +namespace ChartJs.Blazor.Common { /// /// Represents a point on a plane with an X and a Y-value. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Time/JsonMomentConverter.cs b/src/ChartJs.Blazor/Common/Time/JsonMomentConverter.cs similarity index 76% rename from src/ChartJs.Blazor/ChartJS/Common/Time/JsonMomentConverter.cs rename to src/ChartJs.Blazor/Common/Time/JsonMomentConverter.cs index 216fca0e..816555f2 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Time/JsonMomentConverter.cs +++ b/src/ChartJs.Blazor/Common/Time/JsonMomentConverter.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; +using ChartJs.Blazor.Common; using Newtonsoft.Json; -namespace ChartJs.Blazor.ChartJS.Common.Time +namespace ChartJs.Blazor.Common.Time { internal class JsonMomentConverter : JsonWriteOnlyConverter { diff --git a/src/ChartJs.Blazor/ChartJS/Common/Time/Moment.cs b/src/ChartJs.Blazor/Common/Time/Moment.cs similarity index 94% rename from src/ChartJs.Blazor/ChartJS/Common/Time/Moment.cs rename to src/ChartJs.Blazor/Common/Time/Moment.cs index e3e06aa8..c59ac57d 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Time/Moment.cs +++ b/src/ChartJs.Blazor/Common/Time/Moment.cs @@ -1,13 +1,13 @@ using Newtonsoft.Json; using System; -namespace ChartJs.Blazor.ChartJS.Common.Time +namespace ChartJs.Blazor.Common.Time { /// /// Wrapper class for for serialization purposes. /// - // This wrapper can be removed if https://github.com/aspnet/AspNetCore/issues/12685 passes - // because then we can just write a custom converter for DateTime and add that to + // This wrapper can be removed if https://github.com/aspnet/AspNetCore/issues/12685 passes + // because then we can just write a custom converter for DateTime and add that to // the options so it's used for every DateTime it sees. This should not have side effects. [JsonConverter(typeof(JsonMomentConverter))] public class Moment @@ -36,7 +36,7 @@ public class Moment /// Returns the value indicating whether this instance is equal to a specified object. /// /// The object to compare to this instance. - /// true if the other object is a wrapper for the same value + /// true if the other object is a wrapper for the same value /// or if it's the same value as wrapped in this instance. public override bool Equals(object obj) { diff --git a/src/ChartJs.Blazor/ChartJS/Common/Time/TimeDisplayFormats.cs b/src/ChartJs.Blazor/Common/Time/TimeDisplayFormats.cs similarity index 90% rename from src/ChartJs.Blazor/ChartJS/Common/Time/TimeDisplayFormats.cs rename to src/ChartJs.Blazor/Common/Time/TimeDisplayFormats.cs index 9d6f9502..e3ccaf2d 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Time/TimeDisplayFormats.cs +++ b/src/ChartJs.Blazor/Common/Time/TimeDisplayFormats.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.Common.Time +namespace ChartJs.Blazor.Common.Time { /// /// This is a helper class containing pre-made display formats to use in for certain locales. diff --git a/src/ChartJs.Blazor/ChartJS/Common/Time/TimeOptions.cs b/src/ChartJs.Blazor/Common/Time/TimeOptions.cs similarity index 95% rename from src/ChartJs.Blazor/ChartJS/Common/Time/TimeOptions.cs rename to src/ChartJs.Blazor/Common/Time/TimeOptions.cs index f35b0489..96908c61 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Time/TimeOptions.cs +++ b/src/ChartJs.Blazor/Common/Time/TimeOptions.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.Common.Time +namespace ChartJs.Blazor.Common.Time { /// /// As per documentation here https://www.chartjs.org/docs/latest/axes/cartesian/time.html#configuration-options diff --git a/src/ChartJs.Blazor/ChartJS/Common/Time/TimePoint.cs b/src/ChartJs.Blazor/Common/Time/TimePoint.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/Common/Time/TimePoint.cs rename to src/ChartJs.Blazor/Common/Time/TimePoint.cs index eeaa4ed2..4446a99e 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Time/TimePoint.cs +++ b/src/ChartJs.Blazor/Common/Time/TimePoint.cs @@ -1,6 +1,6 @@ using System; -namespace ChartJs.Blazor.ChartJS.Common.Time +namespace ChartJs.Blazor.Common.Time { /// /// Represents a point on a plane with an X and a Y-value where the diff --git a/src/ChartJs.Blazor/ChartJS/Common/Properties/Tooltips.cs b/src/ChartJs.Blazor/Common/Tooltips.cs similarity index 98% rename from src/ChartJs.Blazor/ChartJS/Common/Properties/Tooltips.cs rename to src/ChartJs.Blazor/Common/Tooltips.cs index 9d197248..2ce95ff0 100644 --- a/src/ChartJs.Blazor/ChartJS/Common/Properties/Tooltips.cs +++ b/src/ChartJs.Blazor/Common/Tooltips.cs @@ -1,6 +1,6 @@ -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.Common.Properties +namespace ChartJs.Blazor.Common { /// /// The tooltips-subconfig of the common options (applies to all charts). @@ -169,4 +169,4 @@ public class Tooltips /// public double BorderWidth { get; set; } = 0; } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/Interop/ChartJsInterop.cs b/src/ChartJs.Blazor/Interop/ChartJsInterop.cs index 3da4895b..e721ffd9 100644 --- a/src/ChartJs.Blazor/Interop/ChartJsInterop.cs +++ b/src/ChartJs.Blazor/Interop/ChartJsInterop.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common; +using ChartJs.Blazor.Common; using Microsoft.JSInterop; using Newtonsoft.Json; using Newtonsoft.Json.Converters; @@ -8,7 +8,7 @@ using System.Dynamic; using System.Linq; using System.Threading.Tasks; -using ChartJs.Blazor.ChartJS.Common.Handlers; +using ChartJs.Blazor.Common.Handlers; using ChartJs.Blazor.Util; namespace ChartJs.Blazor.Interop diff --git a/src/ChartJs.Blazor/ChartJS/LineChart/LineConfig.cs b/src/ChartJs.Blazor/LineChart/LineConfig.cs similarity index 72% rename from src/ChartJs.Blazor/ChartJS/LineChart/LineConfig.cs rename to src/ChartJs.Blazor/LineChart/LineConfig.cs index b0dbb285..13cb5112 100644 --- a/src/ChartJs.Blazor/ChartJS/LineChart/LineConfig.cs +++ b/src/ChartJs.Blazor/LineChart/LineConfig.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.LineChart +namespace ChartJs.Blazor.LineChart { /// /// Config for a @@ -13,4 +13,4 @@ public class LineConfig : ConfigBase /// public LineConfig() : base(ChartType.Line) { } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/LineChart/LineDataset.cs b/src/ChartJs.Blazor/LineChart/LineDataset.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/LineChart/LineDataset.cs rename to src/ChartJs.Blazor/LineChart/LineDataset.cs index 9d507bd7..bfdf2053 100644 --- a/src/ChartJs.Blazor/ChartJS/LineChart/LineDataset.cs +++ b/src/ChartJs.Blazor/LineChart/LineDataset.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Threading.Tasks; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; using ChartJs.Blazor.Util; using Newtonsoft.Json; -namespace ChartJs.Blazor.ChartJS.LineChart +namespace ChartJs.Blazor.LineChart { /// /// Represents a dataset for a line chart. @@ -47,7 +47,7 @@ protected LineDataset(ChartType type) : base(type) { } public BorderCapStyle BorderCapStyle { get; set; } /// - /// Gets or sets the color of the line. + /// Gets or sets the color of the line. /// See for working with colors. /// public string BorderColor { get; set; } @@ -102,7 +102,7 @@ protected LineDataset(ChartType type) : base(type) { } public BorderCapStyle HoverBorderCapStyle { get; set; } /// - /// Gets or sets the color of the line when hovered. + /// Gets or sets the color of the line when hovered. /// See for working with colors. /// public string HoverBorderColor { get; set; } diff --git a/src/ChartJs.Blazor/ChartJS/LineChart/LineOptions.cs b/src/ChartJs.Blazor/LineChart/LineOptions.cs similarity index 79% rename from src/ChartJs.Blazor/ChartJS/LineChart/LineOptions.cs rename to src/ChartJs.Blazor/LineChart/LineOptions.cs index e492edde..03c21710 100644 --- a/src/ChartJs.Blazor/ChartJS/LineChart/LineOptions.cs +++ b/src/ChartJs.Blazor/LineChart/LineOptions.cs @@ -1,8 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Properties; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.LineChart +namespace ChartJs.Blazor.LineChart { /// /// The options-subconfig of a diff --git a/src/ChartJs.Blazor/ChartJS/LineChart/Scales.cs b/src/ChartJs.Blazor/LineChart/Scales.cs similarity index 87% rename from src/ChartJs.Blazor/ChartJS/LineChart/Scales.cs rename to src/ChartJs.Blazor/LineChart/Scales.cs index 02e97a52..bda595b0 100644 --- a/src/ChartJs.Blazor/ChartJS/LineChart/Scales.cs +++ b/src/ChartJs.Blazor/LineChart/Scales.cs @@ -1,8 +1,8 @@ -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common.Axes; using Newtonsoft.Json; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.LineChart +namespace ChartJs.Blazor.LineChart { /// /// Defines the scales for cartesian charts by holding the x and y axes. diff --git a/src/ChartJs.Blazor/ChartJS/PieChart/PieConfig.cs b/src/ChartJs.Blazor/PieChart/PieConfig.cs similarity index 72% rename from src/ChartJs.Blazor/ChartJS/PieChart/PieConfig.cs rename to src/ChartJs.Blazor/PieChart/PieConfig.cs index 84b4eab4..9b1086ad 100644 --- a/src/ChartJs.Blazor/ChartJS/PieChart/PieConfig.cs +++ b/src/ChartJs.Blazor/PieChart/PieConfig.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.PieChart +namespace ChartJs.Blazor.PieChart { /// /// Config for a . diff --git a/src/ChartJs.Blazor/ChartJS/PieChart/PieDataset.cs b/src/ChartJs.Blazor/PieChart/PieDataset.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/PieChart/PieDataset.cs rename to src/ChartJs.Blazor/PieChart/PieDataset.cs index f69b3ba4..be37ebbf 100644 --- a/src/ChartJs.Blazor/ChartJS/PieChart/PieDataset.cs +++ b/src/ChartJs.Blazor/PieChart/PieDataset.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.PieChart +namespace ChartJs.Blazor.PieChart { /// public class PieDataset : PieDataset diff --git a/src/ChartJs.Blazor/ChartJS/PieChart/PieOptions.cs b/src/ChartJs.Blazor/PieChart/PieOptions.cs similarity index 91% rename from src/ChartJs.Blazor/ChartJS/PieChart/PieOptions.cs rename to src/ChartJs.Blazor/PieChart/PieOptions.cs index 814085fe..a1ed9966 100644 --- a/src/ChartJs.Blazor/ChartJS/PieChart/PieOptions.cs +++ b/src/ChartJs.Blazor/PieChart/PieOptions.cs @@ -1,8 +1,7 @@ using System; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Properties; +using ChartJs.Blazor.Common; -namespace ChartJs.Blazor.ChartJS.PieChart +namespace ChartJs.Blazor.PieChart { /// /// The options-subconfig of a . @@ -39,4 +38,4 @@ public PieOptions(bool doughnutCutout = false) /// public double Circumference { get; set; } = 2 * Math.PI; } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaConfig.cs b/src/ChartJs.Blazor/PolarAreaChart/PolarAreaConfig.cs similarity index 69% rename from src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaConfig.cs rename to src/ChartJs.Blazor/PolarAreaChart/PolarAreaConfig.cs index acac9592..b0751c16 100644 --- a/src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaConfig.cs +++ b/src/ChartJs.Blazor/PolarAreaChart/PolarAreaConfig.cs @@ -1,8 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.Charts; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.PolarAreaChart +namespace ChartJs.Blazor.PolarAreaChart { /// /// Config for a diff --git a/src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaDataset.cs b/src/ChartJs.Blazor/PolarAreaChart/PolarAreaDataset.cs similarity index 92% rename from src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaDataset.cs rename to src/ChartJs.Blazor/PolarAreaChart/PolarAreaDataset.cs index 46af32d6..861c6945 100644 --- a/src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaDataset.cs +++ b/src/ChartJs.Blazor/PolarAreaChart/PolarAreaDataset.cs @@ -1,12 +1,11 @@ using System; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.PieChart; -using ChartJs.Blazor.Charts; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.PieChart; using ChartJs.Blazor.Util; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.PolarAreaChart +namespace ChartJs.Blazor.PolarAreaChart { /// public class PolarAreaDataset : PolarAreaDataset diff --git a/src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaOptions.cs b/src/ChartJs.Blazor/PolarAreaChart/PolarAreaOptions.cs similarity index 79% rename from src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaOptions.cs rename to src/ChartJs.Blazor/PolarAreaChart/PolarAreaOptions.cs index cfdeae3e..30e4555b 100644 --- a/src/ChartJs.Blazor/ChartJS/PolarAreaChart/PolarAreaOptions.cs +++ b/src/ChartJs.Blazor/PolarAreaChart/PolarAreaOptions.cs @@ -1,9 +1,8 @@ using System; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Properties; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.PolarAreaChart +namespace ChartJs.Blazor.PolarAreaChart { /// /// The options-subconfig of a . @@ -25,4 +24,4 @@ public class PolarAreaOptions : BaseConfigOptions /// public LinearRadialAxis Scale { get; set; } } -} \ No newline at end of file +} diff --git a/src/ChartJs.Blazor/ChartJS/RadarChart/RadarConfig.cs b/src/ChartJs.Blazor/RadarChart/RadarConfig.cs similarity index 71% rename from src/ChartJs.Blazor/ChartJS/RadarChart/RadarConfig.cs rename to src/ChartJs.Blazor/RadarChart/RadarConfig.cs index c4470e8c..1a88277a 100644 --- a/src/ChartJs.Blazor/ChartJS/RadarChart/RadarConfig.cs +++ b/src/ChartJs.Blazor/RadarChart/RadarConfig.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.RadarChart +namespace ChartJs.Blazor.RadarChart { /// /// Represents the config for a radar chart. diff --git a/src/ChartJs.Blazor/ChartJS/RadarChart/RadarDataset.cs b/src/ChartJs.Blazor/RadarChart/RadarDataset.cs similarity index 97% rename from src/ChartJs.Blazor/ChartJS/RadarChart/RadarDataset.cs rename to src/ChartJs.Blazor/RadarChart/RadarDataset.cs index 4b08ba86..ef8a9104 100644 --- a/src/ChartJs.Blazor/ChartJS/RadarChart/RadarDataset.cs +++ b/src/ChartJs.Blazor/RadarChart/RadarDataset.cs @@ -1,11 +1,11 @@ using System; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.LineChart; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.LineChart; using ChartJs.Blazor.Util; using System.Collections.Generic; -namespace ChartJs.Blazor.ChartJS.RadarChart +namespace ChartJs.Blazor.RadarChart { /// public class RadarDataset : RadarDataset diff --git a/src/ChartJs.Blazor/ChartJS/RadarChart/RadarOptions.cs b/src/ChartJs.Blazor/RadarChart/RadarOptions.cs similarity index 82% rename from src/ChartJs.Blazor/ChartJS/RadarChart/RadarOptions.cs rename to src/ChartJs.Blazor/RadarChart/RadarOptions.cs index 5f13058e..4f9eb46f 100644 --- a/src/ChartJs.Blazor/ChartJS/RadarChart/RadarOptions.cs +++ b/src/ChartJs.Blazor/RadarChart/RadarOptions.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Axes; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Axes; -namespace ChartJs.Blazor.ChartJS.RadarChart +namespace ChartJs.Blazor.RadarChart { /// /// Represents the options-subconfig of a . diff --git a/src/ChartJs.Blazor/ChartJS/ScatterChart/ScatterConfig.cs b/src/ChartJs.Blazor/ScatterChart/ScatterConfig.cs similarity index 82% rename from src/ChartJs.Blazor/ChartJS/ScatterChart/ScatterConfig.cs rename to src/ChartJs.Blazor/ScatterChart/ScatterConfig.cs index 7d9e1d53..3605a27b 100644 --- a/src/ChartJs.Blazor/ChartJS/ScatterChart/ScatterConfig.cs +++ b/src/ChartJs.Blazor/ScatterChart/ScatterConfig.cs @@ -1,7 +1,7 @@ -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; -namespace ChartJs.Blazor.ChartJS.ScatterChart +namespace ChartJs.Blazor.ScatterChart { /// /// Represents the config for a scatter chart. diff --git a/src/ChartJs.Blazor/ChartJS/ScatterChart/ScatterDataset.cs b/src/ChartJs.Blazor/ScatterChart/ScatterDataset.cs similarity index 88% rename from src/ChartJs.Blazor/ChartJS/ScatterChart/ScatterDataset.cs rename to src/ChartJs.Blazor/ScatterChart/ScatterDataset.cs index 4092e034..5c2f0d3d 100644 --- a/src/ChartJs.Blazor/ChartJS/ScatterChart/ScatterDataset.cs +++ b/src/ChartJs.Blazor/ScatterChart/ScatterDataset.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using ChartJs.Blazor.ChartJS.Common; -using ChartJs.Blazor.ChartJS.Common.Enums; -using ChartJs.Blazor.ChartJS.LineChart; +using ChartJs.Blazor.Common; +using ChartJs.Blazor.Common.Enums; +using ChartJs.Blazor.LineChart; using ChartJs.Blazor.Util; -namespace ChartJs.Blazor.ChartJS.ScatterChart +namespace ChartJs.Blazor.ScatterChart { /// /// Represents a dataset for a scatter chart. diff --git a/src/ChartJs.Blazor/Util/PointUtil.cs b/src/ChartJs.Blazor/Util/PointUtil.cs index c03da9d9..43198889 100644 --- a/src/ChartJs.Blazor/Util/PointUtil.cs +++ b/src/ChartJs.Blazor/Util/PointUtil.cs @@ -1,4 +1,4 @@ -using ChartJs.Blazor.ChartJS.Common; +using ChartJs.Blazor.Common; using System; using System.Collections.Generic; using System.Linq; @@ -62,4 +62,4 @@ public static List GetRandomPoints(int amount = 10, .Select(i => GetRandomPoint(minX, maxX, minY, maxY)) .ToList(); } -} \ No newline at end of file +}