diff --git a/www/application/controllers/User_Tweets.php b/www/application/controllers/User_Tweets.php index e5b6fb6..e756de0 100644 --- a/www/application/controllers/User_Tweets.php +++ b/www/application/controllers/User_Tweets.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD load->database(); + $this->load->model('User_Tweets_Model'); + $this->output->enable_profiler(TRUE); + } + + public function index(){ + $this->data['posts'] = $this->Users_Tweets_Model2->getPosts(); + $this->load->view('user', $this->data); + } + } +>>>>>>> 41b5a2f810bd6d9f899d79ce9dd4069ec9f97dda diff --git a/www/application/models/User_Tweets_Model.php b/www/application/models/User_Tweets_Model.php index 6292bf0..3ef6c63 100644 --- a/www/application/models/User_Tweets_Model.php +++ b/www/application/models/User_Tweets_Model.php @@ -1,5 +1,6 @@ db->select("first_name, last_name, username, tweet, date_time"); @@ -32,5 +33,22 @@ function addTweet(){ return $this->db->insert('tweets', $data); */ } +======= + + function getPosts(){ + + //$this->load->library('session'); + //session_start(); + $user_id = 1; //$this->session->userdata('session_id'); + + $this->db->select("first_name, last_name, username, tweet, date_time, location"); + $this->db->from("Users, Tweets"); + $this->db->where("Users.id = Tweets.user_id and Users.id = $user_id"); + $this->db->order_by('date_time', 'DESC'); + $query = $this->db->get(); + return $query->result_array(); + } + +>>>>>>> 41b5a2f810bd6d9f899d79ce9dd4069ec9f97dda } diff --git a/www/application/views/home.php b/www/application/views/home.php index bf2eaeb..7153591 100644 --- a/www/application/views/home.php +++ b/www/application/views/home.php @@ -1,32 +1,25 @@ - - - - All Tweets - - - - -

Tweets Feed

-
-
- -
- - - -
-
- - -
- -
-
- - - +
+

All Tweets

+ +
+
+
+ " . $post['first_name'] . " " . $post['last_name'] . ""; ?> + " . "@" . $post['username'] . "";?> +
+
+ +
+
+
+
+ +
+
+
+ +
diff --git a/www/application/views/templates/footer.php b/www/application/views/templates/footer.php index f531270..f9a1892 100644 --- a/www/application/views/templates/footer.php +++ b/www/application/views/templates/footer.php @@ -1,4 +1,4 @@ - © 2017 + © 2017 Stumper and Singh Studios diff --git a/www/application/views/templates/header.php b/www/application/views/templates/header.php index 5584cc0..de05d9c 100644 --- a/www/application/views/templates/header.php +++ b/www/application/views/templates/header.php @@ -1,8 +1,10 @@ - + + + - Twitter + Twitter Clone + + - - -

Hello

+ diff --git a/www/application/views/user.php b/www/application/views/user.php index bcf8f1e..1accc25 100644 --- a/www/application/views/user.php +++ b/www/application/views/user.php @@ -4,6 +4,7 @@
+
diff --git a/www/css/styles.css b/www/css/styles.css new file mode 100644 index 0000000..bb75e82 --- /dev/null +++ b/www/css/styles.css @@ -0,0 +1,24 @@ +.home{ + max-width:60%; + margin:0 auto +} + + .tweet-container{ + border:1px solid #eeeeee; + padding:15px; + margin-bottom:15px; + max-width:100%; + } + + .tweet-container h3{ + margin-top:0!important + } + + .date{ + color:grey + } + + .tweet{ + font-size: 16px; + font-style: italic; + }