From 886a8d52585c28d96f362515c30abc2b4768ff0f Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 09:50:37 +0000 Subject: [PATCH 01/16] moved to Database folder --- Company.sql | 207 ---------------------------------------------------- 1 file changed, 207 deletions(-) delete mode 100644 Company.sql diff --git a/Company.sql b/Company.sql deleted file mode 100644 index bd98315..0000000 --- a/Company.sql +++ /dev/null @@ -1,207 +0,0 @@ --- phpMyAdmin SQL Dump --- version 4.8.2 --- https://www.phpmyadmin.net/ --- --- Host: localhost --- Generation Time: Aug 07, 2018 at 12:23 AM --- Server version: 5.7.22-0ubuntu18.04.1 --- PHP Version: 7.2.5-0ubuntu0.18.04.1 - -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -SET AUTOCOMMIT = 0; -START TRANSACTION; -SET time_zone = "+00:00"; - - -/*!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 utf8mb4 */; - --- --- Database: `Company` --- - --- -------------------------------------------------------- - --- --- Table structure for table `admin` --- - -CREATE TABLE `admin` ( - `id` int(11) NOT NULL, - `email` varchar(200) NOT NULL, - `password` varchar(500) NOT NULL, - `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- --- Dumping data for table `admin` --- - -INSERT INTO `admin` (`id`, `email`, `password`, `date`) VALUES -(4, 'admin@example.com', '$2y$12$HP9yMU7ND.83aak5UmmDM.xXm24RuxXcq8cEfhPgCS5C2yoA8jM0q', '2018-08-07 01:23:11'); - --- -------------------------------------------------------- - --- --- Table structure for table `comments` --- - -CREATE TABLE `comments` ( - `id` int(11) NOT NULL, - `name` varchar(200) NOT NULL, - `comment` varchar(200) NOT NULL, - `blogid` int(11) NOT NULL, - `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- --- Dumping data for table `comments` --- - -INSERT INTO `comments` (`id`, `name`, `comment`, `blogid`, `date`) VALUES -(1, 'Jaden', 'Awesome post guys!!', 6, '2018-07-28 00:15:59'), -(6, 'Cliff', 'I really relate to this', 5, '2018-07-28 01:00:14'), -(8, 'Ethredah', 'nice', 7, '2018-07-29 21:10:30'); - --- -------------------------------------------------------- - --- --- Table structure for table `contacts` --- - -CREATE TABLE `contacts` ( - `id` int(11) NOT NULL, - `names` varchar(50) NOT NULL, - `email` varchar(50) NOT NULL, - `message` text NOT NULL, - `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- --- Dumping data for table `contacts` --- - -INSERT INTO `contacts` (`id`, `names`, `email`, `message`, `date`) VALUES -(1, 'Ethredah', 'ethredah@gmail.com', 'Hello there Ushauri team.', '2018-07-27 16:57:59'), -(2, 'Chao', 'chao@gmail.com', 'Hi there!!', '2018-07-27 16:57:59'), -(4, 'James Mlamba', 'jaymo@gmail.com', 'I am interested in a meeting.', '2018-07-28 01:38:22'), -(5, 'James Mlamba', 'ethredah@gmail.com', 'hi', '2018-07-31 19:45:43'); - --- -------------------------------------------------------- - --- --- Table structure for table `posts` --- - -CREATE TABLE `posts` ( - `id` int(11) NOT NULL, - `author` varchar(200) NOT NULL, - `title` varchar(400) NOT NULL, - `content` text NOT NULL, - `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- --- Dumping data for table `posts` --- - -INSERT INTO `posts` (`id`, `author`, `title`, `content`, `date`) VALUES -(5, 'Ethredah', 'MENTAL HEALTH IS REAL', 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis,csem.Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. enean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar,\r\n\r\n', '2018-07-27 15:28:31'), -(6, 'Derick', 'Ushauri Lending a hand', 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. enean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar,\r\n\r\n', '2018-07-27 15:50:04'); - --- -------------------------------------------------------- - --- --- Table structure for table `subscribers` --- - -CREATE TABLE `subscribers` ( - `id` int(11) NOT NULL, - `email` varchar(50) NOT NULL, - `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- --- Dumping data for table `subscribers` --- - -INSERT INTO `subscribers` (`id`, `email`, `date`) VALUES -(3, 'ethredah@gmail.com', '2018-07-27 18:21:30'), -(4, 'james@hack3.io', '2018-07-27 18:21:30'), -(6, 'admin@pikash.sales', '2018-07-28 01:49:21'); - --- --- Indexes for dumped tables --- - --- --- Indexes for table `admin` --- -ALTER TABLE `admin` - ADD PRIMARY KEY (`id`); - --- --- Indexes for table `comments` --- -ALTER TABLE `comments` - ADD PRIMARY KEY (`id`), - ADD KEY `blogid` (`blogid`); - --- --- Indexes for table `contacts` --- -ALTER TABLE `contacts` - ADD PRIMARY KEY (`id`); - --- --- Indexes for table `posts` --- -ALTER TABLE `posts` - ADD PRIMARY KEY (`id`); - --- --- Indexes for table `subscribers` --- -ALTER TABLE `subscribers` - ADD PRIMARY KEY (`id`); - --- --- AUTO_INCREMENT for dumped tables --- - --- --- AUTO_INCREMENT for table `admin` --- -ALTER TABLE `admin` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5; - --- --- AUTO_INCREMENT for table `comments` --- -ALTER TABLE `comments` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=9; - --- --- AUTO_INCREMENT for table `contacts` --- -ALTER TABLE `contacts` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6; - --- --- AUTO_INCREMENT for table `posts` --- -ALTER TABLE `posts` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7; - --- --- AUTO_INCREMENT for table `subscribers` --- -ALTER TABLE `subscribers` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7; -COMMIT; - -/*!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 */; From 1330b592a14f269a7c62a4ed35ddef3b46500a2e Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 09:51:19 +0000 Subject: [PATCH 02/16] database sql file --- Database/Company.sql | 207 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) create mode 100644 Database/Company.sql diff --git a/Database/Company.sql b/Database/Company.sql new file mode 100644 index 0000000..bd98315 --- /dev/null +++ b/Database/Company.sql @@ -0,0 +1,207 @@ +-- phpMyAdmin SQL Dump +-- version 4.8.2 +-- https://www.phpmyadmin.net/ +-- +-- Host: localhost +-- Generation Time: Aug 07, 2018 at 12:23 AM +-- Server version: 5.7.22-0ubuntu18.04.1 +-- PHP Version: 7.2.5-0ubuntu0.18.04.1 + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET AUTOCOMMIT = 0; +START TRANSACTION; +SET time_zone = "+00:00"; + + +/*!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 utf8mb4 */; + +-- +-- Database: `Company` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `admin` +-- + +CREATE TABLE `admin` ( + `id` int(11) NOT NULL, + `email` varchar(200) NOT NULL, + `password` varchar(500) NOT NULL, + `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `admin` +-- + +INSERT INTO `admin` (`id`, `email`, `password`, `date`) VALUES +(4, 'admin@example.com', '$2y$12$HP9yMU7ND.83aak5UmmDM.xXm24RuxXcq8cEfhPgCS5C2yoA8jM0q', '2018-08-07 01:23:11'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `comments` +-- + +CREATE TABLE `comments` ( + `id` int(11) NOT NULL, + `name` varchar(200) NOT NULL, + `comment` varchar(200) NOT NULL, + `blogid` int(11) NOT NULL, + `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `comments` +-- + +INSERT INTO `comments` (`id`, `name`, `comment`, `blogid`, `date`) VALUES +(1, 'Jaden', 'Awesome post guys!!', 6, '2018-07-28 00:15:59'), +(6, 'Cliff', 'I really relate to this', 5, '2018-07-28 01:00:14'), +(8, 'Ethredah', 'nice', 7, '2018-07-29 21:10:30'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `contacts` +-- + +CREATE TABLE `contacts` ( + `id` int(11) NOT NULL, + `names` varchar(50) NOT NULL, + `email` varchar(50) NOT NULL, + `message` text NOT NULL, + `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `contacts` +-- + +INSERT INTO `contacts` (`id`, `names`, `email`, `message`, `date`) VALUES +(1, 'Ethredah', 'ethredah@gmail.com', 'Hello there Ushauri team.', '2018-07-27 16:57:59'), +(2, 'Chao', 'chao@gmail.com', 'Hi there!!', '2018-07-27 16:57:59'), +(4, 'James Mlamba', 'jaymo@gmail.com', 'I am interested in a meeting.', '2018-07-28 01:38:22'), +(5, 'James Mlamba', 'ethredah@gmail.com', 'hi', '2018-07-31 19:45:43'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `posts` +-- + +CREATE TABLE `posts` ( + `id` int(11) NOT NULL, + `author` varchar(200) NOT NULL, + `title` varchar(400) NOT NULL, + `content` text NOT NULL, + `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `posts` +-- + +INSERT INTO `posts` (`id`, `author`, `title`, `content`, `date`) VALUES +(5, 'Ethredah', 'MENTAL HEALTH IS REAL', 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis,csem.Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. enean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar,\r\n\r\n', '2018-07-27 15:28:31'), +(6, 'Derick', 'Ushauri Lending a hand', 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. enean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar,\r\n\r\n', '2018-07-27 15:50:04'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `subscribers` +-- + +CREATE TABLE `subscribers` ( + `id` int(11) NOT NULL, + `email` varchar(50) NOT NULL, + `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP +) ENGINE=InnoDB DEFAULT CHARSET=latin1; + +-- +-- Dumping data for table `subscribers` +-- + +INSERT INTO `subscribers` (`id`, `email`, `date`) VALUES +(3, 'ethredah@gmail.com', '2018-07-27 18:21:30'), +(4, 'james@hack3.io', '2018-07-27 18:21:30'), +(6, 'admin@pikash.sales', '2018-07-28 01:49:21'); + +-- +-- Indexes for dumped tables +-- + +-- +-- Indexes for table `admin` +-- +ALTER TABLE `admin` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `comments` +-- +ALTER TABLE `comments` + ADD PRIMARY KEY (`id`), + ADD KEY `blogid` (`blogid`); + +-- +-- Indexes for table `contacts` +-- +ALTER TABLE `contacts` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `posts` +-- +ALTER TABLE `posts` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `subscribers` +-- +ALTER TABLE `subscribers` + ADD PRIMARY KEY (`id`); + +-- +-- AUTO_INCREMENT for dumped tables +-- + +-- +-- AUTO_INCREMENT for table `admin` +-- +ALTER TABLE `admin` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5; + +-- +-- AUTO_INCREMENT for table `comments` +-- +ALTER TABLE `comments` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=9; + +-- +-- AUTO_INCREMENT for table `contacts` +-- +ALTER TABLE `contacts` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6; + +-- +-- AUTO_INCREMENT for table `posts` +-- +ALTER TABLE `posts` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7; + +-- +-- AUTO_INCREMENT for table `subscribers` +-- +ALTER TABLE `subscribers` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7; +COMMIT; + +/*!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 */; From e1f997eca26922e80a464c06a2ff1859f8b21787 Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 10:22:43 +0000 Subject: [PATCH 03/16] required file directory changed --- blog.php | 2 +- single.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blog.php b/blog.php index dbbc09c..d4e1ff8 100644 --- a/blog.php +++ b/blog.php @@ -7,7 +7,7 @@ Date: Sat, 2 Jan 2021 10:22:59 +0000 Subject: [PATCH 04/16] db connection changed --- admin/functions/db.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/admin/functions/db.php b/admin/functions/db.php index f93fc75..4d90a9a 100644 --- a/admin/functions/db.php +++ b/admin/functions/db.php @@ -1,6 +1,3 @@ - - - $value){ @@ -21,7 +18,7 @@ } try{ - $db = new PDO('mysql:dbhost=localhost;dbname=Company;charset=utf8','root','Sabc123*'); + $db = new PDO('mysql:dbhost=localhost;dbname=Company;charset=utf8','root',''); } From afa15121fccde7f3bde253ad4c5245641de49cdd Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 10:24:34 +0000 Subject: [PATCH 05/16] moved to includes --- footer.php | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 footer.php diff --git a/footer.php b/footer.php deleted file mode 100644 index 2160787..0000000 --- a/footer.php +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - \ No newline at end of file From 7d51341d6e999c03dee67bbdd320cc6f10ce3814 Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 10:25:02 +0000 Subject: [PATCH 06/16] pages banner --- includes/banner.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 includes/banner.php diff --git a/includes/banner.php b/includes/banner.php new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/includes/banner.php @@ -0,0 +1 @@ + From da554b1e41d7944b9c17869f5d92fe6afc606103 Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 10:30:52 +0000 Subject: [PATCH 07/16] footer --- includes/footer.php | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 includes/footer.php diff --git a/includes/footer.php b/includes/footer.php new file mode 100644 index 0000000..2160787 --- /dev/null +++ b/includes/footer.php @@ -0,0 +1,43 @@ + + + + + + + + + + \ No newline at end of file From f3420c3d94f7f75d3700aef0657c582f2bb0395f Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 10:31:19 +0000 Subject: [PATCH 08/16] banner and footer relocated --- about.php | 40 +--------------------------------------- blog.php | 42 ++---------------------------------------- contact.php | 42 ++---------------------------------------- includes/banner.php | 38 ++++++++++++++++++++++++++++++++++++++ index.php | 2 +- portfolio.php | 42 ++---------------------------------------- single.php | 42 ++---------------------------------------- 7 files changed, 48 insertions(+), 200 deletions(-) diff --git a/about.php b/about.php index 7b34bf7..5e5d0ea 100644 --- a/about.php +++ b/about.php @@ -29,45 +29,7 @@ function hideURLbar(){ window.scrollTo(0,1); } -
-
-
-
- -
-
-
- -
-
-
+
diff --git a/blog.php b/blog.php index d4e1ff8..aa6336e 100644 --- a/blog.php +++ b/blog.php @@ -41,45 +41,7 @@ function hideURLbar(){ window.scrollTo(0,1); } -
-
-
-
- -
-
-
- -
-
-
+
- - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
diff --git a/admin/new-post.php b/admin/new-post.php index 99da118..8d12303 100644 --- a/admin/new-post.php +++ b/admin/new-post.php @@ -59,86 +59,13 @@
- - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -251,7 +178,7 @@
-
2018 © Company Admin
+
diff --git a/admin/new-user.php b/admin/new-user.php index 75ce2d1..c118a1b 100644 --- a/admin/new-user.php +++ b/admin/new-user.php @@ -59,86 +59,13 @@
- - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -250,7 +177,7 @@
-
2018 © Company Admin
+
diff --git a/admin/post-details.php b/admin/post-details.php index 8f3f809..b24004c 100644 --- a/admin/post-details.php +++ b/admin/post-details.php @@ -66,87 +66,13 @@
- - - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -277,7 +203,7 @@
-
2018 © Company Admin.
+
diff --git a/admin/posts.php b/admin/posts.php index 9b2ab51..7792cf3 100644 --- a/admin/posts.php +++ b/admin/posts.php @@ -62,86 +62,13 @@
- - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -290,7 +217,7 @@
-
2018 © Company Admin
+
diff --git a/admin/session-timeout.php b/admin/session-timeout.php index 50be968..35a869c 100644 --- a/admin/session-timeout.php +++ b/admin/session-timeout.php @@ -39,367 +39,13 @@
- - - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -506,7 +152,7 @@
-
2017 © Elite Admin brought to you by themedesigner.in
+
diff --git a/admin/settings.php b/admin/settings.php index 00bfd23..eec7472 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -60,86 +60,13 @@
- - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -256,7 +183,7 @@
-
2018 © Company Admin
+
diff --git a/admin/subscribers.php b/admin/subscribers.php index 120055d..5f1a6cc 100644 --- a/admin/subscribers.php +++ b/admin/subscribers.php @@ -63,86 +63,13 @@
- - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -266,7 +193,7 @@
-
2018 © Company Admin
+
diff --git a/admin/users.php b/admin/users.php index 993aac8..a63e365 100644 --- a/admin/users.php +++ b/admin/users.php @@ -64,86 +64,13 @@
- - - - - + + include_once 'includes/navbar.php'; + // + include_once 'includes/sidebar.php'; + // + ?>
@@ -323,7 +250,7 @@
-
2018 © Company Admin
+
From 4d60e36bc8d2909780c1bbd3dc61b057c8672278 Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 11:19:18 +0000 Subject: [PATCH 15/16] right sidebar theme settings --- admin/includes/theme_setting.php | 92 ++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 admin/includes/theme_setting.php diff --git a/admin/includes/theme_setting.php b/admin/includes/theme_setting.php new file mode 100644 index 0000000..03878b3 --- /dev/null +++ b/admin/includes/theme_setting.php @@ -0,0 +1,92 @@ + + \ No newline at end of file From 086828d32ed8ff0f51bf2ef614d30f1db6060ea3 Mon Sep 17 00:00:00 2001 From: MusheAbdulHakim Date: Sat, 2 Jan 2021 11:23:42 +0000 Subject: [PATCH 16/16] theme settings /right sidebar dynamically loaded --- admin/comments.php | 403 +++++++++++-------------- admin/inbox-detail.php | 47 +-- admin/inbox.php | 48 +-- admin/index.php | 619 ++++++++++++++++++-------------------- admin/new-post.php | 47 +-- admin/new-user.php | 46 +-- admin/post-details.php | 47 +-- admin/posts.php | 47 +-- admin/session-timeout.php | 73 +---- admin/settings.php | 46 +-- admin/subscribers.php | 47 +-- admin/users.php | 47 +-- 12 files changed, 476 insertions(+), 1041 deletions(-) diff --git a/admin/comments.php b/admin/comments.php index f422846..051c7f2 100644 --- a/admin/comments.php +++ b/admin/comments.php @@ -1,27 +1,27 @@ @@ -29,237 +29,192 @@ - - - - - - - Company Admin - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - -
-
-
-
- - include_once 'includes/navbar.php'; - // - include_once 'includes/sidebar.php'; - // - ?> - -
-
-
-
-

