Merge pull request #48 from dragomano/develop

Update to 2.0 beta

.gitignore

@@ -1,10 +1,16 @@
 **/.idea/
 **/.vscode/
 **/vendor/
-**/addons/**/*.less
-**/addons/**/russian.php
-**/addons/**/polish.php
-**/addons/**/spanish*.php
-**/addons/**/turkish.php
-**/addons/**/french.php
-**/addons/**/ukrainian.php
+**/Addons/**/*.less
+**/Addons/**/russian.php
+**/Addons/**/polish.php
+**/Addons/**/spanish*.php
+**/Addons/**/turkish.php
+**/Addons/**/french.php
+**/Addons/**/ukrainian.php
+Themes/**/.russian.php
+Themes/**/.polish.php
+Themes/**/.spanish*.php
+Themes/**/.turkish.php
+Themes/**/.french.php
+Themes/**/.ukrainian.php

CONTRIBUTING.md

@@ -15,13 +15,13 @@
 * Check if the develop branch exists. If it exist use it to pull your request into.
 * If you want to send a bug fix, use `Fix` word in the title of your PR (i.e. `Fix page permissions`).
 * If you want to send a new feature, use `Add` word in the title of your PR (i.e `Add a new frontpage template`).
+
 In any case, the title of each of your commits should continue such a phrase — `If applied, this commit will  ...` (`Update HelloPortal addon`, etc.)
 
 ## Styleguides with examples
 
 ### PHP Styleguide
