diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index ca4d7a8..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php new file mode 100644 index 0000000..bfbea07 --- /dev/null +++ b/application/views/welcome_message.php @@ -0,0 +1,92 @@ + + + + + Welcome to CodeIgniter + " /> + + + + + +
+

Welcome to CodeIgniter!

+ +
+

The page you are looking at is being generated dynamically by CodeIgniter.

+ +

If you would like to edit this page you'll find it located at:

+ application/views/welcome_message.php + +

The corresponding controller for this page is found at:

+ application/controllers/Welcome.php + +

If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

+
+ +

Page rendered in {elapsed_time} seconds. ' . CI_VERSION . '' : '' ?>

+
+ + + + + diff --git a/db/lamp_2017-11-28.sql b/db/lamp_2017-11-28.sql new file mode 100644 index 0000000..114e28b --- /dev/null +++ b/db/lamp_2017-11-28.sql @@ -0,0 +1,66 @@ +# ************************************************************ +# Sequel Pro SQL dump +# Version 4541 +# +# http://www.sequelpro.com/ +# https://github.com/sequelpro/sequelpro +# +# Host: 127.0.0.1 (MySQL 5.7.20) +# Database: lamp +# Generation Time: 2017-11-29 03:09:17 +0000 +# ************************************************************ + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + + +# Dump of table Tweets +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `Tweets`; + +CREATE TABLE `Tweets` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `tweet_id` bigint(11) DEFAULT NULL, + `tweet` char(11) DEFAULT NULL, + `date_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + + +# Dump of table Users +# ------------------------------------------------------------ + +DROP TABLE IF EXISTS `Users`; + +CREATE TABLE `Users` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `first_name` text, + `last_name` text, + `username` char(20) DEFAULT '', + `password` text, + `email` text, + `picture` text, + `bio` char(140) DEFAULT '', + `url` text, + `location` text, + `date_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + + + + +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/www/application/config/database.php b/www/application/config/database.php index bf9857f..6c634b5 100755 --- a/www/application/config/database.php +++ b/www/application/config/database.php @@ -75,10 +75,10 @@ $db['default'] = array( 'dsn' => '', - 'hostname' => 'localhost', - 'username' => '', - 'password' => '', - 'database' => '', + 'hostname' => 'database', + 'username' => 'lamp', + 'password' => 'lamp', + 'database' => 'lamp', 'dbdriver' => 'mysqli', 'dbprefix' => '', 'pconnect' => FALSE, diff --git a/www/application/views/templates/header.php b/www/application/views/templates/header.php index 09ff133..c136f24 100644 --- a/www/application/views/templates/header.php +++ b/www/application/views/templates/header.php @@ -1,6 +1,7 @@ CodeIgniter Tutorial +