GitSource/Manarah
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: GitSource:550d53e9c764122750f9749e31a71b12b629d495
Branches Tags
GitSource:main
...
compare: GitSource:b1f7fa53f8774ab86cfa107e158df68832fd07a4
Branches Tags
GitSource:main

4 Commits
550d53e9c7 ... b1f7fa53f8

Author SHA1 Message Date
amdnaji
b1f7fa53f8 #5 Added sqlite as default db provider 2024-05-06 06:54:49 +00:00
amdnaji
4aec2938f9 Merge branch 'main' of https://gitsource.sa/GitSource/Manarah 2024-05-06 06:53:30 +00:00
amdnaji
4c7020b267 Add sqlite as default db provider 2024-05-06 06:53:13 +00:00
amdnaji
b8bf339a04 Fixed condition for unreachable server 2024-04-16 10:12:12 +00:00
15 changed files with 191 additions and 48 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

@ -398,3 +398,6 @@ FodyWeavers.xsd
# JetBrains Rider
*.sln.iml
/Manarah.App/Manarah.db
/Manarah.App/Manarah.db-shm
/Manarah.App/Manarah.db-wal

1
Manarah.App/Manarah.App.csproj
View File

@ -22,6 +22,7 @@
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
</ItemGroup>
</Project>

33
Manarah.App/Migrations/20240327205653_InitialCreate.cs
View File

@ -1,33 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Manarah.App.Migrations
{
/// <inheritdoc />
public partial class InitialCreate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Server",
columns: table => new
{
IPAddress = table.Column<string>(type: "nvarchar(450)", nullable: false),
Description = table.Column<string>(type: "nvarchar(max)", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Server", x => x.IPAddress);
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Server");
}
}
}

25
Manarah.App/Program.cs
View File

@ -10,12 +10,25 @@ var builder = WebApplication.CreateBuilder(args);
// Add services to the container.
builder.Services.AddControllersWithViews();
builder.Services.AddDbContext<ManarahContext>(options =>
{
options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection"));
});
var configuration = builder.Configuration;
//Register Service of typ Base Service for DI Container
//Set db to Sqlite if as default db provider
var provider = configuration.GetValue("Provider", "Sqlite");
builder.Services.AddDbContext<ManarahContext>(
options => _ = provider switch
{
"Sqlite" => options.UseSqlite(
configuration.GetConnectionString("SqliteConnection"),
x => x.MigrationsAssembly("Manarah.SqliteMigrations")),
"SqlServer" => options.UseSqlServer(
configuration.GetConnectionString("SqlServerConnection"),
x => x.MigrationsAssembly("Manarah.SqlServerMigrations")),
_ => throw new Exception($"Unsupported provider: {provider}")
});
//Register Service of typ Base Service for DI
var assembly = Assembly.Load(typeof(BaseService).Assembly.FullName);
var serviceList = assembly.DefinedTypes.Where(d => d.BaseType == typeof(BaseService));
foreach (var service in serviceList)
@ -33,7 +46,7 @@ if (!app.Environment.IsDevelopment())
app.UseHsts();
}
app.UseHttpsRedirection();
app.UseStaticFiles();
app.UseRouting();

2
Manarah.App/Views/Home/Index.cshtml
View File

@ -29,7 +29,7 @@
<div class="small-box text-bg-danger">
<div class="inner">
<p>Unreachable servers</p>
<h3>@Model.Where(s => s.IsReachable).Count()</h3>
<h3>@Model.Where(s => !s.IsReachable).Count()</h3>
</div>
<svg class="small-box-icon" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
<path d="M4.5 5a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1M3 4.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0" />

5
Manarah.App/appsettings.json
View File

