v2.0.0-rc.2

config/api_sample.php

@@ -2,19 +2,12 @@
 
 return [
  'app' => [
- 'path' => '/',
- 'env' => 'development',
- 'debug' => true,
- 'default_language' => 'en',
+ 'env' => 'production',
  'timezone' => 'America/New_York',
  ],
 
  'settings' => [
- 'debug' => true,
- 'displayErrorDetails' => true,
  'logger' => [
- 'name' => 'directus-api',
- 'level' => Monolog\Logger::DEBUG,
  'path' => __DIR__ . '/logs/app.log',
  ],
  ],
@@ -25,17 +18,14 @@
  'port' => 3306,
  'name' => 'directus',
  'username' => 'root',
- 'password' => 'pass',
- 'prefix' => '', // not used
+ 'password' => 'root',
  'engine' => 'InnoDB',
  'charset' => 'utf8mb4'
  ],
 
  'cache' => [
  'enabled' => false,
  'response_ttl' => 3600, // seconds
- 'adapter' => 'filesystem',
- 'path' => '/storage/cache',
  // 'pool' => [
  // 'adapter' => 'apc'
  // ],
@@ -60,37 +50,28 @@
 
  'filesystem' => [
  'adapter' => 'local',
- // By default media directory are located at the same level of directus root
- // To make them a level up outsite the root directory
- // use this instead
- // Ex: 'root' => realpath(ROOT_PATH.'/../storage/uploads'),
- // Note: ROOT_PATH constant doesn't end with trailing slash
- 'root' => 'public/storage/uploads',
+ // The filesystem root is the directus root directory.
+ // All path are relative to the filesystem root when the path is not starting with a forward slash.
+ // By default the uploads directory is located at the directus public root
+ // An absolute path can be used as alternative.
+ 'root' => 'public/uploads/_/originals',
  // This is the url where all the media will be pointing to
- // here all assets will be (yourdomain)/storage/uploads
- // same with thumbnails (yourdomain)/storage/uploads/thumbs
- 'root_url' => '/storage/uploads',
- 'root_thumb_url' => '/storage/uploads/thumbs',
+ // here is where Directus will assume all assets will be accesed
+ // Ex: (yourdomain)/uploads/_/originals
+ 'root_url' => '/uploads/_/originals',
+ // Same as "root", but for the thumbnails
+ 'thumb_root' => 'public/uploads/_/thumbnails',
  // 'key' => 's3-key',
- // 'secret' => 's3-key',
+ // 'secret' => 's3-secret',
  // 'region' => 's3-region',
  // 'version' => 's3-version',
  // 'bucket' => 's3-bucket'
  ],
 
- // HTTP Settings
- 'http' => [
- 'emulate_enabled' => false,
- // can be null, or an array list of method to be emulated
- // Ex: ['PATH', 'DELETE', 'PUT']
- // 'emulate_methods' => null,
- 'force_https' => false
- ],
-
  'mail' => [
  'default' => [
  'transport' => 'sendmail',
- 'from' => 'admin@admin.com'
+ 'from' => 'admin@example.com'
  ],
  ],
 

migrations/db/schemas/20180220023232_create_relations_table.php

@@ -29,35 +29,23 @@ public function change()
  {
  $table = $this->table('directus_relations', ['signed' => false]);
 
- $table->addColumn('collection_a', 'string', [
+ $table->addColumn('collection_many', 'string', [
  'limit' => 64,
  'null' => false
  ]);
- $table->addColumn('field_a', 'string', [
+ $table->addColumn('field_many', 'string', [
  'limit' => 45,
  'null' => false
  ]);
- $table->addColumn('junction_key_a', 'string', [
+ $table->addColumn('collection_one', 'string', [
  'limit' => 64,
  'null' => true
  ]);
- $table->addColumn('junction_collection', 'string', [
+ $table->addColumn('field_one', 'string', [
  'limit' => 64,
  'null' => true
  ]);
- $table->addColumn('junction_mixed_collections', 'string', [
- 'limit' => 64,
- 'null' => true
- ]);
- $table->addColumn('junction_key_b', 'string', [
- 'limit' => 64,
- 'null' => true
- ]);
- $table->addColumn('collection_b', 'string', [
- 'limit' => 64,
- 'null' => true
- ]);
- $table->addColumn('field_b', 'string', [
+ $table->addColumn('junction_field', 'string', [
  'limit' => 64,
  'null' => true
  ]);

migrations/db/seeds/FieldsSeeder.php

@@ -509,7 +509,7 @@ public function run()
  [
  'collection' => 'directus_users',
  'field' => 'status',
- 'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
+ 'type' => \Directus\Database\Schema\DataTypes::TYPE_STATUS,
  'interface' => 'status',
  'options' => json_encode([
  'status_mapping' => [
@@ -557,8 +557,8 @@ public function run()
  [
  'collection' => 'directus_users',
  'field' => 'roles',
- 'type' => \Directus\Database\Schema\DataTypes::TYPE_M2M,
- 'interface' => 'm2m'
+ 'type' => \Directus\Database\Schema\DataTypes::TYPE_O2M,
+ 'interface' => 'one-to-many'
  ],
  [
  'collection' => 'directus_users',
@@ -714,43 +714,31 @@ public function run()
  ],
  [
  'collection' => 'directus_relations',
- 'field' => 'collection_a',
- 'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
- 'interface' => 'text-input'
- ],
- [
- 'collection' => 'directus_relations',
- 'field' => 'field_a',
- 'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
- 'interface' => 'text-input'
- ],
- [
- 'collection' => 'directus_relations',
- 'field' => 'junction_key_a',
+ 'field' => 'collection_many',
  'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
  'interface' => 'text-input'
  ],
  [
  'collection' => 'directus_relations',
- 'field' => 'junction_mixed_collections',
+ 'field' => 'field_many',
  'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
  'interface' => 'text-input'
  ],
  [
  'collection' => 'directus_relations',
- 'field' => 'junction_key_b',
+ 'field' => 'collection_one',
  'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
  'interface' => 'text-input'
  ],
  [
  'collection' => 'directus_relations',
- 'field' => 'collection_b',
+ 'field' => 'field_one',
  'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
  'interface' => 'text-input'
  ],
  [
  'collection' => 'directus_relations',
- 'field' => 'field_b',
+ 'field' => 'junction_field',
  'type' => \Directus\Database\Schema\DataTypes::TYPE_VARCHAR,
  'interface' => 'text-input'
  ],

migrations/db/seeds/RelationsSeeder.php

@@ -16,68 +16,73 @@ public function run()
  {
  $data = [
  [
- 'collection_a' => 'directus_activity',
- 'field_a' => 'user',
- 'collection_b' => 'directus_users'
+ 'collection_many' => 'directus_activity',
+ 'field_many' => 'user',
+ 'collection_one' => 'directus_users'
  ],
  [
- 'collection_a' => 'directus_activity_read',
- 'field_a' => 'user',
- 'collection_b' => 'directus_users'
+ 'collection_many' => 'directus_activity_read',
+ 'field_many' => 'user',
+ 'collection_one' => 'directus_users'
  ],
  [
- 'collection_a' => 'directus_activity_read',
- 'field_a' => 'activity',
- 'collection_b' => 'directus_activity'
+ 'collection_many' => 'directus_activity_read',
+ 'field_many' => 'activity',
+ 'collection_one' => 'directus_activity'
  ],
  [
- 'collection_a' => 'directus_collections_presets',
- 'field_a' => 'user',
- 'collection_b' => 'directus_users'
+ 'collection_many' => 'directus_collections_presets',
+ 'field_many' => 'user',
+ 'collection_one' => 'directus_users'
  ],
  [
- 'collection_a' => 'directus_collections_presets',
- 'field_a' => 'group',
- 'collection_b' => 'directus_groups'
+ 'collection_many' => 'directus_collections_presets',
+ 'field_many' => 'group',
+ 'collection_one' => 'directus_groups'
  ],
  [
- 'collection_a' => 'directus_files',
- 'field_a' => 'upload_user',
- 'collection_b' => 'directus_users'
+ 'collection_many' => 'directus_files',
+ 'field_many' => 'upload_user',
+ 'collection_one' => 'directus_users'
  ],
  [
- 'collection_a' => 'directus_files',
- 'field_a' => 'folder',
- 'collection_b' => 'directus_folders'
+ 'collection_many' => 'directus_files',
+ 'field_many' => 'folder',
+ 'collection_one' => 'directus_folders'
  ],
  [
- 'collection_a' => 'directus_folders',
- 'field_a' => 'parent_folder',
- 'collection_b' => 'directus_folders'
+ 'collection_many' => 'directus_folders',
+ 'field_many' => 'parent_folder',
+ 'collection_one' => 'directus_folders'
  ],
  [
- 'collection_a' => 'directus_permissions',
- 'field_a' => 'group',
- 'collection_b' => 'directus_groups'
+ 'collection_many' => 'directus_permissions',
+ 'field_many' => 'group',
+ 'collection_one' => 'directus_groups'
  ],
  [
- 'collection_a' => 'directus_revisions',
- 'field_a' => 'activity',
- 'collection_b' => 'directus_activity'
+ 'collection_many' => 'directus_revisions',
+ 'field_many' => 'activity',
+ 'collection_one' => 'directus_activity'
  ],
  [
- 'collection_a' => 'directus_users',
- 'field_a' => 'roles',
- 'junction_key_a' => 'user',
- 'junction_collection' => 'directus_user_roles',
- 'junction_key_b' => 'role',
- 'field_b' => 'users',
- 'collection_b' => 'directus_roles'
+ 'collection_many' => 'directus_user_roles',
+ 'field_many' => 'user',
+ 'collection_one' => 'directus_users',
+ 'field_one' => 'roles',
+ 'junction_field' => 'role',
  ],
  [
- 'collection_a' => 'directus_users',
- 'field_a' => 'avatar',
- 'collection_b' => 'directus_files'
+ 'collection_many' => 'directus_user_roles',
+ 'field_many' => 'role',
+ 'collection_one' => 'directus_roles',
+ 'field_one' => 'users',
+ 'junction_field' => 'user',
+ ],
+ [
+ 'collection_many' => 'directus_users',
+ 'field_many' => 'avatar',
+ 'collection_one' => 'directus_files'
  ]
  ];
 

public/.htaccess

@@ -4,33 +4,17 @@ Options +SymLinksIfOwnerMatch
 
 <ifModule mod_rewrite.c>
  RewriteEngine On
- # Uncomment this if you are getting routing errors:
- # RewriteBase /api
 
  RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 
  # Yield static media
  RewriteCond %{REQUEST_FILENAME} !-f
 
- # Map extension requests to their front controller
- # RewriteRule ^extensions/([^/]+) index.php?run_extension=$1&%{QUERY_STRING} [L]
-
  # Map all other requests to the main front controller, invoking the API router
  RewriteRule ^ index.php?%{QUERY_STRING} [L]
 </ifModule>
 
-<IfModule mod_headers.c>
- # Set CORS header for static files
- Header set Access-Control-Allow-Origin "*"
-</IfModule>
-
 <ifModule mod_php5.c>
  # Fix $HTTP_RAW_POST_DATA deprecated warning
  php_value always_populate_raw_post_data -1
 </ifModule>
-
-# Prevent PageSpeed module from rewriting the templates files
-# Avoiding it from breaking the template
-# <IfModule pagespeed_module>
-# ModPagespeedDisallow "*/app/**/*.twig"
-# </IfModule>