Skip to content

Commit a4a8fe2

Browse files
stygiansabyssstygiansabyss
committed
Updating to latest and greatest
1 parent 2d47dc1 commit a4a8fe2

22 files changed

+10848
-70
lines changed

‎.gitmodules

+12
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,15 @@
5858
[submodule "app/core"]
5959
path = app/core
6060
url = [email protected]:riddles8888/core.git
61+
[submodule "public/vendor/darkstrap3"]
62+
path = public/vendor/darkstrap3
63+
url = [email protected]:stygiansabyss/darkstrap.git
64+
[submodule "public/vendor/bootstrap3"]
65+
path = public/vendor/bootstrap3
66+
url = [email protected]:twbs/bootstrap.git
67+
[submodule "public/vendor/Bootstrap-Image-Gallery"]
68+
path = public/vendor/Bootstrap-Image-Gallery
69+
url = [email protected]:blueimp/Bootstrap-Image-Gallery.git
70+
[submodule "public/vendor/Gallery"]
71+
path = public/vendor/Gallery
72+
url = [email protected]:blueimp/Gallery.git

‎app/config/app.php

+11-41
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@
6262
*/
6363

6464
'allRepos' => array(
65+
'control-room' => 'Control-Room',
6566
'stygianvault' => 'StygianVault',
6667
'AHScoreboard' => 'AH Scoreboard',
67-
'dev-toolbox' => 'Dev-Toolbox',
68-
'core' => 'Core',
69-
'LaravelBase' => 'Laravel Base',
68+
'dev-toolbox' => 'Dev-Toolbox',
69+
'core' => 'Core',
70+
'LaravelBase' => 'Laravel Base',
7071
),
7172

7273
/*
@@ -209,7 +210,11 @@
209210
'Way\Generators\GeneratorsServiceProvider',
210211
'Juy\Profiler\Providers\ProfilerServiceProvider',
211212
'Intervention\Image\ImageServiceProvider',
213+
'McCool\LaravelAutoPresenter\LaravelAutoPresenterServiceProvider',
212214
'Core\View\ViewServiceProvider',
215+
'Core\Forum\ForumServiceProvider',
216+
'Core\Utility\UtilityServiceProvider',
217+
'Core\Utility\AliasServiceProvider',
213218
),
214219

215220
/*
@@ -272,45 +277,10 @@
272277
'SSH' => 'Illuminate\Support\Facades\SSH',
273278
'Str' => 'Illuminate\Support\Str',
274279
'URL' => 'Illuminate\Support\Facades\URL',
275-
'View' => 'Core\View\ViewFacade',
276-
'SocketIOClient' => 'ElephantIO\Client',
277280
'Image' => 'Intervention\Image\Facades\Image',
278-
'Github' => 'Github\Client',
279-
'Chat' => 'Core\Chat',
280-
'Forum' => 'Core\Forum',
281-
'Message' => 'Core\Message',
282-
'User' => 'Core\User',
283-
'Chat_Room' => 'Core\Chat_Room',
284-
'Forum_Board' => 'Core\Forum_Board',
285-
'Forum_Board_Type' => 'Core\Forum_Board_Type',
286-
'Forum_Category' => 'Core\Forum_Category',
287-
'Forum_Category_Type' => 'Core\Forum_Category_Type',
288-
'Forum_Moderation' => 'Core\Forum_Moderation',
289-
'Forum_Moderation_Log' => 'Core\Forum_Moderation_Log',
290-
'Forum_Moderation_Reply' => 'Core\Forum_Moderation_Reply',
291-
'Forum_Post' => 'Core\Forum_Post',
292-
'Forum_Post_Edit' => 'Core\Forum_Post_Edit',
293-
'Forum_Post_Status' => 'Core\Forum_Post_Status',
294-
'Forum_Post_Type' => 'Core\Forum_Post_Type',
295-
'Forum_Post_View' => 'Core\Forum_Post_View',
296-
'Forum_Reply' => 'Core\Forum_Reply',
297-
'Forum_Reply_Edit' => 'Core\Forum_Reply_Edit',
298-
'Forum_Reply_Roll' => 'Core\Forum_Reply_Roll',
299-
'Forum_Reply_Type' => 'Core\Forum_Reply_Type',
300-
'Forum_Support_Status' => 'Core\Forum_Support_Status',
301-
'Message_Folder' => 'Core\Message_Folder',
302-
'Message_Folder_Message' => 'Core\Message_Folder_Message',
303-
'Message_Type' => 'Core\Message_Type',
304-
'Message_User_Delete' => 'Core\Message_User_Delete',
305-
'Message_User_Read' => 'Core\Message_User_Read',
306-
'User_Preference' => 'Core\User_Preference',
307-
'User_Preference_User' => 'Core\User_Preference_User',
308-
'User_Permission_Action' => 'Core\User_Permission_Action',
309-
'User_Permission_Action_Role' => 'Core\User_Permission_Action_Role',
310-
'User_Permission_Role' => 'Core\User_Permission_Role',
311-
'User_Permission_Role_User' => 'Core\User_Permission_Role_User',
312-
'Seed' => 'Core\Seed',
313-
'Migration' => 'Core\Migration',
281+
),
282+
283+
'nonCoreAliases' => array(
314284
),
315285

316286
);

‎app/config/remote.php

+7-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
|
1414
*/
1515

