diff --git a/Core/.vs/Core/DesignTimeBuild/.dtbcache b/Core/.vs/Core/DesignTimeBuild/.dtbcache
deleted file mode 100644
index 57cc10a294557871475c51451d268a3731b63895..0000000000000000000000000000000000000000
Binary files a/Core/.vs/Core/DesignTimeBuild/.dtbcache and /dev/null differ
diff --git a/Core/.vs/Core/v15/.suo b/Core/.vs/Core/v15/.suo
index 784f9a4239f8c001c087b632aa2a4f4600b5368a..95974f3266c0f7ef69cc337f24e0eb8829ed0fca 100644
Binary files a/Core/.vs/Core/v15/.suo and b/Core/.vs/Core/v15/.suo differ
diff --git a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm
index 49803e9919ce74e29ffb54ab32e4d2fd9b3cf991..b1e4c9a885d04af949add3a36876d06711bfd777 100644
Binary files a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm and b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal
index ef4087a29164fa16a1324e2cb69983064cda2703..4fded95a79729eb4a63b9dac3bccccdc658389cb 100644
Binary files a/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal and b/Core/.vs/Core/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Core/.vs/config/applicationhost.config b/Core/.vs/config/applicationhost.config
index 3a8d776e65cd8e0e1eb8ce6e262bba8ac7646d45..cfa86b4a1006947229faf7a9209f93187631fabd 100644
--- a/Core/.vs/config/applicationhost.config
+++ b/Core/.vs/config/applicationhost.config
@@ -159,8 +159,8 @@
<virtualDirectory path="/" physicalPath="C:\Users\Krypton0\Documents\NetBeansProjects\bakalarka\Core\Core" />
</application>
<bindings>
- <binding protocol="http" bindingInformation="*:54233:localhost" />
- <binding protocol="https" bindingInformation="*:44309:localhost" />
+ <binding protocol="http" bindingInformation="*:52021:localhost" />
+ <binding protocol="https" bindingInformation="*:44368:localhost" />
</bindings>
</site>
<siteDefaults>
@@ -238,6 +238,7 @@
<add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
<add name="ApplicationInitializationModule" image="%IIS_BIN%\warmup.dll" />
<add name="AspNetCoreModule" image="%IIS_BIN%\aspnetcore.dll" />
+ <add name="AspNetCoreModuleV2" image="%IIS_BIN%\Asp.Net Core Module\V2\aspnetcorev2.dll" />
</globalModules>
<httpCompression />
<!--
@@ -776,6 +777,7 @@
<add name="Rewrite" value="1024" />
<add name="FastCGI" value="4096" />
<add name="WebSocket" value="16384" />
+ <add name="ANCM" value="65536" />
</areas>
</add>
<add name="ASP" guid="{06b94d9a-b15e-456e-a4ef-37c984a2cb4b}">
@@ -877,6 +879,7 @@
<add name="UrlRoutingModule-4.0" type="System.Web.Routing.UrlRoutingModule" preCondition="managedHandler,runtimeVersionv4.0" />
<add name="ScriptModule-4.0" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="managedHandler,runtimeVersionv4.0" />
<add name="AspNetCoreModule" lockItem="true" />
+ <add name="AspNetCoreModuleV2" lockItem="true" />
</modules>
<handlers accessPolicy="Read, Script">
<!-- <add name="WebDAV" path="*" verb="PROPFIND,PROPPATCH,MKCOL,PUT,COPY,DELETE,MOVE,LOCK,UNLOCK" modules="WebDAVModule" resourceType="Unspecified" requireAccess="None" /> -->
diff --git a/Core/Core.sln b/Core/Core.sln
index ce2cbf3d9700cca87c5276c92ad8d9ee4b223006..48d9a429a5c5f788ad0b27979b02242362704541 100644
--- a/Core/Core.sln
+++ b/Core/Core.sln
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2036
+VisualStudioVersion = 15.0.28307.489
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{294B9759-C960-4CA8-8375-9751CB48CEB4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{391EF37E-96B4-42BD-91BA-ED4E518713C8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +11,15 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {294B9759-C960-4CA8-8375-9751CB48CEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {294B9759-C960-4CA8-8375-9751CB48CEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {294B9759-C960-4CA8-8375-9751CB48CEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {294B9759-C960-4CA8-8375-9751CB48CEB4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {391EF37E-96B4-42BD-91BA-ED4E518713C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {391EF37E-96B4-42BD-91BA-ED4E518713C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {391EF37E-96B4-42BD-91BA-ED4E518713C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {391EF37E-96B4-42BD-91BA-ED4E518713C8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {DC8B861A-D08F-4DB0-A038-AD38BF4AC210}
+ SolutionGuid = {3637BED5-3332-4681-9A9B-B09D83F90528}
EndGlobalSection
EndGlobal
diff --git a/Core/Core/ClientApp/src/app/app.module.ts b/Core/Core/ClientApp/src/app/app.module.ts
index 262ccdb2cb83fcf2c58ec974cce483f3335e508b..69df9a8734ba32ad80e9a32bef1882e16837ac27 100644
--- a/Core/Core/ClientApp/src/app/app.module.ts
+++ b/Core/Core/ClientApp/src/app/app.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import { RouterModule } from '@angular/router';
+import { ChartModule } from 'angular-highcharts';
import { AppComponent } from './app.component';
import { NavMenuComponent } from './nav-menu/nav-menu.component';
@@ -10,7 +11,6 @@ import { HomeComponent } from './home/home.component';
import { CounterComponent } from './counter/counter.component';
import { FetchDataComponent } from './fetch-data/fetch-data.component';
import { ExpensesComponent } from './expenses/expenses.component';
-import { ChartModule } from 'angular-highcharts';
@NgModule({
declarations: [
diff --git a/Core/Core/ClientApp/src/app/expenses/expenses.component.spec.ts b/Core/Core/ClientApp/src/app/expenses/expenses.component.spec.ts
index 47adde24a18f69eaf7a4cbd6b714fe32b802fe5b..9a9d31cd271471f403c34b58801e7ed8245cb957 100644
--- a/Core/Core/ClientApp/src/app/expenses/expenses.component.spec.ts
+++ b/Core/Core/ClientApp/src/app/expenses/expenses.component.spec.ts
@@ -1,4 +1,4 @@
-//// <reference path="../../../../node_modules/@types/jasmine/index.d.ts" />
+/// <reference path="../../../../node_modules/@types/jasmine/index.d.ts" />
import { TestBed, async, ComponentFixture, ComponentFixtureAutoDetect } from '@angular/core/testing';
import { BrowserModule, By } from "@angular/platform-browser";
import { ExpensesComponent } from './expenses.component';
@@ -22,4 +22,4 @@ describe('expenses component', () => {
it('should do something', async(() => {
expect(true).toEqual(true);
}));
-});
+});
\ No newline at end of file
diff --git a/Core/Core/ClientApp/src/index.html b/Core/Core/ClientApp/src/index.html
index 94a45c245e47c7ade7a059d41bb44b7004a42e62..855bd2f6c2de15e900144908af94da5a199391c5 100644
--- a/Core/Core/ClientApp/src/index.html
+++ b/Core/Core/ClientApp/src/index.html
@@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>Core</title>
<base href="/">
+
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
diff --git a/Core/Core/Core.csproj b/Core/Core/Core.csproj
index b4b69969b08fdd97c8a4cbfb5f6b1883e6b0226c..28f46eccf2bece01fda34ee1a1553c6fd29dc8ea 100644
--- a/Core/Core/Core.csproj
+++ b/Core/Core/Core.csproj
@@ -14,6 +14,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
+ <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
</ItemGroup>
diff --git a/Core/Core/package-lock.json b/Core/Core/package-lock.json
deleted file mode 100644
index b337c297cf470b9156b5ba43307fd88dd58a0119..0000000000000000000000000000000000000000
--- a/Core/Core/package-lock.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "requires": true,
- "lockfileVersion": 1,
- "dependencies": {
- "highcharts": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-7.0.3.tgz",
- "integrity": "sha512-ubfHLDqKZkGLfDGWYPaa9txLwiJDSWphMZ15xdC0RKKKxZ2ZBc13+MjDfz5ARpYGQvCHmytGOGFUgRWEvkOhNA=="
- }
- }
-}