Organize the project more like a conventional PHP project

jimwins · Sep 7, 2024 · 26e7a55 · 26e7a55
1 parent d241e79
commit 26e7a55
Show file tree

Hide file tree

Showing 104 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     ],
     "autoload": {
         "psr-4": {
-          "Talapoin\\" : "lib/Talapoin/"
+          "Talapoin\\" : "src/"
         }
     },
     "require": {

diff --git a/config/Caddyfile b/config/Caddyfile
@@ -3,10 +3,10 @@
 	encode zstd gzip
 
 	# our root is in /srv
-	root * /app/site
+	root * /app/public
 
 	# pass everything else to php
-	php_fastcgi talapoin:9000 {
+	php_fastcgi backend:9000 {
 		env HTTPS on
 		env SERVER_PORT 443
 	}

diff --git a/config/tailscale/talapoin.json → config/tailscale/backend.json b/config/tailscale/talapoin.json → config/tailscale/backend.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     hostname: talapoin
     env_file: ./.env
     environment:
-      - TS_SERVE_CONFIG=/config/talapoin.json
+      - TS_SERVE_CONFIG=/config/backend.json
       - TS_STATE_DIR=/var/lib/tailscale
     volumes:
       - tailscalestate:/var/lib/tailscale
@@ -26,7 +26,7 @@ services:
       - caddy_config:/config
     restart: unless-stopped
 
-  talapoin:
+  backend:
     image: jimwins/talapoin
     build: ./
     env_file: ./.env

diff --git a/phinx.yml b/phinx.yml
@@ -1,9 +1,9 @@
 paths:
-    migrations: '%%PHINX_CONFIG_DIR%%/db/migrations'
-    seeds: '%%PHINX_CONFIG_DIR%%/db/seeds'
+    migrations: '%%PHINX_CONFIG_DIR%%/resources/migrations'
+    seeds: '%%PHINX_CONFIG_DIR%%/resources/seeds'
 
 templates:
-    file: 'db/templates/migration.php'
+    file: 'resources/templates/migration.php'
 
 environments:
     default_migration_table: phinxlog

diff --git a/phpcs.xml b/phpcs.xml
@@ -8,5 +8,5 @@
     <arg name="extensions" value="php"/>
 
     <file>lib</file>
-    <file>site</file>
+    <file>public</file>
 </ruleset>
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,5 +3,5 @@ parameters:
 		- Talapoin\Model
 	level: 5
 	paths:
-		- site
+		- public
 		- lib
diff --git a/site/common/awesomplete/awesomplete.css → public/common/awesomplete/awesomplete.css b/site/common/awesomplete/awesomplete.css → public/common/awesomplete/awesomplete.css
diff --git a/site/common/awesomplete/awesomplete.js → public/common/awesomplete/awesomplete.js b/site/common/awesomplete/awesomplete.js → public/common/awesomplete/awesomplete.js
diff --git a/site/common/fav.ico → public/common/fav.ico b/site/common/fav.ico → public/common/fav.ico
diff --git a/site/common/monkey.png → public/common/monkey.png b/site/common/monkey.png → public/common/monkey.png
diff --git a/site/common/norights.png → public/common/norights.png b/site/common/norights.png → public/common/norights.png
diff --git a/site/common/screen.css → public/common/screen.css b/site/common/screen.css → public/common/screen.css
diff --git a/site/common/sh_lang/sh_c.min.js → public/common/sh_lang/sh_c.min.js b/site/common/sh_lang/sh_c.min.js → public/common/sh_lang/sh_c.min.js
diff --git a/site/common/sh_lang/sh_html.min.js → public/common/sh_lang/sh_html.min.js b/site/common/sh_lang/sh_html.min.js → public/common/sh_lang/sh_html.min.js
diff --git a/site/common/sh_lang/sh_javascript.min.js → public/common/sh_lang/sh_javascript.min.js b/site/common/sh_lang/sh_javascript.min.js → public/common/sh_lang/sh_javascript.min.js
diff --git a/site/common/sh_lang/sh_perl.min.js → public/common/sh_lang/sh_perl.min.js b/site/common/sh_lang/sh_perl.min.js → public/common/sh_lang/sh_perl.min.js
diff --git a/site/common/sh_lang/sh_php.min.js → public/common/sh_lang/sh_php.min.js b/site/common/sh_lang/sh_php.min.js → public/common/sh_lang/sh_php.min.js
diff --git a/site/common/sh_lang/sh_python.min.js → public/common/sh_lang/sh_python.min.js b/site/common/sh_lang/sh_python.min.js → public/common/sh_lang/sh_python.min.js
diff --git a/site/common/sh_lang/sh_ruby.min.js → public/common/sh_lang/sh_ruby.min.js b/site/common/sh_lang/sh_ruby.min.js → public/common/sh_lang/sh_ruby.min.js
diff --git a/site/common/sh_lang/sh_sh.min.js → public/common/sh_lang/sh_sh.min.js b/site/common/sh_lang/sh_sh.min.js → public/common/sh_lang/sh_sh.min.js
diff --git a/site/common/sh_lang/sh_sql.min.js → public/common/sh_lang/sh_sql.min.js b/site/common/sh_lang/sh_sql.min.js → public/common/sh_lang/sh_sql.min.js
diff --git a/site/common/sh_lang/sh_yaml.min.js → public/common/sh_lang/sh_yaml.min.js b/site/common/sh_lang/sh_yaml.min.js → public/common/sh_lang/sh_yaml.min.js
diff --git a/site/common/sh_main.js → public/common/sh_main.js b/site/common/sh_main.js → public/common/sh_main.js
diff --git a/site/common/sh_style.css → public/common/sh_style.css b/site/common/sh_style.css → public/common/sh_style.css
diff --git a/site/index.php → public/index.php b/site/index.php → public/index.php
@@ -57,7 +57,7 @@
 $container->set('view', function ($container) use ($tz) {
     /* We use two loaders and chain them together. */
     $db_loader = new \Talapoin\PageLoader($container->get(\Talapoin\Service\Page::class));
-    $file_loader = new \Twig\Loader\FilesystemLoader('../ui');
+    $file_loader = new \Twig\Loader\FilesystemLoader('../templates');
     $loader = new \Twig\Loader\ChainLoader([ $db_loader, $file_loader]);
 
     /* No cache for now */

diff --git a/site/robots.txt → public/robots.txt b/site/robots.txt → public/robots.txt
diff --git a/...grations/20190421200747_initial_setup.php → ...grations/20190421200747_initial_setup.php b/...grations/20190421200747_initial_setup.php → ...grations/20190421200747_initial_setup.php
diff --git a/...tions/20190421220404_initialize_pages.php → ...tions/20190421220404_initialize_pages.php b/...tions/20190421220404_initialize_pages.php → ...tions/20190421220404_initialize_pages.php
diff --git a/...s/20190423195807_initialize_redirects.php → ...s/20190423195807_initialize_redirects.php b/...s/20190423195807_initialize_redirects.php → ...s/20190423195807_initialize_redirects.php
diff --git a/...s/20230617194141_fix_comment_ip_field.php → ...s/20230617194141_fix_comment_ip_field.php b/...s/20230617194141_fix_comment_ip_field.php → ...s/20230617194141_fix_comment_ip_field.php
diff --git a/...20230617203454_add_comment_spam_field.php → ...20230617203454_add_comment_spam_field.php b/...20230617203454_add_comment_spam_field.php → ...20230617203454_add_comment_spam_field.php
diff --git a/...ions/20240117184728_add_toot_to_entry.php → ...ions/20240117184728_add_toot_to_entry.php b/...ions/20240117184728_add_toot_to_entry.php → ...ions/20240117184728_add_toot_to_entry.php
diff --git a/...ations/20240128010821_add_photo_table.php → ...ations/20240128010821_add_photo_table.php b/...ations/20240128010821_add_photo_table.php → ...ations/20240128010821_add_photo_table.php
diff --git a/...tions/20240130180740_add_album_tables.php → ...tions/20240130180740_add_album_tables.php b/...tions/20240130180740_add_album_tables.php → ...tions/20240130180740_add_album_tables.php
diff --git a/...40203210331_add_mastodon_uri_to_entry.php → ...40203210331_add_mastodon_uri_to_entry.php b/...40203210331_add_mastodon_uri_to_entry.php → ...40203210331_add_mastodon_uri_to_entry.php
diff --git a/...240209201452_add_bluesky_uri_to_entry.php → ...240209201452_add_bluesky_uri_to_entry.php b/...240209201452_add_bluesky_uri_to_entry.php → ...240209201452_add_bluesky_uri_to_entry.php
diff --git a/...ons/20240906221646_add_bookmark_table.php → ...ons/20240906221646_add_bookmark_table.php b/...ons/20240906221646_add_bookmark_table.php → ...ons/20240906221646_add_bookmark_table.php
diff --git a/db/templates/migration.php → resources/templates/migration.php b/db/templates/migration.php → resources/templates/migration.php
diff --git a/lib/Talapoin/Controller/Admin.php → src/Controller/Admin.php b/lib/Talapoin/Controller/Admin.php → src/Controller/Admin.php
diff --git a/lib/Talapoin/Controller/Blog.php → src/Controller/Blog.php b/lib/Talapoin/Controller/Blog.php → src/Controller/Blog.php
diff --git a/lib/Talapoin/Controller/BookmarkLibrary.php → src/Controller/BookmarkLibrary.php b/lib/Talapoin/Controller/BookmarkLibrary.php → src/Controller/BookmarkLibrary.php
diff --git a/lib/Talapoin/Controller/Page.php → src/Controller/Page.php b/lib/Talapoin/Controller/Page.php → src/Controller/Page.php
diff --git a/lib/Talapoin/Controller/PhotoLibrary.php → src/Controller/PhotoLibrary.php b/lib/Talapoin/Controller/PhotoLibrary.php → src/Controller/PhotoLibrary.php
diff --git a/lib/Talapoin/Handler/ErrorRenderer.php → src/Handler/ErrorRenderer.php b/lib/Talapoin/Handler/ErrorRenderer.php → src/Handler/ErrorRenderer.php
diff --git a/lib/Talapoin/Middleware/Auth.php → src/Middleware/Auth.php b/lib/Talapoin/Middleware/Auth.php → src/Middleware/Auth.php
diff --git a/lib/Talapoin/Model.php → src/Model.php b/lib/Talapoin/Model.php → src/Model.php
diff --git a/lib/Talapoin/Model/Album.php → src/Model/Album.php b/lib/Talapoin/Model/Album.php → src/Model/Album.php
diff --git a/lib/Talapoin/Model/Bookmark.php → src/Model/Bookmark.php b/lib/Talapoin/Model/Bookmark.php → src/Model/Bookmark.php
diff --git a/lib/Talapoin/Model/BookmarkTag.php → src/Model/BookmarkTag.php b/lib/Talapoin/Model/BookmarkTag.php → src/Model/BookmarkTag.php
diff --git a/lib/Talapoin/Model/Comment.php → src/Model/Comment.php b/lib/Talapoin/Model/Comment.php → src/Model/Comment.php
diff --git a/lib/Talapoin/Model/Entry.php → src/Model/Entry.php b/lib/Talapoin/Model/Entry.php → src/Model/Entry.php
diff --git a/lib/Talapoin/Model/EntryTag.php → src/Model/EntryTag.php b/lib/Talapoin/Model/EntryTag.php → src/Model/EntryTag.php
diff --git a/lib/Talapoin/Model/HasTags.php → src/Model/HasTags.php b/lib/Talapoin/Model/HasTags.php → src/Model/HasTags.php
diff --git a/lib/Talapoin/Model/Page.php → src/Model/Page.php b/lib/Talapoin/Model/Page.php → src/Model/Page.php
diff --git a/lib/Talapoin/Model/Photo.php → src/Model/Photo.php b/lib/Talapoin/Model/Photo.php → src/Model/Photo.php
diff --git a/lib/Talapoin/Model/PhotoAlbum.php → src/Model/PhotoAlbum.php b/lib/Talapoin/Model/PhotoAlbum.php → src/Model/PhotoAlbum.php
diff --git a/lib/Talapoin/Model/PhotoTag.php → src/Model/PhotoTag.php b/lib/Talapoin/Model/PhotoTag.php → src/Model/PhotoTag.php
diff --git a/lib/Talapoin/Model/Tag.php → src/Model/Tag.php b/lib/Talapoin/Model/Tag.php → src/Model/Tag.php
diff --git a/lib/Talapoin/PageLoader.php → src/PageLoader.php b/lib/Talapoin/PageLoader.php → src/PageLoader.php
diff --git a/lib/Talapoin/Service/Blodotgs.php → src/Service/Blodotgs.php b/lib/Talapoin/Service/Blodotgs.php → src/Service/Blodotgs.php
diff --git a/lib/Talapoin/Service/Blog.php → src/Service/Blog.php b/lib/Talapoin/Service/Blog.php → src/Service/Blog.php
diff --git a/lib/Talapoin/Service/Bluesky.php → src/Service/Bluesky.php b/lib/Talapoin/Service/Bluesky.php → src/Service/Bluesky.php
diff --git a/lib/Talapoin/Service/BookmarkLibrary.php → src/Service/BookmarkLibrary.php b/lib/Talapoin/Service/BookmarkLibrary.php → src/Service/BookmarkLibrary.php
diff --git a/lib/Talapoin/Service/Config.php → src/Service/Config.php b/lib/Talapoin/Service/Config.php → src/Service/Config.php
diff --git a/lib/Talapoin/Service/Data.php → src/Service/Data.php b/lib/Talapoin/Service/Data.php → src/Service/Data.php
diff --git a/lib/Talapoin/Service/Elasticsearch.php → src/Service/Elasticsearch.php b/lib/Talapoin/Service/Elasticsearch.php → src/Service/Elasticsearch.php
diff --git a/lib/Talapoin/Service/Email.php → src/Service/Email.php b/lib/Talapoin/Service/Email.php → src/Service/Email.php
diff --git a/lib/Talapoin/Service/FileStorage.php → src/Service/FileStorage.php b/lib/Talapoin/Service/FileStorage.php → src/Service/FileStorage.php
diff --git a/lib/Talapoin/Service/Gumlet.php → src/Service/Gumlet.php b/lib/Talapoin/Service/Gumlet.php → src/Service/Gumlet.php
diff --git a/lib/Talapoin/Service/Mastodon.php → src/Service/Mastodon.php b/lib/Talapoin/Service/Mastodon.php → src/Service/Mastodon.php
diff --git a/lib/Talapoin/Service/Meilisearch.php → src/Service/Meilisearch.php b/lib/Talapoin/Service/Meilisearch.php → src/Service/Meilisearch.php
diff --git a/lib/Talapoin/Service/Page.php → src/Service/Page.php b/lib/Talapoin/Service/Page.php → src/Service/Page.php
diff --git a/lib/Talapoin/Service/PhotoLibrary.php → src/Service/PhotoLibrary.php b/lib/Talapoin/Service/PhotoLibrary.php → src/Service/PhotoLibrary.php
diff --git a/lib/Talapoin/Service/Search.php → src/Service/Search.php b/lib/Talapoin/Service/Search.php → src/Service/Search.php
diff --git a/lib/Talapoin/Service/SpamFilter.php → src/Service/SpamFilter.php b/lib/Talapoin/Service/SpamFilter.php → src/Service/SpamFilter.php
diff --git a/ui/404.html → templates/404.html b/ui/404.html → templates/404.html
diff --git a/ui/admin/edit-entry.html → templates/admin/edit-entry.html b/ui/admin/edit-entry.html → templates/admin/edit-entry.html
diff --git a/ui/admin/edit-page.html → templates/admin/edit-page.html b/ui/admin/edit-page.html → templates/admin/edit-page.html
diff --git a/ui/admin/index.html → templates/admin/index.html b/ui/admin/index.html → templates/admin/index.html
diff --git a/ui/archive.html → templates/archive.html b/ui/archive.html → templates/archive.html
diff --git a/ui/blog.twig → templates/blog.twig b/ui/blog.twig → templates/blog.twig
diff --git a/ui/bookmark.twig → templates/bookmark.twig b/ui/bookmark.twig → templates/bookmark.twig
diff --git a/ui/bookmark/bookmark.html → templates/bookmark/bookmark.html b/ui/bookmark/bookmark.html → templates/bookmark/bookmark.html
diff --git a/ui/bookmark/index.html → templates/bookmark/index.html b/ui/bookmark/index.html → templates/bookmark/index.html
diff --git a/ui/day.html → templates/day.html b/ui/day.html → templates/day.html
diff --git a/ui/email-comment.html → templates/email-comment.html b/ui/email-comment.html → templates/email-comment.html
diff --git a/ui/email-webmention.html → templates/email-webmention.html b/ui/email-webmention.html → templates/email-webmention.html
diff --git a/ui/entries.twig → templates/entries.twig b/ui/entries.twig → templates/entries.twig
diff --git a/ui/entry.html → templates/entry.html b/ui/entry.html → templates/entry.html
diff --git a/ui/entry.twig → templates/entry.twig b/ui/entry.twig → templates/entry.twig
diff --git a/ui/error.html → templates/error.html b/ui/error.html → templates/error.html
diff --git a/ui/index.atom → templates/index.atom b/ui/index.atom → templates/index.atom
diff --git a/ui/index.html → templates/index.html b/ui/index.html → templates/index.html
diff --git a/ui/info-db.html → templates/info-db.html b/ui/info-db.html → templates/info-db.html
diff --git a/ui/layout.html → templates/layout.html b/ui/layout.html → templates/layout.html
diff --git a/ui/month.html → templates/month.html b/ui/month.html → templates/month.html
diff --git a/ui/page.html → templates/page.html b/ui/page.html → templates/page.html
diff --git a/ui/photo/albums.html → templates/photo/albums.html b/ui/photo/albums.html → templates/photo/albums.html
diff --git a/ui/photo/index.html → templates/photo/index.html b/ui/photo/index.html → templates/photo/index.html
diff --git a/ui/photo/photo.html → templates/photo/photo.html b/ui/photo/photo.html → templates/photo/photo.html
diff --git a/ui/photo/tags.html → templates/photo/tags.html b/ui/photo/tags.html → templates/photo/tags.html
diff --git a/ui/search.html → templates/search.html b/ui/search.html → templates/search.html
diff --git a/ui/year.html → templates/year.html b/ui/year.html → templates/year.html