Merged Development to Master

.gitignore

@@ -253,3 +253,4 @@ paket-files/
 /src/LetsDisc.Web.Mvc/App_Data/Logs/Logs.txt
 /src/LetsDisc.EntityFrameworkCore/Migrations/20180628102141_LetsDisc-v1.cs
 /src/LetsDisc.EntityFrameworkCore/Migrations/20180628102141_LetsDisc-v1.Designer.cs
+**/appsettings.json

LetsDisc.sln

@@ -19,9 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LetsDisc.Web.Host", "src\Le
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LetsDisc.Web.Core", "src\LetsDisc.Web.Core\LetsDisc.Web.Core.csproj", "{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LetsDisc.Web.Mvc", "src\LetsDisc.Web.Mvc\LetsDisc.Web.Mvc.csproj", "{A2213374-BB48-48FD-BBD4-81E6A961D866}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LetsDisc.EntityFrameworkCore", "src\LetsDisc.EntityFrameworkCore\LetsDisc.EntityFrameworkCore.csproj", "{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LetsDisc.EntityFrameworkCore", "src\LetsDisc.EntityFrameworkCore\LetsDisc.EntityFrameworkCore.csproj", "{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,10 +51,6 @@ Global
 		{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22CFE0D2-8DCA-42D7-AD7D-784C3862493F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2213374-BB48-48FD-BBD4-81E6A961D866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2213374-BB48-48FD-BBD4-81E6A961D866}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2213374-BB48-48FD-BBD4-81E6A961D866}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2213374-BB48-48FD-BBD4-81E6A961D866}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -72,7 +66,9 @@ Global
 		{880B3591-E057-46FE-B525-10BD83828B93} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
 		{38E184BD-E874-4633-A947-AED4FDB73F40} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
 		{22CFE0D2-8DCA-42D7-AD7D-784C3862493F} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
-		{A2213374-BB48-48FD-BBD4-81E6A961D866} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
 		{E0580562-F8F2-4EBB-B07A-ABFC6F2C314F} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B3A2FADE-BA3D-4AAF-BF24-5F5830504141}
+	EndGlobalSection
 EndGlobal

README.md

@@ -17,6 +17,15 @@ You should have Visual Studio 2017 Installed on your system.
 git clone https://github.com/codingdefined/LetsDisc LetsDisc
 
 Open LetsDisc Folder and run LetsDisc.sln. 
+Run the Solution to get the API information : http://localhost:21021/swagger/index.html
+In Node Terminal (LetsDisc/src/LetsDisc.Web.Host), run npm install and then npm start to run the Angular App
+
+When adding a new class (Make Sure the Default Project is src/LetsDisc.EntityFrameworkCore)
+
+1. First delete the database
+2. Run `Remove-Migration` from Package Manager Console
+3. Run `Add-Migration LetsDisc-v1` to add the latest migration
+4. Run `update-database` to update the database
 
 ### Technology Stack
 

build/build-with-ng.ps1

