Merge pull request #88 from berkansasmaz/dev

Modified menu and home page
berkansasmaz · Jan 1, 2021 · b36b22c · b36b22c
2 parents c4c4c0a + 92988cf
commit b36b22c
Show file tree

Hide file tree

Showing 14 changed files with 290 additions and 267 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Ketum
 
-Ketum is an **open source application** that enables you to easily test and monitor your website’s health.
+Ketum is an **cross-platform and open-source application** that enables you to easily test and monitor your website’s health.
 
 Monitor your Website and APIs from your on-premises server and never miss any problem on your website with our E-mail notifications.
 

diff --git a/docs/Get-Started/getting-started.md b/docs/Get-Started/getting-started.md
@@ -85,7 +85,7 @@ This will create a new database based on the configured connection string.
 
 This is the HTTP API that is used by the web application.
 
-3. Lastly, ensure that the `Ketum.Web` project is the startup project and run the application which will open a **welcome** page in your browser.
+3. Lastly, ensure that the `Ketum.Blazor` project is the startup project and run the application which will open a **welcome** page in your browser.
 
 ![home-page](./home-page.png)
 
@@ -108,3 +108,8 @@ We have pretty clearly defined roles so I don't need to explain further.
 > Note: If you want, you can create a new role and assign it to your new users as the default.
 
 The application is designed to support multi-tenant, but has never been tested. I need your feedback on this subject. Please let me know about the problems you are experiencing and let's discuss them together and create a solution map.
