From fea04eb897d5404f90f81a95c84d9d8c087888a9 Mon Sep 17 00:00:00 2001 From: ABGEO Date: Mon, 8 Apr 2019 00:19:48 +0400 Subject: [PATCH 1/5] Add Bootstrap template to sample page. --- composer.json | 2 +- templates/index.templater.php | 49 +++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index d5f328f..5cb36f3 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Cherry-Project Framework", "type": "project", "keywords": ["cherry","framework"], - "homepage": "https://github.com/ABGEO07/cherry-framework", + "homepage": "https://github.com/cherry-framework/framework", "license": "MIT", "authors": [ { diff --git a/templates/index.templater.php b/templates/index.templater.php index 203e762..03cbb16 100644 --- a/templates/index.templater.php +++ b/templates/index.templater.php @@ -1,10 +1,49 @@ - + - - Cherry Project + + Cherry Framework + + -

Welcome to Cherry Framework!

+ + + + +
+
+
+

Hello, World!

+

This is simple Cherry page.

+ +
+
+
+ + + - \ No newline at end of file + From 207302a6f17c43262a120274d6afa3c63a464775 Mon Sep 17 00:00:00 2001 From: ABGEO Date: Mon, 8 Apr 2019 00:29:42 +0400 Subject: [PATCH 2/5] Add Cherry Logs Viewer. --- composer.json | 3 +- composer.lock | 74 +++++++++++++++++++++++++------ config/routes.json | 5 +++ controllers/DefaultController.php | 8 ++++ 4 files changed, 75 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 5cb36f3..64354e5 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.6.0", - "cherry-project/core": "^1.0" + "cherry-project/core": "^1.0", + "cherry-project/logs-viewer": "dev-master" } } diff --git a/composer.lock b/composer.lock index a0fffaf..f34b115 100644 --- a/composer.lock +++ b/composer.lock @@ -4,19 +4,19 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ab7c4a0e7799fee8f6879925fa55d155", + "content-hash": "5866dea42393cc21ece10bdeb389ad4c", "packages": [ { "name": "cherry-project/core", "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/ABGEO07/cherry-core.git", + "url": "https://github.com/cherry-framework/core.git", "reference": "cdb99d9620211d84e118371840697fa69c6b524c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ABGEO07/cherry-core/zipball/cdb99d9620211d84e118371840697fa69c6b524c", + "url": "https://api.github.com/repos/cherry-framework/core/zipball/cdb99d9620211d84e118371840697fa69c6b524c", "reference": "cdb99d9620211d84e118371840697fa69c6b524c", "shasum": "" }, @@ -58,12 +58,12 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/ABGEO07/cherry-logger.git", + "url": "https://github.com/cherry-framework/logger.git", "reference": "0fcb09ad1415d5fc0915304097fcd2e8e06bda14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ABGEO07/cherry-logger/zipball/0fcb09ad1415d5fc0915304097fcd2e8e06bda14", + "url": "https://api.github.com/repos/cherry-framework/logger/zipball/0fcb09ad1415d5fc0915304097fcd2e8e06bda14", "reference": "0fcb09ad1415d5fc0915304097fcd2e8e06bda14", "shasum": "" }, @@ -97,17 +97,61 @@ ], "time": "2019-03-05T17:57:31+00:00" }, + { + "name": "cherry-project/logs-viewer", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/cherry-framework/logs-viewer.git", + "reference": "011481ec3c611edab9f7e684b0fd98e75d101914" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cherry-framework/logs-viewer/zipball/011481ec3c611edab9f7e684b0fd98e75d101914", + "reference": "011481ec3c611edab9f7e684b0fd98e75d101914", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Cherry\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "ABGEO", + "email": "takalandzet@gmail.com", + "homepage": "http://www.abgeo.ga", + "role": "Developer" + } + ], + "description": "Cherry-project Logs Viewer.", + "homepage": "https://github.com/", + "keywords": [ + "cherry", + "logs", + "logs-viewer" + ], + "time": "2019-03-31T14:08:07+00:00" + }, { "name": "cherry-project/request", "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/ABGEO07/cherry-request.git", + "url": "https://github.com/cherry-framework/request.git", "reference": "83e3a4929b70b40afb1c45dec11415d412041dfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ABGEO07/cherry-request/zipball/83e3a4929b70b40afb1c45dec11415d412041dfd", + "url": "https://api.github.com/repos/cherry-framework/request/zipball/83e3a4929b70b40afb1c45dec11415d412041dfd", "reference": "83e3a4929b70b40afb1c45dec11415d412041dfd", "shasum": "" }, @@ -145,12 +189,12 @@ "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/ABGEO07/cherry-response.git", + "url": "https://github.com/cherry-framework/response.git", "reference": "3ec39fa1ac828162e574b55a945b3228cfb19ddf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ABGEO07/cherry-response/zipball/3ec39fa1ac828162e574b55a945b3228cfb19ddf", + "url": "https://api.github.com/repos/cherry-framework/response/zipball/3ec39fa1ac828162e574b55a945b3228cfb19ddf", "reference": "3ec39fa1ac828162e574b55a945b3228cfb19ddf", "shasum": "" }, @@ -188,12 +232,12 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/ABGEO07/cherry-router.git", + "url": "https://github.com/cherry-framework/router.git", "reference": "28292277f7930f9a42a8242cc82d2e7c2a9d4f0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ABGEO07/cherry-router/zipball/28292277f7930f9a42a8242cc82d2e7c2a9d4f0d", + "url": "https://api.github.com/repos/cherry-framework/router/zipball/28292277f7930f9a42a8242cc82d2e7c2a9d4f0d", "reference": "28292277f7930f9a42a8242cc82d2e7c2a9d4f0d", "shasum": "" }, @@ -233,12 +277,12 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/ABGEO07/cherry-templater.git", + "url": "https://github.com/cherry-framework/templater.git", "reference": "323b4f0278c32e404c0e893ded8984fef5d11bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ABGEO07/cherry-templater/zipball/323b4f0278c32e404c0e893ded8984fef5d11bed", + "url": "https://api.github.com/repos/cherry-framework/templater/zipball/323b4f0278c32e404c0e893ded8984fef5d11bed", "reference": "323b4f0278c32e404c0e893ded8984fef5d11bed", "shasum": "" }, @@ -1749,7 +1793,9 @@ "packages-dev": [], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "cherry-project/logs-viewer": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/config/routes.json b/config/routes.json index 951dac3..4f3db1b 100644 --- a/config/routes.json +++ b/config/routes.json @@ -3,5 +3,10 @@ "path": "/", "method": "GET", "action": "Cherry\\Controller\\DefaultController::hello" + }, + "logs": { + "path": "/logs", + "method": "GET", + "action": "Cherry\\Controller\\DefaultController::showLogs" } } \ No newline at end of file diff --git a/controllers/DefaultController.php b/controllers/DefaultController.php index 15387aa..7fca70e 100644 --- a/controllers/DefaultController.php +++ b/controllers/DefaultController.php @@ -2,6 +2,8 @@ namespace Cherry\Controller; +use Cherry\Log\LogViewer; + class DefaultController { use ControllerTrait; @@ -10,4 +12,10 @@ public function hello() { $this->render('index'); } + + public function showLogs() + { + $lw = new LogViewer(); + $lw->render(); + } } \ No newline at end of file From 55e8094fc76c100fc83f5258bf8f9ba855b88663 Mon Sep 17 00:00:00 2001 From: ABGEO Date: Mon, 8 Apr 2019 21:38:33 +0400 Subject: [PATCH 3/5] Add Cherry Console support. --- bin/console | 10 ++++++++++ composer.json | 3 ++- composer.lock | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100755 bin/console diff --git a/bin/console b/bin/console new file mode 100755 index 0000000..efa47f3 --- /dev/null +++ b/bin/console @@ -0,0 +1,10 @@ +#!/usr/bin/env php +=5.6.0", "cherry-project/core": "^1.0", - "cherry-project/logs-viewer": "dev-master" + "cherry-project/logs-viewer": "dev-master", + "cherry-project/console": "dev-master" } } diff --git a/composer.lock b/composer.lock index f34b115..ad04797 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,51 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5866dea42393cc21ece10bdeb389ad4c", + "content-hash": "a2e2191f9dc7ed48c6474421f9fe18e9", "packages": [ + { + "name": "cherry-project/console", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/cherry-framework/console.git", + "reference": "a38c381bf14500d7137b74f6c949e5b7db489792" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cherry-framework/console/zipball/a38c381bf14500d7137b74f6c949e5b7db489792", + "reference": "a38c381bf14500d7137b74f6c949e5b7db489792", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Cherry\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "ABGEO", + "email": "takalandzet@gmail.com", + "homepage": "http://www.abgeo.ga", + "role": "Developer" + } + ], + "description": "CLI Console for Cherry-project", + "homepage": "https://github.com/cherry-framework/console", + "keywords": [ + "cherry", + "console" + ], + "time": "2019-04-07T20:07:45+00:00" + }, { "name": "cherry-project/core", "version": "v1.0.0", @@ -1794,7 +1837,8 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "cherry-project/logs-viewer": 20 + "cherry-project/logs-viewer": 20, + "cherry-project/console": 20 }, "prefer-stable": false, "prefer-lowest": false, From 597daf3ab5607f2f7b9d6cbe4280f6f8b96f9e89 Mon Sep 17 00:00:00 2001 From: ABGEO Date: Mon, 8 Apr 2019 21:39:56 +0400 Subject: [PATCH 4/5] Update CHANGELOG. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfd9898..4e9bd0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Cherry-framework Changelog +## [v2.0.0](https://github.com/cherry-framework/framework/releases/tag/v2.0.0 "v.0.0") (xxxx-xx-xx) + +- Add Bootstrap template to sample page. + +- Add Cherry [Logs Viewer](https://github.com/cherry-framework/logs-viewer). + +- Add Cherry [Console](https://github.com/cherry-framework/console). + ## [v1.0.0](https://github.com/cherry-framework/framework/releases/tag/v1.0.0 "v1.0.0") (2019-03-29) #### The first stable version From 4ff2953742af3c285a692a4d526cd4a3713797ba Mon Sep 17 00:00:00 2001 From: ABGEO Date: Mon, 8 Apr 2019 21:44:48 +0400 Subject: [PATCH 5/5] Update Release Date in CHANGELOG. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e9bd0c..72f2d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Cherry-framework Changelog -## [v2.0.0](https://github.com/cherry-framework/framework/releases/tag/v2.0.0 "v.0.0") (xxxx-xx-xx) +## [v2.0.0](https://github.com/cherry-framework/framework/releases/tag/v2.0.0 "v.0.0") (2019-04-08) - Add Bootstrap template to sample page.