Merge pull request #123 from alirizaadiyahsi/dev

v0.4.0
alirizaadiyahsi · Dec 4, 2018 · 188e766 · 188e766
2 parents 3b71e9e + d021cb5
commit 188e766
Show file tree

Hide file tree

Showing 17 changed files with 402 additions and 164 deletions.
diff --git a/src/Nucleus.Application/Nucleus.Application.csproj b/src/Nucleus.Application/Nucleus.Application.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nucleus.Core/Nucleus.Core.csproj b/src/Nucleus.Core/Nucleus.Core.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Nucleus.EntityFramework/Nucleus.EntityFramework.csproj b/src/Nucleus.EntityFramework/Nucleus.EntityFramework.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Nucleus.Utilities/Nucleus.Utilities.csproj b/src/Nucleus.Utilities/Nucleus.Utilities.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nucleus.Web.Api/Nucleus.Web.Api.csproj b/src/Nucleus.Web.Api/Nucleus.Web.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />

diff --git a/src/Nucleus.Web.Api/Startup.cs b/src/Nucleus.Web.Api/Startup.cs
@@ -30,7 +30,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMvc(setup =>
             {
                 setup.Filters.AddService<UnitOfWorkActionFilter>();
-            }).SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            });
 
             services.AddSwaggerGen(c =>
             {

diff --git a/src/Nucleus.Web.Core/Nucleus.Web.Core.csproj b/src/Nucleus.Web.Core/Nucleus.Web.Core.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.3.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
   </ItemGroup>

diff --git a/src/Nucleus.Web.Vue/Nucleus.Web.Vue.csproj b/src/Nucleus.Web.Vue/Nucleus.Web.Vue.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <TypeScriptToolsVersion>3.0</TypeScriptToolsVersion>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="BuildWebCompiler" Version="1.12.394" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Nucleus.Web.Vue/package.json b/src/Nucleus.Web.Vue/package.json
@@ -12,23 +12,23 @@
     "vue": "^2.5.17",
     "vue-class-component": "^6.3.2",
     "vue-property-decorator": "^7.2.0",
-    "vue-router": "^3.0.1",
-    "vuetify": "^1.3.11",
-    "material-design-icons-iconfont": "4.0.2",
-    "sweetalert2": "^7.29.1",
-    "vue-i18n": "^8.3.2"
+    "vue-router": "^3.0.2",
+    "vuetify": "^1.4.0-alpha.0",
+    "material-design-icons-iconfont": "^4.0.3",
+    "sweetalert2": "^7.29.2",
+    "vue-i18n": "^8.4.0"
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.5",
-    "@vue/cli-plugin-babel": "^3.1.1",
-    "@vue/cli-plugin-typescript": "^3.1.1",
-    "@vue/cli-plugin-unit-mocha": "^3.1.1",
-    "@vue/cli-service": "^3.1.4",
-    "@vue/test-utils": "^1.0.0-beta.25",
+    "@vue/cli-plugin-babel": "^3.2.0",
+    "@vue/cli-plugin-typescript": "^3.2.0",
+    "@vue/cli-plugin-unit-mocha": "^3.2.0",
+    "@vue/cli-service": "^3.2.0",
+    "@vue/test-utils": "^1.0.0-beta.26",
     "@types/query-string": "^6.1.1",
     "chai": "^4.2.0",
-    "typescript": "^3.1.6",
+    "typescript": "^3.2.1",
     "vue-template-compiler": "^2.5.17",
     "query-string": "^6.2.0"
   }

diff --git a/src/Nucleus.Web.Vue/src/admin/admin-layout.vue b/src/Nucleus.Web.Vue/src/admin/admin-layout.vue
@@ -1,15 +1,18 @@
 <template>
-    <v-app>
+    <div>
         <aside-menu>
         </aside-menu>
         <top-menu>
         </top-menu>
         <v-content>
-            <v-container>
+            <v-container grid-list-md class="px-0">
                 <router-view></router-view>
             </v-container>
         </v-content>
-    </v-app>
+        <v-footer app fixed dark>
+            <span>&copy; Version: {{nucleus.appVersion}}</span>
+        </v-footer>
+    </div>
 </template>
 
 <script src="./admin-layout.ts"></script>
diff --git a/src/Nucleus.Web.Vue/src/admin/views/home/home.ts b/src/Nucleus.Web.Vue/src/admin/views/home/home.ts
@@ -3,4 +3,94 @@ import { Component } from 'vue-property-decorator';
 
 @Component
 export default class HomeComponent extends NucleusComponentBase {
+    public get items() {
+        return [
+            { header: 'Today' },
+            {
+                avatar: 'https://cdn.vuetifyjs.com/images/lists/1.jpg',
+                title: 'Brunch this weekend?',
+                subtitle: "<span class='text--primary'>Ali Connors</span> &mdash; I'll be in your neighborhood doing errands this weekend. Do you want to hang out?"
+            },
+            { divider: true, inset: true },
+            {
+                avatar: 'https://cdn.vuetifyjs.com/images/lists/2.jpg',
+                title: 'Summer BBQ <span class="grey--text text--lighten-1">4</span>',
+                subtitle: "<span class='text--primary'>to Alex, Scott, Jennifer</span> &mdash; Wish I could come, but I'm out of town this weekend."
+            },
+            { divider: true, inset: true },
+            {
+                avatar: 'https://cdn.vuetifyjs.com/images/lists/3.jpg',
+                title: 'Oui oui',
+                subtitle: "<span class='text--primary'>Sandra Adams</span> &mdash; Do you have Paris recommendations? Have you ever been?"
+            },
+            { divider: true, inset: true },
+            {
+                avatar: 'https://cdn.vuetifyjs.com/images/lists/4.jpg',
+                title: 'Birthday gift',
+                subtitle: "<span class='text--primary'>Trevor Hansen</span> &mdash; Have any ideas about what we should get Heidi for her birthday?"
+            },
+            { divider: true, inset: true },
+            {
+                avatar: 'https://cdn.vuetifyjs.com/images/lists/5.jpg',
+                title: 'Recipe to try',
+                subtitle: "<span class='text--primary'>Britta Holt</span> &mdash; We should eat this: Grate, Squash, Corn, and tomatillo Tacos."
+            }];
+    }
+
+    public rowsPerPageItems = [4, 8, 12];
+    public pagination = {
+        rowsPerPage: 4
+    };
+
+    public get dataIteratorItems() {
+        return [
+            {
+                value: false,
+                name: 'Frozen Yogurt',
+                calories: 159,
+                fat: 6.0,
+                carbs: 24,
+                protein: 4.0,
+                sodium: 87,
+                calcium: '14%',
+                iron: '1%'
+            },
+            {
+                value: false,
+                name: 'Ice cream sandwich',
+                calories: 237,
+                fat: 9.0,
+                carbs: 37,
+                protein: 4.3,
+                sodium: 129,
+                calcium: '8%',
+                iron: '1%'
+            }
+        ];
+    }
+
+    public get years() {
+        return [
+            {
+                color: 'cyan',
+                year: '1960'
+            },
+            {
+                color: 'green',
+                year: '1970'
+            },
+            {
+                color: 'pink',
+                year: '1980'
+            },
+            {
+                color: 'amber',
+                year: '1990'
+            },
+            {
+                color: 'orange',
+                year: '2000'
+            }
+        ];
+    }
 }