feat/qg-157: сайт сделан PWA-приложением (#283)

Author: d-r-q

app/src/main/kotlin/pro/qyoga/app/infra/WebSecurityConfig.kt

@@ -53,6 +53,8 @@ class WebSecurityConfig(
                     .requestMatchers(
                         HttpMethod.GET,
                         "/",
+                        "/offline.html",
+                        "/manifest.json",
                         "/register",
                         "/components/**",
                         "/styles/**",

app/src/main/kotlin/pro/qyoga/app/publc/surverys/ProcessSurveyOp.kt

@@ -1,10 +1,12 @@
 package pro.qyoga.app.publc.surverys
 
+import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional
 import pro.qyoga.core.clients.cards.ClientsRepo
 import pro.qyoga.core.clients.cards.findByPhone
 import pro.qyoga.core.clients.cards.model.PhoneNumber
+import pro.qyoga.core.clients.cards.model.toLogString
 import pro.qyoga.core.survey_forms.settings.model.SurveyFormsSettingsRepo
 import pro.qyoga.core.survey_forms.settings.model.findByYandexAdminEmail
 import java.time.LocalDate
@@ -16,15 +18,24 @@ class ProcessSurveyOp(
     private val surveyFormsSettingsRepo: SurveyFormsSettingsRepo
 ) : (SurveyRq) -> Unit {
 
+    private val log = LoggerFactory.getLogger(javaClass)
+
     @Transactional
     override operator fun invoke(surveyRq: SurveyRq) {
+        log.debug("Processing survey: {}", surveyRq)
         val therapistRef = surveyFormsSettingsRepo.findByYandexAdminEmail(surveyRq.yandexAdminEmail)
             ?.therapistRef
             ?: throw InvalidSurveyException.surveySettingsNotFoundForAdminEmail()
 
         var client = clientsRepo.findByPhone(therapistRef, PhoneNumber.of(surveyRq.survey.phone))
             ?: surveyRq.survey.toClient(therapistRef)
 
+        if (client.version > 0) {
+            log.info("Updating client: {} from survey", client.toLogString())
+        } else {
+            log.info("Creating client: {} from survey", client.toLogString())
+        }
+
         val today = LocalDate.now()
         client = client
             .prependComplaints(formatComplaintsEntry(surveyRq, today))

app/src/main/kotlin/pro/qyoga/core/clients/cards/model/Client.kt

@@ -63,4 +63,7 @@ private fun prependTextBlock(value: String?, base: String?): String? {
     }
 
     return value.trimEnd('\n') + "\n\n" + base
-}
+}
+
+fun Client.toLogString() =
+    "$lastName $firstName ($id)"

app/src/main/resources/static/img/icon-192x192.png

@@ -0,0 +1,12 @@
+if ("serviceWorker" in navigator) {
+    navigator.serviceWorker.register("/js/pwa/sw.js").then(
+        (registration) => {
+            console.log("Service worker registration successful:", registration);
+        },
+        (error) => {
+            console.error(`Service worker registration failed: ${error}`);
+        },
+    );
+} else {
+    console.error("Service workers are not supported.");
+}

app/src/main/resources/static/img/icon-512x512.png

@@ -0,0 +1,58 @@
+const CACHE_NAME = 'trainer-advisor-v1';
+const OFFLINE_URL = '/offline.html';
+
+const urlsToCache = [
+    '/',
+    OFFLINE_URL,
+    '/styles/styles-qyoga.css',
+    '/vendor/bootstrap/css/bootstrap.css',
+    '/vendor/bootstrap/js/bootstrap.bundle.min.js',
+    '/img/icon.png',
+    '/img/icon-192x192.png',
+    '/img/icon-512x512.png',
+    '/manifest.json'
+];
+
+// Install service worker and cache assets
+self.addEventListener('install', event => {
+    event.waitUntil(
+        caches.open(CACHE_NAME)
+            .then(cache => {
+                console.log('Opened cache');
+                return cache.addAll(urlsToCache);
+            })
+    );
+});
+
+// Serve cached content when offline
+self.addEventListener('fetch', event => {
+    // For all other requests, go to the cache first, and then the network.
+    event.respondWith(
+        (async () => {
+            const cache = await caches.open(CACHE_NAME);
+            const cachedResponse = await cache.match(event.request.url);
+            if (cachedResponse) {
+                // Return the cached response if it's available.
+                return cachedResponse;
+            }
+            // If resource isn't in the cache, return a 404.
+            return new Response(null, {status: 404});
+        })(),
+    );
+});
+
+// Clean up old caches
+self.addEventListener('activate', event => {
+    const cacheWhitelist = [CACHE_NAME];
+    event.waitUntil(
+        caches.keys().then(cacheNames => {
+            return Promise.all(
+                cacheNames.map(cacheName => {
+                    if (cacheWhitelist.indexOf(cacheName) === -1) {
+                        return caches.delete(cacheName);
+                    }
+                })
+            );
+        })
+    );
+});

app/src/main/resources/static/js/pwa/pwa-register.js

@@ -0,0 +1,24 @@
+{
+  "name": "Trainer Advisor",
+  "short_name": "TrainerAdvisor",
+  "description": "Приложение для управления терапевтическими программами",
+  "start_url": "/",
+  "scope": "/",
+  "display": "standalone",
+  "background_color": "#e6e6e6",
+  "theme_color": "#e6e6e6",
+  "icons": [
+    {
+      "src": "/img/icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "/img/icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "any maskable"
+    }
+  ]
+}

app/src/main/resources/static/js/pwa/sw.js

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta content="width=device-width, initial-scale=1.0" name="viewport">
+    <title>Trainer Advisor - Оффлайн</title>
+    <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport"/>
+
+    <script defer src="/vendor/fontawesome-6.5.2/js/fontawesome.min.js"></script>
+    <link href="/vendor/fontawesome-6.5.2/css/all.min.css" rel="stylesheet">
+
+    <script src="/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <link href="/vendor/bootstrap/css/bootstrap.css" rel="stylesheet"/>
+    <style>
+        body {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            background-color: #f8f9fc;
+            text-align: center;
+            padding: 20px;
+        }
+
+        .offline-container {
+            max-width: 500px;
+            padding: 2rem;
+            border-radius: 10px;
+            background: white;
+            box-shadow: 0 0.15rem 1.75rem 0 rgba(58, 59, 69, 0.15);
+        }
+    </style>
+</head>
+<body>
+<div class="offline-container">
+    <div class="offline-icon">
+        <i class="bi bi-wifi-off"></i>
+    </div>
+    <h1>Вы находитесь оффлайн</h1>
+    <p>К сожалению, эта страница недоступна без подключения к интернету. Пожалуйста, проверьте ваше интернет-соединение
+        и попробуйте снова.</p>
+    <a class="btn btn-primary" onclick="window.location.href='/';">Вернуться на главную</a>
+</div>
+
+</body>
+</html>

app/src/main/resources/static/manifest.json

@@ -124,4 +124,14 @@ input[type=number] {
     .w-sm-auto {
         width: auto !important;
     }
+}
+
+/* "мобилизация" табов в карточке клиента */
+.nav-tabs .nav-link.active {
+    border: 0;
+    border-bottom: 2px solid #20c997 !important;
+}
+
+.nav-tabs .nav-link:hover {
+    border-color: transparent;
 }