Skip to content
This repository was archived by the owner on Dec 21, 2023. It is now read-only.

Commit ee50ca4

Browse files
InfinityGhostInfinityGhost
authored
Merge pull request #54 from InfinityGhost/cleanup
Clean up Views and Controllers
2 parents 7ae9cef + 54be016 commit ee50ca4

7 files changed

Lines changed: 74 additions & 88 deletions

File tree

‎OpenTabletDriver.Web/Controllers/DiscordController.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using Microsoft.AspNetCore.Mvc;
2+
3+
namespace OpenTabletDriver.Web.Controllers
4+
{
5+
public class DiscordController : Controller
6+
{
7+
private const string DISCORD_INVITE_URL = "https://discord.gg/9bcMaPkVAR";
8+
9+
public IActionResult Index()
10+
{
11+
return Redirect(DISCORD_INVITE_URL);
12+
}
13+
}
14+
}

‎OpenTabletDriver.Web/Controllers/GitHubController.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using Microsoft.AspNetCore.Mvc;
2+
3+
namespace OpenTabletDriver.Web.Controllers;
4+
5+
public class GitHubController : Controller
6+
{
7+
private const string REPOSITORY_URL = "https://www.github.com/OpenTabletDriver/OpenTabletDriver";
8+
9+
public IActionResult Index()
10+
{
11+
return Redirect(REPOSITORY_URL);
12+
}
13+
}

‎OpenTabletDriver.Web/Controllers/HomeController.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ public HomeController(ILogger<HomeController> logger, IReleaseService releaseSer
2424
this.releaseService = releaseService;
2525
}
2626

