Merge pull request #99 from nstack-io/develop

Deploy to production

Author: Morten Turn Pedersen

.github/workflows/dotnet-core.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '6.0.x'
 
     - name: Clean
       run: dotnet clean NStack/NStack.sln --configuration Release && dotnet nuget locals all --clear
@@ -39,7 +39,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.x'
+          dotnet-version: '6.0.x'
 
       - name: Install dependencies
         run: dotnet restore DemoNStack/DemoNStack.sln

.github/workflows/publish-demo-site.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '6.0.x'
 
     - name: Clean
       run: dotnet clean DemoNStack/DemoNStack/DemoNStack.csproj --configuration Release && dotnet nuget locals all --clear

.github/workflows/publish-nuget.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '6.0.x'
 
     - name: Clean
       run: dotnet clean NStack/NStack.sln --configuration Release && dotnet nuget locals all --clear

DemoNStack/DemoNStack/Controllers/HomeController.cs

@@ -1,29 +1,21 @@
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using DemoNStack.Models;
-using NStack.SDK.Services;
-using NStack.SDK.Models;
+namespace DemoNStack.Controllers;
 
-namespace DemoNStack.Controllers
+public class HomeController : NStackController
 {
-    public class HomeController : NStackController
+    public HomeController(INStackAppService nStackAppService) : base(nStackAppService)
     {
-        public HomeController(INStackAppService nStackAppService) : base(nStackAppService)
-        {
-        }
+    }
 
-        public async Task<IActionResult> Index()
-        {
-            DataMetaWrapper<Translation> res = await GetTranslations();
+    public async Task<IActionResult> Index()
+    {
+        DataMetaWrapper<Translation> res = await GetTranslations();
 
-            return View(res.Data.Default);
-        }
+        return View(res.Data.Default);
+    }
 
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
-        }
+    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+    public IActionResult Error()
+    {
+        return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
     }
 }

DemoNStack/DemoNStack/Controllers/NStackController.cs

@@ -1,40 +1,30 @@
-using DemoNStack.Extensions;
-using DemoNStack.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using NStack.SDK.Models;
-using NStack.SDK.Services;
-using System;
-using System.Threading.Tasks;
+namespace DemoNStack.Controllers;
 
-namespace DemoNStack.Controllers
+public abstract class NStackController : Controller
 {
-    public abstract class NStackController : Controller
+    protected INStackAppService NStackAppService { get; }
+
+    protected NStackController(INStackAppService nStackAppService)
     {
-        protected INStackAppService NStackAppService { get; }
+        NStackAppService = nStackAppService ?? throw new ArgumentNullException(nameof(nStackAppService));
+    }
 
-        protected NStackController(INStackAppService nStackAppService)
-        {
-            NStackAppService = nStackAppService ?? throw new ArgumentNullException(nameof(nStackAppService));
-        }
+    protected async Task<DataMetaWrapper<Translation>> GetTranslations()
+    {
+        return await NStackAppService.GetResourceAsync<Translation>(Request.GetCurrentLanguage(), NStackPlatform.Web, "1.3.1");
+    }
 
-        protected async Task<DataMetaWrapper<Translation>> GetTranslations()
-        {
-            return await NStackAppService.GetResourceAsync<Translation>(Request.GetCurrentLanguage(), NStackPlatform.Web, "1.3.1");
-        }
+    protected Guid GetUserId()
+    {
+        var userIdString = HttpContext.Session.GetString("UserId");
 
-        protected Guid GetUserId()
+        if (!Guid.TryParse(userIdString, out Guid userId))
         {
-            var userIdString = HttpContext.Session.GetString("UserId");
+            userId = Guid.NewGuid();
 
-            if (!Guid.TryParse(userIdString, out Guid userId))
-            {
-                userId = Guid.NewGuid();
-
-                HttpContext.Session.SetString("UserId", userId.ToString());
-            }
-
-            return userId;
+            HttpContext.Session.SetString("UserId", userId.ToString());
         }
+
+        return userId;
     }
 }

DemoNStack/DemoNStack/Controllers/TermsController.cs