@@ -0,0 +1,57 @@
+# COMMON PATHS
+
+$buildFolder = (Get-Item -Path "./" -Verbose).FullName
+$slnFolder = Join-Path $buildFolder "../"
+$outputFolder = Join-Path $buildFolder "outputs"
+$webHostFolder = Join-Path $slnFolder "src/LetsDisc.Web.Host"
+$ngFolder = Join-Path $buildFolder "../../angular"
+
+## CLEAR ######################################################################
+
+Remove-Item $outputFolder -Force -Recurse -ErrorAction Ignore
+New-Item -Path $outputFolder -ItemType Directory
+
+## RESTORE NUGET PACKAGES #####################################################
+
+Set-Location $slnFolder
+dotnet restore
+
+## PUBLISH WEB HOST PROJECT ###################################################
+
+Set-Location $webHostFolder
+dotnet publish --output (Join-Path $outputFolder "Host")
+
+## PUBLISH ANGULAR UI PROJECT #################################################
+
+Set-Location $ngFolder
+& yarn
+& ng build -prod
+Copy-Item (Join-Path $ngFolder "dist") (Join-Path $outputFolder "ng") -Recurse
+Copy-Item (Join-Path $ngFolder "Dockerfile") (Join-Path $outputFolder "ng")
+
+# Change UI configuration
+$ngConfigPath = Join-Path $outputFolder "ng/assets/appconfig.json"
+(Get-Content $ngConfigPath) -replace "21021", "9901" | Set-Content $ngConfigPath
+(Get-Content $ngConfigPath) -replace "4200", "9902" | Set-Content $ngConfigPath
+
+## CREATE DOCKER IMAGES #######################################################
+
+# Host
+Set-Location (Join-Path $outputFolder "Host")
+
+docker rmi abp/host -f
+docker build -t abp/host .
+
+# Angular UI
+Set-Location (Join-Path $outputFolder "ng")
+
+docker rmi abp/ng -f
+docker build -t abp/ng .
+
+## DOCKER COMPOSE FILES #######################################################
+
+Copy-Item (Join-Path $slnFolder "docker/ng/*.*") $outputFolder
+
+## FINALIZE ###################################################################
+
+Set-Location $outputFolder

docker/ng/docker-compose.yml

@@ -0,0 +1,17 @@
+version: '2'
+
+services:
+
+    abp_host:
+        image: abp/host
+        environment:
+            - ASPNETCORE_ENVIRONMENT=Staging
+        ports:
+            - "9901:80"
+        volumes:
+            - "./Host-Logs:/app/App_Data/Logs"
+
+    abp_ng:
+        image: abp/ng
+        ports:
+            - "9902:80"

docker/ng/down.ps1

@@ -0,0 +1 @@
+docker-compose down -v --rmi local

docker/ng/up.ps1

@@ -0,0 +1 @@
+docker-compose up -d

src/LetsDisc.Application/LetsDisc.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <AssemblyName>LetsDisc.Application</AssemblyName>
     <PackageId>LetsDisc.Application</PackageId>
@@ -16,4 +16,9 @@
   <ItemGroup>
     <ProjectReference Include="..\LetsDisc.Core\LetsDisc.Core.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Mvc.Core">
+      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.aspnetcore.mvc.core\2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>

src/LetsDisc.Application/LetsDiscAppServiceBase.cs

@@ -6,6 +6,8 @@
 using Abp.Runtime.Session;
 using LetsDisc.Authorization.Users;
 using LetsDisc.MultiTenancy;
+using Microsoft.AspNetCore.Http;
+using System.Security.Claims;
 
 namespace LetsDisc
 {
@@ -23,9 +25,20 @@ protected LetsDiscAppServiceBase()
             LocalizationSourceName = LetsDiscConsts.LocalizationSourceName;
         }
 
