Skip to content

Commit c802db9

Browse files
martinesoffmartinesoff
committed
Update from master
2 parents ea1f20e + 0e8e238 commit c802db9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+4081
-3
lines changed

Diff for: ‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ _[Ss]cripts
7777
# dependencies
7878
node_modules
7979
wwwroot
80-
**/wwwroot/lib
80+
**/wwwroot/lib

Diff for: ‎.gitmodules

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "TaskPlannerAPI/ClientApp"]
2+
path = TaskPlannerAPI/ClientApp
3+
url = https://github.com/IgniteUI/TaskPlanner.git
4+
[submodule "MarketingDashboard/ClientApp"]
5+
path = MarketingDashboard/ClientApp
6+
url = https://github.com/IgniteUI/igniteui-angular-marketing-dashboard.git
7+
[submodule "DockManager-DataAnalysis/ClientApp"]
8+
path = DockManager-DataAnalysis/ClientApp
9+
url = https://github.com/IgniteUI/DockManager-DataAnalysis.git

Diff for: ‎.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"git.ignoreLimitWarning": true
3+
}

Diff for: ‎DockManager-DataAnalysis/.gitignore

+231
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
1+
## Ignore Visual Studio temporary files, build results, and
2+
## files generated by popular Visual Studio add-ons.
3+
4+
# User-specific files
5+
*.suo
6+
*.user
7+
*.userosscache
8+
*.sln.docstates
9+
10+
# User-specific files (MonoDevelop/Xamarin Studio)
11+
*.userprefs
12+
13+
# Build results
14+
[Dd]ebug/
15+
[Dd]ebugPublic/
16+
[Rr]elease/
17+
[Rr]eleases/
18+
x64/
19+
x86/
20+
build/
21+
bld/
22+
bin/
23+
Bin/
24+
obj/
25+
Obj/
26+
27+
# Visual Studio 2015 cache/options directory
28+
.vs/
29+
30+
# MSTest test Results
31+
[Tt]est[Rr]esult*/
32+
[Bb]uild[Ll]og.*
33+
34+
# NUNIT
35+
*.VisualState.xml
36+
TestResult.xml
37+
38+
# Build Results of an ATL Project
39+
[Dd]ebugPS/
40+
[Rr]eleasePS/
41+
dlldata.c
42+
43+
*_i.c
44+
*_p.c
45+
*_i.h
46+
*.ilk
47+
*.meta
48+
*.obj
49+
*.pch
50+
*.pdb
51+
*.pgc
52+
*.pgd
53+
*.rsp
54+
*.sbr
55+
*.tlb
56+
*.tli
57+
*.tlh
58+
*.tmp
59+
*.tmp_proj
60+
*.log
61+
*.vspscc
62+
*.vssscc
63+
.builds
64+
*.pidb
65+
*.svclog
66+
*.scc
67+
68+
# Chutzpah Test files
69+
_Chutzpah*
70+
71+
# Visual C++ cache files
72+
ipch/
73+
*.aps
74+
*.ncb
75+
*.opendb
76+
*.opensdf
77+
*.sdf
78+
*.cachefile
79+
80+
# Visual Studio profiler
81+
*.psess
82+
*.vsp
83+
*.vspx
84+
*.sap
85+
86+
# TFS 2012 Local Workspace
87+
$tf/
88+
89+
# Guidance Automation Toolkit
90+
*.gpState
91+
92+
# ReSharper is a .NET coding add-in
93+
_ReSharper*/
94+
*.[Rr]e[Ss]harper
95+
*.DotSettings.user
96+
97+
# JustCode is a .NET coding add-in
98+
.JustCode
99+
100+
# TeamCity is a build add-in
101+
_TeamCity*
102+
103+
# DotCover is a Code Coverage Tool
104+
*.dotCover
105+
106+
# NCrunch
107+
_NCrunch_*
108+
.*crunch*.local.xml
109+
nCrunchTemp_*
110+
111+
# MightyMoose
112+
*.mm.*
113+
AutoTest.Net/
114+
115+
# Web workbench (sass)
116+
.sass-cache/
117+
118+
# Installshield output folder
119+
[Ee]xpress/
120+
121+
# DocProject is a documentation generator add-in
122+
DocProject/buildhelp/
123+
DocProject/Help/*.HxT
124+
DocProject/Help/*.HxC
125+
DocProject/Help/*.hhc
126+
DocProject/Help/*.hhk
127+
DocProject/Help/*.hhp
128+
DocProject/Help/Html2
129+
DocProject/Help/html
130+
131+
# Click-Once directory
132+
publish/
133+
134+
# Publish Web Output
135+
*.[Pp]ublish.xml
136+
*.azurePubxml
137+
# TODO: Comment the next line if you want to checkin your web deploy settings
138+
# but database connection strings (with potential passwords) will be unencrypted
139+
*.pubxml
140+
*.publishproj
141+
142+
# NuGet Packages
143+
*.nupkg
144+
# The packages folder can be ignored because of Package Restore
145+
**/packages/*
146+
# except build/, which is used as an MSBuild target.
147+
!**/packages/build/
148+
# Uncomment if necessary however generally it will be regenerated when needed
149+
#!**/packages/repositories.config
150+
151+
# Microsoft Azure Build Output
152+
csx/
153+
*.build.csdef
154+
155+
# Microsoft Azure Emulator
156+
ecf/
157+
rcf/
158+
159+
# Microsoft Azure ApplicationInsights config file
160+
ApplicationInsights.config
161+
162+
# Windows Store app package directory
163+
AppPackages/
164+
BundleArtifacts/
165+
166+
# Visual Studio cache files
167+
# files ending in .cache can be ignored
168+
*.[Cc]ache
169+
# but keep track of directories ending in .cache
170+
!*.[Cc]ache/
171+
172+
# Others
173+
ClientBin/
174+
~$*
175+
*~
176+
*.dbmdl
177+
*.dbproj.schemaview
178+
*.pfx
179+
*.publishsettings
180+
orleans.codegen.cs
181+
182+
/node_modules
183+
184+
# RIA/Silverlight projects
185+
Generated_Code/
186+
187+
# Backup & report files from converting an old project file
188+
# to a newer Visual Studio version. Backup files are not needed,
189+
# because we have git ;-)
190+
_UpgradeReport_Files/
191+
Backup*/
192+
UpgradeLog*.XML
193+
UpgradeLog*.htm
194+
195+
# SQL Server files
196+
*.mdf
197+
*.ldf
198+
199+
# Business Intelligence projects
200+
*.rdl.data
201+
*.bim.layout
202+
*.bim_*.settings
203+
204+
# Microsoft Fakes
205+
FakesAssemblies/
206+
207+
# GhostDoc plugin setting file
208+
*.GhostDoc.xml
209+
210+
# Node.js Tools for Visual Studio
211+
.ntvs_analysis.dat
212+
213+
# Visual Studio 6 build log
214+
*.plg
215+
216+
# Visual Studio 6 workspace options file
217+
*.opt
218+
219+
# Visual Studio LightSwitch build output
220+
**/*.HTMLClient/GeneratedArtifacts
221+
**/*.DesktopClient/GeneratedArtifacts
222+
**/*.DesktopClient/ModelManifest.xml
223+
**/*.Server/GeneratedArtifacts
224+
**/*.Server/ModelManifest.xml
225+
_Pvt_Extensions
226+
227+
# Paket dependency manager
228+
.paket/paket.exe
229+
230+
# FAKE - F# Make
231+
.fake/

Diff for: ‎DockManager-DataAnalysis/Controllers/FinancialDataController.cs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using System.Collections.Generic;
2+
using System.Linq;
3+
using Microsoft.AspNetCore.Mvc;
4+
5+
namespace DockManager_DataAnalysis.Controllers
6+
{
7+
[ApiController]
8+
[Route("financialData/{volume}")]
9+
public class FinancialDataController : ControllerBase
10+
{
11+
[HttpGet]
12+
public IEnumerable<FinancialRecord> Get(int volume)
13+
{
14+
return Enumerable.Range(1, volume).Select(index => new FinancialRecord()).ToArray();
15+
}
16+
}
17+
}

Diff for: ‎DockManager-DataAnalysis/DockManager-DataAnalysis.csproj

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
6+
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
7+
<IsPackable>false</IsPackable>
8+
<SpaRoot>ClientApp\</SpaRoot>
9+
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
10+
11+
<!-- Set this to true if you enable server-side prerendering -->
12+
<BuildServerSideRenderer>false</BuildServerSideRenderer>
13+
<RootNamespace>DockManager_DataAnalysis</RootNamespace>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<!-- Don't publish the SPA source files, but do show them in the project files list -->
22+
<Content Remove="$(SpaRoot)**" />
23+
<None Remove="$(SpaRoot)**" />
24+
<None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
25+
</ItemGroup>
26+
27+
<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug'">
28+
<!-- Ensure Node.js is installed -->
29+
<Exec Command="node --version" ContinueOnError="true">
30+
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
31+
</Exec>
32+
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
33+
<Message Importance="high" Text="Custom message: SpaRoot is $(SpaRoot) and Root is $(SolutionDir)" />
34+
<Exec Condition="!Exists('$(SpaRoot)')" WorkingDirectory="$(SolutionDir)" Command="git clone -j8 https://github.com/IgniteUI/DockManager-DataAnalysis.git ClientApp "/>
35+
<Exec Condition="Exists('$(SpaRoot)')" WorkingDirectory="$(SpaRoot)" Command="git pull origin master" />
36+
<Message Condition="!Exists('$(SpaRoot)node_modules')" Importance="high" Text="Custom message: Restoring dependencies using 'npm'. This may take several minutes..." />
37+
<Exec Condition="!Exists('$(SpaRoot)node_modules')" WorkingDirectory="$(SpaRoot)" Command="npm install" />
38+
<Message Condition="Exists('$(SpaRoot)node_modules')" Importance="high" Text="Custom message: Dependencies are installed" />
39+
</Target>
40+
41+
<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
42+
<!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
43+
<Exec WorkingDirectory="$(SpaRoot)" Command="git pull origin master" />
44+
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
45+
<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build -- --prod" />
46+
47+
<!-- Include the newly-built files in the publish output -->
48+
<ItemGroup>
49+
<DistFiles Include="$(SpaRoot)dist\**; $(SpaRoot)dist-server\**" />
50+
<DistFiles Include="$(SpaRoot)node_modules\**" Condition="'$(BuildServerSideRenderer)' == 'true'" />
51+
<ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
52+
<RelativePath>%(DistFiles.Identity)</RelativePath>
53+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
54+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
55+
</ResolvedFileToPublish>
56+
</ItemGroup>
57+
</Target>
58+
59+
</Project>

Diff for: ‎DockManager-DataAnalysis/DockManager-DataAnalysis.sln

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.1209
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DockManager-DataAnalysis", "DockManager-DataAnalysis.csproj", "{8272904C-A17A-4BE3-B4AF-7FD83F3C9733}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{8272904C-A17A-4BE3-B4AF-7FD83F3C9733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{8272904C-A17A-4BE3-B4AF-7FD83F3C9733}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{8272904C-A17A-4BE3-B4AF-7FD83F3C9733}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{8272904C-A17A-4BE3-B4AF-7FD83F3C9733}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {0EF07AA0-605B-45B5-B263-6D7048E9ABEC}
24+
EndGlobalSection
25+
EndGlobal

0 commit comments

Comments
 (0)