16-
'default' => 'production',
16+
'default' => 'control',
1717

1818
/*
1919
|--------------------------------------------------------------------------
@@ -27,14 +27,13 @@
2727
*/
2828

2929
'connections' => array(
30-
31-
'production' => array(
32-
'host' => '',
33-
'username' => '',
34-
'password' => '',
30+
'control' => array(
31+
'host' => 'localhost:1979',
32+
'username' => 'stygian',
33+
'password' => 'stygicide',
3534
'key' => '',
3635
'keyphrase' => '',
37-
'root' => '/var/www',
36+
'root' => '/home/stygian/public_control'
3837
),
3938

4039
),
@@ -52,7 +51,7 @@
5251

5352
'groups' => array(
5453

55-
'web' => array('production')
54+
'web' => array('control')
5655

5756
),
5857

‎app/controllers/MenuController.php

+18-18
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,51 @@ class MenuController extends Core_BaseController
55

66
public function getMenu()
77
{
8-
$this->menu->addMenuItem('Home', '/')
9-
->addMenuItem('Memberlist', 'memberlist');
8+
Menu::addMenuItem('Home', '/')
9+
->addMenuItem('Memberlist', 'memberlist');
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-
$this->menu->addMenuItem($forumTitle, 'forum', null, 1);
17+
Menu::addMenuItem($forumTitle, 'forum', null, 1);
1818

1919
// Forum Moderation
2020
if ($this->hasPermission('FORUM_MOD')) {
21-
$this->menu->addMenuChild($forumTitle, 'Moderation Panel', 'forum/moderation/dashboard');
21+
Menu::addMenuChild($forumTitle, 'Moderation Panel', 'forum/moderation/dashboard');
2222
}
2323

2424
// Forum Administration
2525
if ($this->hasPermission('FORUM_ADMIN')) {
26-
$this->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');
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');
2929
}
3030
}
3131

3232
// User Menu
33-
$this->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');
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');
3737

3838
// Manage Menu
3939
if ($this->hasPermission('DEVELOPER')) {
40-
$this->menu->addMenuItem('Management', null, null, null, 'right')
41-
->addMenuChild('Management', 'Dev Panel', 'admin');
40+
Menu::addMenuItem('Management', null, null, null, 'right')
41+
->addMenuChild('Management', 'Dev Panel', 'admin');
4242

4343
// Github Links
4444
if ($this->activeUser->githubToken != null) {
45-
$this->menu->addMenuChild('Management', 'Github Issues', 'github')
46-
->addMenuChild('Management', 'My Github Issues', 'github/user');
45+
Menu::addMenuChild('Management', 'Github Issues', 'github')
46+
->addMenuChild('Management', 'My Github Issues', 'github/user');
4747
}
4848
}
4949
} else {
50-
$this->menu->addMenuItem('Login', 'login', null, null, 'right');
51-
$this->menu->addMenuItem('Register', 'register', null, null, 'right');
52-
$this->menu->addMenuItem('Forgot Password', 'forgotPassword', null, null, 'right');
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');
5353
}
5454
}
5555

‎app/core

Submodule core updated from 3369aa7 to 767cb83

‎app/presenters/.gitkeep

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎app/views/home/index.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
@endif
1212
</div>
13-
{{ Utility_Response_BBCode::parse($newsItem->content) }}
13+
{{ BBCode::parse($newsItem->content) }}
1414
<hr />
1515
<div class="pull-left"><small>{{ $newsItem->created_at }}</small></div>
1616
<div class="pull-right">

‎composer.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,24 @@
1010
"juy/profiler" : "dev-master",
1111
"intervention/image": "dev-master",
1212
"leafo/lessphp": "0.4.0",
13-
"knplabs/github-api": "*"
13+
"knplabs/github-api": "*",
14+
"mccool/laravel-auto-presenter": "*"
1415
},
1516
"autoload": {
1617
"classmap": [
1718
"app/commands",
1819
"app/controllers",
1920
"app/library",
2021
"app/models",
22+
"app/presenters",
2123
"app/core",
2224
"app/core/commands",
2325
"app/core/controllers",
2426
"app/core/library",
2527
"app/core/models",
28+
"app/core/Forum",
29+
"app/core/presenters",
30+
"app/core/Utility",
2631
"app/database/migrations",
2732
"app/database/seeds",
2833
"app/tests/TestCase.php"

0 commit comments

Comments
 (0)