Changed uri parsing

src/controllers/pages.js

@@ -1,7 +1,6 @@
 const Model = require('../models/page');
 const Alias = require('../models/alias');
 const aliasTypes = require('../constants/aliasTypes');
-const md5 = require('../utils/md5');
 
 /**
  * @class Pages
@@ -60,9 +59,8 @@ class Pages {
 
       const alias = new Alias({
         id: updatedPage._id,
-        type: aliasTypes.PAGE,
-        hash: md5(updatedPage.uri)
-      });
+        type: aliasTypes.PAGE
+      }, updatedPage.uri);
 
       alias.save();
 
@@ -129,9 +127,8 @@ class Pages {
 
       const alias = new Alias({
         id: updatedPage._id,
-        type: aliasTypes.PAGE,
-        hash: md5(updatedPage.uri)
-      });
+        type: aliasTypes.PAGE
+      }, updatedPage.uri);
 
       alias.save();
     }

src/frontend/styles/vars.pcss

@@ -3,7 +3,7 @@
   --color-text-second: #7B7E89;
   --color-line-gray: #E8E8EB;
   --color-link-active: #388AE5;
-  --color-gray-border: rgba(201, 201, 204, 0.48);
+  --color-gray-border: rgba(var(--color-line-gray), 0.48);
 
   /**
    * Site layout sizes

src/models/alias.js

@@ -39,14 +39,18 @@ class Alias {
    * @constructor
    *
    * @param {AliasData} data
+   * @param {string} aliasName - alias of entity
    */
-  constructor(data = {}) {
+  constructor(data = {}, aliasName) {
     if (data === null) {
       data = {};
     }
     if (data._id) {
       this._id = data._id;
     }
+    if (aliasName) {
+      this.hash = md5(aliasName);
+    }
     this.data = data;
   }
 

src/models/page.js

@@ -84,7 +84,13 @@ class Page {
 
     this.body = body || this.body;
     this.title = this.extractTitleFromBody();
-    this.uri = uri || translateString(this.title.toLowerCase()).split(' ').join('-');
+    this.uri = uri || translateString(this.title
+      .replace(/ /g, ' ')
+      .replace(/-/g, ' ')
+      .trim()
+      .toLowerCase()
+      .split(' ')
+      .join('-'));
     this._parent = parent || this._parent;
   }