move editor folder to editor-files, remove appcache

* it sometimes confuses web servers to have a folder named "editor" while also serving routes with the same name * dropped appcache stuff since it wasn't working super well * add nginx config to the readme
8 years ago · 904782f973
53 changed files with 61 additions and 55 deletions
--- a/README.md
+++ b/README.md
@ -6,6 +6,46 @@ Work in progress. Do not use!
 https://quill.p3k.io/


+### Web Server Configuration
+
+Set the document root to the "public" folder of this repo, and ensure all requests are routed through `public/index.php` if they don't match a file.
+
+#### nginx
+
+```
+server {
+  listen       80;
+  server_name  quill.dev;
+
+  root /path/to/Quill/public;
+
+  error_log  logs/quill.error.log  notice;
+
+  try_files $uri /index.php?$args;
+
+  location /index.php {
+    fastcgi_pass    php-pool;
+    fastcgi_index   index.php;
+    include fastcgi_params;
+    fastcgi_param   SCRIPT_FILENAME $document_root$fastcgi_script_name;
+  }
+}
+```
+
+#### Apache htaccess
+
+```
+  RewriteEngine on
+
+  RewriteBase /
+
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !=/favicon.ico
+  RewriteRule ^ index.php [L]
+```
+
+
 ### Contributing

 By submitting code to this project, you agree to irrevocably release it under the same license as this project.
