Reorganize namespaces

- ChartJs.Blazor.ChartJS was truncated to ChartJs.Blazor - Common.Properties was merged with Common (full namespace is now ChartJs.Blazor.Common) - The Chart component was placed in the root namespace ChartJs.Blazor as it can be seen as the entry point of the library - This has some automatic whitespace changes which I didn't bother to remove, they are irrelevant
mariusmuntean · Oct 14, 2020 · ee7c460 · ee7c460
1 parent 1efeca3
commit ee7c460
Show file tree

Hide file tree

Showing 130 changed files with 318 additions and 330 deletions.
diff --git 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
@@ -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
 
 <Chart TConfig="BarConfig" Config="_config" @ref="_chart"></Chart>

diff --git 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
@@ -1,5 +1,5 @@
 @page "/charts/line/basic"
-@using ChartJS.LineChart
+@using ChartJs.Blazor.LineChart
 @layout SampleLayout
 
 <Chart TConfig="LineConfig" Config="_config" @ref="_chart"></Chart>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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);
         }
     }
-}
+}
diff --git 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);
         }
     }
-}
+}
diff --git 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
@@ -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);
         }
     }
-}
+}
diff --git 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) { }
         }
     }
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/BarChart/Axes/BarCategoryAxis.cs → ...s.Blazor/BarChart/Axes/BarCategoryAxis.cs b/.../ChartJS/BarChart/Axes/BarCategoryAxis.cs → ...s.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
 {
     /// <summary>
     /// Extended version of <see cref="CategoryAxis"/> for use in a bar chart.

diff --git a/...S/BarChart/Axes/BarLinearCartesianAxis.cs → ...r/BarChart/Axes/BarLinearCartesianAxis.cs b/...S/BarChart/Axes/BarLinearCartesianAxis.cs → ...r/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
 {
     /// <summary>
     /// Extended version of <see cref="LinearCartesianAxis"/> for use in a bar chart.

diff --git a/...artJS/BarChart/Axes/BarLogarithmicAxis.cs → ...lazor/BarChart/Axes/BarLogarithmicAxis.cs b/...artJS/BarChart/Axes/BarLogarithmicAxis.cs → ...lazor/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
 {
     /// <summary>
     /// Extended version of <see cref="LogarithmicAxis"/> for use in a bar chart.

diff --git a/...azor/ChartJS/BarChart/Axes/BarTimeAxis.cs → ...artJs.Blazor/BarChart/Axes/BarTimeAxis.cs b/...azor/ChartJS/BarChart/Axes/BarTimeAxis.cs → ...artJs.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
 {
     /// <summary>
     /// Extended version of <see cref="TimeAxis"/> for use in a bar chart.

diff --git a/...JS/BarChart/Axes/ExtendedCartesianAxes.tt → ...or/BarChart/Axes/ExtendedCartesianAxes.tt b/...JS/BarChart/Axes/ExtendedCartesianAxes.tt → ...or/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
 {
     /// <summary>
     /// Extended version of <see cref="<#= baseName #>"/> 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);
 }
-#>
+#>
diff --git a/...rtJs.Blazor/ChartJS/BarChart/BarConfig.cs → src/ChartJs.Blazor/BarChart/BarConfig.cs b/...rtJs.Blazor/ChartJS/BarChart/BarConfig.cs → 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
 {
     /// <summary>
     /// Config for a <see cref="Charts.ChartJsBarChart"/>.

diff --git a/...tJs.Blazor/ChartJS/BarChart/BarDataset.cs → src/ChartJs.Blazor/BarChart/BarDataset.cs b/...tJs.Blazor/ChartJS/BarChart/BarDataset.cs → 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
 {
     /// <summary>
     /// Represents a dataset for a bar chart.

diff --git a/...tJs.Blazor/ChartJS/BarChart/BarOptions.cs → src/ChartJs.Blazor/BarChart/BarOptions.cs b/...tJs.Blazor/ChartJS/BarChart/BarOptions.cs → 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
 {
     /// <summary>
     /// The options-subconfig of a <see cref="BarConfig"/>.
@@ -13,4 +12,4 @@ public class BarOptions : BaseConfigOptions
         /// </summary>
         public BarScales Scales { get; set; }
     }
-}
+}
diff --git a/...rtJs.Blazor/ChartJS/BarChart/BarScales.cs → src/ChartJs.Blazor/BarChart/BarScales.cs b/...rtJs.Blazor/ChartJS/BarChart/BarScales.cs → 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
 {
     /// <summary>
     /// Defines the scales for bar charts by holding the x and y axes.
@@ -11,7 +11,7 @@ public class BarScales
     {
         /// <summary>
         /// Gets or sets the configurations for the x-axes.
-        /// <para>You can use any <see cref="CartesianAxis"/> but there are extended axes in the <see cref="BarChart.Axes"/> namespace which contain additional properties to customize the bar chart axes.</para>        
+        /// <para>You can use any <see cref="CartesianAxis"/> but there are extended axes in the <see cref="BarChart.Axes"/> namespace which contain additional properties to customize the bar chart axes.</para>
         /// </summary>
         [JsonProperty("xAxes")]
         public IList<CartesianAxis> XAxes { get; set; }

diff --git a/...s.Blazor/ChartJS/BarChart/BarThickness.cs → src/ChartJs.Blazor/BarChart/BarThickness.cs b/...s.Blazor/ChartJS/BarChart/BarThickness.cs → 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
 {
     /// <summary>
-    /// The bar thickness used to customize all bar axes (extended cartesian axes in <see cref="ChartJs.Blazor.ChartJS.BarChart.Axes"/>).
+    /// The bar thickness used to customize all bar axes (extended cartesian axes in <see cref="ChartJs.Blazor.BarChart.Axes"/>).
     /// <para>As per documentation here https://www.chartjs.org/docs/latest/charts/bar.html#barthickness </para>
     /// </summary>
     public class BarThickness : ObjectEnum
@@ -34,7 +34,7 @@ private BarThickness(double doubleValue) : base(doubleValue) { }
         public static implicit operator BarThickness(double thickness) => new BarThickness(thickness);
 
         /// <summary>
-        /// If set to <see cref="Flex"/>, the base sample widths are calculated automatically 
+        /// If set to <see cref="Flex"/>, the base sample widths are calculated automatically
         /// based on the previous and following samples so that they take the full available widths without overlap.
         /// </summary>
         public static BarThickness Flex => new BarThickness("flex");

diff --git a/...azor/ChartJS/BarChart/FloatingBarPoint.cs → ...artJs.Blazor/BarChart/FloatingBarPoint.cs b/...azor/ChartJS/BarChart/FloatingBarPoint.cs → ...artJs.Blazor/BarChart/FloatingBarPoint.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace ChartJs.Blazor.ChartJS.BarChart
+namespace ChartJs.Blazor.BarChart
 {
     /// <summary>
     /// Represents a floating bar within a bar chart (use in <see cref="BarDataset{T}"/>).

diff --git a/...tJS/BarChart/FloatingBarPointConverter.cs → ...zor/BarChart/FloatingBarPointConverter.cs b/...tJS/BarChart/FloatingBarPointConverter.cs → ...zor/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<FloatingBarPoint>
     {

diff --git a/...lazor/ChartJS/BubbleChart/BubbleConfig.cs → ...hartJs.Blazor/BubbleChart/BubbleConfig.cs b/...lazor/ChartJS/BubbleChart/BubbleConfig.cs → ...hartJs.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<BubbleOptions>
     {

diff --git a/...azor/ChartJS/BubbleChart/BubbleDataset.cs → ...artJs.Blazor/BubbleChart/BubbleDataset.cs b/...azor/ChartJS/BubbleChart/BubbleDataset.cs → ...artJs.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
 {
     /// <summary>
     /// Represents a dataset for a bubble chart.

diff --git a/src/ChartJs.Blazor/BubbleChart/BubbleOptions.cs 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/...Blazor/ChartJS/BubbleChart/BubblePoint.cs → ...ChartJs.Blazor/BubbleChart/BubblePoint.cs b/...Blazor/ChartJS/BubbleChart/BubblePoint.cs → ...ChartJs.Blazor/BubbleChart/BubblePoint.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ChartJs.Blazor.ChartJS.BubbleChart
+namespace ChartJs.Blazor.BubbleChart
 {
     /// <summary>
     /// Represents a bubble on a plane with an X, Y and radius value.

diff --git a/src/ChartJs.Blazor/Charts/Chart.razor → src/ChartJs.Blazor/Chart.razor b/src/ChartJs.Blazor/Charts/Chart.razor → src/ChartJs.Blazor/Chart.razor
diff --git a/src/ChartJs.Blazor/Charts/Chart.razor.cs → src/ChartJs.Blazor/Chart.razor.cs b/src/ChartJs.Blazor/Charts/Chart.razor.cs → 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
 {
     /// <summary>
     /// Represents a ChartJs chart