@@ -1,70 +1,59 @@
-using DemoNStack.Extensions;
-using DemoNStack.Models;
-using DemoNStack.Models.ViewModels;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Memory;
-using NStack.SDK.Models;
-using NStack.SDK.Services;
-using System;
-using System.Threading.Tasks;
+namespace DemoNStack.Controllers;
 
-namespace DemoNStack.Controllers
+public class TermsController : NStackController
 {
-    public class TermsController : NStackController
-    {
-        private INStackTermsService TermsService { get; }
-        private IMemoryCache Cache { get; }
-
-        public TermsController(INStackAppService appService, IMemoryCache cache, INStackTermsService termsService) : base(appService)
-        {
-            Cache = cache ?? throw new ArgumentNullException(nameof(cache));
-            TermsService = termsService ?? throw new ArgumentNullException(nameof(termsService));
-        }
+    private INStackTermsService TermsService { get; }
+    private IMemoryCache Cache { get; }
 
-        public async Task<IActionResult> Index()
-        {
-            Guid userId = GetUserId();
-
-            TermsWithContent newestTerms = await GetNewestTerms(userId, Request.GetCurrentLanguage());
+    public TermsController(INStackAppService appService, IMemoryCache cache, INStackTermsService termsService) : base(appService)
+    {
+        Cache = cache ?? throw new ArgumentNullException(nameof(cache));
+        TermsService = termsService ?? throw new ArgumentNullException(nameof(termsService));
+    }
 
-            DataMetaWrapper<Translation> translations = await GetTranslations();
+    public async Task<IActionResult> Index()
+    {
+        Guid userId = GetUserId();
 
-            var viewModel = new TermsViewModel
-            {
-                Content = newestTerms.Content.Data,
-                HasApproved = newestTerms.HasViewed,
-                Headline = translations.Data.Terms.Headline,
-                ApproveButton = translations.Data.Terms.Approve,
-                HasApprovedString = translations.Data.Terms.HasApproved
-            };
+        TermsWithContent newestTerms = await GetNewestTerms(userId, Request.GetCurrentLanguage());
 
-            return View(viewModel);
-        }
+        DataMetaWrapper<Translation> translations = await GetTranslations();
 
-        [HttpPost]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> AcceptTerms()
+        var viewModel = new TermsViewModel
         {
-            Guid userId = GetUserId();
-            string language = Request.GetCurrentLanguage();
+            Content = newestTerms.Content.Data,
+            HasApproved = newestTerms.HasViewed,
+            Headline = translations.Data.Terms.Headline,
+            ApproveButton = translations.Data.Terms.Approve,
+            HasApprovedString = translations.Data.Terms.HasApproved
+        };
+
+        return View(viewModel);
+    }
 
-            TermsWithContent newestTerms = await GetNewestTerms(userId, language);
+    [HttpPost]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> AcceptTerms()
+    {
+        Guid userId = GetUserId();
+        string language = Request.GetCurrentLanguage();
 
-            await TermsService.MarkReadAsync(newestTerms.Id, userId.ToString(), language);
+        TermsWithContent newestTerms = await GetNewestTerms(userId, language);
 
-            //Clear cache so we get the updated boolean that the user has read the terms
-            Cache.Remove($"terms-{language}-{userId}");
+        await TermsService.MarkReadAsync(newestTerms.Id, userId.ToString(), language);
 
-            return RedirectToAction("index", new { lang = language });
-        }
+        //Clear cache so we get the updated boolean that the user has read the terms
+        Cache.Remove($"terms-{language}-{userId}");
 
-        protected async Task<TermsWithContent> GetNewestTerms(Guid userId, string language)
-        {
-            return (await Cache.GetOrCreateAsync($"terms-{language}-{userId}", async e => {
-                e.AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(60);
+        return RedirectToAction("index", new { lang = language });
+    }
+
+    protected async Task<TermsWithContent> GetNewestTerms(Guid userId, string language)
+    {
+        return (await Cache.GetOrCreateAsync($"terms-{language}-{userId}", async e => {
+            e.AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(60);
 
-                return await TermsService.GetNewestTermsAsync("terms", userId.ToString(), language);
-            })).Data;
-        }
+            return await TermsService.GetNewestTermsAsync("terms", userId.ToString(), language);
+        })).Data;
     }
 }

