diff --git a/application/controllers/Main.php b/application/controllers/Main.php index b2627a4..cde34be 100755 --- a/application/controllers/Main.php +++ b/application/controllers/Main.php @@ -14,9 +14,7 @@ class Main extends MY_Controller { $pages = Page::getPages(); - $this->json($pages->toArray()); - - //$this->load->view('main_view'); + $this->load->view('main_view', ['pages'=>$pages]); } private function showLoginPage() diff --git a/application/controllers/Menu.php b/application/controllers/Menu.php new file mode 100644 index 0000000..4b9bebf --- /dev/null +++ b/application/controllers/Menu.php @@ -0,0 +1,21 @@ +with( 'subpages' ) + $pages = Page::whereRaw( 'id = page_id AND ' ) + ->with( ['subpages' => function($q){ + $q->whereRaw('id != page_id'); + }] ) ->get(); return $pages; } + public static function getAppPages() + { + $appPages = Page::whereRaw + } + } \ No newline at end of file diff --git a/application/views/main_view.php b/application/views/main_view.php index 765fcf6..88f651f 100644 --- a/application/views/main_view.php +++ b/application/views/main_view.php @@ -19,9 +19,26 @@ Breakpoints(); - + load->view( 'partials/_navbar-left' ); ?> -load->view( 'partials/_content' ); ?> + + + subpages ) == 0 ): ?> + +
+ load->view( 'partials/_content', ['pageurl' => $page->pageurl] ); ?> +
+ + + subpages as $subpage ): ?> + +
+ load->view( 'partials/_content', ['pageurl' => $subpage->pageurl] ); ?> +
+ + + + diff --git a/application/views/partials/_content.php b/application/views/partials/_content.php index 5052c62..cf355f2 100644 --- a/application/views/partials/_content.php +++ b/application/views/partials/_content.php @@ -1,29 +1,3 @@ -
- -
-

Page Title

-
- - - -
- - -
-
-

Panel Title

-
-
-
- - - -
-
- - - ...... - -
- +
+

