Merge branch 'develop' into main

ar-koder · Apr 15, 2022 · ea46f6f · ea46f6f
2 parents b9110f2 + 26a73cc
commit ea46f6f
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 11 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -10,7 +10,6 @@ var/cache
 var/log
 var/data.db
 
-.env
 .env.*
 
 public/build

diff --git a/Dockerfile b/Dockerfile
@@ -7,8 +7,7 @@ ENV TEMPLATE_PHP_INI "production"
 ENV PHP_INI_MEMORY_LIMIT="128M"
 
 ENV PHP_EXTENSIONS="gd pdo_sqlite" \
-    APACHE_RUN_USER=www-data \
-    APACHE_RUN_GROUP=www-data \
+    APACHE_EXTENSIONS="headers" \
     APACHE_DOCUMENT_ROOT=public/
 
 RUN composer install --no-progress --no-interaction --optimize-autoloader
@@ -27,12 +26,11 @@ RUN composer clear-cache
 RUN rm -rf node_modules
 
 ENV APP_ENV "prod"
-ENV APP_DEBUG "0"
-ENV APP_SECRET "455159ee27d159bdbdeb8b34e599e80e"
-ENV MESSENGER_TRANSPORT_DSN "doctrine://default?auto_setup=0"
 ENV BUCKET_MODE "path"
-ENV DATABASE_URL "sqlite:///%kernel.project_dir%/var/data.db"
 ENV CORS_ALLOW_ORIGIN "^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$"
 ENV TRUSTED_PROXIES "127.0.0.1,REMOTE_ADDR"
 
 VOLUME ["var/bins", "var/log"]
+
+ENV CRON_SCHEDULE "*/15 * * * *"
+ENV CRON_COMMAND "bin/console schedule:run"
diff --git a/public/.htaccess b/public/.htaccess
@@ -86,10 +86,6 @@ DirectoryIndex index.php
 <IfModule mod_rewrite.c>
     RewriteEngine On
 
-    RewriteCond %{HTTPS}  !=on
-    RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-
-
     # Determine the RewriteBase automatically and set it as environment variable.
     # If you are using Apache aliases to do mass virtual hosting or installed the
     # project in a subdirectory, the base path will be prepended to allow proper

diff --git a/templates/bundles/TwigBundle/Exception/error.html.twig b/templates/bundles/TwigBundle/Exception/error.html.twig
@@ -0,0 +1,28 @@
+{% extends 'base.html.twig' %}
+
+{% block content %}
+    <section class="hero">
+        <div class="hero__inner">
+            <h1 data-animate="title" class="text-center uppercase">
+                Oops :(
+            </h1>
+        </div>
+    </section>
+
+    <section class="page-content__wrapper">
+        <div class="page-content__inner">
+            <section>
+                <div class="max-w-3xl">
+                    <div class="mx-auto space-y-16 text-lg text-left">
+                        <div class="space-y-8">
+                            <p class="text-base text-center font-light text-waterloo dark:text-santa md:mt-5">
+                                <b class="inline-block mb-4">THE PAGE YOU WERE LOOKING FOR DOESN'T EXIST.</b><br>
+                                Checkout for any URL misspelling or <a href="/" class="link">return to the homepage</a>.
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </section>
+{% endblock %}
diff --git a/templates/bundles/TwigBundle/Exception/error404.html.twig b/templates/bundles/TwigBundle/Exception/error404.html.twig
@@ -0,0 +1,28 @@
+{% extends 'base.html.twig' %}
+
+{% block content %}
+    <section class="hero">
+        <div class="hero__inner">
+            <h1 data-animate="title" class="text-center uppercase">
+                Page not found
+            </h1>
+        </div>
+    </section>
+
+    <section class="page-content__wrapper">
+        <div class="page-content__inner">
+            <section>
+                <div class="max-w-3xl">
+                    <div class="mx-auto space-y-16 text-lg text-left">
+                        <div class="space-y-8">
+                            <p class="text-base text-center font-light text-waterloo dark:text-santa md:mt-5">
+                                <b class="inline-block mb-4">THE PAGE YOU WERE LOOKING FOR DOESN'T EXIST.</b><br>
+                                Checkout for any URL misspelling or <a href="/" class="link">return to the homepage</a>.
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </section>
+{% endblock %}
diff --git a/templates/bundles/TwigBundle/Exception/error500.html.twig b/templates/bundles/TwigBundle/Exception/error500.html.twig
@@ -0,0 +1,28 @@
+{% extends 'base.html.twig' %}
+
+{% block content %}
+    <section class="hero">
+        <div class="hero__inner">
+            <h1 data-animate="title" class="text-center uppercase">
+                INTERNAL SERVER ERROR
+            </h1>
+        </div>
+    </section>
+
+    <section class="page-content__wrapper">
+        <div class="page-content__inner">
+            <section>
+                <div class="max-w-3xl">
+                    <div class="mx-auto space-y-16 text-lg text-left">
+                        <div class="space-y-8">
+                            <p class="text-base text-center font-light text-waterloo dark:text-santa md:mt-5">
+                                <b class="inline-block mb-4">THE PAGE YOU WERE LOOKING FOR DOESN'T EXIST.</b><br>
+                                Checkout for any URL misspelling or <a href="/" class="link">return to the homepage</a>.
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </section>
+{% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ var/cache @@
     var/log
     var/data.db
-    .env
     .env.*
     public/build
@@ Expand Down @@