aprog 1.6.6 → 1.6.8

package/README.md

@@ -144,7 +144,7 @@ onInput: (event) => {
 Загальний список методів:
 
 - *dump(...args), dd(...args)*
-- *redirect(url, { newTab: bool, replace: bool }), reload(delaySeconds)*
+- *redirect(url, { newTab: bool, replace: bool }), reload(delaySeconds), validateEmail(email), validatePassword(password)*
 - *encrypt(str), decrypt(encryptedStr)*
 
 - *div, span, button, a, img, meta, label, input, select, option, options, form, hr, textarea, table, caption, thead, tbody, tr, th, td, pre, attachCustomTitle* 

package/index.js

@@ -6,7 +6,7 @@ export {
     firstKey, isArray, checkArrays, isNumber, isString, isPromise, ucfirst, deepEqual, nodeListToObject
 } from './src/aprog.js';
 export { dump, dd } from './src/debugger.js';
-export { redirect, reload } from './src/redirect.js';
+export { redirect, reload, validateEmail, validatePassword } from './src/redirect.js';
 export { router, navigateTo, navi } from './src/router.js';
 export { encrypt, decrypt } from './src/shifrator.js';
 export { gemini } from './src/OpenAI.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aprog",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "Допоміжна бібліотека js",
   "main": "index.js",
   "scripts": {

package/src/paginate.js

@@ -1,7 +1,7 @@
 import {storage} from "./storage.js";
 import {button, div} from "./aprog.js";
 
-export const paginate = ({ count = 0, currentPage = 1, onPageChange = () => {}, colors = {} } = {}) => {
+export const paginate = ({ count = 0, currentPage = 1, onPageChange = () => {}, colors = {}, customStyles = {} } = {}) => {
     const defaultColors = {
         defaultColor: "#043458",
         backgroundColor: "#ffffff",
@@ -9,21 +9,31 @@ export const paginate = ({ count = 0, currentPage = 1, onPageChange = () => {},
         borderRadius: "0.5rem",
         fontSize: "16px",
         borderWidth: "0.0313rem",
-        border: "border: ${theme.borderWidth} solid ${theme.defaultColor};"
+        border: "border: ${theme.borderWidth} solid ${theme.defaultColor}",
+
+        paginateBlock: {
+            width: "width: 100vw",
+            margin: "margin: 20px 0",
+            padding: "padding: 0 20px",
+            display: "display: flex",
+            alignItems: "align-items: center",
+            justifyContent: "justify-content: center",
+            gap: "gap: 5px"
+        }
     };
 
-    const theme = { ...defaultColors, ...colors };
+    const theme = { ...defaultColors, ...colors, ...customStyles };
 
     const styles = `
         <style>
             .paginate-block {
-                width: 100vw;
-                padding: 0 20px;
-                margin: 20px 0;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                gap: 5px;
+                ${theme.paginateBlock.width};
+                ${theme.paginateBlock.margin};
+                ${theme.paginateBlock.padding};
+                ${theme.paginateBlock.display};
+                ${theme.paginateBlock.alignItems};
+                ${theme.paginateBlock.justifyContent};
+                ${theme.paginateBlock.gap};
             }
             .paginate-btn,
             .paginate-dots,
@@ -34,7 +44,7 @@ export const paginate = ({ count = 0, currentPage = 1, onPageChange = () => {},
                 font-weight: 600;
                 color: ${theme.defaultColor};
                 background: ${theme.backgroundColor};
-                ${theme.border}
+                ${theme.border};
                 border-radius: ${theme.borderRadius};
                 cursor: pointer;
                 box-shadow: ${theme.boxShadow};

package/src/redirect.js

@@ -9,3 +9,11 @@ export const redirect = (url, { newTab = false, replace = false } = {}) => {
 };
 
 export const reload = (delaySeconds = 0.7) => setTimeout(() => window.location.reload(), (delaySeconds * 1000));
+
+export const validateEmail = (email) => {
+    return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
+};
+
+export const validatePassword = (password) => {
+    return /^(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{6,}$/.test(password);
+};

package/src/storage.js

@@ -1,8 +1,18 @@
 export const cookie = {
+    /**
+     * Отримати значення cookie по імені
+     * @param {string} name
+     * @returns {string|null}
+     */
     get(name) {
         const cookies = document.cookie.split('; ');
         for (let cookie of cookies) {
-            let [key, value] = cookie.split('=');
+            const index = cookie.indexOf('=');
+            if (index === -1) continue;
+
+            const key = cookie.substring(0, index);
+            const value = cookie.substring(index + 1);
+
             if (key === name) {
                 return decodeURIComponent(value);
             }
@@ -10,18 +20,29 @@ export const cookie = {
         return null;
     },
 
+    /**
+     * Встановити cookie
+     * @param {string} name
+     * @param {string} value
+     * @param {number} days
+     */
     set(name, value, days = 7) {
         let expires = "";
         if (days) {
-            let date = new Date();
+            const date = new Date();
             date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
             expires = "; expires=" + date.toUTCString();
         }
-        document.cookie = name + "=" + encodeURIComponent(value) + expires + "; path=/";
+        const safeValue = encodeURIComponent(value);
+        document.cookie = `${name}=${safeValue}${expires}; path=/`;
     },
 
+    /**
+     * Видалити cookie
+     * @param {string} name
+     */
     delete(name) {
-        document.cookie = name + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
     }
 };