diff --git a/app/.eslintrc.js b/app/.eslintrc.js index 4770e244..cada27e5 100644 --- a/app/.eslintrc.js +++ b/app/.eslintrc.js @@ -32,5 +32,6 @@ module.exports = { "userLogin": true, "Keycloak": true, "Intercom": true, + "slug": true } }; diff --git a/app/app/utils/string.js b/app/app/utils/string.js index 100ce4b5..3fa66de3 100644 --- a/app/app/utils/string.js +++ b/app/app/utils/string.js @@ -9,9 +9,11 @@ // // https://documize.com -// make url friendly slug from specified text. +// Make url friendly slug from specified text. +// Has to handle non-english character text "Общее" text! function makeSlug(text) { - return text.toLowerCase().replace(/[^\w ]+/g, '').replace(/ +/g, '-'); + return slug(text, { mode: 'rfc3986', lower: true}); + //return text.toLowerCase().replace(/[^\w ]+/g, '').replace(/ +/g, '-'); } function makeId(len) { @@ -33,4 +35,5 @@ export default { makeSlug, makeId, endsWith -}; \ No newline at end of file +}; + diff --git a/app/ember-cli-build.js b/app/ember-cli-build.js index c4056325..23e1a59c 100644 --- a/app/ember-cli-build.js +++ b/app/ember-cli-build.js @@ -61,6 +61,7 @@ module.exports = function (defaults) { app.import('vendor/velocity.js'); app.import('vendor/velocity.ui.js'); app.import('vendor/keycloak.js'); + app.import('vendor/slug.js'); return app.toTree(); }; diff --git a/app/vendor/slug.js b/app/vendor/slug.js new file mode 100644 index 00000000..7b3931c2 --- /dev/null +++ b/app/vendor/slug.js @@ -0,0 +1,218 @@ +// Copyright (c) 2014 ▟ ▖▟ ▖(dodo) +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// https://github.com/dodo/node-slug + +(function (root) { +// lazy require symbols table +var _symbols, removelist; +function symbols(code) { + if (_symbols) return _symbols[code]; + _symbols = require('unicode/category/So'); + removelist = ['sign','cross','of','symbol','staff','hand','black','white'] + .map(function (word) {return new RegExp(word, 'gi')}); + return _symbols[code]; +} + +function slug(string, opts) { + string = string.toString(); + if ('string' === typeof opts) + opts = {replacement:opts}; + opts = opts || {}; + opts.mode = opts.mode || slug.defaults.mode; + var defaults = slug.defaults.modes[opts.mode]; + var keys = ['replacement','multicharmap','charmap','remove','lower']; + for (var key, i = 0, l = keys.length; i < l; i++) { key = keys[i]; + opts[key] = (key in opts) ? opts[key] : defaults[key]; + } + if ('undefined' === typeof opts.symbols) + opts.symbols = defaults.symbols; + + var lengths = []; + for (var key in opts.multicharmap) { + if (!opts.multicharmap.hasOwnProperty(key)) + continue; + + var len = key.length; + if (lengths.indexOf(len) === -1) + lengths.push(len); + } + + var code, unicode, result = ""; + for (var char, i = 0, l = string.length; i < l; i++) { char = string[i]; + if (!lengths.some(function (len) { + var str = string.substr(i, len); + if (opts.multicharmap[str]) { + i += len - 1; + char = opts.multicharmap[str]; + return true; + } else return false; + })) { + if (opts.charmap[char]) { + char = opts.charmap[char]; + code = char.charCodeAt(0); + } else { + code = string.charCodeAt(i); + } + if (opts.symbols && (unicode = symbols(code))) { + char = unicode.name.toLowerCase(); + for(var j = 0, rl = removelist.length; j < rl; j++) { + char = char.replace(removelist[j], ''); + } + char = char.replace(/^\s+|\s+$/g, ''); + } + } + char = char.replace(/[^\w\s\-\.\_~]/g, ''); // allowed + if (opts.remove) char = char.replace(opts.remove, ''); // add flavour + result += char; + } + result = result.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces + result = result.replace(/[-\s]+/g, opts.replacement); // convert spaces + result = result.replace(opts.replacement+"$",''); // remove trailing separator + if (opts.lower) + result = result.toLowerCase(); + return result; +}; + +slug.defaults = { + mode: 'pretty', +}; + +slug.multicharmap = slug.defaults.multicharmap = { + '<3': 'love', '&&': 'and', '||': 'or', 'w/': 'with', +}; + +// https://code.djangoproject.com/browser/django/trunk/django/contrib/admin/media/js/urlify.js +slug.charmap = slug.defaults.charmap = { + // latin + 'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', + 'Ç': 'C', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', + 'Î': 'I', 'Ï': 'I', 'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', + 'Õ': 'O', 'Ö': 'O', 'Ő': 'O', 'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', + 'Ü': 'U', 'Ű': 'U', 'Ý': 'Y', 'Þ': 'TH', 'ß': 'ss', 'à':'a', 'á':'a', + 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c', 'è': 'e', + 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i', + 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', + 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u', 'ű': 'u', + 'ý': 'y', 'þ': 'th', 'ÿ': 'y', 'ẞ': 'SS', + // greek + 'α':'a', 'β':'b', 'γ':'g', 'δ':'d', 'ε':'e', 'ζ':'z', 'η':'h', 'θ':'8', + 'ι':'i', 'κ':'k', 'λ':'l', 'μ':'m', 'ν':'n', 'ξ':'3', 'ο':'o', 'π':'p', + 'ρ':'r', 'σ':'s', 'τ':'t', 'υ':'y', 'φ':'f', 'χ':'x', 'ψ':'ps', 'ω':'w', + 'ά':'a', 'έ':'e', 'ί':'i', 'ό':'o', 'ύ':'y', 'ή':'h', 'ώ':'w', 'ς':'s', + 'ϊ':'i', 'ΰ':'y', 'ϋ':'y', 'ΐ':'i', + 'Α':'A', 'Β':'B', 'Γ':'G', 'Δ':'D', 'Ε':'E', 'Ζ':'Z', 'Η':'H', 'Θ':'8', + 'Ι':'I', 'Κ':'K', 'Λ':'L', 'Μ':'M', 'Ν':'N', 'Ξ':'3', 'Ο':'O', 'Π':'P', + 'Ρ':'R', 'Σ':'S', 'Τ':'T', 'Υ':'Y', 'Φ':'F', 'Χ':'X', 'Ψ':'PS', 'Ω':'W', + 'Ά':'A', 'Έ':'E', 'Ί':'I', 'Ό':'O', 'Ύ':'Y', 'Ή':'H', 'Ώ':'W', 'Ϊ':'I', + 'Ϋ':'Y', + // turkish + 'ş':'s', 'Ş':'S', 'ı':'i', 'İ':'I', + 'ğ':'g', 'Ğ':'G', + // russian + 'а':'a', 'б':'b', 'в':'v', 'г':'g', 'д':'d', 'е':'e', 'ё':'yo', 'ж':'zh', + 'з':'z', 'и':'i', 'й':'j', 'к':'k', 'л':'l', 'м':'m', 'н':'n', 'о':'o', + 'п':'p', 'р':'r', 'с':'s', 'т':'t', 'у':'u', 'ф':'f', 'х':'h', 'ц':'c', + 'ч':'ch', 'ш':'sh', 'щ':'sh', 'ъ':'u', 'ы':'y', 'ь':'', 'э':'e', 'ю':'yu', + 'я':'ya', + 'А':'A', 'Б':'B', 'В':'V', 'Г':'G', 'Д':'D', 'Е':'E', 'Ё':'Yo', 'Ж':'Zh', + 'З':'Z', 'И':'I', 'Й':'J', 'К':'K', 'Л':'L', 'М':'M', 'Н':'N', 'О':'O', + 'П':'P', 'Р':'R', 'С':'S', 'Т':'T', 'У':'U', 'Ф':'F', 'Х':'H', 'Ц':'C', + 'Ч':'Ch', 'Ш':'Sh', 'Щ':'Sh', 'Ъ':'U', 'Ы':'Y', 'Ь':'', 'Э':'E', 'Ю':'Yu', + 'Я':'Ya', + // ukranian + 'Є':'Ye', 'І':'I', 'Ї':'Yi', 'Ґ':'G', 'є':'ye', 'і':'i', 'ї':'yi', 'ґ':'g', + // czech + 'č':'c', 'ď':'d', 'ě':'e', 'ň': 'n', 'ř':'r', 'š':'s', 'ť':'t', 'ů':'u', + 'ž':'z', 'Č':'C', 'Ď':'D', 'Ě':'E', 'Ň': 'N', 'Ř':'R', 'Š':'S', 'Ť':'T', + 'Ů':'U', 'Ž':'Z', + // polish + 'ą':'a', 'ć':'c', 'ę':'e', 'ł':'l', 'ń':'n', 'ś':'s', 'ź':'z', + 'ż':'z', 'Ą':'A', 'Ć':'C', 'Ę':'E', 'Ł':'L', 'Ń':'N', 'Ś':'S', + 'Ź':'Z', 'Ż':'Z', + // latvian + 'ā':'a', 'ē':'e', 'ģ':'g', 'ī':'i', 'ķ':'k', 'ļ':'l', 'ņ':'n', + 'ū':'u', 'Ā':'A', 'Ē':'E', 'Ģ':'G', 'Ī':'I', + 'Ķ':'K', 'Ļ':'L', 'Ņ':'N', 'Ū':'U', + // lithuanian + 'ė':'e', 'į':'i', 'ų':'u', 'Ė': 'E', 'Į': 'I', 'Ų':'U', + // romanian + 'ț':'t', 'Ț':'T', 'ţ':'t', 'Ţ':'T', 'ș':'s', 'Ș':'S', 'ă':'a', 'Ă':'A', + // vietnamese + 'Ạ': 'A', 'Ả': 'A', 'Ầ': 'A', 'Ấ': 'A', 'Ậ': 'A', 'Ẩ': 'A', 'Ẫ': 'A', + 'Ằ': 'A', 'Ắ': 'A', 'Ặ': 'A', 'Ẳ': 'A', 'Ẵ': 'A', 'Ẹ': 'E', 'Ẻ': 'E', + 'Ẽ': 'E', 'Ề': 'E', 'Ế': 'E', 'Ệ': 'E', 'Ể': 'E', 'Ễ': 'E', 'Ị': 'I', + 'Ỉ': 'I', 'Ĩ': 'I', 'Ọ': 'O', 'Ỏ': 'O', 'Ồ': 'O', 'Ố': 'O', 'Ộ': 'O', + 'Ổ': 'O', 'Ỗ': 'O', 'Ơ': 'O', 'Ờ': 'O', 'Ớ': 'O', 'Ợ': 'O', 'Ở': 'O', + 'Ỡ': 'O', 'Ụ': 'U', 'Ủ': 'U', 'Ũ': 'U', 'Ư': 'U', 'Ừ': 'U', 'Ứ': 'U', + 'Ự': 'U', 'Ử': 'U', 'Ữ': 'U', 'Ỳ': 'Y', 'Ỵ': 'Y', 'Ỷ': 'Y', 'Ỹ': 'Y', + 'Đ': 'D', 'ạ': 'a', 'ả': 'a', 'ầ': 'a', 'ấ': 'a', 'ậ': 'a', 'ẩ': 'a', + 'ẫ': 'a', 'ằ': 'a', 'ắ': 'a', 'ặ': 'a', 'ẳ': 'a', 'ẵ': 'a', 'ẹ': 'e', + 'ẻ': 'e', 'ẽ': 'e', 'ề': 'e', 'ế': 'e', 'ệ': 'e', 'ể': 'e', 'ễ': 'e', + 'ị': 'i', 'ỉ': 'i', 'ĩ': 'i', 'ọ': 'o', 'ỏ': 'o', 'ồ': 'o', 'ố': 'o', + 'ộ': 'o', 'ổ': 'o', 'ỗ': 'o', 'ơ': 'o', 'ờ': 'o', 'ớ': 'o', 'ợ': 'o', + 'ở': 'o', 'ỡ': 'o', 'ụ': 'u', 'ủ': 'u', 'ũ': 'u', 'ư': 'u', 'ừ': 'u', + 'ứ': 'u', 'ự': 'u', 'ử': 'u', 'ữ': 'u', 'ỳ': 'y', 'ỵ': 'y', 'ỷ': 'y', + 'ỹ': 'y', 'đ': 'd', + // currency + '€': 'euro', '₢': 'cruzeiro', '₣': 'french franc', '£': 'pound', + '₤': 'lira', '₥': 'mill', '₦': 'naira', '₧': 'peseta', '₨': 'rupee', + '₩': 'won', '₪': 'new shequel', '₫': 'dong', '₭': 'kip', '₮': 'tugrik', + '₯': 'drachma', '₰': 'penny', '₱': 'peso', '₲': 'guarani', '₳': 'austral', + '₴': 'hryvnia', '₵': 'cedi', '¢': 'cent', '¥': 'yen', '元': 'yuan', + '円': 'yen', '﷼': 'rial', '₠': 'ecu', '¤': 'currency', '฿': 'baht', + "$": 'dollar', '₹': 'indian rupee', + // symbols + '©':'(c)', 'œ': 'oe', 'Œ': 'OE', '∑': 'sum', '®': '(r)', '†': '+', + '“': '"', '”': '"', '‘': "'", '’': "'", '∂': 'd', 'ƒ': 'f', '™': 'tm', + '℠': 'sm', '…': '...', '˚': 'o', 'º': 'o', 'ª': 'a', '•': '*', + '∆': 'delta', '∞': 'infinity', '♥': 'love', '&': 'and', '|': 'or', + '<': 'less', '>': 'greater', +}; + +slug.defaults.modes = { + rfc3986: { + replacement: '-', + symbols: true, + remove: null, + lower: true, + charmap: slug.defaults.charmap, + multicharmap: slug.defaults.multicharmap, + }, + pretty: { + replacement: '-', + symbols: true, + remove: /[.]/g, + lower: false, + charmap: slug.defaults.charmap, + multicharmap: slug.defaults.multicharmap, + }, +}; + +// Be compatible with different module systems + +if (typeof define !== 'undefined' && define.amd) { // AMD + // dont load symbols table in the browser + for (var key in slug.defaults.modes) { + if (!slug.defaults.modes.hasOwnProperty(key)) + continue; + + slug.defaults.modes[key].symbols = false; + } + define([], function () {return slug}); +} else if (typeof module !== 'undefined' && module.exports) { // CommonJS + symbols(); // preload symbols table + module.exports = slug; +} else { // Script tag + // dont load symbols table in the browser + for (var key in slug.defaults.modes) { + if (!slug.defaults.modes.hasOwnProperty(key)) + continue; + + slug.defaults.modes[key].symbols = false; + } + root.slug = slug; +} + +}(this)); \ No newline at end of file