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

Some styling

Browse source
This commit is contained in:
tidusjar 2016-03-04 13:19:17 +00:00
parent 725678779a
commit 37aa6b938d
9 changed files with 102 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PlexRequests.Api/ApiRequest.cs
View file

@ -75,7 +75,8 @@ namespace PlexRequests.Api
throw new ApplicationException(message, response.ErrorException);
}
return Deserialize<T>(response.Content);
var result = Deserialize<T>(response.Content);
return result;
}
public T Deserialize<T>(string input)
@ -83,8 +84,15 @@ namespace PlexRequests.Api
{
var ser = new XmlSerializer(typeof(T));
try
{
using (var sr = new StringReader(input))
return (T)ser.Deserialize(sr);
}
catch (InvalidOperationException)
{
return null;
}
}
}
}

38
PlexRequests.Api/Models/PlexError.cs Normal file
View file

@ -0,0 +1,38 @@
#region Copyright
// /************************************************************************
// Copyright (c) 2016 Jamie Rees
// File: PlexError.cs
// Created By: Jamie Rees
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/
#endregion
using System.Xml.Serialization;
namespace PlexRequests.Api.Models
{
[XmlRoot(ElementName = "errors")]
public class PlexError
{
[XmlElement(ElementName = "error")]
public string Error { get; set; }
}
}

1
PlexRequests.Api/PlexRequests.Api.csproj
View file

@ -62,6 +62,7 @@
<ItemGroup>
<Compile Include="ApiRequest.cs" />
<Compile Include="Models\PlexAuthentication.cs" />
<Compile Include="Models\PlexError.cs" />
<Compile Include="Models\PlexFriends.cs" />
<Compile Include="Models\PlexUserRequest.cs" />
<Compile Include="Models\Tv\Authentication.cs" />

9
PlexRequests.UI/Content/custom.css
View file

@ -9,3 +9,12 @@
right: 0;
}
}
.multiSelect {
background-color: #4e5d6c;
}
.form-control-custom {
background-color: #4e5d6c !important;
color: white !important;
}

15
PlexRequests.UI/Modules/AdminModule.cs
View file

@ -117,6 +117,12 @@ namespace PlexRequests.UI.Modules
var plex = new PlexApi();
var model = plex.GetToken(user.username, user.password);
if (model.user == null)
{
return Response.AsJson(new { Result = false, Message = "Incorrect username or password!" });
}
var oldSettings = AuthService.GetSettings();
if (oldSettings != null)
{
@ -132,15 +138,22 @@ namespace PlexRequests.UI.Modules
AuthService.SaveSettings(newModel);
}
return Response.AsJson(new {Result = true, AuthToken = model.user.authentication_token});
return Response.AsJson(new { Result = true, AuthToken = model.user.authentication_token });
}
private Response GetUsers()
{
var token = AuthService.GetSettings().PlexAuthToken;
if (token == null)
{
return Response.AsJson(string.Empty);
}
var api = new PlexApi();
var users = api.GetUsers(token);
if (users == null)
{ return Response.AsJson(string.Empty); }
var usernames = users.User.Select(x => x.Username);
return Response.AsJson(usernames); //TODO usernames are not populated.
}

2
PlexRequests.UI/Program.cs
View file

