First push before 🥚

DaneEveritt · DaneEveritt · commit 344c1a988535 · 2017-10-06T21:22:32.000-05:00
diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -34,8 +34,6 @@ class Service extends Model implements CleansAttributes, ValidableContract
     protected $fillable = [
         'name',
         'description',
-        'startup',
-        'index_file',
     ];
 
     /**
@@ -45,8 +43,6 @@ class Service extends Model implements CleansAttributes, ValidableContract
         'author' => 'required',
         'name' => 'required',
         'description' => 'sometimes',
-        'startup' => 'sometimes',
-        'index_file' => 'required',
     ];
 
     /**
@@ -56,8 +52,6 @@ class Service extends Model implements CleansAttributes, ValidableContract
         'author' => 'email',
         'name' => 'string|max:255',
         'description' => 'nullable|string',
-        'startup' => 'nullable|string',
-        'index_file' => 'string',
     ];
 
     /**
diff --git a/app/Models/ServiceOption.php b/app/Models/ServiceOption.php
@@ -107,17 +107,6 @@ class ServiceOption extends Model implements CleansAttributes, ValidableContract
         'docker_image' => null,
     ];
 
-    /**
-     * Returns the display startup string for the option and will use the parent
-     * service one if the option does not have one defined.
-     *
-     * @return string
-     */
-    public function getDisplayStartupAttribute()
-    {
-        return (is_null($this->startup)) ? $this->service->startup : $this->startup;
-    }
-
     /**
      * Returns the install script for the option; if option is copying from another
      * it will return the copied script.
diff --git a/app/Services/Services/Sharing/ServiceOptionExporterService.php b/app/Services/Services/Sharing/ServiceOptionExporterService.php
@@ -58,10 +58,8 @@ public function handle(int $option): string
             'exported_at' => $this->carbon->now()->toIso8601String(),
             'name' => $option->name,
             'author' => array_get(explode(':', $option->tag), 0),
-            'tag' => $option->tag,
             'description' => $option->description,
             'image' => $option->docker_image,
-            'startup' => $option->display_startup,
             'config' => [
                 'files' => $option->inherit_config_files,
                 'startup' => $option->inherit_config_startup,
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -91,12 +91,10 @@
 $factory->define(Pterodactyl\Models\Service::class, function (Faker\Generator $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
-        'author' => $faker->unique()->uuid,
+        'uuid' => $faker->unique()->uuid,
+        'author' => 'testauthor@example.com',
         'name' => $faker->word,
         'description' => null,
-        'folder' => strtolower($faker->unique()->word),
-        'startup' => 'java -jar test.jar',
-        'index_file' => 'indexjs',
     ];
 });
 
@@ -108,7 +106,6 @@
         'name' => $faker->name,
         'description' => implode(' ', $faker->sentences(3)),
         'startup' => 'java -jar test.jar',
-        'tag' => 'test@testfactory.com:' . $faker->unique()->randomNumber(8),
     ];
 });
 
diff --git a/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php b/database/migrations/2017_09_23_185022_RemoveDaemonSecretFromSubusersTable.php
@@ -42,12 +42,16 @@ public function up()
     public function down()
     {
         Schema::table('subusers', function (Blueprint $table) {
-            $table->char('daemonSecret', 36)->after('server_id')->unique();
+            $table->char('daemonSecret', 36)->after('server_id');
         });
 
         $subusers = DB::table('subusers')->get();
         $subusers->each(function ($subuser) {
             DB::table('daemon_keys')->where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();
         });
+
+        Schema::table('subusers', function (Blueprint $table) {
+            $table->unique('daemonSecret');
+        });
     }
 }
diff --git a/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php b/database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
@@ -20,6 +20,8 @@ public function up()
             $table->string('author')->change();
             $table->char('uuid', 36)->after('id');
             $table->dropColumn('folder');
+            $table->dropColumn('startup');
+            $table->dropColumn('index_file');
         });
 
         DB::table('services')->get(['id', 'author', 'uuid'])->each(function ($service) {
@@ -42,6 +44,8 @@ public function down()
         Schema::table('services', function (Blueprint $table) {
             $table->dropColumn('uuid');
             $table->string('folder')->nullable();
+            $table->text('startup')->nullable();
+            $table->text('index_file');
             $table->string('author', 36)->change();
 
             $table->unique('name');
diff --git a/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php b/database/migrations/2017_10_02_202007_ChangeToABetterUniqueServiceConfiguration.php
@@ -15,19 +15,16 @@ public function up()
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->char('uuid', 36)->after('id');
-
-            $table->index(['service_id', 'tag']);
+            $table->dropColumn('tag');
         });
 
         DB::transaction(function () {
             DB::table('service_options')->select([
                 'service_options.id',
                 'service_options.uuid',
-                'service_options.tag',
                 'services.author AS service_author',
             ])->join('services', 'services.id', '=', 'service_options.service_id')->get()->each(function ($option) {
                 DB::table('service_options')->where('id', $option->id)->update([
-                    'tag' => $option->service_author . ':' . $option->tag,
                     'uuid' => Uuid::uuid4()->toString(),
                 ]);
             });
@@ -45,13 +42,13 @@ public function down()
     {
         Schema::table('service_options', function (Blueprint $table) {
             $table->dropColumn('uuid');
-            $table->dropIndex(['service_id', 'tag']);
+            $table->string('tag');
         });
 
         DB::transaction(function () {
             DB::table('service_options')->select(['id', 'tag'])->get()->each(function ($option) {
                 DB::table('service_options')->where('id', $option->id)->update([
-                    'tag' => array_get(explode(':', $option->tag), 1),
+                    'tag' => str_random(10),
                 ]);
             });
         });
diff --git a/resources/themes/pterodactyl/admin/services/functions.blade.php b/resources/themes/pterodactyl/admin/services/functions.blade.php
diff --git a/resources/themes/pterodactyl/admin/services/new.blade.php b/resources/themes/pterodactyl/admin/services/new.blade.php
@@ -21,7 +21,7 @@
 @section('content')
 <form action="{{ route('admin.services.new') }}" method="POST">
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-12">
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">New Service</h3>
@@ -41,19 +41,6 @@
                         </div>
                     </div>
                 </div>
-            </div>
-        </div>
-        <div class="col-md-6">
-            <div class="box">
-                <div class="box-body">
-                    <div class="form-group">
-                        <label class="control-label">Default Start Command</label>
-                        <div>
-                            <textarea name="startup" class="form-control" rows="2">{{ old('startup') }}</textarea>
-                            <p class="text-muted"><small>The default start command to use when running options under this service. This command can be modified per-option and should include the executable to be called in the container.</small></p>
-                        </div>
-                    </div>
-                </div>
                 <div class="box-footer">
                     {!! csrf_field() !!}
                     <button type="input" class="btn btn-primary pull-right">Save Service</button>
diff --git a/resources/themes/pterodactyl/admin/services/view.blade.php b/resources/themes/pterodactyl/admin/services/view.blade.php
@@ -20,70 +20,53 @@
 
 @section('content')
 <div class="row">
-    <div class="col-xs-12">
-        <div class="nav-tabs-custom nav-tabs-floating">
-            <ul class="nav nav-tabs">
-                <li class="active"><a href="{{ route('admin.services.view', $service->id) }}">Overview</a></li>
-                <li><a href="{{ route('admin.services.view.functions', $service->id) }}">Functions</a></li>
-            </ul>
-        </div>
-    </div>
-</div>
-<form action="{{ route('admin.services.view', $service->id) }}" method="POST">
-    <div class="row">
+    <form action="{{ route('admin.services.view', $service->id) }}" method="POST">
         <div class="col-md-6">
             <div class="box">
                 <div class="box-body">
                     <div class="form-group">
-                        <label class="control-label">Name</label>
+                        <label class="control-label">Name <span class="field-required"></span></label>
                         <div>
                             <input type="text" name="name" class="form-control" value="{{ $service->name }}" />
                             <p class="text-muted"><small>This should be a descriptive category name that emcompasses all of the options within the service.</small></p>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="control-label">Description</label>
+                        <label class="control-label">Description <span class="field-required"></span></label>
                         <div>
                             <textarea name="description" class="form-control" rows="7">{{ $service->description }}</textarea>
                         </div>
                     </div>
                 </div>
                 <div class="box-footer">
+                    {!! csrf_field() !!}
+                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Option</button>
                     <button id="deleteButton" type="submit" name="_method" value="DELETE" class="btn btn-sm btn-danger muted muted-hover"><i class="fa fa-trash-o"></i></button>
                 </div>
             </div>
         </div>
-        <div class="col-md-6">
-            <div class="box">
-                <div class="box-body">
-                    <div class="form-group">
-                        <label class="control-label">Default Start Command</label>
-                        <div>
-                            <textarea name="startup" class="form-control" rows="2">{{ $service->startup }}</textarea>
-                            <p class="text-muted"><small>The default start command to use when running options under this service. This command can be modified per-option and should include the executable to be called in the container.</small></p>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label">Author</label>
-                        <div>
-                            <input type="text" readonly class="form-control" value="{{ $service->author }}" />
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="control-label">UUID</label>
-                        <div>
-                            <input type="text" readonly class="form-control" value="{{ $service->uuid }}" />
-                        </div>
+    </form>
+    <div class="col-md-6">
+        <div class="box">
+            <div class="box-body">
+                <div class="form-group">
+                    <label class="control-label">Author</label>
+                    <div>
+                        <input type="text" readonly class="form-control" value="{{ $service->author }}" />
+                        <p class="text-muted small">The author of this service option. Please direct questions and issues to them unless this is an official option authored by <code>support@pterodactyl.io</code>.</p>
                     </div>
                 </div>
-                <div class="box-footer">
-                    {!! csrf_field() !!}
-                    <button type="submit" name="_method" value="PATCH" class="btn btn-primary btn-sm pull-right">Edit Service</button>
+                <div class="form-group">
+                    <label class="control-label">UUID</label>
+                    <div>
+                        <input type="text" readonly class="form-control" value="{{ $service->uuid }}" />
+                        <p class="text-muted small">A unique identifier that all servers using this option are assigned for identification purposes.</p>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</form>
+</div>
 <div class="row">
     <div class="col-xs-12">
         <div class="box box-primary">
diff --git a/routes/admin.php b/routes/admin.php
@@ -152,7 +152,6 @@
     Route::get('/', 'ServiceController@index')->name('admin.services');
     Route::get('/new', 'ServiceController@create')->name('admin.services.new');
     Route::get('/view/{service}', 'ServiceController@view')->name('admin.services.view');
-    Route::get('/view/{service}/functions', 'ServiceController@viewFunctions')->name('admin.services.view.functions');
     Route::get('/option/new', 'OptionController@create')->name('admin.services.option.new');
     Route::get('/option/{option}', 'OptionController@viewConfiguration')->name('admin.services.option.view');
     Route::get('/option/{option}/export', 'Services\Options\OptionShareController@export')->name('admin.services.option.export');
@@ -165,7 +164,6 @@
     Route::post('/option/{option}/variables', 'VariableController@store');
 
     Route::patch('/view/{service}', 'ServiceController@update');
-    Route::patch('/view/{service}/functions', 'ServiceController@updateFunctions');
     Route::patch('/option/{option}', 'OptionController@editConfiguration');
     Route::patch('/option/{option}/scripts', 'OptionController@updateScripts');
     Route::patch('/option/{option}/variables/{variable}', 'VariableController@update')->name('admin.services.option.variables.edit');

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,16 @@ public function up()`
`42`	`42`	`public function down()`
`43`	`43`	`{`
`44`	`44`	`Schema::table('subusers', function (Blueprint $table) {`
`45`		`- $table->char('daemonSecret', 36)->after('server_id')->unique();`
	`45`	`+ $table->char('daemonSecret', 36)->after('server_id');`
`46`	`46`	`});`
`47`	`47`
`48`	`48`	`$subusers = DB::table('subusers')->get();`
`49`	`49`	`$subusers->each(function ($subuser) {`
`50`	`50`	`DB::table('daemon_keys')->where('user_id', $subuser->user_id)->where('server_id', $subuser->server_id)->delete();`
`51`	`51`	`});`
	`52`	`+`
	`53`	`+ Schema::table('subusers', function (Blueprint $table) {`
	`54`	`+ $table->unique('daemonSecret');`
	`55`	`+ });`
`52`	`56`	`}`
`53`	`57`	`}`