diff --git a/README.md b/README.md index 097c5c4..c5c7b47 100644 --- 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. diff --git a/controllers/editor.php b/controllers/editor.php index 4c9740b..a3c0496 100644 --- a/controllers/editor.php +++ b/controllers/editor.php @@ -1,9 +1,10 @@ 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); -}); diff --git a/public/editor/editor.js b/public/editor-files/editor.js similarity index 100% rename from public/editor/editor.js rename to public/editor-files/editor.js diff --git a/public/editor/font-awesome/css/font-awesome.css b/public/editor-files/font-awesome/css/font-awesome.css similarity index 100% rename from public/editor/font-awesome/css/font-awesome.css rename to public/editor-files/font-awesome/css/font-awesome.css diff --git a/public/editor/font-awesome/css/font-awesome.min.css b/public/editor-files/font-awesome/css/font-awesome.min.css similarity index 100% rename from public/editor/font-awesome/css/font-awesome.min.css rename to public/editor-files/font-awesome/css/font-awesome.min.css diff --git a/public/editor/font-awesome/fonts/FontAwesome.otf b/public/editor-files/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from public/editor/font-awesome/fonts/FontAwesome.otf rename to public/editor-files/font-awesome/fonts/FontAwesome.otf diff --git a/public/editor/font-awesome/fonts/fontawesome-webfont.eot b/public/editor-files/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from public/editor/font-awesome/fonts/fontawesome-webfont.eot rename to public/editor-files/font-awesome/fonts/fontawesome-webfont.eot diff --git a/public/editor/font-awesome/fonts/fontawesome-webfont.svg b/public/editor-files/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from public/editor/font-awesome/fonts/fontawesome-webfont.svg rename to public/editor-files/font-awesome/fonts/fontawesome-webfont.svg diff --git a/public/editor/font-awesome/fonts/fontawesome-webfont.ttf b/public/editor-files/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from public/editor/font-awesome/fonts/fontawesome-webfont.ttf rename to public/editor-files/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/public/editor/font-awesome/fonts/fontawesome-webfont.woff b/public/editor-files/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from public/editor/font-awesome/fonts/fontawesome-webfont.woff rename to public/editor-files/font-awesome/fonts/fontawesome-webfont.woff diff --git a/public/editor/font-awesome/fonts/fontawesome-webfont.woff2 b/public/editor-files/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from public/editor/font-awesome/fonts/fontawesome-webfont.woff2 rename to public/editor-files/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/public/editor/handlebars.min.js b/public/editor-files/handlebars.min.js similarity index 100% rename from public/editor/handlebars.min.js rename to public/editor-files/handlebars.min.js diff --git a/public/editor/jquery-1.11.3.min.js b/public/editor-files/jquery-1.11.3.min.js similarity index 100% rename from public/editor/jquery-1.11.3.min.js rename to public/editor-files/jquery-1.11.3.min.js diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_flat_10_000000_40x100.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_flat_10_000000_40x100.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_f6f6f6_1x400.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_fdf5ce_1x400.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_glass_65_ffffff_1x400.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-icons_222222_256x240.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_222222_256x240.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-icons_228ef1_256x240.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_228ef1_256x240.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-icons_ef8c08_256x240.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ef8c08_256x240.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-icons_ffd27a_256x240.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ffd27a_256x240.png diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/images/ui-icons_ffffff_256x240.png rename to public/editor-files/jquery-ui-1.11.4.custom/images/ui-icons_ffffff_256x240.png diff --git a/public/editor/jquery-ui-1.11.4.custom/index.html b/public/editor-files/jquery-ui-1.11.4.custom/index.html similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/index.html rename to public/editor-files/jquery-ui-1.11.4.custom/index.html diff --git a/public/editor/jquery-ui-1.11.4.custom/jquery-ui.css b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.css similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.css rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.css diff --git a/public/editor/jquery-ui-1.11.4.custom/jquery-ui.js b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.js similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.js rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.js diff --git a/public/editor/jquery-ui-1.11.4.custom/jquery-ui.min.css b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.css similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.min.css rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.css diff --git a/public/editor/jquery-ui-1.11.4.custom/jquery-ui.min.js b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.js similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.min.js rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.min.js diff --git a/public/editor/jquery-ui-1.11.4.custom/jquery-ui.structure.css b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.structure.css similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.structure.css rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.structure.css diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.structure.min.css rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.structure.min.css diff --git a/public/editor/jquery-ui-1.11.4.custom/jquery-ui.theme.css b/public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.theme.css similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.theme.css rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.theme.css diff --git a/public/editor/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 similarity index 100% rename from public/editor/jquery-ui-1.11.4.custom/jquery-ui.theme.min.css rename to public/editor-files/jquery-ui-1.11.4.custom/jquery-ui.theme.min.css diff --git a/public/editor/jquery.fileupload.js b/public/editor-files/jquery.fileupload.js similarity index 100% rename from public/editor/jquery.fileupload.js rename to public/editor-files/jquery.fileupload.js diff --git a/public/editor/jquery.iframetransport.js b/public/editor-files/jquery.iframetransport.js similarity index 100% rename from public/editor/jquery.iframetransport.js rename to public/editor-files/jquery.iframetransport.js diff --git a/public/editor/localforage/localforage.js b/public/editor-files/localforage/localforage.js similarity index 100% rename from public/editor/localforage/localforage.js rename to public/editor-files/localforage/localforage.js diff --git a/public/editor/medium-editor/css/medium-editor-insert-plugin-frontend.min.css b/public/editor-files/medium-editor/css/medium-editor-insert-plugin-frontend.min.css similarity index 100% rename from public/editor/medium-editor/css/medium-editor-insert-plugin-frontend.min.css rename to public/editor-files/medium-editor/css/medium-editor-insert-plugin-frontend.min.css diff --git a/public/editor/medium-editor/css/medium-editor-insert-plugin.min.css b/public/editor-files/medium-editor/css/medium-editor-insert-plugin.min.css similarity index 100% rename from public/editor/medium-editor/css/medium-editor-insert-plugin.min.css rename to public/editor-files/medium-editor/css/medium-editor-insert-plugin.min.css diff --git a/public/editor/medium-editor/css/medium-editor.min.css b/public/editor-files/medium-editor/css/medium-editor.min.css similarity index 100% rename from public/editor/medium-editor/css/medium-editor.min.css rename to public/editor-files/medium-editor/css/medium-editor.min.css diff --git a/public/editor/medium-editor/css/themes/bootstrap.min.css b/public/editor-files/medium-editor/css/themes/bootstrap.min.css similarity index 100% rename from public/editor/medium-editor/css/themes/bootstrap.min.css rename to public/editor-files/medium-editor/css/themes/bootstrap.min.css diff --git a/public/editor/medium-editor/css/themes/default.min.css b/public/editor-files/medium-editor/css/themes/default.min.css similarity index 100% rename from public/editor/medium-editor/css/themes/default.min.css rename to public/editor-files/medium-editor/css/themes/default.min.css diff --git a/public/editor/medium-editor/css/themes/flat.min.css b/public/editor-files/medium-editor/css/themes/flat.min.css similarity index 100% rename from public/editor/medium-editor/css/themes/flat.min.css rename to public/editor-files/medium-editor/css/themes/flat.min.css diff --git a/public/editor/medium-editor/css/themes/mani.min.css b/public/editor-files/medium-editor/css/themes/mani.min.css similarity index 100% rename from public/editor/medium-editor/css/themes/mani.min.css rename to public/editor-files/medium-editor/css/themes/mani.min.css diff --git a/public/editor/medium-editor/css/themes/roman.min.css b/public/editor-files/medium-editor/css/themes/roman.min.css similarity index 100% rename from public/editor/medium-editor/css/themes/roman.min.css rename to public/editor-files/medium-editor/css/themes/roman.min.css diff --git a/public/editor/medium-editor/js/medium-editor-insert-plugin.min.js b/public/editor-files/medium-editor/js/medium-editor-insert-plugin.min.js similarity index 100% rename from public/editor/medium-editor/js/medium-editor-insert-plugin.min.js rename to public/editor-files/medium-editor/js/medium-editor-insert-plugin.min.js diff --git a/public/editor/medium-editor/js/medium-editor.min.js b/public/editor-files/medium-editor/js/medium-editor.min.js similarity index 100% rename from public/editor/medium-editor/js/medium-editor.min.js rename to public/editor-files/medium-editor/js/medium-editor.min.js diff --git a/public/editor/quill-logo-36.png b/public/editor-files/quill-logo-36.png similarity index 100% rename from public/editor/quill-logo-36.png rename to public/editor-files/quill-logo-36.png diff --git a/public/editor/style.css b/public/editor-files/style.css similarity index 100% rename from public/editor/style.css rename to public/editor-files/style.css diff --git a/views/editor.php b/views/editor.php index ac0f429..6d235c4 100644 --- a/views/editor.php +++ b/views/editor.php @@ -1,5 +1,5 @@ - + Quill Editor @@ -15,22 +15,22 @@ we want to exclude it for iPhone 5 to allow full screen apps --> - - - - - - + + + + + + - - - - + + + + - - - - + + + + @@ -43,7 +43,7 @@
- + Draft
@@ -106,7 +106,7 @@
- + \ No newline at end of file diff --git a/views/partials/appcache.php b/views/partials/appcache.php deleted file mode 100644 index 2e76754..0000000 --- a/views/partials/appcache.php +++ /dev/null @@ -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: -* -