Skip to content

Commit

Permalink
Merge pull request #143 from lokenx/dev
Browse files Browse the repository at this point in the history
v1.0.0 merge
  • Loading branch information
mikhailbot committed Nov 4, 2015
2 parents de5b09d + 800a742 commit af4e68d
Show file tree
Hide file tree
Showing 155 changed files with 3,240 additions and 11,075 deletions.
4 changes: 4 additions & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ notices-for-0.9.0
notices-for-0.9.1
0.9.4-platform-file
notices-for-facebook-graph-api-2
1.2.0-standard-minifiers-package
1.2.0-meteor-platform-split
1.2.0-cordova-changes
1.2.0-breaking-changes
46 changes: 38 additions & 8 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,47 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

meteor-platform
http
iron:router
houston:admin
iron:router@=1.0.10
peerlibrary:xml2js
u2622:persistent-session
aslagle:reactive-table
meteorhacks:npm
percolate:synced-cron
npm-container
standard-minifiers
meteor-base
mobile-experience
mongo
blaze-html-templates
session
jquery
tracker
logging
reload
random
ejson
spacebars
check
aldeed:collection2
aldeed:simple-schema
iron:core@=1.0.8
fortawesome:fontawesome
accounts-password
reactive-var
dburles:collection-helpers
alanning:roles
momentjs:moment
twbs:[email protected]
accounts-ui
zimme:active-route
themeteorchef:bert
aldeed:autoform
ongoworks:security
fourseven:scss
multiply:iron-router-progress


mizzao:bootstrap-3


npm-container
lokenx:themoviedbsearch
lokenx:couchpotatowrapper
lokenx:sickragewrapper
lokenx:sonarrwrapper
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.1.0.2
METEOR@1.2.1
172 changes: 104 additions & 68 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,76 +1,112 @@
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
alanning:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
[email protected]
anti:[email protected]
aslagle:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
dburles:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
houston:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
[email protected]_2
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
aslagle:[email protected]
[email protected]
[email protected]_1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
dburles:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
fortawesome:[email protected]
fourseven:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
lokenx:[email protected]
lokenx:[email protected]
lokenx:[email protected]
lokenx:[email protected]
[email protected]
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
[email protected]
[email protected]
mizzao:[email protected]_1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
momentjs:[email protected]
[email protected]
[email protected]
multiply:[email protected]
[email protected]_2
[email protected]
[email protected]
[email protected]
[email protected]_1
[email protected]
ongoworks:[email protected]
[email protected]
peerlibrary:[email protected]
peerlibrary:[email protected]_1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
tmeasday:[email protected]
[email protected]
u2622:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
percolate:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
themeteorchef:[email protected]
[email protected]
twbs:[email protected]
u2622:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
zimme:[email protected]
Binary file added PlexRequestsHome.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 18 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
#Plex Requests - Meteor Style!
# Plex Requests - Meteor Style!