\ No newline at end of file diff --git a/application/views/partials/_js.php b/application/views/partials/_js.php index cfb657f..f6c1cf8 100644 --- a/application/views/partials/_js.php +++ b/application/views/partials/_js.php @@ -45,4 +45,8 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/application/views/partials/_navbar-left.php b/application/views/partials/_navbar-left.php index e170e7c..291923e 100644 --- a/application/views/partials/_navbar-left.php +++ b/application/views/partials/_navbar-left.php @@ -1,22 +1,26 @@
\ No newline at end of file diff --git a/composer.json b/composer.json index e904ca0..786cb7f 100755 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "require": { "php": ">=5.3.7", "vlucas/phpdotenv": "^2.4", - "illuminate/database": "5.1.16" + "illuminate/database": "5.1.16", + "symfony/var-dumper": "^3.4" }, "autoload": { "classmap": [ diff --git a/db/ci_sessions.sql b/db/ci_sessions.sql new file mode 100644 index 0000000..ba7a199 --- /dev/null +++ b/db/ci_sessions.sql @@ -0,0 +1,17 @@ +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('be0f1398fddb86d3eb30297785ad3afc419978e5', '::1', 1513871050, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837303937333B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('a3ccd5a7a36a2f3e28be8a6b2749d8caac4a2e8f', '::1', 1513871801, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837313830313B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('78f98f62c0b61fad1963a9e0836bbc37c99a4a02', '::1', 1513872222, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837323232323B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('c53309ff5c6219b9aa462d729ce18cb47f134427', '::1', 1513872734, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837323733343B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('b163a64a08c4a3bf69dd17e1fce8970ae0dd346a', '::1', 1513873090, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837333039303B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('0968295358aa54472f282347ac0becf2ea2c4dc1', '::1', 1513873439, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837333433393B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('d1556a80e0f492c45d840c9ce2315b5b84ade31b', '::1', 1513873827, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837333832373B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('c2948e1e9e20b56c58c6fa2be51e6b85de7ac4bc', '::1', 1513874132, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837343133323B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('1a94dfc0cdede1344fa1ba2bb8ad9c004f128fc2', '::1', 1513874449, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837343434393B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('794ed3029ace011d7b784bac815cdfa8c570336c', '::1', 1513874791, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837343739313B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('451b3f190cb6311eaf1491568346e1398c122c33', '::1', 1513876114, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837363131343B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('752e89ff54a2597e486e7a19fc3fefaf5aa3862d', '::1', 1513876332, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333837363131343B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('f1a0d146fd32dad44dc96a4efb5e8cfcd2572e5e', '::1', 1513940075, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333934303037353B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('011f3e79ce7d92b38f1bf933dca3b71857b5abc0', '::1', 1513940377, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333934303337373B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('00371a005b69756a7ee8d872cbaaeb5fdd0fb991', '::1', 1513940697, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333934303639373B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('1bcb926a04e2bb842d8795d29fb959852ac76db6', '::1', 1513944477, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333934343437373B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); +INSERT INTO `ci_sessions`(`id`, `ip_address`, `timestamp`, `data`) VALUES ('a7325ac8b33af2e5cfd2f3eb08d3448b3ee9df9b', '::1', 1513944596, 0x5F5F63695F6C6173745F726567656E65726174657C693A313531333934343437373B7573657249447C733A313A2231223B726F6C657C733A313A2231223B); diff --git a/db/pages.sql b/db/pages.sql new file mode 100644 index 0000000..59a5977 --- /dev/null +++ b/db/pages.sql @@ -0,0 +1,8 @@ +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (1, 1, 'dashboard', 'DASHBOARD', 'T', 0, NULL, NULL, NULL, NULL); +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (2, 2, 'Beheer', 'SUBPAGE', 'F', 0, NULL, NULL, NULL, NULL); +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (3, 2, 'Gebruikers', 'USERS', 'T', 0, NULL, NULL, NULL, NULL); +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (4, 2, 'Projecten', 'PROJECTS', 'T', 0, NULL, NULL, NULL, NULL); +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (5, 5, 'Rapportage', 'SUBPAGE', 'F', 0, NULL, NULL, NULL, NULL); +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (6, 5, 'Report - 1', 'REPORT_1', 'T', 0, NULL, NULL, NULL, NULL); +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (7, 5, 'Report - 2', 'REPORT_2', 'T', 0, NULL, NULL, NULL, NULL); +INSERT INTO `pages`(`id`, `page_id`, `pagename`, `pageurl`, `app_page`, `pagelevel`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (8, 5, 'Report - 3', 'REPORT_3', 'T', 0, NULL, NULL, NULL, NULL); diff --git a/db/roles.sql b/db/roles.sql new file mode 100644 index 0000000..12e57db --- /dev/null +++ b/db/roles.sql @@ -0,0 +1,4 @@ +INSERT INTO `roles`(`id`, `rolename`, `rolelevel`, `rolehierarchy`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (1, 'super', 1, 1, NULL, '', NULL, NULL); +INSERT INTO `roles`(`id`, `rolename`, `rolelevel`, `rolehierarchy`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (2, 'beheerder', 2, 10, NULL, '', NULL, NULL); +INSERT INTO `roles`(`id`, `rolename`, `rolelevel`, `rolehierarchy`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (3, 'projectleider', 4, 20, NULL, '', NULL, NULL); +INSERT INTO `roles`(`id`, `rolename`, `rolelevel`, `rolehierarchy`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (4, 'administratie', 8, 30, NULL, '', NULL, NULL); diff --git a/db/users.sql b/db/users.sql new file mode 100644 index 0000000..10a612c --- /dev/null +++ b/db/users.sql @@ -0,0 +1 @@ +INSERT INTO `users`(`id`, `firstname`, `middlename`, `lastname`, `email`, `username`, `password`, `salt`, `role`, `creation_date`, `created_by`, `last_update_date`, `last_updated_by`) VALUES (1, 'Pensare', NULL, 'Software', 't.weijmer@pensare.nl', 'pensare', NULL, NULL, 1, NULL, NULL, NULL, NULL); diff --git a/public/js/lib/dataservices.js b/public/js/lib/dataservices.js new file mode 100644 index 0000000..dcbb105 --- /dev/null +++ b/public/js/lib/dataservices.js @@ -0,0 +1,6 @@ +/** + * Created by Pensare Software. + * User: Theo Weijmer + * Date: 22/12/2017 + * Time: 13:32 + */ \ No newline at end of file diff --git a/public/js/lib/main.js b/public/js/lib/main.js new file mode 100644 index 0000000..ee68d7e --- /dev/null +++ b/public/js/lib/main.js @@ -0,0 +1,36 @@ +/** + * Created by Pensare Software. + * User: Theo Weijmer + * Date: 22/12/2017 + * Time: 12:13 + */ + +var dbo = {}; + +$(function(){ + + ko.bindingHandlers.stopBinding = { + init: function () { + return {controlsDescendantBindings: true}; + } + }; + + ko.virtualElements.allowedBindings.stopBinding = true; + + + + ko.bindingHandlers.fadeVisible = { + init : function ( element, valueAccessor ) { + + // Initially set the element to be instantly visible/hidden depending on the value + var value = valueAccessor(); + $( element ).toggle( ko.unwrap( value ) ); // Use "unwrapObservable" so we can handle values that may or may not be observable + }, + update: function ( element, valueAccessor ) { + // Whenever the value subsequently changes, slowly fade the element in or out + var value = valueAccessor(); + ko.unwrap( value ) ? $( element ).fadeIn( 500 ) : $( element ).fadeOut( 500 ); + } + }; + +}); \ No newline at end of file diff --git a/public/js/lib/modules/menuModule.js b/public/js/lib/modules/menuModule.js new file mode 100644 index 0000000..598d17b --- /dev/null +++ b/public/js/lib/modules/menuModule.js @@ -0,0 +1,24 @@ +/** + * Created by Pensare Software. + * User: Theo Weijmer + * Date: 22/12/2017 + * Time: 13:22 + */ + + +$( function () { + + dbo.menuModel = { + + init : function(){ + + } + + + } + + dbo.menuModel.init(); + + ko.applyBindings(dbo.menuModel, document.getElementById("dbois-app")); + +} ); diff --git a/public/js/lib/pageDataservice.js b/public/js/lib/pageDataservice.js new file mode 100644 index 0000000..1eb2f1a --- /dev/null +++ b/public/js/lib/pageDataservice.js @@ -0,0 +1,13 @@ +/** + * Created by Pensare Software. + * User: Theo Weijmer + * Date: 22/12/2017 + * Time: 13:32 + */ + +dbo.pageDataservice = { + + $.getJSON('index.php/') + +}; +