refactor: migrated setup and update to Twig

thorsten · Jun 2, 2024 · d7fafea · d7fafea
1 parent 19be68d
commit d7fafea
Show file tree

Hide file tree

Showing 17 changed files with 1,156 additions and 518 deletions.
diff --git a/phpmyfaq/.htaccess b/phpmyfaq/.htaccess
@@ -96,6 +96,9 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     # User pages
     RewriteRule ^user/(ucp|bookmarks|request-removal|logout|register) index.php?action=$1 [L,QSA]
 
+    # Setup and update pages
+    RewriteRule ^setup/(.*) setup/index.php [L,QSA]
+
     # Administration API
     RewriteRule ^admin/api/(.*) admin/api/index.php [L,QSA]
 

diff --git a/phpmyfaq/assets/templates/setup/base.twig b/phpmyfaq/assets/templates/setup/base.twig
@@ -0,0 +1,49 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>phpMyFAQ {{ newVersion }} {{ setupType }}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="application-name" content="phpMyFAQ {{ newVersion }}">
+  <meta name="copyright" content="(c) 2001-{{ currentYear }} phpMyFAQ Team">
+  <link rel="stylesheet" href="../assets/dist/styles.css">
+  <script src="../assets/dist/setup.js"></script>
+  <link rel="shortcut icon" href="../assets/themes/default/img/favicon.ico">
+</head>
+<body>
+
+<nav class="p-3 text-bg-dark border-bottom">
+  <div class="container">
+    <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
+      <ul class="nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
+        <li class="pmf-nav-link">
+          <a href="{{ documentationUrl }}" class="pmf-nav-link" target="_blank">
+            Documentation
+          </a>
+        </li>
+        <li class="pmf-nav-link">
+          <a href="https://www.phpmyfaq.de/support" class="pmf-nav-link" target="_blank">
+            Support
+          </a>
+        </li>
+        <li class="pmf-nav-link">
+          <a href="https://forum.phpmyfaq.de/" class="pmf-nav-link" target="_blank">
+            Forums
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
+
+{% block content %}{% endblock %}
+
+<footer class="setup-footer container mt-1">
+  <p class="text-end">
+    &copy; 2001-{{ currentYear }} <a target="_blank" href="https://www.phpmyfaq.de/">phpMyFAQ Team</a>
+  </p>
+</footer>
+
+<script src="../assets/dist/update.js"></script>
+</body>
+</html>
diff --git a/phpmyfaq/assets/templates/setup/index.twig b/phpmyfaq/assets/templates/setup/index.twig
diff --git a/phpmyfaq/assets/templates/setup/install.twig b/phpmyfaq/assets/templates/setup/install.twig
@@ -0,0 +1,50 @@
+{% extends 'setup/base.twig' %}
+
+{% block content %}
+<main role="main">
+  <section id="content">
+
+    <div class="container shadow-lg p-5 mt-5 bg-light-subtle">
+
+        <div class="px-4 pt-2 my-2 text-center border-bottom">
+          <h1 class="display-4 fw-bold">phpMyFAQ {{ newVersion }}</h1>
+          <div class="col-lg-6 mx-auto">
+            <p class="lead mb-4">
+              Did you already read our
+              <a target="_blank" href="{{ documentationUrl }}">documentation</a>
+              carefully before starting the phpMyFAQ setup?
+            </p>
+          </div>
+        </div>
+
+        {% if checkBasicError %}
+        <div class="alert alert-danger" role="alert">
+          {{ checkBasicError | raw }}
+        </div>
+        {% elseif installationError %}
+        <div class="alert alert-danger" role="alert">
+          {{ installationError | raw }}
+        </div>
+        {% else %}
+          <div class="row" id="done">
+            <div class="col-12">
+              <h3 class="mb-3">Installation</h3>
+
+              {{ feedbackIndicator }}
+
+              <p class="alert alert-success">
+                Wow, looks like the installation worked like a charm. This is pretty cool, isn't it? :-)
+              </p>
+
+              <p>
+                You can visit <a href="../index.php">your version of phpMyFAQ</a> or login into your
+                <a href="../admin/index.php">admin section</a>.
+              </p>
+            </div>
+          </div>
+        {% endif %}
+
+    </div>
+  </section>
+</main>
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/setup/update.twig b/phpmyfaq/assets/templates/setup/update.twig
@@ -54,7 +54,7 @@
             <span class="stepIndicator">Database updates</span>
           </div>
 
-          {{ include('setup/update/step' ~ currentStep ~ '.twig') }}
+          {{ include('./setup/update/step' ~ currentStep ~ '.twig') }}
 
         </div>
         </section>