github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-04 08:13:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extract config into database

Browse Source
This commit is contained in:
Toby Zerner 2015-05-02 08:07:51 +09:30
parent 42c820e0eb
commit 4c42be1362
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/src/Console/SeedCommand.php
View File

@ -40,8 +40,11 @@ class SeedCommand extends Command {
*/ */
public function fire() public function fire()
{ {
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\GroupsTableSeeder']);
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\PermissionsTableSeeder']);
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\UsersTableSeeder']); $this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\UsersTableSeeder']);
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\DiscussionsTableSeeder']); $this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\DiscussionsTableSeeder']);
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\ConfigTableSeeder']);
} }
/** /**

13
framework/core/src/Core/Seeders/ConfigTableSeeder.php
View File

@ -1,6 +1,7 @@
<?php namespace Flarum\Core\Seeders; <?php namespace Flarum\Core\Seeders;
use Illuminate\Database\Seeder; use Illuminate\Database\Seeder;
use DB;
class ConfigTableSeeder extends Seeder { class ConfigTableSeeder extends Seeder {
@ -11,7 +12,17 @@ class ConfigTableSeeder extends Seeder {
*/ */
public function run() public function run()
{ {
// $config = [
'api_url' => 'http://flarum.dev/api',
'base_url' => 'http://flarum.dev',
'forum_title' => 'Flarum Demo Forum',
'welcome_message' => 'Flarum is now at a point where you can have basic conversations, so here is a little demo for you to break.',
'welcome_title' => 'Welcome to Flarum Demo Forum'
];
DB::table('config')->insert(array_map(function($key, $value) {
return compact('key', 'value');
}, array_keys($config), $config));
} }
} }

8
framework/core/src/Forum/Actions/IndexAction.php
View File

@ -6,17 +6,13 @@ use Auth;
use Cookie; use Cookie;
use Config; use Config;
use View; use View;
use DB;
class IndexAction extends BaseAction class IndexAction extends BaseAction
{ {
public function handle(Request $request, $params = []) public function handle(Request $request, $params = [])
{ {
$config = [ $config = DB::table('config')->whereIn('key', ['base_url', 'api_url', 'forum_title', 'welcome_title', 'welcome_message'])->lists('value', 'key');
'baseURL' => 'http://flarum.dev',
'apiURL' => 'http://flarum.dev/api',
'forumTitle' => Config::get('flarum::forum_title', 'Flarum Demo Forum'),
'welcomeDescription' => 'Flarum is now at a point where you can have basic conversations, so here is a little demo for you to break. <a href="http://demo.flarum.org/#/1/welcome-to-the-first-public-demo-of-flarum">Learn more &raquo;</a>'
];
$data = []; $data = [];
$session = []; $session = [];
$alert = Session::get('alert'); $alert = Session::get('alert');

2
framework/core/views/forum.blade.php
View File

@ -4,7 +4,7 @@
<header class="global-header" id="header"> <header class="global-header" id="header">
<div id="back-button"></div> <div id="back-button"></div>
<div class="container"> <div class="container">
<h1 class="header-title"><a href="#" onclick="app.history.home()">Flarum Demo Forum</a></h1> <h1 class="header-title"><a href="#" onclick="app.history.home()">{{ $config['forum_title'] }}</a></h1>
<div id="header-primary" class="header-primary"></div> <div id="header-primary" class="header-primary"></div>
<div id="header-secondary" class="header-secondary"></div> <div id="header-secondary" class="header-secondary"></div>
</div> </div>