Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
/vendor
/workbench
/public/vendor
/public/packages
composer.json
composer.phar
composer.lock
.DS_Store
._**
._**
public/themes/admin/assets/image/defa.png
26 changes: 21 additions & 5 deletions app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,30 @@
'Illuminate\View\ViewServiceProvider',
'Illuminate\Workbench\WorkbenchServiceProvider',

'Lavalite\Core\CoreServiceProvider',
'Lavalite\Menu\MenuServiceProvider',
'Lavalite\Page\PageServiceProvider',
'Lavalite\File\FileServiceProvider',
'Lavalite\Filer\FilerServiceProvider',
'Lavalite\ImageResize\ImageResizeServiceProvider',
'Lavalite\Product\ProductServiceProvider',
'Lavalite\Catalogue\CatalogueServiceProvider',
// 'Lavalite\ContactForm\ContactFormServiceProvider',
'Lavalite\User\UserServiceProvider',
'Lavalite\Cart\CartServiceProvider',
'Lavalite\Shop\ShopServiceProvider',
'Lavalite\Slider\SliderServiceProvider',
'Lavalite\Gallery\GalleryServiceProvider',
'Lavalite\Contact\ContactServiceProvider',

'Cartalyst\Sentry\SentryServiceProvider',
'Former\FormerServiceProvider',
'Teepluss\Theme\ThemeServiceProvider',
'Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider',
'Intervention\Image\ImageServiceProvider',
'Philf\Setting\SettingServiceProvider',
'Cviebrock\EloquentSluggable\SluggableServiceProvider',
'Nwidart\DbExporter\DbExportHandlerServiceProvider',

'Greggilbert\Recaptcha\RecaptchaServiceProvider',
'Profiler\ProfilerServiceProvider',
'Anouar\Paypalpayment\PaypalpaymentServiceProvider',
),

/*
Expand Down Expand Up @@ -187,6 +197,7 @@
'URL' => 'Illuminate\Support\Facades\URL',
'Validator' => 'Illuminate\Support\Facades\Validator',
'View' => 'Illuminate\Support\Facades\View',
'Paypalpayment' => 'Anouar\Paypalpayment\Facades\PaypalPayment',

'Sentry' => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
'Former' => 'Former\Facades\Former',
Expand All @@ -198,7 +209,12 @@

'Menu' => 'Lavalite\Menu\Facades\Menu',
'Page' => 'Lavalite\Page\Facades\Page',
'LFile' => 'Lavalite\File\Facades\LFile',
'Filer' => 'Lavalite\Filer\Facades\Filer',
'Catalogue' => 'Lavalite\Catalogue\Facades\Catalogue',
'Cart' => 'Lavalite\Cart\Facades\Cart',
'Shop' => 'Lavalite\Shop\Facades\Shop',
'Slider' => 'Lavalite\Slider\Facades\Slider',
'SliderLang' => 'Lavalite\Slider\Facades\SliderLang',

),

Expand Down
2 changes: 1 addition & 1 deletion app/config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
'host' => 'localhost',
'database' => 'lavalite',
'username' => 'root',
'password' => '123',
'password' => 'renfos',
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
Expand Down
13 changes: 9 additions & 4 deletions app/config/lavalite.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,15 @@
'layout' => 'default',
),

'packags' => array(
'core' => true,
'page' => true,
'menu' => true,
'packages' => array(
'user' => true,
'page' => true,
'menu' => true,
'catalogue' => true,
),

'usertypes' => ['admin', 'superuser', 'user', 'developer'],

'caching' => true,

);
6 changes: 3 additions & 3 deletions app/config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
|
*/

'driver' => 'smtp',
'driver' => 'mail',

/*
|--------------------------------------------------------------------------
Expand All @@ -28,7 +28,7 @@
|
*/

'host' => 'smtp.mailgun.org',
'host' => '',

/*
|--------------------------------------------------------------------------
Expand All @@ -54,7 +54,7 @@
|
*/

'from' => array('address' => null, 'name' => null),
'from' => array('address' => 'test@gmail.com', 'name' => 'Lava Lite'),

/*
|--------------------------------------------------------------------------
Expand Down
Empty file.
26 changes: 26 additions & 0 deletions app/config/packages/greggilbert/recaptcha/config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

return array(

/*
|--------------------------------------------------------------------------
| API Keys
|--------------------------------------------------------------------------
|
| Set the public and private API keys as provided by reCAPTCHA.
|
*/
'public_key' => '6LeJ4_MSAAAAAKeRZiR1OtN2maJfALFLPBZo8Idn',
'private_key' => '6LeJ4_MSAAAAABSzaa8Klim7qyIYg_MVwFC3zJLk',