-
- -
- -
- -
- -
-
- -
- -
-
- - - - - DELETED!!

The comment has been successfully deleted.

-
' - ; - } - elseif (isset($_GET["del_error"])) { - echo - '
- - ERROR!!

There was an error during deleting this record. Please try again.

-
' - ; - } - ?> - - - - -

Recent Posts Comments ()

- No Comments Yet :( ";} - ?> - -
- - -
- '.$row["name"].' -
Blog Title : '.$row2["title"].'
- - '.$row["comment"].' - '.$row["date"].'
-
+ +
+
+
+
+ + include_once 'includes/navbar.php'; +// + include_once 'includes/sidebar.php'; +// + ?> + +
+
+
+
+

+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ + + + + DELETED!!

The comment has been successfully deleted.

+
' + ; + } + elseif (isset($_GET["del_error"])) { + echo + '
+ + ERROR!!

There was an error during deleting this record. Please try again.

+
' + ; + } + ?> + + + + +

Recent Posts Comments ()

+ No Comments Yet :( ";} + ?> + +
+ + +
+ '.$row["name"].' +
Blog Title : '.$row2["title"].'
+ + '.$row["comment"].' + '.$row["date"].'
+
- - - -
-
-
Showing 1 -
-
-
- -
-
+ +
+
+
Showing 1 -
+
+
+ +
- -
-
-
- - - -
- -
- + + + +
- - - - - - - - - - - - - - - - - + + +
+ +
+ + + + + + + + + + + + + + + + + diff --git a/admin/inbox-detail.php b/admin/inbox-detail.php index 29fb137..e0b1c64 100644 --- a/admin/inbox-detail.php +++ b/admin/inbox-detail.php @@ -149,52 +149,7 @@
- +
diff --git a/admin/inbox.php b/admin/inbox.php index 940d511..9596996 100644 --- a/admin/inbox.php +++ b/admin/inbox.php @@ -163,53 +163,7 @@
- - +
diff --git a/admin/index.php b/admin/index.php index c15c9c5..95d402a 100644 --- a/admin/index.php +++ b/admin/index.php @@ -1,384 +1,339 @@ - - - - - - - Website Admin - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - -
-
-
-
+ +
+
+
+
+ + include_once 'includes/navbar.php'; +// + include_once 'includes/sidebar.php'; +// + ?> + +
+
+
+
+

+
+ +
+ +
+ - include_once 'includes/navbar.php'; - // - include_once 'includes/sidebar.php'; - // - ?> - -
-
-
-
-

-
- -
- -
- - × - DONE!!

Your password has been successfully updated.

-
'; - } - - - ?> - - -
-
-
-
-
-
-
-
Company Blog Posts
-
-

-
-
-
40% Complete (success)
-
-
-
-
-
-
-
-
Blog Comments
-
-

-
-
-
40% Complete (success)
-
-
+ if (isset($_GET['set'])) { + echo'
+ × + DONE!!

Your password has been successfully updated.

+
'; + } + + + ?> + + +
+
+
+
+
+
+
+
Company Blog Posts
+
+

+
+
+
40% Complete (success)
-
-
-
-
Contact Messages
-
-

-
-
-
40% Complete (success)
-
-
+
+
+
+
+
+
Blog Comments
+
+

+
+
+
40% Complete (success)
-
-
-
-
Company Subscribers
-
-

-
-
-
40% Complete (success)
-
-
+
+
+
+
+
+
Contact Messages
+
+

+
+
+
40% Complete (success)
-
-
- - -
-
-
-

Recent Comments

-
-
-
- There are no comments yet :( "; - } - else{ - - $counter = 0; - $max = 3; - - while ($row2 = mysqli_fetch_array($query_comments)) { - $blogid = $row2["blogid"]; - $sql2 = "SELECT * FROM posts WHERE id='$blogid'"; - $query2 = mysqli_query($connection, $sql2); - - while (($row3 = mysqli_fetch_assoc($query2)) and ($counter < $max)) { - - echo ' - - '.$row2["name"].' -
Blog Title : '.$row3["title"].'
- - '.$row2["comment"].' - '.$row2["date"].' - '; - $counter++; - } } } - ?> -
- +
+
+
+
Company Subscribers
+
+

+
+
+
40% Complete (success)
-
- -
-
- -
-
-

Company 2018

-

Blog Posts

-
-
-

+
+
+
+ + +
+
+
+

Recent Comments

+
+
+
+ There are no comments yet :( "; + } + else{ + + $counter = 0; + $max = 3; + + while ($row2 = mysqli_fetch_array($query_comments)) { + $blogid = $row2["blogid"]; + $sql2 = "SELECT * FROM posts WHERE id='$blogid'"; + $query2 = mysqli_query($connection, $sql2); + + while (($row3 = mysqli_fetch_assoc($query2)) and ($counter < $max)) { + + echo ' + + '.$row2["name"].' +
Blog Title : '.$row3["title"].'
+ + '.$row2["comment"].' + '.$row2["date"].' + '; + $counter++; + } } } + ?> +
+
-
- - - No Posts Yet :( Upload Company's first blog post today! "; - } - else - - { - echo ' - - - - - - - - - '; - } - $counter = 0; - $max = 3; - - while (($row = mysqli_fetch_array($query_posts)) and ($counter < $max) ) - { - $postid = $row["id"]; - $sql2 = "SELECT * FROM comments WHERE blogid=$postid"; - $query2 = mysqli_query($connection, $sql2); - - echo ' - - - - - - '; - $counter++; - } - ?> - - - -
TITLEDATECOMMENTS
'.$row["title"].''.$row["date"].''.mysqli_num_rows($query2).'
- -
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/admin/new-post.php b/admin/new-post.php index 8d12303..b9faf6a 100644 --- a/admin/new-post.php +++ b/admin/new-post.php @@ -129,52 +129,7 @@
- +
diff --git a/admin/new-user.php b/admin/new-user.php index c118a1b..e4b33ac 100644 --- a/admin/new-user.php +++ b/admin/new-user.php @@ -129,51 +129,7 @@ - +
diff --git a/admin/post-details.php b/admin/post-details.php index b24004c..dd6be82 100644 --- a/admin/post-details.php +++ b/admin/post-details.php @@ -154,52 +154,7 @@
- +
diff --git a/admin/posts.php b/admin/posts.php index 7792cf3..ecc757d 100644 --- a/admin/posts.php +++ b/admin/posts.php @@ -168,52 +168,7 @@
- +
diff --git a/admin/session-timeout.php b/admin/session-timeout.php index 35a869c..4be5023 100644 --- a/admin/session-timeout.php +++ b/admin/session-timeout.php @@ -77,78 +77,7 @@
- +
diff --git a/admin/settings.php b/admin/settings.php index eec7472..2264e7b 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -135,51 +135,7 @@ - +
diff --git a/admin/subscribers.php b/admin/subscribers.php index 5f1a6cc..ecd07b6 100644 --- a/admin/subscribers.php +++ b/admin/subscribers.php @@ -144,52 +144,7 @@
- +
diff --git a/admin/users.php b/admin/users.php index a63e365..1d86f27 100644 --- a/admin/users.php +++ b/admin/users.php @@ -201,52 +201,7 @@ - +