diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
new file mode 100644
index 00000000..217f7cbe
--- /dev/null
+++ b/.github/workflows/dotnet.yml
@@ -0,0 +1,28 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET
+
+on:
+ push:
+ branches: [ "main" ]
+ pull_request:
+ branches: [ "main" ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v4
+ with:
+ dotnet-version: 8.0.x
+ - name: Restore dependencies
+ run: dotnet restore
+ - name: Build
+ run: dotnet build --no-restore
+ - name: Test
+ run: dotnet test --no-build --verbosity normal
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 71badf6b..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# Please find the full example project here:
-# https://gitlab.com/tobiaskoch/gitlab-ci-example-mono
-
-# see https://hub.docker.com/_/mono/
-image: mono:4.6.2.7
-
-stages:
- - build
- - test
- - deploy
-
-before_script:
- - . /opt/mono-4.6/mono-env
- - export GIT_SSL_NO_VERIFY=true
- - curl --insecure -sSL https://lua.pschneider.fr/files/Paul/pub/dnx-install.sh | bash
- - DNX_USER_HOME=`pwd -P`/dnx . ./dnx/dnvm/dnvm.sh
- - cd src/OAuth.AspNet.Token && dnu restore --ignore-failed-sources
- - cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
- - cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
- - cd ../Yavsc.Server && dnu restore --ignore-failed-sources
- - cd ../Yavsc && dnu restore --ignore-failed-sources
- - cd ../cli && dnu restore --ignore-failed-sources
- - cd ../../test/yavscTests && dnu restore --ignore-failed-sources
- - cd ../..
-
-after_script:
-
-debug:
- stage: build
- artifacts:
- paths:
- - test/yavscTests/bin
- script:
- - cd test/yavscTests
- - dnu build
-
-non_reg:
- stage: test
- artifacts:
- paths:
- - test/yavscTests/test-results.xml
- when: always
- script:
- - cd test/yavscTests
- - cp $yavsc_client_secret_json yavsc-client-secret.json
- - ASPNET_ENV=Development dnx test -trait ategory=non_reg -maxthreads 1 -xml test-results.xml
-
-release:
- stage: deploy
- only:
- - vnext
- artifacts:
- paths:
- - binaries/Debug
- script:
- - make packages
-
-deploy_staging:
- stage: deploy
- script:
- - echo "Deploy to staging server"
- - make strip_yavscd
- - make packages
- - isn push -s $ISNSOURCE -k $NUGETSOURCEAPIKEY src/Yavsc.Abstract/bin/*/*.nupkg
- environment:
- name: staging
- url: https://yavscpre.pschneider.fr
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
deleted file mode 100644
index 3082130d..00000000
--- a/.nuget/NuGet.Config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.nuget/packages.config b/.nuget/packages.config
deleted file mode 100644
index eaeeed58..00000000
--- a/.nuget/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2a523d6b..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: csharp
-os: linux
-mono:
-- beta
-sudo: false
-install:
-- curl --insecure -sSL https://lua.pschneider.fr/files/Paul/pub/dnx-install.sh | bash
-- DNX_USER_HOME=`pwd -P`/dnx . ./dnx/dnvm/dnvm.sh
-- cd src/OAuth.AspNet.Token && dnu restore --ignore-failed-sources
-- cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
-- cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
-- cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-- cd ../Yavsc && dnu restore --ignore-failed-sources
-- cd ../test
-- make restore
-- make
-- cd ../..
-- make
-
-script:
-- "dnu build"
-
diff --git a/global.json b/global.json
index 952b7d76..030b02f6 100644
--- a/global.json
+++ b/global.json
@@ -1,12 +1,6 @@
{
- "projects": [
- "src",
- "scripts",
- "tests"
- ],
"sdk": {
"runtime": "dotnet",
- "architecture": "x64"
- },
- "packages": "packages"
+ "version": "8.0.405"
+ }
}
diff --git a/omnisharp.json b/omnisharp.json
deleted file mode 100644
index 5df81efa..00000000
--- a/omnisharp.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "dotnet": {
- "enabled": false
- },
- "msbuild": {
- "enabled": true
- },
- "Dnx": {
- "enabled": false
- },
- "Script": {
- "enabled": false
- },
- "fileOptions": {
- "systemExcludeSearchPatterns": [
- "**/bin/**/*",
- "**/obj/**/*",
- "**/node_modules/**/*"
- ],
- "userExcludeSearchPatterns": []
- }
-}
diff --git a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Create.cshtml b/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Create.cshtml
deleted file mode 100644
index d212ba9f..00000000
--- a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Create.cshtml
+++ /dev/null
@@ -1,145 +0,0 @@
-@inherits Microsoft.Extensions.CodeGeneration.Templating.RazorTemplateBase
-@using Microsoft.Extensions.CodeGeneration.EntityFramework
-@@model @Model.ViewDataTypeName
-
-@{
- if (Model.IsPartialView)
- {
- }
- else if (Model.IsLayoutPageSelected)
- {
-@:@@{
- @:ViewData["Title"] = @@Model.ViewName;
- if (!string.IsNullOrEmpty(Model.LayoutPageFile))
- {
- @:Layout = "@Model.LayoutPageFile";
- }
-@:}
-@:
-@:
@@Model.ViewName
-@:
- }
- else
- {
-@:@@{
- @:Layout = "null";
-@:}
-@:
-@:
-@:
-@:
-@:
- @:
- @:@Model.ViewName
-@:
-@:
-@:
- // PushIndent(" ");
- }
-@:
-
-
-
-@{
- if (Model.ReferenceScriptLibraries && (Model.IsLayoutPageSelected || Model.IsPartialView))
- {
-@:@@section Scripts {
- @:
- @:
- @:
-@:}
- }
- // The following code closes the tag used in the case of a view using a layout page and the body and html tags in the case of a regular view page
- if (!Model.IsPartialView && !Model.IsLayoutPageSelected)
- {
- if (Model.ReferenceScriptLibraries)
- {
-@:@@section Scripts {
- @:
- @:
- @:
-@:}
- //ClearIndent();
- }
-@:
-@:
- }
-}
-@functions
-{
- // Do we need to use this in conjunction with the PrimaryKey check?
- bool IsPropertyGuid(PropertyMetadata property)
- {
- return string.Equals("System.Guid", property.TypeName, StringComparison.OrdinalIgnoreCase);
- }
-}
diff --git a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Delete.cshtml b/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Delete.cshtml
deleted file mode 100644
index 1c2dab35..00000000
--- a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Delete.cshtml
+++ /dev/null
@@ -1,81 +0,0 @@
-@inherits Microsoft.Extensions.CodeGeneration.Templating.RazorTemplateBase
-@using Microsoft.Extensions.CodeGeneration.EntityFramework
-@@model @Model.ViewDataTypeName
-
-@{
- if (Model.IsPartialView)
- {
- }
- else if (Model.IsLayoutPageSelected)
- {
-@:@@{
- @:ViewData["Title"] = @@Model.ViewName;
- if (!string.IsNullOrEmpty(Model.LayoutPageFile))
- {
- @:Layout = "@Model.LayoutPageFile";
- }
-@:}
-@:
-@:@@Model.ViewName
-@:
- }
- else
- {
-@:@@{
- @:Layout = "null";
-@:}
-@:
-@:
-@:
-@:
-@:
- @:
- @:@@@Model.ViewName
-@:
-@:
-@:
- // PushIndent(" ");
- }
-}
-@AreYourSureYouWantToDeleteThis
-
-
@@@Model.ViewDataTypeShortName
-
-
-@{
- foreach (var property in Model.ModelMetadata.Properties)
- {
- if (property.Scaffold && !property.IsPrimaryKey && !property.IsForeignKey)
- {
- -
- @@Html.DisplayNameFor(model => model.@GetValueExpression(property))
-
- -
- @@Html.DisplayFor(model => model.@GetValueExpression(property))
-
- }
- }
- @:
- @:
- @:
-@:
- if (!Model.IsPartialView && !Model.IsLayoutPageSelected)
- {
- //ClearIndent();
-@:
-@:
- }
-}
-@functions
-{
- string GetValueExpression(PropertyMetadata property)
- {
- //Todo: Get the association for the property and use that.
- return property.PropertyName;
- }
-}
diff --git a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Details.cshtml b/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Details.cshtml
deleted file mode 100644
index 87e0bc5c..00000000
--- a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Details.cshtml
+++ /dev/null
@@ -1,95 +0,0 @@
-@inherits Microsoft.Extensions.CodeGeneration.Templating.RazorTemplateBase
-@using Microsoft.Extensions.CodeGeneration.EntityFramework
-@@model @Model.ViewDataTypeName
-
-@{
- if (Model.IsPartialView)
- {
- }
- else if (Model.IsLayoutPageSelected)
- {
-@:@@{
- @:ViewData["Title"] = @@Model.ViewName;
- if (!string.IsNullOrEmpty(Model.LayoutPageFile))
- {
- @:Layout = "@Model.LayoutPageFile";
- }
-@:}
-@:
-@:@@Model.ViewName
-@:
- }
- else
- {
-@:@@{
- @:Layout = "null";
-@:}
-@:
-@:
-@:
-@:
-@:
- @:
- @:@Model.ViewName
-@:
-@:
-@:
- // PushIndent(" ");
- }
-}
-
-
@Model.ViewDataTypeShortName
-
-
-@{
- foreach (var property in Model.ModelMetadata.Properties)
- {
- if (property.Scaffold && !property.IsPrimaryKey && !property.IsForeignKey)
- {
- -
- @@Html.DisplayNameFor(model => model.@GetValueExpression(property))
-
- -
- @@Html.DisplayFor(model => model.@GetValueExpression(property))
-
- }
- }
-}
-
-
-@{
- string pkName = GetPrimaryKeyName();
- if (pkName != null)
- {
- @:@Edit |
- @:Back to List
- }
- else
- {
- @:@@Html.ActionLink(@Edit, "Edit", new { /* id = Model.PrimaryKey */ }) |
- @:Back to List
- }
-}
-@{
- if (!Model.IsPartialView && !Model.IsLayoutPageSelected)
- {
- //ClearIndent();
-@:
-@:
- }
-}
-@functions
-{
- string GetPrimaryKeyName()
- {
- return (Model.ModelMetadata.PrimaryKeys != null && Model.ModelMetadata.PrimaryKeys.Length == 1)
- ? Model.ModelMetadata.PrimaryKeys[0].PropertyName
- : null;
- }
-
- string GetValueExpression(PropertyMetadata property)
- {
- //Todo: Get the association for the property and use that.
- return property.PropertyName;
- }
-}
diff --git a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Edit.cshtml b/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Edit.cshtml
deleted file mode 100644
index 6437586f..00000000
--- a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/Edit.cshtml
+++ /dev/null
@@ -1,149 +0,0 @@
-@inherits Microsoft.Extensions.CodeGeneration.Templating.RazorTemplateBase
-@using Microsoft.Extensions.CodeGeneration.EntityFramework
-@@model @Model.ViewDataTypeName
-
-@{
- if (Model.IsPartialView)
- {
- }
- else if (Model.IsLayoutPageSelected)
- {
-@:@@{
- @:ViewData["Title"] = @@Model.ViewName;
- if (!string.IsNullOrEmpty(Model.LayoutPageFile))
- {
- @:Layout = "@Model.LayoutPageFile";
- }
-@:}
-@:
-@:@@Model.ViewName
-@:
- }
- else
- {
-@:@@{
- @:Layout = "null";
-@:}
-@:
-@:
-@:
-@:
-@:
- @:
- @:@@Model.ViewName
-@:
-@:
-@:
- // PushIndent(" ");
- }
-@:
-
-
-
-@{
- if (Model.ReferenceScriptLibraries && (Model.IsLayoutPageSelected || Model.IsPartialView))
- {
-@:@@section Scripts {
- @:
- @:
- @:
-@:}
- }
- // The following code closes the tag used in the case of a view using a layout page and the body and html tags in the case of a regular view page
- if (!Model.IsPartialView && !Model.IsLayoutPageSelected)
- {
- if (Model.ReferenceScriptLibraries)
- {
-@:@@section Scripts {
- @:
- @:
- @:
-@:}
- //ClearIndent();
- }
-@:
-@:
- }
-}
-@functions
-{
- string GetAssociationName(PropertyMetadata property)
- {
- //Todo: Implement properly.
- return property.PropertyName;
- }
-}
diff --git a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/List.cshtml b/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/List.cshtml
deleted file mode 100644
index a2e66ae2..00000000
--- a/scripts/configure/tools/mvc-code-generators/new-templates/ViewGenerator/List.cshtml
+++ /dev/null
@@ -1,115 +0,0 @@
-@inherits Microsoft.Extensions.CodeGeneration.Templating.RazorTemplateBase
-@using Microsoft.Extensions.CodeGeneration.EntityFramework
-@@model @GetEnumerableTypeExpression(Model.ViewDataTypeName)
-
-@{
- if (Model.IsPartialView)
- {
- }
- else if (Model.IsLayoutPageSelected)
- {
-@:@@{
- @:ViewData["Title"] = @@Model.ViewName;
- if (!string.IsNullOrEmpty(Model.LayoutPageFile))
- {
- @:Layout = "@Model.LayoutPageFile";
- }
-@:}
-@:
-@:@@Model.ViewName
-@:
- }
- else
- {
-@:@@{
- @:Layout = "null";
-@:}
-@:
-@:
-@:
-@:
-@:
- @:
- @:@@Model.ViewName
-@:
-@:
- // PushIndent(" ");
- }
-@:
- @:Create New
-@:
-@:
- @:
- IEnumerable properties = Model.ModelMetadata.Properties;
- foreach (var property in properties)
- {
- if (property.Scaffold && !property.IsPrimaryKey && !property.IsForeignKey)
- {
-
- @@Html.DisplayNameFor(model => model.@GetValueExpression(property))
- |
- }
- }
- @: |
- @:
- @:
-@:@@foreach (var item in Model) {
- @:
- foreach (PropertyMetadata property in properties)
- {
- if (property.Scaffold && !property.IsPrimaryKey && !property.IsForeignKey)
- {
-
- @@Html.DisplayFor(modelItem => item.@GetValueExpression(property))
- |
- }
- }
-
- string pkName = GetPrimaryKeyName();
- if (pkName != null)
- {
- @:
- @:@Edit |
- @:@Details |
- @:@Delete
- @: |
- }
- else
- {
-
- @@Html.ActionLink("Edit", "Edit",new { /* id=item.PrimaryKey */ }) |
- @@Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) |
- @@Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ })
- |
- }
- @:
-@:}
-
-@:
- if(!Model.IsPartialView && !Model.IsLayoutPageSelected)
- {
- //ClearIndent();
-@:
-@:
- }
-}
-@functions
-{
- string GetPrimaryKeyName()
- {
- return (Model.ModelMetadata.PrimaryKeys != null && Model.ModelMetadata.PrimaryKeys.Length == 1)
- ? Model.ModelMetadata.PrimaryKeys[0].PropertyName
- : null;
- }
-
- string GetValueExpression(PropertyMetadata property)
- {
- //Todo: Get the association for the property and use that.
- return property.PropertyName;
- }
-
- string GetEnumerableTypeExpression(string typeName)
- {
- return "IEnumerable<" + typeName + ">";
- }
-}
diff --git a/scripts/make/Makefile b/scripts/make/Makefile
deleted file mode 100644
index 76584c73..00000000
--- a/scripts/make/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-include versioning.mk
-
-
-REPO_ROOT=../../../src
-
-SUBDIRS=Yavsc Yavsc.Server Yavsc.Abstract OAuth.AspNet.AuthServer OAuth.AspNet.Token cli test
-
-all: $(SUBDIRS)
-
-Yavsc.Abstract:
- $(MAKE) -C $(REPO_ROOT)/Yavsc.Abstract VERSION=$(VERSION)
-
-OAuth.AspNet.Token:
- $(MAKE) -C $(REPO_ROOT)/OAuth.AspNet.Token VERSION=$(VERSION)
-
-OAuth.AspNet.AuthServer: OAuth.AspNet.Token
- $(MAKE) -C $(REPO_ROOT)/OAuth.AspNet.AuthServer VERSION=$(VERSION)
-
-Yavsc.Server: Yavsc.Abstract
- $(MAKE) -C $(REPO_ROOT)/Yavsc.Server VERSION=$(VERSION)
-
-Yavsc: Yavsc.Server OAuth.AspNet.AuthServer OAuth.AspNet.Token
- make -C $(REPO_ROOT)/Yavsc VERSION=$(VERSION)
-
-Yavsc-deploy-pkg: Yavsc
- make -C $(REPO_ROOT)/Yavsc deploy-pkg
-
-Yavsc.Server-deploy-pkg: Yavsc.Server
- make -C $(REPO_ROOT)/Yavsc.Server deploy-pkg
-
-Yavsc.Abstract-deploy-pkg: Yavsc.Abstract
- make -C $(REPO_ROOT)/Yavsc.Abstract deploy-pkg
-
-cli-deploy-pkg: cli check
- make -C $(REPO_ROOT)/cli deploy-pkg
-
-cli: Yavsc-deploy-pkg Yavsc.Server-deploy-pkg Yavsc.Abstract-deploy-pkg
- make -C $(REPO_ROOT)/cli
-
-undoLocalYavscNugetDeploy:
- rm -rf ../../../packages/Yavsc.Abstract
- rm -rf ../../../packages/Yavsc.Server
- rm -rf ../../../packages/Yavsc
- rm -rf ~/.dnx/packages/Yavsc.Abstract
- rm -rf ~/.dnx/packages/Yavsc.Server
- rm -rf ~/.dnx/packages/Yavsc
-
-check: cli
- make -C $(REPO_ROOT)/cli check
- make -C $(REPO_ROOT)/test
-
-test:
- make -C $(REPO_ROOT)/test
-
-pushInPre:
- make -C $(REPO_ROOT)/Yavsc pushInPre
-
-pushInProd:
- make -C $(REPO_ROOT)/Yavsc pushInProd
-
-deploy-pkgs: Yavsc-deploy-pkg Yavsc.Server-deploy-pkg Yavsc.Abstract-deploy-pkg cli-deploy-pkg
-
-memo:
- vim ~/TODO.md
-
-rc-num:
- @echo echo 1-alpha1 < $< ^ $^ @ $@
-
-clean:
- for subdir in $(SUBDIRS) ; do \
- make -C $(REPO_ROOT)/$${subdir} clean ; \
- done
-
-watch:
- make -C $(REPO_ROOT)/Yavsc watch
-
-.PHONY: all $(SUBDIRS)
-
diff --git a/scripts/make/dnx.mk b/scripts/make/dnx.mk
deleted file mode 100644
index 9a5a8a58..00000000
--- a/scripts/make/dnx.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-# Common defs
-#
-
-ifndef PRJNAME
-PRJNAME := $(shell basename `pwd -P`)
-endif
-FRAMEWORK=dnx451
-ASPNET_ENV=Development
-ASPNET_LOG_LEVEL=Debug
-HOSTING=localhost
-HOSTADMIN=root
-FRAMEWORKALIAS=dnx451
-# nuget package destination, at generation time
-BINTARGET=$(PRJNAME).dll
-BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
-PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
-dnu=dnu
-
-# OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
-#
-
-# Git commit hash, in order to not publish some uncrontrolled code in production environment
-#
-
-git_status := $(shell git status -s --porcelain |wc -l)
-
-all: $(BINTARGETPATH)
-
-fixSystemXML:
- @# fixing package id reference case, to System.Xml, from package NJsonSchema.CodeGeneration.CSharp
- @sed 's/System.XML/System.Xml/' project.lock.json > project.lock.json.new && mv project.lock.json.new project.lock.json
-
-restore:
- touch project.json
- $(dnu) restore --ignore-failed-sources
-
-project.lock.json: project.json
- $(dnu) restore --ignore-failed-sources
-
-watch: project.lock.json
- MONO_OPTIONS=--debug MONO_MANAGED_WATCHER=enabled ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION)
-
-clean:
- rm -rf bin obj
- rm project.lock.json
-
-cleanoutput:
- rm -rf bin/$(CONFIGURATION)
- rm -rf bin/output
-
-$(BINTARGETPATH): project.lock.json rc-num.txt-check
- $(dnu) build --configuration=$(CONFIGURATION)
-
-# Default target, from one level sub dirs
-
-bin/output:
- $(dnu) publish
-
-bin/output/wwwroot/version: bin/output
- @echo $(version) > bin/output/wwwroot/version
-
-pack: $(BINTARGETPATH) ../../version.txt
- dnu pack --configuration $(CONFIGURATION)
-
-push: pack
- @echo push to source: $(ISNSOURCE)
- isn push -s $(ISNSOURCE) -k $(NUGETSOURCEAPIKEY) src/$(PRJNAME)/bin/$(CONFIGURATION)/$(PRJNAME).*.nupkg
-
-.PHONY: rc-num.txt-check
-
-# .DEFAULT_GOAL := $(BINTARGETPATH)
diff --git a/scripts/make/msbuild.mk b/scripts/make/msbuild.mk
deleted file mode 100644
index d6d260f8..00000000
--- a/scripts/make/msbuild.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-MSBUILD=msbuild
-MONO=mono
-CONFIGURATION=Debug
-BINTYPE=exe
-PRJNAME := $(shell basename `pwd -P`)
-
-rc_num := $(shell cat ../../rc-num.txt)
-VERSION=1.0.5-rc$(rc_num)
-
-BINTARGET=$(PRJNAME).$(BINTYPE)
-BINTARGETPATH=bin/$(CONFIGURATION)/$(BINTARGET)
-ISNSOURCE=$(HOME)/Nupkgs
-PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
-
diff --git a/scripts/make/versioning.mk b/scripts/make/versioning.mk
deleted file mode 100644
index 2adc45d2..00000000
--- a/scripts/make/versioning.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-
-ifndef PRJNAME
-PRJNAME := $(shell basename `pwd -P`)
-endif
-version := $(shell cat ../../version.txt)
-MAKE=make
-ISNSOURCE=$(HOME)/Nupkgs
-VERSION=$(version)
-CONFIGURATION=Debug
-
-version-check:
-ifndef version
- @echo no version number specification ... please, could you try and run 'echo 1.2.3 > ../../version.txt' ?.
-else
- @echo 'Got version number : $(version)'
-endif
diff --git a/scripts/version.sh b/scripts/version.sh
deleted file mode 100755
index f6e09210..00000000
--- a/scripts/version.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-version="$1"
-major=0
-minor=0
-build=0
-
-# break down the version number into it's components
-regex="([0-9]+).([0-9]+).([0-9]+)((-[A-Za-z]+)([0-9]+))?"
-if [[ $version =~ $regex ]]; then
- major="${BASH_REMATCH[1]}"
- minor="${BASH_REMATCH[2]}"
- build="${BASH_REMATCH[3]}"
- patchtype="${BASH_REMATCH[5]}"
- patchnum="${BASH_REMATCH[6]}"
-fi
-
-# check paramater to see which number to increment
-if [[ "$2" == "feature" ]]; then
- minor=$(echo $minor + 1 | bc)
- build=0
- patchtype=
- patchnum=
-elif [[ "$2" == "build" ]]; then
- build=$(echo $build + 1 | bc)
- patchtype=
- patchnum=
-elif [[ "$2" == "major" ]]; then
- major=$(echo $major+1 | bc)
- minor=0
- build=0
- patchtype=
- patchnum=
-elif [[ "$2" == "patch" ]]; then
- patchnum=$(echo $patchnum + 1 | bc)
-else
- echo "usage: ./version.sh version_number [major/feature/build/patch]" >&2
-
- exit -1
-fi
-
-# echo the new version number
-echo "${major}.${minor}.${build}${patchtype}${patchnum}"
-
diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
new file mode 100644
index 00000000..6e024e9b
--- /dev/null
+++ b/src/Api/Api.csproj
@@ -0,0 +1,12 @@
+
+
+ net8.0
+ enable
+ enable
+ 1c73094f-959f-4211-b1a1-6a69b236c283
+
+
+
+
+
+
diff --git a/src/Yavsc/ApiControllers/Blogspot/BlogApiController.cs b/src/Api/Controllers/Blogspot/BlogApiController.cs
similarity index 91%
rename from src/Yavsc/ApiControllers/Blogspot/BlogApiController.cs
rename to src/Api/Controllers/Blogspot/BlogApiController.cs
index 6df54178..66389352 100644
--- a/src/Yavsc/ApiControllers/Blogspot/BlogApiController.cs
+++ b/src/Api/Controllers/Blogspot/BlogApiController.cs
@@ -27,7 +27,7 @@ namespace Yavsc.Controllers
[HttpGet]
public IEnumerable GetBlogspot()
{
- return _context.Blogspot.Where(b => b.Visible).OrderByDescending(b => b.UserModified);
+ return _context.BlogSpot.Where(b => b.Visible).OrderByDescending(b => b.UserModified);
}
// GET: api/BlogApi/5
@@ -39,7 +39,7 @@ namespace Yavsc.Controllers
return BadRequest(ModelState);
}
- BlogPost blog = _context.Blogspot.Single(m => m.Id == id);
+ BlogPost blog = _context.BlogSpot.Single(m => m.Id == id);
if (blog == null)
{
@@ -93,7 +93,7 @@ namespace Yavsc.Controllers
return BadRequest(ModelState);
}
- _context.Blogspot.Add(blog);
+ _context.BlogSpot.Add(blog);
try
{
_context.SaveChanges(User.GetUserId());
@@ -122,13 +122,13 @@ namespace Yavsc.Controllers
return BadRequest(ModelState);
}
- BlogPost blog = _context.Blogspot.Single(m => m.Id == id);
+ BlogPost blog = _context.BlogSpot.Single(m => m.Id == id);
if (blog == null)
{
return NotFound();
}
- _context.Blogspot.Remove(blog);
+ _context.BlogSpot.Remove(blog);
_context.SaveChanges(User.GetUserId());
return Ok(blog);
@@ -145,7 +145,7 @@ namespace Yavsc.Controllers
private bool BlogExists(long id)
{
- return _context.Blogspot.Count(e => e.Id == id) > 0;
+ return _context.BlogSpot.Count(e => e.Id == id) > 0;
}
}
}
diff --git a/src/Yavsc/ApiControllers/Blogspot/BlogTagsApiController.cs b/src/Api/Controllers/Blogspot/BlogTagsApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Blogspot/BlogTagsApiController.cs
rename to src/Api/Controllers/Blogspot/BlogTagsApiController.cs
diff --git a/src/Yavsc/ApiControllers/Blogspot/CommentsApiController.cs b/src/Api/Controllers/Blogspot/CommentsApiController.cs
similarity index 58%
rename from src/Yavsc/ApiControllers/Blogspot/CommentsApiController.cs
rename to src/Api/Controllers/Blogspot/CommentsApiController.cs
index 879f0b43..41cdd95c 100644
--- a/src/Yavsc/ApiControllers/Blogspot/CommentsApiController.cs
+++ b/src/Api/Controllers/Blogspot/CommentsApiController.cs
@@ -1,12 +1,15 @@
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
using Yavsc.Helpers;
using Yavsc.Models;
using Yavsc.Models.Blog;
namespace Yavsc.Controllers
{
+ [Authorize]
[Produces("application/json")]
[Route("api/blogcomments")]
public class CommentsApiController : Controller
@@ -18,14 +21,6 @@ namespace Yavsc.Controllers
_context = context;
}
- // GET: api/CommentsApi
- [HttpGet]
- public IEnumerable GetComment()
- {
- return _context.Comment;
- }
-
- // GET: api/CommentsApi/5
[HttpGet("{id}", Name = "GetComment")]
public async Task GetComment([FromRoute] long id)
{
@@ -43,65 +38,46 @@ namespace Yavsc.Controllers
return Ok(comment);
}
-
- // PUT: api/CommentsApi/5
- [HttpPut("{id}")]
- public async Task PutComment([FromRoute] long id, [FromBody] Comment comment)
- {
- if (!ModelState.IsValid)
- {
- return BadRequest(ModelState);
- }
-
- if (id != comment.Id)
- {
- return BadRequest();
- }
-
- _context.Entry(comment).State = EntityState.Modified;
-
- try
- {
- await _context.SaveChangesAsync(User.GetUserId());
- }
- catch (DbUpdateConcurrencyException)
- {
- if (!CommentExists(id))
- {
- return NotFound();
- }
- else
- {
- throw;
- }
- }
-
- return new StatusCodeResult(StatusCodes.Status204NoContent);
- }
-
- // POST: api/CommentsApi
[HttpPost]
- public async Task PostComment([FromBody] Comment comment)
+ public async Task Post([FromBody] CommentPost post)
{
if (!ModelState.IsValid)
{
return new BadRequestObjectResult(ModelState);
}
- if (!User.IsInRole(Constants.AdminGroupName))
+ var article = await _context.BlogSpot.FirstOrDefaultAsync
+ (p=> p.Id == post.ReceiverId);
+
+ if (article==null) {
+ ModelState.AddModelError("ReceiverId", "not found");
+ return BadRequest(ModelState);
+ }
+ if (post.ParentId!=null)
{
- if (User.GetUserId()!=comment.AuthorId) {
- ModelState.AddModelError("Content","Vous ne pouvez pas poster au nom d'un autre.");
- return new BadRequestObjectResult(ModelState);
+ var parentExists = _context.Comment.Any(c => c.Id == post.ParentId);
+ if (!parentExists)
+ {
+ ModelState.AddModelError("ParentId", "not found");
+ return BadRequest(ModelState);
}
}
- _context.Comment.Add(comment);
+ string uid = User.GetUserId();
+ Comment c = new Comment{
+ ReceiverId = post.ReceiverId,
+ Content = post.Content,
+ ParentId = post.ParentId,
+ AuthorId = uid,
+ UserModified = uid
+ };
+
+ _context.Comment.Add(c);
try
{
- await _context.SaveChangesAsync(User.GetUserId());
+ await _context.SaveChangesAsync(uid);
}
catch (DbUpdateException)
{
- if (CommentExists(comment.Id))
+ if (CommentExists(c.Id))
{
return new StatusCodeResult(StatusCodes.Status409Conflict);
}
@@ -110,12 +86,12 @@ namespace Yavsc.Controllers
throw;
}
}
- return CreatedAtRoute("GetComment", new { id = comment.Id }, comment);
+ return CreatedAtRoute("GetComment", new { id = c.Id }, new { id = c.Id, dateCreated = c.DateCreated });
}
// DELETE: api/CommentsApi/5
[HttpDelete("{id}")]
- public async Task DeleteComment([FromRoute] long id)
+ public async Task Delete([FromRoute] long id)
{
if (!ModelState.IsValid)
{
@@ -135,7 +111,8 @@ namespace Yavsc.Controllers
}
private void RemoveRecursive (Comment comment)
{
- var children = _context.Comment.Where(c=>c.ParentId==comment.Id).ToList();
+ var children = _context.Comment.Where
+ (c=>c.ParentId==comment.Id).ToList();
foreach (var child in children) {
RemoveRecursive(child);
}
diff --git a/src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs b/src/Api/Controllers/Blogspot/FileSystemApiController.cs
similarity index 99%
rename from src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs
rename to src/Api/Controllers/Blogspot/FileSystemApiController.cs
index 5a7f2251..2dc63d59 100644
--- a/src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs
+++ b/src/Api/Controllers/Blogspot/FileSystemApiController.cs
@@ -9,11 +9,13 @@ namespace Yavsc.ApiControllers
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Yavsc.Helpers;
- using Yavsc.Exceptions;
using Yavsc.Models.FileSystem;
using System.ComponentModel.DataAnnotations;
using Yavsc.Attributes.Validation;
using System.IO;
+ using Yavsc.Exceptions;
+ using Yavsc.Server.Helpers;
+ using Yavsc.Abstract.Helpers;
[Authorize,Route("api/fs")]
public partial class FileSystemApiController : Controller
diff --git a/src/Yavsc/ApiControllers/Blogspot/FileSystemStream.cs b/src/Api/Controllers/Blogspot/FileSystemStream.cs
similarity index 99%
rename from src/Yavsc/ApiControllers/Blogspot/FileSystemStream.cs
rename to src/Api/Controllers/Blogspot/FileSystemStream.cs
index af80fe7d..e6b3c159 100644
--- a/src/Yavsc/ApiControllers/Blogspot/FileSystemStream.cs
+++ b/src/Api/Controllers/Blogspot/FileSystemStream.cs
@@ -8,6 +8,7 @@ using Yavsc.Models;
using Yavsc.Models.Messaging;
using Yavsc.Services;
using Microsoft.AspNetCore.SignalR;
+using Yavsc.Server.Helpers;
namespace Yavsc.ApiControllers
{
diff --git a/src/Yavsc/ApiControllers/Blogspot/MoveFileQuery.cs b/src/Api/Controllers/Blogspot/MoveFileQuery.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Blogspot/MoveFileQuery.cs
rename to src/Api/Controllers/Blogspot/MoveFileQuery.cs
diff --git a/src/Yavsc/ApiControllers/Blogspot/PostTagsApiController.cs b/src/Api/Controllers/Blogspot/PostTagsApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Blogspot/PostTagsApiController.cs
rename to src/Api/Controllers/Blogspot/PostTagsApiController.cs
diff --git a/src/Yavsc/ApiControllers/Blogspot/TagsApiController.cs b/src/Api/Controllers/Blogspot/TagsApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Blogspot/TagsApiController.cs
rename to src/Api/Controllers/Blogspot/TagsApiController.cs
diff --git a/src/Yavsc/ApiControllers/Blogspot/TestApiController.cs b/src/Api/Controllers/Blogspot/TestApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Blogspot/TestApiController.cs
rename to src/Api/Controllers/Blogspot/TestApiController.cs
diff --git a/src/Yavsc/ApiControllers/Business/ActivityApiController.cs b/src/Api/Controllers/Business/ActivityApiController.cs
similarity index 99%
rename from src/Yavsc/ApiControllers/Business/ActivityApiController.cs
rename to src/Api/Controllers/Business/ActivityApiController.cs
index c661857a..709fab7a 100644
--- a/src/Yavsc/ApiControllers/Business/ActivityApiController.cs
+++ b/src/Api/Controllers/Business/ActivityApiController.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
-using Yavsc.Helpers;
+using Yavsc.Api.Helpers;
using Yavsc.Models;
using Yavsc.Models.Workflow;
diff --git a/src/Yavsc/ApiControllers/Business/BillingController.cs b/src/Api/Controllers/Business/BillingController.cs
similarity index 99%
rename from src/Yavsc/ApiControllers/Business/BillingController.cs
rename to src/Api/Controllers/Business/BillingController.cs
index 2a27f418..5ab4a332 100644
--- a/src/Yavsc/ApiControllers/Business/BillingController.cs
+++ b/src/Api/Controllers/Business/BillingController.cs
@@ -12,9 +12,10 @@ namespace Yavsc.ApiControllers
using Services;
using Models.Messaging;
- using ViewModels.Auth;
using Microsoft.Extensions.Options;
using Microsoft.EntityFrameworkCore;
+ using Yavsc.ViewModels.Auth;
+ using Yavsc.Server.Helpers;
[Route("api/bill"), Authorize]
public class BillingController : Controller
diff --git a/src/Yavsc/ApiControllers/Business/BookQueryApiController.cs b/src/Api/Controllers/Business/BookQueryApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Business/BookQueryApiController.cs
rename to src/Api/Controllers/Business/BookQueryApiController.cs
diff --git a/src/Yavsc/ApiControllers/Business/EstimateApiController.cs b/src/Api/Controllers/Business/EstimateApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Business/EstimateApiController.cs
rename to src/Api/Controllers/Business/EstimateApiController.cs
diff --git a/src/Yavsc/ApiControllers/Business/EstimateTemplatesApiController.cs b/src/Api/Controllers/Business/EstimateTemplatesApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Business/EstimateTemplatesApiController.cs
rename to src/Api/Controllers/Business/EstimateTemplatesApiController.cs
diff --git a/src/Yavsc/ApiControllers/Business/FrontOfficeApiController.cs b/src/Api/Controllers/Business/FrontOfficeApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Business/FrontOfficeApiController.cs
rename to src/Api/Controllers/Business/FrontOfficeApiController.cs
diff --git a/src/Yavsc/ApiControllers/Business/PaymentApiController.cs b/src/Api/Controllers/Business/PaymentApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Business/PaymentApiController.cs
rename to src/Api/Controllers/Business/PaymentApiController.cs
diff --git a/src/Yavsc/ApiControllers/Business/PerformersApiController.cs b/src/Api/Controllers/Business/PerformersApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Business/PerformersApiController.cs
rename to src/Api/Controllers/Business/PerformersApiController.cs
diff --git a/src/Yavsc/ApiControllers/Business/ProductApiController.cs b/src/Api/Controllers/Business/ProductApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Business/ProductApiController.cs
rename to src/Api/Controllers/Business/ProductApiController.cs
diff --git a/src/Yavsc/ApiControllers/DimissClicksApiController.cs b/src/Api/Controllers/DimissClicksApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/DimissClicksApiController.cs
rename to src/Api/Controllers/DimissClicksApiController.cs
diff --git a/src/Yavsc/ApiControllers/HairCut/BursherProfilesApiController.cs b/src/Api/Controllers/HairCut/BursherProfilesApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/HairCut/BursherProfilesApiController.cs
rename to src/Api/Controllers/HairCut/BursherProfilesApiController.cs
diff --git a/src/Yavsc/ApiControllers/HairCut/HairCutController.cs b/src/Api/Controllers/HairCut/HairCutController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/HairCut/HairCutController.cs
rename to src/Api/Controllers/HairCut/HairCutController.cs
diff --git a/src/Yavsc/ApiControllers/HyperLinkApiController.cs b/src/Api/Controllers/HyperLinkApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/HyperLinkApiController.cs
rename to src/Api/Controllers/HyperLinkApiController.cs
diff --git a/src/Yavsc/ApiControllers/IT/GitRefsApiController.cs b/src/Api/Controllers/IT/GitRefsApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/IT/GitRefsApiController.cs
rename to src/Api/Controllers/IT/GitRefsApiController.cs
diff --git a/src/Yavsc/ApiControllers/MailTemplatingApiController.cs b/src/Api/Controllers/MailTemplatingApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/MailTemplatingApiController.cs
rename to src/Api/Controllers/MailTemplatingApiController.cs
diff --git a/src/Yavsc/ApiControllers/MailingTemplateApiController.cs b/src/Api/Controllers/MailingTemplateApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/MailingTemplateApiController.cs
rename to src/Api/Controllers/MailingTemplateApiController.cs
diff --git a/src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs b/src/Api/Controllers/Musical/DjProfileApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs
rename to src/Api/Controllers/Musical/DjProfileApiController.cs
diff --git a/src/Yavsc/ApiControllers/Musical/MusicalPreferencesApiController.cs b/src/Api/Controllers/Musical/MusicalPreferencesApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Musical/MusicalPreferencesApiController.cs
rename to src/Api/Controllers/Musical/MusicalPreferencesApiController.cs
diff --git a/src/Yavsc/ApiControllers/Musical/MusicalTendenciesApiController.cs b/src/Api/Controllers/Musical/MusicalTendenciesApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Musical/MusicalTendenciesApiController.cs
rename to src/Api/Controllers/Musical/MusicalTendenciesApiController.cs
diff --git a/src/Yavsc/ApiControllers/Musical/PodcastController.cs b/src/Api/Controllers/Musical/PodcastController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Musical/PodcastController.cs
rename to src/Api/Controllers/Musical/PodcastController.cs
diff --git a/src/Yavsc/ApiControllers/NativeConfidentialController.cs b/src/Api/Controllers/NativeConfidentialController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/NativeConfidentialController.cs
rename to src/Api/Controllers/NativeConfidentialController.cs
diff --git a/src/Yavsc/ApiControllers/PostRateApiController.cs b/src/Api/Controllers/PostRateApiController.cs
similarity index 92%
rename from src/Yavsc/ApiControllers/PostRateApiController.cs
rename to src/Api/Controllers/PostRateApiController.cs
index 25bb4341..a989587d 100644
--- a/src/Yavsc/ApiControllers/PostRateApiController.cs
+++ b/src/Api/Controllers/PostRateApiController.cs
@@ -27,7 +27,7 @@ namespace Yavsc.Controllers
return BadRequest(ModelState);
}
- Models.Blog.BlogPost blogpost = _context.Blogspot.Single(x=>x.Id == id);
+ Models.Blog.BlogPost blogpost = _context.BlogSpot.Single(x=>x.Id == id);
if (blogpost == null)
{
@@ -39,7 +39,6 @@ namespace Yavsc.Controllers
if (!User.IsInRole(Constants.AdminGroupName))
return BadRequest();
- blogpost.Rate = rate;
_context.SaveChanges(User.GetUserId());
return Ok();
diff --git a/src/Yavsc/ApiControllers/ProfileApiController.cs b/src/Api/Controllers/ProfileApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/ProfileApiController.cs
rename to src/Api/Controllers/ProfileApiController.cs
diff --git a/src/Yavsc/ApiControllers/Relationship/BlackListApiController.cs b/src/Api/Controllers/Relationship/BlackListApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Relationship/BlackListApiController.cs
rename to src/Api/Controllers/Relationship/BlackListApiController.cs
diff --git a/src/Yavsc/ApiControllers/Relationship/BlogAclApiController.cs b/src/Api/Controllers/Relationship/BlogAclApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Relationship/BlogAclApiController.cs
rename to src/Api/Controllers/Relationship/BlogAclApiController.cs
diff --git a/src/Yavsc/ApiControllers/Relationship/ChatApiController.cs b/src/Api/Controllers/Relationship/ChatApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Relationship/ChatApiController.cs
rename to src/Api/Controllers/Relationship/ChatApiController.cs
diff --git a/src/Yavsc/ApiControllers/Relationship/ChatRoomAccessApiController.cs b/src/Api/Controllers/Relationship/ChatRoomAccessApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Relationship/ChatRoomAccessApiController.cs
rename to src/Api/Controllers/Relationship/ChatRoomAccessApiController.cs
diff --git a/src/Yavsc/ApiControllers/Relationship/ChatRoomApiController.cs b/src/Api/Controllers/Relationship/ChatRoomApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Relationship/ChatRoomApiController.cs
rename to src/Api/Controllers/Relationship/ChatRoomApiController.cs
diff --git a/src/Yavsc/ApiControllers/Relationship/CircleApiController.cs b/src/Api/Controllers/Relationship/CircleApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Relationship/CircleApiController.cs
rename to src/Api/Controllers/Relationship/CircleApiController.cs
diff --git a/src/Yavsc/ApiControllers/Relationship/ContactsApiController.cs b/src/Api/Controllers/Relationship/ContactsApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Relationship/ContactsApiController.cs
rename to src/Api/Controllers/Relationship/ContactsApiController.cs
diff --git a/src/Yavsc/ApiControllers/ServiceApiController.cs b/src/Api/Controllers/ServiceApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/ServiceApiController.cs
rename to src/Api/Controllers/ServiceApiController.cs
diff --git a/src/Yavsc/ApiControllers/Survey/BugApiController.cs b/src/Api/Controllers/Survey/BugApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/Survey/BugApiController.cs
rename to src/Api/Controllers/Survey/BugApiController.cs
diff --git a/src/Api/Controllers/accounting/AccountController.cs b/src/Api/Controllers/accounting/AccountController.cs
new file mode 100644
index 00000000..c1bb811a
--- /dev/null
+++ b/src/Api/Controllers/accounting/AccountController.cs
@@ -0,0 +1,86 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+using Yavsc.Models;
+using Yavsc.Api.Helpers;
+using Yavsc.Server.Helpers;
+
+namespace Yavsc.WebApi.Controllers
+{
+ [Route("~/api/account")]
+ [Authorize("ApiScope")]
+ public class ApiAccountController : Controller
+ {
+ readonly ApplicationDbContext _dbContext;
+ private readonly ILogger _logger;
+
+ public ApiAccountController(
+ ILoggerFactory loggerFactory, ApplicationDbContext dbContext)
+ {
+ _logger = loggerFactory.CreateLogger(nameof(ApiAccountController));
+ _dbContext = dbContext;
+ }
+
+ [HttpGet("me")]
+ public async Task Me()
+ {
+ if (User == null)
+ return new BadRequestObjectResult(
+ new { error = "user not found" });
+ var uid = User.GetUserId();
+
+ var userData = await GetUserData(uid);
+
+ var user = new Yavsc.Models.Auth.Me(userData.Id, userData.UserName, userData.Email,
+ userData.Avatar,
+ userData.PostalAddress, userData.DedicatedGoogleCalendar);
+
+ var userRoles = _dbContext.UserRoles.Where(u => u.UserId == uid).Select(r => r.RoleId).ToArray();
+
+ IdentityRole[] roles = _dbContext.Roles.Where(r => userRoles.Contains(r.Id)).ToArray();
+
+ user.Roles = roles.Select(r => r.Name).ToArray();
+
+ return Ok(user);
+ }
+
+ private async Task GetUserData(string uid)
+ {
+ return await _dbContext.Users
+ .Include(u => u.PostalAddress)
+ .Include(u => u.AccountBalance)
+ .FirstAsync(u => u.Id == uid);
+ }
+
+ [HttpGet("myhost")]
+ public IActionResult MyHost ()
+ {
+ return Ok(new { host = Request.ForHost() });
+ }
+
+
+ ///
+ /// Updates the avatar
+ ///
+ ///
+ [HttpPost("~/api/setavatar")]
+ public async Task SetAvatar()
+ {
+ var root = User.InitPostToFileSystem(null);
+ var user = await GetUserData(User.GetUserId());
+ if (Request.Form.Files.Count!=1)
+ return new BadRequestResult();
+ var info = user.ReceiveAvatar(Request.Form.Files[0]);
+ await _dbContext.SaveChangesAsync();
+ return Ok(info);
+ }
+
+ [HttpGet("identity")]
+ public async Task Identity()
+ {
+ return Json(User.Claims.Select(c=>new {c.Type, c.Value}));
+ }
+ }
+}
diff --git a/src/Yavsc/ApiControllers/accounting/ApplicationUserApiController.cs b/src/Api/Controllers/accounting/ApplicationUserApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/accounting/ApplicationUserApiController.cs
rename to src/Api/Controllers/accounting/ApplicationUserApiController.cs
diff --git a/src/Yavsc/ApiControllers/accounting/ProfileApiController.cs b/src/Api/Controllers/accounting/ProfileApiController.cs
similarity index 100%
rename from src/Yavsc/ApiControllers/accounting/ProfileApiController.cs
rename to src/Api/Controllers/accounting/ProfileApiController.cs
diff --git a/src/Yavsc/Helpers/RequestHelpers.cs b/src/Api/Helpers/RequestHelpers.cs
similarity index 96%
rename from src/Yavsc/Helpers/RequestHelpers.cs
rename to src/Api/Helpers/RequestHelpers.cs
index 96f060c3..2c2fae27 100644
--- a/src/Yavsc/Helpers/RequestHelpers.cs
+++ b/src/Api/Helpers/RequestHelpers.cs
@@ -8,7 +8,7 @@ using Yavsc.ViewModels;
using Yavsc.Models;
using System.Linq;
-namespace Yavsc.Helpers
+namespace Yavsc.Api.Helpers
{
public static class RequestHelpers
{
diff --git a/src/Api/Helpers/UserHelpers.cs b/src/Api/Helpers/UserHelpers.cs
new file mode 100644
index 00000000..2d480ea1
--- /dev/null
+++ b/src/Api/Helpers/UserHelpers.cs
@@ -0,0 +1,17 @@
+using System.Security.Claims;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Yavsc.Models;
+using Yavsc.Models.Blog;
+
+namespace Yavsc.Api.Helpers
+{
+ public static class UserHelpers
+ {
+ public static string GetUserId(this ClaimsPrincipal user)
+ {
+ return user.FindFirstValue("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier");
+ }
+ }
+}
diff --git a/src/Api/Program.cs b/src/Api/Program.cs
new file mode 100644
index 00000000..5ef8afde
--- /dev/null
+++ b/src/Api/Program.cs
@@ -0,0 +1,113 @@
+/*
+ Copyright (c) 2024 HigginsSoft, Alexander Higgins - https://github.com/alexhiggins732/
+
+ Copyright (c) 2018, Brock Allen & Dominick Baier. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+ Source code and license this software can be found
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+*/
+
+using IdentityModel;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Yavsc.Interface;
+using Yavsc.Models;
+using Yavsc.Services;
+
+internal class Program
+{
+ private static async Task Main(string[] args)
+ {
+ Console.Title = "API";
+
+ var builder = WebApplication.CreateBuilder(args);
+
+ var services = builder.Services;
+ // builder.Services.AddDistributedMemoryCache();
+
+ // accepts any access token issued by identity server
+ // adds an authorization policy for scope 'scope1'
+
+ services
+ .AddAuthorization(options =>
+ {
+ options.AddPolicy("ApiScope", policy =>
+ {
+ policy
+ .RequireAuthenticatedUser()
+ .RequireClaim(JwtClaimTypes.Scope, new string[] { "scope2" });
+ });
+ })
+ .AddCors(options =>
+ {
+ // this defines a CORS policy called "default"
+ options.AddPolicy("default", policy =>
+ {
+ policy.WithOrigins("https://localhost:5003")
+ .AllowAnyHeader()
+ .AllowAnyMethod();
+ });
+ })
+ .AddControllers();
+
+ // accepts any access token issued by identity server
+ var authenticationBuilder = services.AddAuthentication("Bearer")
+ .AddJwtBearer("Bearer", options =>
+ {
+ options.IncludeErrorDetails = true;
+ options.Authority = "https://localhost:5001";
+ options.TokenValidationParameters =
+ new() { ValidateAudience = false };
+ });
+
+ services.AddDbContext(options =>
+ options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection")));
+
+ services.AddTransient()
+ .AddTransient()
+ .AddTransient();
+ /*
+ services.AddSingleton();
+ services.AddSingleton();
+ services.AddTransient();
+ services.AddIdentityApiEndpoints();
+ services.AddSession();
+ */
+ using (var app = builder.Build())
+ {
+ if (app.Environment.IsDevelopment())
+ app.UseDeveloperExceptionPage();
+
+ app
+ .UseRouting()
+ .UseAuthentication()
+ .UseAuthorization()
+ .UseCors("default")
+ /* .UseEndpoints(endpoints =>
+ {
+ endpoints.MapDefaultControllerRoute()
+ .RequireAuthorization();
+ })*/
+
+ ;
+ // app.MapIdentityApi().RequireAuthorization("ApiScope");
+ app.MapDefaultControllerRoute();
+ app.MapGet("/identity", (HttpContext context) =>
+ new JsonResult(context?.User?.Claims.Select(c => new { c.Type, c.Value }))
+ );
+
+ // app.UseSession();
+ await app.RunAsync();
+ }
+ ;
+
+
+
+
+ }
+}
diff --git a/src/Api/Properties/launchSettings.json b/src/Api/Properties/launchSettings.json
new file mode 100644
index 00000000..e27c888f
--- /dev/null
+++ b/src/Api/Properties/launchSettings.json
@@ -0,0 +1,30 @@
+{
+ "$schema": "http://json.schemastore.org/launchsettings.json",
+ "iisSettings": {
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
+ "iisExpress": {
+ "applicationUrl": "https://localhost:5001",
+ "sslPort": 6001
+ }
+ },
+ "profiles": {
+
+ "https": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": false,
+ "applicationUrl": "https://localhost:6001;",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ },
+ "IIS Express": {
+ "commandName": "IISExpress",
+ "launchBrowser": true,
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ }
+ }
+}
diff --git a/src/Api/appsettings.json b/src/Api/appsettings.json
new file mode 100644
index 00000000..d9d9a9bf
--- /dev/null
+++ b/src/Api/appsettings.json
@@ -0,0 +1,10 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
+ },
+ "AllowedHosts": "*"
+}
diff --git a/src/Api/tempkey.jwk b/src/Api/tempkey.jwk
new file mode 100644
index 00000000..690a14ae
--- /dev/null
+++ b/src/Api/tempkey.jwk
@@ -0,0 +1 @@
+{"AdditionalData":{},"Alg":"RS256","Crv":null,"D":"V1qxZgyKyWNi8FbeueGjfOae22fnDa0dU8YpTohrjn89bk9B8kvIzFJP9IPYThTLMaKCTFN09A3aVy_zhL5Cv2ebEqkZIpXkPmtvRavAYxoSQWUfN2czMok216KI7csVVk79csLnnO6i3pf0B9OgGwsuEsLR40_X4MTy5iTejZfwEVobN7H6_uylw5dEUjcJlR-RtuXAZz48stOLt8-y9it7rvowv8eHEsAFSaiV-g92rKZdvMdxVqW5dvHkqF4-h1gdp9VvStZYsqfnR8hrObSxom5yWFnpmxZKmaFaFxbF-k9T8YX1izuPzESPyKCUb-GX5_4sLB6vOiUO4drHiQ","DP":"7Vz77Jz00YuT87QDAEHuBl-GInvI2VT1Fg0HsUEUhBN_o1ZwqlgX6U_3yGUgYYvoWQZZQeLTxRiQSzymPxXiikKnmGt97zMypIllEOar284Ddypa4fraXSJwgKR-1UPYGZg1adjN3KDruLok3ahyUcD9375tCXmQ3Cs0QC1_ATs","DQ":"B5qgaCcQGleo-zZqWIjMCtyEyB4JBbPFtKk3uZ5KAV8lO-TQPJkohraRxInOUHoSS1O2hj1bUO1r-C29XJqrkhi2APGs2hu6V11cmAtwwhj5XPTnL_TNx314dK5ECEQ231gxidfod-6PknG20Qim7sacsj5OrJHfp9RnMZ2p4fk","E":"AQAB","K":null,"KeyId":"E7139A7A77AEA502B0482C026DCE5C59","KeyOps":[],"Kid":"E7139A7A77AEA502B0482C026DCE5C59","Kty":"RSA","N":"tL1q9Mon5IGTGYvBg_FmDoxy0HWQ0ceo6iZmDMzAkjYZ06KKdWoR7Up2ZJ7NrBnGpyrb1uR9qAJAAJm19SLKDKSrEUn5QcnTDMqVQLBurtXYw-eY2DL4cO0bbetc5_z8hyKUzikf6jJRRGfDSR2nEfXwUf3riYfYXtNgSmr_CsBwPUcH12JGad0bwsqJy7z9Tg2_pWvNR36Ba5qd_6VmkLQRGQuDTcHzwbagd3bl4Ma1bzxPULBiBENfj6srAxV-6gQhCJr3mIr1ZsJcZsrYuUnnBNgzYCZvkOkmyB68PlrV9C9xQO8aQfla2s42Uc12-UhBbreI0uBP_k8PXXXjXw","Oth":[],"P":"_jaZkNClDqxS8nddu2t6pgP596qJdzMAq11JVWAoDJV_9JRUZH2Qbq2CrDRUjRF9nxR2bVTglfzZ-bho-Iy9PqcWeVekLObiyR30zmUzoWCdUhmi-BRd3FF3uSteNPc7ohtuX4SrbbCoUR4BpcBAgHas8KKj80sIPpoYo10xK-s","Q":"tgKedcJQilsxEzRRbs8_XD4MxnsmrxqvccfvzzHkqqZMNI0CMGA41ddHiWdNcYsyzqIc-vCf6OGabD6Z7mzZXPbYsr1o4rIQXveUy3Ty3fD9YCRKgWbS9gTbXNGBFAglu3iyNl1XUCGc_DF8PImgk99pu9byPoIr6rAPhciaDV0","QI":"2wtLbwL9kODL6HoF5R8CFmf0Fz3gqoEetrq_I7wuK1pL2vmpZlzmURjvERhi5T6lD2L8SC1vY4AJ7NGzAncwn5ozpnos2s0YIxHYUixj5RuTWQLPKqk5r1bEORuju8KwfW6Nzc4K6Rhk3Lb3TXDvKi6BSf1URjLtiI8DUB_enxw","Use":null,"X":null,"X5c":[],"X5t":null,"X5tS256":null,"X5u":null,"Y":null,"KeySize":2048,"HasPrivateKey":true,"CryptoProviderFactory":{"CryptoProviderCache":{},"CustomCryptoProvider":null,"CacheSignatureProviders":true,"SignatureProviderObjectPoolCacheSize":16}}
\ No newline at end of file
diff --git a/src/Yavsc.Abstract/Attributes/Validation/ValidRemoteUserDirAttribute.cs b/src/Yavsc.Abstract/Attributes/Validation/ValidRemoteUserDirAttribute.cs
index 2c59f689..43c44054 100644
--- a/src/Yavsc.Abstract/Attributes/Validation/ValidRemoteUserDirAttribute.cs
+++ b/src/Yavsc.Abstract/Attributes/Validation/ValidRemoteUserDirAttribute.cs
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
-using Yavsc.Helpers;
+using Yavsc.Server.Helpers;
namespace Yavsc.Attributes.Validation
{
diff --git a/src/Yavsc.Abstract/Blogspot/IBlog.cs b/src/Yavsc.Abstract/Blogspot/IBlog.cs
index 42af2f1a..9cc121a1 100644
--- a/src/Yavsc.Abstract/Blogspot/IBlog.cs
+++ b/src/Yavsc.Abstract/Blogspot/IBlog.cs
@@ -3,7 +3,7 @@
namespace Yavsc
{
- public interface IBlogPost : IBaseTrackedEntity, IIdentified, IRating, ITitle
+ public interface IBlogPost : ITrackedEntity, IIdentified, ITitle
{
string AuthorId { get; set; }
string Content { get; set; }
diff --git a/src/Yavsc.Abstract/Constants.cs b/src/Yavsc.Abstract/Constants.cs
index 8a37bd29..b6c7bf2e 100644
--- a/src/Yavsc.Abstract/Constants.cs
+++ b/src/Yavsc.Abstract/Constants.cs
@@ -37,7 +37,7 @@ namespace Yavsc
public const string FrontOfficeGroupName = "FrontOffice";
public const string DefaultAvatar = "/images/Users/icon_user.png";
public const string AnonAvatar = "/images/Users/icon_anon_user.png";
- public const string YavscConnectionStringEnvName = "YAVSC_DB_CONNECTION";
+ public const string YavscConnectionStringEnvName = "DEFAULTCONNECTION_CONNECTIONSTRING";
// at the end, let 4*4 bytes in peace
public const int WebSocketsMaxBufLen = 4096;
@@ -54,5 +54,7 @@ namespace Yavsc
public const string LivePath = "/live/cast";
public const string StreamingPath = "/api/stream/put";
+
+ public const string RoleClaimName = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role";
}
}
diff --git a/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs b/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
index 0b4aefbb..5e571e24 100644
--- a/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
+++ b/src/Yavsc.Abstract/FileSystem/AbstractFileSystemHelpers.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using Yavsc.ViewModels.UserFiles;
-namespace Yavsc.Helpers
+namespace Yavsc.Server.Helpers
{
public static class AbstractFileSystemHelpers
{
diff --git a/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs b/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
index ba748fbd..63c69cb4 100644
--- a/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
+++ b/src/Yavsc.Abstract/FileSystem/FsOperationInfo.cs
@@ -1,4 +1,4 @@
-namespace Yavsc.Helpers
+namespace Yavsc.Abstract.Helpers
{
public enum ErrorCode {
NotFound,
diff --git a/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs b/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
index 77b7e6e4..cced9397 100644
--- a/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
+++ b/src/Yavsc.Abstract/FileSystem/UserDirectoryInfo.cs
@@ -2,7 +2,7 @@ using System;
using System.IO;
using System.Linq;
using Yavsc.Abstract.FileSystem;
-using Yavsc.Helpers;
+using Yavsc.Server.Helpers;
namespace Yavsc.ViewModels.UserFiles
{
diff --git a/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs b/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs
index 7efd00ef..eb153ec2 100644
--- a/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs
+++ b/src/Yavsc.Abstract/Identity/Security/ICircleAuthorized.cs
@@ -3,7 +3,7 @@ namespace Yavsc.Abstract.Identity.Security
public interface ICircleAuthorized
{
long Id { get; set; }
- string GetOwnerId ();
+ string OwnerId { get; }
bool AuthorizeCircle(long circleId);
ICircleAuthorization [] GetACL();
diff --git a/src/Yavsc.Abstract/Interfaces/IBaseTrackedEntity.cs b/src/Yavsc.Abstract/Interfaces/IBaseTrackedEntity.cs
index 64da6cdd..f544f654 100644
--- a/src/Yavsc.Abstract/Interfaces/IBaseTrackedEntity.cs
+++ b/src/Yavsc.Abstract/Interfaces/IBaseTrackedEntity.cs
@@ -2,7 +2,7 @@ using System;
namespace Yavsc
{
- public interface IBaseTrackedEntity
+ public interface ITrackedEntity
{
DateTime DateCreated { get; set; }
string UserCreated { get; set; }
diff --git a/src/Yavsc.Abstract/Interfaces/Models/IComment.cs b/src/Yavsc.Abstract/Interfaces/Models/IComment.cs
new file mode 100644
index 00000000..f700ba29
--- /dev/null
+++ b/src/Yavsc.Abstract/Interfaces/Models/IComment.cs
@@ -0,0 +1,9 @@
+namespace Yavsc.Interfaces
+{
+
+ public interface IComment
+ {
+ string Content { get; set; }
+ TReceiverId ReceiverId { get; set; }
+ }
+}
diff --git a/src/Yavsc.Abstract/Interfaces/Models/ICommentable.cs b/src/Yavsc.Abstract/Interfaces/Models/ICommentable.cs
deleted file mode 100644
index 405ef3bd..00000000
--- a/src/Yavsc.Abstract/Interfaces/Models/ICommentable.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Yavsc.Interfaces
-{
- public interface IComment : IIdentified
- {
- T GetReceiverId();
- void SetReceiverId(T rid);
- string Content { get; set; }
-
- }
-}
\ No newline at end of file
diff --git a/src/Yavsc.Abstract/MarkdownParser.y b/src/Yavsc.Abstract/MarkdownParser.y
deleted file mode 100644
index 5f282702..00000000
--- a/src/Yavsc.Abstract/MarkdownParser.y
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Yavsc.Abstract/Messaging/Comment.cs b/src/Yavsc.Abstract/Messaging/Comment.cs
new file mode 100644
index 00000000..3215abe4
--- /dev/null
+++ b/src/Yavsc.Abstract/Messaging/Comment.cs
@@ -0,0 +1,9 @@
+
+using Yavsc.Interfaces;
+
+public class CommentPost : IComment
+ {
+ public long ReceiverId { get; set; }
+ public long? ParentId { get; set; }
+ public string Content { get; set; }
+ }
diff --git a/src/Yavsc.Abstract/Workflow/INominativeQuery.cs b/src/Yavsc.Abstract/Workflow/INominativeQuery.cs
index 2d6a1d8d..f0adebdc 100644
--- a/src/Yavsc.Abstract/Workflow/INominativeQuery.cs
+++ b/src/Yavsc.Abstract/Workflow/INominativeQuery.cs
@@ -2,7 +2,7 @@ using System;
namespace Yavsc.Abstract.Workflow
{
- public interface IDecidableQuery: IBaseTrackedEntity, IQuery
+ public interface IDecidableQuery: ITrackedEntity, IQuery
{
bool Decided { get; set; }
bool Accepted { get; set; }
diff --git a/src/Yavsc.Abstract/Workflow/IQuery.cs b/src/Yavsc.Abstract/Workflow/IQuery.cs
index 0997100c..ff9c76ac 100644
--- a/src/Yavsc.Abstract/Workflow/IQuery.cs
+++ b/src/Yavsc.Abstract/Workflow/IQuery.cs
@@ -3,7 +3,7 @@ namespace Yavsc.Abstract.Workflow
using Yavsc;
using Yavsc.Billing;
- public interface IQuery: IBaseTrackedEntity, IBillable
+ public interface IQuery: ITrackedEntity, IBillable
{
QueryStatus Status { get; set; }
string PaymentId { get; set; }
diff --git a/src/Yavsc.Abstract/Workflow/IRating.cs b/src/Yavsc.Abstract/Workflow/IRating.cs
deleted file mode 100644
index bc45f9a9..00000000
--- a/src/Yavsc.Abstract/Workflow/IRating.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// IIdentified.cs
-//
-// Author:
-// Paul Schneider
-//
-// Copyright (c) 2015 GNU GPL
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see .
-
-namespace Yavsc
-{
-
- ///
- /// I rating.
- ///
- public interface IRating: IIdentified
- {
- ///
- /// Gets or sets the rate.
- ///
- /// The rate.
- int Rate { get; set; }
- }
-}
-
diff --git a/src/Yavsc.Abstract/Yavsc.Abstract.csproj b/src/Yavsc.Abstract/Yavsc.Abstract.csproj
index 4483fe35..6d0c7e5f 100644
--- a/src/Yavsc.Abstract/Yavsc.Abstract.csproj
+++ b/src/Yavsc.Abstract/Yavsc.Abstract.csproj
@@ -9,8 +9,5 @@
-
-
-
diff --git a/src/Yavsc.Abstract/app.config b/src/Yavsc.Abstract/app.config
deleted file mode 100644
index 8460dd43..00000000
--- a/src/Yavsc.Abstract/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Yavsc.Abstract/packages.config b/src/Yavsc.Abstract/packages.config
deleted file mode 100644
index 569e1bea..00000000
--- a/src/Yavsc.Abstract/packages.config
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/Yavsc/Config.cs b/src/Yavsc.Server/Config.cs
similarity index 68%
rename from src/Yavsc/Config.cs
rename to src/Yavsc.Server/Config.cs
index 938a9c1a..bc579e5f 100644
--- a/src/Yavsc/Config.cs
+++ b/src/Yavsc.Server/Config.cs
@@ -1,5 +1,8 @@
-using IdentityServer4.Models;
+using IdentityServer8;
+using IdentityServer8.Models;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
using Yavsc.Settings;
namespace Yavsc;
@@ -38,13 +41,14 @@ public static class Config
{
new IdentityResources.OpenId(),
new IdentityResources.Profile(),
+ new IdentityResources.Email()
};
public static IEnumerable ApiScopes =>
new ApiScope[]
{
- new ApiScope("scope1"),
- new ApiScope("scope2"),
+ new ApiScope("scope1",new string[] {"scope1"}),
+ new ApiScope("scope2",new string[] {"scope2"}),
};
public static IEnumerable Clients =>
@@ -65,17 +69,29 @@ public static class Config
// interactive client using code flow + pkce
new Client
{
- ClientId = "interactive",
+ ClientId = "mvc",
ClientSecrets = { new Secret("49C1A7E1-0C79-4A89-A3D6-A37998FB86B0".Sha256()) },
AllowedGrantTypes = GrantTypes.Code,
+ AlwaysIncludeUserClaimsInIdToken = true,
- RedirectUris = { "https://localhost:5003/signin-oidc" },
- FrontChannelLogoutUri = "https://localhost:5003/signout-oidc",
- PostLogoutRedirectUris = { "https://localhost:5003/signout-callback-oidc" },
+ RedirectUris = { "https://localhost:5003/signin-oidc",
+ "http://localhost:5002/signin-oidc" },
+ PostLogoutRedirectUris = {
+ "http://localhost:5002/signout-callback-oidc",
+ "https://localhost:5003/signout-callback-oidc" },
- AllowOfflineAccess = true,
- AllowedScopes = { "openid", "profile", "scope2" }
+
+ AllowedScopes = {
+ IdentityServerConstants.StandardScopes.OpenId,
+ IdentityServerConstants.StandardScopes.Profile,
+ IdentityServerConstants.StandardScopes.Email,
+ IdentityServerConstants.StandardScopes.OfflineAccess,
+ "scope2" }
+ ,
+ AllowedCorsOrigins=new string[]{"*"},
+ AllowRememberConsent=true
+
},
};
diff --git a/src/Yavsc/Exceptions/InvalidActivityModelException.cs b/src/Yavsc.Server/Exceptions/InvalidActivityModelException.cs
similarity index 100%
rename from src/Yavsc/Exceptions/InvalidActivityModelException.cs
rename to src/Yavsc.Server/Exceptions/InvalidActivityModelException.cs
diff --git a/src/Yavsc/Exceptions/InvalidPathException.cs b/src/Yavsc.Server/Exceptions/InvalidPathException.cs
similarity index 100%
rename from src/Yavsc/Exceptions/InvalidPathException.cs
rename to src/Yavsc.Server/Exceptions/InvalidPathException.cs
diff --git a/src/Yavsc.Server/Helpers/BillingHelpers.cs b/src/Yavsc.Server/Helpers/BillingHelpers.cs
index 0a826447..c10a7615 100644
--- a/src/Yavsc.Server/Helpers/BillingHelpers.cs
+++ b/src/Yavsc.Server/Helpers/BillingHelpers.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
using System.Globalization;
-using System.IO;
-using System.Linq;
-using Yavsc.Abstract.FileSystem;
using Yavsc.Billing;
using Yavsc.Models.Billing;
+using Yavsc.Server.Helpers;
using Yavsc.Services;
namespace Yavsc.Helpers
diff --git a/src/Yavsc/Helpers/CompanyInfoHelpers.cs b/src/Yavsc.Server/Helpers/CompanyInfoHelpers.cs
similarity index 100%
rename from src/Yavsc/Helpers/CompanyInfoHelpers.cs
rename to src/Yavsc.Server/Helpers/CompanyInfoHelpers.cs
diff --git a/src/Yavsc/Helpers/FileSystemHelpers.cs b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs
similarity index 80%
rename from src/Yavsc/Helpers/FileSystemHelpers.cs
rename to src/Yavsc.Server/Helpers/FileSystemHelpers.cs
index 8d6f7385..f0d5782b 100644
--- a/src/Yavsc/Helpers/FileSystemHelpers.cs
+++ b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs
@@ -1,19 +1,30 @@
-using System.Drawing;
-using System.Drawing.Imaging;
+
using System.Security.Claims;
using Microsoft.AspNetCore.Html;
using Microsoft.Extensions.FileProviders;
-using Yavsc.Exceptions;
using Yavsc.Models;
using Yavsc.Models.FileSystem;
using Yavsc.Models.Streaming;
using Yavsc.ViewModels;
-
-namespace Yavsc.Helpers
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Processing;
+using Microsoft.AspNetCore.Http;
+using Yavsc.Exceptions;
+using Yavsc.Helpers;
+using Yavsc.Abstract.Helpers;
+namespace Yavsc.Server.Helpers
{
public static class FileSystemHelpers
{
+ public static async Task SaveAsAsync(this IFormFile formFile, string path)
+ {
+ if (formFile.Length > 0) {
+ using (Stream fileStream = new FileStream(path, FileMode.Create)) {
+ await formFile.CopyToAsync(fileStream);
+ }
+ }
+ }
public static FileRecievedInfo ReceiveProSignature(this ClaimsPrincipal user, string billingCode, long estimateId, IFormFile formFile, string signtype)
{
var item = new FileRecievedInfo
@@ -28,43 +39,12 @@ namespace Yavsc.Helpers
using (var org = formFile.OpenReadStream())
{
- Image i = Image.FromStream(org);
- using (Bitmap source = new Bitmap(i))
- {
- source.Save(destFileName, ImageFormat.Png);
- }
+ using Image image = Image.Load(org);
+ image.Save(destFileName);
}
return item;
}
- ///
- /// Create avatars
- ///
- ///
- ///
- private static void CreateAvatars(this ApplicationUser user, Bitmap source)
- {
- var dir = Config.SiteSetup.Avatars;
- var name = user.UserName + ".png";
- var smallname = user.UserName + ".s.png";
- var xsmallname = user.UserName + ".xs.png";
- using (Bitmap newBMP = new Bitmap(source, 128, 128))
- {
- newBMP.Save(Path.Combine(
- dir, name), ImageFormat.Png);
- }
- using (Bitmap newBMP = new Bitmap(source, 64, 64))
- {
- newBMP.Save(Path.Combine(
- dir, smallname), ImageFormat.Png);
- }
- using (Bitmap newBMP = new Bitmap(source, 32, 32))
- {
- newBMP.Save(Path.Combine(
- dir, xsmallname), ImageFormat.Png);
- }
- }
-
public static string GetAvatarUri(this ApplicationUser user)
{
return $"/{Config.SiteSetup.Avatars}/{user.UserName}.png";
@@ -257,42 +237,15 @@ namespace Yavsc.Helpers
{
FileName = user.UserName + ".png"
};
-
- var destFileName = Path.Combine(Config.SiteSetup.Avatars, item.FileName);
-
- var fi = new FileInfo(destFileName);
- if (fi.Exists) item.Overriden = true;
- Rectangle cropRect = new Rectangle();
-
using (var org = formFile.OpenReadStream())
{
- Image i = Image.FromStream(org);
- using (Bitmap source = new Bitmap(i))
- {
- if (i.Width != i.Height)
- {
- if (i.Width > i.Height)
- {
- cropRect.X = (i.Width - i.Height) / 2;
- cropRect.Y = 0;
- cropRect.Width = i.Height;
- cropRect.Height = i.Height;
- }
- else
- {
- cropRect.X = 0;
- cropRect.Y = (i.Height - i.Width) / 2;
- cropRect.Width = i.Width;
- cropRect.Height = i.Width;
- }
- using (var cropped = source.Clone(cropRect, source.PixelFormat))
- {
- CreateAvatars(user,cropped);
- }
- }
-
- }
-
+ using Image image = Image.Load(org);
+ image.Mutate(x=>x.Resize(128,128));
+ image.Save(Path.Combine(Config.SiteSetup.Avatars,item.FileName));
+ image.Mutate(x=>x.Resize(64,64));
+ image.Save(Path.Combine(Config.SiteSetup.Avatars,user.UserName + ".s.png"));
+ image.Mutate(x=>x.Resize(32,32));
+ image.Save(Path.Combine(Config.SiteSetup.Avatars,user.UserName + ".xs.png"));
}
item.DestDir = Config.AvatarsOptions.RequestPath.ToUriComponent();
user.Avatar = $"{item.DestDir}/{item.FileName}";
@@ -315,9 +268,5 @@ namespace Yavsc.Helpers
return $"{basename}-{flow.SequenceNumber}{ext}";
}
- public static void SaveAs(this IFormFile file, string destFileName)
- {
- throw new NotImplementedException();
- }
}
}
diff --git a/src/Yavsc/Helpers/HtmlHelpers.cs b/src/Yavsc.Server/Helpers/HtmlHelpers.cs
similarity index 95%
rename from src/Yavsc/Helpers/HtmlHelpers.cs
rename to src/Yavsc.Server/Helpers/HtmlHelpers.cs
index 57d77b3e..213ea369 100644
--- a/src/Yavsc/Helpers/HtmlHelpers.cs
+++ b/src/Yavsc.Server/Helpers/HtmlHelpers.cs
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
using Yavsc.Models.Drawing;
namespace Yavsc.Helpers
diff --git a/src/Yavsc/Helpers/PayPalHelpers.cs b/src/Yavsc.Server/Helpers/PayPalHelpers.cs
similarity index 100%
rename from src/Yavsc/Helpers/PayPalHelpers.cs
rename to src/Yavsc.Server/Helpers/PayPalHelpers.cs
diff --git a/src/Yavsc.Server/Helpers/UserHelpers.cs b/src/Yavsc.Server/Helpers/UserHelpers.cs
new file mode 100644
index 00000000..e319239d
--- /dev/null
+++ b/src/Yavsc.Server/Helpers/UserHelpers.cs
@@ -0,0 +1,53 @@
+using System.Security.Claims;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Yavsc.Models;
+using Yavsc.Models.Blog;
+
+namespace Yavsc.Helpers
+{
+ public static class UserHelpers
+ {
+ public static string GetUserId(this ClaimsPrincipal user)
+ {
+ return user.FindFirstValue("sub");
+ }
+
+ public static string GetUserName(this ClaimsPrincipal user)
+ {
+ return user.FindFirstValue(ClaimTypes.Name);
+ }
+
+ public static bool IsSignedIn(this ClaimsPrincipal user)
+ {
+ return user.Identity.IsAuthenticated;
+ }
+
+ public static IEnumerable UserPosts(this ApplicationDbContext dbContext, string posterId, string readerId)
+ {
+ if (readerId == null)
+ {
+ var userPosts = dbContext.BlogSpot.Include(
+ b => b.Author
+ ).Where(x => ((x.AuthorId == posterId) && (x.Visible))).ToArray();
+ return userPosts;
+ }
+ else
+ {
+ long[] readerCirclesMemberships =
+ dbContext.Circle.Include(c => c.Members)
+ .Where(c => c.Members.Any(m => m.MemberId == readerId))
+ .Select(c => c.Id).ToArray();
+ return dbContext.BlogSpot.Include(
+ b => b.Author
+ ).Include(p => p.ACL).Where(x => x.Author.Id == posterId &&
+ (x.Visible &&
+ (x.ACL.Count == 0 || x.ACL.Any(a => readerCirclesMemberships.Contains(a.CircleId)))));
+
+
+ }
+
+ }
+ }
+}
diff --git a/src/Yavsc/Helpers/WorkflowHelpers.cs b/src/Yavsc.Server/Helpers/WorkflowHelpers.cs
similarity index 100%
rename from src/Yavsc/Helpers/WorkflowHelpers.cs
rename to src/Yavsc.Server/Helpers/WorkflowHelpers.cs
diff --git a/src/Yavsc/Hubs/ChatHub.cs b/src/Yavsc.Server/Hubs/ChatHub.cs
similarity index 100%
rename from src/Yavsc/Hubs/ChatHub.cs
rename to src/Yavsc.Server/Hubs/ChatHub.cs
diff --git a/src/Yavsc/Interfaces/IConnexionManager.cs b/src/Yavsc.Server/Interfaces/IConnexionManager.cs
similarity index 100%
rename from src/Yavsc/Interfaces/IConnexionManager.cs
rename to src/Yavsc.Server/Interfaces/IConnexionManager.cs
diff --git a/src/Yavsc/Interfaces/IDiskUsageTracker.cs b/src/Yavsc.Server/Interfaces/IDiskUsageTracker.cs
similarity index 100%
rename from src/Yavsc/Interfaces/IDiskUsageTracker.cs
rename to src/Yavsc.Server/Interfaces/IDiskUsageTracker.cs
diff --git a/src/Yavsc/Interfaces/ILiveProcessor.cs b/src/Yavsc.Server/Interfaces/ILiveProcessor.cs
similarity index 100%
rename from src/Yavsc/Interfaces/ILiveProcessor.cs
rename to src/Yavsc.Server/Interfaces/ILiveProcessor.cs
diff --git a/src/Yavsc/Interfaces/ITrueEmailSender.cs b/src/Yavsc.Server/Interfaces/ITrueEmailSender.cs
similarity index 100%
rename from src/Yavsc/Interfaces/ITrueEmailSender.cs
rename to src/Yavsc.Server/Interfaces/ITrueEmailSender.cs
diff --git a/src/Yavsc/Migrations/2016/20160315144017_init.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160315144017_init.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160315144017_init.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160315144017_init.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160315144017_init.cs b/src/Yavsc.Server/Migrations/2016/20160315144017_init.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160315144017_init.cs
rename to src/Yavsc.Server/Migrations/2016/20160315144017_init.cs
diff --git a/src/Yavsc/Migrations/2016/20160317215718_command.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160317215718_command.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160317215718_command.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160317215718_command.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160317215718_command.cs b/src/Yavsc.Server/Migrations/2016/20160317215718_command.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160317215718_command.cs
rename to src/Yavsc.Server/Migrations/2016/20160317215718_command.cs
diff --git a/src/Yavsc/Migrations/2016/20160320170252_bank.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160320170252_bank.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160320170252_bank.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160320170252_bank.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160320170252_bank.cs b/src/Yavsc.Server/Migrations/2016/20160320170252_bank.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160320170252_bank.cs
rename to src/Yavsc.Server/Migrations/2016/20160320170252_bank.cs
diff --git a/src/Yavsc/Migrations/2016/20160322144500_contact.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160322144500_contact.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160322144500_contact.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160322144500_contact.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160322144500_contact.cs b/src/Yavsc.Server/Migrations/2016/20160322144500_contact.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160322144500_contact.cs
rename to src/Yavsc.Server/Migrations/2016/20160322144500_contact.cs
diff --git a/src/Yavsc/Migrations/2016/20160322152206_balance.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160322152206_balance.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160322152206_balance.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160322152206_balance.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160322152206_balance.cs b/src/Yavsc.Server/Migrations/2016/20160322152206_balance.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160322152206_balance.cs
rename to src/Yavsc.Server/Migrations/2016/20160322152206_balance.cs
diff --git a/src/Yavsc/Migrations/2016/20160401233357_circle.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160401233357_circle.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160401233357_circle.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160401233357_circle.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160401233357_circle.cs b/src/Yavsc.Server/Migrations/2016/20160401233357_circle.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160401233357_circle.cs
rename to src/Yavsc.Server/Migrations/2016/20160401233357_circle.cs
diff --git a/src/Yavsc/Migrations/2016/20160402135146_calendar.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160402135146_calendar.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160402135146_calendar.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160402135146_calendar.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160402135146_calendar.cs b/src/Yavsc.Server/Migrations/2016/20160402135146_calendar.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160402135146_calendar.cs
rename to src/Yavsc.Server/Migrations/2016/20160402135146_calendar.cs
diff --git a/src/Yavsc/Migrations/2016/20160404110708_files.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160404110708_files.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160404110708_files.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160404110708_files.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160404110708_files.cs b/src/Yavsc.Server/Migrations/2016/20160404110708_files.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160404110708_files.cs
rename to src/Yavsc.Server/Migrations/2016/20160404110708_files.cs
diff --git a/src/Yavsc/Migrations/2016/20160404121446_estimate.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160404121446_estimate.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160404121446_estimate.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160404121446_estimate.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160404121446_estimate.cs b/src/Yavsc.Server/Migrations/2016/20160404121446_estimate.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160404121446_estimate.cs
rename to src/Yavsc.Server/Migrations/2016/20160404121446_estimate.cs
diff --git a/src/Yavsc/Migrations/2016/20160404130359_estimateCommand.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160404130359_estimateCommand.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160404130359_estimateCommand.cs b/src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160404130359_estimateCommand.cs
rename to src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.cs
diff --git a/src/Yavsc/Migrations/2016/20160405091432_booking.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160405091432_booking.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160405091432_booking.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160405091432_booking.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160405091432_booking.cs b/src/Yavsc.Server/Migrations/2016/20160405091432_booking.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160405091432_booking.cs
rename to src/Yavsc.Server/Migrations/2016/20160405091432_booking.cs
diff --git a/src/Yavsc/Migrations/2016/20160407112403_dailycost.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160407112403_dailycost.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160407112403_dailycost.cs b/src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160407112403_dailycost.cs
rename to src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.cs
diff --git a/src/Yavsc/Migrations/2016/20160418114001_commandCreation.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160418114001_commandCreation.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160418114001_commandCreation.cs b/src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160418114001_commandCreation.cs
rename to src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.cs
diff --git a/src/Yavsc/Migrations/2016/20160427123737_perfoffer.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160427123737_perfoffer.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160427123737_perfoffer.cs b/src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160427123737_perfoffer.cs
rename to src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.cs
diff --git a/src/Yavsc/Migrations/2016/20160506154628_siren.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160506154628_siren.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160506154628_siren.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160506154628_siren.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160506154628_siren.cs b/src/Yavsc.Server/Migrations/2016/20160506154628_siren.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160506154628_siren.cs
rename to src/Yavsc.Server/Migrations/2016/20160506154628_siren.cs
diff --git a/src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.cs b/src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.cs
rename to src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.cs
diff --git a/src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.cs b/src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.cs
rename to src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.cs
diff --git a/src/Yavsc/Migrations/2016/20160610153353_client.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160610153353_client.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160610153353_client.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160610153353_client.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160610153353_client.cs b/src/Yavsc.Server/Migrations/2016/20160610153353_client.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160610153353_client.cs
rename to src/Yavsc.Server/Migrations/2016/20160610153353_client.cs
diff --git a/src/Yavsc/Migrations/2016/20160613142037_devices.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160613142037_devices.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160613142037_devices.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160613142037_devices.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160613142037_devices.cs b/src/Yavsc.Server/Migrations/2016/20160613142037_devices.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160613142037_devices.cs
rename to src/Yavsc.Server/Migrations/2016/20160613142037_devices.cs
diff --git a/src/Yavsc/Migrations/2016/20160614010545_bookquery.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160614010545_bookquery.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160614010545_bookquery.cs b/src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160614010545_bookquery.cs
rename to src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.cs
diff --git a/src/Yavsc/Migrations/2016/20160702195348_GCMinfos.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160702195348_GCMinfos.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160702195348_GCMinfos.cs b/src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160702195348_GCMinfos.cs
rename to src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.cs
diff --git a/src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.cs b/src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.cs
rename to src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.cs
diff --git a/src/Yavsc/Migrations/2016/20160725145306_estimates.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160725145306_estimates.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160725145306_estimates.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160725145306_estimates.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160725145306_estimates.cs b/src/Yavsc.Server/Migrations/2016/20160725145306_estimates.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160725145306_estimates.cs
rename to src/Yavsc.Server/Migrations/2016/20160725145306_estimates.cs
diff --git a/src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.cs b/src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.cs
rename to src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.cs
diff --git a/src/Yavsc/Migrations/2016/20160726133002_otherOrtho.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160726133002_otherOrtho.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160726133002_otherOrtho.cs b/src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160726133002_otherOrtho.cs
rename to src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.cs
diff --git a/src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.cs b/src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.cs
rename to src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.cs
diff --git a/src/Yavsc/Migrations/2016/20160802143258_bcontentornot.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160802143258_bcontentornot.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160802143258_bcontentornot.cs b/src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160802143258_bcontentornot.cs
rename to src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.cs
diff --git a/src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.cs b/src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.cs
rename to src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.cs
diff --git a/src/Yavsc/Migrations/2016/20160901145646_products.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160901145646_products.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160901145646_products.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160901145646_products.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160901145646_products.cs b/src/Yavsc.Server/Migrations/2016/20160901145646_products.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160901145646_products.cs
rename to src/Yavsc.Server/Migrations/2016/20160901145646_products.cs
diff --git a/src/Yavsc/Migrations/2016/20160905095708_tags.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160905095708_tags.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160905095708_tags.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160905095708_tags.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160905095708_tags.cs b/src/Yavsc.Server/Migrations/2016/20160905095708_tags.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160905095708_tags.cs
rename to src/Yavsc.Server/Migrations/2016/20160905095708_tags.cs
diff --git a/src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs b/src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs
rename to src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs
diff --git a/src/Yavsc/Migrations/2016/20160917010249_yaev.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160917010249_yaev.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160917010249_yaev.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160917010249_yaev.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160917010249_yaev.cs b/src/Yavsc.Server/Migrations/2016/20160917010249_yaev.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160917010249_yaev.cs
rename to src/Yavsc.Server/Migrations/2016/20160917010249_yaev.cs
diff --git a/src/Yavsc/Migrations/2016/20160920215459_avatar.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160920215459_avatar.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160920215459_avatar.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20160920215459_avatar.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20160920215459_avatar.cs b/src/Yavsc.Server/Migrations/2016/20160920215459_avatar.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20160920215459_avatar.cs
rename to src/Yavsc.Server/Migrations/2016/20160920215459_avatar.cs
diff --git a/src/Yavsc/Migrations/2016/20161010102616_recontact.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161010102616_recontact.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161010102616_recontact.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161010102616_recontact.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161010102616_recontact.cs b/src/Yavsc.Server/Migrations/2016/20161010102616_recontact.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161010102616_recontact.cs
rename to src/Yavsc.Server/Migrations/2016/20161010102616_recontact.cs
diff --git a/src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.cs b/src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.cs
rename to src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.cs
diff --git a/src/Yavsc/Migrations/2016/20161020212947_userAddress.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161020212947_userAddress.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161020212947_userAddress.cs b/src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161020212947_userAddress.cs
rename to src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.cs
diff --git a/src/Yavsc/Migrations/2016/20161021153306_estimateLines.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161021153306_estimateLines.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161021153306_estimateLines.cs b/src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161021153306_estimateLines.cs
rename to src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.cs
diff --git a/src/Yavsc/Migrations/2016/20161101234703_chatConnection.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161101234703_chatConnection.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161101234703_chatConnection.cs b/src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161101234703_chatConnection.cs
rename to src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.cs
diff --git a/src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.cs b/src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.cs
rename to src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.cs
diff --git a/src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.cs b/src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.cs
rename to src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.cs
diff --git a/src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.cs b/src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.cs
rename to src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.cs
diff --git a/src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.cs b/src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.cs
rename to src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.cs
diff --git a/src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.cs b/src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.cs
rename to src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.cs
diff --git a/src/Yavsc/Migrations/2016/20161130084909_diskQuota.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161130084909_diskQuota.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161130084909_diskQuota.cs b/src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161130084909_diskQuota.cs
rename to src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.cs
diff --git a/src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.cs b/src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.cs
rename to src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.cs
diff --git a/src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.Designer.cs
rename to src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.Designer.cs
diff --git a/src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.cs b/src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.cs
similarity index 100%
rename from src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.cs
rename to src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.cs
diff --git a/src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.cs b/src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.cs
rename to src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.cs
diff --git a/src/Yavsc/Migrations/2017/20170102152745_locationTypes.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170102152745_locationTypes.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170102152745_locationTypes.cs b/src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170102152745_locationTypes.cs
rename to src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.cs
diff --git a/src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs b/src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs
rename to src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs
diff --git a/src/Yavsc/Migrations/2017/20170106113614_ownerProfile.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106113614_ownerProfile.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170106113614_ownerProfile.cs b/src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106113614_ownerProfile.cs
rename to src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.cs
diff --git a/src/Yavsc/Migrations/2017/20170106122307_Instruments.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106122307_Instruments.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170106122307_Instruments.cs b/src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106122307_Instruments.cs
rename to src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.cs
diff --git a/src/Yavsc/Migrations/2017/20170106124548_instrumentation.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106124548_instrumentation.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170106124548_instrumentation.cs b/src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106124548_instrumentation.cs
rename to src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.cs
diff --git a/src/Yavsc/Migrations/2017/20170106144035_activityRate.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106144035_activityRate.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170106144035_activityRate.cs b/src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106144035_activityRate.cs
rename to src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.cs
diff --git a/src/Yavsc/Migrations/2017/20170106235954_weight.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106235954_weight.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106235954_weight.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170106235954_weight.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170106235954_weight.cs b/src/Yavsc.Server/Migrations/2017/20170106235954_weight.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170106235954_weight.cs
rename to src/Yavsc.Server/Migrations/2017/20170106235954_weight.cs
diff --git a/src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.cs b/src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.cs
rename to src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.cs
diff --git a/src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.cs b/src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.cs
rename to src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.cs
diff --git a/src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.cs b/src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.cs
rename to src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.cs
diff --git a/src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.cs b/src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.cs
rename to src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.cs
diff --git a/src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.cs b/src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.cs
rename to src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.cs
diff --git a/src/Yavsc/Migrations/2017/20170117134339_entityTracking.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170117134339_entityTracking.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170117134339_entityTracking.cs b/src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170117134339_entityTracking.cs
rename to src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.cs
diff --git a/src/Yavsc/Migrations/2017/20170120095258_blogAcl.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170120095258_blogAcl.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170120095258_blogAcl.cs b/src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170120095258_blogAcl.cs
rename to src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.cs
diff --git a/src/Yavsc/Migrations/2017/20170120122324_queryTraking.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170120122324_queryTraking.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170120122324_queryTraking.cs b/src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170120122324_queryTraking.cs
rename to src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.cs
diff --git a/src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.cs b/src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.cs
rename to src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.cs
diff --git a/src/Yavsc/Migrations/2017/20170124090324_commandForms.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170124090324_commandForms.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170124090324_commandForms.cs b/src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170124090324_commandForms.cs
rename to src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.cs
diff --git a/src/Yavsc/Migrations/2017/20170126152454_trackActivity.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170126152454_trackActivity.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170126152454_trackActivity.cs b/src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170126152454_trackActivity.cs
rename to src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.cs
diff --git a/src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.cs b/src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.cs
rename to src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.cs
diff --git a/src/Yavsc/Migrations/2017/20170201002133_blacklisted.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170201002133_blacklisted.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170201002133_blacklisted.cs b/src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170201002133_blacklisted.cs
rename to src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.cs
diff --git a/src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.cs b/src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.cs
rename to src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.cs
diff --git a/src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.cs b/src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.cs
rename to src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.cs
diff --git a/src/Yavsc/Migrations/2017/20170212005346_haircut.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170212005346_haircut.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170212005346_haircut.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170212005346_haircut.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170212005346_haircut.cs b/src/Yavsc.Server/Migrations/2017/20170212005346_haircut.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170212005346_haircut.cs
rename to src/Yavsc.Server/Migrations/2017/20170212005346_haircut.cs
diff --git a/src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.cs b/src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.cs
rename to src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.cs
diff --git a/src/Yavsc/Migrations/2017/20170220102125_notifications.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170220102125_notifications.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170220102125_notifications.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170220102125_notifications.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170220102125_notifications.cs b/src/Yavsc.Server/Migrations/2017/20170220102125_notifications.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170220102125_notifications.cs
rename to src/Yavsc.Server/Migrations/2017/20170220102125_notifications.cs
diff --git a/src/Yavsc/Migrations/2017/20170220125518_dimissclick.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170220125518_dimissclick.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170220125518_dimissclick.cs b/src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170220125518_dimissclick.cs
rename to src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.cs
diff --git a/src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.cs b/src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.cs
rename to src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.cs
diff --git a/src/Yavsc/Migrations/2017/20170227151759_hairPrestations.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170227151759_hairPrestations.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170227151759_hairPrestations.cs b/src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170227151759_hairPrestations.cs
rename to src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.cs
diff --git a/src/Yavsc/Migrations/2017/20170228115359_brusherProfile.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170228115359_brusherProfile.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170228115359_brusherProfile.cs b/src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170228115359_brusherProfile.cs
rename to src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.cs
diff --git a/src/Yavsc/Migrations/2017/20170228145057_actionName.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170228145057_actionName.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170228145057_actionName.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170228145057_actionName.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170228145057_actionName.cs b/src/Yavsc.Server/Migrations/2017/20170228145057_actionName.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170228145057_actionName.cs
rename to src/Yavsc.Server/Migrations/2017/20170228145057_actionName.cs
diff --git a/src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.cs b/src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.cs
rename to src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.cs
diff --git a/src/Yavsc/Migrations/2017/20170301132531_manbrushing.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170301132531_manbrushing.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170301132531_manbrushing.cs b/src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170301132531_manbrushing.cs
rename to src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.cs
diff --git a/src/Yavsc/Migrations/2017/20170301211317_folding.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170301211317_folding.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170301211317_folding.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170301211317_folding.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170301211317_folding.cs b/src/Yavsc.Server/Migrations/2017/20170301211317_folding.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170301211317_folding.cs
rename to src/Yavsc.Server/Migrations/2017/20170301211317_folding.cs
diff --git a/src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.cs b/src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.cs
rename to src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.cs
diff --git a/src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.cs b/src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.cs
rename to src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.cs
diff --git a/src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.cs b/src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.cs
rename to src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.cs
diff --git a/src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.cs b/src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.cs
rename to src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.cs
diff --git a/src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs b/src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs
rename to src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs
diff --git a/src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs b/src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs
rename to src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs
diff --git a/src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.cs b/src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.cs
rename to src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.cs
diff --git a/src/Yavsc/Migrations/2017/20170507200834_paypal.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170507200834_paypal.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170507200834_paypal.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170507200834_paypal.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170507200834_paypal.cs b/src/Yavsc.Server/Migrations/2017/20170507200834_paypal.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170507200834_paypal.cs
rename to src/Yavsc.Server/Migrations/2017/20170507200834_paypal.cs
diff --git a/src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.cs b/src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.cs
rename to src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.cs
diff --git a/src/Yavsc/Migrations/2017/20170512102508_hairCutBill.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170512102508_hairCutBill.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170512102508_hairCutBill.cs b/src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170512102508_hairCutBill.cs
rename to src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.cs
diff --git a/src/Yavsc/Migrations/2017/20170513213829_paypalids.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170513213829_paypalids.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170513213829_paypalids.cs b/src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170513213829_paypalids.cs
rename to src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.cs
diff --git a/src/Yavsc/Migrations/2017/20170514123122_links.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170514123122_links.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170514123122_links.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170514123122_links.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170514123122_links.cs b/src/Yavsc.Server/Migrations/2017/20170514123122_links.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170514123122_links.cs
rename to src/Yavsc.Server/Migrations/2017/20170514123122_links.cs
diff --git a/src/Yavsc/Migrations/2017/20170516181745_paymentConsent.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170516181745_paymentConsent.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170516181745_paymentConsent.cs b/src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170516181745_paymentConsent.cs
rename to src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.cs
diff --git a/src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.cs b/src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.cs
rename to src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.cs
diff --git a/src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.cs b/src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.cs
rename to src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.cs
diff --git a/src/Yavsc/Migrations/2017/20170526020220_rdvPayment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170526020220_rdvPayment.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170526020220_rdvPayment.cs b/src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170526020220_rdvPayment.cs
rename to src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.cs
diff --git a/src/Yavsc/Migrations/2017/20170601115553_period.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170601115553_period.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170601115553_period.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170601115553_period.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170601115553_period.cs b/src/Yavsc.Server/Migrations/2017/20170601115553_period.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170601115553_period.cs
rename to src/Yavsc.Server/Migrations/2017/20170601115553_period.cs
diff --git a/src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.cs b/src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.cs
rename to src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.cs
diff --git a/src/Yavsc/Migrations/2017/20171002023107_Features.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171002023107_Features.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171002023107_Features.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171002023107_Features.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171002023107_Features.cs b/src/Yavsc.Server/Migrations/2017/20171002023107_Features.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171002023107_Features.cs
rename to src/Yavsc.Server/Migrations/2017/20171002023107_Features.cs
diff --git a/src/Yavsc/Migrations/2017/20171002023835_bugs.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171002023835_bugs.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171002023835_bugs.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171002023835_bugs.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171002023835_bugs.cs b/src/Yavsc.Server/Migrations/2017/20171002023835_bugs.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171002023835_bugs.cs
rename to src/Yavsc.Server/Migrations/2017/20171002023835_bugs.cs
diff --git a/src/Yavsc/Migrations/2017/20171003195221_BlogRename.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171003195221_BlogRename.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171003195221_BlogRename.cs b/src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171003195221_BlogRename.cs
rename to src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.cs
diff --git a/src/Yavsc/Migrations/2017/20171003203721_BlogComment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171003203721_BlogComment.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171003203721_BlogComment.cs b/src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171003203721_BlogComment.cs
rename to src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.cs
diff --git a/src/Yavsc/Migrations/2017/20171008184908_annouce.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171008184908_annouce.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171008184908_annouce.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171008184908_annouce.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171008184908_annouce.cs b/src/Yavsc.Server/Migrations/2017/20171008184908_annouce.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171008184908_annouce.cs
rename to src/Yavsc.Server/Migrations/2017/20171008184908_annouce.cs
diff --git a/src/Yavsc/Migrations/2017/20171008190234_announceAnwer.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171008190234_announceAnwer.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171008190234_announceAnwer.cs b/src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171008190234_announceAnwer.cs
rename to src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.cs
diff --git a/src/Yavsc/Migrations/2017/20171016090837_bugDescription.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171016090837_bugDescription.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171016090837_bugDescription.cs b/src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171016090837_bugDescription.cs
rename to src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.cs
diff --git a/src/Yavsc/Migrations/2017/20171019130120_subComment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171019130120_subComment.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171019130120_subComment.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171019130120_subComment.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171019130120_subComment.cs b/src/Yavsc.Server/Migrations/2017/20171019130120_subComment.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171019130120_subComment.cs
rename to src/Yavsc.Server/Migrations/2017/20171019130120_subComment.cs
diff --git a/src/Yavsc/Migrations/2017/20171020090944_commentAuthor.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171020090944_commentAuthor.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171020090944_commentAuthor.cs b/src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171020090944_commentAuthor.cs
rename to src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.cs
diff --git a/src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.Designer.cs
rename to src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.Designer.cs
diff --git a/src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.cs b/src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.cs
similarity index 100%
rename from src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.cs
rename to src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.cs
diff --git a/src/Yavsc/Migrations/2018/20180102153009_chatRooms.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180102153009_chatRooms.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180102153009_chatRooms.cs b/src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180102153009_chatRooms.cs
rename to src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.cs
diff --git a/src/Yavsc/Migrations/2018/20180209144114_rejectQuery.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180209144114_rejectQuery.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180209144114_rejectQuery.cs b/src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180209144114_rejectQuery.cs
rename to src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.cs
diff --git a/src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.cs b/src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.cs
rename to src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.cs
diff --git a/src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs b/src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs
rename to src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs
diff --git a/src/Yavsc/Migrations/2018/20180625113528_Git.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180625113528_Git.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180625113528_Git.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180625113528_Git.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180625113528_Git.cs b/src/Yavsc.Server/Migrations/2018/20180625113528_Git.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180625113528_Git.cs
rename to src/Yavsc.Server/Migrations/2018/20180625113528_Git.cs
diff --git a/src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs b/src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs
rename to src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs
diff --git a/src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs b/src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs
rename to src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs
diff --git a/src/Yavsc/Migrations/2018/20180805122812_gitprojectref.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180805122812_gitprojectref.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20180805122812_gitprojectref.cs b/src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20180805122812_gitprojectref.cs
rename to src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.cs
diff --git a/src/Yavsc/Migrations/2018/20181212103501_blogLang.Designer.cs b/src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20181212103501_blogLang.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20181212103501_blogLang.cs b/src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20181212103501_blogLang.cs
rename to src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.cs
diff --git a/src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.Designer.cs b/src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.cs b/src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.cs
rename to src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.cs
diff --git a/src/Yavsc/Migrations/2018/20181231153224_bugTitles.Designer.cs b/src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20181231153224_bugTitles.Designer.cs
rename to src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.Designer.cs
diff --git a/src/Yavsc/Migrations/2018/20181231153224_bugTitles.cs b/src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.cs
similarity index 100%
rename from src/Yavsc/Migrations/2018/20181231153224_bugTitles.cs
rename to src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.cs
diff --git a/src/Yavsc/Migrations/2019/20190730164137_publicCircle.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190730164137_publicCircle.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/20190730164137_publicCircle.cs b/src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190730164137_publicCircle.cs
rename to src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.cs
diff --git a/src/Yavsc/Migrations/2019/20190803204448_fileCircle.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190803204448_fileCircle.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/20190803204448_fileCircle.cs b/src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190803204448_fileCircle.cs
rename to src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.cs
diff --git a/src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.cs b/src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.cs
rename to src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.cs
diff --git a/src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.cs b/src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.cs
rename to src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.cs
diff --git a/src/Yavsc/Migrations/2019/20190819221632_instRateWInst.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190819221632_instRateWInst.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/20190819221632_instRateWInst.cs b/src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190819221632_instRateWInst.cs
rename to src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.cs
diff --git a/src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.cs b/src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.cs
rename to src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.cs b/src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.cs b/src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190127105601_banReason.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190127105601_banReason.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190127105601_banReason.cs b/src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190127105601_banReason.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs b/src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs
rename to src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.cs b/src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.cs b/src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.cs b/src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.Designer.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.Designer.cs
diff --git a/src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.cs b/src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.cs
similarity index 100%
rename from src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.cs
rename to src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.cs
diff --git a/src/Yavsc/Migrations/2021/20210530122042_template-key.Designer.cs b/src/Yavsc.Server/Migrations/2021/20210530122042_template-key.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2021/20210530122042_template-key.Designer.cs
rename to src/Yavsc.Server/Migrations/2021/20210530122042_template-key.Designer.cs
diff --git a/src/Yavsc/Migrations/2021/20210530122042_template-key.cs b/src/Yavsc.Server/Migrations/2021/20210530122042_template-key.cs
similarity index 100%
rename from src/Yavsc/Migrations/2021/20210530122042_template-key.cs
rename to src/Yavsc.Server/Migrations/2021/20210530122042_template-key.cs
diff --git a/src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs b/src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs
rename to src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs
diff --git a/src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs b/src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs
similarity index 100%
rename from src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs
rename to src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs
diff --git a/src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs b/src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs
rename to src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs
diff --git a/src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs b/src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs
similarity index 100%
rename from src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs
rename to src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs
diff --git a/src/Yavsc/Migrations/20230326173049_net7.Designer.cs b/src/Yavsc.Server/Migrations/20230326173049_net7.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/20230326173049_net7.Designer.cs
rename to src/Yavsc.Server/Migrations/20230326173049_net7.Designer.cs
diff --git a/src/Yavsc/Migrations/20230326173049_net7.cs b/src/Yavsc.Server/Migrations/20230326173049_net7.cs
similarity index 100%
rename from src/Yavsc/Migrations/20230326173049_net7.cs
rename to src/Yavsc.Server/Migrations/20230326173049_net7.cs
diff --git a/src/Yavsc/Migrations/20230405203545_userreload.Designer.cs b/src/Yavsc.Server/Migrations/20230405203545_userreload.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/20230405203545_userreload.Designer.cs
rename to src/Yavsc.Server/Migrations/20230405203545_userreload.Designer.cs
diff --git a/src/Yavsc/Migrations/20230405203545_userreload.cs b/src/Yavsc.Server/Migrations/20230405203545_userreload.cs
similarity index 100%
rename from src/Yavsc/Migrations/20230405203545_userreload.cs
rename to src/Yavsc.Server/Migrations/20230405203545_userreload.cs
diff --git a/src/Yavsc/Migrations/20230405210700_nullableFullname.Designer.cs b/src/Yavsc.Server/Migrations/20230405210700_nullableFullname.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/20230405210700_nullableFullname.Designer.cs
rename to src/Yavsc.Server/Migrations/20230405210700_nullableFullname.Designer.cs
diff --git a/src/Yavsc/Migrations/20230405210700_nullableFullname.cs b/src/Yavsc.Server/Migrations/20230405210700_nullableFullname.cs
similarity index 100%
rename from src/Yavsc/Migrations/20230405210700_nullableFullname.cs
rename to src/Yavsc.Server/Migrations/20230405210700_nullableFullname.cs
diff --git a/src/Yavsc/Migrations/20241106133541_dismiss.Designer.cs b/src/Yavsc.Server/Migrations/20241106133541_dismiss.Designer.cs
similarity index 100%
rename from src/Yavsc/Migrations/20241106133541_dismiss.Designer.cs
rename to src/Yavsc.Server/Migrations/20241106133541_dismiss.Designer.cs
diff --git a/src/Yavsc/Migrations/20241106133541_dismiss.cs b/src/Yavsc.Server/Migrations/20241106133541_dismiss.cs
similarity index 100%
rename from src/Yavsc/Migrations/20241106133541_dismiss.cs
rename to src/Yavsc.Server/Migrations/20241106133541_dismiss.cs
diff --git a/src/Yavsc.Server/Migrations/20241214154207_commentReceiver.Designer.cs b/src/Yavsc.Server/Migrations/20241214154207_commentReceiver.Designer.cs
new file mode 100644
index 00000000..bdca338d
--- /dev/null
+++ b/src/Yavsc.Server/Migrations/20241214154207_commentReceiver.Designer.cs
@@ -0,0 +1,3519 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Yavsc.Models;
+
+#nullable disable
+
+namespace Yavsc.Migrations
+{
+ [DbContext(typeof(ApplicationDbContext))]
+ [Migration("20241214154207_commentReceiver")]
+ partial class commentReceiver
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "8.0.2")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
+
+ b.Property("Name")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("NormalizedName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedName")
+ .IsUnique()
+ .HasDatabaseName("RoleNameIndex");
+
+ b.ToTable("AspNetRoles", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ClaimType")
+ .HasColumnType("text");
+
+ b.Property("ClaimValue")
+ .HasColumnType("text");
+
+ b.Property("RoleId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetRoleClaims", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("integer");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("ClaimType")
+ .HasColumnType("text");
+
+ b.Property("ClaimValue")
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserClaims", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.Property("LoginProvider")
+ .HasColumnType("text");
+
+ b.Property("ProviderKey")
+ .HasColumnType("text");
+
+ b.Property("ProviderDisplayName")
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("LoginProvider", "ProviderKey");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserLogins", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("RoleId")
+ .HasColumnType("text");
+
+ b.HasKey("UserId", "RoleId");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetUserRoles", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("LoginProvider")
+ .HasColumnType("text");
+
+ b.Property("Name")
+ .HasColumnType("text");
+
+ b.Property("Value")
+ .HasColumnType("text");
+
+ b.HasKey("UserId", "LoginProvider", "Name");
+
+ b.ToTable("AspNetUserTokens", (string)null);
+ });
+
+ modelBuilder.Entity("Yavsc.Abstract.Identity.ClientProviderInfo", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("Avatar")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("BillingAddressId")
+ .HasColumnType("bigint");
+
+ b.Property("EMail")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Phone")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserName")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("UserId");
+
+ b.ToTable("ClientProviderInfo");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Access.Ban", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("DateCreated")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("DateModified")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Reason")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("TargetId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserCreated")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserModified")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("TargetId");
+
+ b.ToTable("Ban");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Access.BlackListed", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("OwnerId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("OwnerId");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("BlackListed");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Access.CircleAuthorizationToBlogPost", b =>
+ {
+ b.Property("CircleId")
+ .HasColumnType("bigint");
+
+ b.Property("BlogPostId")
+ .HasColumnType("bigint");
+
+ b.HasKey("CircleId", "BlogPostId");
+
+ b.HasIndex("BlogPostId");
+
+ b.ToTable("CircleAuthorizationToBlogPost");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.AccountBalance", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("ContactCredits")
+ .HasColumnType("bigint");
+
+ b.Property("Credits")
+ .HasColumnType("numeric");
+
+ b.HasKey("UserId");
+
+ b.ToTable("BankStatus");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.ApplicationUser", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("AccessFailedCount")
+ .HasColumnType("integer");
+
+ b.Property("AllowMonthlyEmail")
+ .HasColumnType("boolean");
+
+ b.Property("Avatar")
+ .IsRequired()
+ .ValueGeneratedOnAdd()
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)")
+ .HasDefaultValue("/images/Users/icon_user.png");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("text");
+
+ b.Property("DedicatedGoogleCalendar")
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)");
+
+ b.Property("DiskQuota")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint")
+ .HasDefaultValue(524288000L);
+
+ b.Property("DiskUsage")
+ .HasColumnType("bigint");
+
+ b.Property("Email")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("EmailConfirmed")
+ .HasColumnType("boolean");
+
+ b.Property("FullName")
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)");
+
+ b.Property("LockoutEnabled")
+ .HasColumnType("boolean");
+
+ b.Property("LockoutEnd")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("MaxFileSize")
+ .HasColumnType("bigint");
+
+ b.Property("NormalizedEmail")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("NormalizedUserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("PasswordHash")
+ .HasColumnType("text");
+
+ b.Property("PhoneNumber")
+ .HasColumnType("text");
+
+ b.Property("PhoneNumberConfirmed")
+ .HasColumnType("boolean");
+
+ b.Property("PostalAddressId")
+ .HasColumnType("bigint");
+
+ b.Property("SecurityStamp")
+ .HasColumnType("text");
+
+ b.Property("TwoFactorEnabled")
+ .HasColumnType("boolean");
+
+ b.Property("UserName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.HasKey("Id");
+
+ b.HasAlternateKey("Email");
+
+ b.HasIndex("NormalizedEmail")
+ .HasDatabaseName("EmailIndex");
+
+ b.HasIndex("NormalizedUserName")
+ .IsUnique()
+ .HasDatabaseName("UserNameIndex");
+
+ b.HasIndex("PostalAddressId");
+
+ b.ToTable("AspNetUsers", (string)null);
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Auth.Client", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("text");
+
+ b.Property("AccessTokenLifetime")
+ .HasColumnType("integer");
+
+ b.Property("Active")
+ .HasColumnType("boolean");
+
+ b.Property("DisplayName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("character varying(128)");
+
+ b.Property("LogoutRedirectUri")
+ .IsRequired()
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)");
+
+ b.Property("RedirectUri")
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)");
+
+ b.Property("RefreshTokenLifeTime")
+ .HasColumnType("integer");
+
+ b.Property("Secret")
+ .IsRequired()
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)");
+
+ b.Property("Type")
+ .HasColumnType("integer");
+
+ b.HasKey("Id");
+
+ b.ToTable("Applications");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Auth.OAuth2Tokens", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("AccessToken")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Expiration")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("ExpiresIn")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("RefreshToken")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("TokenType")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("UserId");
+
+ b.ToTable("OAuth2Tokens");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Auth.RefreshToken", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("ClientId")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)");
+
+ b.Property("ExpiresUtc")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("IssuedUtc")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("ProtectedTicket")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Subject")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("character varying(50)");
+
+ b.HasKey("Id");
+
+ b.ToTable("RefreshTokens");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Auth.Scope", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Scopes");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.BalanceImpact", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("BalanceId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("ExecDate")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Impact")
+ .HasColumnType("numeric");
+
+ b.Property("Reason")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("BalanceId");
+
+ b.ToTable("BankBook");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Bank.BankIdentity", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AccountNumber")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("BIC")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("BankCode")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("BankedKey")
+ .HasColumnType("integer");
+
+ b.Property("IBAN")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("WicketCode")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("BankIdentity");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Billing.CommandLine", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("Count")
+ .HasColumnType("integer");
+
+ b.Property("Currency")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)");
+
+ b.Property("EstimateId")
+ .HasColumnType("bigint");
+
+ b.Property("EstimateTemplateId")
+ .HasColumnType("bigint");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)");
+
+ b.Property("UnitaryCost")
+ .HasColumnType("numeric");
+
+ b.HasKey("Id");
+
+ b.HasIndex("EstimateId");
+
+ b.HasIndex("EstimateTemplateId");
+
+ b.ToTable("CommandLine");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Billing.Estimate", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AttachedFilesString")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("AttachedGraphicsString")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("ClientId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("ClientValidationDate")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("CommandId")
+ .HasColumnType("bigint");
+
+ b.Property("CommandType")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("OwnerId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("ProviderValidationDate")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ClientId");
+
+ b.HasIndex("CommandId");
+
+ b.HasIndex("OwnerId");
+
+ b.ToTable("Estimates");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Billing.EstimateTemplate", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("OwnerId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.ToTable("EstimateTemplates");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Billing.ExceptionSIREN", b =>
+ {
+ b.Property("SIREN")
+ .HasColumnType("text");
+
+ b.HasKey("SIREN");
+
+ b.ToTable("ExceptionsSIREN");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Blog.BlogPost", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AuthorId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Content")
+ .IsRequired()
+ .HasMaxLength(56224)
+ .HasColumnType("character varying(56224)");
+
+ b.Property("DateCreated")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("DateModified")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Photo")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)");
+
+ b.Property("Rate")
+ .HasColumnType("integer");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)");
+
+ b.Property("UserCreated")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserModified")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Visible")
+ .HasColumnType("boolean");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AuthorId");
+
+ b.ToTable("Blogspot");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Blog.BlogTag", b =>
+ {
+ b.Property("PostId")
+ .HasColumnType("bigint");
+
+ b.Property("TagId")
+ .HasColumnType("bigint");
+
+ b.HasKey("PostId", "TagId");
+
+ b.HasIndex("TagId");
+
+ b.ToTable("BlogTag");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Blog.Comment", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("AuthorId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Content")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("DateCreated")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("DateModified")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("ParentId")
+ .HasColumnType("bigint");
+
+ b.Property("PostId")
+ .HasColumnType("bigint");
+
+ b.Property("ReceiverId")
+ .HasColumnType("bigint");
+
+ b.Property("UserCreated")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserModified")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Visible")
+ .HasColumnType("boolean");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AuthorId");
+
+ b.HasIndex("ParentId");
+
+ b.HasIndex("PostId");
+
+ b.ToTable("Comment");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Calendar.Schedule", b =>
+ {
+ b.Property("OwnerId")
+ .HasColumnType("text");
+
+ b.HasKey("OwnerId");
+
+ b.ToTable("Schedule");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Calendar.ScheduledEvent", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("PeriodEnd")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("PeriodStart")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Reccurence")
+ .HasColumnType("integer");
+
+ b.Property("ScheduleOwnerId")
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ScheduleOwnerId");
+
+ b.HasIndex("PeriodStart", "PeriodEnd");
+
+ b.ToTable("ScheduledEvent");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Chat.ChatConnection", b =>
+ {
+ b.Property("ConnectionId")
+ .HasColumnType("text");
+
+ b.Property("ApplicationUserId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Connected")
+ .HasColumnType("boolean");
+
+ b.Property("UserAgent")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("ConnectionId");
+
+ b.HasIndex("ApplicationUserId");
+
+ b.ToTable("ChatConnection");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Chat.ChatRoom", b =>
+ {
+ b.Property("Name")
+ .HasColumnType("text");
+
+ b.Property("DateCreated")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("DateModified")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("LatestJoinPart")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("OwnerId")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Topic")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserCreated")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserModified")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Name");
+
+ b.HasIndex("OwnerId");
+
+ b.ToTable("ChatRoom");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Chat.ChatRoomAccess", b =>
+ {
+ b.Property("ChannelName")
+ .HasColumnType("text");
+
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("Level")
+ .HasColumnType("integer");
+
+ b.HasKey("ChannelName", "UserId");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("ChatRoomAccess");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Cratie.Option", b =>
+ {
+ b.Property("Code")
+ .HasColumnType("text");
+
+ b.Property("CodeScrutin")
+ .HasColumnType("text");
+
+ b.Property("DateCreated")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("DateModified")
+ .HasColumnType("timestamp with time zone");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserCreated")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("UserModified")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Code", "CodeScrutin");
+
+ b.ToTable("Option");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Drawing.Color", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
+
+ b.Property("Blue")
+ .HasColumnType("smallint");
+
+ b.Property("Green")
+ .HasColumnType("smallint");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.Property("Red")
+ .HasColumnType("smallint");
+
+ b.HasKey("Id");
+
+ b.ToTable("Color");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Forms.Form", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("text");
+
+ b.Property("Summary")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b.HasKey("Id");
+
+ b.ToTable("Form");
+ });
+
+ modelBuilder.Entity("Yavsc.Models.Haircut.BrusherProfile", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("text");
+
+ b.Property("ActionDistance")
+ .HasColumnType("integer");
+
+ b.Property("CarePrice")
+ .HasColumnType("numeric");
+
+ b.Property("FlatFeeDiscount")
+ .HasColumnType("numeric");
+
+ b.Property("HalfBalayagePrice")
+ .HasColumnType("numeric");
+
+ b.Property("HalfBrushingPrice")
+ .HasColumnType("numeric");
+
+ b.Property("HalfColorPrice")
+ .HasColumnType("numeric");
+
+ b.Property("HalfDefrisPrice")
+ .HasColumnType("numeric");
+
+ b.Property("HalfFoldingPrice")
+ .HasColumnType("numeric");
+
+ b.Property("HalfMechPrice")
+ .HasColumnType("numeric");
+
+ b.Property("HalfMultiColorPrice")
+ .HasColumnType("numeric");
+
+ b.Property("HalfPermanentPrice")
+ .HasColumnType("numeric");
+
+ b.Property("KidCutPrice")
+ .HasColumnType("numeric");
+
+ b.Property("LongBalayagePrice")
+ .HasColumnType("numeric");
+
+ b.Property