github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-21 13:53:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

BaseUrl is finally finished! #72

Browse source
This commit is contained in:
tidusjar 2016-04-16 14:02:06 +01:00
commit 67c968e886
17 changed files with 201 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PlexRequests.UI/Views/Admin/Authentication.cshtml
View file

@ -122,11 +122,11 @@
$('#requestToken').click(function (e) {
e.preventDefault();
var url = createBaseUrl(base, "admin/requestauth");
var url = createBaseUrl(base, "requestauth");
var $form = $("#mainForm");
$.ajax({
type: $form.prop("method"),
url: url,
url: "requestauth",
data: $form.serialize(),
dataType: "json",
success: function (response) {
@ -149,11 +149,11 @@
function loadUserList() {
$('#users').html("");
var url = "admin/getusers";
var url = "getusers";
url = createBaseUrl(base, url);
$.ajax({
type: "Get",
url: url,
url: "getusers",
dataType: "json",
success: function (response) {
if (response.length > 1) {

10
PlexRequests.UI/Views/Admin/CouchPotato.cshtml
View file

@ -116,7 +116,7 @@
<text>
var qualitySelected = '@Model.ProfileId';
var $form = $("#mainForm");
var url = 'cpprofiles';
var url = '/admin/cpprofiles';
url = createBaseUrl(baseUrl, url);
$.ajax({
type: $form.prop("method"),
@ -144,14 +144,17 @@
$('#getProfiles').click(function (e) {
e.preventDefault();
var $form = $("#mainForm");
var url = "admin/cpprofiles";
url = createBaseUrl(baseUrl, url);
var url = createBaseUrl(baseUrl, "/admin/cpprofiles");
$.ajax({
type: $form.prop("method"),
data: $form.serialize(),
url: url,
dataType: "json",
success: function (response) {
if (response.message) {
generateNotify(response.message, "warning");
return;
}
response.list.forEach(function (result) {
$("#select").append("<option value='" + result._id + "'>" + result.label + "</option>");
});
@ -167,7 +170,6 @@
e.preventDefault();
var $form = $("#mainForm");
var url = createBaseUrl(baseUrl,"/test/cp");
url = createBaseUrl(baseUrl, url);
$.ajax({
type: $form.prop("method"),
url: url,

7
PlexRequests.UI/Views/Admin/Sickrage.cshtml
View file

@ -148,13 +148,18 @@
$('#testSickRage').click(function (e) {
e.preventDefault();
var qualityProfile = $("#profiles option:selected").val();
var $form = $("#mainForm");
var data = $form.serialize();
data = data + "&qualityProfile=" + qualityProfile;
var url = createBaseUrl(base, '/test/sickrage');
$.ajax({
type: $form.prop("method"),
url: url,
data: $form.serialize(),
data: data,
dataType: "json",
success: function (response) {
console.log(response);

8
PlexRequests.UI/Views/Admin/Sonarr.cshtml
View file

@ -224,16 +224,22 @@
}
});
});
var base = '@Html.GetBaseUrl()';
$('#testSonarr').click(function (e) {
e.preventDefault();
var qualityProfile = $("#profiles option:selected").val();
var $form = $("#mainForm");
var data = $form.serialize();
data = data + "&qualityProfile=" + qualityProfile;
var url = createBaseUrl(base, '/test/sonarr');
$.ajax({
type: $form.prop("method"),
url: url,
data: $form.serialize(),
data: data,
dataType: "json",
success: function (response) {
console.log(response);

1
PlexRequests.UI/Views/Requests/Index.cshtml
View file

@ -411,7 +411,6 @@
</div>
</div>
</div>
<div id="baseUrl" value="@Html.GetBaseUrl()"></div>
@Html.LoadRequestAssets()

14
PlexRequests.UI/Views/Search/Index.cshtml
View file

@ -1,4 +1,12 @@
@using PlexRequests.UI.Helpers
@{
var baseUrl = Html.GetBaseUrl();
var url = string.Empty;
if (!string.IsNullOrEmpty(baseUrl.ToHtmlString()))
{
url = "/" + baseUrl.ToHtmlString();
}
}
<div>
<h1>Search</h1>
<h4>Want to watch something that is not currently on Plex?! No problem! Just search for it below and request it!</h4>
@ -19,7 +27,7 @@
}
</ul>
<!-- Tab panes -->
<div class="tab-content">
@if (Model.SearchForMovies)
@ -123,7 +131,7 @@
<p>{{overview}}</p>
</div>
<div class="col-sm-2 col-sm-push-3">
<form method="POST" action="/search/request/{{type}}" id="form{{id}}">
<form method="POST" action="@url/search/request/{{type}}" id="form{{id}}">
<input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
{{#if_eq available true}}
<button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> Available</button>
@ -188,7 +196,7 @@
<p>{{overview}}</p>
</div>
<div class="col-sm-2 col-sm-push-3">
<form method="POST" action="/search/request/{{type}}" id="form{{id}}">
<form method="POST" action="@url/search/request/{{type}}" id="form{{id}}">
<input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
{{#if_eq available true}}
<button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> Available</button>

51
PlexRequests.UI/Views/Shared/_Layout.cshtml
View file

@ -3,11 +3,21 @@
@using PlexRequests.UI.Helpers
@using PlexRequests.UI.Models
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase
@{
var baseUrl = Html.GetBaseUrl();
var url = string.Empty;
if (!string.IsNullOrEmpty(baseUrl.ToHtmlString()))
{
url = "/" + baseUrl.ToHtmlString();
}
}
<html>
<div hidden="hidden" id="baseUrl">@baseUrl.ToHtmlString()</div>
<head>
<title>Plex Requests</title>
<!-- Styles -->
<meta name="viewport" content="width=device-width, initial-scale=1">
@Html.LoadAssets()
</head>
<body>
@ -22,53 +32,36 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/search">Plex Requests</a>
<a class="navbar-brand" href="@url/search">Plex Requests</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
@if (Context.Request.Path == "/search")
{
<li class="active"><a href="/search"><i class="fa fa-search"></i> Search</a></li>
}
else
{
<li><a href="/search"><i class="fa fa-search"></i> Search</a></li>
}
@if (Context.Request.Path == "/requests")
{
<li class="active"><a href="/requests"><i class="fa fa-plus-circle"></i> Requests</a></li>
}
else
{
<li><a href="/requests"><i class="fa fa-plus-circle"></i> Requests</a></li>
}
@Html.GetNavbarUrl(Context, "/search", "Search", "search")
@Html.GetNavbarUrl(Context, "/requests", "Requests", "plus-circle")
</ul>
<ul class="nav navbar-nav navbar-right">
@if (!Context.CurrentUser.IsAuthenticated())
{
<li><a href="/login"><i class="fa fa-user"></i> Admin</a></li>
<li><a href="@url/login"><i class="fa fa-user"></i> Admin</a></li>
}
else
{
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> Admin <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="/admin"><i class="fa fa-cog"></i> Settings</a></li>
<li><a href="/changepassword"><i class="fa fa-key"></i> Change password</a></li>
<li><a href="@url/admin"><i class="fa fa-cog"></i> Settings</a></li>
<li><a href="@url/changepassword"><i class="fa fa-key"></i> Change password</a></li>
<li class="divider"></li>
<li><a href="/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
<li><a href="@url/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
</ul>
</li>
}
@if (Context.Request.Session[SessionKeys.UsernameKey] != null)
{
<li><a href="/userlogin/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
<li><a href="@url/userlogin/logout"><i class="fa fa-sign-out"></i> Logout</a></li>
}
</ul>
</div>
@ -78,11 +71,11 @@
<div class="container">
@RenderBody()
</div>
<div class="scroll-top-wrapper ">
<span class="scroll-top-inner">
<div class="scroll-top-wrapper ">
<span class="scroll-top-inner">
<i class="fa fa-2x fa-arrow-circle-up"></i>
</span>
</div>
</div>
</body>
</html>
<script>