[WIP] Directory/file organization directus#1197

softdzx · Jun 25, 2016 · 3a5e9bc · 3a5e9bc
1 parent f65dd08
commit 3a5e9bc
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 88 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ dist/*
 
 # Don't track composer phar/vendors
 composer.phar
-api/vendor
+vendor
 
 # Ignore log files, but track the log README
 api/logs/*.log

diff --git a/api/api.php b/api/api.php
@@ -1,7 +1,7 @@
 <?php
 
 // Composer Autoloader
-$loader = require 'vendor/autoload.php';
+$loader = require __DIR__.'/../vendor/autoload.php';
 
 // Non-autoload components
 require dirname(__FILE__) . '/config.php';

diff --git a/api/core/Directus/Bootstrap.php b/api/core/Directus/Bootstrap.php
@@ -340,7 +340,7 @@ private static function filesystem()
     private static function extensions() {
         self::requireConstants('APPLICATION_PATH', __FUNCTION__);
         $extensions = array();
-        $extensionsDirectory = APPLICATION_PATH . '/extensions/';
+        $extensionsDirectory = APPLICATION_PATH . '/customs/extensions/';
         foreach (new \DirectoryIterator($extensionsDirectory) as $file) {
             if($file->isDot()) {
                 continue;
@@ -365,7 +365,7 @@ private static function extensions() {
      */
     private static function uis() {
         self::requireConstants('APPLICATION_PATH', __FUNCTION__);
-        $uiDirectory = APPLICATION_PATH . '/ui';
+        $uiDirectory = APPLICATION_PATH . '/customs/ui';
         $uis = array();
 
         if (!file_exists($uiDirectory)) {
@@ -392,7 +392,7 @@ private static function uis() {
     private static function listViews() {
         self::requireConstants('APPLICATION_PATH', __FUNCTION__);
         $listViews = array();
-        $listViewsDirectory = APPLICATION_PATH . '/listviews/';
+        $listViewsDirectory = APPLICATION_PATH . '/customs/listviews/';
         foreach (new \DirectoryIterator($listViewsDirectory) as $file) {
             if($file->isDot()) {
                 continue;

diff --git a/api/core/functions.php b/api/core/functions.php
@@ -154,7 +154,7 @@ function load_registered_hooks($listeners, $areFilters = false)
 
 function getLocale() {
     // TODO: get locale from user.
-    return 'en';
+    return 'es';
 }
 
 function getDefaultPhrases() {
@@ -164,7 +164,7 @@ function getDefaultPhrases() {
 }
 
 function getPhrases($locale = 'en') {
-    $langFile = BASE_PATH.'/content/locales/'.$locale.'.json';
+    $langFile = BASE_PATH.'/customs/locales/'.$locale.'.json';
 
     if (file_exists($langFile)) {
         $phrases = json_decode(file_get_contents($langFile), true);

diff --git a/app/config.js b/app/config.js
@@ -23,9 +23,9 @@ require.config({
     "vendor":     "../assets/vendor",
 
     // Extensions
-    "extensions": '../extensions',
-    "listviews":  '../listviews',
-    "ui":         '../ui'
+    "extensions": '../customs/extensions',
+    "listviews":  '../customs/listviews',
+    "ui":         '../customs/ui'
   },
 
   shim: {

diff --git a/bin/directus b/bin/directus
@@ -2,7 +2,7 @@
 <?php
 
 // Composer Autoloader
-$loader = require __DIR__ . '/../api/vendor/autoload.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
 
 use Directus\Util\Installation\Console;
 

diff --git a/bin/directusLoader.php b/bin/directusLoader.php
@@ -1,7 +1,7 @@
 <?php
 
 // Composer Autoloader
-$loader = require __DIR__ . '/../api/vendor/autoload.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
 
 // Non-autoload components
 require __DIR__ . '/../api/config.php';

diff --git a/bin/ruckus.php b/bin/ruckus.php
@@ -3,7 +3,7 @@
 define('ROOTPATH', dirname(dirname(__FILE__)));
 error_reporting(0);
 
-$loader = require ROOTPATH . '/api/vendor/autoload.php';
+$loader = require ROOTPATH . '/vendor/autoload.php';
 $loader->add("Ruckusing", ROOTPATH . "/api/vendor/ruckusing/ruckusing-migrations/lib/");
 
 use Ruckusing\FrameworkRunner as Ruckusing_Framework;
@@ -16,4 +16,4 @@
 
 $main = new Ruckusing_Framework($config, $_SERVER['argv']);
 $output = $main->execute();
-echo $output;
+echo $output;
diff --git a/api/composer.json → composer.json b/api/composer.json → composer.json
@@ -18,11 +18,11 @@
   },
     "autoload": {
         "psr-4": {
-            "Directus\\": "core/Directus/",
-            "Directus\\Installation\\": "../installation/includes/"
+            "Directus\\": "api/core/Directus/",
+            "Directus\\Installation\\": "installation/includes/"
         },
         "files": [
-            "core/functions.php"
+            "api/core/functions.php"
         ]
     }
 }
diff --git a/api/composer.lock → composer.lock b/api/composer.lock → composer.lock
diff --git a/customs/.htaccess b/customs/.htaccess
@@ -0,0 +1,2 @@
+# Prevent directory listing
+IndexIgnore *
diff --git a/extensions/.gitignore → customs/extensions/.gitignore b/extensions/.gitignore → customs/extensions/.gitignore
diff --git a/extensions/.htaccess → customs/extensions/.htaccess b/extensions/.htaccess → customs/extensions/.htaccess
diff --git a/listviews/.gitignore → customs/listviews/.gitignore b/listviews/.gitignore → customs/listviews/.gitignore
diff --git a/customs/locales/.gitkeep b/customs/locales/.gitkeep
diff --git a/ui/.gitignore → customs/ui/.gitignore b/ui/.gitignore → customs/ui/.gitignore
diff --git a/extensions/_example/main.js b/extensions/_example/main.js
diff --git a/extensions/_example/templates/example.html b/extensions/_example/templates/example.html
diff --git a/gulpfile.js b/gulpfile.js
@@ -220,7 +220,7 @@ gulp.task('singlepage', function () {
 // Composer - Gulp Task
 // --------------------
 gulp.task('composer', function(cb) {
-  var child = cp.spawn('composer', ['install', '--ansi', '--prefer-dist', '--no-dev'], {cwd: './dist/api'});
+  var child = cp.spawn('composer', ['install', '--ansi', '--prefer-dist', '--no-dev'], {cwd: './dist/'});
 
   child.stdout.on('data', function(chunk) {
     process.stdout.write(chunk);
@@ -240,7 +240,7 @@ gulp.task('move', function() {
     './api/logs/*',
     './api/migrations/**/*',
     // './api/vendor/**/*.*',
-    './api/composer.json',
+    './composer.json',
     './api/.htaccess',
     './api/api.php',
     './api/config_sample.php',
@@ -320,4 +320,4 @@ gulp.task('build', function(cb) {
 });
 
 // Default task
-gulp.task('default', ['watch', 'build']);
+gulp.task('default', ['watch', 'build']);
diff --git a/index.php b/index.php
@@ -6,7 +6,7 @@
 }
 
 // Composer Autoloader
-$loader = require 'api/vendor/autoload.php';
+$loader = require 'vendor/autoload.php';
 
 // Non-autoloaded components
 require 'api/api.php';

diff --git a/installation/bootstrap.php b/installation/bootstrap.php
@@ -2,7 +2,7 @@
 
 require __DIR__.'/includes/install.functions.php';
 
-$vendorAutoload = BASE_PATH.'/api/vendor/autoload.php';
+$vendorAutoload = BASE_PATH.'/vendor/autoload.php';
 $installationAutoload = __DIR__.'/autoload.php';
 
 if (!file_exists($vendorAutoload)) {

diff --git a/installation/includes/Steps/CheckRequirementsStep.php b/installation/includes/Steps/CheckRequirementsStep.php
@@ -28,7 +28,7 @@ public function preRun(&$state)
             $errors[] = 'Your host needs to have GD Library enabled to run this version of Directus!';
         }
 
-        if (!file_exists(BASE_PATH.'/api/vendor/autoload.php')) {
+        if (!file_exists(BASE_PATH.'/vendor/autoload.php')) {
             $errors[] = 'Composer dependencies must be installed first.';
         }
 

diff --git a/installation/views/confirm.php b/installation/views/confirm.php
@@ -74,7 +74,7 @@
         </tr>
         <tr>
             <td class="item">Composer Dependencies Installed (../api/composer.json)</td>
-            <td class="result"><?php if(file_exists('../api/vendor/autoload.php')) {echo('<span class="label label-success">Yes</span>');} else {echo('<span class="label label-important">No</span><a href="https://github.com/RNGR/Directus/wiki/6.-Development-Build#step-4-install-dependencies" target="_blank"> ?</a>');} ?></td>
+            <td class="result"><?php if(file_exists('../vendor/autoload.php')) {echo('<span class="label label-success">Yes</span>');} else {echo('<span class="label label-important">No</span><a href="https://github.com/RNGR/Directus/wiki/6.-Development-Build#step-4-install-dependencies" target="_blank"> ?</a>');} ?></td>
         </tr>
         <tr>
             <td class="item">Logs Writable (../api/logs/)</td>

diff --git a/login.php b/login.php
@@ -5,7 +5,7 @@
 }
 
 // Composer Autoloader
-$loader = require 'api/vendor/autoload.php';
+$loader = require 'vendor/autoload.php';
 
 define('BASE_PATH', dirname(__FILE__));
 define('API_PATH', BASE_PATH . '/api');

diff --git a/media_auth_proxy/index.php b/media_auth_proxy/index.php
@@ -1,7 +1,7 @@
 <?php
 
 // Composer Autoloader
-$loader = require '../api/vendor/autoload.php';
+$loader = require '../vendor/autoload.php';
 
 // Non-autoload components
 require dirname(__FILE__) . '/../api/config.php';

diff --git a/phpunit.php b/phpunit.php
@@ -1,3 +1,3 @@
 <?php
 
-$loader = require __DIR__.'/api/vendor/autoload.php';
+$loader = require __DIR__.'/vendor/autoload.php';