--- a/controllers/editor.php
+++ b/controllers/editor.php
@ -1,9 +1,10 @@
 <?php

 $app->get('/editor', function() use($app) {
-  // Don't require login because appcache caches the whole page
-  $html = $app->render('editor.php');
-  $app->response()->body($html);
+  if($user=require_login($app)) {
+    $html = $app->render('editor.php');
+    $app->response()->body($html);
+  }
 });

 $app->post('/editor/publish', function() use($app) {
@ -66,10 +67,3 @@ $app->post('/editor/test-login', function() use($app) {
  $app->response()['Content-type'] = 'application/json';
  $app->response()->body(json_encode(['logged_in'=>$logged_in]));
 });
-
-$app->get('/appcache.manifest', function() use($app) {
-  $content = partial('partials/appcache');
-
-  $app->response()['Content-type'] = 'text/cache-manifest';
-  $app->response()->body($content);
-});
--- a/public/editor-files/editor.js
+++ b/public/editor-files/editor.js
--- a/public/editor-files/font-awesome/css/font-awesome.css
+++ b/public/editor-files/font-awesome/css/font-awesome.css
--- a/public/editor-files/font-awesome/css/font-awesome.min.css
+++ b/public/editor-files/font-awesome/css/font-awesome.min.css
--- a/public/editor-files/font-awesome/fonts/FontAwesome.otf
+++ b/public/editor-files/font-awesome/fonts/FontAwesome.otf
--- a/public/editor-files/font-awesome/fonts/fontawesome-webfont.eot
+++ b/public/editor-files/font-awesome/fonts/fontawesome-webfont.eot
--- a/public/editor-files/font-awesome/fonts/fontawesome-webfont.svg
+++ b/public/editor-files/font-awesome/fonts/fontawesome-webfont.svg
--- a/public/editor-files/font-awesome/fonts/fontawesome-webfont.ttf
+++ b/public/editor-files/font-awesome/fonts/fontawesome-webfont.ttf
--- a/public/editor-files/font-awesome/fonts/fontawesome-webfont.woff
+++ b/public/editor-files/font-awesome/fonts/fontawesome-webfont.woff
--- a/public/editor-files/font-awesome/fonts/fontawesome-webfont.woff2
+++ b/public/editor-files/font-awesome/fonts/fontawesome-webfont.woff2
--- a/public/editor-files/handlebars.min.js
+++ b/public/editor-files/handlebars.min.js
--- a/public/editor-files/jquery-1.11.3.min.js
+++ b/public/editor-files/jquery-1.11.3.min.js
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_18_b81900_40x40.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_20_666666_40x40.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_20_666666_40x40.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_flat_10_000000_40x100.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_flat_10_000000_40x100.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_f6f6f6_1x400.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_f6f6f6_1x400.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_fdf5ce_1x400.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_fdf5ce_1x400.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_65_ffffff_1x400.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_gloss-wave_35_f6a828_500x100.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_222222_256x240.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_222222_256x240.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_228ef1_256x240.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_228ef1_256x240.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ef8c08_256x240.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ef8c08_256x240.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ffd27a_256x240.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ffd27a_256x240.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ffffff_256x240.png
+++ b/public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ffffff_256x240.png
--- a/public/editor-files/jquery-ui-1.11.4.custom/index.html
+++ b/public/editor-files/jquery-ui-1.11.4.custom/index.html
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.css
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.css
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.js
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.js
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.css
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.css
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.js
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.js
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.structure.css
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.structure.css
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.structure.min.css
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.structure.min.css
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.theme.css
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.theme.css
--- a/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.theme.min.css
+++ b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.theme.min.css
--- a/public/editor-files/jquery.fileupload.js
+++ b/public/editor-files/jquery.fileupload.js
--- a/public/editor-files/jquery.iframetransport.js
+++ b/public/editor-files/jquery.iframetransport.js
--- a/public/editor-files/localforage/localforage.js
+++ b/public/editor-files/localforage/localforage.js
--- a/public/editor-files/medium-editor/css/medium-editor-insert-plugin-frontend.min.css
+++ b/public/editor-files/medium-editor/css/medium-editor-insert-plugin-frontend.min.css
--- a/public/editor-files/medium-editor/css/medium-editor-insert-plugin.min.css
+++ b/public/editor-files/medium-editor/css/medium-editor-insert-plugin.min.css
--- a/public/editor-files/medium-editor/css/medium-editor.min.css
+++ b/public/editor-files/medium-editor/css/medium-editor.min.css
--- a/public/editor-files/medium-editor/css/themes/bootstrap.min.css
+++ b/public/editor-files/medium-editor/css/themes/bootstrap.min.css
--- a/public/editor-files/medium-editor/css/themes/default.min.css
+++ b/public/editor-files/medium-editor/css/themes/default.min.css
--- a/public/editor-files/medium-editor/css/themes/flat.min.css
+++ b/public/editor-files/medium-editor/css/themes/flat.min.css
--- a/public/editor-files/medium-editor/css/themes/mani.min.css
+++ b/public/editor-files/medium-editor/css/themes/mani.min.css
--- a/public/editor-files/medium-editor/css/themes/roman.min.css
+++ b/public/editor-files/medium-editor/css/themes/roman.min.css
--- a/public/editor-files/medium-editor/js/medium-editor-insert-plugin.min.js
+++ b/public/editor-files/medium-editor/js/medium-editor-insert-plugin.min.js
--- a/public/editor-files/medium-editor/js/medium-editor.min.js
+++ b/public/editor-files/medium-editor/js/medium-editor.min.js
--- a/public/editor-files/quill-logo-36.png
+++ b/public/editor-files/quill-logo-36.png
--- a/public/editor-files/style.css
+++ b/public/editor-files/style.css
--- a/views/editor.php
+++ b/views/editor.php
@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" manifest="appcache.manifest">
+<html lang="en">
  <head>
    <title>Quill Editor</title>
    <meta charset="utf-8">
@ -15,22 +15,22 @@
      we want to exclude it for iPhone 5 to allow full screen apps -->
    <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)" />

-    <link rel="stylesheet" href="/editor/medium-editor/css/medium-editor.min.css">
-    <link rel="stylesheet" href="/editor/medium-editor/css/themes/default.min.css">
-    <link rel="stylesheet" href="/editor/medium-editor/css/medium-editor-insert-plugin.min.css">
-    <link rel="stylesheet" href="/editor/medium-editor/css/medium-editor-insert-plugin-frontend.min.css">
-    <link href="/editor/font-awesome/css/font-awesome.css" rel="stylesheet">
-    <link rel="stylesheet" href="/editor/style.css">
+    <link rel="stylesheet" href="/editor-files/medium-editor/css/medium-editor.min.css">
+    <link rel="stylesheet" href="/editor-files/medium-editor/css/themes/default.min.css">
+    <link rel="stylesheet" href="/editor-files/medium-editor/css/medium-editor-insert-plugin.min.css">
+    <link rel="stylesheet" href="/editor-files/medium-editor/css/medium-editor-insert-plugin-frontend.min.css">
+    <link href="/editor-files/font-awesome/css/font-awesome.css" rel="stylesheet">
+    <link rel="stylesheet" href="/editor-files/style.css">

-    <script src="/editor/jquery-1.11.3.min.js"></script>
-    <script src="/editor/jquery-ui-1.11.4.custom/jquery-ui.min.js"></script>
-    <script src="/editor/jquery.fileupload.js"></script>
-    <script src="/editor/jquery.iframetransport.js"></script>
+    <script src="/editor-files/jquery-1.11.3.min.js"></script>
+    <script src="/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.js"></script>
+    <script src="/editor-files/jquery.fileupload.js"></script>
+    <script src="/editor-files/jquery.iframetransport.js"></script>

-    <script src="/editor/handlebars.min.js"></script>
-    <script src="/editor/medium-editor/js/medium-editor.min.js"></script>
-    <script src="/editor/medium-editor/js/medium-editor-insert-plugin.min.js"></script>
-    <script src="/editor/localforage/localforage.js"></script>
+    <script src="/editor-files/handlebars.min.js"></script>
+    <script src="/editor-files/medium-editor/js/medium-editor.min.js"></script>
+    <script src="/editor-files/medium-editor/js/medium-editor-insert-plugin.min.js"></script>
+    <script src="/editor-files/localforage/localforage.js"></script>

    <link rel="apple-touch-icon" sizes="57x57" href="/images/quill-icon-57.png">
    <link rel="apple-touch-icon" sizes="72x72" href="/images/quill-icon-72.png">
@ -43,7 +43,7 @@

 <div class="toolbar">
  <div class="toolbar-left">
-    <span class="item"><a href="/"><img src="/editor/quill-logo-36.png" width="36" height="31" class="logo"></a></span>
+    <span class="item"><a href="/"><img src="/editor-files/quill-logo-36.png" width="36" height="31" class="logo"></a></span>
    <span class="item text"><span id="draft-status">Draft</span></span>
  </div>
  <div class="toolbar-right">
@ -106,7 +106,7 @@
  </div>
 </div>

-<script src="/editor/editor.js"></script>
+<script src="/editor-files/editor.js"></script>

 </body>
 </html>
--- a/views/partials/appcache.php
+++ b/views/partials/appcache.php
@ -1,28 +0,0 @@
-CACHE MANIFEST
-
-# v25
-
-/editor
-/editor/style.css
-/editor/medium-editor/css/medium-editor.min.css
-/editor/medium-editor/css/themes/default.min.css
-/editor/medium-editor/css/medium-editor-insert-plugin.min.css
-/editor/medium-editor/css/medium-editor-insert-plugin-frontend.min.css
-/editor/font-awesome/css/font-awesome.css
-/editor/jquery-1.11.3.min.js
-/editor/jquery-ui-1.11.4.custom/jquery-ui.min.js
-/editor/jquery.fileupload.js
-/editor/jquery.iframetransport.js
-/editor/handlebars.min.js
-/editor/medium-editor/js/medium-editor.min.js
-/editor/medium-editor/js/medium-editor-insert-plugin.min.js
-/editor/localforage/localforage.js
-/editor/quill-logo-36.png
-# /editor/editor.js
-/editor/font-awesome/fonts/fontawesome-webfont.woff2?v=4.3.0
-/editor/font-awesome/fonts/fontawesome-webfont.woff?v=4.3.0
-/editor/font-awesome/fonts/fontawesome-webfont.ttf?v=4.3.0
-
-NETWORK:
-*
-