Skip to content

Commit

Permalink
Merge pull request #6 from everest-php/dev
Browse files Browse the repository at this point in the history
hooks rebranded as everest
  • Loading branch information
Tika Pahadi authored Apr 19, 2018
2 parents 9e81b27 + 4312a4f commit 3bc650d
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Controllers;

use hooks\MVC\Controller;
use everest\MVC\Controller;

class HomeController extends Controller {

Expand Down
4 changes: 2 additions & 2 deletions ViewComponents/NavigationViewComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

namespace ViewComponents;

use hooks\MVC\ViewComponent;
use everest\MVC\ViewComponent;

class NavigationViewComponent extends ViewComponent
{

public function __construct()
{
$this->registeredVariables["app"] = "My Hooks App";
$this->registeredVariables["app"] = "Everest PHP";
}


Expand Down
Binary file removed assets/images/photo.jpg
Binary file not shown.
Binary file added assets/images/photo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"version": "1.0.1",
"type": "project",
"require": {
"everest-php/framework": "1.0.1",
"php": ">=5.3"
"everest-php/framework": "1.1.0",
"php": ">=7.0"
},
"autoload": {
"psr-4": {
"hooks\\": "src/"
"everest\\": "src/"
}
},
"license": "MIT",
Expand Down
24 changes: 12 additions & 12 deletions config/helperFunctions.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?php

use hooks\MVC\View;
use hooks\MVC\Redirect;
use hooks\MVC\Route;
use hooks\Storage\DB;
use hooks\HooksApp;
use hooks\Utils\Curl;
use hooks\DataBase\Statements\DeleteStatement;
use hooks\DataBase\Statements\InsertStatement;
use hooks\DataBase\Statements\SelectStatement;
use hooks\DataBase\Statements\UpdateStatement;
use hooks\Form\FormBuilder;
use hooks\Media\Image;
use everest\MVC\View;
use everest\MVC\Redirect;
use everest\MVC\Route;
use everest\Storage\DB;
use everest\HooksApp;
use everest\Utils\Curl;
use everest\DataBase\Statements\DeleteStatement;
use everest\DataBase\Statements\InsertStatement;
use everest\DataBase\Statements\SelectStatement;
use everest\DataBase\Statements\UpdateStatement;
use everest\Form\FormBuilder;
use everest\Media\Image;

function image(string $path, float $width = null, float $height = null) {
$image = new Image($path);
Expand Down
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
+--------------------------------------------------------------------+
+ +
+ Let's Route the URL from Route class below: +
+ Route class is aliased as hooks\MVC\Route +
+ Route class is aliased as everest\MVC\Route +
+ Configure Routes at : [config/routes.php] +
+ +
+--------------------------------------------------------------------+
Expand Down
4 changes: 2 additions & 2 deletions views/home/about.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
@block('content')
<div class="container">

<h4>About Hooks Framework</h4>
<h4>About Everest PHP Framework</h4>
<p>
@string('Nepal')
Everest is a web-api ready, powerful yet lightweight PHP framework for rapid development.
</p>

</div>
Expand Down
14 changes: 10 additions & 4 deletions views/home/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@
<div class="container">

<div class="text-center">
<h1><span class="glyphicon glyphicon-home"></span></h1>
<h3>Welcome to Hooks!</h3>
<h1><span class="glyphicon glyphicon-equalizer"></span></h1>
<h3>Welcome to Everest, the top of the world!</h3>
<p>
Hooks is a powerful PHP7 based framework.
Everest is a web-api ready, powerful yet lightweight PHP framework for rapid development.
</p>
<img src="assets/images/photo.jpg" />
<img src="assets/images/photo.png" />
<!--
Image by: Laura Reen
Licence: Create Commons
https://www.iconfinder.com/icons/2064036/badge_flag_leader_mountain_sport_top_winner_icon#size=128
-->
<!--
If GD is installed, you can try: [Remove + between @ and image]
<img src='@+image("assets/images/photo.jpg")' />
Expand Down

0 comments on commit 3bc650d

Please sign in to comment.