Skip to content

Commit a5402d6

Browse files
stygiansabyssstygiansabyss
committed
Setting up default install
1 parent e127d5d commit a5402d6

27 files changed

+8223
-216
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@
5555
[submodule "public/vendor/jansyBootstrap"]
5656
path = public/vendor/jansyBootstrap
5757
url = git@github.com:jasny/bootstrap.git
58-
[submodule "app/core"]
59-
path = app/core
60-
url = git@github.com:riddles8888/core.git
6158
[submodule "public/vendor/darkstrap3"]
6259
path = public/vendor/darkstrap3
6360
url = git@github.com:stygiansabyss/darkstrap.git

‎app/config/app.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
|
3939
*/
4040

41-
'url' => 'http://localhost',
41+
'url' => 'http://stories.stygianvault.com',
4242

4343
/*
4444
|--------------------------------------------------------------------------
@@ -77,7 +77,7 @@
7777
|
7878
*/
7979

80-
'key' => 'qmt2Dv8gK1wtUcnSP9LABIwzYoeFJ1NB',
80+
'key' => 'rwCXeh5s6nUiTYNLloGlpotn0cCKsawg',
8181

8282
/*
8383
|--------------------------------------------------------------------------
@@ -130,6 +130,7 @@
130130
'Juy\Profiler\Providers\ProfilerServiceProvider',
131131
'Intervention\Image\ImageServiceProvider',
132132
'McCool\LaravelAutoPresenter\LaravelAutoPresenterServiceProvider',
133+
'Menu\MenuServiceProvider',
133134
'Syntax\Core\CoreServiceProvider',
134135
'Syntax\Core\View\ViewServiceProvider',
135136
'Syntax\Core\Forum\ForumServiceProvider',
@@ -199,6 +200,7 @@
199200
'Str' => 'Illuminate\Support\Str',
200201
'URL' => 'Illuminate\Support\Facades\URL',
201202
'Image' => 'Intervention\Image\Facades\Image',
203+
'Menu' => 'Menu\Menu',
202204
),
203205

204206
);

‎app/config/database.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
'mysql' => array(
5656
'driver' => 'mysql',
5757
'host' => '173.193.69.178',
58-
'database' => 'stygian_base',
59-
'username' => 'stygian_base',
60-
'password' => '#hsZz0G@E1#t',
58+
'database' => 'stygian_stories',
59+
'username' => 'stygian_stories',
60+
'password' => 'bT].{@A8q3CT',
6161
'charset' => 'utf8',
6262
'collation' => 'utf8_unicode_ci',
6363
'prefix' => '',

‎app/controllers/MenuController.php

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,56 @@ class MenuController extends Core_BaseController
55

66
public function getMenu()
77
{
8-
Menu::addMenuItem('Home', '/')
9-
->addMenuItem('Memberlist', 'memberlist');
8+
Menu::handler('main')
9+
->add('/', 'Home');
1010

1111
if (Auth::check()) {
1212
// Forum access
1313
if ($this->hasPermission('FORUM_ACCESS')) {
1414
$postsCount = $this->activeUser->unreadPostCount();
1515
$forumTitle = ($postsCount > 0 ? 'Forums ('. $postsCount .')' : 'Forums');
1616

17-
Menu::addMenuItem($forumTitle, 'forum', null, 1);
18-
19-
// Forum Moderation
20-
if ($this->hasPermission('FORUM_MOD')) {
21-
Menu::addMenuChild($forumTitle, 'Moderation Panel', 'forum/moderation/dashboard');
22-
}
23-
24-
// Forum Administration
17+
// Forum Options
2518
if ($this->hasPermission('FORUM_ADMIN')) {
26-
Menu::addMenuChild($forumTitle, 'Admin Panel', 'forum/admin/dashboard')
27-
->addChildChild('Forums', 'Admin Panel', 'Add Category', 'forum/category/add')
28-
->addChildChild('Forums', 'Admin Panel', 'Add Board', 'forum/board/add');
19+
Menu::handler('main')->add('/forum', $forumTitle, Menu::items()
20+
->add('/forum/moderation/dashboard', 'Moderation Panel')
21+
->add('/forum/admin/dashboard', 'Admin Panel', Menu::items()
22+
->add('/forum/category/add', 'Add Category')
23+
->add('/forum/board/add', 'Add Board'))
24+
);
25+
} elseif ($this->hasPermission('FORUM_MOD')) {
26+
Menu::handler('main')->add('/forum', $forumTitle, Menu::items()
27+
->add('/forum/moderation/dashboard', 'Moderation Panel'));
28+
} else {
29+
Menu::handler('main')->add('/forum', $forumTitle);
2930
}
3031
}
3132

32-
// User Menu
33-
Menu::addMenuItem($this->activeUser->username, 'user/view/'. $this->activeUser->id, null, null, 'right')
34-
->addMenuChild($this->activeUser->username, 'My Messages... ('. $this->activeUser->unreadMessageCount .')', 'messages')
35-
->addMenuChild($this->activeUser->username, 'Edit Profile', 'user/account')
36-
->addMenuChild($this->activeUser->username, 'Logout', 'logout');
37-
3833
// Manage Menu
3934
if ($this->hasPermission('DEVELOPER')) {
40-
Menu::addMenuItem('Management', null, null, null, 'right')
41-
->addMenuChild('Management', 'Dev Panel', 'admin');
42-
43-
// Github Links
44-
if ($this->activeUser->githubToken != null) {
45-
Menu::addMenuChild('Management', 'Github Issues', 'github')
46-
->addMenuChild('Management', 'My Github Issues', 'github/user');
47-
}
35+
Menu::handler('mainRight')
36+
->add('javascript:void(0);', 'Management', Menu::items()
37+
->add('/admin', 'Dev Panel')
38+
->add('/manage', 'Video Panel')
39+
->add('/video/add', 'Add Video')
40+
->add('/video/rss', 'RSS'));
4841
}
42+
43+
// User Menu
44+
Menu::handler('mainRight')
45+
->add('/user/view/'. $this->activeUser->id, $this->activeUser->username, Menu::items()
46+
->add('/messages', 'My Messages... ('. $this->activeUser->unreadMessageCount .')')
47+
->add('/user/account', 'Edit Profile')
48+
->add('/logout', 'Logout'));
4949
} else {
50-
Menu::addMenuItem('Login', 'login', null, null, 'right');
51-
Menu::addMenuItem('Register', 'register', null, null, 'right');
52-
Menu::addMenuItem('Forgot Password', 'forgotPassword', null, null, 'right');
50+
Menu::handler('mainRight')
51+
->add('/login', 'Login')
52+
->add('/register', 'Register')
53+
->add('/forgotPassword', 'Forgot Password');
5354
}
55+
56+
Menu::handler('main')
57+
->add('/memberlist', 'Memberlist');
5458
}
5559

5660
public function setAreaDetails($area)

‎app/database/migrations/2013_11_18_113221_create_seeds_table.php

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
6+
class CreateSeedsTable extends Migration {
7+
8+
/**
9+
* Run the migrations.
10+
*
11+
* @return void
12+
*/
13+
public function up()
14+
{
15+
Schema::create('seeds', function(Blueprint $table) {
16+
$table->increments('id');
17+
$table->string('name')->index();
18+
$table->timestamps();
19+
});
20+
}
21+
22+
23+
/**
24+
* Reverse the migrations.
25+
*
26+
* @return void
27+
*/
28+
public function down()
29+
{
30+
Schema::drop('seeds');
31+
}
32+
33+
}