@ -1,8 +1,9 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=localhost;Database=ManarahDb;Trusted_Connection=True;MultipleActiveResultSets=true;encrypt=false"
"SqlServerConnection": "Server=localhost;Database=ManarahDb;Trusted_Connection=True;MultipleActiveResultSets=true;encrypt=false",
"SqliteConnection": "Data Source=Manarah.db;Cache=Shared"
},
"Provider": "Sqlite",
"Logging": {
"LogLevel": {
"Default": "Information",

13
Manarah.SqlServerMigrations/Manarah.SqlServerMigrations.csproj Normal file
View File

@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>..\Manarah.App\bin\</BaseOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Manarah.App\Manarah.App.csproj" />
</ItemGroup>
</Project>

6
Manarah.App/Migrations/20240327205653_InitialCreate.Designer.cs → Manarah.SqlServerMigrations/Migrations/20240505211647_InitCreate.Designer.cs generated
View File

@ -8,11 +8,11 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Manarah.App.Migrations
namespace Manarah.SqlServerMigrations.Migrations
{
[DbContext(typeof(ManarahContext))]
[Migration("20240327205653_InitialCreate")]
partial class InitialCreate
[Migration("20240505211647_InitCreate")]
partial class InitCreate
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)

22
Manarah.SqlServerMigrations/Migrations/20240505211647_InitCreate.cs Normal file
View File

@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Manarah.SqlServerMigrations.Migrations
{
/// <inheritdoc />
public partial class InitCreate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

2
Manarah.App/Migrations/ManarahContextModelSnapshot.cs → Manarah.SqlServerMigrations/Migrations/ManarahContextModelSnapshot.cs
View File

@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Manarah.App.Migrations
namespace Manarah.SqlServerMigrations.Migrations
{
[DbContext(typeof(ManarahContext))]
partial class ManarahContextModelSnapshot : ModelSnapshot

12
Manarah.SqliteMigrations/Manarah.SqliteMigrations.csproj Normal file
View File

@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>..\Manarah.App\bin\</BaseOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Manarah.App\Manarah.App.csproj" />
</ItemGroup>
</Project>

37
Manarah.SqliteMigrations/Migrations/20240505211518_InitCreate.Designer.cs generated Normal file
View File

@ -0,0 +1,37 @@
// <auto-generated />
using Manarah.App.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Manarah.SqliteMigrations.Migrations
{
[DbContext(typeof(ManarahContext))]
[Migration("20240505211518_InitCreate")]
partial class InitCreate
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "8.0.3");
modelBuilder.Entity("Manarah.Domain.Server", b =>
{
b.Property<string>("IPAddress")
.HasColumnType("TEXT");
b.Property<string>("Description")
.HasColumnType("TEXT");
b.HasKey("IPAddress");
b.ToTable("Server", (string)null);
});
#pragma warning restore 612, 618
}
}
}

22
Manarah.SqliteMigrations/Migrations/20240505211518_InitCreate.cs Normal file
View File

@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Manarah.SqliteMigrations.Migrations
{
/// <inheritdoc />
public partial class InitCreate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

34
Manarah.SqliteMigrations/Migrations/ManarahContextModelSnapshot.cs Normal file
View File

@ -0,0 +1,34 @@
// <auto-generated />
using Manarah.App.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Manarah.SqliteMigrations.Migrations
{
[DbContext(typeof(ManarahContext))]
partial class ManarahContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "8.0.3");
modelBuilder.Entity("Manarah.Domain.Server", b =>
{
b.Property<string>("IPAddress")
.HasColumnType("TEXT");
b.Property<string>("Description")
.HasColumnType("TEXT");
b.HasKey("IPAddress");
b.ToTable("Server", (string)null);
});
#pragma warning restore 612, 618
}
}
}

22
Manarah.sln
View File

@ -3,9 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34525.116
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Manarah.App", "Manarah.App\Manarah.App.csproj", "{C505E413-CB8E-49A6-9186-AFDED3B878BD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Manarah.App", "Manarah.App\Manarah.App.csproj", "{C505E413-CB8E-49A6-9186-AFDED3B878BD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Manarah.Domain", "Manarah.Domain\Manarah.Domain.csproj", "{1551179E-FA6B-4E87-8B50-9FA2AD2F0CB0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Manarah.Domain", "Manarah.Domain\Manarah.Domain.csproj", "{1551179E-FA6B-4E87-8B50-9FA2AD2F0CB0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{D07B611D-55F9-4830-949C-850677ED48EB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Manarah.SqliteMigrations", "Manarah.SqliteMigrations\Manarah.SqliteMigrations.csproj", "{794BD3E8-AD7B-4C57-95E1-78CD0AA03DB8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Manarah.SqlServerMigrations", "Manarah.SqlServerMigrations\Manarah.SqlServerMigrations.csproj", "{DF9FC8BA-0854-465E-9C84-9FC330120527}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -21,10 +27,22 @@ Global
{1551179E-FA6B-4E87-8B50-9FA2AD2F0CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1551179E-FA6B-4E87-8B50-9FA2AD2F0CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1551179E-FA6B-4E87-8B50-9FA2AD2F0CB0}.Release|Any CPU.Build.0 = Release|Any CPU
{794BD3E8-AD7B-4C57-95E1-78CD0AA03DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{794BD3E8-AD7B-4C57-95E1-78CD0AA03DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{794BD3E8-AD7B-4C57-95E1-78CD0AA03DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{794BD3E8-AD7B-4C57-95E1-78CD0AA03DB8}.Release|Any CPU.Build.0 = Release|Any CPU
{DF9FC8BA-0854-465E-9C84-9FC330120527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF9FC8BA-0854-465E-9C84-9FC330120527}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF9FC8BA-0854-465E-9C84-9FC330120527}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF9FC8BA-0854-465E-9C84-9FC330120527}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{794BD3E8-AD7B-4C57-95E1-78CD0AA03DB8} = {D07B611D-55F9-4830-949C-850677ED48EB}
{DF9FC8BA-0854-465E-9C84-9FC330120527} = {D07B611D-55F9-4830-949C-850677ED48EB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A3C4374E-F704-4D7C-88D0-BBEB231C39FC}
EndGlobalSection