v2→main: интеграция — v2 как основной UI (/), старый UI закомментирован

v2/src/user/index.js

@@ -29,7 +29,7 @@ function createUserRouter() {
       // Переключение компании
       if (req.query.switchTo && allCompanies.find(c => c.client_id === req.query.switchTo)) {
         req.session.user.activeClientId = req.query.switchTo;
-        return res.redirect('/v2/app');
+        return res.redirect('/app');
       }
 
       res.render('v2/user', {
@@ -41,7 +41,7 @@ function createUserRouter() {
         version: config.version,
       });
     } catch (e) {
-      res.status(500).send('<h2>Ошибка</h2><pre>' + e.message + '</pre><a href="/v2/app">Назад</a>');
+      res.status(500).send('<h2>Ошибка</h2><pre>' + e.message + '</pre><a href="/app">Назад</a>');
     }
   });
 
@@ -50,9 +50,9 @@ function createUserRouter() {
     try {
       const result = await crud.add(req.clientId, req.body.cidr || '', req.body.comment || '', req.email, req.impersonatedBy);
       const msg = result.wasNormalized ? 'Добавлено (адрес нормализован)' : 'Добавлено';
-      res.redirect('/v2/app?msg=' + encodeURIComponent(msg));
+      res.redirect('/app?msg=' + encodeURIComponent(msg));
     } catch (e) {
-      res.redirect('/v2/app?error=' + encodeURIComponent(e.message));
+      res.redirect('/app?error=' + encodeURIComponent(e.message));
     }
   });
 
@@ -61,9 +61,9 @@ function createUserRouter() {
     try {
       const result = await crud.edit(parseInt(req.params.id), req.clientId, req.body.cidr || '', req.body.comment || '', req.email, req.impersonatedBy);
       const msg = result.wasNormalized ? 'Изменено (адрес нормализован)' : 'Изменено';
-      res.redirect('/v2/app?msg=' + encodeURIComponent(msg));
+      res.redirect('/app?msg=' + encodeURIComponent(msg));
     } catch (e) {
-      res.redirect('/v2/app?error=' + encodeURIComponent(e.message));
+      res.redirect('/app?error=' + encodeURIComponent(e.message));
     }
   });
 
@@ -71,9 +71,9 @@ function createUserRouter() {
   router.post('/delete/:id', async (req, res) => {
     try {
       await crud.remove(parseInt(req.params.id), req.clientId, req.email, req.impersonatedBy);
-      res.redirect('/v2/app?msg=Удалено');
+      res.redirect('/app?msg=Удалено');
     } catch (e) {
-      res.redirect('/v2/app?error=' + encodeURIComponent(e.message));
+      res.redirect('/app?error=' + encodeURIComponent(e.message));
     }
   });