-        protected virtual Task<User> GetCurrentUserAsync()
+        protected async virtual Task<User> GetCurrentUserAsync()
         {
-            var user = UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());
+            var user = await UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());
+            if (user == null)
+            {
+                throw new Exception("There is no current user!");
+            }
+
+            return user;
+        }
+
+        protected async virtual Task<User> GetUserByEmailAsync(string email)
+        {
+            var user = await UserManager.FindByEmailAsync(email);
             if (user == null)
             {
                 throw new Exception("There is no current user!");

src/LetsDisc.Application/Posts/Dto/AnswerWithQuestion.cs

@@ -0,0 +1,8 @@
+namespace LetsDisc.Posts.Dto
+{
+    public class AnswerWithQuestion
+    {
+        public PostDto Question { get; set; }
+        public PostDto Answer { get; set; }
+    }
+}

src/LetsDisc.Application/Posts/Dto/CreatePostDto.cs

@@ -0,0 +1,24 @@
+using Abp.AutoMapper;
+using LetsDisc.PostDetails;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace LetsDisc.Posts.Dto
+{
+    [AutoMapTo(typeof(Post))]
+    public class CreatePostDto
+    {
+        [Required]
+        public string Title { get; set; }
+        [Required]
+        public string Body { get; set; }
+        [Required]
+        public int PostTypeId { get; set; }
+
+        public int ParentId { get; set; }
+
+        public string Tags { get; set; }
+    }
+}

src/LetsDisc.Application/Posts/Dto/PostDto.cs

@@ -0,0 +1,28 @@
+using Abp.Application.Services.Dto;
+using Abp.AutoMapper;
+using Abp.Domain.Entities.Auditing;
+using LetsDisc.PostDetails;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LetsDisc.Posts.Dto
+{
+    [AutoMap(typeof(Post))]
+    public class PostDto : FullAuditedEntityDto
+    {
+        public string Title { get; set; }
+        public string Body { get; set; }
+        public int PostTypeId { get; set; }
+        public int AcceptedAnswerId { get; set; }
+        public int ParentId { get; set; }
+        public int Score { get; set; }
+        public int ViewCount { get; set; }
+        public DateTime LastActivityDate { get; set; }
+        public string Tags { get; set; }
+        public int AnswerCount { get; set; }
+        public int CommentCount { get; set; }
+        public int FavoriteCount { get; set; }
+        public string CreatorUserName { get; set; }
+    }
+}

src/LetsDisc.Application/Posts/Dto/PostWithAnswers.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LetsDisc.Posts.Dto
+{
+    public class PostWithAnswers
+    {
+        public PostWithVoteInfo Post { get; set; }
+        public List<PostWithVoteInfo> Answers { get; set; }
+    }
+}

src/LetsDisc.Application/Posts/Dto/PostWithVoteInfo.cs

@@ -0,0 +1,16 @@
+using Abp.AutoMapper;
+using LetsDisc.PostDetails;
+using LetsDisc.Votes;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LetsDisc.Posts.Dto
+{
+    public class PostWithVoteInfo
+    {
+        public PostDto Post { get; set; }
+        public bool Upvote { get; set; }
+        public bool Downvote { get; set; }
+    }
+}

src/LetsDisc.Application/Posts/Dto/SubmitAnswerInput.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace LetsDisc.Posts.Dto
+{
+    public class SubmitAnswerInput
+        {
+            [Range(1, int.MaxValue)]
+            public int QuestionId { get; set; }
+
+            [Required]
+            public string Body { get; set; }
+
+            [Required]
+            public string Title { get; set; }
+    }
+}

src/LetsDisc.Application/Posts/Dto/VoteChangeOutput.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LetsDisc.Posts.Dto
+{
+    public class VoteChangeOutput
+    {
+        public int VoteCount { get; set; }
+        public bool UpVote { get; set; }
+        public bool DownVote { get; set; }
+        public int PostTypeId { get; set; }
+        public int PostId { get; set; }
+
+        public VoteChangeOutput()
+        {
+        }
+    }
+}

src/LetsDisc.Application/Posts/IPostAppService.cs

@@ -0,0 +1,21 @@
+using Abp.Application.Services;
+using Abp.Application.Services.Dto;
+using LetsDisc.Posts.Dto;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LetsDisc.Posts
+{ 
+    public interface IPostAppService : IAsyncCrudAppService<PostDto, int, PagedAndSortedResultRequestDto, CreatePostDto, PostDto>
+    {
+        Task<PagedResultDto<PostDto>> GetQuestions(PagedAndSortedResultRequestDto input, string tag);
+        Task<PostWithAnswers> GetPost(int id);
+        Task<VoteChangeOutput> PostVoteUp(int id);
+        Task<VoteChangeOutput> PostVoteDown(int id);
+        Task<PostWithVoteInfo> SubmitAnswer(SubmitAnswerInput input);
+        Task<PostWithAnswers> UpdateQuestion(PostDto input);
+    }
+}