27-
public const string REPOSITORY_URL = "https://www.github.com/OpenTabletDriver/OpenTabletDriver";
28-
public const string DISCORD_INVITE_URL = "https://discord.gg/9bcMaPkVAR";
29-
3027
[ResponseCache(Duration = 300)]
3128
public async Task<IActionResult> Index()
3229
{

‎OpenTabletDriver.Web/Views/Shared/_Layout.cshtml‎

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@using OpenTabletDriver.Web.Controllers
2-
3-
@{
4-
string subTitle = @ViewData["Title"] as string;
1+
@{
2+
string subTitle = @ViewBag.Title;
53
string pageTitle = subTitle != null ? $"{subTitle} - OpenTabletDriver" : "OpenTabletDriver";
64
}
75

@@ -11,48 +9,11 @@
119
<meta charset="utf-8"/>
1210
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
1311
<title>@pageTitle</title>
14-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5.0.2/dist/darkly/bootstrap.min.css" integrity="sha256-IzD7YgcFC7mrH3sadY/G75Gc49OgfS5IVOgFlxtdoUI=" crossorigin="anonymous"></link>
15-
<link rel="stylesheet" href="~/css/site.css"></link>
12+
<partial name="_Styles"/>
1613
@await RenderSectionAsync("Styles", required: false)
1714
</head>
1815
<body>
19-
<header>
20-
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-dark bg-dark border-bottom border-dark box-shadow mb-3">
21-
<div class="container">
22-
<img class="pr-3" src="~/otd.png" height="64">
23-
<a class="navbar-brand text-white ms-3" asp-area="" asp-controller="Home" asp-action="Index">OpenTabletDriver</a>
24-
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
25-
aria-expanded="false" aria-label="Toggle navigation">
26-
<span class="navbar-toggler-icon"></span>
27-
</button>
28-
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
29-
<ul class="navbar-nav flex-grow-1">
30-
<li class="nav-item">
31-
<a class="nav-link text-light" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
32-
</li>
33-
<li class="nav-item">
34-
<a class="nav-link text-light" asp-area="" asp-controller="Tablets" asp-action="Index">Tablets</a>
35-
</li>
36-
<li class="nav-item">
37-
<a class="nav-link text-light" asp-area="" asp-controller="Plugins" asp-action="Index">Plugins</a>
38-
</li>
39-
<li class="nav-item">
40-
<a class="nav-link text-light" asp-area="" asp-controller="Wiki" asp-action="Index">Wiki</a>
41-
</li>
42-
<li class="nav-item">
43-
<a class="nav-link text-light" asp-area="" asp-controller="Changelog" asp-action="Index">Changelog</a>
44-
</li>
45-
<li class="nav-item">
46-
<a class="nav-link text-light" href="@HomeController.REPOSITORY_URL">GitHub</a>
47-
</li>
48-
<li class="nav-item">
49-
<a class="nav-link text-light" href="@HomeController.DISCORD_INVITE_URL">Discord</a>
50-
</li>
51-
</ul>
52-
</div>
53-
</div>
54-
</nav>
55-
</header>
16+
<partial name="_LayoutHeader"/>
5617
<div class="container">
5718
<main role="main" class="pb-3">
5819
@RenderBody()

‎OpenTabletDriver.Web/Views/Shared/_LayoutHeader.cshtml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<header>
2+
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-dark bg-dark border-bottom border-dark box-shadow mb-3">
3+
<div class="container">
4+
<img class="pr-3" src="~/otd.png" height="64">
5+
<a class="navbar-brand text-white ms-3" asp-area="" asp-controller="Home" asp-action="Index">OpenTabletDriver</a>
6+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
7+
aria-expanded="false" aria-label="Toggle navigation">
8+
<span class="navbar-toggler-icon"></span>
9+
</button>
10+
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
11+
<ul class="navbar-nav flex-grow-1">
12+
<li class="nav-item">
13+
<a class="nav-link text-light" asp-controller="Home" asp-action="Index">Home</a>
14+
</li>
15+
<li class="nav-item">
16+
<a class="nav-link text-light" asp-controller="Tablets" asp-action="Index">Tablets</a>
17+
</li>
18+
<li class="nav-item">
19+
<a class="nav-link text-light" asp-controller="Plugins" asp-action="Index">Plugins</a>
20+
</li>
21+
<li class="nav-item">
22+
<a class="nav-link text-light" asp-controller="Wiki" asp-action="Index">Wiki</a>
23+
</li>
24+
<li class="nav-item">
25+
<a class="nav-link text-light" asp-controller="Changelog" asp-action="Index">Changelog</a>
26+
</li>
27+
<li class="nav-item">
28+
<a class="nav-link text-light" asp-controller="GitHub" asp-action="Index">GitHub</a>
29+
</li>
30+
<li class="nav-item">
31+
<a class="nav-link text-light" asp-controller="Discord" asp-action="Index">Discord</a>
32+
</li>
33+
</ul>
34+
</div>
35+
</div>
36+
</nav>
37+
</header>

‎OpenTabletDriver.Web/Views/Shared/_Styles.cshtml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5.0.2/dist/darkly/bootstrap.min.css"
2+
integrity="sha256-IzD7YgcFC7mrH3sadY/G75Gc49OgfS5IVOgFlxtdoUI=" crossorigin="anonymous"/>
3+
<link rel="stylesheet" href="~/css/site.css"/>

‎OpenTabletDriver.Web/Views/Wiki/_WikiLayout.cshtml‎

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
@using OpenTabletDriver.Web.Controllers
2-
31
@{
4-
string subTitle = @ViewData["Title"] as string;
2+
string subTitle = @ViewBag.Title;
53
string pageTitle = subTitle != null ? $"{subTitle} - OpenTabletDriver" : "OpenTabletDriver";
64
}
75

@@ -11,48 +9,11 @@
119
<meta charset="utf-8"/>
1210
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
1311
<title>@pageTitle</title>
14-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5.0.2/dist/darkly/bootstrap.min.css" integrity="sha256-IzD7YgcFC7mrH3sadY/G75Gc49OgfS5IVOgFlxtdoUI=" crossorigin="anonymous"></link>
15-
<link rel="stylesheet" href="~/css/site.css"></link>
12+
<partial name="_Styles"/>
1613
@await RenderSectionAsync("Styles", required: false)
1714
</head>
1815
<body>
19-
<header>
20-
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-dark bg-dark border-bottom border-dark box-shadow mb-3">
21-
<div class="container">
22-
<img class="pr-3" src="~/otd.png" height="64">
23-
<a class="navbar-brand text-white ms-3" asp-area="" asp-controller="Home" asp-action="Index">OpenTabletDriver</a>
24-
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
25-
aria-expanded="false" aria-label="Toggle navigation">
26-
<span class="navbar-toggler-icon"></span>
27-
</button>
28-
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
29-
<ul class="navbar-nav flex-grow-1">
30-
<li class="nav-item">
31-
<a class="nav-link text-light" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
32-
</li>
33-
<li class="nav-item">
34-
<a class="nav-link text-light" asp-area="" asp-controller="Tablets" asp-action="Index">Tablets</a>
35-
</li>
36-
<li class="nav-item">
37-
<a class="nav-link text-light" asp-area="" asp-controller="Plugins" asp-action="Index">Plugins</a>
38-
</li>
39-
<li class="nav-item">
40-
<a class="nav-link text-light" asp-area="" asp-controller="Wiki" asp-action="Index">Wiki</a>
41-
</li>
42-
<li class="nav-item">
43-
<a class="nav-link text-light" asp-area="" asp-controller="Changelog" asp-action="Index">Changelog</a>
44-
</li>
45-
<li class="nav-item">
46-
<a class="nav-link text-light" href="@HomeController.REPOSITORY_URL">GitHub</a>
47-
</li>
48-
<li class="nav-item">
49-
<a class="nav-link text-light" href="@HomeController.DISCORD_INVITE_URL">Discord</a>
50-
</li>
51-
</ul>
52-
</div>
53-
</div>
54-
</nav>
55-
</header>
16+
<partial name="_LayoutHeader"/>
5617
<div class="container">
5718
<main role="main" class="pb-3">
5819
<partial name="Wiki/_Header"/>

0 commit comments

Comments
 (0)