Dev

README.md

@@ -1,19 +1,21 @@
-## CodeIgniter 3 Bootstrap 
+## CodeIgniter 3 Bootstrap
+
+**Latest Build: 2016-12-09**
 
 **Note: This project is still in progress, but welcome for any issues encountered**
 
 A starter template that supports multi-tenant (Frontend / Admin Panel / API) website in a single application.
 
 This repository is developed upon the following tools: 
-* [CodeIgniter](http://www.codeigniter.com/) (v3.0.6) - PHP framework
+* [CodeIgniter](http://www.codeigniter.com/) (v3.1.2) - PHP framework
 * [CodeIgniter HMVC Extensions](https://bitbucket.org/wiredesignz/codeigniter-modular-extensions-hmvc) - modular structure by [wiredesignz](http://wiredesignz.co.nz/)
 * [codeigniter-base-model](https://github.com/jamierumbelow/codeigniter-base-model) - more advanced CRUD functions for models by [jamierumbelow](https://github.com/jamierumbelow)
 * [codeigniter-restserver](https://github.com/chriskacerguis/codeigniter-restserver) - base setup for API module
 * [Ion Auth](http://benedmunds.com/ion_auth/) - authentication library for CodeIgniter by [Ben Edmunds](http://benedmunds.com/)
-* [Bootstrap](http://getbootstrap.com/) (v3.3.6) - popular frontend framework
-* [Grocery CRUD](http://www.grocerycrud.com/) (v1.5.5) - feature-rich library to build CRUD tables
+* [Bootstrap](http://getbootstrap.com/) (v3.3.7) - popular frontend framework
+* [Grocery CRUD](http://www.grocerycrud.com/) (v1.5.7) - feature-rich library to build CRUD tables
 * [Image CRUD](http://www.grocerycrud.com/image-crud) (v0.6) - CRUD library for image management
-* [AdminLTE](https://github.com/almasaeed2010/AdminLTE) (v2.3.3) - bootstrap theme for Admin Panel
+* [AdminLTE](https://github.com/almasaeed2010/AdminLTE) (v2.3.8) - bootstrap theme for Admin Panel
 
 
 ### Features
@@ -40,7 +42,7 @@ This repository contains setup for rapid development:
 * ... more coming!
 
 
-### Demo Project (in progress)
+### Demo Project
 
 A demo repository can be found from: https://github.com/waifung0207/ci_bootstrap_3_demo
 
@@ -49,7 +51,7 @@ A demo repository can be found from: https://github.com/waifung0207/ci_bootstrap
 
 Below configuration are preferred; other environments are not well-tested, but still feel free to report and issues. 
 
-* **PHP 5.5+**
+* **PHP 5.6+**
 * **Apache 2.2+** with rewrite mod enabled
 * **MySQL 5.5+** (not tested on MariaDB)
 
@@ -86,7 +88,7 @@ application/                    --- Main CodeIgniter source files
         autoload.php            --- By default, some files are loaded for this repo
         ci_bootstrap.php        --- Core configuration file for all sites
         database.php            --- Need to verify to ensure connection with MySQL database
-        email.php               --- Created to centralize email configuration (preset: using Mandrill service)
+        email.php               --- Created to centralize email configuration (default: using Mailgun)
         form_validation.php     --- Created to centralize validation forms for all forms, include ReCAPTCHA settings
         routes.php              --- Changed default controller from Welcome to Home
     controllers/                --- Controllers for Frontend Website; extends from MY_Controller (except Cli)
@@ -99,7 +101,8 @@ application/                    --- Main CodeIgniter source files
         MY_Router.php           --- Required for HMVC extension
     helpers/                    --- Contains custom helper functions being used throughout this repo
     language/                   --- Preset language files
-    libraries/                  --- Custom libraries (e.g. Ion Auth, Form Builder, System Message)
+    libraries/                  --- Custom libraries (e.g. Form Builder, System Message)
+        MY_Email.php            --- Enhanced email library, includes work with Mailgun API
     models/                     --- Sample model extending from MY_Model
     modules/                    --- Each module can be accessed by http://{base_url}/{module_name}/{module_controller}/, etc.
         admin/                  --- Module for Admin Panel
@@ -170,7 +173,5 @@ More screenshots can be viewed from the [screenshots folder](https://github.com/
 * Changelog file
 * Better documentation (e.g. on [Gitbook](http://gitbook.com/))
 * Enhance Form Builder library to support more field types
-* API authentication (by API key or JSON Web Token, i.e. JWT)
-* Database backup and restore versions
 * Grocery CRUD / Image CRUD file upload - add Amazon S3 integration
 * Grocery CRUD / Image CRUD image upload - add cropping feature

application/config/ci_bootstrap.php

@@ -15,7 +15,7 @@
 $config['ci_bootstrap'] = array(
 
 	// Site name
-	'site_name' => 'CI Bootstrap 3',
+	'site_name' => '',
 
 	// Default page title prefix
 	'page_title_prefix' => '',
@@ -33,26 +33,34 @@
 	// Default scripts to embed at page head or end
 	'scripts' => array(
 		'head'	=> array(
+
 		),
 		'foot'	=> array(
-			'assets/dist/frontend/lib.min.js',
-			'assets/dist/frontend/app.min.js'
+											'https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js',
+											'assets/dist/pe/js/common.js',
+											'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js',
+											'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.8/js/materialize.min.js'
+
+
+
 		),
 	),
 
 	// Default stylesheets to embed at page head
 	'stylesheets' => array(
 		'screen' => array(
-			'assets/dist/frontend/lib.min.css',
-			'assets/dist/frontend/app.min.css'
-		)
+
+			'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css',
+			'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.8/css/materialize.min.css',
+			'assets/dist/pe/css/pe_custome.css'
+			)
 	),
 
 	// Default CSS class for <body> tag
-	'body_class' => '',
+	'body_class' => 'body_pe',	
 
 	// Multilingual settings
-	'languages' => array(
+	/*'languages' => array(
 		'default'		=> 'en',
 		'autoload'		=> array('general'),
 		'available'		=> array(
@@ -73,25 +81,54 @@
 				'value' => 'spanish'
 			)
 		)
-	),
+	),*/
 
 	// Google Analytics User ID
 	'ga_id' => '',
 
 	// Menu items
 	'menu' => array(
-		'home' => array(
-			'name'		=> 'Home',
+
+		'about' => array(
+			'name'		=> 'About',
+			'url'		=> '',
+		),
+		'services' => array(
+			'name'		=> 'Services',
+			'url'		=> '',
+		),
+		'samples' => array(
+			'name'		=> 'Samples',
+			'url'		=> '',
+		),
+		'order' => array(
+			'name'		=> 'Order',
+			'url'		=> '',
+		),
+		'support' => array(
+			'name'		=> 'Support',
 			'url'		=> '',
 		),
 	),
 
 	// Login page
-	'login_url' => '',
+	'login_url' => 'login',
 
 	// Restricted pages
 	'page_auth' => array(
-		'test'	=> array('membders'),
+	),
+
+	// Email config
+	'email' => array(
+		'from_email'		=> '',
+		'from_name'			=> '',
+		'subject_prefix'	=> '',
+
+		// Mailgun HTTP API
+		'mailgun_api'		=> array(
+			'domain'			=> '',
+			'private_api_key'	=> ''
+		),
 	),
 
 	// Debug tools
@@ -101,6 +138,19 @@
 	),
 );
 
+/** Browser Detection **/
+$msie = strpos($_SERVER["HTTP_USER_AGENT"], 'MSIE') ? true : false;
+$firefox = strpos($_SERVER["HTTP_USER_AGENT"], 'Firefox') ? true : false;
+$safari = strpos($_SERVER["HTTP_USER_AGENT"], 'Safari') ? true : false;
+$chrome = strpos($_SERVER["HTTP_USER_AGENT"], 'Chrome') ? true : false;
+if($chrome){
+	array_push($config['ci_bootstrap']['stylesheets']['screen'],'assets/dist/pe/css/pe_custome_chrome.css');
+}elseif($firefox){
+	array_push($config['ci_bootstrap']['stylesheets']['screen'],'assets/dist/pe/css/pe_custome_moz.css');
+}elseif($safari){
+	array_push($config['ci_bootstrap']['stylesheets']['screen'],'assets/dist/pe/css/pe_custome_chrome.css');
+}
+/** End Browser Detection **/
 /*
 | -------------------------------------------------------------------------
 | Override values from /application/config/config.php

application/config/ci_bootstrap_example.php

@@ -137,6 +137,19 @@
 		'panel/admin_user_group'	=> array('webmaster'),
 	),
 
+	// Email config (to be used in MY_Email library)
+	'email' => array(
+		'from_email'		=> '[email protected]',
+		'from_name'			=> 'CI Bootstrap',
+		'subject_prefix'	=> '[CI Bootstrap] ',
+
+		// Mailgun HTTP API
+		'mailgun_api'		=> array(
+			'domain'			=> '',
+			'private_api_key'	=> ''
+		),
+	),
+
 	// Debug tools (available only when ENVIRONMENT = 'development')
 	'debug' => array(
 		'view_data'	=> FALSE,	// whether to display MY_Controller's mViewData at page end

application/config/constants.php

@@ -93,15 +93,19 @@
 */
 if (!(PHP_SAPI === 'cli' OR defined('STDIN')))
 {
-	// Base URL with directory support; also for API prefix in Swagger annotation (/application/modules/api/swagger/info.php)
+	// Base URL with directory support
 	$protocol = (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS'])!== 'off') ? 'https' : 'http';
 	$base_url = $protocol.'://'.$_SERVER['HTTP_HOST'];
 	$base_url.= dirname($_SERVER['SCRIPT_NAME']);
-	define('BASE_URL', $base_url);
+	//define('BASE_URL', $base_url);
+
+    define('BASE_URL', 'http://ci3.localhost/');
+	// For API prefix in Swagger annotation (/application/modules/api/swagger/info.php)
+	define('API_HOST', $_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
 }
 
 define('CI_BOOTSTRAP_REPO',			'https://github.com/waifung0207/ci_bootstrap_3');
-define('CI_BOOTSTRAP_VERSION',		'Build 20160610');	// will follow semantic version (e.g. v1.x.x) after first stable launch
+define('CI_BOOTSTRAP_VERSION',		'Build 20161209');	// will follow semantic version (e.g. v1.x.x) after first stable launch
 
 // Upload paths
-//define('UPLOAD_COVER_PHOTO',	'assets/uploads/cover_photos');
+//define('UPLOAD_COVER_PHOTO',	'assets/uploads/cover_photos');

application/config/database.php

@@ -76,8 +76,8 @@
 $db['default'] = array(
 	'dsn'	=> '',
 	'hostname' => 'localhost',
-	'username' => 'ci_bootstrap_3',
-	'password' => 'ci_bootstrap_3',
+	'username' => 'root',
+	'password' => '',
 	'database' => 'ci_bootstrap_3',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',

application/config/email.php

@@ -8,23 +8,12 @@
 | */
 
 $config['protocol'] = 'smtp';
-$config['smtp_host'] = 'smtp.mandrillapp.com';
+$config['smtp_host'] = 'smtp.mailgun.org';
 $config['smtp_port'] = '587';
 $config['smtp_timeout'] = '30';
-$config['smtp_user'] = 'username';
+$config['smtp_user'] = '[email protected]';
 $config['smtp_pass'] = 'password';
 $config['charset'] = 'utf-8';
 $config['mailtype'] = 'html';
 $config['wordwrap'] = TRUE;
 $config['newline'] = "\r\n";
-
-// custom values from CI Bootstrap
-$config['from_email'] = "[email protected]";
-$config['from_name'] = "CI Bootstrap";
-$config['subject_prefix'] = "[CI Bootstrap] ";
-
-// Mailgun API (to be used in Email Client library)
-$config['mailgun'] = array(
-	'domain'				=> '',
-	'private_api_key'		=> '',
-);

application/config/routes.php

@@ -56,11 +56,11 @@
 /*
 | -------------------------------------------------------------------------
 | Added by CI Bootstrap 3
-| Multilingual routing (update "en|zh|cn|es" for available languages)
+| Multilingual routing (use 2 characters (e.g. en, zh, cn, es) for switching languages)
 | -------------------------------------------------------------------------
 */
-$route['^en|zh|cn|es/(.+)$'] = "$1";
-$route['^en|zh|cn|es$'] = $route['default_controller'];
+$route['^(\w{2})/(.*)$'] = '$2';
+$route['^(\w{2})$'] = $route['default_controller'];
 
 /*
 | -------------------------------------------------------------------------
@@ -81,7 +81,11 @@
 */
 $route['api/(:any)/(:num)']				= 'api/$1/id/$2';
 $route['api/(:any)/(:num)/(:any)']		= 'api/$1/$3/$2';
-
+$route['login']				= 'auth/login';
+$route['register']				= 'auth/create_user';
+$route['forgot_password'] = 'auth/forgot_password';
+$route['reset_password'] = 'auth/reset_password';
+$route['change_password'] = 'auth/change_password';
 /*
 | -------------------------------------------------------------------------
 | Added by CI Bootstrap 3