diff --git a/Makefile b/Makefile index c19cbbf..5e9808c 100644 --- a/Makefile +++ b/Makefile @@ -20,15 +20,18 @@ test: # Run coding standards/static analysis checks and tests tunnel: # Expose the application via secure tunnel @ngrok http -host-header=rewrite http://directory-lister.local:80 +clear-assets: # Clear the compiled assets + @rm app/assets/* -rfv + clear-cache: # Clear the application cache @rm app/cache/* -rfv tar: # Generate tarball - @tar --verbose --create --gzip --exclude-vcs --exclude app/cache/* \ + @tar --verbose --create --gzip --exclude-vcs --exclude app/cache/* --exclude app/resources \ --file artifacts/$(ARTIFACT_NAME).tar.gz $(ARTIFACT_FILES) zip: # Generate zip file - @zip --exclude "*.git*" --exclude "app/cache/**" \ + @zip --verbose --exclude "*.git*" "app/cache/**" "app/resources/*" \ --recurse-paths artifacts/$(ARTIFACT_NAME).zip $(ARTIFACT_FILES) -artifacts: production tar zip # Generate release artifacts +artifacts: clear-assets production tar zip # Generate release artifacts diff --git a/app/assets/.gitignore b/app/assets/.gitignore index 84c1711..d6b7ef3 100644 --- a/app/assets/.gitignore +++ b/app/assets/.gitignore @@ -1,3 +1,2 @@ * -!/images/ !.gitignore diff --git a/app/resources/images/favicon.dark.png b/app/resources/images/favicon.dark.png new file mode 100644 index 0000000..b54f5df Binary files /dev/null and b/app/resources/images/favicon.dark.png differ diff --git a/app/resources/images/favicon.light.png b/app/resources/images/favicon.light.png new file mode 100644 index 0000000..ced572e Binary files /dev/null and b/app/resources/images/favicon.light.png differ diff --git a/app/src/Providers/TwigProvider.php b/app/src/Providers/TwigProvider.php index 10655d1..b329ea3 100644 --- a/app/src/Providers/TwigProvider.php +++ b/app/src/Providers/TwigProvider.php @@ -50,7 +50,7 @@ class TwigProvider */ public function __invoke(): void { - $twig = new Twig(new FilesystemLoader('app/resources/views')); + $twig = new Twig(new FilesystemLoader('app/views')); $twig->getEnvironment()->setCache( $this->config->get('view.cache', 'app/cache/views') diff --git a/app/resources/views/404.twig b/app/views/404.twig similarity index 100% rename from app/resources/views/404.twig rename to app/views/404.twig diff --git a/app/resources/views/components/file.twig b/app/views/components/file.twig similarity index 100% rename from app/resources/views/components/file.twig rename to app/views/components/file.twig diff --git a/app/resources/views/components/footer.twig b/app/views/components/footer.twig similarity index 100% rename from app/resources/views/components/footer.twig rename to app/views/components/footer.twig diff --git a/app/resources/views/components/google-analytics.twig b/app/views/components/google-analytics.twig similarity index 100% rename from app/resources/views/components/google-analytics.twig rename to app/views/components/google-analytics.twig diff --git a/app/resources/views/components/header.twig b/app/views/components/header.twig similarity index 100% rename from app/resources/views/components/header.twig rename to app/views/components/header.twig diff --git a/app/resources/views/components/readme.twig b/app/views/components/readme.twig similarity index 100% rename from app/resources/views/components/readme.twig rename to app/views/components/readme.twig diff --git a/app/resources/views/components/scroll-to-top.twig b/app/views/components/scroll-to-top.twig similarity index 100% rename from app/resources/views/components/scroll-to-top.twig rename to app/views/components/scroll-to-top.twig diff --git a/app/resources/views/index.twig b/app/views/index.twig similarity index 100% rename from app/resources/views/index.twig rename to app/views/index.twig diff --git a/app/resources/views/layouts/app.twig b/app/views/layouts/app.twig similarity index 100% rename from app/resources/views/layouts/app.twig rename to app/views/layouts/app.twig diff --git a/webpack.mix.js b/webpack.mix.js index 7d9f9dd..943121c 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -15,6 +15,8 @@ mix.sass('app/resources/sass/app.scss', 'app/assets/app.css').options({ mix.js('app/resources/js/app.js', 'app/assets/app.js'); +mix.copyDirectory('app/resources/images', 'app/assets/images'); + mix.copyDirectory( 'node_modules/@fortawesome/fontawesome-free/webfonts', 'app/assets/webfonts'