Skip to content

Commit 9591b8c

Browse files
chunk1tychunk1ty
committed
Revert "Feature/improve design"
1 parent 282caca commit 9591b8c

98 files changed

Lines changed: 596 additions & 1627 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎TeachersDiary.sln‎

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2727
EndProject
2828
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.CiDependencies", "src\TeachersDiary.CiDependencies\TeachersDiary.CiDependencies.csproj", "{455282A1-00D7-42BD-93C8-EE1A754704E2}"
2929
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Data.Contracts", "src\Data\TeachersDiary.Data.Contracts\TeachersDiary.Data.Contracts.csproj", "{F9468348-493F-47E5-B0F3-8A952B7BCC53}"
31+
EndProject
3032
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Data.Services", "src\Data\TeachersDiary.Data.Services\TeachersDiary.Data.Services.csproj", "{32C7407C-43B7-4208-828F-030323646860}"
3133
EndProject
3234
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Data.Services.Contracts", "src\Data\TeachersDiary.Data.Services.Contracts\TeachersDiary.Data.Services.Contracts.csproj", "{35C455BF-326C-47B4-A20E-2E4E67E59649}"
3335
EndProject
36+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{16B6903A-2B4C-4CEC-A2B0-A2174E0A8429}"
37+
EndProject
38+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Common.Constants", "src\Common\TeachersDiary.Common.Constants\TeachersDiary.Common.Constants.csproj", "{650857DB-DDBE-4586-9E16-62A27E0FF209}"
39+
EndProject
3440
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Services", "src\Services\TeachersDiary.Services\TeachersDiary.Services.csproj", "{BCDA0869-B632-4B8D-B0E3-167C039BFF19}"
3541
EndProject
3642
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Data.Identity", "src\Data\TeachersDiary.Data.Identity\TeachersDiary.Data.Identity.csproj", "{7B1AF903-26DD-451D-A37C-DE14FBBD8047}"
3743
EndProject
44+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Common.Extensions", "src\Common\TeachersDiary.Common.Extensions\TeachersDiary.Common.Extensions.csproj", "{5D12CB90-074A-452C-911A-BBBB7CF2CB07}"
45+
EndProject
3846
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Domain", "src\TeachersDiary.Domain\TeachersDiary.Domain.csproj", "{2EF30906-2AB7-46F5-AAA3-C1AEDCAB824C}"
3947
EndProject
4048
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Services.ExcelParser", "src\Services\TeachersDiary.Services.ExcelParser\TeachersDiary.Services.ExcelParser.csproj", "{1A9EC2F9-335B-49BB-9533-C3846267A555}"
@@ -45,6 +53,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration"
4553
EndProject
4654
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{0F9944ED-4423-4FF2-81F6-39B17A820475}"
4755
EndProject
56+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Data.Ef.Tests", "test\Integration\Data\TeachersDiary.Data.Ef.Tests\TeachersDiary.Data.Ef.Tests.csproj", "{29EABAE3-2C71-4EE3-90AE-DE5E818C25E9}"
57+
EndProject
4858
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit", "Unit", "{597C6642-D48B-489E-982F-07E7F624320E}"
4959
EndProject
5060
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{7B943785-B027-42DF-9495-F95BB3268EB4}"
@@ -55,20 +65,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{2D0808
5565
EndProject
5666
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Common.Extensions.Tests", "test\Unit\Common\TeachersDiary.Common.Extensions.Tests\TeachersDiary.Common.Extensions.Tests.csproj", "{D2B2FF6F-2ACA-4B81-B49F-5BD172C6B151}"
5767
EndProject
58-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{D9F33544-A5BF-411F-8F3C-217FC5E88BE2}"
59-
EndProject
60-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Services.Tests", "test\Unit\Services\TeachersDiary.Services.Tests\TeachersDiary.Services.Tests.csproj", "{8EAD5DFD-CE92-49D8-9E12-77174667D99D}"
61-
EndProject
62-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Data.Services.Tests", "test\Integration\Data\TeachersDiary.Data.Services.Tests\TeachersDiary.Data.Services.Tests.csproj", "{811A1AF0-11EB-4ADE-A1B5-B3E1B617A950}"
63-
EndProject
64-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Common", "src\TeachersDiary.Common\TeachersDiary.Common.csproj", "{7CDA362C-6E1D-4CE2-83E3-C8FF3A10047D}"
65-
EndProject
66-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{1D8303FD-3B8B-4883-8535-BA8D0757A645}"
67-
EndProject
68-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Teachers.Diary.Data.Services.Tests", "test\Unit\Data\Teachers.Diary.Data.Services.Tests\Teachers.Diary.Data.Services.Tests.csproj", "{0B438553-54EE-45B1-9A49-694E40485F78}"
69-
EndProject
70-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeachersDiary.Services.Contracts", "src\Services\TeachersDiary.Services.Contracts\TeachersDiary.Services.Contracts.csproj", "{466D697E-0E8E-47B4-9997-901ECAD63465}"
71-
EndProject
7268
Global
7369
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7470
Debug|Any CPU = Debug|Any CPU
@@ -87,6 +83,10 @@ Global
8783
{455282A1-00D7-42BD-93C8-EE1A754704E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
8884
{455282A1-00D7-42BD-93C8-EE1A754704E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
8985
{455282A1-00D7-42BD-93C8-EE1A754704E2}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{F9468348-493F-47E5-B0F3-8A952B7BCC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87+
{F9468348-493F-47E5-B0F3-8A952B7BCC53}.Debug|Any CPU.Build.0 = Debug|Any CPU
88+
{F9468348-493F-47E5-B0F3-8A952B7BCC53}.Release|Any CPU.ActiveCfg = Release|Any CPU
89+
{F9468348-493F-47E5-B0F3-8A952B7BCC53}.Release|Any CPU.Build.0 = Release|Any CPU
9090
{32C7407C-43B7-4208-828F-030323646860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9191
{32C7407C-43B7-4208-828F-030323646860}.Debug|Any CPU.Build.0 = Debug|Any CPU
9292
{32C7407C-43B7-4208-828F-030323646860}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -95,6 +95,10 @@ Global
9595
{35C455BF-326C-47B4-A20E-2E4E67E59649}.Debug|Any CPU.Build.0 = Debug|Any CPU
9696
{35C455BF-326C-47B4-A20E-2E4E67E59649}.Release|Any CPU.ActiveCfg = Release|Any CPU
9797
{35C455BF-326C-47B4-A20E-2E4E67E59649}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{650857DB-DDBE-4586-9E16-62A27E0FF209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{650857DB-DDBE-4586-9E16-62A27E0FF209}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{650857DB-DDBE-4586-9E16-62A27E0FF209}.Release|Any CPU.ActiveCfg = Release|Any CPU
101+
{650857DB-DDBE-4586-9E16-62A27E0FF209}.Release|Any CPU.Build.0 = Release|Any CPU
98102
{BCDA0869-B632-4B8D-B0E3-167C039BFF19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99103
{BCDA0869-B632-4B8D-B0E3-167C039BFF19}.Debug|Any CPU.Build.0 = Debug|Any CPU
100104
{BCDA0869-B632-4B8D-B0E3-167C039BFF19}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -103,6 +107,10 @@ Global
103107
{7B1AF903-26DD-451D-A37C-DE14FBBD8047}.Debug|Any CPU.Build.0 = Debug|Any CPU
104108
{7B1AF903-26DD-451D-A37C-DE14FBBD8047}.Release|Any CPU.ActiveCfg = Release|Any CPU
105109
{7B1AF903-26DD-451D-A37C-DE14FBBD8047}.Release|Any CPU.Build.0 = Release|Any CPU
110+
{5D12CB90-074A-452C-911A-BBBB7CF2CB07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
111+
{5D12CB90-074A-452C-911A-BBBB7CF2CB07}.Debug|Any CPU.Build.0 = Debug|Any CPU
112+
{5D12CB90-074A-452C-911A-BBBB7CF2CB07}.Release|Any CPU.ActiveCfg = Release|Any CPU
113+
{5D12CB90-074A-452C-911A-BBBB7CF2CB07}.Release|Any CPU.Build.0 = Release|Any CPU
106114
{2EF30906-2AB7-46F5-AAA3-C1AEDCAB824C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107115
{2EF30906-2AB7-46F5-AAA3-C1AEDCAB824C}.Debug|Any CPU.Build.0 = Debug|Any CPU
108116
{2EF30906-2AB7-46F5-AAA3-C1AEDCAB824C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -115,6 +123,10 @@ Global
115123
{0EE826C5-185A-4BD6-B4AD-CDBE8191D7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
116124
{0EE826C5-185A-4BD6-B4AD-CDBE8191D7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
117125
{0EE826C5-185A-4BD6-B4AD-CDBE8191D7DF}.Release|Any CPU.Build.0 = Release|Any CPU
126+
{29EABAE3-2C71-4EE3-90AE-DE5E818C25E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127+
{29EABAE3-2C71-4EE3-90AE-DE5E818C25E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
128+
{29EABAE3-2C71-4EE3-90AE-DE5E818C25E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
129+
{29EABAE3-2C71-4EE3-90AE-DE5E818C25E9}.Release|Any CPU.Build.0 = Release|Any CPU
118130
{617F9B76-0E6C-457B-8946-AC6FE0710012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119131
{617F9B76-0E6C-457B-8946-AC6FE0710012}.Debug|Any CPU.Build.0 = Debug|Any CPU
120132
{617F9B76-0E6C-457B-8946-AC6FE0710012}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -123,26 +135,6 @@ Global
123135
{D2B2FF6F-2ACA-4B81-B49F-5BD172C6B151}.Debug|Any CPU.Build.0 = Debug|Any CPU
124136
{D2B2FF6F-2ACA-4B81-B49F-5BD172C6B151}.Release|Any CPU.ActiveCfg = Release|Any CPU
125137
{D2B2FF6F-2ACA-4B81-B49F-5BD172C6B151}.Release|Any CPU.Build.0 = Release|Any CPU
126-
{8EAD5DFD-CE92-49D8-9E12-77174667D99D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127-
{8EAD5DFD-CE92-49D8-9E12-77174667D99D}.Debug|Any CPU.Build.0 = Debug|Any CPU
128-
{8EAD5DFD-CE92-49D8-9E12-77174667D99D}.Release|Any CPU.ActiveCfg = Release|Any CPU
129-
{8EAD5DFD-CE92-49D8-9E12-77174667D99D}.Release|Any CPU.Build.0 = Release|Any CPU
130-
{811A1AF0-11EB-4ADE-A1B5-B3E1B617A950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131-
{811A1AF0-11EB-4ADE-A1B5-B3E1B617A950}.Debug|Any CPU.Build.0 = Debug|Any CPU
132-
{811A1AF0-11EB-4ADE-A1B5-B3E1B617A950}.Release|Any CPU.ActiveCfg = Release|Any CPU
133-
{811A1AF0-11EB-4ADE-A1B5-B3E1B617A950}.Release|Any CPU.Build.0 = Release|Any CPU
134-
{7CDA362C-6E1D-4CE2-83E3-C8FF3A10047D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135-
{7CDA362C-6E1D-4CE2-83E3-C8FF3A10047D}.Debug|Any CPU.Build.0 = Debug|Any CPU
136-
{7CDA362C-6E1D-4CE2-83E3-C8FF3A10047D}.Release|Any CPU.ActiveCfg = Release|Any CPU
137-
{7CDA362C-6E1D-4CE2-83E3-C8FF3A10047D}.Release|Any CPU.Build.0 = Release|Any CPU
138-
{0B438553-54EE-45B1-9A49-694E40485F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139-
{0B438553-54EE-45B1-9A49-694E40485F78}.Debug|Any CPU.Build.0 = Debug|Any CPU
140-
{0B438553-54EE-45B1-9A49-694E40485F78}.Release|Any CPU.ActiveCfg = Release|Any CPU
141-
{0B438553-54EE-45B1-9A49-694E40485F78}.Release|Any CPU.Build.0 = Release|Any CPU
142-
{466D697E-0E8E-47B4-9997-901ECAD63465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143-
{466D697E-0E8E-47B4-9997-901ECAD63465}.Debug|Any CPU.Build.0 = Debug|Any CPU
144-
{466D697E-0E8E-47B4-9997-901ECAD63465}.Release|Any CPU.ActiveCfg = Release|Any CPU
145-
{466D697E-0E8E-47B4-9997-901ECAD63465}.Release|Any CPU.Build.0 = Release|Any CPU
146138
EndGlobalSection
147139
GlobalSection(SolutionProperties) = preSolution
148140
HideSolutionNode = FALSE
@@ -154,26 +146,24 @@ Global
154146
{B3B52A78-365C-42AC-BD87-A5EA269573B9} = {BD9A4336-EB90-4D20-A2DC-F0ADC2543643}
155147
{CDC2DD1B-3420-467A-B330-A90D71396999} = {B3B52A78-365C-42AC-BD87-A5EA269573B9}
156148
{455282A1-00D7-42BD-93C8-EE1A754704E2} = {BD9A4336-EB90-4D20-A2DC-F0ADC2543643}
149+
{F9468348-493F-47E5-B0F3-8A952B7BCC53} = {B3B52A78-365C-42AC-BD87-A5EA269573B9}
157150
{32C7407C-43B7-4208-828F-030323646860} = {B3B52A78-365C-42AC-BD87-A5EA269573B9}
158151
{35C455BF-326C-47B4-A20E-2E4E67E59649} = {B3B52A78-365C-42AC-BD87-A5EA269573B9}
152+
{16B6903A-2B4C-4CEC-A2B0-A2174E0A8429} = {BD9A4336-EB90-4D20-A2DC-F0ADC2543643}
153+
{650857DB-DDBE-4586-9E16-62A27E0FF209} = {16B6903A-2B4C-4CEC-A2B0-A2174E0A8429}
159154
{BCDA0869-B632-4B8D-B0E3-167C039BFF19} = {1D257161-D3F2-422D-86BA-1AEF33BF7208}
160155
{7B1AF903-26DD-451D-A37C-DE14FBBD8047} = {B3B52A78-365C-42AC-BD87-A5EA269573B9}
156+
{5D12CB90-074A-452C-911A-BBBB7CF2CB07} = {16B6903A-2B4C-4CEC-A2B0-A2174E0A8429}
161157
{2EF30906-2AB7-46F5-AAA3-C1AEDCAB824C} = {BD9A4336-EB90-4D20-A2DC-F0ADC2543643}
162158
{1A9EC2F9-335B-49BB-9533-C3846267A555} = {1D257161-D3F2-422D-86BA-1AEF33BF7208}
163159
{0EE826C5-185A-4BD6-B4AD-CDBE8191D7DF} = {B3B52A78-365C-42AC-BD87-A5EA269573B9}
164160
{EF182658-C946-49EC-A918-907C8935528F} = {69487108-D63E-4C0E-B118-73F15491CA7C}
165161
{0F9944ED-4423-4FF2-81F6-39B17A820475} = {EF182658-C946-49EC-A918-907C8935528F}
162+
{29EABAE3-2C71-4EE3-90AE-DE5E818C25E9} = {0F9944ED-4423-4FF2-81F6-39B17A820475}
166163
{597C6642-D48B-489E-982F-07E7F624320E} = {69487108-D63E-4C0E-B118-73F15491CA7C}
167164
{7B943785-B027-42DF-9495-F95BB3268EB4} = {597C6642-D48B-489E-982F-07E7F624320E}
168165
{617F9B76-0E6C-457B-8946-AC6FE0710012} = {7B943785-B027-42DF-9495-F95BB3268EB4}
169166
{2D0808A4-6732-4666-B62B-6A4A4C90238B} = {597C6642-D48B-489E-982F-07E7F624320E}
170167
{D2B2FF6F-2ACA-4B81-B49F-5BD172C6B151} = {2D0808A4-6732-4666-B62B-6A4A4C90238B}
171-
{D9F33544-A5BF-411F-8F3C-217FC5E88BE2} = {597C6642-D48B-489E-982F-07E7F624320E}
172-
{8EAD5DFD-CE92-49D8-9E12-77174667D99D} = {D9F33544-A5BF-411F-8F3C-217FC5E88BE2}
173-
{811A1AF0-11EB-4ADE-A1B5-B3E1B617A950} = {0F9944ED-4423-4FF2-81F6-39B17A820475}
174-
{7CDA362C-6E1D-4CE2-83E3-C8FF3A10047D} = {BD9A4336-EB90-4D20-A2DC-F0ADC2543643}
175-
{1D8303FD-3B8B-4883-8535-BA8D0757A645} = {597C6642-D48B-489E-982F-07E7F624320E}
176-
{0B438553-54EE-45B1-9A49-694E40485F78} = {1D8303FD-3B8B-4883-8535-BA8D0757A645}
177-
{466D697E-0E8E-47B4-9997-901ECAD63465} = {1D257161-D3F2-422D-86BA-1AEF33BF7208}
178168
EndGlobalSection
179169
EndGlobal

‎appveyor.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
branches:
44
only:
55
- master
6-
- develop
76

87
before_build:
98
- ps: nuget restore TeachersDiary.sln
@@ -18,9 +17,7 @@ environment:
1817

1918
after_test:
2019
- packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -filter:"+[*]* -[*]*ViewModel -[*]*Entity -[*]*Domain -[*]*Config" -target:"packages\NUnit.ConsoleRunner.3.6.1\tools\nunit3-console.exe" -targetargs:"/domain:single
21-
test\Unit\Clients\TeachersDiary.Clients.Mvc.Tests\bin\Debug\TeachersDiary.Clients.Mvc.Tests.dll
22-
test\Unit\Common\TeachersDiary.Common.Extensions.Tests\bin\Debug\TeachersDiary.Common.Extensions.Test.dll
23-
test\Unit\Data\TeachersDiary.Data.Services.Tests\bin\Debug\TeachersDiary.Data.Services.Tests.dll
24-
test\Unit\Services\TeachersDiary.Services.Tests\bin\Debug\TeachersDiary.Services.Tests.dll" -output:coverage.xml
20+
test\Unit\Clients\TeachersDiary.Clients.Mvc.Tests\bin\Debug\TeachersDiary.Clients.Mvc.Tests.dll
21+
test\Unit\Common\TeachersDiary.Common.Extensions.Tests\bin\Debug\TeachersDiary.Common.Extensions.Test.dll" -output:coverage.xml
2522

2623
- packages\coveralls.io.1.3.4\tools\coveralls.net.exe --opencover coverage.xml

‎src/Clients/TeachersDiary.Clients.Mvc/App_Start/LoggingConfig.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Clients/TeachersDiary.Clients.Mvc/App_Start/NinjectConfig.cs‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,55 @@
55
using Microsoft.AspNet.Identity.Owin;
66
using Microsoft.Web.Infrastructure.DynamicModuleHelper;
77
using Ninject;
8-
using Ninject.Syntax;
98
using Ninject.Web.Common;
10-
using Ninject.Extensions.Conventions;
11-
using Ninject.Extensions.Conventions.Syntax;
129

1310
using TeachersDiary.Clients.Mvc;
11+
using TeachersDiary.Data.Contracts;
1412
using TeachersDiary.Data.Ef;
1513
using TeachersDiary.Data.Ef.Contracts;
16-
using TeachersDiary.Data.Ef.GenericRepository;
14+
using TeachersDiary.Data.Ef.Repositories;
1715
using TeachersDiary.Data.Identity;
1816
using TeachersDiary.Data.Identity.Contracts;
1917
using TeachersDiary.Data.Services;
2018
using TeachersDiary.Data.Services.Contracts;
19+
using TeachersDiary.Services.Encrypting;
2120
using TeachersDiary.Services.ExcelParser;
2221
using TeachersDiary.Services.Mapping;
22+
using TeachersDiary.Services.Mapping.Contracts;
2323

2424
[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(NinjectConfig), "Start")]
2525
[assembly: WebActivatorEx.ApplicationShutdownMethodAttribute(typeof(NinjectConfig), "Stop")]
2626

2727
namespace TeachersDiary.Clients.Mvc
2828
{
2929
[ExcludeFromCodeCoverage]
30-
public static class NinjectConfig
30+
public static class NinjectConfig
3131
{
3232
private static readonly Bootstrapper bootstrapper = new Bootstrapper();
3333

3434
/// <summary>
3535
/// Starts the application
3636
/// </summary>
37-
public static void Start()
37+
public static void Start()
3838
{
3939
DynamicModuleUtility.RegisterModule(typeof(OnePerRequestHttpModule));
4040
DynamicModuleUtility.RegisterModule(typeof(NinjectHttpModule));
4141
bootstrapper.Initialize(CreateKernel);
4242
}
43-
43+
4444
/// <summary>
4545
/// Stops the application.
4646
/// </summary>
4747
public static void Stop()
4848
{
4949
bootstrapper.ShutDown();
5050
}
51-
51+
5252
/// <summary>
5353
/// Creates the kernel that will manage your application.
5454
/// </summary>
5555
/// <returns>The created kernel.</returns>
56-
public static IKernel CreateKernel()
56+
private static IKernel CreateKernel()
5757
{
5858
var kernel = new StandardKernel();
5959
try
@@ -77,30 +77,33 @@ public static IKernel CreateKernel()
7777
/// <param name="kernel">The kernel.</param>
7878
private static void RegisterServices(IKernel kernel)
7979
{
80-
RegisterDataModule(kernel);
80+
RegisterDbModule(kernel);
81+
82+
kernel.Bind<IExelParser>().To<ExelParser>();
83+
kernel.Bind<IEncryptingService>().To<EncryptingService>().InSingletonScope();
84+
85+
kernel.Bind<IMappingService>().To<MappingService>().InSingletonScope();
8186

8287
kernel.Bind<IIdentitySignInService>().ToMethod(_ => HttpContext.Current.GetOwinContext().Get<ApplicationSignInManager>());
8388
kernel.Bind<IIdentityUserManagerService>().ToMethod(_ => HttpContext.Current.GetOwinContext().GetUserManager<ApplicationUserManager>());
84-
85-
kernel.Bind(x => x
86-
.FromAssembliesMatching("TeachersDiary.Service*")
87-
.SelectAllClasses()
88-
.BindDefaultInterface());
8989
}
9090

91-
private static void RegisterDataModule(IKernel kernel)
91+
private static void RegisterDbModule(IKernel kernel)
9292
{
93-
kernel.Bind(typeof(ITeachersDiaryDbContext), typeof(IUnitOfWork))
93+
kernel.Bind(typeof(ITeachersDiaryDbContext),
94+
typeof(IUnitOfWork))
9495
.ToMethod(ctx => ctx.Kernel.Get<TeachersDiaryDbContext>())
9596
.InRequestScope();
9697

97-
kernel.Bind(typeof(IEntityFrameworkGenericRepository<>)).To(typeof(EntityFrameworkGenericRepository<>));
98-
kernel.Bind(typeof(IQuerySettings<>)).To(typeof(QuerySettings<>));
98+
kernel.Bind<IClassRepository>().To<ClassRepository>();
99+
kernel.Bind<ISchoolRepository>().To<SchoolRepository>();
100+
kernel.Bind<ITeacherRepository>().To<TeacherRepository>();
99101

100-
kernel.Bind(x => x
101-
.FromAssembliesMatching("TeachersDiary.Data.Services*")
102-
.SelectAllClasses()
103-
.BindDefaultInterface());
102+
kernel.Bind<IAbsenceService>().To<AbsenceService>();
103+
kernel.Bind<IClassService>().To<ClassService>();
104+
kernel.Bind<ISchoolService>().To<SchoolService>();
105+
kernel.Bind<IAuthenticationService>().To<AuthenticationService>();
106+
kernel.Bind<ITeacherService>().To<TeacherService>();
104107
}
105108
}
106109
}

‎src/Clients/TeachersDiary.Clients.Mvc/Controllers/AbsenseController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using TeachersDiary.Common.Extensions;
88
using TeachersDiary.Data.Services.Contracts;
99
using TeachersDiary.Domain;
10-
using TeachersDiary.Services.Contracts.Mapping;
10+
using TeachersDiary.Services.Mapping.Contracts;
1111

1212
namespace TeachersDiary.Clients.Mvc.Controllers
1313
{

‎src/Clients/TeachersDiary.Clients.Mvc/Controllers/Abstracts/TeacherController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Web.Mvc;
2+
23
using TeachersDiary.Common.Constants;
34

45
namespace TeachersDiary.Clients.Mvc.Controllers.Abstracts

‎src/Clients/TeachersDiary.Clients.Mvc/Controllers/ClassController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
using TeachersDiary.Clients.Mvc.Controllers.Abstracts;
1111
using TeachersDiary.Clients.Mvc.ViewModels.Class;
1212
using TeachersDiary.Data.Services.Contracts;
13-
using TeachersDiary.Services.Contracts.Mapping;
1413
using TeachersDiary.Services.ExcelParser;
14+
using TeachersDiary.Services.Mapping.Contracts;
1515

1616
namespace TeachersDiary.Clients.Mvc.Controllers
1717
{
@@ -59,7 +59,7 @@ public async Task<ActionResult> Index(string classId)
5959
[HttpGet]
6060
public async Task<ActionResult> Delete(string classId)
6161
{
62-
await _classService.DeleteByIdAsync(classId);
62+
await _classService.DeleteById(classId);
6363

6464
return this.RedirectToAction<ClassController>(x => x.All());
6565
}

‎src/Clients/TeachersDiary.Clients.Mvc/Global.asax.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ protected void Application_Start()
1313
ViewEngineConfig.RegisterViewEngine();
1414
AutoMapperConfig.RegisterAutomapper();
1515
DbConfig.RegisterDb();
16-
LoggingConfig.RegisterLog4Net();
1716

1817
AreaRegistration.RegisterAllAreas();
1918
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);

0 commit comments

Comments
 (0)