/*
|--------------------------------------------------------------------------
| Template
|--------------------------------------------------------------------------
|
| Set a template to use if you don't want to use the standard one.
|
*/
'template' => '',

);
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,6 @@

// If LaravelLocalizationRedirectFilter is active and hideDefaultLocaleInURL
// is true, the url would not have the default application language
'hideDefaultLocaleInURL' => false,
'hideDefaultLocaleInURL' => true,

);
93 changes: 66 additions & 27 deletions app/controllers/AdminController.php
Original file line number Diff line number Diff line change
@@ -1,39 +1,78 @@
<?php
use \Former;
use \Teepluss;
use \Lang;


class AdminController extends BaseController {

protected $session;

public function __construct()
{
$this->session = App::make('Lavalite\User\Interfaces\SessionInterface');
$this->setupTheme('admin', 'default');

}

public function clearCache()
{
Cache::flush();
return $this->theme->of('admin.cache')->layout('blank')->render();
}

/**
* Show the login form
*/
public function login()
{
$this->theme->layout('blank');
return $this->theme->of('admin.login')->render();
}

/**
* Store a newly created resource in storage.
*
* @return Response
*/
public function postLogin()
{

$input = Input::all();

$result = $this->session->store($input);

if ($result['success']) {

// Success!
$path = Session::get('url.intended', '/admin');
Session::forget('url.intended');
return Redirect::to($path);

} else {
Session::flash('error', $result['message']);

/**
* Theme instance.
*
* @var \Teepluss\Theme\Theme
*/
protected $theme;
return Redirect::to('login')->withErrors($result['errors'])->withInput();
}

}

/**
* Theme to be used.
*
* @var string
*/
protected $layout = 'default';
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return Response
*/
public function logout()
{
$this->session->destroy();
Event::fire('user.logout');

/**
* Model instance.
*
* @var \Menu\Model\Menu
*/
protected $model;
return Redirect::to('/admin');
}

public function setupTheme($theme = 'admin') {

$this->theme = Theme::uses($theme)->layout($this->layout);
Former::framework('TwitterBootstrap3');
Former::config('fetch_errors', true);
}
public function showHome()
{
$this->theme->prependTitle(Lang::get('app.admin_panel') . ' :: ');
return $this->theme->of('admin.home')->layout('blank')->render();
}

}
26 changes: 25 additions & 1 deletion app/controllers/BaseController.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
<?php
use Former\Facades\Former;
use Teepluss\Theme\Facades\Theme;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Lang;
use Illuminate\Support\Facades\Config;

class BaseController extends \Controller {
class BaseController extends Controller {

/**
* Theme instance.
*
* @var \Teepluss\Theme\Theme
*/
protected $theme;

/**
* Model instance.
*/
protected $model;

public function setupTheme($theme = 'default', $layout = 'default') {

$this->theme = Theme::uses($theme)->layout($layout);

Former::framework('TwitterBootstrap3');
Former::config('fetch_errors', true);
}


}
43 changes: 13 additions & 30 deletions app/controllers/PublicController.php
Original file line number Diff line number Diff line change
@@ -1,38 +1,21 @@
<?php

use \Former, \Theme, \Config;

class PublicController extends BaseController {

public function __construct()
{
$this->setupTheme('public', 'default');

/**
* Theme instance.
*
* @var \Teepluss\Theme\Theme
*/
protected $theme;


/**
* Layout instance.
*
* @var \Teepluss\Layout\Layout
*/
protected $layout = 'default';

/**
* Model instance.
*
* @var \Menu\Model\Menu
*/
protected $model;

public function setupTheme($theme = 'public') {
}

$this->theme = Theme::uses($theme)->layout($this->layout);

Former::framework('TwitterBootstrap3');
Former::config('fetch_errors', true);
}
public function showIndex()
{
$data['page'] = Page::getPage('home');
$this->theme->layout('home');
$this -> theme -> setTitle($data['page'] -> title);
$this -> theme -> setKeywords($data['page'] -> keyword);
$this -> theme -> setDescription($data['page'] -> description);

return $this->theme->of('public.home', $data)->render();
}
}
Loading