+
+## See Also
+
+- [Notification](https://github.com/berkansasmaz/ketum/blob/master/docs/Notification/Index.md)
+
diff --git a/docs/Get-Started/home-page.png b/docs/Get-Started/home-page.png
diff --git a/docs/Notification/Index.md b/docs/Notification/Index.md
@@ -0,0 +1,13 @@
+# Notification 
+
+## Email
+
+Ketum's e-mail notification system was developed based on ABP's e-mail service. So, it's documentation is valid in KETUM too.
+
+Below you can find some useful content:
+
+[For e-mail settings](https://docs.abp.io/en/abp/latest/Emailing#email-settings)<br>
+[For MailKit integration](https://docs.abp.io/en/abp/latest/MailKit) <br>
+[To replace the Email Template](https://community.abp.io/articles/replacing-email-templates-and-sending-emails-jkeb8zzh) <br>
+<br>
+> Note: If you want more alert channels, please [open an issue](https://github.com/berkansasmaz/ketum/issues/new) about this. If it gets enough support from the community, it will be added in a short time.
diff --git a/ketum/src/Ketum.Application.Contracts/Permissions/KetumPermissionDefinitionProvider.cs b/ketum/src/Ketum.Application.Contracts/Permissions/KetumPermissionDefinitionProvider.cs
@@ -8,7 +8,7 @@ public class KetumPermissionDefinitionProvider : PermissionDefinitionProvider
     {
         public override void Define(IPermissionDefinitionContext context)
         {
-            var monitor = context.AddGroup(KetumPermissions.Monitors.MonitorGroup, L("Permission:Monitors"));
+            var monitor = context.AddGroup(KetumPermissions.Monitors.Default, L("Permission:Monitors"));
 
             var communityArticles = monitor.AddPermission(KetumPermissions.Monitors.Default, L("Permission:Monitors"));
             communityArticles.AddChild(KetumPermissions.Monitors.Create, L("Permission:Create"));

diff --git a/ketum/src/Ketum.Application.Contracts/Permissions/KetumPermissions.cs b/ketum/src/Ketum.Application.Contracts/Permissions/KetumPermissions.cs
@@ -6,7 +6,7 @@ public static class KetumPermissions
 
         public static class Monitors
         {
-            public const string MonitorGroup = GroupName + ".Monitors";
+            private const string MonitorGroup = GroupName + ".Monitors";
 
             public const string Default = MonitorGroup;
             public const string Create = Default + ".Create";

diff --git a/ketum/src/Ketum.Blazor/KetumMenuContributor.cs b/ketum/src/Ketum.Blazor/KetumMenuContributor.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Ketum.Localization;
+using Ketum.Permissions;
 using Volo.Abp.Account.Localization;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.Users;
@@ -30,7 +31,7 @@ public async Task ConfigureMenuAsync(MenuConfigurationContext context)
             }
         }
 
-        private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
+        private async Task ConfigureMainMenuAsync(MenuConfigurationContext context)
         {
             var l = context.GetLocalizer<KetumResource>();
 
@@ -44,7 +45,16 @@ private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
                 )
             );
 
-            return Task.CompletedTask;
+            if (await context.IsGrantedAsync(KetumPermissions.Monitors.Default))
+            {
+                context.Menu.AddItem(
+                    new ApplicationMenuItem(
+                        "Ketum.Monitors",
+                        l["Menu:Monitors"],
+                        url: "/monitors",
+                        "fas fa-chart-line")
+                );
+            }
         }
 
         private Task ConfigureUserMenuAsync(MenuConfigurationContext context)

diff --git a/ketum/src/Ketum.Blazor/Pages/Index.razor b/ketum/src/Ketum.Blazor/Pages/Index.razor
@@ -9,147 +9,45 @@
             <h5 class="m-1"> <i class="fas fa-rocket"></i> Congratulations, <strong>Ketum</strong> is successfully running!</h5>
         </Badge>
 
-        <h1>Welcome to the Application</h1>
+        <h1>Welcome to the KETUM</h1>
 
         <p class="lead px-lg-5 mx-lg-5">@L["LongWelcomeMessage"]</p>
 
         @if ( !CurrentUser.IsAuthenticated )
         {
-            <a class="btn btn-primary" href="/authentication/login">
+            <a class="btn btn-outline-primary ml-2 mr-2" href="/authentication/login">
                 <i class="fa fa-sign-in-alt"></i> @L["Login"]
             </a>
         }
+        <a class="btn btn-outline-success ml-2 mr-2" href="/monitors">
+            <i class="fas fa-chart-line"></i> @L["Monitors"]
+        </a>
     </div>
 
     <div class="my-3 text-center">
-        <h3>Let's improve your application!</h3>
-        <p>Here are some links to help you get started:</p>
+        <h3>
+            <a href="https://github.com/berkansasmaz/ketum/blob/master/docs/Contribution/Index.md" target="_blank" class="btn btn-link px-1">Let's improve KETUM!&nbsp;<i class="fas fa-code-branch"></i></a>
+        </h3>
     </div>
 
     <div class="card mt-4 mb-5">
-        <div class="card-body">
-            <div class="row text-center justify-content-md-center">
-                <div class="col-lg-4">
-                    <div class="p-4">
-                        <h5 class="mb-3"><i class="fas fa-book text-secondary d-block my-3 fa-2x"></i> Learn the ABP Framework</h5>
-                        <p>Explore the compherensive documentation to learn how to build a modern web application.</p>
-                        <a href="https://docs.abp.io/en/abp/latest?ref=tmpl" target="_blank" class="btn btn-link px-1">See Documents <i class="fas fa-chevron-right"></i></a>
-                    </div>
-                </div>
-                <div class="col-lg-4 border-left">
-                    <div class="p-4">
-                        <h5 class="mb-3"><i class="fas fa-cubes text-secondary d-block my-3 fa-2x"></i> Samples</h5>
-                        <p>See the example projects built with the ABP Framework.</p>
-                        <a href="https://docs.abp.io/en/abp/latest/Samples/Index?ref=tmpl" target="_blank" class="btn btn-link px-1">All samples <i class="fas fa-chevron-right"></i></a>
-                    </div>
-                </div>
-                <div class="col-lg-4 border-left">
-                    <div class="p-4">
-                        <h5 class="mb-3"><i class="fas fa-users text-secondary d-block my-3 fa-2x"></i> ABP Community</h5>
-                        <p>Get involved with a vibrant community and become a contributor.</p>
-                        <a href="https://community.abp.io/" target="_blank" class="btn btn-link px-1">Community <i class="fas fa-chevron-right"></i></a>
-                        <a href="https://docs.abp.io/en/abp/latest/Contribution/Index?ref=tmpl" target="_blank" class="btn btn-link px-1">Contribute <i class="fas fa-chevron-right"></i></a>
-                    </div>
-                </div>
-            </div>
-            <div class="row text-center mt-lg-3 justify-content-md-center">
-                <div class="col-lg-4">
-                    <div class="p-4">
-                        <h5 class="mb-3"><i class="fas fa-pen-nib text-secondary d-block my-3 fa-2x"></i> ABP Blog</h5>
-                        <p>Take a look at our recently published articles.</p>
-                        <a href="https://blog.abp.io/abp?ref=tmpl" target="_blank" class="btn btn-link px-1">See Blog <i class="fas fa-chevron-right"></i></a>
-                    </div>
-                </div>
-                <div class="col-lg-4 border-left">
-                    <div class="p-4">
-                        <h5 class="mb-3"><i class="fab fa-github text-secondary d-block my-3 fa-2x"></i> Github</h5>
-                        <p>Do you love the ABP Framework? Please <strong>give a star</strong> to support it!</p>
-
-                        <a href="https://github.com/abpframework/abp/" target="_blank" class="btn btn-link px-1">See Open Source Framework <i class="fas fa-chevron-right"></i></a>
-
-                    </div>
-                </div>
-                <div class="col-lg-4 border-left">
-                    <div class="p-4">
-                        <h5 class="mb-3"><i class="fab fa-stack-overflow text-secondary d-block my-3 fa-2x"></i> Stackoverflow</h5>
-                        <p>See answers to previously asked questions or ask a new one.</p>
-                        <a href="https://stackoverflow.com/questions/tagged/abp" target="_blank" class="btn btn-link px-1">Questions <i class="fas fa-chevron-right"></i></a>
-                        <a href="https://stackoverflow.com/questions/ask" target="_blank" class="btn btn-link px-1">Ask a Question <i class="fas fa-chevron-right"></i></a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="mt-5 my-3 text-center">
-        <h3>Meet the ABP Commercial</h3>
-        <p>A Complete Web Application Platform Built on the ABP Framework</p>
-    </div>
-
-    <div class="card mt-4 mb-5">
-        <div class="card-body">
-            <p class="px-lg-5 mx-lg-5 py-3 text-center">
-                <a href="https://commercial.abp.io/" target="_blank">ABP Commercial</a> is a platform based on the open source ABP framework. It provides pre-built application modules,
-                rapid application development tooling, professional UI themes, premium support and more.
-            </p>
-
-            <div class="row text-center justify-content-md-center">
-                <div class="col-lg-2">
-                    <div class="p-3">
-                        <h6>
-                            <i class="fas fa-plus d-block mb-3 fa- 2x text-secondary"></i> Startup Templates
-                            <a href="https://commercial.abp.io/startup-templates?ref=tmpl" target="_blank" class="d-block mt-2 btn btn-sm btn-link">Details <i class="fas fa-chevron-right"></i></a>
-                        </h6>
-                    </div>
-                </div>
-                <div class="col-lg-2 border-left">
-                    <div class="p-3">
-                        <h6>
-                            <i class="fas fa-plus d-block mb-3 fa- 2x text-secondary"></i> Application Modules
-                            <a href="https://commercial.abp.io/modules?ref=tmpl" target="_blank" class="d-block mt-2 btn btn-sm btn-link">Details <i class="fas fa-chevron-right"></i></a>
-                        </h6>
-                    </div>
-                </div>
-                <div class="col-lg-2 border-left">
-                    <div class="p-3">
-                        <h6>
-                            <i class="fas fa-plus d-block mb-3 fa- 2x text-secondary"></i> Developer<br />Tools
-                            <a href="https://commercial.abp.io/tools?ref=tmpl" target="_blank" class="d-block mt-2 btn btn-sm btn-link">Details <i class="fas fa-chevron-right"></i></a>
-                        </h6>
-                    </div>
-                </div>
-                <div class="col-lg-2 border-left">
-                    <div class="p-3">
-                        <h6>
-                            <i class="fas fa-plus d-block mb-3 fa- 2x text-secondary"></i> UI<br /> Themes
-                            <a href="https://commercial.abp.io/themes?ref=tmpl" target="_blank" class="d-block mt-2 btn btn-sm btn-link">Details <i class="fas fa-chevron-right"></i></a>
-                        </h6>
-                    </div>
-                </div>
-                <div class="col-lg-2 border-left">
-                    <div class="p-3">
-                        <h6>
-                            <i class="fas fa-plus d-block mb-3 fa- 2x text-secondary"></i> Premium Support
-                            <a href="https://support.abp.io/QA/Questions?ref=tmpl" target="_blank" class="d-block mt-2 btn btn-sm btn-link">Details <i class="fas fa-chevron-right"></i></a>
-                        </h6>
-                    </div>
-                </div>
-                <div class="col-lg-2 border-left">
-                    <div class="p-3">
-                        <h6>
-                            <i class="fas fa-plus d-block mb-3 fa- 2x text-secondary"></i> Additional Services
-                            <a href="https://commercial.abp.io/additional-services?ref=tmpl" target="_blank" class="d-block mt-2 btn btn-sm btn-link">Details <i class="fas fa-chevron-right"></i></a>
-                        </h6>
-                    </div>
-                </div>
+        <div class="card-body text-center">
+            <div class="p-4">
+                <h4 class="mb-3"><i class="fas fa-tools text-secondary d-block my-3 fa-2x"></i>  Feautres</h4>
+                <h6>WEBSITE TESTING&nbsp;<i class="fas fa-desktop"></i></h6>
+                <p>Our convenient platform allows you to monitor the health of your website effortlessly. The testing process is quick, reliable, and simple. You can receive your results in no time so that you don’t have to wonder about the status of your site!</p>
+                <h6>TRACK HEALTH&nbsp;<i class="fas fa-heartbeat"></i></h6>
+                <p>Ketum provides you with simple and easy-to-read charts that track your website’s health, and you will have access to charts displaying your uptime, response time, and other test results.</p>
+                <h6>Instant Notifications&nbsp;<i class="fas fa-bell"></i></h6>
+                <p>Never miss any problem on your website with our E-mail notifications.</p>
+                <a href="https://github.com/berkansasmaz/ketum/tree/master/docs" target="_blank" class="btn btn-link px-1">More information <i class="fas fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
+
     <div class="mb-5 text-center">
         <p class="align-middle">
-            <a href="https://twitter.com/abpframework" target="_blank" class="mx-2"><i class="fab fa-twitter"></i><span class="text-secondary"> Abp Framework</span></a>
-            <a href="https://twitter.com/abpcommercial" target="_blank" class="mx-2"><i class="fab fa-twitter"></i><span class="text-secondary"> Abp Commercial</span></a>
-            <a href="https://github.com/abpframework/abp" target="_blank" class="mx-2"><i class="fab fa-github"></i><span class="text-secondary"> abpframework</span></a>
+            <a href="https://github.com/berkansasmaz/ketum" target="_blank" class="mx-2"><i class="fab fa-github"></i><span class="text-secondary"> ketum</span></a>
         </p>
     </div>
 </div>