Merge branch 'master' of ssh://phabricator.poniverse.net/diffusion/PF/pony-fm

This commit is contained in:
Nelson LaQuet 2015-05-20 03:22:49 -05:00
commit a57d081fec
13 changed files with 18 additions and 178 deletions

3
.gitignore vendored
View file

@ -21,6 +21,7 @@ Thumbs.db
.tmproj
*.esproj
nbproject
*.iml
# Dreamweaver added files
_notes
@ -46,4 +47,4 @@ node_modules
composer.phar
composer.lock
atlassian-ide-plugin.xml
_ide_helper.php
_ide_helper.php

3
Vagrantfile vendored
View file

@ -7,4 +7,5 @@ Vagrant.configure("2") do |config|
config.vm.provision "shell", path: "vagrant/install.sh"
config.vm.synced_folder "../pony.fm.files", "/vagrant-files"
end
config.bindfs.bind_folder "/vagrant", "/vagrant"
end

View file

@ -352,7 +352,7 @@
umask(0);
if (!is_dir($destination))
mkdir($destination, 777);
mkdir($destination, 777, true);
}
public function hasCover() {

View file

@ -2,11 +2,11 @@
@section('app_content')
<h1>Welcome to Pony.fm</h1>
<p>The pony fan music site. By a brony, for bronies.</p>
<p>The pony fan music site. By bronies, for bronies.</p>
<p>
We provide a comprehensive set of free tools to host, distribute, and catalogue your music, integrated with a rich community experience for artists and listeners alike.
</p>
<p>
Features include <strong>unlimited downloads</strong>, <strong>unlimited uploads</strong>, <strong>lossless uploads</strong> and much more! Click <a href="/about">here</a> to get all of our features!
Features include <strong>unlimited downloads</strong>, <strong>unlimited uploads</strong>, <strong>lossless uploads</strong> and much more! Click <a href="/about">here</a> for more details!
</p>
@endsection

0
artisan Normal file → Executable file
View file

View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/public/build" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="pony.fm node_modules" level="project" />
</component>
</module>

View file

@ -16,12 +16,12 @@
<section class="news">
<h1>Welcome to Pony.fm</h1>
<p>The pony fan music site. By a brony, for bronies.</p>
<p>The pony fan music site. By bronies, for bronies.</p>
<p>
We provide a comprehensive set of free tools to host, distribute, and catalogue your music, integrated with a rich community experience for artists and listeners alike.
</p>
<p>
Features include <strong>unlimited downloads</strong>, <strong>unlimited uploads</strong>, <strong>lossless uploads</strong> and much more! Click <a href="/about">here</a> to get all of our features!
Features include <strong>unlimited downloads</strong>, <strong>unlimited uploads</strong>, <strong>lossless uploads</strong> and much more! Click <a href="/about">here</a> for more details!
</p>
<h1>

View file

@ -13,13 +13,14 @@
<p>Simply put, <strong>&quot;Pony.fm is Pony.fm.&quot;</strong></p>
<h2>What makes Pony.fm special?</h2>
<p>Pony.fm is a service created by a brony, for bronies. Every inch of the Pony.fm experience is crafted with ponies and bronies in mind. Some of the features necessarily resemble what you may find on other sites - lossless uploads, for example - but some features are specific to the pony fan music community.</p>
<p>Pony.fm is a service created by bronies, for bronies. Every inch of the Pony.fm experience is crafted with ponies and bronies in mind. Some of the features necessarily resemble what you may find on other sites - lossless uploads, for example - but some features are specific to the pony fan music community.</p>
<p>Created as a service for the fandom, Pony.fm aims to be the one-stop shop for all things pony music, for artists and listeners alike.</p>
<h2>What does MLP Forums have to do with Pony.fm?</h2>
<p>MLP Forums and Pony.fm share an owner, and each encompasses a different segment of the global <em>My Little Pony: Friendship is Magic</em> community. Put together, both sites are able to offer a richer &quot;supercommunity&quot; experience than either site could offer on its own.</p>
<h2>Who is behind Pony.fm?</h2>
<p>Pony.fm is built and owned by Feld0, a pony-loving teenager who heard the call of code. Recognizing the need for a true pony-specific music hosting site, and realizing that MLP Forums provided him with the resources he needed to make it happen, he created a blank text file and started pumping code into his computer.</p>
<p>Pony.fm was created by Feld0, a pony-loving teenager who heard the call of code. Recognizing the need for a true pony-specific music hosting site, and realizing that MLP Forums provided him with the resources he needed to make it happen, he created a blank text file and started pumping code into his computer.</p>
<p>The site is now maintained by him and Nelson LaQuet as part of the <a href="https://poniverse.net/" target="_blank">Poniverse</a> network.</p>
</div>
</div>

View file

@ -1,10 +1,12 @@
# Starting a dev environment
To begin development, you must do two things:
To begin development, you must do three things:
1. Ensure that you have the following hosts entries:
> 192.168.33.11 pony.fm.local
> 192.168.33.11 api.pony.fm.local
2. Run "vagrant up" from the folder in which you cloned the repository
2. Install the "vagrant-bindfs" plugin: `vagrant plugin install vagrant-bindfs`
3. Run `vagrant up` from the folder in which you cloned the repository
Once everything is up and running, you'll be able to access the site at http://pony.fm.local. You can access the MySQL database by logging into **192.168.33.11:3306** with the username of **homestead** and the password of **secret**. The pony.fm database is named **homestead**.
@ -25,4 +27,4 @@ Pony.fm uses nginx, php-fpm, redis, and MySQL. You can modify the configuration
If you need to change any other configuration file on the VM - copy the entire file over into the vagrant folder, make your changes, and update the "copy-and-restart-config.sh" script to copy the modified config back into the proper folder. All potential configuration requirements should be represented in the vagrant folder **and never only on the VM itself** as changes will not be preserved.
**NOTE:** currently, Redis's configuration is not reloaded by the "copy-and-restart-config.sh"
**NOTE:** currently, Redis's configuration is not reloaded by the "copy-and-restart-config.sh"

View file

@ -1,154 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="F:\Nelson\My Documents - Personal\Visual Studio 2010\Projects\Poniverse\spa.pony.fm\composer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/cboden/ratchet" />
<excludeFolder url="file://$MODULE_DIR$/vendor/classpreloader/classpreloader" />
<excludeFolder url="file://$MODULE_DIR$/vendor/codescale/ffmpeg-php" />
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/annotations" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/cache" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/collections" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/common" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/inflector" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/lexer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/evenement/evenement" />
<excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/common" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/http" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/parser" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/stream" />
<excludeFolder url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" />
<excludeFolder url="file://$MODULE_DIR$/vendor/intouch/newrelic" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ircmaxell/password-compat" />
<excludeFolder url="file://$MODULE_DIR$/vendor/kriswallsmith/assetic" />
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/framework" />
<excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />
<excludeFolder url="file://$MODULE_DIR$/vendor/navruzm/lmongo" />
<excludeFolder url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
<excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<excludeFolder url="file://$MODULE_DIR$/vendor/patchwork/utf8" />
<excludeFolder url="file://$MODULE_DIR$/vendor/predis/predis" />
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/vendor/react/event-loop" />
<excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
<excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
<excludeFolder url="file://$MODULE_DIR$/vendor/simplepie/simplepie" />
<excludeFolder url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/browser-kit" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/console" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/debug" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/filesystem" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/finder" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-kernel" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/routing" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="PHARS">
<CLASSES>
<root url="phar://$MODULE_DIR$/composer.phar" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="phar://$MODULE_DIR$/composer.phar" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Composer Vendors">
<CLASSES>
<root url="file://$MODULE_DIR$/vendor/psr/log" />
<root url="file://$MODULE_DIR$/vendor/filp/whoops" />
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
<root url="file://$MODULE_DIR$/vendor/predis/predis" />
<root url="file://$MODULE_DIR$/vendor/intouch/newrelic" />
<root url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" />
<root url="file://$MODULE_DIR$/vendor/laravel/framework" />
<root url="file://$MODULE_DIR$/vendor/monolog/monolog" />
<root url="file://$MODULE_DIR$/vendor/navruzm/lmongo" />
<root url="file://$MODULE_DIR$/vendor/symfony/debug" />
<root url="file://$MODULE_DIR$/vendor/symfony/finder" />
<root url="file://$MODULE_DIR$/vendor/symfony/console" />
<root url="file://$MODULE_DIR$/vendor/symfony/process" />
<root url="file://$MODULE_DIR$/vendor/symfony/routing" />
<root url="file://$MODULE_DIR$/vendor/symfony/filesystem" />
<root url="file://$MODULE_DIR$/vendor/symfony/browser-kit" />
<root url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
<root url="file://$MODULE_DIR$/vendor/symfony/http-kernel" />
<root url="file://$MODULE_DIR$/vendor/symfony/translation" />
<root url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
<root url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
<root url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
<root url="file://$MODULE_DIR$/vendor/composer" />
<root url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
<root url="file://$MODULE_DIR$/vendor/doctrine/cache" />
<root url="file://$MODULE_DIR$/vendor/doctrine/lexer" />
<root url="file://$MODULE_DIR$/vendor/doctrine/common" />
<root url="file://$MODULE_DIR$/vendor/doctrine/inflector" />
<root url="file://$MODULE_DIR$/vendor/doctrine/annotations" />
<root url="file://$MODULE_DIR$/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/vendor/codescale/ffmpeg-php" />
<root url="file://$MODULE_DIR$/vendor/ircmaxell/password-compat" />
<root url="file://$MODULE_DIR$/vendor/patchwork/utf8" />
<root url="file://$MODULE_DIR$/vendor/simplepie/simplepie" />
<root url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" />
<root url="file://$MODULE_DIR$/vendor/kriswallsmith/assetic" />
<root url="file://$MODULE_DIR$/vendor/classpreloader/classpreloader" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$MODULE_DIR$/vendor/psr/log" />
<root url="file://$MODULE_DIR$/vendor/filp/whoops" />
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
<root url="file://$MODULE_DIR$/vendor/predis/predis" />
<root url="file://$MODULE_DIR$/vendor/intouch/newrelic" />
<root url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" />
<root url="file://$MODULE_DIR$/vendor/laravel/framework" />
<root url="file://$MODULE_DIR$/vendor/monolog/monolog" />
<root url="file://$MODULE_DIR$/vendor/navruzm/lmongo" />
<root url="file://$MODULE_DIR$/vendor/symfony/debug" />
<root url="file://$MODULE_DIR$/vendor/symfony/finder" />
<root url="file://$MODULE_DIR$/vendor/symfony/console" />
<root url="file://$MODULE_DIR$/vendor/symfony/process" />
<root url="file://$MODULE_DIR$/vendor/symfony/routing" />
<root url="file://$MODULE_DIR$/vendor/symfony/filesystem" />
<root url="file://$MODULE_DIR$/vendor/symfony/browser-kit" />
<root url="file://$MODULE_DIR$/vendor/symfony/dom-crawler" />
<root url="file://$MODULE_DIR$/vendor/symfony/http-kernel" />
<root url="file://$MODULE_DIR$/vendor/symfony/translation" />
<root url="file://$MODULE_DIR$/vendor/symfony/css-selector" />
<root url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
<root url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
<root url="file://$MODULE_DIR$/vendor/composer" />
<root url="file://$MODULE_DIR$/vendor/doctrine/dbal" />
<root url="file://$MODULE_DIR$/vendor/doctrine/cache" />
<root url="file://$MODULE_DIR$/vendor/doctrine/lexer" />
<root url="file://$MODULE_DIR$/vendor/doctrine/common" />
<root url="file://$MODULE_DIR$/vendor/doctrine/inflector" />
<root url="file://$MODULE_DIR$/vendor/doctrine/annotations" />
<root url="file://$MODULE_DIR$/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/vendor/codescale/ffmpeg-php" />
<root url="file://$MODULE_DIR$/vendor/ircmaxell/password-compat" />
<root url="file://$MODULE_DIR$/vendor/patchwork/utf8" />
<root url="file://$MODULE_DIR$/vendor/simplepie/simplepie" />
<root url="file://$MODULE_DIR$/vendor/swiftmailer/swiftmailer" />
<root url="file://$MODULE_DIR$/vendor/kriswallsmith/assetic" />
<root url="file://$MODULE_DIR$/vendor/classpreloader/classpreloader" />
</SOURCES>
</library>
</orderEntry>
</component>
</module>

0
vagrant/copy-and-restart-configs.sh Normal file → Executable file
View file

2
vagrant/install.sh Normal file → Executable file
View file

@ -1,7 +1,7 @@
sudo add-apt-repository -y ppa:kirillshkrogalev/ffmpeg-next
sudo apt-get update
sudo apt-get install -y ffmpeg
sudo apt-get install -y AtomicParsley
sudo apt-get install -y AtomicParsley flac vorbis-tools
sudo add-apt-repository -y --remove ppa:kirillshkrogalev/ffmpeg-next
mkdir /vagrant/logs

0
vagrant/reload-config.sh Normal file → Executable file
View file