-* Use [PHP 7.3+](https://smknstd.github.io/modern-php-cheatsheet/)
-* Use [DocBlock](https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/php/#docblock-formatting) comments for your functions
+* Use [PHP 7.4+](https://smknstd.github.io/modern-php-cheatsheet/)
 
 ```php
 /**
@@ -88,7 +88,7 @@ $test = isset($variable) ? $variable : 'default_value';
 ```
 
 ### JavaScript Styleguide
-* Use native JavaScript or [Alpine.js](https://github.com/alpinejs/alpine) (2.x) instead of jQuery.
+* Use native JavaScript or [Alpine.js](https://github.com/alpinejs/alpine) (3.x) instead of jQuery.
 * Use [strict mode](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode) in your scripts.
 * Use [`const`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const) or [`let`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let) instead of `var`.
 
@@ -123,5 +123,5 @@ console.log('Sorted array: ', arr.bubbleSort())
 // Sorted array:  (7) [1, 2, 3, 4, 5, 6, 7]
 ```
 
-### Do. Or do not. There is no try
-Anyway, you can use [SMF Coding Guidelines](https://wiki.simplemachines.org/smf/Coding_Guidelines) and that will be enough.
+### Semantic Versioning
+We try using [Major.Minor.Patch](https://medium.com/fiverr-engineering/major-minor-patch-a5298e2e1798) for releases.

README.md

@@ -1,29 +1,25 @@
 # Light Portal
 [![SMF 2.1](https://img.shields.io/badge/SMF-2.1-ed6033.svg?style=flat)](https://github.com/SimpleMachines/SMF2.1)
 ![License](https://img.shields.io/github/license/dragomano/light-portal)
-![PHP](https://img.shields.io/badge/PHP-^7.3-blue.svg?style=flat)
+![Hooks only: Yes](https://img.shields.io/badge/Hooks%20only-YES-blue)
+![PHP](https://img.shields.io/badge/PHP-^7.4-blue.svg?style=flat)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/417e4cab3c63460dbb5e06ac126f8ebf)](https://www.codacy.com/gh/dragomano/Light-Portal/dashboard?utm_source=github.com&utm_medium=referral&utm_content=dragomano/Light-Portal&utm_campaign=Badge_Grade)
 [![Crowdin](https://badges.crowdin.net/light-portal/localized.svg)](https://crowdin.com/project/light-portal)
 
-* **Author:** Bugo [dragomano.ru](https://dragomano.ru/mods/light-portal)
-* **License:** [GNU GPLv3](https://github.com/dragomano/Light-Portal/blob/master/LICENSE)
-* **Compatible with:** SMF 2.1 RC4+ / PHP 7.3+
-* **Tested on:** PHP 7.3.33-7.4.26-8.1.0 / MySQL 5.7.33 / MariaDB 10.6.5 / PostgreSQL 9.6.22
-* **Hooks only:** Yes
+* **Tested on:** PHP 7.4.27 / MySQL 5.7.33 / MariaDB 10.6.5 / PostgreSQL 11.12
 * **Languages:** English, Russian, Polish, Spanish, French, Turkish, Ukrainian
 
 ## Description
-This modification will transform your forum into a portal that includes:
-* the customizable frontpage,
-* separate pages with keywords,
+This modification will transform your forum into a portal that includes:
+* the customizable frontpage,
+* separate pages with keywords,
 * blocks within 12-column flexbox grid.
 
-The portal supports BBC, HTML, PHP, Markdown (via addon), and Pug (via addon) content within pages and custom blocks.
+The portal supports BBC, HTML, PHP, as well as Markdown, Pug, and even Twig (via plugins) content within pages and custom blocks.
 
 ### Features:
 * Blocks and pages with multilingual titles.
-* 120 block appearance options.
-* Support for the FontAwesome icons.
+* Support for the FontAwesome icons and any other similar packs.
 * Using the Flexbox to output blocks.
 * Available panels: header, left and right sidebars, center (top and bottom), footer.
 * Frontpage article system: portal pages, forum topics, or boards.
@@ -34,20 +30,18 @@ The portal supports BBC, HTML, PHP, Markdown (via addon), and Pug (via addon) c
 * Import and export for pages and blocks.
 * Support for addons (+ Plugin Maker).
 * Support for standalone mode.
-* Caching for portal elements.
 
 ## Описание
 Модификация преобразует ваш форум в портал:
-* настраиваемая главная страница,
-* отдельные страницы с ключевыми словами,
+* настраиваемая главная страница,
+* отдельные страницы с ключевыми словами,
 * блоки внутри 12-колоночной flexbox-сетки.
 
-Поддержка контента с форумными тегами, HTML, PHP, Markdown (через плагин), и Pug (через плагин) в страницах и пользовательских блоках.
+Поддержка контента с форумными тегами (BBCode), HTML, PHP, а также Markdown, Pug и даже Twig (через плагины) в страницах и пользовательских блоках.
 
 ### Особенности:
 * Блоки и страницы с многоязычными заголовками.
-* 120 вариантов оформления блоков.
-* Поддержка иконок FontAwesome.
+* Поддержка иконок FontAwesome и любых других подобных.
 * Использование Flexbox для вывода блоков.
 * Доступные панели: шапка, левый и правый сайдбары, центр (верх и низ), подвал.
 * Статьи на главной: отображение тем, разделов или страниц портала.
@@ -58,25 +52,17 @@ The portal supports BBC, HTML, PHP, Markdown (via addon), and Pug (via addon) c
 * Импорт и экспорт страниц и блоков.
 * Поддержка плагинов (+ мастер создания плагинов).
 * Поддержка автономного режима.
-* Кэширование элементов портала.
-
-## Roadmap
-* Rating of comments
-* Migrate to AlpineJS 3
-* Migrate to PHP 7.4
-* Tests
-* Ajax pagination
-* New UI icons
 
 ## Supported by
 
-[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/PhpStorm.svg" alt="PhpStorm logo." width="250">](https://www.jetbrains.com/?from=LightPortal)
-[<img src="https://support.crowdin.com/assets/badges/localization-at-white-rounded@1x.svg" alt="Crowdin logo." width="250">](https://crowdin.com/project/light-portal)
+[<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/PhpStorm.svg" alt="PhpStorm logo" width="250">](https://www.jetbrains.com/?from=LightPortal)
+[<img src="https://support.crowdin.com/assets/badges/localization-at-white-rounded@1x.svg" alt="Crowdin logo" width="250">](https://crowdin.com/project/light-portal)
+[<img src="https://uploads-ssl.webflow.com/5c14e387dab576fe667689cf/61e11ddcc39341db4958c5cc_Supportbutton.png" alt="Ko-fi logo" width="250">](https://ko-fi.com/dragomano)
 
 ### Supporting Light Portal
-Light Portal is completely free to use. It is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY.
+Light Portal is completely free to use. It is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY.
 
-It was made for your convenient, and if you like the project, support the developer. Or give a star ⭐️ to this project.
+It was made for your convenience, and if you like the project, support the developer. Or give a star ⭐️ to this project.
 
 ## About plugins
 Some custom addons may have their own licenses.