Get things out of /frontend, closes #28

godotengine · Aug 9, 2016 · 1a58a48 · akien-mga · Aug 9, 2016 · 1a58a48
1 parent 6b94cbf
commit 1a58a48
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 vendor/**
-logs/**
+logs/**/*.log
 src/settings-local.php
 
 **/bower_components/**
diff --git a/frontend/.htaccess → .htaccess b/frontend/.htaccess → .htaccess
@@ -4,7 +4,8 @@ RewriteEngine On
 # If you need to use the `RewriteBase` directive, it should be the
 # absolute physical path to the directory that contains this htaccess file.
 #
-RewriteBase /asset-library/frontend
+
+RewriteBase /asset-library
 
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^ index.php [QSA,L]
diff --git a/data/.htaccess b/data/.htaccess
@@ -0,0 +1,2 @@
+Order allow,deny
+Deny from all
diff --git a/frontend/index.php b/frontend/index.php
diff --git a/index.php b/index.php
@@ -0,0 +1,4 @@
+<?php
+$frontend = true;
+include(__DIR__ . '/api/index.php');
+
diff --git a/logs/.htaccess b/logs/.htaccess
@@ -0,0 +1,2 @@
+Order allow,deny
+Deny from all
diff --git a/logs/README.md b/logs/README.md
diff --git a/src/.htaccess b/src/.htaccess
@@ -0,0 +1,2 @@
+Order allow,deny
+Deny from all
diff --git a/src/middleware.php b/src/middleware.php
@@ -48,7 +48,7 @@
 
     if(isset($result['url'])) {
       $response = new \Slim\Http\Response(303);
-      $response = $response->withHeader('Location', dirname($request->getUri()->getBasePath()) . '/frontend/' . $result['url']);
+      $response = $response->withHeader('Location', $request->getUri()->getBasePath() . '/' . $result['url']);
     } else {
       $template_names = [
         //'/configure' => 'configure',
@@ -77,8 +77,8 @@
         $errorResponse = new \Slim\Http\Response();
         $params = [
           'data' => $result,
-          'basepath' => dirname($request->getUri()->getBasePath()) . '/frontend',
-          'bowerpath' => dirname($request->getUri()->getBasePath()) . '/bower_components',
+          'basepath' => $request->getUri()->getBasePath(). '',
+          'bowerpath' => $request->getUri()->getBasePath() . '/bower_components',
           'path' => $path,
           'params' => $request->getQueryParams(),
           'categories' => [], // Filled later

diff --git a/src/routes/auth.php b/src/routes/auth.php
@@ -3,7 +3,7 @@
 
 
 // Initializes the connection by sending all categories available
-$app->get('/configure', function ($request, $response, $args) {
+$app->get('/configure', function ($request, $response, $args) { global $frontend;
   $params = $request->getQueryParams();
 
   $category_type = $this->constants['category_type']['addon'];
@@ -28,7 +28,9 @@
     return $response->withJson([
       'categories' => $query->fetchAll(),
       'token' => $token,
-      'login_url' => $_SERVER['HTTP_HOST'] . dirname($request->getUri()->getBasePath()) . 'frontend/login#' . urlencode($token),
+      'login_url' => $_SERVER['HTTP_HOST'] .
+        (isset($frontend) && $frontend ? dirname($request->getUri()->getBasePath()) : $request->getUri()->getBasePath()) .
+        '/login#' . urlencode($token),
       // ^ TODO: Make those routes actually work
     ], 200);
 

diff --git a/templates/.htaccess b/templates/.htaccess
@@ -0,0 +1,2 @@
+Order allow,deny
+Deny from all
diff --git a/templates/_header.phtml b/templates/_header.phtml
@@ -31,7 +31,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/asset-library/frontend">Godot Asset Library</a>
+        <a class="navbar-brand" href="<?php echo $basepath ?>">Godot Asset Library</a>
       </div>
 
       <?php global $gPaths; $gPaths = [$basepath, $path]; function make_nav_link($name, $link='#') { global $gPaths; ?>