Skip to content

Commit 835c23a

Browse files
ABGEOABGEO
authored
Merge pull request #2 from cherry-framework/develop
Develop
2 parents d5abafd + 4ff2953 commit 835c23a

File tree

7 files changed

+183
-21
lines changed

7 files changed

+183
-21
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Cherry-framework Changelog
22

3+
## [v2.0.0](https://github.com/cherry-framework/framework/releases/tag/v2.0.0 "v.0.0") (2019-04-08)
4+
5+
- Add Bootstrap template to sample page.
6+
7+
- Add Cherry [Logs Viewer](https://github.com/cherry-framework/logs-viewer).
8+
9+
- Add Cherry [Console](https://github.com/cherry-framework/console).
10+
311
## [v1.0.0](https://github.com/cherry-framework/framework/releases/tag/v1.0.0 "v1.0.0") (2019-03-29)
412
#### The first stable version
513

‎bin/console‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env php
2+
<?php
3+
4+
set_time_limit(0);
5+
6+
require __DIR__ . '/../vendor/autoload.php';
7+
8+
use Cherry\Console\Console;
9+
10+
$console = new Console();

‎composer.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Cherry-Project Framework",
44
"type": "project",
55
"keywords": ["cherry","framework"],
6-
"homepage": "https://github.com/ABGEO07/cherry-framework",
6+
"homepage": "https://github.com/cherry-framework/framework",
77
"license": "MIT",
88
"authors": [
99
{
@@ -16,6 +16,8 @@
1616
"minimum-stability": "dev",
1717
"require": {
1818
"php": ">=5.6.0",
19-
"cherry-project/core": "^1.0"
19+
"cherry-project/core": "^1.0",
20+
"cherry-project/logs-viewer": "dev-master",
21+
"cherry-project/console": "dev-master"
2022
}
2123
}

‎composer.lock‎

Lines changed: 104 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/routes.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33
"path": "/",
44
"method": "GET",
55
"action": "Cherry\\Controller\\DefaultController::hello"
6+
},
7+
"logs": {
8+
"path": "/logs",
9+
"method": "GET",
10+
"action": "Cherry\\Controller\\DefaultController::showLogs"
611
}
712
}

‎controllers/DefaultController.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Cherry\Controller;
44

5+
use Cherry\Log\LogViewer;
6+
57
class DefaultController
68
{
79
use ControllerTrait;
@@ -10,4 +12,10 @@ public function hello()
1012
{
1113
$this->render('index');
1214
}
15+
16+
public function showLogs()
17+
{
18+
$lw = new LogViewer();
19+
$lw->render();
20+
}
1321
}

‎templates/index.templater.php‎

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,49 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8">
5-
<title>Cherry Project</title>
4+
<meta charset="utf-8">
5+
<title>Cherry Framework</title>
6+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
67
</head>
8+
79
<body>
8-
<h1>Welcome to Cherry Framework!</h1>
10+
<!-- Navigation -->
11+
<nav class="navbar navbar-expand-lg navbar-dark bg-dark static-top">
12+
<div class="container">
13+
<a class="navbar-brand" href="#">Cherry Framework</a>
14+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
15+
<span class="navbar-toggler-icon"></span>
16+
</button>
17+
<div class="collapse navbar-collapse" id="navbarResponsive">
18+
<ul class="navbar-nav ml-auto">
19+
<li class="nav-item">
20+
<a class="nav-link" href="https://github.com/cherry-framework">Github</a>
21+
</li>
22+
<li class="nav-item">
23+
<a class="nav-link" href="https://packagist.org/packages/cherry-project/framework">Packagist</a>
24+
</li>
25+
</ul>
26+
</div>
27+
</div>
28+
</nav>
29+
30+
<!-- Page Content -->
31+
<div class="container">
32+
<div class="row">
33+
<div class="col-lg-12 text-center">
34+
<h1 class="mt-5">Hello, World!</h1>
35+
<p class="lead">This is simple Cherry page.</p>
36+
<ul class="list-unstyled">
37+
<li>
38+
© 2019-<?php echo date('Y'); ?> Copyright:
39+
<a href="https://github.com/cherry-framework"> Cherry Framework</a>.
40+
</li>
41+
</ul>
42+
</div>
43+
</div>
44+
</div>
45+
46+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
47+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
948
</body>
10-
</html>
49+
</html>

0 commit comments

Comments
 (0)