[![Join the chat at https://gitter.im/lokenx/plexrequests-meteor](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lokenx/plexrequests-meteor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
![plexrequestshomepage](PlexRequestsHome.jpg)

![plexrequestshomepage](Screenshot03.png)
[![Join the chat at https://gitter.im/lokenx/plexrequests-meteor](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lokenx/plexrequests-meteor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

This is [Plex Requests](https://github.com/lokenx/plexrequests) but written with Meteor! It's been updated with [SickRage](https://github.com/SiCKRAGETV/SickRage) and [Sonarr](https://sonarr.tv/) (currently beta) intergration, includes support for authentication via Plex.tv usernames, and TV requests!
This is [Plex Requests](https://github.com/lokenx/plexrequests) but written with Meteor! It's been updated with an approval system, basic issue reporting, and a new visual style!

**A project website has been setup using [GitHub pages](http://plexrequests.8bits.ca/), please visit it for more details!**

##Features
* Users can easily search the [TheMovieDB](https://www.themoviedb.org/) for content to request
* Easily accessible list of requested movies and TV series
* Simple and easy user authentication lets only those you want in
* [Couch Potato](https://couchpota.to/) integration for automatic downloads of movies
* [SickRage](https://github.com/SiCKRAGETV/SickRage) and [Sonarr](https://sonarr.tv/) integrationed for automatic TV Series downloads
* [PushBullet](https://www.pushbullet.com/) or [PushOver](https://pushover.net/) notifications to keep up to date with requests
* Test pages are now setup that should help diagnose and troubleshoot connectivity issues, links can be found in admin interface

![Plex Authentication](Screenshot10.png)
## Features
* Users can easily search the [TheMovieDB](https://www.themoviedb.org/) for content to request
* Easily accessible list of requested Movies and TV series
* Simple and easy user authentication and request approval
* [CouchPotato](https://couchpota.to/) integration for automatic downloads of Movies
* [SickRage](https://github.com/SiCKRAGETV/SickRage) and [Sonarr](https://sonarr.tv/) integrationed for automatic TV Series downloads
* [Pushbullet](https://www.pushbullet.com/) and [Pushover](https://pushover.net/) notifications to keep up to date with requests

##Installation
Installation is straightforward: please update to Meteor 1.1 (for Windows support), clone the repo, `cd` into the directory, and run `meteor`. For Windows users check out this [blog post](http://8bits.ca/blog/installing-plexrequests-windows/) for installation instructions using Git!
## Installation
Installation is straightforward: please update to Meteor 1.2.1, clone the repo, `cd` into the directory, and run `meteor`. For Windows users check out this [blog post](http://8bits.ca/blog/installing-plexrequests-windows/) for installation instructions using Git!

On first run navigate to `http://localhost:3000/admin` and create an admin account with an username and password. **If this isn't done someone else can create the admin account to your applications.** This account is only used for logging in, email integration isn't enabled. Once logged in, please visit the status and setup pages for the various services as linked to in the admin interface to get started.
On first run navigate to `http://localhost:3000/admin` and create an admin account with an email address and password. **If this isn't done someone else can create the admin account to your application.** This account is only used for logging in, email integration isn't enabled. Once logged in, you can configure your settings and get things going.

##FAQ
## FAQ
Please visit the projects [GitHub page](http://plexrequests.8bits.ca/) for [FAQ page](http://plexrequests.8bits.ca/faq)

##Contributors
Plex Authentication: [@jeradin](https://github.com/Jeradin)
Test Pages: [@jrudio](https://github.com/jrudio)
Improved TV Requests: [@drzoidberg33](https://github.com/drzoidberg33)
## Contributors
[@jeradin](https://github.com/Jeradin) / [@jrudio](https://github.com/jrudio) / [@drzoidberg33](https://github.com/drzoidberg33) / [@SmallwoodDR82](https://github.com/SmallwoodDR82)

##License
## License
This application is licensed under The MIT License. The Plex logo, and name are copyright of Plex Inc.
Binary file removed Screenshot03.png
Binary file not shown.
Binary file removed Screenshot07.jpg
Binary file not shown.
Binary file removed Screenshot10.png
Binary file not shown.
9 changes: 9 additions & 0 deletions client/head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<head>
<title>Plex Requests</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<!-- <link rel="stylesheet" href="/css/bootstrap.min.css"> -->
<!-- <link rel="stylesheet" href="/css/styles.css"> -->
<link rel="icon" href="favicon.ico">
</head>
8 changes: 8 additions & 0 deletions client/helpers/authentication.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Plex user authentication
// Session.get("auth")

// Plex user name
// Session.get("user")

// Last logged on (for clearing sessions)
// Session.get("lastLoggedIn")
5 changes: 5 additions & 0 deletions client/helpers/bert.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bert.defaults = {
hideDelay: 3500,
style: 'growl-bottom-right',
type: 'default'
};
20 changes: 20 additions & 0 deletions client/helpers/globalHelpers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Template.registerHelper('plexUser', function () {
return Session.get("user");
});

Template.registerHelper('auth', function () {
var auth = function () {
if (Session.get("auth") === "true") {
return true;
} else if (Meteor.userId()) {
return true;
} else {
return false;
}
}
return auth();
});

Template.registerHelper('plexAuth', function () {
return (Session.get("auth") === "true") ? true : false;
})
16 changes: 0 additions & 16 deletions client/helpers/helpers.js

This file was deleted.

Loading

0 comments on commit af4e68d

Please sign in to comment.