DemoNStack/DemoNStack/DemoNStack.csproj

@@ -1,11 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NStack.SDK" Version="1.3.1" />
+    <PackageReference Include="Monstarlab.NStack.SDK" Version="1.5.1" />
   </ItemGroup>
 
 </Project>

DemoNStack/DemoNStack/Extensions/HttpRequestExtensions.cs

@@ -1,13 +1,10 @@
-using Microsoft.AspNetCore.Http;
+namespace DemoNStack.Extensions;
 
-namespace DemoNStack.Extensions
+public static class HttpRequestExtensions
 {
-    public static class HttpRequestExtensions
-    {
-        private const string DefaultLanguage = "en-GB";
+    private const string DefaultLanguage = "en-GB";
 
-        public static string GetCurrentLanguage(this HttpRequest request) => request.Query.ContainsKey("lang") ? (string)request.Query["lang"] : DefaultLanguage;
+    public static string GetCurrentLanguage(this HttpRequest request) => request.Query.ContainsKey("lang") ? (string)request.Query["lang"] : DefaultLanguage;
 
-        public static string GetLanguageDirection(this HttpRequest request) => request.GetCurrentLanguage().StartsWith("ar-QA") ? "rtl" : "ltr";
-    }
+    public static string GetLanguageDirection(this HttpRequest request) => request.GetCurrentLanguage().StartsWith("ar-QA") ? "rtl" : "ltr";
 }

DemoNStack/DemoNStack/GlobalUsings.cs

@@ -0,0 +1,12 @@
+global using DemoNStack.Extensions;
+global using DemoNStack.Models;
+global using DemoNStack.Models.ViewModels;
+global using Microsoft.AspNetCore.Mvc;
+global using Microsoft.Extensions.Caching.Memory;
+global using NStack.SDK.Extensions;
+global using NStack.SDK.Models;
+global using NStack.SDK.Repositories;
+global using NStack.SDK.Repositories.Implementation;
+global using NStack.SDK.Services;
+global using NStack.SDK.Services.Implementation;
+global using System.Diagnostics;

DemoNStack/DemoNStack/Models/DefaultSection.cs

@@ -1,19 +1,15 @@
-using NStack.SDK.Extensions;
-using NStack.SDK.Models;
+namespace DemoNStack.Models;
 
-namespace DemoNStack.Models
+public class DefaultSection : ResourceInnerItem
 {
-    public class DefaultSection : ResourceInnerItem
-    {
-        public DefaultSection() : base() { }
-        public DefaultSection(ResourceInnerItem item) : base(item) { }
+    public DefaultSection() : base() { }
+    public DefaultSection(ResourceInnerItem item) : base(item) { }
 
-        public string BoolValue => this[nameof(BoolValue).FirstCharToLower()];
-        public string BoolValueFalse => this[nameof(BoolValueFalse).FirstCharToLower()];
-        public string Html => this[nameof(Html).FirstCharToLower()];
-        public string Language => this[nameof(Language).FirstCharToLower()];
-        public string Text => this[nameof(Text).FirstCharToLower()];
-        public string FirstHeadline => this[nameof(FirstHeadline).FirstCharToLower()];
-        public string SecondHeadline => this[nameof(SecondHeadline).FirstCharToLower()];
-    }
+    public string BoolValue => this[nameof(BoolValue).FirstCharToLower()];
+    public string BoolValueFalse => this[nameof(BoolValueFalse).FirstCharToLower()];
+    public string Html => this[nameof(Html).FirstCharToLower()];
+    public string Language => this[nameof(Language).FirstCharToLower()];
+    public string Text => this[nameof(Text).FirstCharToLower()];
+    public string FirstHeadline => this[nameof(FirstHeadline).FirstCharToLower()];
+    public string SecondHeadline => this[nameof(SecondHeadline).FirstCharToLower()];
 }