‎app/database/migrations/2013_12_18_131137_add_hiddenflag_to_preferences_table.php

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
6+
class AddHiddenflagToPreferencesTable extends Migration {
7+
8+
/**
9+
* Run the migrations.
10+
*
11+
* @return void
12+
*/
13+
public function up()
14+
{
15+
Schema::table('preferences', function(Blueprint $table) {
16+
$table->boolean('hiddenFlag')->default(0)->index();
17+
});
18+
}
19+
20+
/**
21+
* Reverse the migrations.
22+
*
23+
* @return void
24+
*/
25+
public function down()
26+
{
27+
Schema::table('preferences', function(Blueprint $table) {
28+
$table->dropColumn('hiddenFlag');
29+
});
30+
}
31+
32+
}

‎app/database/seeds/ActionRolesTableSeeder.php

100644100755
File mode changed.

‎app/database/seeds/ActionsTableSeeder.php

100644100755
File mode changed.

‎app/database/seeds/DatabaseSeeder.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ public function run()
2525
$this->call('MessageFoldersTableSeeder');
2626
$this->call('PreferencesTableSeeder');
2727
$this->call('Preferences_usersTableSeeder');
28+
$this->call('PreferencesTableSeeder_Update_01_09_2014');
29+
$this->call('PreferencesTableSeeder_Update_01_21_2014');
30+
$this->call('PreferencesTableSeeder_Update_11_18_2013');
31+
$this->call('PreferencesTableSeeder_Update_11_20_2013');
32+
$this->call('PreferencesTableSeeder_Update_12_17_2013');
2833
}
2934

3035
}

‎app/database/seeds/PreferencesTableSeeder.php

100644100755
File mode changed.

0 commit comments

Comments
 (0)