diff --git a/.gitignore b/.gitignore index 87a0400..d5a62f2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,28 +22,28 @@ Icon .DS_Store # Temporary files -/media/* -!/media/index.html +/public/media/* +!/public/media/index.html # -------------------------------------------------- # SECURITY # -------------------------------------------------- # Accounts -/site/accounts/* -!/site/accounts/index.html +/storage/accounts/* +!/storage/accounts/index.html # Cache Files -/site/cache/* -!/site/cache/index.html +/storage/cache/* +!/storage/cache/index.html # Configuration files -/site/config/config.julienmonnerie.com.php -/site/config/config.julienmonnerie.test.php +/site/config/config.xiaowang.fr.php +/site/config/config.xiaowang.test.php # License /site/config/.license # Sessions -/site/sessions/* -!/site/sessions/index.html +/storage/sessions/* +!/storage/sessions/index.html diff --git a/htdocs b/htdocs new file mode 120000 index 0000000..d70ebaa --- /dev/null +++ b/htdocs @@ -0,0 +1 @@ +public \ No newline at end of file diff --git a/index.php b/index.php deleted file mode 100644 index 87ed01d..0000000 --- a/index.php +++ /dev/null @@ -1,5 +0,0 @@ -render(); diff --git a/.htaccess b/public/.htaccess similarity index 100% rename from .htaccess rename to public/.htaccess diff --git a/assets/css/panel.min.css b/public/assets/css/panel.min.css similarity index 100% rename from assets/css/panel.min.css rename to public/assets/css/panel.min.css diff --git a/assets/css/panel.min.css.map b/public/assets/css/panel.min.css.map similarity index 100% rename from assets/css/panel.min.css.map rename to public/assets/css/panel.min.css.map diff --git a/assets/css/panel.scss b/public/assets/css/panel.scss similarity index 100% rename from assets/css/panel.scss rename to public/assets/css/panel.scss diff --git a/assets/css/partials/_animations.scss b/public/assets/css/partials/_animations.scss similarity index 100% rename from assets/css/partials/_animations.scss rename to public/assets/css/partials/_animations.scss diff --git a/assets/css/partials/_fonts.scss b/public/assets/css/partials/_fonts.scss similarity index 100% rename from assets/css/partials/_fonts.scss rename to public/assets/css/partials/_fonts.scss diff --git a/assets/css/partials/_minireset.css b/public/assets/css/partials/_minireset.css similarity index 100% rename from assets/css/partials/_minireset.css rename to public/assets/css/partials/_minireset.css diff --git a/assets/css/partials/_variables.scss b/public/assets/css/partials/_variables.scss similarity index 100% rename from assets/css/partials/_variables.scss rename to public/assets/css/partials/_variables.scss diff --git a/assets/css/style.min.css b/public/assets/css/style.min.css similarity index 100% rename from assets/css/style.min.css rename to public/assets/css/style.min.css diff --git a/assets/css/style.min.css.map b/public/assets/css/style.min.css.map similarity index 100% rename from assets/css/style.min.css.map rename to public/assets/css/style.min.css.map diff --git a/assets/css/style.scss b/public/assets/css/style.scss similarity index 100% rename from assets/css/style.scss rename to public/assets/css/style.scss diff --git a/assets/fonts/open-sans/OpenSans-Bold.ttf b/public/assets/fonts/open-sans/OpenSans-Bold.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-Bold.ttf rename to public/assets/fonts/open-sans/OpenSans-Bold.ttf diff --git a/assets/fonts/open-sans/OpenSans-BoldItalic.ttf b/public/assets/fonts/open-sans/OpenSans-BoldItalic.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-BoldItalic.ttf rename to public/assets/fonts/open-sans/OpenSans-BoldItalic.ttf diff --git a/assets/fonts/open-sans/OpenSans-Italic.ttf b/public/assets/fonts/open-sans/OpenSans-Italic.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-Italic.ttf rename to public/assets/fonts/open-sans/OpenSans-Italic.ttf diff --git a/assets/fonts/open-sans/OpenSans-Medium.ttf b/public/assets/fonts/open-sans/OpenSans-Medium.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-Medium.ttf rename to public/assets/fonts/open-sans/OpenSans-Medium.ttf diff --git a/assets/fonts/open-sans/OpenSans-MediumItalic.ttf b/public/assets/fonts/open-sans/OpenSans-MediumItalic.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-MediumItalic.ttf rename to public/assets/fonts/open-sans/OpenSans-MediumItalic.ttf diff --git a/assets/fonts/open-sans/OpenSans-Regular.ttf b/public/assets/fonts/open-sans/OpenSans-Regular.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-Regular.ttf rename to public/assets/fonts/open-sans/OpenSans-Regular.ttf diff --git a/assets/fonts/open-sans/OpenSans-SemiBold.ttf b/public/assets/fonts/open-sans/OpenSans-SemiBold.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-SemiBold.ttf rename to public/assets/fonts/open-sans/OpenSans-SemiBold.ttf diff --git a/assets/fonts/open-sans/OpenSans-SemiBoldItalic.ttf b/public/assets/fonts/open-sans/OpenSans-SemiBoldItalic.ttf similarity index 100% rename from assets/fonts/open-sans/OpenSans-SemiBoldItalic.ttf rename to public/assets/fonts/open-sans/OpenSans-SemiBoldItalic.ttf diff --git a/assets/js/app.js b/public/assets/js/app.js similarity index 100% rename from assets/js/app.js rename to public/assets/js/app.js diff --git a/public/index.php b/public/index.php new file mode 100644 index 0000000..100cfa2 --- /dev/null +++ b/public/index.php @@ -0,0 +1,18 @@ + [ + 'index' => __DIR__, + 'base' => $base = dirname(__DIR__), + 'content' => $base . '/content', + 'site' => $base . '/site', + 'storage' => $storage = $base . '/storage', + 'accounts' => $storage . '/accounts', + 'cache' => $storage . '/cache', + 'sessions' => $storage . '/sessions', + ] +]); + +echo $kirby->render(); diff --git a/media/index.html b/public/media/index.html similarity index 100% rename from media/index.html rename to public/media/index.html diff --git a/robots.txt b/public/robots.txt similarity index 100% rename from robots.txt rename to public/robots.txt diff --git a/site/config/config.julienmonnerie.com.php b/site/config/config.julienmonnerie.com.php new file mode 100644 index 0000000..c66f9b8 --- /dev/null +++ b/site/config/config.julienmonnerie.com.php @@ -0,0 +1,10 @@ + false, + // Matomo plugin options (critical keys) + 'sylvainjule.matomo' => [ + // 'token' => 'a3d53082e369334813c0ed93d5a80db6' + ] +]; diff --git a/site/config/config.julienmonnerie.test.php b/site/config/config.julienmonnerie.test.php new file mode 100644 index 0000000..5a83911 --- /dev/null +++ b/site/config/config.julienmonnerie.test.php @@ -0,0 +1,10 @@ + true, + // Matomo plugin options (critical keys) + 'sylvainjule.matomo' => [ + // 'token' => 'a3d53082e369334813c0ed93d5a80db6' + ] +]; diff --git a/site/cache/index.html b/storage/cache/index.html similarity index 100% rename from site/cache/index.html rename to storage/cache/index.html