@ -130,7 +130,7 @@ namespace PlexRequests.UI
// Step 5. Activate the configuration
LogManager.Configuration = config;
}
catch (Exception e)
catch (Exception )
{
throw;

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

@ -1,7 +1,7 @@
@Html.Partial("/Admin/_Sidebar")
<div class="col-sm-8">
<form class="form-horizontal" method="POST" action="/admin/SaveAuthentication" id="mainForm">
<form class="form-horizontal" method="POST" action="/admin/authentication" id="mainForm">
<fieldset>
<legend>Authentication Settings</legend>
@ -40,17 +40,17 @@
<div class="form-group">
<label for="authToken" class="col-lg-2 control-label">Plex Authorization Token</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="authToken" name="PlexAuthToken" placeholder="Plex Auth Token" value="@Model.PlexAuthToken">
<input type="text" class="form-control-custom form-control " id="authToken" name="PlexAuthToken" placeholder="Plex Auth Token" value="@Model.PlexAuthToken">
</div>
</div>
<div class="form-group">
<label for="username" class="col-lg-2 control-label">Username and Password</label>
<div class="col-lg-4">
<input type="text" class="form-control" id="username" name="Username" placeholder="Username">
<input type="text" class="form-control form-control-custom" id="username" name="Username" placeholder="Username">
</div>
<div class="col-lg-4 col-lg-push-1">
<input type="password" class="form-control" id="password" name="Password" placeholder="Password">
<div class="col-lg-4 col-lg-push-2">
<input type="password" class="form-control form-control-custom" id="password" name="Password" placeholder="Password">
</div>
</div>
<div class="form-group">
@ -66,20 +66,16 @@
<br />
<br />
<div class="form-group">
<select id="users" multiple="" class="col-lg-10 col-lg-offset-2"></select>
<select id="users" multiple="" class="col-lg-10 col-lg-offset-2 form-control-custom "></select>
</div>
<div class="form-group">
<br />
<br />
<div class="col-lg-10 col-lg-offset-2">
<button id="refreshUsers" class="btn btn-primary">Refresh Users</button>
</div>
</div>
<br />
<br />
<br />
<br />
<div>
</div>
<div class="form-group">
@ -137,7 +133,7 @@
dataType: "json",
success: function (response) {
if (response.length > 1) {
$(response).each(function(user) {
$(response).each(function() {
$('#users').append("<option>" + this + "</option>");
});
} else {

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

@ -34,7 +34,7 @@
<div class="form-group">
<label for="Ip" class="col-lg-2 control-label">CouchPotato Hostname or IP</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="Ip" name="Ip" placeholder="localhost" value="@Model.Ip">
<input type="text" class="form-control form-control-custom " id="Ip" name="Ip" placeholder="localhost" value="@Model.Ip">
</div>
</div>
@ -42,7 +42,7 @@
<label for="portNumber" class="col-lg-2 control-label">Port</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="portNumber" name="Port" placeholder="Port Number" value="@port">
<input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="@port">
</div>
</div>
@ -50,7 +50,7 @@
<div class="form-group">
<label for="ApiKey" class="col-lg-2 control-label">CouchPotato API Key</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="ApiKey" name="ApiKey" value="@Model.ApiKey">
<input type="text" class="form-control form-control-custom " id="ApiKey" name="ApiKey" value="@Model.ApiKey">
</div>
</div>

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

@ -13,14 +13,14 @@
}
<div class="col-sm-8">
<form class="form-horizontal" method="POST" action="/admin/couchpotato" id="mainForm">
<form class="form-horizontal" method="POST" action="/admin" id="mainForm">
<fieldset>
<legend>Request Plex Settings</legend>
<div class="form-group">
<label for="portNumber" class="col-lg-2 control-label">Port</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="portNumber" name="Port" placeholder="Port Number" value="@port">
<input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="@port">
</div>
</div>
<small class="col-lg-10 col-lg-offset-2">You will have to restart after changing the port.</small>
@ -58,9 +58,9 @@
<div class="form-group">
<label for="WeeklyRequestLimit" class="col-lg-2 control-label">Weekly Request Limit</label>
<div class="col-lg-10 checkbox">
<div class="col-lg-10">
<label>
<input type="number" id="WeeklyRequestLimit" name="WeeklyRequestLimit" value="@Model.WeeklyRequestLimit">
<input type="number" id="WeeklyRequestLimit" name="WeeklyRequestLimit" class="form-control form-control-custom " value="@Model.WeeklyRequestLimit">
</label>
</div>
</div>