From 4a63ffb5175c3a37b3c57937146614e3fec48419 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 16 Oct 2020 18:12:23 +0330
Subject: [PATCH 001/118] refactors and adds new tables for translation

---
 ..._28_224023_create_blog_etc_posts_table.php | 92 -------------------
 ...dd_author_and_url_blog_etc_posts_table.php | 37 --------
 ...711_add_short_desc_textrea_to_blog_etc.php | 34 -------
 ...d_parameters_blog_etc_categories_table.php | 35 -------
 ..._005400_create_hessam_categories_table.php | 51 ++++++++++
 ...ate_hessam_category_translations_table.php | 39 ++++++++
 ...10_16_010039_create_hessam_posts_table.php | 36 ++++++++
 ..._create_hessam_post_translations_table.php | 49 ++++++++++
 ...16_121230_create_hessam_comments_table.php | 46 ++++++++++
 ...8_create_hessam_uploaded_photos_table.php} | 17 +---
 ...6_124241_create_hessam_languages_table.php | 38 ++++++++
 11 files changed, 264 insertions(+), 210 deletions(-)
 delete mode 100755 migrations/2018_05_28_224023_create_blog_etc_posts_table.php
 delete mode 100644 migrations/2018_09_16_224023_add_author_and_url_blog_etc_posts_table.php
 delete mode 100644 migrations/2018_09_26_085711_add_short_desc_textrea_to_blog_etc.php
 delete mode 100644 migrations/2020_05_27_104123_add_parameters_blog_etc_categories_table.php
 create mode 100644 migrations/2020_10_16_005400_create_hessam_categories_table.php
 create mode 100644 migrations/2020_10_16_005425_create_hessam_category_translations_table.php
 create mode 100644 migrations/2020_10_16_010039_create_hessam_posts_table.php
 create mode 100644 migrations/2020_10_16_010049_create_hessam_post_translations_table.php
 create mode 100644 migrations/2020_10_16_121230_create_hessam_comments_table.php
 rename migrations/{2018_09_27_122627_create_blog_etc_uploaded_photos_table.php => 2020_10_16_121728_create_hessam_uploaded_photos_table.php} (60%)
 create mode 100644 migrations/2020_10_16_124241_create_hessam_languages_table.php

diff --git a/migrations/2018_05_28_224023_create_blog_etc_posts_table.php b/migrations/2018_05_28_224023_create_blog_etc_posts_table.php
deleted file mode 100755
index 683a076..0000000
--- a/migrations/2018_05_28_224023_create_blog_etc_posts_table.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateBlogEtcPostsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('blog_etc_posts', function (Blueprint $table) {
-            $table->increments('id');
-            $table->unsignedInteger("user_id")->index()->nullable();
-            $table->string("slug")->unique();
-
-            $table->string("title")->nullable()->default("New blog post");
-            $table->string("subtitle")->nullable()->default("");
-            $table->text("meta_desc")->nullable();
-            $table->mediumText("post_body")->nullable();
-
-            $table->string("use_view_file")->nullable()->comment("should refer to a blade file in /views/");
-
-            $table->dateTime("posted_at")->index()->nullable()->comment("Public posted at time, if this is in future then it wont appear yet");
-            $table->boolean("is_published")->default(true);
-
-            $table->string('image_large')->nullable();
-            $table->string('image_medium')->nullable();
-            $table->string('image_thumbnail')->nullable();
-
-            $table->timestamps();
-        });
-
-        Schema::create('blog_etc_categories', function (Blueprint $table) {
-            $table->increments('id');
-
-            $table->string("category_name")->nullable();
-            $table->string("slug")->unique();
-            $table->mediumText("category_description")->nullable();
-
-            $table->unsignedInteger("created_by")->nullable()->index()->comment("user id");
-
-            $table->timestamps();
-        });
-
-        Schema::create('blog_etc_post_categories', function (Blueprint $table) {
-            $table->increments('id');
-
-            $table->unsignedInteger("blog_etc_post_id")->index();
-            $table->foreign('blog_etc_post_id')->references('id')->on('blog_etc_posts')->onDelete("cascade");
-
-            $table->unsignedInteger("blog_etc_category_id")->index();
-            $table->foreign('blog_etc_category_id')->references('id')->on('blog_etc_categories')->onDelete("cascade");
-        });
-
-
-        Schema::create('blog_etc_comments', function (Blueprint $table) {
-            $table->increments('id');
-
-            $table->unsignedInteger("blog_etc_post_id")->index();
-            $table->foreign('blog_etc_post_id')->references('id')->on('blog_etc_posts')->onDelete("cascade");
-            $table->unsignedInteger("user_id")->nullable()->index()->comment("if user was logged in");
-
-            $table->string("ip")->nullable()->comment("if enabled in the config file");
-            $table->string("author_name")->nullable()->comment("if not logged in");
-
-            $table->text("comment")->comment("the comment body");
-
-            $table->boolean("approved")->default(true);
-
-            $table->timestamps();
-        });
-
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('blog_etc_post_categories');
-        Schema::dropIfExists('blog_etc_categories');
-        Schema::dropIfExists('blog_etc_posts');
-    }
-}
diff --git a/migrations/2018_09_16_224023_add_author_and_url_blog_etc_posts_table.php b/migrations/2018_09_16_224023_add_author_and_url_blog_etc_posts_table.php
deleted file mode 100644
index 67cec73..0000000
--- a/migrations/2018_09_16_224023_add_author_and_url_blog_etc_posts_table.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddAuthorAndUrlBlogEtcPostsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('blog_etc_comments', function (Blueprint $table) {
-            $table->string("author_email")->nullable();
-            $table->string("author_website")->nullable();
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-
-        Schema::table('blog_etc_comments', function (Blueprint $table) {
-            $table->dropColumn("author_email");
-            $table->dropColumn("author_website");
-        });
-    }
-}
-
diff --git a/migrations/2018_09_26_085711_add_short_desc_textrea_to_blog_etc.php b/migrations/2018_09_26_085711_add_short_desc_textrea_to_blog_etc.php
deleted file mode 100644
index e24feed..0000000
--- a/migrations/2018_09_26_085711_add_short_desc_textrea_to_blog_etc.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddShortDescTextreaToBlogEtc extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('blog_etc_posts', function (Blueprint $table) {
-            $table->text("short_description")->nullable();
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-
-        Schema::table('blog_etc_posts', function (Blueprint $table) {
-            $table->dropColumn("short_description");
-        });
-    }
-}
diff --git a/migrations/2020_05_27_104123_add_parameters_blog_etc_categories_table.php b/migrations/2020_05_27_104123_add_parameters_blog_etc_categories_table.php
deleted file mode 100644
index 1fc8255..0000000
--- a/migrations/2020_05_27_104123_add_parameters_blog_etc_categories_table.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddParametersBlogEtcCategoriesTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('blog_etc_categories', function (Blueprint $table) {
-            $table->integer('parent_id')->nullable()->default(0);
-            $table->integer('lft')->nullable();
-            $table->integer('rgt')->nullable();
-            $table->integer('depth')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('blog_etc_categories', function (Blueprint $table) {
-            //
-        });
-    }
-}
diff --git a/migrations/2020_10_16_005400_create_hessam_categories_table.php b/migrations/2020_10_16_005400_create_hessam_categories_table.php
new file mode 100644
index 0000000..c4776e7
--- /dev/null
+++ b/migrations/2020_10_16_005400_create_hessam_categories_table.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHessamCategoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('hessam_categories', function (Blueprint $table) {
+            $table->increments('category_id');
+
+            $table->unsignedInteger("created_by")->nullable()->index()->comment("user id");
+
+            //columns related to multi-level categories
+            $table->integer('parent_id')->nullable()->default(0);
+            $table->integer('lft')->nullable();
+            $table->integer('rgt')->nullable();
+            $table->integer('depth')->nullable();
+
+            $table->timestamps();
+        });
+
+        Schema::create('hessam_post_categories', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->unsignedInteger("post_id")->index();
+            $table->foreign('post_id')->references('post_id')->on('hessam_posts')->onDelete("cascade");
+
+            $table->unsignedInteger("category_id")->index();
+            $table->foreign('category_id')->references('category_id')->on('hessam_categories')->onDelete("cascade");
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('hessam_categories');
+    }
+}
diff --git a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
new file mode 100644
index 0000000..8ff802a
--- /dev/null
+++ b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHessamCategoryTranslationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('hessam_category_translations', function (Blueprint $table) {
+            $table->increments('category_id');
+
+            $table->string("category_name")->nullable();
+            $table->string("slug")->unique();
+            $table->mediumText("category_description")->nullable();
+
+            $table->unsignedInteger("lang_id")->index();
+            $table->foreign('lang_id')->references('lang_id')->on('hessam_languages');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('hessam_category_translations');
+    }
+}
diff --git a/migrations/2020_10_16_010039_create_hessam_posts_table.php b/migrations/2020_10_16_010039_create_hessam_posts_table.php
new file mode 100644
index 0000000..0565aa6
--- /dev/null
+++ b/migrations/2020_10_16_010039_create_hessam_posts_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHessamPostsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('hessam_posts', function (Blueprint $table) {
+            $table->increments('post_id');
+            $table->unsignedInteger("user_id")->index()->nullable();
+
+            $table->dateTime("posted_at")->index()->nullable()->comment("Public posted at time, if this is in future then it wont appear yet");
+            $table->boolean("is_published")->default(true);
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('hessam_posts');
+    }
+}
diff --git a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
new file mode 100644
index 0000000..fd5d295
--- /dev/null
+++ b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
@@ -0,0 +1,49 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHessamPostTranslationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('hessam_post_translations', function (Blueprint $table) {
+            $table->increments('post_id');
+
+            $table->string("slug")->unique();
+            $table->string("title")->nullable()->default("New blog post");
+            $table->string("subtitle")->nullable()->default("");
+            $table->text("meta_desc")->nullable();
+            $table->string("seo_title")->nullable();
+            $table->mediumText("post_body")->nullable();
+            $table->text("short_description")->nullable();
+
+            $table->string("use_view_file")->nullable()->comment("should refer to a blade file in /views/");
+
+            $table->string('image_large')->nullable();
+            $table->string('image_medium')->nullable();
+            $table->string('image_thumbnail')->nullable();
+
+            $table->unsignedInteger("lang_id")->index();
+            $table->foreign('lang_id')->references('lang_id')->on('hessam_languages');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('hessam_post_translations');
+    }
+}
diff --git a/migrations/2020_10_16_121230_create_hessam_comments_table.php b/migrations/2020_10_16_121230_create_hessam_comments_table.php
new file mode 100644
index 0000000..297b5b6
--- /dev/null
+++ b/migrations/2020_10_16_121230_create_hessam_comments_table.php
@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHessamCommentsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('hessam_comments', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->unsignedInteger("post_id")->index();
+            $table->foreign('post_id')->references('post_id')->on('hessam_posts');
+            $table->unsignedInteger("user_id")->nullable()->index()->comment("if user was logged in");
+
+            $table->string("ip")->nullable()->comment("if enabled in the config file");
+            $table->string("author_name")->nullable()->comment("if not logged in");
+
+            $table->text("comment")->comment("the comment body");
+
+            $table->boolean("approved")->default(true);
+
+            $table->string("author_email")->nullable();
+            $table->string("author_website")->nullable();
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('hessam_comments');
+    }
+}
diff --git a/migrations/2018_09_27_122627_create_blog_etc_uploaded_photos_table.php b/migrations/2020_10_16_121728_create_hessam_uploaded_photos_table.php
similarity index 60%
rename from migrations/2018_09_27_122627_create_blog_etc_uploaded_photos_table.php
rename to migrations/2020_10_16_121728_create_hessam_uploaded_photos_table.php
index 5098b13..66a1d5c 100644
--- a/migrations/2018_09_27_122627_create_blog_etc_uploaded_photos_table.php
+++ b/migrations/2020_10_16_121728_create_hessam_uploaded_photos_table.php
@@ -1,10 +1,10 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
-class CreateBlogEtcUploadedPhotosTable extends Migration
+class CreateHessamUploadedPhotosTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateBlogEtcUploadedPhotosTable extends Migration
      */
     public function up()
     {
-        Schema::create('blog_etc_uploaded_photos', function (Blueprint $table) {
+        Schema::create('hessam_uploaded_photos', function (Blueprint $table) {
             $table->increments('id');
             $table->text("uploaded_images")->nullable();
             $table->string("image_title")->nullable();
@@ -21,9 +21,6 @@ public function up()
             $table->unsignedInteger("uploader_id")->nullable()->index();
             $table->timestamps();
         });
-        Schema::table("blog_etc_posts",function(Blueprint $table) {
-            $table->string("seo_title")->nullable();
-        });
     }
 
     /**
@@ -33,10 +30,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('blog_etc_uploaded_photos');
-
-        Schema::table("blog_etc_posts",function(Blueprint $table) {
-            $table->dropColumn("seo_title");
-        });
+        Schema::dropIfExists('hessam_uploaded_photos');
     }
 }
diff --git a/migrations/2020_10_16_124241_create_hessam_languages_table.php b/migrations/2020_10_16_124241_create_hessam_languages_table.php
new file mode 100644
index 0000000..b9894e8
--- /dev/null
+++ b/migrations/2020_10_16_124241_create_hessam_languages_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHessamLanguagesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('hessam_languages', function (Blueprint $table) {
+            $table->increments('lang_id');
+
+            $table->string("name")->unique();
+            $table->string("locale")->unique();
+            $table->string("iso_code")->unique();
+            $table->string("date_format")->unique();
+            $table->boolean("active")->default(true);
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('hessam_languages');
+    }
+}

From 2c6c8ad0dff44b75512515a9065026285027ab2a Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 16 Oct 2020 18:34:36 +0330
Subject: [PATCH 002/118] model classes refactor

---
 src/BlogEtcServiceProvider.php                | 16 ++++++++------
 src/Captcha/CaptchaAbstract.php               | 10 ++++-----
 src/Controllers/BlogEtcAdminController.php    | 22 +++++++++----------
 .../BlogEtcCategoryAdminController.php        | 20 ++++++++---------
 .../BlogEtcCommentWriterController.php        | 10 ++++-----
 .../BlogEtcCommentsAdminController.php        |  8 +++----
 .../BlogEtcImageUploadController.php          |  6 ++---
 src/Controllers/BlogEtcReaderController.php   | 14 ++++++------
 src/Controllers/BlogEtcRssFeedController.php  |  6 ++---
 src/Events/BlogPostAdded.php                  |  8 +++----
 src/Events/BlogPostEdited.php                 |  8 +++----
 src/Events/BlogPostWillBeDeleted.php          |  8 +++----
 src/Events/CategoryAdded.php                  |  8 +++----
 src/Events/CategoryEdited.php                 |  8 +++----
 src/Events/CategoryWillBeDeleted.php          |  8 +++----
 src/Events/CommentAdded.php                   | 14 ++++++------
 src/Events/CommentApproved.php                |  8 +++----
 src/Events/CommentWillBeDeleted.php           |  8 +++----
 src/Events/UploadedImage.php                  |  8 +++----
 ...BlogEtcCategory.php => HessamCategory.php} |  8 +++----
 .../{BlogEtcComment.php => HessamComment.php} |  6 ++---
 .../{BlogEtcPost.php => HessamPost.php}       | 12 +++++-----
 ...oadedPhoto.php => HessamUploadedPhoto.php} |  2 +-
 src/Requests/Traits/HasCategoriesTrait.php    |  4 ++--
 src/Requests/UpdateBlogEtcCategoryRequest.php |  2 +-
 src/Requests/UpdateBlogEtcPostRequest.php     |  2 +-
 src/Traits/UploadFileTrait.php                |  6 ++---
 src/Views/blogetc/search.blade.php            |  2 +-
 .../blogetc/sitewide/random_posts.blade.php   |  2 +-
 .../blogetc/sitewide/recent_posts.blade.php   |  2 +-
 .../sitewide/show_all_categories.blade.php    |  2 +-
 .../blogetc_admin/layouts/sidebar.blade.php   |  8 +++----
 .../blogetc_admin/posts/add_post.blade.php    |  2 +-
 src/Views/blogetc_admin/posts/form.blade.php  |  2 +-
 tests/MainTest.php                            | 20 ++++++++---------
 35 files changed, 141 insertions(+), 139 deletions(-)
 rename src/Models/{BlogEtcCategory.php => HessamCategory.php} (84%)
 rename src/Models/{BlogEtcComment.php => HessamComment.php} (91%)
 rename src/Models/{BlogEtcPost.php => HessamPost.php} (93%)
 rename src/Models/{BlogEtcUploadedPhoto.php => HessamUploadedPhoto.php} (88%)

diff --git a/src/BlogEtcServiceProvider.php b/src/BlogEtcServiceProvider.php
index a8ed524..9b92d6f 100755
--- a/src/BlogEtcServiceProvider.php
+++ b/src/BlogEtcServiceProvider.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use Swis\Laravel\Fulltext\ModelObserver;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 class BlogEtcServiceProvider extends ServiceProvider
 {
@@ -18,7 +18,7 @@ public function boot()
 
         if (config("blogetc.search.search_enabled") == false) {
             // if search is disabled, don't allow it to sync.
-            ModelObserver::disableSyncingFor(BlogEtcPost::class);
+            ModelObserver::disableSyncingFor(HessamPost::class);
         }
 
         if (config("blogetc.include_default_routes", true)) {
@@ -27,11 +27,13 @@ public function boot()
 
 
         foreach ([
-                     '2018_05_28_224023_create_blog_etc_posts_table.php',
-                     '2018_09_16_224023_add_author_and_url_blog_etc_posts_table.php',
-                     '2018_09_26_085711_add_short_desc_textrea_to_blog_etc.php',
-                     '2018_09_27_122627_create_blog_etc_uploaded_photos_table.php',
-                     '2020_05_27_104123_add_parameters_blog_etc_categories_table.php'
+                     '2020_10_16_005400_create_hessam_categories_table.php',
+                     '2020_10_16_005425_create_hessam_category_translations_table.php',
+                     '2020_10_16_010039_create_hessam_posts_table.php',
+                     '2020_10_16_010049_create_hessam_post_translations_table.php',
+                     '2020_10_16_121230_create_hessam_comments_table.php',
+                     '2020_10_16_121728_create_hessam_uploaded_photos_table.php',
+                     '2020_10_16_124241_create_hessam_languages_table.php'
                  ] as $file) {
 
             $this->publishes([
diff --git a/src/Captcha/CaptchaAbstract.php b/src/Captcha/CaptchaAbstract.php
index c11dcf1..bfacc6a 100644
--- a/src/Captcha/CaptchaAbstract.php
+++ b/src/Captcha/CaptchaAbstract.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Http\Request;
 use WebDevEtc\BlogEtc\Interfaces\CaptchaInterface;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 abstract class CaptchaAbstract implements CaptchaInterface
 {
@@ -12,11 +12,11 @@ abstract class CaptchaAbstract implements CaptchaInterface
      * executed when viewing single post
      *
      * @param Request $request
-     * @param BlogEtcPost $blogEtcPost
+     * @param HessamPost $blogEtcPost
      *
      * @return void
      */
-    public function runCaptchaBeforeShowingPosts(Request $request, BlogEtcPost $blogEtcPost)
+    public function runCaptchaBeforeShowingPosts(Request $request, HessamPost $blogEtcPost)
     {
         // no code here to run! Maybe in your subclass you can make use of this?
         /*
@@ -37,11 +37,11 @@ public function runCaptchaBeforeShowingPosts(Request $request, BlogEtcPost $blog
      * executed when posting new comment
      *
      * @param Request $request
-     * @param BlogEtcPost $blogEtcPost
+     * @param HessamPost $blogEtcPost
      *
      * @return void
      */
-    public function runCaptchaBeforeAddingComment(Request $request, BlogEtcPost $blogEtcPost)
+    public function runCaptchaBeforeAddingComment(Request $request, HessamPost $blogEtcPost)
     {
         // no code here to run! Maybe in your subclass you can make use of this?
     }
diff --git a/src/Controllers/BlogEtcAdminController.php b/src/Controllers/BlogEtcAdminController.php
index 9f93a30..891d3c4 100755
--- a/src/Controllers/BlogEtcAdminController.php
+++ b/src/Controllers/BlogEtcAdminController.php
@@ -11,8 +11,8 @@
 use WebDevEtc\BlogEtc\Events\BlogPostWillBeDeleted;
 use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
-use WebDevEtc\BlogEtc\Models\BlogEtcUploadedPhoto;
+use WebDevEtc\BlogEtc\Models\HessamPost;
+use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
 use WebDevEtc\BlogEtc\Requests\CreateBlogEtcPostRequest;
 use WebDevEtc\BlogEtc\Requests\DeleteBlogEtcPostRequest;
 use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcPostRequest;
@@ -46,7 +46,7 @@ public function __construct()
      */
     public function index()
     {
-        $posts = BlogEtcPost::orderBy("posted_at", "desc")
+        $posts = HessamPost::orderBy("posted_at", "desc")
             ->paginate(10);
 
         return view("blogetc_admin::index", ['posts'=>$posts]);
@@ -70,7 +70,7 @@ public function create_post()
      */
     public function store_post(CreateBlogEtcPostRequest $request)
     {
-        $new_blog_post = new BlogEtcPost($request->all());
+        $new_blog_post = new HessamPost($request->all());
 
         $this->processUploadedImages($request, $new_blog_post);
 
@@ -96,7 +96,7 @@ public function store_post(CreateBlogEtcPostRequest $request)
      */
     public function edit_post( $blogPostId)
     {
-        $post = BlogEtcPost::findOrFail($blogPostId);
+        $post = HessamPost::findOrFail($blogPostId);
         return view("blogetc_admin::posts.edit_post")->withPost($post);
     }
 
@@ -110,8 +110,8 @@ public function edit_post( $blogPostId)
      */
     public function update_post(UpdateBlogEtcPostRequest $request, $blogPostId)
     {
-        /** @var BlogEtcPost $post */
-        $post = BlogEtcPost::findOrFail($blogPostId);
+        /** @var HessamPost $post */
+        $post = HessamPost::findOrFail($blogPostId);
         $post->fill($request->all());
 
         $this->processUploadedImages($request, $post);
@@ -128,7 +128,7 @@ public function update_post(UpdateBlogEtcPostRequest $request, $blogPostId)
 
     public function remove_photo($postSlug)
     {
-        $post = BlogEtcPost::where("slug", $postSlug)->firstOrFail();
+        $post = HessamPost::where("slug", $postSlug)->firstOrFail();
 
         $path = public_path('/' . config("blogetc.blog_upload_dir"));
         if (!$this->checked_blog_image_dir_is_writable) {
@@ -171,7 +171,7 @@ public function remove_photo($postSlug)
     public function destroy_post(DeleteBlogEtcPostRequest $request, $blogPostId)
     {
 
-        $post = BlogEtcPost::findOrFail($blogPostId);
+        $post = HessamPost::findOrFail($blogPostId);
         event(new BlogPostWillBeDeleted($post));
 
         $post->delete();
@@ -192,7 +192,7 @@ public function destroy_post(DeleteBlogEtcPostRequest $request, $blogPostId)
      * @throws \Exception
      * @todo - next full release, tidy this up!
      */
-    protected function processUploadedImages(BaseRequestInterface $request, BlogEtcPost $new_blog_post)
+    protected function processUploadedImages(BaseRequestInterface $request, HessamPost $new_blog_post)
     {
         if (!config("blogetc.image_upload_enabled")) {
             // image upload was disabled
@@ -221,7 +221,7 @@ protected function processUploadedImages(BaseRequestInterface $request, BlogEtcP
         // store the image upload.
         // todo: link this to the blogetc_post row.
         if (count(array_filter($uploaded_image_details))>0) {
-            BlogEtcUploadedPhoto::create([
+            HessamUploadedPhoto::create([
                 'source' => "BlogFeaturedImage",
                 'uploaded_images' => $uploaded_image_details,
             ]);
diff --git a/src/Controllers/BlogEtcCategoryAdminController.php b/src/Controllers/BlogEtcCategoryAdminController.php
index 827222c..2ea8d58 100755
--- a/src/Controllers/BlogEtcCategoryAdminController.php
+++ b/src/Controllers/BlogEtcCategoryAdminController.php
@@ -8,7 +8,7 @@
 use WebDevEtc\BlogEtc\Events\CategoryWillBeDeleted;
 use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\BlogEtcCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategory;
 use WebDevEtc\BlogEtc\Requests\DeleteBlogEtcCategoryRequest;
 use WebDevEtc\BlogEtc\Requests\StoreBlogEtcCategoryRequest;
 use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcCategoryRequest;
@@ -34,7 +34,7 @@ public function __construct()
      */
     public function index(){
 
-        $categories = BlogEtcCategory::orderBy("category_name")->paginate(25);
+        $categories = HessamCategory::orderBy("category_name")->paginate(25);
         return view("blogetc_admin::categories.index")->withCategories($categories);
     }
 
@@ -45,8 +45,8 @@ public function index(){
     public function create_category(){
 
         return view("blogetc_admin::categories.add_category",[
-            'category' => new \WebDevEtc\BlogEtc\Models\BlogEtcCategory(),
-            'categories_list' => BlogEtcCategory::orderBy("category_name")->get()
+            'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
+            'categories_list' => HessamCategory::orderBy("category_name")->get()
         ]);
 
     }
@@ -61,7 +61,7 @@ public function store_category(StoreBlogEtcCategoryRequest $request){
         if ($request['parent_id']== 0){
             $request['parent_id'] = null;
         }
-        $new_category = BlogEtcCategory::create($request->all());
+        $new_category = HessamCategory::create($request->all());
 
         Helpers::flash_message("Saved new category");
 
@@ -75,9 +75,9 @@ public function store_category(StoreBlogEtcCategoryRequest $request){
      * @return mixed
      */
     public function edit_category($categoryId){
-        $category = BlogEtcCategory::findOrFail($categoryId);
+        $category = HessamCategory::findOrFail($categoryId);
         return view("blogetc_admin::categories.edit_category",[
-            'categories_list' => BlogEtcCategory::orderBy("category_name")->get()
+            'categories_list' => HessamCategory::orderBy("category_name")->get()
         ])->withCategory($category);
     }
 
@@ -89,8 +89,8 @@ public function edit_category($categoryId){
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function update_category(UpdateBlogEtcCategoryRequest $request, $categoryId){
-        /** @var BlogEtcCategory $category */
-        $category = BlogEtcCategory::findOrFail($categoryId);
+        /** @var HessamCategory $category */
+        $category = HessamCategory::findOrFail($categoryId);
         $category->fill($request->all());
         $category->save();
 
@@ -111,7 +111,7 @@ public function destroy_category(DeleteBlogEtcCategoryRequest $request, $categor
         /* Please keep this in, so code inspections don't say $request was unused. Of course it might now get marked as left/right parts are equal */
         $request=$request;
 
-        $category = BlogEtcCategory::findOrFail($categoryId);
+        $category = HessamCategory::findOrFail($categoryId);
         event(new CategoryWillBeDeleted($category));
         $category->delete();
 
diff --git a/src/Controllers/BlogEtcCommentWriterController.php b/src/Controllers/BlogEtcCommentWriterController.php
index d033439..a1ba079 100755
--- a/src/Controllers/BlogEtcCommentWriterController.php
+++ b/src/Controllers/BlogEtcCommentWriterController.php
@@ -7,8 +7,8 @@
 use WebDevEtc\BlogEtc\Captcha\CaptchaAbstract;
 use WebDevEtc\BlogEtc\Captcha\UsesCaptcha;
 use WebDevEtc\BlogEtc\Events\CommentAdded;
-use WebDevEtc\BlogEtc\Models\BlogEtcComment;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamComment;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Requests\AddNewCommentRequest;
 
 /**
@@ -35,7 +35,7 @@ public function addNewComment(AddNewCommentRequest $request, $blog_post_slug)
             throw new \RuntimeException("Built in comments are disabled");
         }
 
-        $blog_post = BlogEtcPost::where("slug", $blog_post_slug)
+        $blog_post = HessamPost::where("slug", $blog_post_slug)
             ->firstOrFail();
 
         /** @var CaptchaAbstract $captcha */
@@ -57,11 +57,11 @@ public function addNewComment(AddNewCommentRequest $request, $blog_post_slug)
     /**
      * @param AddNewCommentRequest $request
      * @param $blog_post
-     * @return BlogEtcComment
+     * @return HessamComment
      */
     protected function createNewComment(AddNewCommentRequest $request, $blog_post)
     {
-        $new_comment = new BlogEtcComment($request->all());
+        $new_comment = new HessamComment($request->all());
 
         if (config("blogetc.comments.save_ip_address")) {
             $new_comment->ip = $request->ip();
diff --git a/src/Controllers/BlogEtcCommentsAdminController.php b/src/Controllers/BlogEtcCommentsAdminController.php
index 3557aed..de3a638 100755
--- a/src/Controllers/BlogEtcCommentsAdminController.php
+++ b/src/Controllers/BlogEtcCommentsAdminController.php
@@ -8,7 +8,7 @@
 use WebDevEtc\BlogEtc\Events\CommentWillBeDeleted;
 use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\BlogEtcComment;
+use WebDevEtc\BlogEtc\Models\HessamComment;
 
 /**
  * Class BlogEtcCommentsAdminController
@@ -32,7 +32,7 @@ public function __construct()
      */
     public function index(Request $request)
     {
-        $comments = BlogEtcComment::withoutGlobalScopes()->orderBy("created_at", "desc")
+        $comments = HessamComment::withoutGlobalScopes()->orderBy("created_at", "desc")
             ->with("post");
 
         if ($request->get("waiting_for_approval")) {
@@ -54,7 +54,7 @@ public function index(Request $request)
      */
     public function approve($blogCommentId)
     {
-        $comment = BlogEtcComment::withoutGlobalScopes()->findOrFail($blogCommentId);
+        $comment = HessamComment::withoutGlobalScopes()->findOrFail($blogCommentId);
         $comment->approved = true;
         $comment->save();
 
@@ -73,7 +73,7 @@ public function approve($blogCommentId)
      */
     public function destroy($blogCommentId)
     {
-        $comment = BlogEtcComment::withoutGlobalScopes()->findOrFail($blogCommentId);
+        $comment = HessamComment::withoutGlobalScopes()->findOrFail($blogCommentId);
         event(new CommentWillBeDeleted($comment));
 
         $comment->delete();
diff --git a/src/Controllers/BlogEtcImageUploadController.php b/src/Controllers/BlogEtcImageUploadController.php
index de80e75..72a2295 100755
--- a/src/Controllers/BlogEtcImageUploadController.php
+++ b/src/Controllers/BlogEtcImageUploadController.php
@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\BlogEtcUploadedPhoto;
+use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
 use File;
 use WebDevEtc\BlogEtc\Requests\UploadImageRequest;
 use WebDevEtc\BlogEtc\Traits\UploadFileTrait;
@@ -46,7 +46,7 @@ public function __construct()
 
     public function index()
     {
-        return view("blogetc_admin::imageupload.index", ['uploaded_photos' => BlogEtcUploadedPhoto::orderBy("id", "desc")->paginate(10)]);
+        return view("blogetc_admin::imageupload.index", ['uploaded_photos' => HessamUploadedPhoto::orderBy("id", "desc")->paginate(10)]);
     }
 
     /**
@@ -112,7 +112,7 @@ protected function processUploadedImages(UploadImageRequest $request)
 
 
         // store the image upload.
-        BlogEtcUploadedPhoto::create([
+        HessamUploadedPhoto::create([
             'image_title' => $request->get("image_title"),
             'source' => "ImageUpload",
             'uploader_id' => optional(\Auth::user())->id,
diff --git a/src/Controllers/BlogEtcReaderController.php b/src/Controllers/BlogEtcReaderController.php
index 242a437..8482430 100755
--- a/src/Controllers/BlogEtcReaderController.php
+++ b/src/Controllers/BlogEtcReaderController.php
@@ -7,8 +7,8 @@
 use Illuminate\Http\Request;
 use Swis\Laravel\Fulltext\Search;
 use WebDevEtc\BlogEtc\Captcha\UsesCaptcha;
-use WebDevEtc\BlogEtc\Models\BlogEtcCategory;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamCategory;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 /**
  * Class BlogEtcReaderController
@@ -33,7 +33,7 @@ public function index($category_slug = null)
 
         $categoryChain = null;
         if ($category_slug) {
-            $category = BlogEtcCategory::where("slug", $category_slug)->firstOrFail();
+            $category = HessamCategory::where("slug", $category_slug)->firstOrFail();
             $categoryChain = $category->getAncestorsAndSelf();
             $posts = $category->posts()->where("blog_etc_post_categories.blog_etc_category_id", $category->id);
 
@@ -42,13 +42,13 @@ public function index($category_slug = null)
             \View::share('blogetc_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
             $title = 'Posts in ' . $category->category_name . " category"; // hardcode title here...
         } else {
-            $posts = BlogEtcPost::query();
+            $posts = HessamPost::query();
         }
 
         $posts = $posts->where('is_published', '=', 1)->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'))->orderBy("posted_at", "desc")->paginate(config("blogetc.per_page", 10));
 
         //load categories in 3 levels
-        $rootList = BlogEtcCategory::where('parent_id' ,'=' , null)->get();
+        $rootList = HessamCategory::where('parent_id' ,'=' , null)->get();
         for($i = 0 ; sizeof($rootList) > $i ; $i++){
             $rootList[$i]->loadSiblings();
             for ($j = 0 ; sizeof($rootList[$i]->siblings) > $j; $j++){
@@ -82,7 +82,7 @@ public function search(Request $request)
 
         \View::share("title", "Search results for " . e($query));
 
-        $categories = BlogEtcCategory::all();
+        $categories = HessamCategory::all();
 
         return view("blogetc::search", [
                 'categories' => $categories,
@@ -115,7 +115,7 @@ public function view_category($hierarchy)
     public function viewSinglePost(Request $request, $blogPostSlug)
     {
         // the published_at + is_published are handled by BlogEtcPublishedScope, and don't take effect if the logged in user can manage log posts
-        $blog_post = BlogEtcPost::where("slug", $blogPostSlug)
+        $blog_post = HessamPost::where("slug", $blogPostSlug)
             ->firstOrFail();
 
         if ($captcha = $this->getCaptchaObject()) {
diff --git a/src/Controllers/BlogEtcRssFeedController.php b/src/Controllers/BlogEtcRssFeedController.php
index 2b0ada9..c361f18 100755
--- a/src/Controllers/BlogEtcRssFeedController.php
+++ b/src/Controllers/BlogEtcRssFeedController.php
@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Laravelium\Feed\Feed;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Requests\FeedRequest;
 
 /**
@@ -38,14 +38,14 @@ protected function setupFeed(Feed $feed, $posts)
      */
     protected function makeFreshFeed(Feed $feed)
     {
-        $posts = BlogEtcPost::orderBy("posted_at", "desc")
+        $posts = HessamPost::orderBy("posted_at", "desc")
             ->limit(config("blogetc.rssfeed.posts_to_show_in_rss_feed", 10))
             ->with("author")
             ->get();
 
         $this->setupFeed($feed, $posts);
 
-        /** @var BlogEtcPost $post */
+        /** @var HessamPost $post */
         foreach ($posts as $post) {
             $feed->add($post->title,
                 $post->author_string(),
diff --git a/src/Events/BlogPostAdded.php b/src/Events/BlogPostAdded.php
index d0bfb21..081a6fc 100644
--- a/src/Events/BlogPostAdded.php
+++ b/src/Events/BlogPostAdded.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 /**
  * Class BlogPostAdded
@@ -15,14 +15,14 @@ class BlogPostAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcPost */
+    /** @var  HessamPost */
     public $blogEtcPost;
 
     /**
      * BlogPostAdded constructor.
-     * @param BlogEtcPost $blogEtcPost
+     * @param HessamPost $blogEtcPost
      */
-    public function __construct(BlogEtcPost $blogEtcPost)
+    public function __construct(HessamPost $blogEtcPost)
     {
         $this->blogEtcPost=$blogEtcPost;
     }
diff --git a/src/Events/BlogPostEdited.php b/src/Events/BlogPostEdited.php
index 3bade22..c19f366 100644
--- a/src/Events/BlogPostEdited.php
+++ b/src/Events/BlogPostEdited.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 /**
  * Class BlogPostEdited
@@ -15,14 +15,14 @@ class BlogPostEdited
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcPost */
+    /** @var  HessamPost */
     public $blogEtcPost;
 
     /**
      * BlogPostEdited constructor.
-     * @param BlogEtcPost $blogEtcPost
+     * @param HessamPost $blogEtcPost
      */
-    public function __construct(BlogEtcPost $blogEtcPost)
+    public function __construct(HessamPost $blogEtcPost)
     {
         $this->blogEtcPost=$blogEtcPost;
     }
diff --git a/src/Events/BlogPostWillBeDeleted.php b/src/Events/BlogPostWillBeDeleted.php
index 3e1f332..3770200 100644
--- a/src/Events/BlogPostWillBeDeleted.php
+++ b/src/Events/BlogPostWillBeDeleted.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 /**
  * Class BlogPostWillBeDeleted
@@ -15,14 +15,14 @@ class BlogPostWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcPost */
+    /** @var  HessamPost */
     public $blogEtcPost;
 
     /**
      * BlogPostWillBeDeleted constructor.
-     * @param BlogEtcPost $blogEtcPost
+     * @param HessamPost $blogEtcPost
      */
-    public function __construct(BlogEtcPost $blogEtcPost)
+    public function __construct(HessamPost $blogEtcPost)
     {
         $this->blogEtcPost=$blogEtcPost;
     }
diff --git a/src/Events/CategoryAdded.php b/src/Events/CategoryAdded.php
index 825339e..b5b23e3 100644
--- a/src/Events/CategoryAdded.php
+++ b/src/Events/CategoryAdded.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategory;
 
 /**
  * Class CategoryAdded
@@ -15,14 +15,14 @@ class CategoryAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcCategory */
+    /** @var  HessamCategory */
     public $blogEtcCategory;
 
     /**
      * CategoryAdded constructor.
-     * @param BlogEtcCategory $blogEtcCategory
+     * @param HessamCategory $blogEtcCategory
      */
-    public function __construct(BlogEtcCategory $blogEtcCategory)
+    public function __construct(HessamCategory $blogEtcCategory)
     {
         $this->blogEtcCategory=$blogEtcCategory;
     }
diff --git a/src/Events/CategoryEdited.php b/src/Events/CategoryEdited.php
index 9fe3ef6..e175397 100644
--- a/src/Events/CategoryEdited.php
+++ b/src/Events/CategoryEdited.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategory;
 
 /**
  * Class CategoryEdited
@@ -15,14 +15,14 @@ class CategoryEdited
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcCategory */
+    /** @var  HessamCategory */
     public $blogEtcCategory;
 
     /**
      * CategoryEdited constructor.
-     * @param BlogEtcCategory $blogEtcCategory
+     * @param HessamCategory $blogEtcCategory
      */
-    public function __construct(BlogEtcCategory $blogEtcCategory)
+    public function __construct(HessamCategory $blogEtcCategory)
     {
         $this->blogEtcCategory=$blogEtcCategory;
     }
diff --git a/src/Events/CategoryWillBeDeleted.php b/src/Events/CategoryWillBeDeleted.php
index 980d233..299297c 100644
--- a/src/Events/CategoryWillBeDeleted.php
+++ b/src/Events/CategoryWillBeDeleted.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategory;
 
 /**
  * Class CategoryWillBeDeleted
@@ -15,14 +15,14 @@ class CategoryWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcCategory */
+    /** @var  HessamCategory */
     public $blogEtcCategory;
 
     /**
      * CategoryWillBeDeleted constructor.
-     * @param BlogEtcCategory $blogEtcCategory
+     * @param HessamCategory $blogEtcCategory
      */
-    public function __construct(BlogEtcCategory $blogEtcCategory)
+    public function __construct(HessamCategory $blogEtcCategory)
     {
         $this->blogEtcCategory=$blogEtcCategory;
     }
diff --git a/src/Events/CommentAdded.php b/src/Events/CommentAdded.php
index dcb383c..60b196e 100644
--- a/src/Events/CommentAdded.php
+++ b/src/Events/CommentAdded.php
@@ -5,8 +5,8 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcComment;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamComment;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 /**
  * Class CommentAdded
@@ -16,17 +16,17 @@ class CommentAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcPost */
+    /** @var  HessamPost */
     public $blogEtcPost;
-    /** @var  BlogEtcComment */
+    /** @var  HessamComment */
     public $newComment;
 
     /**
      * CommentAdded constructor.
-     * @param BlogEtcPost $blogEtcPost
-     * @param BlogEtcComment $newComment
+     * @param HessamPost $blogEtcPost
+     * @param HessamComment $newComment
      */
-    public function __construct(BlogEtcPost $blogEtcPost, BlogEtcComment $newComment)
+    public function __construct(HessamPost $blogEtcPost, HessamComment $newComment)
     {
         $this->blogEtcPost=$blogEtcPost;
         $this->newComment=$newComment;
diff --git a/src/Events/CommentApproved.php b/src/Events/CommentApproved.php
index 43c9351..e712028 100644
--- a/src/Events/CommentApproved.php
+++ b/src/Events/CommentApproved.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcComment;
+use WebDevEtc\BlogEtc\Models\HessamComment;
 
 /**
  * Class CommentApproved
@@ -15,14 +15,14 @@ class CommentApproved
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcComment */
+    /** @var  HessamComment */
     public $comment;
 
     /**
      * CommentApproved constructor.
-     * @param BlogEtcComment $comment
+     * @param HessamComment $comment
      */
-    public function __construct(BlogEtcComment $comment)
+    public function __construct(HessamComment $comment)
     {
         $this->comment=$comment;
         // you can get the blog post via $comment->post
diff --git a/src/Events/CommentWillBeDeleted.php b/src/Events/CommentWillBeDeleted.php
index 7947eb5..fd41e19 100644
--- a/src/Events/CommentWillBeDeleted.php
+++ b/src/Events/CommentWillBeDeleted.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcComment;
+use WebDevEtc\BlogEtc\Models\HessamComment;
 
 /**
  * Class CommentWillBeDeleted
@@ -15,14 +15,14 @@ class CommentWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcComment */
+    /** @var  HessamComment */
     public $comment;
 
     /**
      * CommentWillBeDeleted constructor.
-     * @param BlogEtcComment $comment
+     * @param HessamComment $comment
      */
-    public function __construct(BlogEtcComment $comment)
+    public function __construct(HessamComment $comment)
     {
         $this->comment=$comment;
     }
diff --git a/src/Events/UploadedImage.php b/src/Events/UploadedImage.php
index 1feb61d..333f2a1 100644
--- a/src/Events/UploadedImage.php
+++ b/src/Events/UploadedImage.php
@@ -5,7 +5,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 
 /**
  * Class UploadedImage
@@ -15,7 +15,7 @@ class UploadedImage
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  BlogEtcPost|null */
+    /** @var  HessamPost|null */
     public $blogEtcPost;
     /**
      * @var
@@ -29,11 +29,11 @@ class UploadedImage
      * UploadedImage constructor.
      *
      * @param $image_filename - the new filename
-     * @param BlogEtcPost $blogEtcPost
+     * @param HessamPost $blogEtcPost
      * @param $image
      * @param $source string|null  the __METHOD__  firing this event (or other string)
      */
-    public function __construct(string $image_filename, $image,BlogEtcPost $blogEtcPost=null,string $source='other')
+    public function __construct(string $image_filename, $image, HessamPost $blogEtcPost=null, string $source='other')
     {
         $this->image_filename = $image_filename;
         $this->blogEtcPost=$blogEtcPost;
diff --git a/src/Models/BlogEtcCategory.php b/src/Models/HessamCategory.php
similarity index 84%
rename from src/Models/BlogEtcCategory.php
rename to src/Models/HessamCategory.php
index af32277..c5a1d66 100755
--- a/src/Models/BlogEtcCategory.php
+++ b/src/Models/HessamCategory.php
@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use WebDevEtc\BlogEtc\Baum\Node;
 
-class BlogEtcCategory extends Node
+class HessamCategory extends Node
 {
     protected $parentColumn = 'parent_id';
     public $siblings = array();
@@ -22,7 +22,7 @@ class BlogEtcCategory extends Node
      */
     public function posts()
     {
-        return $this->belongsToMany(BlogEtcPost::class, 'blog_etc_post_categories');
+        return $this->belongsToMany(HessamPost::class, 'blog_etc_post_categories');
     }
 
     /**
@@ -54,12 +54,12 @@ public function loadSiblings(){
 
 //    public function parent()
 //    {
-//        return $this->belongsTo('WebDevEtc\BlogEtc\Models\BlogEtcCategory', 'parent_id');
+//        return $this->belongsTo('WebDevEtc\BlogEtc\Models\HessamCategory', 'parent_id');
 //    }
 //
 //    public function children()
 //    {
-//        return $this->hasMany('WebDevEtc\BlogEtc\Models\BlogEtcCategory', 'parent_id');
+//        return $this->hasMany('WebDevEtc\BlogEtc\Models\HessamCategory', 'parent_id');
 //    }
 //
 //    // recursive, loads all descendants
diff --git a/src/Models/BlogEtcComment.php b/src/Models/HessamComment.php
similarity index 91%
rename from src/Models/BlogEtcComment.php
rename to src/Models/HessamComment.php
index 680bb1c..2096f18 100755
--- a/src/Models/BlogEtcComment.php
+++ b/src/Models/HessamComment.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Eloquent\Model;
 use WebDevEtc\BlogEtc\Scopes\BlogCommentApprovedAndDefaultOrderScope;
 
-class BlogEtcComment extends Model
+class HessamComment extends Model
 {
     public $casts = [
         'approved' => 'boolean',
@@ -37,12 +37,12 @@ protected static function boot()
 
 
     /**
-     * The associated BlogEtcPost
+     * The associated HessamPost
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function post()
     {
-        return $this->belongsTo(BlogEtcPost::class,"blog_etc_post_id");
+        return $this->belongsTo(HessamPost::class,"blog_etc_post_id");
     }
 
     /**
diff --git a/src/Models/BlogEtcPost.php b/src/Models/HessamPost.php
similarity index 93%
rename from src/Models/BlogEtcPost.php
rename to src/Models/HessamPost.php
index 12d97f5..fbcfb11 100755
--- a/src/Models/BlogEtcPost.php
+++ b/src/Models/HessamPost.php
@@ -9,10 +9,10 @@
 use WebDevEtc\BlogEtc\Scopes\BlogEtcPublishedScope;
 
 /**
- * Class BlogEtcPost
+ * Class HessamPost
  * @package WebDevEtc\BlogEtc\Models
  */
-class BlogEtcPost extends Model implements SearchResultInterface
+class HessamPost extends Model implements SearchResultInterface
 {
 
     use Sluggable;
@@ -121,7 +121,7 @@ public function author_string()
      */
     public function categories()
     {
-        return $this->belongsToMany(BlogEtcCategory::class, 'blog_etc_post_categories');
+        return $this->belongsToMany(HessamCategory::class, 'blog_etc_post_categories');
     }
 
     /**
@@ -131,7 +131,7 @@ public function categories()
      */
     public function comments()
     {
-        return $this->hasMany(BlogEtcComment::class);
+        return $this->hasMany(HessamComment::class);
     }
 
     /**
@@ -281,11 +281,11 @@ protected function check_valid_image_size(string $size = 'medium')
                 in the database table:    : blogetc_posts.image_medium
                 when calling image_url()  : image_url("medium")
             */
-            throw new \InvalidArgumentException("Invalid image size ($size). BlogEtcPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the blogetc.image_sizes config though!");
+            throw new \InvalidArgumentException("Invalid image size ($size). HessamPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the blogetc.image_sizes config though!");
         }
 
 
-        throw new \InvalidArgumentException("BlogEtcPost image size should be 'large','medium','thumbnail' or another field as defined in config/blogetc.php. Provided size ($size) is not valid");
+        throw new \InvalidArgumentException("HessamPost image size should be 'large','medium','thumbnail' or another field as defined in config/blogetc.php. Provided size ($size) is not valid");
     }
 
 
diff --git a/src/Models/BlogEtcUploadedPhoto.php b/src/Models/HessamUploadedPhoto.php
similarity index 88%
rename from src/Models/BlogEtcUploadedPhoto.php
rename to src/Models/HessamUploadedPhoto.php
index 50aa787..38b7c84 100644
--- a/src/Models/BlogEtcUploadedPhoto.php
+++ b/src/Models/HessamUploadedPhoto.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class BlogEtcUploadedPhoto extends Model
+class HessamUploadedPhoto extends Model
 {
     public $table = 'blog_etc_uploaded_photos';
     public $casts = [
diff --git a/src/Requests/Traits/HasCategoriesTrait.php b/src/Requests/Traits/HasCategoriesTrait.php
index 40e280d..84eb7cd 100755
--- a/src/Requests/Traits/HasCategoriesTrait.php
+++ b/src/Requests/Traits/HasCategoriesTrait.php
@@ -1,6 +1,6 @@
 <?php namespace WebDevEtc\BlogEtc\Requests\Traits;
 
-use WebDevEtc\BlogEtc\Models\BlogEtcCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategory;
 
 /**
  * Class HasCategoriesTrait
@@ -25,7 +25,7 @@ public function categories()
 
         // check they are valid, return the IDs
         // limit to 1000 ... just in case someone submits with too many for the web server. No error is given if they submit more than 1k.
-        $vals = BlogEtcCategory::whereIn("id", array_keys($this->get("category")))->select("id")->limit(1000)->get();
+        $vals = HessamCategory::whereIn("id", array_keys($this->get("category")))->select("id")->limit(1000)->get();
         $vals = array_values($vals->pluck("id")->toArray());
 
         return $vals;
diff --git a/src/Requests/UpdateBlogEtcCategoryRequest.php b/src/Requests/UpdateBlogEtcCategoryRequest.php
index 45af4d0..cc512df 100755
--- a/src/Requests/UpdateBlogEtcCategoryRequest.php
+++ b/src/Requests/UpdateBlogEtcCategoryRequest.php
@@ -4,7 +4,7 @@
 
 
 use Illuminate\Validation\Rule;
-use WebDevEtc\BlogEtc\Models\BlogEtcCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategory;
 
 class UpdateBlogEtcCategoryRequest extends BaseBlogEtcCategoryRequest
 {
diff --git a/src/Requests/UpdateBlogEtcPostRequest.php b/src/Requests/UpdateBlogEtcPostRequest.php
index d59ed70..5cef8eb 100755
--- a/src/Requests/UpdateBlogEtcPostRequest.php
+++ b/src/Requests/UpdateBlogEtcPostRequest.php
@@ -4,7 +4,7 @@
 
 
 use Illuminate\Validation\Rule;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Requests\Traits\HasCategoriesTrait;
 use WebDevEtc\BlogEtc\Requests\Traits\HasImageUploadTrait;
 
diff --git a/src/Traits/UploadFileTrait.php b/src/Traits/UploadFileTrait.php
index 1b11f28..3a4befc 100644
--- a/src/Traits/UploadFileTrait.php
+++ b/src/Traits/UploadFileTrait.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Http\UploadedFile;
 use WebDevEtc\BlogEtc\Events\UploadedImage;
-use WebDevEtc\BlogEtc\Models\BlogEtcPost;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 use File;
 
 trait UploadFileTrait
@@ -83,14 +83,14 @@ protected function image_destination_path()
 
 
     /**
-     * @param BlogEtcPost $new_blog_post
+     * @param HessamPost $new_blog_post
      * @param $suggested_title - used to help generate the filename
      * @param $image_size_details - either an array (with 'w' and 'h') or a string (and it'll be uploaded at full size, no size reduction, but will use this string to generate the filename)
      * @param $photo
      * @return array
      * @throws \Exception
      */
-    protected function UploadAndResize(BlogEtcPost $new_blog_post = null, $suggested_title, $image_size_details, $photo)
+    protected function UploadAndResize(HessamPost $new_blog_post = null, $suggested_title, $image_size_details, $photo)
     {
         // get the filename/filepath
         $image_filename = $this->getImageFilename($suggested_title, $image_size_details, $photo);
diff --git a/src/Views/blogetc/search.blade.php b/src/Views/blogetc/search.blade.php
index 98abe55..8bfbdfd 100755
--- a/src/Views/blogetc/search.blade.php
+++ b/src/Views/blogetc/search.blade.php
@@ -12,7 +12,7 @@
                         @if(isset($result->indexable))
                             @php $search_count += $search_count + 1; @endphp
                             <?php $post = $result->indexable; ?>
-                            @if($post && is_a($post,\WebDevEtc\BlogEtc\Models\BlogEtcPost::class))
+                            @if($post && is_a($post,\WebDevEtc\BlogEtc\Models\HessamPost::class))
                                 <h2>Search result #{{$search_count}}</h2>
                                 @include("blogetc::partials.index_loop")
                             @else
diff --git a/src/Views/blogetc/sitewide/random_posts.blade.php b/src/Views/blogetc/sitewide/random_posts.blade.php
index 505781b..650ac7a 100644
--- a/src/Views/blogetc/sitewide/random_posts.blade.php
+++ b/src/Views/blogetc/sitewide/random_posts.blade.php
@@ -1,6 +1,6 @@
 <h5>Random Posts</h5>
 <ul class="nav">
-    @foreach(\WebDevEtc\BlogEtc\Models\BlogEtcPost::inRandomOrder()->limit(5)->get() as $post)
+    @foreach(\WebDevEtc\BlogEtc\Models\HessamPost::inRandomOrder()->limit(5)->get() as $post)
         <li class="nav-item">
             <a class='nav-link' href='{{$post->url()}}'>{{$post->title}}</a>
         </li>
diff --git a/src/Views/blogetc/sitewide/recent_posts.blade.php b/src/Views/blogetc/sitewide/recent_posts.blade.php
index cd3935f..66468fc 100644
--- a/src/Views/blogetc/sitewide/recent_posts.blade.php
+++ b/src/Views/blogetc/sitewide/recent_posts.blade.php
@@ -1,6 +1,6 @@
 <h5>Recent Posts</h5>
 <ul class="nav">
-    @foreach(\WebDevEtc\BlogEtc\Models\BlogEtcPost::orderBy("posted_at","desc")->limit(5)->get() as $post)
+    @foreach(\WebDevEtc\BlogEtc\Models\HessamPost::orderBy("posted_at","desc")->limit(5)->get() as $post)
         <li class="nav-item">
             <a class='nav-link' href='{{$post->url()}}'>{{$post->title}}</a>
         </li>
diff --git a/src/Views/blogetc/sitewide/show_all_categories.blade.php b/src/Views/blogetc/sitewide/show_all_categories.blade.php
index a4e2286..eead550 100644
--- a/src/Views/blogetc/sitewide/show_all_categories.blade.php
+++ b/src/Views/blogetc/sitewide/show_all_categories.blade.php
@@ -1,6 +1,6 @@
 <h5>Post Categories</h5>
 <ul class="nav">
-    @foreach(\WebDevEtc\BlogEtc\Models\BlogEtcCategory::orderBy("category_name")->limit(200)->get() as $category)
+    @foreach(\WebDevEtc\BlogEtc\Models\HessamCategory::orderBy("category_name")->limit(200)->get() as $category)
         <li class="nav-item">
             <a class='nav-link' href='{{$category->url()}}'>{{$category->category_name}}</a>
         </li>
diff --git a/src/Views/blogetc_admin/layouts/sidebar.blade.php b/src/Views/blogetc_admin/layouts/sidebar.blade.php
index 5ed6a08..7c8d76d 100755
--- a/src/Views/blogetc_admin/layouts/sidebar.blade.php
+++ b/src/Views/blogetc_admin/layouts/sidebar.blade.php
@@ -3,7 +3,7 @@
         <div>
             <h6 class="my-0"><a href="{{ route('blogetc.admin.index') }}">Dashboard</a>
                 <span class="text-muted">(<?php
-                    $categoryCount = \WebDevEtc\BlogEtc\Models\BlogEtcPost::count();
+                    $categoryCount = \WebDevEtc\BlogEtc\Models\HessamPost::count();
 
                     echo $categoryCount . " " . str_plural("Post", $categoryCount);
 
@@ -32,7 +32,7 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
             <h6 class="my-0"><a href="{{ route('blogetc.admin.comments.index') }}">Comments</a>
 
                 <span class="text-muted">(<?php
-                    $commentCount = \WebDevEtc\BlogEtc\Models\BlogEtcComment::withoutGlobalScopes()->count();
+                    $commentCount = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->count();
 
                     echo $commentCount . " " . str_plural("Comment", $commentCount);
 
@@ -47,7 +47,7 @@ class="fa  fa-fw fa-comments" aria-hidden="true"></i>
                     All Comments</a>
 
 
-                <?php $comment_approval_count = \WebDevEtc\BlogEtc\Models\BlogEtcComment::withoutGlobalScopes()->where("approved", false)->count(); ?>
+                <?php $comment_approval_count = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where("approved", false)->count(); ?>
 
                 <a href='{{ route('blogetc.admin.comments.index') }}?waiting_for_approval=true'
                    class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.comments.index' && \Request::get("waiting_for_approval")) active @elseif($comment_approval_count>0) list-group-item list-group-color-warning @endif  '><i
@@ -64,7 +64,7 @@ class="fa  fa-fw fa-comments" aria-hidden="true"></i>
         <div>
             <h6 class="my-0"><a href="{{ route('blogetc.admin.categories.index') }}">Categories</a>
                 <span class="text-muted">(<?php
-                    $postCount = \WebDevEtc\BlogEtc\Models\BlogEtcCategory::count();
+                    $postCount = \WebDevEtc\BlogEtc\Models\HessamCategory::count();
                     echo $postCount . " " . str_plural("Category", $postCount);
                     ?>)</span>
             </h6>
diff --git a/src/Views/blogetc_admin/posts/add_post.blade.php b/src/Views/blogetc_admin/posts/add_post.blade.php
index 9bf2090..3bf1d37 100755
--- a/src/Views/blogetc_admin/posts/add_post.blade.php
+++ b/src/Views/blogetc_admin/posts/add_post.blade.php
@@ -7,7 +7,7 @@
     <form method='post' action='{{route("blogetc.admin.store_post")}}'  enctype="multipart/form-data" >
 
         @csrf
-        @include("blogetc_admin::posts.form", ['post' => new \WebDevEtc\BlogEtc\Models\BlogEtcPost()])
+        @include("blogetc_admin::posts.form", ['post' => new \WebDevEtc\BlogEtc\Models\HessamPost()])
 
         <input type='submit' class='btn btn-primary' value='Add new post' >
 
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/blogetc_admin/posts/form.blade.php
index 0179dfe..9462011 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/blogetc_admin/posts/form.blade.php
@@ -181,7 +181,7 @@ class='btn btn-light btn-sm'>Show other sizes</span>
     <h4>Categories:</h4>
     <div class='row'>
 
-        @forelse(\WebDevEtc\BlogEtc\Models\BlogEtcCategory::orderBy("category_name","asc")->limit(1000)->get() as $category)
+        @forelse(\WebDevEtc\BlogEtc\Models\HessamCategory::orderBy("category_name","asc")->limit(1000)->get() as $category)
             <div class="form-check col-sm-6">
                 <input class="" type="checkbox" value="1"
                        @if(old("category.".$category->id, $post->categories->contains($category->id))) checked='checked'
diff --git a/tests/MainTest.php b/tests/MainTest.php
index e436964..bd5679d 100644
--- a/tests/MainTest.php
+++ b/tests/MainTest.php
@@ -227,7 +227,7 @@ public function testCanCreatePostThenEditIt()
         $response->assertStatus(302); // redirect
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\BlogEtcPost::where("slug", $new_object_vals['slug'])->firstOrFail();
+        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
 
 
         $new_object_vals['title'] = "New title " . str_random();
@@ -455,7 +455,7 @@ public function testCreatePostThenSetCommentsToDisabledAndCheckNoneShow()
         $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \WebDevEtc\BlogEtc\Models\BlogEtcPost;
+        $newblogpost = new \WebDevEtc\BlogEtc\Models\HessamPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -487,7 +487,7 @@ public function testCreatePostThenSetCommentsToDisqusAndCheckDisqusJSIsShown()
         $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \WebDevEtc\BlogEtc\Models\BlogEtcPost;
+        $newblogpost = new \WebDevEtc\BlogEtc\Models\HessamPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -517,7 +517,7 @@ public function testCreatePostThenSetCommentsToCustomAndCheckCustomErrorShows()
         $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \WebDevEtc\BlogEtc\Models\BlogEtcPost;
+        $newblogpost = new \WebDevEtc\BlogEtc\Models\HessamPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -587,7 +587,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
         $this->assertDatabaseHas('blog_etc_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
-        $justAddedRow = \WebDevEtc\BlogEtc\Models\BlogEtcComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+        $justAddedRow = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
         $response = $this->get(route("blogetc.admin.comments.index"));
         $response->assertSee($justAddedRow->author_name);
@@ -650,7 +650,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
         $this->assertDatabaseHas('blog_etc_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
-        $justAddedRow = \WebDevEtc\BlogEtc\Models\BlogEtcComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+        $justAddedRow = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
         $response = $this->get(route("blogetc.admin.comments.index"));
         $response->assertSee($justAddedRow->author_name);
@@ -708,7 +708,7 @@ public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
             $this->assertDatabaseHas('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
 
 
-            $justAddedRow = \WebDevEtc\BlogEtc\Models\BlogEtcComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+            $justAddedRow = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
             // check the just added row exists...
             $response = $this->get(route("blogetc.admin.comments.index"));
@@ -763,7 +763,7 @@ public function testCanCreateThenDeletePost()
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
 
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\BlogEtcPost::where("slug", $new_object_vals['slug'])->firstOrFail();
+        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
         $id = $justCreatedRow->id;
         $delete_url = $admin_panel_url . "/delete_post/" . $id;
 
@@ -822,7 +822,7 @@ public function testCanCreateCategoryThenEditIt()
 
 
         // get the just inserted row
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\BlogEtcCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
+        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
 
 
         // get the edit page (form)
@@ -874,7 +874,7 @@ public function testCanDeleteCategory()
         $this->assertDatabaseHas('blog_etc_categories', $search_for_new_cat);
 
 
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\BlogEtcCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
+        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
         $id = $justCreatedRow->id;
 
         $delete_url = $admin_panel_url . "/categories/delete_category/$id";

From 1eec6fc3d63538cfabd310a45a039dcca076b240 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 17 Oct 2020 17:15:33 +0330
Subject: [PATCH 003/118] adds relations to model classes

---
 ..._004241_create_hessam_languages_table.php} |  0
 ..._005400_create_hessam_categories_table.php | 10 -----
 ...10_16_010039_create_hessam_posts_table.php | 10 +++++
 src/Models/HessamCategory.php                 | 14 +++++--
 src/Models/HessamCategoryTranslation.php      | 35 +++++++++++++++++
 src/Models/HessamComment.php                  |  2 +-
 src/Models/HessamLanguage.php                 | 37 ++++++++++++++++++
 src/Models/HessamPost.php                     | 21 +++++-----
 src/Models/HessamPostTranslation.php          | 39 +++++++++++++++++++
 src/Models/HessamUploadedPhoto.php            |  2 +-
 .../layouts/admin_layout.blade.php            |  2 +-
 11 files changed, 144 insertions(+), 28 deletions(-)
 rename migrations/{2020_10_16_124241_create_hessam_languages_table.php => 2020_10_16_004241_create_hessam_languages_table.php} (100%)
 create mode 100644 src/Models/HessamCategoryTranslation.php
 create mode 100644 src/Models/HessamLanguage.php
 create mode 100644 src/Models/HessamPostTranslation.php

diff --git a/migrations/2020_10_16_124241_create_hessam_languages_table.php b/migrations/2020_10_16_004241_create_hessam_languages_table.php
similarity index 100%
rename from migrations/2020_10_16_124241_create_hessam_languages_table.php
rename to migrations/2020_10_16_004241_create_hessam_languages_table.php
diff --git a/migrations/2020_10_16_005400_create_hessam_categories_table.php b/migrations/2020_10_16_005400_create_hessam_categories_table.php
index c4776e7..bf74f59 100644
--- a/migrations/2020_10_16_005400_create_hessam_categories_table.php
+++ b/migrations/2020_10_16_005400_create_hessam_categories_table.php
@@ -27,16 +27,6 @@ public function up()
             $table->timestamps();
         });
 
-        Schema::create('hessam_post_categories', function (Blueprint $table) {
-            $table->increments('id');
-
-            $table->unsignedInteger("post_id")->index();
-            $table->foreign('post_id')->references('post_id')->on('hessam_posts')->onDelete("cascade");
-
-            $table->unsignedInteger("category_id")->index();
-            $table->foreign('category_id')->references('category_id')->on('hessam_categories')->onDelete("cascade");
-        });
-
     }
 
     /**
diff --git a/migrations/2020_10_16_010039_create_hessam_posts_table.php b/migrations/2020_10_16_010039_create_hessam_posts_table.php
index 0565aa6..b0539d3 100644
--- a/migrations/2020_10_16_010039_create_hessam_posts_table.php
+++ b/migrations/2020_10_16_010039_create_hessam_posts_table.php
@@ -22,6 +22,16 @@ public function up()
 
             $table->timestamps();
         });
+
+        Schema::create('hessam_post_categories', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->unsignedInteger("post_id")->index();
+            $table->foreign('post_id')->references('post_id')->on('hessam_posts')->onDelete("cascade");
+
+            $table->unsignedInteger("category_id")->index();
+            $table->foreign('category_id')->references('category_id')->on('hessam_categories')->onDelete("cascade");
+        });
     }
 
     /**
diff --git a/src/Models/HessamCategory.php b/src/Models/HessamCategory.php
index c5a1d66..855d998 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/HessamCategory.php
@@ -11,18 +11,24 @@ class HessamCategory extends Node
     public $siblings = array();
 
     public $fillable = [
-        'category_name',
-        'slug',
-        'category_description',
         'parent_id'
     ];
 
+    /**
+     * The associated category translation
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function categoryTranslation()
+    {
+        return $this->hasOne(HessamCategoryTranslation::class,"category_id");
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function posts()
     {
-        return $this->belongsToMany(HessamPost::class, 'blog_etc_post_categories');
+        return $this->belongsToMany(HessamPost::class, 'hessam_post_categories');
     }
 
     /**
diff --git a/src/Models/HessamCategoryTranslation.php b/src/Models/HessamCategoryTranslation.php
new file mode 100644
index 0000000..2c92b8c
--- /dev/null
+++ b/src/Models/HessamCategoryTranslation.php
@@ -0,0 +1,35 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class HessamCategoryTranslation extends Model
+{
+
+    public $fillable = [
+        'category_name',
+        'slug',
+        'category_description',
+        'parent_id'
+    ];
+
+    /**
+     * Get the user that owns the phone.
+     */
+    public function category()
+    {
+        return $this->belongsTo(HessamCategory::class, 'category_id');
+    }
+
+    /**
+     * The associated Language
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function language()
+    {
+        return $this->hasOne(HessamLanguage::class,"lang_id");
+    }
+
+}
\ No newline at end of file
diff --git a/src/Models/HessamComment.php b/src/Models/HessamComment.php
index 2096f18..e97a031 100755
--- a/src/Models/HessamComment.php
+++ b/src/Models/HessamComment.php
@@ -42,7 +42,7 @@ protected static function boot()
      */
     public function post()
     {
-        return $this->belongsTo(HessamPost::class,"blog_etc_post_id");
+        return $this->belongsTo(HessamPost::class,"hessam_post_id");
     }
 
     /**
diff --git a/src/Models/HessamLanguage.php b/src/Models/HessamLanguage.php
new file mode 100644
index 0000000..26861eb
--- /dev/null
+++ b/src/Models/HessamLanguage.php
@@ -0,0 +1,37 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class HessamLanguage
+{
+    public $fillable = [
+        'name',
+        'locale',
+        'iso_code',
+        'date_format',
+        'active'
+    ];
+
+
+    /**
+     * The associated post (if post_id) is set
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function post()
+    {
+        return $this->belongsTo(HessamPost::class, 'post_id');
+    }
+
+    /**
+     * The associated author (if category_id) is set
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function category()
+    {
+        return $this->belongsTo(HessamCategory::class, 'category_id');
+    }
+
+}
\ No newline at end of file
diff --git a/src/Models/HessamPost.php b/src/Models/HessamPost.php
index fbcfb11..cdfebe6 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/HessamPost.php
@@ -39,20 +39,19 @@ class HessamPost extends Model implements SearchResultInterface
      * @var array
      */
     public $fillable = [
-
-        'title',
-        'subtitle',
-        'short_description',
-        'post_body',
-        'seo_title',
-        'meta_desc',
-        'slug',
-        'use_view_file',
-
         'is_published',
         'posted_at',
     ];
 
+    /**
+     * The associated post translation
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function postTranslation()
+    {
+        return $this->hasOne(HessamPostTranslation::class,"post_id");
+    }
+
     /**
      * Return the sluggable configuration array for this model.
      *
@@ -121,7 +120,7 @@ public function author_string()
      */
     public function categories()
     {
-        return $this->belongsToMany(HessamCategory::class, 'blog_etc_post_categories');
+        return $this->belongsToMany(HessamCategory::class, 'hessam_post_categories');
     }
 
     /**
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
new file mode 100644
index 0000000..4e14be1
--- /dev/null
+++ b/src/Models/HessamPostTranslation.php
@@ -0,0 +1,39 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class HessamPostTranslation
+{
+    public $fillable = [
+
+        'title',
+        'subtitle',
+        'short_description',
+        'post_body',
+        'seo_title',
+        'meta_desc',
+        'slug',
+        'use_view_file',
+    ];
+
+    /**
+     * Get the user that owns the phone.
+     */
+    public function post()
+    {
+        return $this->belongsTo(HessamPost::class, 'post_id');
+    }
+
+    /**
+     * The associated Language
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function language()
+    {
+        return $this->hasOne(HessamLanguage::class,"lang_id");
+    }
+
+}
\ No newline at end of file
diff --git a/src/Models/HessamUploadedPhoto.php b/src/Models/HessamUploadedPhoto.php
index 38b7c84..363cdf1 100644
--- a/src/Models/HessamUploadedPhoto.php
+++ b/src/Models/HessamUploadedPhoto.php
@@ -6,7 +6,7 @@
 
 class HessamUploadedPhoto extends Model
 {
-    public $table = 'blog_etc_uploaded_photos';
+    public $table = 'hessam_uploaded_photos';
     public $casts = [
         'uploaded_images' => 'array',
     ];
diff --git a/src/Views/blogetc_admin/layouts/admin_layout.blade.php b/src/Views/blogetc_admin/layouts/admin_layout.blade.php
index 4b2ac86..0d346f8 100755
--- a/src/Views/blogetc_admin/layouts/admin_layout.blade.php
+++ b/src/Views/blogetc_admin/layouts/admin_layout.blade.php
@@ -94,7 +94,7 @@
                         <small><a href='https://github.com/vhessam/laravel-blogger'>Hessam CMS</a></small>
 
                         <small>
-                            Version 8.0.x
+                            Version 9.0.x
                         </small>
                     </div>
                 </div>

From 31bf65f5a1427f284328fd4f0130591d6f258d8c Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 17 Oct 2020 20:35:02 +0330
Subject: [PATCH 004/118] controller classes name refactor

---
 src/Config/blogetc.php                        |  2 +-
 ...ntroller.php => HessamAdminController.php} |  6 +--
 ....php => HessamCategoryAdminController.php} |  6 +--
 ....php => HessamCommentWriterController.php} |  4 +-
 ....php => HessamCommentsAdminController.php} |  6 +--
 ...er.php => HessamImageUploadController.php} |  8 +--
 ...troller.php => HessamReaderController.php} |  4 +-
 ...roller.php => HessamRssFeedController.php} |  4 +-
 src/routes.php                                | 52 +++++++++----------
 9 files changed, 46 insertions(+), 46 deletions(-)
 rename src/Controllers/{BlogEtcAdminController.php => HessamAdminController.php} (98%)
 rename src/Controllers/{BlogEtcCategoryAdminController.php => HessamCategoryAdminController.php} (96%)
 rename src/Controllers/{BlogEtcCommentWriterController.php => HessamCommentWriterController.php} (96%)
 rename src/Controllers/{BlogEtcCommentsAdminController.php => HessamCommentsAdminController.php} (93%)
 rename src/Controllers/{BlogEtcImageUploadController.php => HessamImageUploadController.php} (94%)
 rename src/Controllers/{BlogEtcReaderController.php => HessamReaderController.php} (98%)
 rename src/Controllers/{BlogEtcRssFeedController.php => HessamRssFeedController.php} (96%)

diff --git a/src/Config/blogetc.php b/src/Config/blogetc.php
index b774dec..e091afb 100755
--- a/src/Config/blogetc.php
+++ b/src/Config/blogetc.php
@@ -11,7 +11,7 @@
     // reading progress bar is the bar which shows on top of your post when you are scrolling down the page. You can disable this feature if you want
     'reading_progress_bar' => true,
 
-    'include_default_routes' => true, // set to false to not include routes.php for BlogEtcReaderController and admin related routes. Default: true. If you disable this, you will have to manually copy over the data from routes.php and add it to your web.php.
+    'include_default_routes' => true, // set to false to not include routes.php for HessamReaderController and admin related routes. Default: true. If you disable this, you will have to manually copy over the data from routes.php and add it to your web.php.
 
     'blog_prefix' => "blog", // used in routes.php. If you want to your http://yoursite.com/latest-news (or anything else), then enter that here. Default: blog
     'admin_prefix' => "blog_admin", // similar to above, but used for the admin panel for the blog. Default: blog_admin
diff --git a/src/Controllers/BlogEtcAdminController.php b/src/Controllers/HessamAdminController.php
similarity index 98%
rename from src/Controllers/BlogEtcAdminController.php
rename to src/Controllers/HessamAdminController.php
index 891d3c4..9b7ec5b 100755
--- a/src/Controllers/BlogEtcAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -19,15 +19,15 @@
 use WebDevEtc\BlogEtc\Traits\UploadFileTrait;
 
 /**
- * Class BlogEtcAdminController
+ * Class HessamAdminController
  * @package WebDevEtc\BlogEtc\Controllers
  */
-class BlogEtcAdminController extends Controller
+class HessamAdminController extends Controller
 {
     use UploadFileTrait;
 
     /**
-     * BlogEtcAdminController constructor.
+     * HessamAdminController constructor.
      */
     public function __construct()
     {
diff --git a/src/Controllers/BlogEtcCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
similarity index 96%
rename from src/Controllers/BlogEtcCategoryAdminController.php
rename to src/Controllers/HessamCategoryAdminController.php
index 2ea8d58..0442c99 100755
--- a/src/Controllers/BlogEtcCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -14,13 +14,13 @@
 use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcCategoryRequest;
 
 /**
- * Class BlogEtcCategoryAdminController
+ * Class HessamCategoryAdminController
  * @package WebDevEtc\BlogEtc\Controllers
  */
-class BlogEtcCategoryAdminController extends Controller
+class HessamCategoryAdminController extends Controller
 {
     /**
-     * BlogEtcCategoryAdminController constructor.
+     * HessamCategoryAdminController constructor.
      */
     public function __construct()
     {
diff --git a/src/Controllers/BlogEtcCommentWriterController.php b/src/Controllers/HessamCommentWriterController.php
similarity index 96%
rename from src/Controllers/BlogEtcCommentWriterController.php
rename to src/Controllers/HessamCommentWriterController.php
index a1ba079..c7af89d 100755
--- a/src/Controllers/BlogEtcCommentWriterController.php
+++ b/src/Controllers/HessamCommentWriterController.php
@@ -12,10 +12,10 @@
 use WebDevEtc\BlogEtc\Requests\AddNewCommentRequest;
 
 /**
- * Class BlogEtcCommentWriterController
+ * Class HessamCommentWriterController
  * @package WebDevEtc\BlogEtc\Controllers
  */
-class BlogEtcCommentWriterController extends Controller
+class HessamCommentWriterController extends Controller
 {
 
     use UsesCaptcha;
diff --git a/src/Controllers/BlogEtcCommentsAdminController.php b/src/Controllers/HessamCommentsAdminController.php
similarity index 93%
rename from src/Controllers/BlogEtcCommentsAdminController.php
rename to src/Controllers/HessamCommentsAdminController.php
index de3a638..7d3caf6 100755
--- a/src/Controllers/BlogEtcCommentsAdminController.php
+++ b/src/Controllers/HessamCommentsAdminController.php
@@ -11,13 +11,13 @@
 use WebDevEtc\BlogEtc\Models\HessamComment;
 
 /**
- * Class BlogEtcCommentsAdminController
+ * Class HessamCommentsAdminController
  * @package WebDevEtc\BlogEtc\Controllers
  */
-class BlogEtcCommentsAdminController extends Controller
+class HessamCommentsAdminController extends Controller
 {
     /**
-     * BlogEtcCommentsAdminController constructor.
+     * HessamCommentsAdminController constructor.
      */
     public function __construct()
     {
diff --git a/src/Controllers/BlogEtcImageUploadController.php b/src/Controllers/HessamImageUploadController.php
similarity index 94%
rename from src/Controllers/BlogEtcImageUploadController.php
rename to src/Controllers/HessamImageUploadController.php
index 72a2295..82c1b35 100755
--- a/src/Controllers/BlogEtcImageUploadController.php
+++ b/src/Controllers/HessamImageUploadController.php
@@ -11,16 +11,16 @@
 use WebDevEtc\BlogEtc\Traits\UploadFileTrait;
 
 /**
- * Class BlogEtcAdminController
+ * Class HessamAdminController
  * @package WebDevEtc\BlogEtc\Controllers
  */
-class BlogEtcImageUploadController extends Controller
+class HessamImageUploadController extends Controller
 {
 
     use UploadFileTrait;
 
     /**
-     * BlogEtcAdminController constructor.
+     * HessamAdminController constructor.
      */
     public function __construct()
     {
@@ -80,7 +80,7 @@ public function store(UploadImageRequest $request)
      *
      * @return array returns an array of details about each file resized.
      * @throws \Exception
-     * @todo - This class was added after the other main features, so this duplicates some code from the main blog post admin controller (BlogEtcAdminController). For next full release this should be tided up.
+     * @todo - This class was added after the other main features, so this duplicates some code from the main blog post admin controller (HessamAdminController). For next full release this should be tided up.
      */
     protected function processUploadedImages(UploadImageRequest $request)
     {
diff --git a/src/Controllers/BlogEtcReaderController.php b/src/Controllers/HessamReaderController.php
similarity index 98%
rename from src/Controllers/BlogEtcReaderController.php
rename to src/Controllers/HessamReaderController.php
index 8482430..830945c 100755
--- a/src/Controllers/BlogEtcReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -11,11 +11,11 @@
 use WebDevEtc\BlogEtc\Models\HessamPost;
 
 /**
- * Class BlogEtcReaderController
+ * Class HessamReaderController
  * All of the main public facing methods for viewing blog content (index, single posts)
  * @package WebDevEtc\BlogEtc\Controllers
  */
-class BlogEtcReaderController extends Controller
+class HessamReaderController extends Controller
 {
     use UsesCaptcha;
 
diff --git a/src/Controllers/BlogEtcRssFeedController.php b/src/Controllers/HessamRssFeedController.php
similarity index 96%
rename from src/Controllers/BlogEtcRssFeedController.php
rename to src/Controllers/HessamRssFeedController.php
index c361f18..4fed9a0 100755
--- a/src/Controllers/BlogEtcRssFeedController.php
+++ b/src/Controllers/HessamRssFeedController.php
@@ -9,11 +9,11 @@
 use WebDevEtc\BlogEtc\Requests\FeedRequest;
 
 /**
- * Class BlogEtcRssFeedController.php
+ * Class HessamRssFeedController.php
  * All RSS feed viewing methods
  * @package WebDevEtc\BlogEtc\Controllers
  */
-class BlogEtcRssFeedController extends Controller
+class HessamRssFeedController extends Controller
 {
     /**
      * @param Feed $feed
diff --git a/src/routes.php b/src/routes.php
index dec1d93..eaf6057 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -6,23 +6,23 @@
     /** The main public facing blog routes - show all posts, view a category, rss feed, view a single post, also the add comment route */
     Route::group(['prefix' => config('blogetc.blog_prefix', 'blog')], function () {
 
-        Route::get('/', 'BlogEtcReaderController@index')
+        Route::get('/', 'HessamReaderController@index')
             ->name('blogetc.index');
 
-        Route::get('/search', 'BlogEtcReaderController@search')
+        Route::get('/search', 'HessamReaderController@search')
             ->name('blogetc.search');
 
-        Route::get('/feed', 'BlogEtcRssFeedController@feed')
+        Route::get('/feed', 'HessamRssFeedController@feed')
             ->name('blogetc.feed'); //RSS feed
 
-        Route::get('/category{subcategories}', 'BlogEtcReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('blogetc.view_category');
+        Route::get('/category{subcategories}', 'HessamReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('blogetc.view_category');
 
 //        Route::get('/category/{categorySlug}',
-//            'BlogEtcReaderController@view_category')
+//            'HessamReaderController@view_category')
 //            ->name('blogetc.view_category');
 
         Route::get('/{blogPostSlug}',
-            'BlogEtcReaderController@viewSinglePost')
+            'HessamReaderController@viewSinglePost')
             ->name('blogetc.single');
 
 
@@ -30,7 +30,7 @@
         Route::group(['middleware' => 'throttle:10,3'], function () {
 
             Route::post('save_comment/{blogPostSlug}',
-                'BlogEtcCommentWriterController@addNewComment')
+                'HessamCommentWriterController@addNewComment')
                 ->name('blogetc.comments.add_new_comment');
 
 
@@ -42,83 +42,83 @@
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
     Route::group(['prefix' => config('blogetc.admin_prefix', 'blog_admin')], function () {
 
-        Route::get('/', 'BlogEtcAdminController@index')
+        Route::get('/', 'HessamAdminController@index')
             ->name('blogetc.admin.index');
 
         Route::get('/add_post',
-            'BlogEtcAdminController@create_post')
+            'HessamAdminController@create_post')
             ->name('blogetc.admin.create_post');
 
 
         Route::post('/add_post',
-            'BlogEtcAdminController@store_post')
+            'HessamAdminController@store_post')
             ->name('blogetc.admin.store_post');
 
 
         Route::get('/edit_post/{blogPostId}',
-            'BlogEtcAdminController@edit_post')
+            'HessamAdminController@edit_post')
             ->name('blogetc.admin.edit_post');
 
         Route::patch('/edit_post/{blogPostId}',
-            'BlogEtcAdminController@update_post')
+            'HessamAdminController@update_post')
             ->name('blogetc.admin.update_post');
 
         //Removes post's photo
         Route::get('/remove_photo/{slug}',
-            'BlogEtcAdminController@remove_photo')
+            'HessamAdminController@remove_photo')
             ->name('blogetc.admin.remove_photo');
 
         Route::group(['prefix' => "image_uploads",], function () {
 
-            Route::get("/", "BlogEtcImageUploadController@index")->name("blogetc.admin.images.all");
+            Route::get("/", "HessamImageUploadController@index")->name("blogetc.admin.images.all");
 
-            Route::get("/upload", "BlogEtcImageUploadController@create")->name("blogetc.admin.images.upload");
-            Route::post("/upload", "BlogEtcImageUploadController@store")->name("blogetc.admin.images.store");
+            Route::get("/upload", "HessamImageUploadController@create")->name("blogetc.admin.images.upload");
+            Route::post("/upload", "HessamImageUploadController@store")->name("blogetc.admin.images.store");
 
         });
 
 
         Route::delete('/delete_post/{blogPostId}',
-            'BlogEtcAdminController@destroy_post')
+            'HessamAdminController@destroy_post')
             ->name('blogetc.admin.destroy_post');
 
         Route::group(['prefix' => 'comments',], function () {
 
             Route::get('/',
-                'BlogEtcCommentsAdminController@index')
+                'HessamCommentsAdminController@index')
                 ->name('blogetc.admin.comments.index');
 
             Route::patch('/{commentId}',
-                'BlogEtcCommentsAdminController@approve')
+                'HessamCommentsAdminController@approve')
                 ->name('blogetc.admin.comments.approve');
             Route::delete('/{commentId}',
-                'BlogEtcCommentsAdminController@destroy')
+                'HessamCommentsAdminController@destroy')
                 ->name('blogetc.admin.comments.delete');
         });
 
         Route::group(['prefix' => 'categories'], function () {
 
             Route::get('/',
-                'BlogEtcCategoryAdminController@index')
+                'HessamCategoryAdminController@index')
                 ->name('blogetc.admin.categories.index');
 
             Route::get('/add_category',
-                'BlogEtcCategoryAdminController@create_category')
+                'HessamCategoryAdminController@create_category')
                 ->name('blogetc.admin.categories.create_category');
             Route::post('/add_category',
-                'BlogEtcCategoryAdminController@store_category')
+                'HessamCategoryAdminController@store_category')
                 ->name('blogetc.admin.categories.store_category');
 
             Route::get('/edit_category/{categoryId}',
-                'BlogEtcCategoryAdminController@edit_category')
+                'HessamCategoryAdminController@edit_category')
                 ->name('blogetc.admin.categories.edit_category');
 
             Route::patch('/edit_category/{categoryId}',
-                'BlogEtcCategoryAdminController@update_category')
+                'HessamCategoryAdminController@update_category')
                 ->name('blogetc.admin.categories.update_category');
 
             Route::delete('/delete_category/{categoryId}',
-                'BlogEtcCategoryAdminController@destroy_category')
+                'HessamCategoryAdminController@destroy_category')
                 ->name('blogetc.admin.categories.destroy_category');
 
         });

From 54f05a0093f2745a0799ad131485aea7ecb846b3 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 20 Oct 2020 04:22:21 +0330
Subject: [PATCH 005/118] adds language support for category

---
 ...6_004241_create_hessam_languages_table.php |   2 +-
 ..._005400_create_hessam_categories_table.php |   2 +-
 ...ate_hessam_category_translations_table.php |   2 +-
 ...10_16_010039_create_hessam_posts_table.php |   2 +-
 ..._create_hessam_post_translations_table.php |   2 +-
 .../HessamCategoryAdminController.php         |  18 +-
 src/Events/CategoryAdded.php                  |  11 +-
 src/Models/HessamCategory.php                 |   6 +-
 src/Models/HessamCategoryTranslation.php      |   3 +-
 src/Models/HessamLanguage.php                 |   2 +-
 src/Models/HessamPost.php                     | 157 +-----------------
 src/Models/HessamPostTranslation.php          | 156 ++++++++++++++++-
 src/Requests/StoreBlogEtcCategoryRequest.php  |   2 +-
 .../categories/add_category.blade.php         |  26 +--
 .../languages/add_language.blade.php          |   0
 .../languages/deleted_language.blade.php      |   0
 .../languages/edit_language.blade.php         |   0
 .../blogetc_admin/languages/form.blade.php    |   0
 .../blogetc_admin/languages/index.blade.php   |   0
 .../blogetc_admin/layouts/sidebar.blade.php   |  22 ++-
 .../blogetc_admin/posts/add_post.blade.php    |   5 +-
 src/Views/blogetc_admin/posts/form.blade.php  |  30 ++--
 22 files changed, 244 insertions(+), 204 deletions(-)
 create mode 100755 src/Views/blogetc_admin/languages/add_language.blade.php
 create mode 100755 src/Views/blogetc_admin/languages/deleted_language.blade.php
 create mode 100755 src/Views/blogetc_admin/languages/edit_language.blade.php
 create mode 100755 src/Views/blogetc_admin/languages/form.blade.php
 create mode 100755 src/Views/blogetc_admin/languages/index.blade.php

diff --git a/migrations/2020_10_16_004241_create_hessam_languages_table.php b/migrations/2020_10_16_004241_create_hessam_languages_table.php
index b9894e8..9b5e8fb 100644
--- a/migrations/2020_10_16_004241_create_hessam_languages_table.php
+++ b/migrations/2020_10_16_004241_create_hessam_languages_table.php
@@ -14,7 +14,7 @@ class CreateHessamLanguagesTable extends Migration
     public function up()
     {
         Schema::create('hessam_languages', function (Blueprint $table) {
-            $table->increments('lang_id');
+            $table->increments('id');
 
             $table->string("name")->unique();
             $table->string("locale")->unique();
diff --git a/migrations/2020_10_16_005400_create_hessam_categories_table.php b/migrations/2020_10_16_005400_create_hessam_categories_table.php
index bf74f59..a2d13d4 100644
--- a/migrations/2020_10_16_005400_create_hessam_categories_table.php
+++ b/migrations/2020_10_16_005400_create_hessam_categories_table.php
@@ -14,7 +14,7 @@ class CreateHessamCategoriesTable extends Migration
     public function up()
     {
         Schema::create('hessam_categories', function (Blueprint $table) {
-            $table->increments('category_id');
+            $table->increments('id');
 
             $table->unsignedInteger("created_by")->nullable()->index()->comment("user id");
 
diff --git a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
index 8ff802a..a926e93 100644
--- a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
+++ b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
@@ -14,7 +14,7 @@ class CreateHessamCategoryTranslationsTable extends Migration
     public function up()
     {
         Schema::create('hessam_category_translations', function (Blueprint $table) {
-            $table->increments('category_id');
+            $table->unsignedInteger('category_id')->nullable();
 
             $table->string("category_name")->nullable();
             $table->string("slug")->unique();
diff --git a/migrations/2020_10_16_010039_create_hessam_posts_table.php b/migrations/2020_10_16_010039_create_hessam_posts_table.php
index b0539d3..a4b5fd3 100644
--- a/migrations/2020_10_16_010039_create_hessam_posts_table.php
+++ b/migrations/2020_10_16_010039_create_hessam_posts_table.php
@@ -14,7 +14,7 @@ class CreateHessamPostsTable extends Migration
     public function up()
     {
         Schema::create('hessam_posts', function (Blueprint $table) {
-            $table->increments('post_id');
+            $table->increments('id');
             $table->unsignedInteger("user_id")->index()->nullable();
 
             $table->dateTime("posted_at")->index()->nullable()->comment("Public posted at time, if this is in future then it wont appear yet");
diff --git a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
index fd5d295..8b4397c 100644
--- a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
+++ b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
@@ -14,7 +14,7 @@ class CreateHessamPostTranslationsTable extends Migration
     public function up()
     {
         Schema::create('hessam_post_translations', function (Blueprint $table) {
-            $table->increments('post_id');
+            $table->unsignedInteger('post_id')->nullable();
 
             $table->string("slug")->unique();
             $table->string("title")->nullable()->default("New blog post");
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index 0442c99..9850700 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -9,6 +9,7 @@
 use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
 use WebDevEtc\BlogEtc\Requests\DeleteBlogEtcCategoryRequest;
 use WebDevEtc\BlogEtc\Requests\StoreBlogEtcCategoryRequest;
 use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcCategoryRequest;
@@ -46,7 +47,8 @@ public function create_category(){
 
         return view("blogetc_admin::categories.add_category",[
             'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
-            'categories_list' => HessamCategory::orderBy("category_name")->get()
+            'category_translation' => new \WebDevEtc\BlogEtc\Models\HessamCategoryTranslation(),
+            'categories_list' => HessamCategory::orderBy("id")->get()
         ]);
 
     }
@@ -61,11 +63,21 @@ public function store_category(StoreBlogEtcCategoryRequest $request){
         if ($request['parent_id']== 0){
             $request['parent_id'] = null;
         }
-        $new_category = HessamCategory::create($request->all());
+        $new_category = HessamCategory::create([
+            'parent_id' => $request['parent_id']
+        ]);
+
+        $new_category_translation = $new_category->categoryTranslations()->create([
+            'category_name' => $request['category_name'],
+            'slug' => $request['slug'],
+            'category_description' => $request['category_description'],
+            'lang_id' => $request['lang_id'],
+            'category_id' => $new_category->id
+        ]);
 
         Helpers::flash_message("Saved new category");
 
-        event(new CategoryAdded($new_category));
+        event(new CategoryAdded($new_category, $new_category_translation));
         return redirect( route('blogetc.admin.categories.index') );
     }
 
diff --git a/src/Events/CategoryAdded.php b/src/Events/CategoryAdded.php
index b5b23e3..0c9f2fb 100644
--- a/src/Events/CategoryAdded.php
+++ b/src/Events/CategoryAdded.php
@@ -6,6 +6,7 @@
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use WebDevEtc\BlogEtc\Models\HessamCategory;
+use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
 
 /**
  * Class CategoryAdded
@@ -16,15 +17,17 @@ class CategoryAdded
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamCategory */
-    public $blogEtcCategory;
+    public $hessamCategory;
+    public $hessamCategoryTranslation;
 
     /**
      * CategoryAdded constructor.
-     * @param HessamCategory $blogEtcCategory
+     * @param HessamCategory $hessamCategory
      */
-    public function __construct(HessamCategory $blogEtcCategory)
+    public function __construct(HessamCategory $hessamCategory, HessamCategoryTranslation  $hessamCategoryTranslation)
     {
-        $this->blogEtcCategory=$blogEtcCategory;
+        $this->hessamCategory=$hessamCategory;
+        $this->hessamCategoryTranslation = $hessamCategoryTranslation;
     }
 
 }
diff --git a/src/Models/HessamCategory.php b/src/Models/HessamCategory.php
index 855d998..bee8623 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/HessamCategory.php
@@ -15,12 +15,12 @@ class HessamCategory extends Node
     ];
 
     /**
-     * The associated category translation
+     * The associated category translations
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
-    public function categoryTranslation()
+    public function categoryTranslations()
     {
-        return $this->hasOne(HessamCategoryTranslation::class,"category_id");
+        return $this->hasMany(HessamCategoryTranslation::class,"category_id");
     }
 
     /**
diff --git a/src/Models/HessamCategoryTranslation.php b/src/Models/HessamCategoryTranslation.php
index 2c92b8c..901b2e8 100644
--- a/src/Models/HessamCategoryTranslation.php
+++ b/src/Models/HessamCategoryTranslation.php
@@ -9,10 +9,11 @@ class HessamCategoryTranslation extends Model
 {
 
     public $fillable = [
+        'category_id',
         'category_name',
         'slug',
         'category_description',
-        'parent_id'
+        'lang_id'
     ];
 
     /**
diff --git a/src/Models/HessamLanguage.php b/src/Models/HessamLanguage.php
index 26861eb..4b8889c 100644
--- a/src/Models/HessamLanguage.php
+++ b/src/Models/HessamLanguage.php
@@ -5,7 +5,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class HessamLanguage
+class HessamLanguage extends Model
 {
     public $fillable = [
         'name',
diff --git a/src/Models/HessamPost.php b/src/Models/HessamPost.php
index cdfebe6..aff720b 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/HessamPost.php
@@ -44,12 +44,12 @@ class HessamPost extends Model implements SearchResultInterface
     ];
 
     /**
-     * The associated post translation
+     * The associated post translations
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
-    public function postTranslation()
+    public function postTranslations()
     {
-        return $this->hasOne(HessamPostTranslation::class,"post_id");
+        return $this->hasMany(HessamPostTranslation::class,"post_id");
     }
 
     /**
@@ -152,155 +152,4 @@ public function edit_url()
         return route("blogetc.admin.edit_post", $this->id);
     }
 
-    /**
-     * If $this->user_view_file is not empty, then it'll return the dot syntax location of the blade file it should look for
-     * @return string
-     * @throws \Exception
-     */
-    public function full_view_file_path()
-    {
-        if (!$this->use_view_file) {
-            throw new \RuntimeException("use_view_file was empty, so cannot use " . __METHOD__);
-        }
-        return "custom_blog_posts." . $this->use_view_file;
-    }
-
-
-    /**
-     * Does this object have an uploaded image of that size...?
-     *
-     * @param string $size
-     * @return int
-     */
-    public function has_image($size = 'medium')
-    {
-        $this->check_valid_image_size($size);
-        return strlen($this->{"image_" . $size});
-    }
-
-    /**
-     * Get the full URL for an image
-     * You should use ::has_image($size) to check if the size is valid
-     *
-     * @param string $size - should be 'medium' , 'large' or 'thumbnail'
-     * @return string
-     */
-    public function image_url($size = 'medium')
-    {
-        $this->check_valid_image_size($size);
-        $filename = $this->{"image_" . $size};
-        return asset(config("blogetc.blog_upload_dir", "blog_images") . "/" . $filename);
-    }
-
-    /**
-     * Generate a full <img src='' alt=''> img tag
-     *
-     * @param string $size - large, medium, thumbnail
-     * @param boolean $auto_link - if true then itll add <a href=''>...</a> around the <img> tag
-     * @param null|string $img_class - if you want any additional CSS classes for this tag for the <IMG>
-     * @param null|string $anchor_class - is you want any additional CSS classes in the <a> anchor tag
-     * @return string
-     */
-    public function image_tag($size = 'medium', $auto_link = true, $img_class = null, $anchor_class = null)
-    {
-        if (!$this->has_image($size)) {
-            // return an empty string if this image does not exist.
-            return '';
-        }
-        $url = e($this->image_url($size));
-        $alt = e($this->title);
-        $img = "<img src='$url' alt='$alt' class='" . e($img_class) . "' >";
-        return $auto_link ? "<a class='" . e($anchor_class) . "' href='" . e($this->url()) . "'>$img</a>" : $img;
-
-    }
-
-    public function generate_introduction($max_len = 500)
-    {
-        $base_text_to_use = $this->short_description;
-        if (!trim($base_text_to_use)) {
-            $base_text_to_use = $this->post_body;
-        }
-        $base_text_to_use = strip_tags($base_text_to_use);
-
-        $intro = str_limit($base_text_to_use, (int)$max_len);
-        return nl2br(e($intro));
-    }
-
-    public function post_body_output()
-    {
-        if (config("blogetc.use_custom_view_files") && $this->use_view_file) {
-            // using custom view files is enabled, and this post has a use_view_file set, so render it:
-            $return = view("blogetc::partials.use_view_file", ['post' => $this])->render();
-        } else {
-            // just use the plain ->post_body
-            $return = $this->post_body;
-        }
-
-
-        if (!config("blogetc.echo_html")) {
-            // if this is not true, then we should escape the output
-            if (config("blogetc.strip_html")) {
-                $return = strip_tags($return);
-            }
-
-            $return = e($return);
-            if (config("blogetc.auto_nl2br")) {
-                $return = nl2br($return);
-            }
-        }
-
-        return $return;
-    }
-
-
-    /**
-     * Throws an exception if $size is not valid
-     * It should be either 'large','medium','thumbnail'
-     * @param string $size
-     * @return bool
-     * @throws \InvalidArgumentException
-     */
-    protected function check_valid_image_size(string $size = 'medium')
-    {
-
-
-        if (array_key_exists("image_" . $size, config("blogetc.image_sizes"))) {
-            return true;
-        }
-
-        // was an error!
-
-        if (starts_with($size, "image_")) {
-            // $size starts with image_, which is an error
-            /* the config/blogetc.php and the DB columns SHOULD have keys that start with image_$size
-            however when using methods such as image_url() or has_image() it SHOULD NOT start with 'image_'
-
-            To put another way: :
-                in the config/blogetc.php : config("blogetc.image_sizes.image_medium")
-                in the database table:    : blogetc_posts.image_medium
-                when calling image_url()  : image_url("medium")
-            */
-            throw new \InvalidArgumentException("Invalid image size ($size). HessamPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the blogetc.image_sizes config though!");
-        }
-
-
-        throw new \InvalidArgumentException("HessamPost image size should be 'large','medium','thumbnail' or another field as defined in config/blogetc.php. Provided size ($size) is not valid");
-    }
-
-
-    /**
-     *
-     * If $this->seo_title was set, return that.
-     * Otherwise just return $this->title
-     *
-     * Basically return $this->seo_title ?? $this->title;
-     * @return string
-     */
-    public function gen_seo_title()
-    {
-        if ($this->seo_title) {
-            return $this->seo_title;
-        }
-        return $this->title;
-    }
 }
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index 4e14be1..9c64e44 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -5,7 +5,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class HessamPostTranslation
+class HessamPostTranslation extends Model
 {
     public $fillable = [
 
@@ -36,4 +36,156 @@ public function language()
         return $this->hasOne(HessamLanguage::class,"lang_id");
     }
 
-}
\ No newline at end of file
+
+    /**
+     * If $this->user_view_file is not empty, then it'll return the dot syntax location of the blade file it should look for
+     * @return string
+     * @throws \Exception
+     */
+    public function full_view_file_path()
+    {
+        if (!$this->use_view_file) {
+            throw new \RuntimeException("use_view_file was empty, so cannot use " . __METHOD__);
+        }
+        return "custom_blog_posts." . $this->use_view_file;
+    }
+
+
+    /**
+     * Does this object have an uploaded image of that size...?
+     *
+     * @param string $size
+     * @return int
+     */
+    public function has_image($size = 'medium')
+    {
+        $this->check_valid_image_size($size);
+        return strlen($this->{"image_" . $size});
+    }
+
+    /**
+     * Get the full URL for an image
+     * You should use ::has_image($size) to check if the size is valid
+     *
+     * @param string $size - should be 'medium' , 'large' or 'thumbnail'
+     * @return string
+     */
+    public function image_url($size = 'medium')
+    {
+        $this->check_valid_image_size($size);
+        $filename = $this->{"image_" . $size};
+        return asset(config("blogetc.blog_upload_dir", "blog_images") . "/" . $filename);
+    }
+
+    /**
+     * Generate a full <img src='' alt=''> img tag
+     *
+     * @param string $size - large, medium, thumbnail
+     * @param boolean $auto_link - if true then itll add <a href=''>...</a> around the <img> tag
+     * @param null|string $img_class - if you want any additional CSS classes for this tag for the <IMG>
+     * @param null|string $anchor_class - is you want any additional CSS classes in the <a> anchor tag
+     * @return string
+     */
+    public function image_tag($size = 'medium', $auto_link = true, $img_class = null, $anchor_class = null)
+    {
+        if (!$this->has_image($size)) {
+            // return an empty string if this image does not exist.
+            return '';
+        }
+        $url = e($this->image_url($size));
+        $alt = e($this->title);
+        $img = "<img src='$url' alt='$alt' class='" . e($img_class) . "' >";
+        return $auto_link ? "<a class='" . e($anchor_class) . "' href='" . e($this->url()) . "'>$img</a>" : $img;
+
+    }
+
+    public function generate_introduction($max_len = 500)
+    {
+        $base_text_to_use = $this->short_description;
+        if (!trim($base_text_to_use)) {
+            $base_text_to_use = $this->post_body;
+        }
+        $base_text_to_use = strip_tags($base_text_to_use);
+
+        $intro = str_limit($base_text_to_use, (int)$max_len);
+        return nl2br(e($intro));
+    }
+
+    public function post_body_output()
+    {
+        if (config("blogetc.use_custom_view_files") && $this->use_view_file) {
+            // using custom view files is enabled, and this post has a use_view_file set, so render it:
+            $return = view("blogetc::partials.use_view_file", ['post' => $this])->render();
+        } else {
+            // just use the plain ->post_body
+            $return = $this->post_body;
+        }
+
+
+        if (!config("blogetc.echo_html")) {
+            // if this is not true, then we should escape the output
+            if (config("blogetc.strip_html")) {
+                $return = strip_tags($return);
+            }
+
+            $return = e($return);
+            if (config("blogetc.auto_nl2br")) {
+                $return = nl2br($return);
+            }
+        }
+
+        return $return;
+    }
+
+
+    /**
+     * Throws an exception if $size is not valid
+     * It should be either 'large','medium','thumbnail'
+     * @param string $size
+     * @return bool
+     * @throws \InvalidArgumentException
+     */
+    protected function check_valid_image_size(string $size = 'medium')
+    {
+
+
+        if (array_key_exists("image_" . $size, config("blogetc.image_sizes"))) {
+            return true;
+        }
+
+        // was an error!
+
+        if (starts_with($size, "image_")) {
+            // $size starts with image_, which is an error
+            /* the config/blogetc.php and the DB columns SHOULD have keys that start with image_$size
+            however when using methods such as image_url() or has_image() it SHOULD NOT start with 'image_'
+
+            To put another way: :
+                in the config/blogetc.php : config("blogetc.image_sizes.image_medium")
+                in the database table:    : blogetc_posts.image_medium
+                when calling image_url()  : image_url("medium")
+            */
+            throw new \InvalidArgumentException("Invalid image size ($size). HessamPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the blogetc.image_sizes config though!");
+        }
+
+
+        throw new \InvalidArgumentException("HessamPost image size should be 'large','medium','thumbnail' or another field as defined in config/blogetc.php. Provided size ($size) is not valid");
+    }
+
+
+    /**
+     *
+     * If $this->seo_title was set, return that.
+     * Otherwise just return $this->title
+     *
+     * Basically return $this->seo_title ?? $this->title;
+     * @return string
+     */
+    public function gen_seo_title()
+    {
+        if ($this->seo_title) {
+            return $this->seo_title;
+        }
+        return $this->title;
+    }
+}
diff --git a/src/Requests/StoreBlogEtcCategoryRequest.php b/src/Requests/StoreBlogEtcCategoryRequest.php
index d274275..ccb6c67 100755
--- a/src/Requests/StoreBlogEtcCategoryRequest.php
+++ b/src/Requests/StoreBlogEtcCategoryRequest.php
@@ -15,7 +15,7 @@ class StoreBlogEtcCategoryRequest extends BaseBlogEtcCategoryRequest
     public function rules()
     {
         $return = $this->baseCategoryRules();
-        $return['slug'] [] = Rule::unique("blog_etc_categories", "slug");
+        $return['slug'] [] = Rule::unique("hessam_category_translations", "slug");
         return $return;
     }
 }
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index 2ecdc64..3364b39 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -44,7 +44,7 @@ class="form-control"
                    required
                    aria-describedby="category_category_name_help"
                    name='category_name'
-                   value="{{old("category_name",$category->category_name)}}"
+                   value="{{old("category_name",$category_translation->category_name)}}"
             >
 
             <small id="category_category_name_help" class="form-text text-muted">The name of the category</small>
@@ -54,16 +54,16 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category slug</label>
             <input
-                maxlength='100'
-                pattern="[a-zA-Z0-9-]+"
-                type="text"
-                required
-                class="form-control"
-                id="category_slug"
-                oninput="SHOULD_AUTO_GEN_SLUG=false;"
-                aria-describedby="category_slug_help"
-                name='slug'
-                value="{{old("slug",$category->slug)}}"
+                    maxlength='100'
+                    pattern="[a-zA-Z0-9-]+"
+                    type="text"
+                    required
+                    class="form-control"
+                    id="category_slug"
+                    oninput="SHOULD_AUTO_GEN_SLUG=false;"
+                    aria-describedby="category_slug_help"
+                    name='slug'
+                    value="{{old("slug",$category_translation->slug)}}"
             >
 
             <small id="category_slug_help" class="form-text text-muted">
@@ -82,7 +82,7 @@ class="form-control"
                 </option>
                 @foreach($categories_list as $category)
                     <option  value='{{$category->id}}'>
-                        {{$category->category_name}}
+                        {{$category->categoryTranslations()->category_name}}
                     </option>
                 @endforeach
             </select>
@@ -93,7 +93,7 @@ class="form-control"
             <label for="category_description">Category Description (optional)</label>
             <textarea name='category_description'
                       class='form-control'
-                      id='category_description'>{{old("category_description",$category->category_description)}}</textarea>
+                      id='category_description'>{{old("category_description",$category_translation->category_description)}}</textarea>
 
         </div>
 
diff --git a/src/Views/blogetc_admin/languages/add_language.blade.php b/src/Views/blogetc_admin/languages/add_language.blade.php
new file mode 100755
index 0000000..e69de29
diff --git a/src/Views/blogetc_admin/languages/deleted_language.blade.php b/src/Views/blogetc_admin/languages/deleted_language.blade.php
new file mode 100755
index 0000000..e69de29
diff --git a/src/Views/blogetc_admin/languages/edit_language.blade.php b/src/Views/blogetc_admin/languages/edit_language.blade.php
new file mode 100755
index 0000000..e69de29
diff --git a/src/Views/blogetc_admin/languages/form.blade.php b/src/Views/blogetc_admin/languages/form.blade.php
new file mode 100755
index 0000000..e69de29
diff --git a/src/Views/blogetc_admin/languages/index.blade.php b/src/Views/blogetc_admin/languages/index.blade.php
new file mode 100755
index 0000000..e69de29
diff --git a/src/Views/blogetc_admin/layouts/sidebar.blade.php b/src/Views/blogetc_admin/layouts/sidebar.blade.php
index 7c8d76d..d61ebb0 100755
--- a/src/Views/blogetc_admin/layouts/sidebar.blade.php
+++ b/src/Views/blogetc_admin/layouts/sidebar.blade.php
@@ -106,4 +106,24 @@ class="fa fa-upload fa-fw" aria-hidden="true"></i>
             </div>
         </li>
     @endif
-</ul>
\ No newline at end of file
+
+    <li class="list-group-item list-group-color  justify-content-between lh-condensed">
+        <div>
+            <h6 class="my-0"><a href="{{ route('blogetc.admin.images.upload') }}">Languages</a></h6>
+
+            <div class="list-group ">
+
+                <a href='{{ route('blogetc.admin.images.all') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.images.all') active @endif  '><i
+                            class="fa fa-language fa-fw" aria-hidden="true"></i>
+                    All Languages</a>
+
+                <a href='{{ route('blogetc.admin.images.upload') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.images.upload') active @endif  '><i
+                            class="fa fa-plus fa-fw" aria-hidden="true"></i>
+                    Add new Language</a>
+            </div>
+        </div>
+    </li>
+
+</ul>
diff --git a/src/Views/blogetc_admin/posts/add_post.blade.php b/src/Views/blogetc_admin/posts/add_post.blade.php
index 3bf1d37..5cff62e 100755
--- a/src/Views/blogetc_admin/posts/add_post.blade.php
+++ b/src/Views/blogetc_admin/posts/add_post.blade.php
@@ -7,7 +7,10 @@
     <form method='post' action='{{route("blogetc.admin.store_post")}}'  enctype="multipart/form-data" >
 
         @csrf
-        @include("blogetc_admin::posts.form", ['post' => new \WebDevEtc\BlogEtc\Models\HessamPost()])
+        @include("blogetc_admin::posts.form", [
+    'post' => new \WebDevEtc\BlogEtc\Models\HessamPost(),
+    'post_translation' => new \WebDevEtc\BlogEtc\Models\HessamPostTranslation()
+    ])
 
         <input type='submit' class='btn btn-primary' value='Add new post' >
 
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/blogetc_admin/posts/form.blade.php
index 9462011..1957ff8 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/blogetc_admin/posts/form.blade.php
@@ -1,14 +1,14 @@
 <div class="form-group">
     <label for="blog_title">Blog Post Title</label>
     <input type="text" class="form-control" required id="blog_title" aria-describedby="blog_title_help" name='title'
-           value="{{old("title",$post->title)}}">
+           value="{{old("title",$post_translation->title)}}">
     <small id="blog_title_help" class="form-text text-muted">The title of the blog post</small>
 </div>
 
 <div class="form-group">
     <label for="blog_subtitle">Subtitle</label>
     <input type="text" class="form-control" id="blog_subtitle" aria-describedby="blog_subtitle_help" name='subtitle'
-           value='{{old("subtitle",$post->subtitle)}}'>
+           value='{{old("subtitle",$post_translation->subtitle)}}'>
     <small id="blog_subtitle_help" class="form-text text-muted">The subtitle of the blog post (optional)</small>
 </div>
 
@@ -22,7 +22,7 @@
         <div class="form-group">
             <label for="blog_slug">Blog Post Slug</label>
             <input type="text" class="form-control" id="blog_slug" aria-describedby="blog_slug_help" name='slug'
-                   value="{{old("slug",$post->slug)}}">
+                   value="{{old("slug",$post_translation->slug)}}">
             <small id="blog_slug_help" class="form-text text-muted">The slug (leave blank to auto generate) -
                 i.e. {{route("blogetc.single","")}}/<u><em>this_part</em></u></small>
         </div>
@@ -81,7 +81,7 @@
 
     </label>
     <textarea style='min-height:600px;' class="form-control" id="blog_post_body" aria-describedby="blog_post_body_help"
-              name='post_body'>{{old("post_body",$post->post_body)}}</textarea>
+              name='post_body'>{{old("post_body",$post_translation->post_body)}}</textarea>
 
 
     <div class='alert alert-warning'>
@@ -95,7 +95,7 @@
         <label for="blog_use_view_file">Custom View File</label>
         <input type="text" class="form-control" id="blog_use_view_file" aria-describedby="blog_use_view_file_help"
                name='use_view_file'
-               value='{{old("use_view_file",$post->use_view_file)}}'>
+               value='{{old("use_view_file",$post_translation->use_view_file)}}'>
         <small id="blog_use_view_file_help" class="form-text text-muted">Optional - if anything is entered here, then it
             will attempt to load <code>view("custom_blog_posts." . $use_view_file)</code>. You must create the file in
             /resources/views/custom_blog_posts/FILENAME.blade.php.
@@ -108,21 +108,21 @@
 <div class="form-group">
     <label for="blog_seo_title">SEO: {{"<title>"}} tag (optional)</label>
     <input class="form-control" id="blog_seo_title" aria-describedby="blog_seo_title_help"
-              name='seo_title' tyoe='text' value='{{old("seo_title",$post->seo_title)}}' >
+           name='seo_title' tyoe='text' value='{{old("seo_title",$post_translation->seo_title)}}' >
     <small id="blog_seo_title_help" class="form-text text-muted">Enter a value for the {{"<title>"}} tag. If nothing is provided here we will just use the normal post title from above (optional)</small>
 </div>
 
 <div class="form-group">
     <label for="blog_meta_desc">Meta Desc (optional)</label>
     <textarea class="form-control" id="blog_meta_desc" aria-describedby="blog_meta_desc_help"
-              name='meta_desc'>{{old("meta_desc",$post->meta_desc)}}</textarea>
+              name='meta_desc'>{{old("meta_desc",$post_translation->meta_desc)}}</textarea>
     <small id="blog_meta_desc_help" class="form-text text-muted">Meta description (optional)</small>
 </div>
 
 <div class="form-group">
     <label for="blog_short_description">Short Desc (optional)</label>
     <textarea class="form-control" id="blog_short_description" aria-describedby="blog_short_description_help"
-              name='short_description'>{{old("short_description",$post->short_description)}}</textarea>
+              name='short_description'>{{old("short_description",$post_translation->short_description)}}</textarea>
     <small id="blog_short_description_help" class="form-text text-muted">Short description (optional - only useful if you use in your template views)</small>
 </div>
 
@@ -143,10 +143,10 @@
                     image_upload_other_sizes
             @endif
                     ">
-                @if($post->has_image($size_info['basic_key']))
+                @if($post_translation->has_image($size_info['basic_key']))
                     <div style='max-width:55px;  ' class='float-right m-2'>
-                        <a style='cursor: zoom-in;' target='_blank' href='{{$post->image_url($size_info['basic_key'])}}'>
-                            <?=$post->image_tag($size_info['basic_key'], false, 'd-block mx-auto img-fluid '); ?>
+                        <a style='cursor: zoom-in;' target='_blank' href='{{$post_translation->image_url($size_info['basic_key'])}}'>
+                            <?=$post_translation->image_tag($size_info['basic_key'], false, 'd-block mx-auto img-fluid '); ?>
                         </a>
                     </div>
                 @endif
@@ -159,8 +159,8 @@
                 <input class="form-control" type="file" name="{{$size_key}}" id="blog_{{$size_key}}"
                        aria-describedby="blog_{{$size_key}}_help">
 
-                @if($post->has_image($size_info['basic_key']))
-                    <a style="color: darkred" href="{{route("blogetc.admin.remove_photo", $post->slug)}}">Remove Image</a>
+                @if($post_translation->has_image($size_info['basic_key']))
+                    <a style="color: darkred" href="{{route("blogetc.admin.remove_photo", $post_translation->slug)}}">Remove Image</a>
                 @endif
             </div>
         @endforeach
@@ -181,13 +181,13 @@ class='btn btn-light btn-sm'>Show other sizes</span>
     <h4>Categories:</h4>
     <div class='row'>
 
-        @forelse(\WebDevEtc\BlogEtc\Models\HessamCategory::orderBy("category_name","asc")->limit(1000)->get() as $category)
+        @forelse(\WebDevEtc\BlogEtc\Models\HessamCategory::orderBy("id","asc")->limit(1000)->get() as $category)
             <div class="form-check col-sm-6">
                 <input class="" type="checkbox" value="1"
                        @if(old("category.".$category->id, $post->categories->contains($category->id))) checked='checked'
                        @endif name='category[{{$category->id}}]' id="category_check{{$category->id}}">
                 <label class="form-check-label" for="category_check{{$category->id}}">
-                    {{$category->category_name}}
+                    {{$category->categoryTranslations()->category_name}}
                 </label>
             </div>
         @empty

From 89ba9dee818116d96346657cb5a2c29aefbf50dd Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 21 Oct 2020 02:14:07 +0330
Subject: [PATCH 006/118] adds language controller and add language blade view

---
 .../HessamLanguageAdminController.php         |  46 ++++++
 .../languages/add_language.blade.php          | 137 ++++++++++++++++++
 .../blogetc_admin/layouts/sidebar.blade.php   |  41 +++---
 src/routes.php                                |  27 ++++
 4 files changed, 231 insertions(+), 20 deletions(-)
 create mode 100644 src/Controllers/HessamLanguageAdminController.php

diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/HessamLanguageAdminController.php
new file mode 100644
index 0000000..6e108d6
--- /dev/null
+++ b/src/Controllers/HessamLanguageAdminController.php
@@ -0,0 +1,46 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Controllers;
+
+use App\Http\Controllers\Controller;
+use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
+
+class HessamLanguageAdminController extends Controller
+{
+    /**
+     * HessamLanguageAdminController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware(UserCanManageBlogPosts::class);
+    }
+
+    //todo
+    public function index(){
+
+    }
+
+    public function create_language(){
+        return view("blogetc_admin::languages.add_language");
+    }
+
+    //todo
+    public function store_language(){
+    }
+
+    //todo
+    public function edit_language(){
+
+    }
+
+    //todo:
+    public function update_language(){
+
+    }
+
+    //todo
+    public function destroy_language(){
+
+    }
+}
diff --git a/src/Views/blogetc_admin/languages/add_language.blade.php b/src/Views/blogetc_admin/languages/add_language.blade.php
index e69de29..1f059a9 100755
--- a/src/Views/blogetc_admin/languages/add_language.blade.php
+++ b/src/Views/blogetc_admin/languages/add_language.blade.php
@@ -0,0 +1,137 @@
+@extends("blogetc_admin::layouts.admin_layout")
+@section("content")
+
+
+    <h5>Add new Language</h5>
+
+    <form method='post' action='{{route("blogetc.admin.languages.store_language")}}'  enctype="multipart/form-data" >
+        @csrf
+
+        <div class="form-group">
+            <input checked type="checkbox" id="active" name="active" value="yes">
+            <label for="active"> Active</label><br>
+
+        </div>
+        <div class="form-group">
+            <select id="lang-name" data-placeholder="Choose a Language...">
+                <option value="AF">Afrikaans</option>
+                <option value="SQ">Albanian</option>
+                <option value="AR">Arabic</option>
+                <option value="HY">Armenian</option>
+                <option value="EU">Basque</option>
+                <option value="BN">Bengali</option>
+                <option value="BG">Bulgarian</option>
+                <option value="CA">Catalan</option>
+                <option value="KM">Cambodian</option>
+                <option value="ZH">Chinese (Mandarin)</option>
+                <option value="HR">Croatian</option>
+                <option value="CS">Czech</option>
+                <option value="DA">Danish</option>
+                <option value="NL">Dutch</option>
+                <option value="EN">English</option>
+                <option value="ET">Estonian</option>
+                <option value="FJ">Fiji</option>
+                <option value="FI">Finnish</option>
+                <option value="FR">French</option>
+                <option value="KA">Georgian</option>
+                <option value="DE">German</option>
+                <option value="EL">Greek</option>
+                <option value="GU">Gujarati</option>
+                <option value="HE">Hebrew</option>
+                <option value="HI">Hindi</option>
+                <option value="HU">Hungarian</option>
+                <option value="IS">Icelandic</option>
+                <option value="ID">Indonesian</option>
+                <option value="GA">Irish</option>
+                <option value="IT">Italian</option>
+                <option value="JA">Japanese</option>
+                <option value="JW">Javanese</option>
+                <option value="KO">Korean</option>
+                <option value="LA">Latin</option>
+                <option value="LV">Latvian</option>
+                <option value="LT">Lithuanian</option>
+                <option value="MK">Macedonian</option>
+                <option value="MS">Malay</option>
+                <option value="ML">Malayalam</option>
+                <option value="MT">Maltese</option>
+                <option value="MI">Maori</option>
+                <option value="MR">Marathi</option>
+                <option value="MN">Mongolian</option>
+                <option value="NE">Nepali</option>
+                <option value="NO">Norwegian</option>
+                <option value="FA">Persian</option>
+                <option value="PL">Polish</option>
+                <option value="PT">Portuguese</option>
+                <option value="PA">Punjabi</option>
+                <option value="QU">Quechua</option>
+                <option value="RO">Romanian</option>
+                <option value="RU">Russian</option>
+                <option value="SM">Samoan</option>
+                <option value="SR">Serbian</option>
+                <option value="SK">Slovak</option>
+                <option value="SL">Slovenian</option>
+                <option value="ES">Spanish</option>
+                <option value="SW">Swahili</option>
+                <option value="SV">Swedish </option>
+                <option value="TA">Tamil</option>
+                <option value="TT">Tatar</option>
+                <option value="TE">Telugu</option>
+                <option value="TH">Thai</option>
+                <option value="BO">Tibetan</option>
+                <option value="TO">Tonga</option>
+                <option value="TR">Turkish</option>
+                <option value="UK">Ukrainian</option>
+                <option value="UR">Urdu</option>
+                <option value="UZ">Uzbek</option>
+                <option value="VI">Vietnamese</option>
+                <option value="CY">Welsh</option>
+                <option value="XH">Xhosa</option>
+            </select>
+        </div>
+
+        <script>
+            $('#lang-name').change(function(){
+                var value = $(this).val().toLowerCase();
+                $('#language_name').val($("#lang-name option:selected").text());
+                $('#language_locale').val(value);
+                $('#iso_code').val(value);
+                console.log(value)
+            });
+        </script>
+
+        <div class="form-group">
+            <label for="language_name">Language Name</label>
+
+            <input type="text"
+                   class="form-control"
+                   id="language_name"
+                   required
+                   name='name'
+                   disabled
+            >
+
+            <small id="language_name" class="form-text text-muted">The name of the language</small>
+
+        </div>
+        <div class="form-group">
+            <label for="category_category_name">Locale</label>
+
+            <input type="text"
+                   class="form-control"
+                   id="language_locale"
+                   required
+                   name='locale'
+                   disabled
+            >
+
+            <small id="language_name" class="form-text text-muted">The locale of the language</small>
+
+        </div>
+
+        <input name="iso_code" value="" id="iso_code" style="display: none">
+        <input name="date_format" value="YYYY/MM/DD" style="display: none">
+
+        <input type='submit' class='btn btn-primary' value='Add New Language' >
+    </form>
+
+@endsection
diff --git a/src/Views/blogetc_admin/layouts/sidebar.blade.php b/src/Views/blogetc_admin/layouts/sidebar.blade.php
index d61ebb0..7390a20 100755
--- a/src/Views/blogetc_admin/layouts/sidebar.blade.php
+++ b/src/Views/blogetc_admin/layouts/sidebar.blade.php
@@ -86,6 +86,27 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
 
     </li>
 
+
+    <li class="list-group-item list-group-color  justify-content-between lh-condensed">
+        <div>
+            <h6 class="my-0"><a href="{{ route('blogetc.admin.images.upload') }}">Languages</a></h6>
+
+            <div class="list-group ">
+
+                <a href='{{ route('blogetc.admin.languages.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.languages.index') active @endif  '><i
+                            class="fa fa-language fa-fw" aria-hidden="true"></i>
+                    All Languages</a>
+
+                <a href='{{ route('blogetc.admin.languages.create_language') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.languages.create_language') active @endif  '><i
+                            class="fa fa-plus fa-fw" aria-hidden="true"></i>
+                    Add new Language</a>
+            </div>
+        </div>
+    </li>
+
+
     @if(config("blogetc.image_upload_enabled"))
         <li class="list-group-item list-group-color  justify-content-between lh-condensed">
             <div>
@@ -106,24 +127,4 @@ class="fa fa-upload fa-fw" aria-hidden="true"></i>
             </div>
         </li>
     @endif
-
-    <li class="list-group-item list-group-color  justify-content-between lh-condensed">
-        <div>
-            <h6 class="my-0"><a href="{{ route('blogetc.admin.images.upload') }}">Languages</a></h6>
-
-            <div class="list-group ">
-
-                <a href='{{ route('blogetc.admin.images.all') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.images.all') active @endif  '><i
-                            class="fa fa-language fa-fw" aria-hidden="true"></i>
-                    All Languages</a>
-
-                <a href='{{ route('blogetc.admin.images.upload') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.images.upload') active @endif  '><i
-                            class="fa fa-plus fa-fw" aria-hidden="true"></i>
-                    Add new Language</a>
-            </div>
-        </div>
-    </li>
-
 </ul>
diff --git a/src/routes.php b/src/routes.php
index eaf6057..546bc45 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -123,6 +123,33 @@
 
         });
 
+
+        Route::group(['prefix' => 'languages'], function () {
+
+            Route::get('/',
+                'HessamLanguageAdminController@index')
+                ->name('blogetc.admin.languages.index');
+
+            Route::get('/add_language',
+                'HessamLanguageAdminController@create_language')
+                ->name('blogetc.admin.languages.create_language');
+            Route::post('/add_language',
+                'HessamLanguageAdminController@store_language')
+                ->name('blogetc.admin.languages.store_language');
+
+            Route::get('/edit_language/{languageId}',
+                'HessamLanguageAdminController@edit_language')
+                ->name('blogetc.admin.languages.edit_language');
+
+            Route::patch('/edit_language/{languageId}',
+                'HessamLanguageAdminController@update_language')
+                ->name('blogetc.admin.languages.update_language');
+
+            Route::delete('/delete_language/{languageId}',
+                'HessamLanguageAdminController@destroy_language')
+                ->name('blogetc.admin.languages.destroy_language');
+
+        });
     });
 });
 

From 573c07a414a79e85c515cb7a611ca54955ffa960 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 22 Oct 2020 15:09:15 +0330
Subject: [PATCH 007/118] multi language support for categories

---
 ...6_004241_create_hessam_languages_table.php |   2 +-
 src/Config/blogetc.php                        |   1 +
 src/Controllers/HessamAdminController.php     |   2 +
 .../HessamCategoryAdminController.php         |  58 +++++---
 src/Middleware/LoadLanguage.php               |  19 +++
 src/Models/HessamCategory.php                 |   4 +-
 src/Requests/StoreBlogEtcCategoryRequest.php  |  21 ---
 .../categories/add_category.blade.php         | 134 +++++++++++++-----
 .../blogetc_admin/categories/index.blade.php  |   4 +-
 9 files changed, 170 insertions(+), 75 deletions(-)
 create mode 100644 src/Middleware/LoadLanguage.php
 delete mode 100755 src/Requests/StoreBlogEtcCategoryRequest.php

diff --git a/migrations/2020_10_16_004241_create_hessam_languages_table.php b/migrations/2020_10_16_004241_create_hessam_languages_table.php
index 9b5e8fb..51735b1 100644
--- a/migrations/2020_10_16_004241_create_hessam_languages_table.php
+++ b/migrations/2020_10_16_004241_create_hessam_languages_table.php
@@ -19,7 +19,7 @@ public function up()
             $table->string("name")->unique();
             $table->string("locale")->unique();
             $table->string("iso_code")->unique();
-            $table->string("date_format")->unique();
+            $table->string("date_format");
             $table->boolean("active")->default(true);
 
             $table->timestamps();
diff --git a/src/Config/blogetc.php b/src/Config/blogetc.php
index e091afb..1f537d8 100755
--- a/src/Config/blogetc.php
+++ b/src/Config/blogetc.php
@@ -3,6 +3,7 @@
 //config for hessam/laravel-blogger
 
 return [
+    'default_language' => 'en',
 
     //Your custom User model
     //Change it to \App\Models\User::class for laravel 8.x's default auth User model
diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 9b7ec5b..39a11bf 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -10,6 +10,7 @@
 use WebDevEtc\BlogEtc\Events\BlogPostEdited;
 use WebDevEtc\BlogEtc\Events\BlogPostWillBeDeleted;
 use WebDevEtc\BlogEtc\Helpers;
+use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
@@ -32,6 +33,7 @@ class HessamAdminController extends Controller
     public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
+        $this->middleware(LoadLanguage::class);
 
         if (!is_array(config("blogetc"))) {
             throw new \RuntimeException('The config/blogetc.php does not exist. Publish the vendor files for the BlogEtc package by running the php artisan publish:vendor command');
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index 9850700..991a5c1 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -3,6 +3,7 @@
 namespace WebDevEtc\BlogEtc\Controllers;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use WebDevEtc\BlogEtc\Events\CategoryAdded;
 use WebDevEtc\BlogEtc\Events\CategoryEdited;
 use WebDevEtc\BlogEtc\Events\CategoryWillBeDeleted;
@@ -10,6 +11,7 @@
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamCategory;
 use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
 use WebDevEtc\BlogEtc\Requests\DeleteBlogEtcCategoryRequest;
 use WebDevEtc\BlogEtc\Requests\StoreBlogEtcCategoryRequest;
 use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcCategoryRequest;
@@ -33,24 +35,30 @@ public function __construct()
      *
      * @return mixed
      */
-    public function index(){
-
-        $categories = HessamCategory::orderBy("category_name")->paginate(25);
-        return view("blogetc_admin::categories.index")->withCategories($categories);
+    public function index(Request $request){
+        $language_id = $request->cookie('language_id');
+        $categories = HessamCategory::orderBy("id")->paginate(25);
+        return view("blogetc_admin::categories.index",[
+            'categories' => $categories,
+            'language_id' => $language_id
+        ]);
     }
 
     /**
      * Show the form for creating new category
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function create_category(){
+    public function create_category(Request $request){
+        $language_id = $request->cookie('language_id');
+        $language_list = HessamLanguage::all();
 
         return view("blogetc_admin::categories.add_category",[
             'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
             'category_translation' => new \WebDevEtc\BlogEtc\Models\HessamCategoryTranslation(),
-            'categories_list' => HessamCategory::orderBy("id")->get()
+            'categories_list' => HessamCategory::orderBy("id")->get(),
+            'language_id' => $language_id,
+            'language_list' => $language_list
         ]);
-
     }
 
     /**
@@ -58,8 +66,13 @@ public function create_category(){
      *
      * @param StoreBlogEtcCategoryRequest $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     *
+     * This controller is totally REST controller
      */
-    public function store_category(StoreBlogEtcCategoryRequest $request){
+    public function store_category(Request $request){
+        $language_id = $request->cookie('language_id');
+        $language_list = $request['data'];
+
         if ($request['parent_id']== 0){
             $request['parent_id'] = null;
         }
@@ -67,17 +80,28 @@ public function store_category(StoreBlogEtcCategoryRequest $request){
             'parent_id' => $request['parent_id']
         ]);
 
-        $new_category_translation = $new_category->categoryTranslations()->create([
-            'category_name' => $request['category_name'],
-            'slug' => $request['slug'],
-            'category_description' => $request['category_description'],
-            'lang_id' => $request['lang_id'],
-            'category_id' => $new_category->id
-        ]);
-
-        Helpers::flash_message("Saved new category");
+        foreach ($language_list as $key => $value) {
+            //check for slug availability
+            $obj = HessamCategoryTranslation::where('slug',$value['slug'])->first();
+            if ($obj){
+                HessamCategory::destroy($new_category->id);
+                return response()->json([
+                    'code' => 403,
+                    'message' => "slug is already taken",
+                    'data' => $value['lang_id']
+                ]);
+            }
+            $new_category_translation = $new_category->categoryTranslations()->create([
+                'category_name' => $value['category_name'],
+                'slug' => $value['slug'],
+                'category_description' => $value['category_description'],
+                'lang_id' => $value['lang_id'],
+                'category_id' => $new_category->id
+            ]);
+        }
 
         event(new CategoryAdded($new_category, $new_category_translation));
+        Helpers::flash_message("Saved new category");
         return redirect( route('blogetc.admin.categories.index') );
     }
 
diff --git a/src/Middleware/LoadLanguage.php b/src/Middleware/LoadLanguage.php
new file mode 100644
index 0000000..30ff3f7
--- /dev/null
+++ b/src/Middleware/LoadLanguage.php
@@ -0,0 +1,19 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Middleware;
+use Closure;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
+
+class LoadLanguage
+{
+
+    public function handle($request, Closure $next)
+    {
+        $language_id = HessamLanguage::where('locale',config("blogetc.default_language"))->first()->id;
+
+        $response = $next($request);
+        $response->withCookie(cookie()->forever('language_id', $language_id));
+        return $response;
+    }
+}
diff --git a/src/Models/HessamCategory.php b/src/Models/HessamCategory.php
index bee8623..096f066 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/HessamCategory.php
@@ -35,12 +35,12 @@ public function posts()
      * Returns the public facing URL of showing blog posts in this category
      * @return string
      */
-    public function url()
+    public function url($language_id)
     {
         $theChainString = "";
         $chain = $this->getAncestorsAndSelf();
         foreach ($chain as $category){
-            $theChainString .=  "/" . $category->slug;
+            $theChainString .=  "/" . $category->categoryTranslations()->where('lang_id', $language_id)->first()->slug;
         }
         return route("blogetc.view_category", $theChainString);
     }
diff --git a/src/Requests/StoreBlogEtcCategoryRequest.php b/src/Requests/StoreBlogEtcCategoryRequest.php
deleted file mode 100755
index ccb6c67..0000000
--- a/src/Requests/StoreBlogEtcCategoryRequest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace WebDevEtc\BlogEtc\Requests;
-
-
-use Illuminate\Validation\Rule;
-
-class StoreBlogEtcCategoryRequest extends BaseBlogEtcCategoryRequest
-{
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        $return = $this->baseCategoryRules();
-        $return['slug'] [] = Rule::unique("hessam_category_translations", "slug");
-        return $return;
-    }
-}
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index 3364b39..f643cea 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -1,45 +1,28 @@
 @extends("blogetc_admin::layouts.admin_layout")
 @section("content")
 
-
     <h5>Admin - Add Category</h5>
-
     <form method='post' action='{{route("blogetc.admin.categories.create_category")}}'  enctype="multipart/form-data" >
 
         @csrf
 
-        <script>
-            SHOULD_AUTO_GEN_SLUG = false;
-
-            /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
-            function populate_slug_field() {
-
-//        alert("A");
-                var cat_slug = document.getElementById('category_slug');
-
-                if (cat_slug.value.length < 1) {
-                    // if the slug field is empty, make sure it auto generates
-                    SHOULD_AUTO_GEN_SLUG = true;
-                }
-
-                if (SHOULD_AUTO_GEN_SLUG) {
-                    // the slug hasn't been manually changed (or it was set above), so we should generate the slug
-                    // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
-                    cat_slug.value =document.getElementById("category_category_name").value.toLowerCase()
-                        .replace(/[^\w-_ ]+/g, '') // replace with nothing
-                        .replace(/[_ ]+/g, '-') // replace _ and spaces with -
-                        .substring(0,99); // limit str length
-
-                }
+        <div class="form-group">
+            <label for="language_list">Select Language</label>
+            <select id="language_list" name='lang_id' class='form-control'>
+                @foreach($language_list as $language)
+                    <option  value='{{$language->id}}' @if($language->id == $language_id)selected="selected" @endif>
+                        {{$language->name}}
+                    </option>
+                @endforeach
+            </select>
+        </div>
 
-            }
-        </script>
         <div class="form-group">
             <label for="category_category_name">Category Name</label>
 
             <input type="text"
                    class="form-control"
-                   id="category_category_name"
+                   id="category_name"
                    oninput="populate_slug_field();"
                    required
                    aria-describedby="category_category_name_help"
@@ -76,13 +59,13 @@ class="form-control"
 
         <div class="form-group">
             <label for="category_slug">Parent Category</label>
-            <select name='parent_id' class='form-control'>
+            <select id="parent_id" name='parent_id' class='form-control'>
                 <option  selected='selected' value='0'>
                     Root
                 </option>
                 @foreach($categories_list as $category)
                     <option  value='{{$category->id}}'>
-                        {{$category->categoryTranslations()->category_name}}
+                        {{$category->categoryTranslations()->where('lang_id', $language_id)->first()->category_name}}
                     </option>
                 @endforeach
             </select>
@@ -97,17 +80,104 @@ class='form-control'
 
         </div>
 
+        <button type="button" class='btn btn-primary' id="submit-btn">Add new category</button>
+
         <script>
+            SHOULD_AUTO_GEN_SLUG = false;
+
+            /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
+            function populate_slug_field() {
+
+//        alert("A");
+                var cat_slug = document.getElementById('category_slug');
+
+                if (cat_slug.value.length < 1) {
+                    // if the slug field is empty, make sure it auto generates
+                    SHOULD_AUTO_GEN_SLUG = true;
+                }
+
+                if (SHOULD_AUTO_GEN_SLUG) {
+                    // the slug hasn't been manually changed (or it was set above), so we should generate the slug
+                    // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
+                    cat_slug.value =document.getElementById("category_name").value.toLowerCase()
+                        .replace(/[^\w-_ ]+/g, '') // replace with nothing
+                        .replace(/[_ ]+/g, '-') // replace _ and spaces with -
+                        .substring(0,99); // limit str length
+
+                }
+
+            }
+
             if (document.getElementById("category_slug").value.length < 1) {
                 SHOULD_AUTO_GEN_SLUG = true;
             } else {
                 SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
             }
-        </script>
 
 
-        <input type='submit' class='btn btn-primary' value='Add new category' >
+            //multi-language data
+            var defalutLangId = {{$language_id}}
+            var preLangId = defalutLangId;
+            var languageList = {};
+            $("#language_list > option").each(function() {
+                languageList[this.value] = {
+                    lang_id: -1,
+                    category_name: "",
+                    slug: "",
+                    category_description: "",
+                    lang_name: this.text
+                }
+            });
+
+            $('#language_list').on('change', function() {
+                fillLanguageList(this.value);
+                preLangId = this.value;
+            });
+
+            function fillLanguageList(langId){
+                languageList[preLangId].lang_id = preLangId;
+                languageList[preLangId].category_name = $('#category_name').val();
+                languageList[preLangId].slug = $('#category_slug').val();
+                languageList[preLangId].category_description = $('#category_description').val();
+
+                $('#category_name').val(languageList[langId].category_name);
+                $('#category_slug').val(languageList[langId].slug);
+                $('#category_description').val(languageList[langId].category_description);
+            }
 
+            $.ajaxSetup({
+                headers: {
+                    'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+                }
+            });
+
+            $('#submit-btn').click(function (){
+                if (languageList[$('#language_list').val()].lang_id == -1){
+                    if (!$('#category_name').val()){
+                        alert("Category name must not be empty");
+                        return ;
+                    }else if (!$('#category_slug').val()){
+                        alert("Category slug must not be empty");
+                        return ;
+                    }
+                    languageList[preLangId].lang_id = $('#language_list').val();
+                    languageList[preLangId].category_name = $('#category_name').val();
+                    languageList[preLangId].slug = $('#category_slug').val();
+                    languageList[preLangId].category_description = $('#category_description').val();
+                }
+                $.post('{{route("blogetc.admin.categories.store_category")}}' ,
+                    {
+                        data: languageList,
+                        parent_id: parseInt($('#parent_id').val())
+                    },
+                    function(data, status){
+                        if (data.code === 403){
+                            alert("Slug is already taken: " + languageList[data.data].lang_name);
+                        }
+                    });
+            });
+
+        </script>
     </form>
 
 @endsection
diff --git a/src/Views/blogetc_admin/categories/index.blade.php b/src/Views/blogetc_admin/categories/index.blade.php
index 448a723..bea8327 100755
--- a/src/Views/blogetc_admin/categories/index.blade.php
+++ b/src/Views/blogetc_admin/categories/index.blade.php
@@ -5,10 +5,10 @@
 
         <div class="card m-4">
             <div class="card-body">
-                <h5 class='card-title'><a class="a-link-cart-color" href='{{$category->url()}}'>{{$category->category_name}}</a></h5>
+                <h5 class='card-title'><a class="a-link-cart-color" href='{{$category->url($language_id)}}'>{{$category->categoryTranslations()->where('lang_id', $language_id)->first()->category_name}}</a></h5>
 
 
-                <a href="{{$category->url()}}" class="card-link btn btn-outline-secondary">View Posts in this category</a>
+                <a href="{{$category->url($language_id)}}" class="card-link btn btn-outline-secondary">View Posts in this category</a>
                 <a href="{{$category->edit_url()}}" class="card-link btn btn-primary">Edit Category</a>
                 <form
 

From 7486983d9e4c6180fb55e447f93654b9b45fc7e8 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 22 Oct 2020 16:52:29 +0330
Subject: [PATCH 008/118] adds hessam configuration

---
 ...005_create_hessam_configurations_table.php | 32 +++++++++++++++++++
 src/Models/HessamConfiguration.php            | 18 +++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 migrations/2020_10_22_132005_create_hessam_configurations_table.php
 create mode 100644 src/Models/HessamConfiguration.php

diff --git a/migrations/2020_10_22_132005_create_hessam_configurations_table.php b/migrations/2020_10_22_132005_create_hessam_configurations_table.php
new file mode 100644
index 0000000..72ffee1
--- /dev/null
+++ b/migrations/2020_10_22_132005_create_hessam_configurations_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHessamConfigurationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('hessam_configurations', function (Blueprint $table) {
+            $table->string("key")->primary();
+            $table->string("value");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('hessam_configurations');
+    }
+}
diff --git a/src/Models/HessamConfiguration.php b/src/Models/HessamConfiguration.php
new file mode 100644
index 0000000..628491d
--- /dev/null
+++ b/src/Models/HessamConfiguration.php
@@ -0,0 +1,18 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+
+/**
+ *
+*/
+class HessamConfiguration extends Model
+{
+    public $fillable = [
+        'key',
+        'value'
+    ];
+}

From 7dd151a6ec57663990ae1c1a48aae65871013b87 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 24 Oct 2020 05:57:03 +0330
Subject: [PATCH 009/118] add language functionality

---
 .../HessamCategoryAdminController.php         |  2 +-
 .../HessamLanguageAdminController.php         | 54 ++++++++++++++-----
 .../categories/add_category.blade.php         |  8 +--
 .../languages/add_language.blade.php          | 11 ++--
 .../blogetc_admin/languages/index.blade.php   | 49 +++++++++++++++++
 src/routes.php                                | 14 ++---
 6 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index 991a5c1..58aec8f 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -50,7 +50,7 @@ public function index(Request $request){
      */
     public function create_category(Request $request){
         $language_id = $request->cookie('language_id');
-        $language_list = HessamLanguage::all();
+        $language_list = HessamLanguage::where('active',true)->get();
 
         return view("blogetc_admin::categories.add_category",[
             'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/HessamLanguageAdminController.php
index 6e108d6..60e17d9 100644
--- a/src/Controllers/HessamLanguageAdminController.php
+++ b/src/Controllers/HessamLanguageAdminController.php
@@ -4,7 +4,10 @@
 namespace WebDevEtc\BlogEtc\Controllers;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
 
 class HessamLanguageAdminController extends Controller
 {
@@ -16,31 +19,58 @@ public function __construct()
         $this->middleware(UserCanManageBlogPosts::class);
     }
 
-    //todo
     public function index(){
-
+        $language_list = HessamLanguage::all();
+        return view("blogetc_admin::languages.index",[
+            'language_list' => $language_list
+        ]);
     }
 
     public function create_language(){
         return view("blogetc_admin::languages.add_language");
     }
 
-    //todo
-    public function store_language(){
-    }
+    public function store_language(Request $request){
+        $language = new HessamLanguage();
+        $language->active = $request['active'];
+        $language->iso_code = $request['iso_code'];
+        $language->locale = $request['locale'];
+        $language->name = $request['name'];
+        $language->date_format = $request['date_format'];
 
-    //todo
-    public function edit_language(){
+        $language->save();
 
+        Helpers::flash_message("Language: " . $language->name . " has been added.");
+        return redirect( route('blogetc.admin.languages.index') );
     }
 
-    //todo:
-    public function update_language(){
-
+    public function destroy_language(Request $request, $languageId){
+        try {
+            $language = HessamLanguage::findOrFail($languageId);
+            //todo
+//        event(new CategoryWillBeDeleted($category));
+            $language->delete();
+            Helpers::flash_message("The language is successfully deleted!");
+            return redirect( route('blogetc.admin.languages.index') );
+        } catch (\Illuminate\Database\QueryException $e) {
+            Helpers::flash_message("You can not delete this language, because it's used in posts or categoies.");
+            return redirect( route('blogetc.admin.languages.index') );
+        }
     }
 
-    //todo
-    public function destroy_language(){
+    public function toggle_language(Request $request, $languageId){
+        $language = HessamLanguage::findOrFail($languageId);
+        if ($language->active == 1){
+            $language->active = 0;
+        }else if ($language->active == 0){
+            $language->active = 1;
+        }
+
+        $language->save();
+        //todo
+        //event
 
+        Helpers::flash_message("Language: " . $language->name . " has been disabled.");
+        return redirect( route('blogetc.admin.languages.index') );
     }
 }
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index f643cea..35cde1b 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -10,9 +10,11 @@
             <label for="language_list">Select Language</label>
             <select id="language_list" name='lang_id' class='form-control'>
                 @foreach($language_list as $language)
-                    <option  value='{{$language->id}}' @if($language->id == $language_id)selected="selected" @endif>
-                        {{$language->name}}
-                    </option>
+                    @if($language->active)
+                        <option  value='{{$language->id}}' @if($language->id == $language_id)selected="selected" @endif>
+                            {{$language->name}}
+                        </option>
+                    @endif
                 @endforeach
             </select>
         </div>
diff --git a/src/Views/blogetc_admin/languages/add_language.blade.php b/src/Views/blogetc_admin/languages/add_language.blade.php
index 1f059a9..fad322d 100755
--- a/src/Views/blogetc_admin/languages/add_language.blade.php
+++ b/src/Views/blogetc_admin/languages/add_language.blade.php
@@ -8,8 +8,11 @@
         @csrf
 
         <div class="form-group">
-            <input checked type="checkbox" id="active" name="active" value="yes">
-            <label for="active"> Active</label><br>
+            <label for="active"> Active</label>
+            <input checked type="radio" id="active" name="active" value="1">
+            <label for="deactive"> Deactive</label>
+            <input type="radio" id="deactive" name="active" value="0">
+            <br>
 
         </div>
         <div class="form-group">
@@ -107,7 +110,7 @@ class="form-control"
                    id="language_name"
                    required
                    name='name'
-                   disabled
+                   readonly
             >
 
             <small id="language_name" class="form-text text-muted">The name of the language</small>
@@ -121,7 +124,7 @@ class="form-control"
                    id="language_locale"
                    required
                    name='locale'
-                   disabled
+                   readonly
             >
 
             <small id="language_name" class="form-text text-muted">The locale of the language</small>
diff --git a/src/Views/blogetc_admin/languages/index.blade.php b/src/Views/blogetc_admin/languages/index.blade.php
index e69de29..1fe14e2 100755
--- a/src/Views/blogetc_admin/languages/index.blade.php
+++ b/src/Views/blogetc_admin/languages/index.blade.php
@@ -0,0 +1,49 @@
+@extends("blogetc_admin::layouts.admin_layout")
+@section("content")
+
+    @forelse ($language_list as $language)
+
+        <div class="card m-4">
+            <div class="card-body">
+                <h5 class='card-title'>{{$language->name}}</h5>
+                <p><span><b>Locale: </b> {{$language->locale}}</span></p>
+                <p><span><b>Date format: </b> {{$language->date_format}}</span></p>
+                <p><span><b>Active: </b>
+                        @if($language->active == 1)
+                            Yes
+                        @else
+                            No
+                        @endif
+                    </span></p>
+
+                <form
+                        onsubmit="return confirm('Are you sure you want to do this action?');"
+
+                        method='post' action='{{route("blogetc.admin.languages.toggle_language", $language->id)}}' class='float-left'>
+                    @csrf
+
+                    @if($language->active == 1)
+                        <input type='submit' class='card-link btn btn-outline-secondary' value='Disable'/>
+
+                    @else
+                        <input type='submit' class='card-link btn btn-primary' value='Enable'/>
+                    @endif
+                </form>
+
+
+                <form
+                        onsubmit="return confirm('Are you sure you want to delete this language?\n You cannot undo this action!');"
+
+                        method='post' action='{{route("blogetc.admin.languages.destroy_language", $language->id)}}' class='float-right'>
+                    @csrf
+                    @method("DELETE")
+                    <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
+                </form>
+
+            </div>
+        </div>
+
+    @empty
+        <div class='alert alert-danger'>None found, why don't you add one?</div>
+    @endforelse
+@endsection
diff --git a/src/routes.php b/src/routes.php
index 546bc45..c45dcb3 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -105,7 +105,7 @@
             Route::get('/add_category',
                 'HessamCategoryAdminController@create_category')
                 ->name('blogetc.admin.categories.create_category');
-            Route::post('/add_category',
+            Route::post('/store_category',
                 'HessamCategoryAdminController@store_category')
                 ->name('blogetc.admin.categories.store_category');
 
@@ -137,18 +137,14 @@
                 'HessamLanguageAdminController@store_language')
                 ->name('blogetc.admin.languages.store_language');
 
-            Route::get('/edit_language/{languageId}',
-                'HessamLanguageAdminController@edit_language')
-                ->name('blogetc.admin.languages.edit_language');
-
-            Route::patch('/edit_language/{languageId}',
-                'HessamLanguageAdminController@update_language')
-                ->name('blogetc.admin.languages.update_language');
-
             Route::delete('/delete_language/{languageId}',
                 'HessamLanguageAdminController@destroy_language')
                 ->name('blogetc.admin.languages.destroy_language');
 
+            Route::post('/toggle_language/{languageId}',
+                'HessamLanguageAdminController@toggle_language')
+                ->name('blogetc.admin.languages.toggle_language');
+
         });
     });
 });

From 3c44ee4ca3b2d3fc9b4464a6d031744f6df30428 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 28 Oct 2020 03:52:41 +0330
Subject: [PATCH 010/118] partial multi lang post

---
 src/Controllers/HessamAdminController.php     |  14 +-
 .../HessamCategoryAdminController.php         |   4 +-
 src/Events/UploadedImage.php                  |   3 +-
 src/Models/HessamCategory.php                 |  26 +---
 src/Models/HessamCategoryTranslation.php      |  27 +++-
 src/Models/HessamPost.php                     |  38 +-----
 src/Requests/CreateBlogEtcPostRequest.php     |   1 -
 src/Traits/UploadFileTrait.php                |   3 +-
 .../categories/add_category.blade.php         |  12 +-
 .../blogetc_admin/categories/index.blade.php  |   4 +-
 src/Views/blogetc_admin/posts/form.blade.php  | 123 +++++++++++++++++-
 11 files changed, 169 insertions(+), 86 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 39a11bf..bfb4a81 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -12,6 +12,8 @@
 use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
+use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
 use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
 use WebDevEtc\BlogEtc\Requests\CreateBlogEtcPostRequest;
@@ -58,9 +60,17 @@ public function index()
      * Show form for creating new post
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function create_post()
+    public function create_post(Request $request)
     {
-        return view("blogetc_admin::posts.add_post");
+        $language_id = $request->cookie('language_id');
+        $language_list = HessamLanguage::where('active',true)->get();
+        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+
+        return view("blogetc_admin::posts.add_post", [
+            'language_id' => $language_id,
+            'cat_ts' => $ts,
+            'language_list' => $language_list
+        ]);
     }
 
     /**
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index 58aec8f..a69f7d0 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -37,7 +37,7 @@ public function __construct()
      */
     public function index(Request $request){
         $language_id = $request->cookie('language_id');
-        $categories = HessamCategory::orderBy("id")->paginate(25);
+        $categories = HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->paginate(25);
         return view("blogetc_admin::categories.index",[
             'categories' => $categories,
             'language_id' => $language_id
@@ -55,7 +55,7 @@ public function create_category(Request $request){
         return view("blogetc_admin::categories.add_category",[
             'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
             'category_translation' => new \WebDevEtc\BlogEtc\Models\HessamCategoryTranslation(),
-            'categories_list' => HessamCategory::orderBy("id")->get(),
+            'categories_list' => HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->get(),
             'language_id' => $language_id,
             'language_list' => $language_list
         ]);
diff --git a/src/Events/UploadedImage.php b/src/Events/UploadedImage.php
index 333f2a1..54495c9 100644
--- a/src/Events/UploadedImage.php
+++ b/src/Events/UploadedImage.php
@@ -6,6 +6,7 @@
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use WebDevEtc\BlogEtc\Models\HessamPost;
+use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
 
 /**
  * Class UploadedImage
@@ -33,7 +34,7 @@ class UploadedImage
      * @param $image
      * @param $source string|null  the __METHOD__  firing this event (or other string)
      */
-    public function __construct(string $image_filename, $image, HessamPost $blogEtcPost=null, string $source='other')
+    public function __construct(string $image_filename, $image, HessamPostTranslation $blogEtcPost=null, string $source='other')
     {
         $this->image_filename = $image_filename;
         $this->blogEtcPost=$blogEtcPost;
diff --git a/src/Models/HessamCategory.php b/src/Models/HessamCategory.php
index 096f066..2367e6c 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/HessamCategory.php
@@ -2,7 +2,6 @@
 
 namespace WebDevEtc\BlogEtc\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use WebDevEtc\BlogEtc\Baum\Node;
 
 class HessamCategory extends Node
@@ -28,30 +27,7 @@ public function categoryTranslations()
      */
     public function posts()
     {
-        return $this->belongsToMany(HessamPost::class, 'hessam_post_categories');
-    }
-
-    /**
-     * Returns the public facing URL of showing blog posts in this category
-     * @return string
-     */
-    public function url($language_id)
-    {
-        $theChainString = "";
-        $chain = $this->getAncestorsAndSelf();
-        foreach ($chain as $category){
-            $theChainString .=  "/" . $category->categoryTranslations()->where('lang_id', $language_id)->first()->slug;
-        }
-        return route("blogetc.view_category", $theChainString);
-    }
-
-    /**
-     * Returns the URL for an admin user to edit this category
-     * @return string
-     */
-    public function edit_url()
-    {
-        return route("blogetc.admin.categories.edit_category", $this->id);
+        return $this->belongsToMany(HessamPost::class, 'hessam_post_categories','category_id', 'post_id');
     }
 
     public function loadSiblings(){
diff --git a/src/Models/HessamCategoryTranslation.php b/src/Models/HessamCategoryTranslation.php
index 901b2e8..e67aee5 100644
--- a/src/Models/HessamCategoryTranslation.php
+++ b/src/Models/HessamCategoryTranslation.php
@@ -17,7 +17,7 @@ class HessamCategoryTranslation extends Model
     ];
 
     /**
-     * Get the user that owns the phone.
+     * Get the category that owns the phone.
      */
     public function category()
     {
@@ -33,4 +33,27 @@ public function language()
         return $this->hasOne(HessamLanguage::class,"lang_id");
     }
 
-}
\ No newline at end of file
+    /**
+     * Returns the public facing URL of showing blog posts in this category
+     * @return string
+     */
+    public function url($language_id)
+    {
+        $theChainString = "";
+        $cat = $this->category()->get();
+        $chain = $cat[0]->getAncestorsAndSelf();
+        foreach ($chain as $category){
+            $theChainString .=  "/" . $category->slug;
+        }
+        return route("blogetc.view_category", $theChainString);
+    }
+
+    /**
+     * Returns the URL for an admin user to edit this category
+     * @return string
+     */
+    public function edit_url()
+    {
+        return route("blogetc.admin.categories.edit_category", $this->category_id);
+    }
+}
diff --git a/src/Models/HessamPost.php b/src/Models/HessamPost.php
index aff720b..1d76a1b 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/HessamPost.php
@@ -2,25 +2,15 @@
 
 namespace WebDevEtc\BlogEtc\Models;
 
-use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Model;
-use Swis\Laravel\Fulltext\Indexable;
-use WebDevEtc\BlogEtc\Interfaces\SearchResultInterface;
 use WebDevEtc\BlogEtc\Scopes\BlogEtcPublishedScope;
 
 /**
  * Class HessamPost
  * @package WebDevEtc\BlogEtc\Models
  */
-class HessamPost extends Model implements SearchResultInterface
+class HessamPost extends Model
 {
-
-    use Sluggable;
-    use Indexable;
-
-    protected $indexContentColumns = ['post_body', 'short_description', 'meta_desc',];
-    protected $indexTitleColumns = ['title', 'subtitle', 'seo_title',];
-
     /**
      * @var array
      */
@@ -52,30 +42,6 @@ public function postTranslations()
         return $this->hasMany(HessamPostTranslation::class,"post_id");
     }
 
-    /**
-     * Return the sluggable configuration array for this model.
-     *
-     * @return array
-     */
-    public function sluggable()
-    {
-        return [
-            'slug' => [
-                'source' => 'title'
-            ]
-        ];
-    }
-
-    public function search_result_page_url()
-    {
-        return $this->url();
-    }
-
-    public function search_result_page_title()
-    {
-        return $this->title;
-    }
-
     /**
      * The "booting" method of the model.
      *
@@ -120,7 +86,7 @@ public function author_string()
      */
     public function categories()
     {
-        return $this->belongsToMany(HessamCategory::class, 'hessam_post_categories');
+        return $this->belongsToMany(HessamCategory::class, 'hessam_post_categories','post_id','category_id');
     }
 
     /**
diff --git a/src/Requests/CreateBlogEtcPostRequest.php b/src/Requests/CreateBlogEtcPostRequest.php
index 0a012ff..7defddb 100755
--- a/src/Requests/CreateBlogEtcPostRequest.php
+++ b/src/Requests/CreateBlogEtcPostRequest.php
@@ -20,7 +20,6 @@ class CreateBlogEtcPostRequest extends BaseBlogEtcPostRequest
     public function rules()
     {
         $return = $this->baseBlogPostRules();
-        $return['slug'] [] = Rule::unique("blog_etc_posts", "slug");
         return $return;
     }
 
diff --git a/src/Traits/UploadFileTrait.php b/src/Traits/UploadFileTrait.php
index 3a4befc..cbe3200 100644
--- a/src/Traits/UploadFileTrait.php
+++ b/src/Traits/UploadFileTrait.php
@@ -6,6 +6,7 @@
 use WebDevEtc\BlogEtc\Events\UploadedImage;
 use WebDevEtc\BlogEtc\Models\HessamPost;
 use File;
+use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
 
 trait UploadFileTrait
 {
@@ -90,7 +91,7 @@ protected function image_destination_path()
      * @return array
      * @throws \Exception
      */
-    protected function UploadAndResize(HessamPost $new_blog_post = null, $suggested_title, $image_size_details, $photo)
+    protected function UploadAndResize(HessamPostTranslation $new_blog_post = null, $suggested_title, $image_size_details, $photo)
     {
         // get the filename/filepath
         $image_filename = $this->getImageFilename($suggested_title, $image_size_details, $photo);
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index 35cde1b..4abb492 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -10,11 +10,9 @@
             <label for="language_list">Select Language</label>
             <select id="language_list" name='lang_id' class='form-control'>
                 @foreach($language_list as $language)
-                    @if($language->active)
-                        <option  value='{{$language->id}}' @if($language->id == $language_id)selected="selected" @endif>
-                            {{$language->name}}
-                        </option>
-                    @endif
+                    <option  value='{{$language->id}}' @if($language->id == $language_id)selected="selected" @endif>
+                        {{$language->name}}
+                    </option>
                 @endforeach
             </select>
         </div>
@@ -66,8 +64,8 @@ class="form-control"
                     Root
                 </option>
                 @foreach($categories_list as $category)
-                    <option  value='{{$category->id}}'>
-                        {{$category->categoryTranslations()->where('lang_id', $language_id)->first()->category_name}}
+                    <option  value='{{$category->category_id}}'>
+                        {{$category->category_name}}
                     </option>
                 @endforeach
             </select>
diff --git a/src/Views/blogetc_admin/categories/index.blade.php b/src/Views/blogetc_admin/categories/index.blade.php
index bea8327..cb307af 100755
--- a/src/Views/blogetc_admin/categories/index.blade.php
+++ b/src/Views/blogetc_admin/categories/index.blade.php
@@ -5,7 +5,7 @@
 
         <div class="card m-4">
             <div class="card-body">
-                <h5 class='card-title'><a class="a-link-cart-color" href='{{$category->url($language_id)}}'>{{$category->categoryTranslations()->where('lang_id', $language_id)->first()->category_name}}</a></h5>
+                <h5 class='card-title'><a class="a-link-cart-color" href='{{$category->url($language_id)}}'>{{$category->category_name}}</a></h5>
 
 
                 <a href="{{$category->url($language_id)}}" class="card-link btn btn-outline-secondary">View Posts in this category</a>
@@ -14,7 +14,7 @@
 
                         onsubmit="return confirm('Are you sure you want to delete this blog post category?\n You cannot undo this action!');"
 
-                        method='post' action='{{route("blogetc.admin.categories.destroy_category", $category->id)}}' class='float-right'>
+                        method='post' action='{{route("blogetc.admin.categories.destroy_category", $category->category_id)}}' class='float-right'>
                     @csrf
                     @method("DELETE")
                     <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/blogetc_admin/posts/form.blade.php
index 1957ff8..1b61497 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/blogetc_admin/posts/form.blade.php
@@ -1,7 +1,19 @@
+<div class="form-group">
+    <label for="language_list">Select Language</label>
+    <select id="language_list" name='lang_id' class='form-control'>
+        @foreach($language_list as $language)
+            <option  value='{{$language->id}}' @if($language->id == $language_id)selected="selected" @endif>
+                {{$language->name}}
+            </option>
+        @endforeach
+    </select>
+</div>
+
 <div class="form-group">
     <label for="blog_title">Blog Post Title</label>
     <input type="text" class="form-control" required id="blog_title" aria-describedby="blog_title_help" name='title'
-           value="{{old("title",$post_translation->title)}}">
+           value="{{old("title",$post_translation->title)}}"                    oninput="populate_slug_field();"
+    >
     <small id="blog_title_help" class="form-text text-muted">The title of the blog post</small>
 </div>
 
@@ -181,13 +193,13 @@ class='btn btn-light btn-sm'>Show other sizes</span>
     <h4>Categories:</h4>
     <div class='row'>
 
-        @forelse(\WebDevEtc\BlogEtc\Models\HessamCategory::orderBy("id","asc")->limit(1000)->get() as $category)
+        @forelse($cat_ts as $translation)
             <div class="form-check col-sm-6">
                 <input class="" type="checkbox" value="1"
-                       @if(old("category.".$category->id, $post->categories->contains($category->id))) checked='checked'
-                       @endif name='category[{{$category->id}}]' id="category_check{{$category->id}}">
-                <label class="form-check-label" for="category_check{{$category->id}}">
-                    {{$category->categoryTranslations()->category_name}}
+                       @if(old("category.".$translation->category_id, $post->categories->contains($translation->category_id))) checked='checked'
+                       @endif name='category[{{$translation->category_id}}]' id="category_check{{$translation->category_id}}">
+                <label class="form-check-label" for="category_check{{$translation->category_id}}">
+                    {{$translation->category_name}}
                 </label>
             </div>
         @empty
@@ -199,8 +211,105 @@ class='btn btn-light btn-sm'>Show other sizes</span>
         <div class='col-md-12 my-3 text-center'>
 
             <em><a class="a-link-cart-color" target='_blank' href='{{route("blogetc.admin.categories.create_category")}}'><i class="fa fa-external-link" aria-hidden="true"></i>
-                      Add new categories
+                    Add new categories
                     here</a></em>
         </div>
     </div>
 </div>
+
+<script>
+    SHOULD_AUTO_GEN_SLUG = false;
+
+    /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
+    function populate_slug_field() {
+
+//        alert("A");
+        var cat_slug = document.getElementById('blog_slug');
+
+        if (cat_slug.value.length < 1) {
+            // if the slug field is empty, make sure it auto generates
+            SHOULD_AUTO_GEN_SLUG = true;
+        }
+
+        if (SHOULD_AUTO_GEN_SLUG) {
+            // the slug hasn't been manually changed (or it was set above), so we should generate the slug
+            // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
+            cat_slug.value =document.getElementById("blog_title").value.toLowerCase()
+                .replace(/[^\w-_ ]+/g, '') // replace with nothing
+                .replace(/[_ ]+/g, '-') // replace _ and spaces with -
+                .substring(0,99); // limit str length
+
+        }
+
+    }
+
+    if (document.getElementById("blog_slug").value.length < 1) {
+        SHOULD_AUTO_GEN_SLUG = true;
+    } else {
+        SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
+    }
+
+
+    //multi-language data
+    var defalutLangId = {{$language_id}}
+    var preLangId = defalutLangId;
+    var languageList = {};
+    $("#language_list > option").each(function() {
+        languageList[this.value] = {
+            lang_id: -1,
+            category_name: "",
+            slug: "",
+            category_description: "",
+            lang_name: this.text
+        }
+    });
+
+    $('#language_list').on('change', function() {
+        fillLanguageList(this.value);
+        preLangId = this.value;
+    });
+
+    function fillLanguageList(langId){
+        languageList[preLangId].lang_id = preLangId;
+        languageList[preLangId].category_name = $('#category_name').val();
+        languageList[preLangId].slug = $('#category_slug').val();
+        languageList[preLangId].category_description = $('#category_description').val();
+
+        $('#category_name').val(languageList[langId].category_name);
+        $('#category_slug').val(languageList[langId].slug);
+        $('#category_description').val(languageList[langId].category_description);
+    }
+
+    $.ajaxSetup({
+        headers: {
+            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+        }
+    });
+
+    $('#submit-btn').click(function (){
+        if (languageList[$('#language_list').val()].lang_id == -1){
+            if (!$('#category_name').val()){
+                alert("Category name must not be empty");
+                return ;
+            }else if (!$('#category_slug').val()){
+                alert("Category slug must not be empty");
+                return ;
+            }
+            languageList[preLangId].lang_id = $('#language_list').val();
+            languageList[preLangId].category_name = $('#category_name').val();
+            languageList[preLangId].slug = $('#category_slug').val();
+            languageList[preLangId].category_description = $('#category_description').val();
+        }
+        $.post('{{route("blogetc.admin.categories.store_category")}}' ,
+            {
+                data: languageList,
+                parent_id: parseInt($('#parent_id').val())
+            },
+            function(data, status){
+                if (data.code === 403){
+                    alert("Slug is already taken: " + languageList[data.data].lang_name);
+                }
+            });
+    });
+
+</script>

From 30fcb375a3e1cef72260c1ef802cacdeb36d124c Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 3 Nov 2020 04:08:51 +0330
Subject: [PATCH 011/118] completes suport for add post - translation

---
 ..._create_hessam_post_translations_table.php |   2 +-
 src/Controllers/HessamAdminController.php     | 158 ++++++++++++++++--
 src/Models/HessamPostTranslation.php          |  35 +++-
 .../CreateHessamPostToggleRequest.php         |  25 +++
 .../layouts/admin_layout.blade.php            |  11 --
 .../blogetc_admin/posts/add_post.blade.php    |  66 +++++++-
 src/Views/blogetc_admin/posts/form.blade.php  | 100 +----------
 src/routes.php                                |   3 +
 8 files changed, 272 insertions(+), 128 deletions(-)
 create mode 100755 src/Requests/CreateHessamPostToggleRequest.php

diff --git a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
index 8b4397c..89edc67 100644
--- a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
+++ b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
@@ -16,7 +16,7 @@ public function up()
         Schema::create('hessam_post_translations', function (Blueprint $table) {
             $table->unsignedInteger('post_id')->nullable();
 
-            $table->string("slug")->unique();
+            $table->string("slug");
             $table->string("title")->nullable()->default("New blog post");
             $table->string("subtitle")->nullable()->default("");
             $table->text("meta_desc")->nullable();
diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index bfb4a81..dbfebfb 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -15,8 +15,10 @@
 use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
 use WebDevEtc\BlogEtc\Models\HessamLanguage;
 use WebDevEtc\BlogEtc\Models\HessamPost;
+use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
 use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
 use WebDevEtc\BlogEtc\Requests\CreateBlogEtcPostRequest;
+use WebDevEtc\BlogEtc\Requests\CreateHessamPostToggleRequest;
 use WebDevEtc\BlogEtc\Requests\DeleteBlogEtcPostRequest;
 use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcPostRequest;
 use WebDevEtc\BlogEtc\Traits\UploadFileTrait;
@@ -67,14 +69,17 @@ public function create_post(Request $request)
         $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
         return view("blogetc_admin::posts.add_post", [
-            'language_id' => $language_id,
             'cat_ts' => $ts,
-            'language_list' => $language_list
+            'language_list' => $language_list,
+            'selected_lang' => $language_id,
+            'post' => new \WebDevEtc\BlogEtc\Models\HessamPost(),
+            'post_translation' => new \WebDevEtc\BlogEtc\Models\HessamPostTranslation(),
+            'post_id' => -1
         ]);
     }
 
     /**
-     * Save a new post
+     * Save a new post - this method is called whenever add post button is clicked
      *
      * @param CreateBlogEtcPostRequest $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
@@ -82,22 +87,135 @@ public function create_post(Request $request)
      */
     public function store_post(CreateBlogEtcPostRequest $request)
     {
-        $new_blog_post = new HessamPost($request->all());
+        $new_blog_post = null;
+        $translation = HessamPostTranslation::where(
+            [
+                ['post_id','=',$request['post_id']],
+                ['lang_id', '=', $request['lang_id']]
+            ]
+        )->first();
+
+        if ($request['post_id'] == -1 || !$translation){
+            //cretes new post
+            $new_blog_post = new HessamPost();
+            $translation = new HessamPostTranslation();
 
-        $this->processUploadedImages($request, $new_blog_post);
-
-        if (!$new_blog_post->posted_at) {
             $new_blog_post->posted_at = Carbon::now();
+        }else{
+            //edits post
+            $new_blog_post = HessamPost::findOrFail($translation->post_id);
         }
 
+        $new_blog_post->is_published = $request['is_published'];
         $new_blog_post->user_id = \Auth::user()->id;
         $new_blog_post->save();
 
-        $new_blog_post->categories()->sync($request->categories());
+        $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $request['post_id']);
+        if ($post_exists){
+            Helpers::flash_message("Post already exists - try to change the slug for this language");
+        }else {
+            $translation->title = $request['title'];
+            $translation->subtitle = $request['subtitle'];
+            $translation->short_description = $request['short_description'];
+            $translation->post_body = $request['post_body'];
+            $translation->seo_title = $request['seo_title'];
+            $translation->meta_desc = $request['meta_desc'];
+            $translation->slug = $request['slug'];
+            $translation->use_view_file = $request['use_view_file'];
+
+            $translation->lang_id = $request['lang_id'];
+            $translation->post_id = $new_blog_post->id;
+
+            $this->processUploadedImages($request, $translation);
+            $translation->save();
+
+            $new_blog_post->categories()->sync($request->categories());
+            Helpers::flash_message("Added post");
+            event(new BlogPostAdded($new_blog_post));
+        }
 
-        Helpers::flash_message("Added post");
-        event(new BlogPostAdded($new_blog_post));
-        return redirect($new_blog_post->edit_url());
+        return redirect( route('blogetc.admin.index') );
+    }
+
+    /**
+     *  This method is called whenever a language is selected
+     */
+    public function store_post_toggle(CreateHessamPostToggleRequest $request){
+        $new_blog_post = null;
+        $translation = HessamPostTranslation::where(
+            [
+                ['post_id','=',$request['post_id']],
+                ['lang_id', '=', $request['lang_id']]
+            ]
+        )->first();
+
+        if (!$translation){
+            $translation = new HessamPostTranslation();
+        }
+
+        if ($request['post_id'] == -1 || $request['post_id'] == null){
+            //cretes new post
+            $new_blog_post = new HessamPost();
+            $new_blog_post->posted_at = Carbon::now();
+        }else{
+            //edits post
+            $new_blog_post = HessamPost::findOrFail($request['post_id']);
+        }
+
+        if ($request['slug']){
+            $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $request['post_id']);
+            if ($post_exists){
+                Helpers::flash_message("Post already exists - try to change the slug for this language");
+            }else{
+                $new_blog_post->is_published = $request['is_published'];
+                $new_blog_post->user_id = \Auth::user()->id;
+                $new_blog_post->save();
+
+                $translation->title = $request['title'];
+                $translation->subtitle = $request['subtitle'];
+                $translation->short_description = $request['short_description'];
+                $translation->post_body = $request['post_body'];
+                $translation->seo_title = $request['seo_title'];
+                $translation->meta_desc = $request['meta_desc'];
+                $translation->slug = $request['slug'];
+                $translation->use_view_file = $request['use_view_file'];
+
+                $translation->lang_id = $request['lang_id'];
+                $translation->post_id = $new_blog_post->id;
+
+                $this->processUploadedImages($request, $translation);
+                $translation->save();
+
+                $new_blog_post->categories()->sync($request->categories());
+
+                event(new BlogPostAdded($new_blog_post));
+            }
+        }
+
+        //todo: generate event
+
+        $language_id = $request->cookie('language_id');
+        $language_list = HessamLanguage::where('active',true)->get();
+        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+
+        $translation = HessamPostTranslation::where(
+            [
+                ['post_id','=',$request['post_id']],
+                ['lang_id', '=', $request['selected_lang']]
+            ]
+        )->first();
+        if (!$translation){
+            $translation = new HessamPostTranslation();
+        }
+
+        return view("blogetc_admin::posts.add_post", [
+            'cat_ts' => $ts,
+            'language_list' => $language_list,
+            'selected_lang' => $request['selected_lang'],
+            'post_translation' => $translation,
+            'post' => $new_blog_post,
+            'post_id' => $new_blog_post->id
+        ]);
     }
 
     /**
@@ -204,7 +322,7 @@ public function destroy_post(DeleteBlogEtcPostRequest $request, $blogPostId)
      * @throws \Exception
      * @todo - next full release, tidy this up!
      */
-    protected function processUploadedImages(BaseRequestInterface $request, HessamPost $new_blog_post)
+    protected function processUploadedImages(BaseRequestInterface $request, HessamPostTranslation $new_blog_post)
     {
         if (!config("blogetc.image_upload_enabled")) {
             // image upload was disabled
@@ -239,4 +357,20 @@ protected function processUploadedImages(BaseRequestInterface $request, HessamPo
             ]);
         }
     }
+
+    //translations for the same psots are ignored
+    protected function check_if_same_post_exists($slug, $lang_id, $post_id){
+        $slg = HessamPostTranslation::where(
+            [
+                ['slug','=', $slug],
+                ['lang_id', '=', $lang_id],
+                ['post_id', '<>', $post_id]
+            ]
+        )->first();
+        if ($slg){
+            return true;
+        }else{
+            return false;
+        }
+    }
 }
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index 9c64e44..d025145 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -3,12 +3,20 @@
 
 namespace WebDevEtc\BlogEtc\Models;
 
+use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Model;
+use Swis\Laravel\Fulltext\Indexable;
+use WebDevEtc\BlogEtc\Interfaces\SearchResultInterface;
 
-class HessamPostTranslation extends Model
+class HessamPostTranslation extends Model implements SearchResultInterface
 {
-    public $fillable = [
+    use Sluggable;
+    use Indexable;
+
+    protected $indexContentColumns = ['post_body', 'short_description', 'meta_desc',];
+    protected $indexTitleColumns = ['title', 'subtitle', 'seo_title',];
 
+    public $fillable = [
         'title',
         'subtitle',
         'short_description',
@@ -36,6 +44,29 @@ public function language()
         return $this->hasOne(HessamLanguage::class,"lang_id");
     }
 
+    /**
+     * Return the sluggable configuration array for this model.
+     *
+     * @return array
+     */
+    public function sluggable()
+    {
+        return [
+            'slug' => [
+                'source' => 'title'
+            ]
+        ];
+    }
+
+    public function search_result_page_url()
+    {
+        return $this->url();
+    }
+
+    public function search_result_page_title()
+    {
+        return $this->title;
+    }
 
     /**
      * If $this->user_view_file is not empty, then it'll return the dot syntax location of the blade file it should look for
diff --git a/src/Requests/CreateHessamPostToggleRequest.php b/src/Requests/CreateHessamPostToggleRequest.php
new file mode 100755
index 0000000..e746c13
--- /dev/null
+++ b/src/Requests/CreateHessamPostToggleRequest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace WebDevEtc\BlogEtc\Requests;
+
+
+use Illuminate\Validation\Rule;
+use WebDevEtc\BlogEtc\Requests\Traits\HasCategoriesTrait;
+use WebDevEtc\BlogEtc\Requests\Traits\HasImageUploadTrait;
+
+class CreateHessamPostToggleRequest extends BaseBlogEtcPostRequest
+{
+    use HasCategoriesTrait;
+    use HasImageUploadTrait;
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        //no rules
+        return [];
+    }
+}
diff --git a/src/Views/blogetc_admin/layouts/admin_layout.blade.php b/src/Views/blogetc_admin/layouts/admin_layout.blade.php
index 0d346f8..c98562a 100755
--- a/src/Views/blogetc_admin/layouts/admin_layout.blade.php
+++ b/src/Views/blogetc_admin/layouts/admin_layout.blade.php
@@ -127,16 +127,5 @@
     </main>
 </div>
 
-
-@if( config("blogetc.use_wysiwyg") && config("blogetc.echo_html") && (in_array( \Request::route()->getName() ,[ 'blogetc.admin.create_post' , 'blogetc.admin.edit_post'  ])))
-    <script src="//cdn.ckeditor.com/4.14.1/full/ckeditor.js"></script>
-    <script>
-        if( typeof(CKEDITOR) !== "undefined" ) {
-            CKEDITOR.replace('post_body');
-        }
-    </script>
-@endif
-
-
 </body>
 </html>
diff --git a/src/Views/blogetc_admin/posts/add_post.blade.php b/src/Views/blogetc_admin/posts/add_post.blade.php
index 5cff62e..de87f30 100755
--- a/src/Views/blogetc_admin/posts/add_post.blade.php
+++ b/src/Views/blogetc_admin/posts/add_post.blade.php
@@ -3,17 +3,73 @@
 
 
     <h5>Admin - Add post</h5>
-
-    <form method='post' action='{{route("blogetc.admin.store_post")}}'  enctype="multipart/form-data" >
+    <p>Change language option to translate your post in different language</p>
+    <form id="add-post-form" method='post' action='{{route("blogetc.admin.store_post")}}'  enctype="multipart/form-data" >
 
         @csrf
         @include("blogetc_admin::posts.form", [
-    'post' => new \WebDevEtc\BlogEtc\Models\HessamPost(),
-    'post_translation' => new \WebDevEtc\BlogEtc\Models\HessamPostTranslation()
+    'post' => $post,
+    'post_translation' => $post_translation
     ])
 
-        <input type='submit' class='btn btn-primary' value='Add new post' >
+        <input type='submit' name="submit_btn" class='btn btn-primary' value='Add new post' >
 
     </form>
 
+    <script>
+        SHOULD_AUTO_GEN_SLUG = false;
+
+        /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
+        function populate_slug_field() {
+
+//        alert("A");
+            var cat_slug = document.getElementById('blog_slug');
+
+            if (cat_slug.value.length < 1) {
+                // if the slug field is empty, make sure it auto generates
+                SHOULD_AUTO_GEN_SLUG = true;
+            }
+
+            if (SHOULD_AUTO_GEN_SLUG) {
+                // the slug hasn't been manually changed (or it was set above), so we should generate the slug
+                // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
+                cat_slug.value =document.getElementById("blog_title").value.toLowerCase()
+                    .replace(/[^\w-_ ]+/g, '') // replace with nothing
+                    .replace(/[_ ]+/g, '-') // replace _ and spaces with -
+                    .substring(0,99); // limit str length
+
+            }
+
+        }
+
+        if (document.getElementById("blog_slug").value.length < 1) {
+            SHOULD_AUTO_GEN_SLUG = true;
+        } else {
+            SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
+        }
+
+        //multi language
+        var store_toggle_url = '{{route("blogetc.admin.store_post_toggle")}}';
+        var preLang = $('#language_list').val();
+        $('#language_list').change(function (){
+            $('#add-post-form').attr('action', store_toggle_url);
+
+            $('#selected_lang').val($('#language_list').val());
+            $('#language_list').val(preLang);
+            console.log($('#language_list').val())
+            $('#add-post-form').trigger('submit');
+        });
+    </script>
+
+    @if( config("blogetc.use_wysiwyg") && config("blogetc.echo_html"))
+        {{--    <script src="//cdn.ckeditor.com/4.14.1/full/ckeditor.js"></script>--}}
+        <script src="//cdn.ckeditor.com/4.15.0/full/ckeditor.js"></script>
+
+        <script>
+            if( typeof(CKEDITOR) !== "undefined" ) {
+                CKEDITOR.replace('post_body');
+            }
+        </script>
+    @endif
+
 @endsection
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/blogetc_admin/posts/form.blade.php
index 1b61497..4206d9d 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/blogetc_admin/posts/form.blade.php
@@ -2,7 +2,7 @@
     <label for="language_list">Select Language</label>
     <select id="language_list" name='lang_id' class='form-control'>
         @foreach($language_list as $language)
-            <option  value='{{$language->id}}' @if($language->id == $language_id)selected="selected" @endif>
+            <option  value='{{$language->id}}' @if($language->id == $selected_lang)selected="selected" @endif>
                 {{$language->name}}
             </option>
         @endforeach
@@ -217,99 +217,5 @@ class='btn btn-light btn-sm'>Show other sizes</span>
     </div>
 </div>
 
-<script>
-    SHOULD_AUTO_GEN_SLUG = false;
-
-    /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
-    function populate_slug_field() {
-
-//        alert("A");
-        var cat_slug = document.getElementById('blog_slug');
-
-        if (cat_slug.value.length < 1) {
-            // if the slug field is empty, make sure it auto generates
-            SHOULD_AUTO_GEN_SLUG = true;
-        }
-
-        if (SHOULD_AUTO_GEN_SLUG) {
-            // the slug hasn't been manually changed (or it was set above), so we should generate the slug
-            // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
-            cat_slug.value =document.getElementById("blog_title").value.toLowerCase()
-                .replace(/[^\w-_ ]+/g, '') // replace with nothing
-                .replace(/[_ ]+/g, '-') // replace _ and spaces with -
-                .substring(0,99); // limit str length
-
-        }
-
-    }
-
-    if (document.getElementById("blog_slug").value.length < 1) {
-        SHOULD_AUTO_GEN_SLUG = true;
-    } else {
-        SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
-    }
-
-
-    //multi-language data
-    var defalutLangId = {{$language_id}}
-    var preLangId = defalutLangId;
-    var languageList = {};
-    $("#language_list > option").each(function() {
-        languageList[this.value] = {
-            lang_id: -1,
-            category_name: "",
-            slug: "",
-            category_description: "",
-            lang_name: this.text
-        }
-    });
-
-    $('#language_list').on('change', function() {
-        fillLanguageList(this.value);
-        preLangId = this.value;
-    });
-
-    function fillLanguageList(langId){
-        languageList[preLangId].lang_id = preLangId;
-        languageList[preLangId].category_name = $('#category_name').val();
-        languageList[preLangId].slug = $('#category_slug').val();
-        languageList[preLangId].category_description = $('#category_description').val();
-
-        $('#category_name').val(languageList[langId].category_name);
-        $('#category_slug').val(languageList[langId].slug);
-        $('#category_description').val(languageList[langId].category_description);
-    }
-
-    $.ajaxSetup({
-        headers: {
-            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-        }
-    });
-
-    $('#submit-btn').click(function (){
-        if (languageList[$('#language_list').val()].lang_id == -1){
-            if (!$('#category_name').val()){
-                alert("Category name must not be empty");
-                return ;
-            }else if (!$('#category_slug').val()){
-                alert("Category slug must not be empty");
-                return ;
-            }
-            languageList[preLangId].lang_id = $('#language_list').val();
-            languageList[preLangId].category_name = $('#category_name').val();
-            languageList[preLangId].slug = $('#category_slug').val();
-            languageList[preLangId].category_description = $('#category_description').val();
-        }
-        $.post('{{route("blogetc.admin.categories.store_category")}}' ,
-            {
-                data: languageList,
-                parent_id: parseInt($('#parent_id').val())
-            },
-            function(data, status){
-                if (data.code === 403){
-                    alert("Slug is already taken: " + languageList[data.data].lang_name);
-                }
-            });
-    });
-
-</script>
+<input id="selected_lang" name="selected_lang" type="number" value="-1" hidden>
+<input id="post_id" name="post_id" type="number" value="{{$post_id}}" hidden>
diff --git a/src/routes.php b/src/routes.php
index c45dcb3..ca31bda 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -54,6 +54,9 @@
             'HessamAdminController@store_post')
             ->name('blogetc.admin.store_post');
 
+        Route::post('/add_post_toggle',
+            'HessamAdminController@store_post_toggle')
+            ->name('blogetc.admin.store_post_toggle');
 
         Route::get('/edit_post/{blogPostId}',
             'HessamAdminController@edit_post')

From 98c2a328abf4b76a6ad39a05540a6c045149f819 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 5 Nov 2020 21:14:30 +0330
Subject: [PATCH 012/118] category update for multi lang support and some fixes
 on posts

---
 ...ate_hessam_category_translations_table.php |  2 +
 src/Controllers/HessamAdminController.php     | 38 +++++++---
 .../HessamCategoryAdminController.php         | 72 +++++++++++++------
 src/Models/HessamCategory.php                 |  8 +++
 src/Models/HessamPost.php                     | 19 -----
 src/Models/HessamPostTranslation.php          | 18 +++++
 src/Requests/UpdateBlogEtcCategoryRequest.php |  1 -
 src/Requests/UpdateBlogEtcPostRequest.php     |  2 +-
 .../categories/add_category.blade.php         |  2 +
 .../categories/deleted_category.blade.php     |  7 --
 .../categories/edit_category.blade.php        | 32 ++++-----
 src/Views/blogetc_admin/index.blade.php       | 25 +++----
 .../blogetc_admin/posts/add_post.blade.php    | 56 ---------------
 .../blogetc_admin/posts/edit_post.blade.php   | 11 +--
 src/Views/blogetc_admin/posts/form.blade.php  | 56 +++++++++++++++
 15 files changed, 200 insertions(+), 149 deletions(-)
 delete mode 100755 src/Views/blogetc_admin/categories/deleted_category.blade.php

diff --git a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
index a926e93..4e15525 100644
--- a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
+++ b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
@@ -14,6 +14,8 @@ class CreateHessamCategoryTranslationsTable extends Migration
     public function up()
     {
         Schema::create('hessam_category_translations', function (Blueprint $table) {
+            $table->increments('id');
+
             $table->unsignedInteger('category_id')->nullable();
 
             $table->string("category_name")->nullable();
diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index dbfebfb..8a49618 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -50,12 +50,13 @@ public function __construct()
      *
      * @return mixed
      */
-    public function index()
+    public function index(Request $request)
     {
-        $posts = HessamPost::orderBy("posted_at", "desc")
+        $language_id = $request->cookie('language_id');
+        $posts = HessamPostTranslation::orderBy("post_id", "desc")->where('lang_id', $language_id)
             ->paginate(10);
 
-        return view("blogetc_admin::index", ['posts'=>$posts]);
+        return view("blogetc_admin::index", ['post_translations'=>$posts]);
     }
 
     /**
@@ -106,14 +107,14 @@ public function store_post(CreateBlogEtcPostRequest $request)
             $new_blog_post = HessamPost::findOrFail($translation->post_id);
         }
 
-        $new_blog_post->is_published = $request['is_published'];
-        $new_blog_post->user_id = \Auth::user()->id;
-        $new_blog_post->save();
-
         $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $request['post_id']);
         if ($post_exists){
             Helpers::flash_message("Post already exists - try to change the slug for this language");
         }else {
+            $new_blog_post->is_published = $request['is_published'];
+            $new_blog_post->user_id = \Auth::user()->id;
+            $new_blog_post->save();
+
             $translation->title = $request['title'];
             $translation->subtitle = $request['subtitle'];
             $translation->short_description = $request['short_description'];
@@ -224,10 +225,29 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
      * @param $blogPostId
      * @return mixed
      */
-    public function edit_post( $blogPostId)
+    public function edit_post( $blogPostId , Request $request)
     {
+        $language_id = $request->cookie('language_id');
+
+        $post_translation = HessamPostTranslation::where(
+            [
+                ['lang_id', '=', $language_id],
+                ['post_id', '=', $blogPostId]
+            ]
+        )->first();
+
         $post = HessamPost::findOrFail($blogPostId);
-        return view("blogetc_admin::posts.edit_post")->withPost($post);
+        $language_list = HessamLanguage::where('active',true)->get();
+        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+
+        return view("blogetc_admin::posts.edit_post", [
+            'cat_ts' => $ts,
+            'language_list' => $language_list,
+            'selected_lang' => $language_id,
+            'post' => $post,
+            'post_translation' => $post_translation,
+            'post_id' => -1
+        ]);
     }
 
     /**
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index a69f7d0..d67445c 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -81,28 +81,33 @@ public function store_category(Request $request){
         ]);
 
         foreach ($language_list as $key => $value) {
-            //check for slug availability
-            $obj = HessamCategoryTranslation::where('slug',$value['slug'])->first();
-            if ($obj){
-                HessamCategory::destroy($new_category->id);
-                return response()->json([
-                    'code' => 403,
-                    'message' => "slug is already taken",
-                    'data' => $value['lang_id']
+            if ($value['lang_id'] != -1){
+                //check for slug availability
+                $obj = HessamCategoryTranslation::where('slug',$value['slug'])->first();
+                if ($obj){
+                    HessamCategory::destroy($new_category->id);
+                    return response()->json([
+                        'code' => 403,
+                        'message' => "slug is already taken",
+                        'data' => $value['lang_id']
+                    ]);
+                }
+                $new_category_translation = $new_category->categoryTranslations()->create([
+                    'category_name' => $value['category_name'],
+                    'slug' => $value['slug'],
+                    'category_description' => $value['category_description'],
+                    'lang_id' => $value['lang_id'],
+                    'category_id' => $new_category->id
                 ]);
             }
-            $new_category_translation = $new_category->categoryTranslations()->create([
-                'category_name' => $value['category_name'],
-                'slug' => $value['slug'],
-                'category_description' => $value['category_description'],
-                'lang_id' => $value['lang_id'],
-                'category_id' => $new_category->id
-            ]);
         }
 
         event(new CategoryAdded($new_category, $new_category_translation));
         Helpers::flash_message("Saved new category");
-        return redirect( route('blogetc.admin.categories.index') );
+        return response()->json([
+            'code' => 200,
+            'message' => "category successfully aaded"
+        ]);
     }
 
     /**
@@ -110,11 +115,25 @@ public function store_category(Request $request){
      * @param $categoryId
      * @return mixed
      */
-    public function edit_category($categoryId){
+    public function edit_category($categoryId, Request $request){
+        $language_id = $request->cookie('language_id');
+        $language_list = HessamLanguage::where('active',true)->get();
+
         $category = HessamCategory::findOrFail($categoryId);
+        $cat_trans = HessamCategoryTranslation::where(
+            [
+                ['lang_id', '=', $language_id],
+                ['category_id', '=', $categoryId]
+            ]
+        )->first();
+
         return view("blogetc_admin::categories.edit_category",[
-            'categories_list' => HessamCategory::orderBy("category_name")->get()
-        ])->withCategory($category);
+            'category' => $category,
+            'category_translation' => $cat_trans,
+            'categories_list' => HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->get(),
+            'language_id' => $language_id,
+            'language_list' => $language_list
+        ]);
     }
 
     /**
@@ -127,12 +146,21 @@ public function edit_category($categoryId){
     public function update_category(UpdateBlogEtcCategoryRequest $request, $categoryId){
         /** @var HessamCategory $category */
         $category = HessamCategory::findOrFail($categoryId);
+        $language_id = $request->cookie('language_id');
+        $translation = HessamCategoryTranslation::where(
+            [
+                ['lang_id', '=', $language_id],
+                ['category_id', '=', $categoryId]
+            ]
+        )->first();
         $category->fill($request->all());
+        $translation->fill($request->all());
         $category->save();
+        $translation->save();
 
         Helpers::flash_message("Saved category changes");
         event(new CategoryEdited($category));
-        return redirect($category->edit_url());
+        return redirect($translation->edit_url());
     }
 
     /**
@@ -151,8 +179,8 @@ public function destroy_category(DeleteBlogEtcCategoryRequest $request, $categor
         event(new CategoryWillBeDeleted($category));
         $category->delete();
 
-        return view ("blogetc_admin::categories.deleted_category");
-
+        Helpers::flash_message("Category successfully deleted!");
+        return redirect( route('blogetc.admin.categories.index') );
     }
 
 }
diff --git a/src/Models/HessamCategory.php b/src/Models/HessamCategory.php
index 2367e6c..fedc8d7 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/HessamCategory.php
@@ -13,6 +13,14 @@ class HessamCategory extends Node
         'parent_id'
     ];
 
+    public static function boot() {
+        parent::boot();
+
+        static::deleting(function($category) { // before delete() method call this
+            $category->categoryTranslations()->delete();
+        });
+    }
+
     /**
      * The associated category translations
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
diff --git a/src/Models/HessamPost.php b/src/Models/HessamPost.php
index 1d76a1b..a9086d9 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/HessamPost.php
@@ -99,23 +99,4 @@ public function comments()
         return $this->hasMany(HessamComment::class);
     }
 
-    /**
-     * Returns the public facing URL to view this blog post
-     *
-     * @return string
-     */
-    public function url()
-    {
-        return route("blogetc.single", $this->slug);
-    }
-
-    /**
-     * Return the URL for editing the post (used for admin users)
-     * @return string
-     */
-    public function edit_url()
-    {
-        return route("blogetc.admin.edit_post", $this->id);
-    }
-
 }
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index d025145..09f99c8 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -219,4 +219,22 @@ public function gen_seo_title()
         }
         return $this->title;
     }
+    /**
+     * Returns the public facing URL to view this blog post
+     *
+     * @return string
+     */
+    public function url()
+    {
+        return route("blogetc.single", $this->slug);
+    }
+
+    /**
+     * Return the URL for editing the post (used for admin users)
+     * @return string
+     */
+    public function edit_url()
+    {
+        return route("blogetc.admin.edit_post", $this->post_id);
+    }
 }
diff --git a/src/Requests/UpdateBlogEtcCategoryRequest.php b/src/Requests/UpdateBlogEtcCategoryRequest.php
index cc512df..bb1ec72 100755
--- a/src/Requests/UpdateBlogEtcCategoryRequest.php
+++ b/src/Requests/UpdateBlogEtcCategoryRequest.php
@@ -18,7 +18,6 @@ class UpdateBlogEtcCategoryRequest extends BaseBlogEtcCategoryRequest
     public function rules()
     {
         $return = $this->baseCategoryRules();
-        $return['slug'] [] = Rule::unique("blog_etc_categories", "slug")->ignore($this->route()->parameter("categoryId"));
         return $return;
 
     }
diff --git a/src/Requests/UpdateBlogEtcPostRequest.php b/src/Requests/UpdateBlogEtcPostRequest.php
index 5cef8eb..f8764a4 100755
--- a/src/Requests/UpdateBlogEtcPostRequest.php
+++ b/src/Requests/UpdateBlogEtcPostRequest.php
@@ -21,7 +21,7 @@ class UpdateBlogEtcPostRequest  extends BaseBlogEtcPostRequest {
     public function rules()
     {
         $return = $this->baseBlogPostRules();
-        $return['slug'] [] = Rule::unique("blog_etc_posts", "slug")->ignore($this->route()->parameter("blogPostId"));
+        $return['slug'] [] = Rule::unique("hessam_posts", "slug")->ignore($this->route()->parameter("blogPostId"));
         return $return;
     }
 }
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index 4abb492..7301c17 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -173,7 +173,9 @@ function fillLanguageList(langId){
                     function(data, status){
                         if (data.code === 403){
                             alert("Slug is already taken: " + languageList[data.data].lang_name);
+                        }else if (data.code === 200) {
                         }
+                        window.location.replace("{{route('blogetc.admin.categories.index')}}");
                     });
             });
 
diff --git a/src/Views/blogetc_admin/categories/deleted_category.blade.php b/src/Views/blogetc_admin/categories/deleted_category.blade.php
deleted file mode 100755
index 64030de..0000000
--- a/src/Views/blogetc_admin/categories/deleted_category.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends("blogetc_admin::layouts.admin_layout")
-@section("content")
-
-
-<div class='alert alert-success'><b>Deleted that category</b></div>
-
-@endsection
\ No newline at end of file
diff --git a/src/Views/blogetc_admin/categories/edit_category.blade.php b/src/Views/blogetc_admin/categories/edit_category.blade.php
index d80658b..0d9be64 100755
--- a/src/Views/blogetc_admin/categories/edit_category.blade.php
+++ b/src/Views/blogetc_admin/categories/edit_category.blade.php
@@ -45,7 +45,7 @@ class="form-control"
                    required
                    aria-describedby="category_category_name_help"
                    name='category_name'
-                   value="{{old("category_name",$category->category_name)}}"
+                   value="{{old("category_name",$category_translation->category_name)}}"
             >
 
             <small id="category_category_name_help" class="form-text text-muted">The name of the category</small>
@@ -55,16 +55,16 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category slug</label>
             <input
-                maxlength='100'
-                pattern="[a-zA-Z0-9-]+"
-                type="text"
-                required
-                class="form-control"
-                id="category_slug"
-                oninput="SHOULD_AUTO_GEN_SLUG=false;"
-                aria-describedby="category_slug_help"
-                name='slug'
-                value="{{old("slug",$category->slug)}}"
+                    maxlength='100'
+                    pattern="[a-zA-Z0-9-]+"
+                    type="text"
+                    required
+                    class="form-control"
+                    id="category_slug"
+                    oninput="SHOULD_AUTO_GEN_SLUG=false;"
+                    aria-describedby="category_slug_help"
+                    name='slug'
+                    value="{{old("slug",$category_translation->slug)}}"
             >
 
             <small id="category_slug_help" class="form-text text-muted">
@@ -82,10 +82,10 @@ class="form-control"
                     Root
                 </option>
                 @foreach($categories_list as $category2)
-                    @if($category->id != $category2->id)
-                    <option @if($category->parent_id == $category2->id) selected='selected' @endif value='{{$category2->id}}'>
-                        {{$category2->category_name}}
-                    </option>
+                    @if($category->id != $category2->category_id)
+                        <option @if($category->parent_id == $category2->category_id) selected='selected' @endif value='{{$category2->category_id}}'>
+                            {{$category2->category_name}}
+                        </option>
                     @endif
                 @endforeach
             </select>
@@ -96,7 +96,7 @@ class="form-control"
             <label for="category_description">Category Description (optional)</label>
             <textarea name='category_description'
                       class='form-control'
-                      id='category_description'>{{old("category_description",$category->category_description)}}</textarea>
+                      id='category_description'>{{old("category_description",$category_translation->category_description)}}</textarea>
 
         </div>
 
diff --git a/src/Views/blogetc_admin/index.blade.php b/src/Views/blogetc_admin/index.blade.php
index a5f117c..7108a12 100755
--- a/src/Views/blogetc_admin/index.blade.php
+++ b/src/Views/blogetc_admin/index.blade.php
@@ -4,7 +4,7 @@
 
     <h5>Admin - Manage Blog Posts</h5>
 
-    @forelse($posts as $post)
+    @forelse($post_translations as $post)
         <div class="card m-4" style="">
             <div class="card-body">
                 <h5 class='card-title'><a class="a-link-cart-color" href='{{$post->url()}}'>{{$post->title}}</a></h5>
@@ -15,22 +15,22 @@
 
                 <dl class="">
                     <dt class="">Author</dt>
-                    <dd class="">{{$post->author_string()}}</dd>
+                    <dd class="">{{$post->post->author_string()}}</dd>
                     <dt class="">Posted at</dt>
-                    <dd class="">{{$post->posted_at}}</dd>
+                    <dd class="">{{$post->post->posted_at}}</dd>
 
 
                     <dt class="">Is published?</dt>
                     <dd class="">
 
-                        {!!($post->is_published ? "Yes" : '<span class="border border-danger rounded p-1">No</span>')!!}
+                        {!!($post->post->is_published ? "Yes" : '<span class="border border-danger rounded p-1">No</span>')!!}
 
                     </dd>
 
                     <dt class="">Categories</dt>
                     <dd class="">
-                        @if(count($post->categories))
-                            @foreach($post->categories as $category)
+                        @if(count($post->post->categories))
+                            @foreach($post->post->categories as $category)
                                 <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->edit_url()}}'>
                                     <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
 
@@ -80,7 +80,7 @@
                     <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                     Edit Post</a>
                 <form onsubmit="return confirm('Are you sure you want to delete this blog post?\n You cannot undo this action!');"
-                      method='post' action='{{route("blogetc.admin.destroy_post", $post->id)}}' class='float-right'>
+                      method='post' action='{{route("blogetc.admin.destroy_post", $post->post_id)}}' class='float-right'>
                     @csrf
                     <input name="_method" type="hidden" value="DELETE"/>
                     <button type='submit' class='btn btn-danger btn-sm'>
@@ -94,11 +94,8 @@
         <div class='alert alert-warning'>No posts to show you. Why don't you add one?</div>
     @endforelse
 
+    {{--    <div class='text-center'>--}}
+    {{--        {{$posts->appends( [] )->links()}}--}}
+    {{--    </div>--}}
 
-
-    <div class='text-center'>
-        {{$posts->appends( [] )->links()}}
-    </div>
-
-
-@endsection
\ No newline at end of file
+@endsection
diff --git a/src/Views/blogetc_admin/posts/add_post.blade.php b/src/Views/blogetc_admin/posts/add_post.blade.php
index de87f30..867d9a7 100755
--- a/src/Views/blogetc_admin/posts/add_post.blade.php
+++ b/src/Views/blogetc_admin/posts/add_post.blade.php
@@ -16,60 +16,4 @@
 
     </form>
 
-    <script>
-        SHOULD_AUTO_GEN_SLUG = false;
-
-        /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
-        function populate_slug_field() {
-
-//        alert("A");
-            var cat_slug = document.getElementById('blog_slug');
-
-            if (cat_slug.value.length < 1) {
-                // if the slug field is empty, make sure it auto generates
-                SHOULD_AUTO_GEN_SLUG = true;
-            }
-
-            if (SHOULD_AUTO_GEN_SLUG) {
-                // the slug hasn't been manually changed (or it was set above), so we should generate the slug
-                // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
-                cat_slug.value =document.getElementById("blog_title").value.toLowerCase()
-                    .replace(/[^\w-_ ]+/g, '') // replace with nothing
-                    .replace(/[_ ]+/g, '-') // replace _ and spaces with -
-                    .substring(0,99); // limit str length
-
-            }
-
-        }
-
-        if (document.getElementById("blog_slug").value.length < 1) {
-            SHOULD_AUTO_GEN_SLUG = true;
-        } else {
-            SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
-        }
-
-        //multi language
-        var store_toggle_url = '{{route("blogetc.admin.store_post_toggle")}}';
-        var preLang = $('#language_list').val();
-        $('#language_list').change(function (){
-            $('#add-post-form').attr('action', store_toggle_url);
-
-            $('#selected_lang').val($('#language_list').val());
-            $('#language_list').val(preLang);
-            console.log($('#language_list').val())
-            $('#add-post-form').trigger('submit');
-        });
-    </script>
-
-    @if( config("blogetc.use_wysiwyg") && config("blogetc.echo_html"))
-        {{--    <script src="//cdn.ckeditor.com/4.14.1/full/ckeditor.js"></script>--}}
-        <script src="//cdn.ckeditor.com/4.15.0/full/ckeditor.js"></script>
-
-        <script>
-            if( typeof(CKEDITOR) !== "undefined" ) {
-                CKEDITOR.replace('post_body');
-            }
-        </script>
-    @endif
-
 @endsection
diff --git a/src/Views/blogetc_admin/posts/edit_post.blade.php b/src/Views/blogetc_admin/posts/edit_post.blade.php
index e3e337c..b2c2922 100755
--- a/src/Views/blogetc_admin/posts/edit_post.blade.php
+++ b/src/Views/blogetc_admin/posts/edit_post.blade.php
@@ -3,17 +3,20 @@
 
 
     <h5>Admin - Editing post
-    <a target='_blank' href='{{$post->url()}}' class='float-right btn btn-primary'>View post</a>
+        <a target='_blank' href='{{$post_translation->url()}}' class='float-right btn btn-primary'>View post</a>
     </h5>
 
     <form method='post' action='{{route("blogetc.admin.update_post",$post->id)}}'  enctype="multipart/form-data" >
 
         @csrf
         @method("patch")
-        @include("blogetc_admin::posts.form", ['post' => $post])
+        @include("blogetc_admin::posts.form", [
+          'post' => $post,
+          'post_translation' => $post_translation
+        ])
 
-        <input type='submit' class='btn btn-primary' value='Save Changes' >
+        <input type='submit' name="submit_btn" class='btn btn-primary' value='Save Changes' >
 
     </form>
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/blogetc_admin/posts/form.blade.php
index 4206d9d..35feced 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/blogetc_admin/posts/form.blade.php
@@ -219,3 +219,59 @@ class='btn btn-light btn-sm'>Show other sizes</span>
 
 <input id="selected_lang" name="selected_lang" type="number" value="-1" hidden>
 <input id="post_id" name="post_id" type="number" value="{{$post_id}}" hidden>
+
+<script>
+    SHOULD_AUTO_GEN_SLUG = false;
+
+    /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
+    function populate_slug_field() {
+
+//        alert("A");
+        var cat_slug = document.getElementById('blog_slug');
+
+        if (cat_slug.value.length < 1) {
+            // if the slug field is empty, make sure it auto generates
+            SHOULD_AUTO_GEN_SLUG = true;
+        }
+
+        if (SHOULD_AUTO_GEN_SLUG) {
+            // the slug hasn't been manually changed (or it was set above), so we should generate the slug
+            // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
+            cat_slug.value =document.getElementById("blog_title").value.toLowerCase()
+                .replace(/[^\w-_ ]+/g, '') // replace with nothing
+                .replace(/[_ ]+/g, '-') // replace _ and spaces with -
+                .substring(0,99); // limit str length
+
+        }
+
+    }
+
+    if (document.getElementById("blog_slug").value.length < 1) {
+        SHOULD_AUTO_GEN_SLUG = true;
+    } else {
+        SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
+    }
+
+    //multi language
+    var store_toggle_url = '{{route("blogetc.admin.store_post_toggle")}}';
+    var preLang = $('#language_list').val();
+    $('#language_list').change(function (){
+        $('#add-post-form').attr('action', store_toggle_url);
+
+        $('#selected_lang').val($('#language_list').val());
+        $('#language_list').val(preLang);
+        console.log($('#language_list').val())
+        $('#add-post-form').trigger('submit');
+    });
+</script>
+
+@if( config("blogetc.use_wysiwyg") && config("blogetc.echo_html"))
+    {{--    <script src="//cdn.ckeditor.com/4.14.1/full/ckeditor.js"></script>--}}
+    <script src="//cdn.ckeditor.com/4.15.0/full/ckeditor.js"></script>
+
+    <script>
+        if( typeof(CKEDITOR) !== "undefined" ) {
+            CKEDITOR.replace('post_body');
+        }
+    </script>
+@endif

From 6a82b1e9605007c7220abdf8341c032edb784d97 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 6 Nov 2020 01:14:07 +0330
Subject: [PATCH 013/118] category hierarchy

---
 .../HessamCategoryAdminController.php           | 10 +++++++++-
 src/Models/HessamCategory.php                   |  9 +++++++++
 .../categories/_category_partial.blade.php      | 13 +++++++++++++
 .../categories/add_category.blade.php           | 14 ++++++++++----
 src/css/blogetc_admin_css.css                   | 17 +++++++++++++++++
 5 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 src/Views/blogetc_admin/categories/_category_partial.blade.php

diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index d67445c..b4a2677 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -52,10 +52,18 @@ public function create_category(Request $request){
         $language_id = $request->cookie('language_id');
         $language_list = HessamLanguage::where('active',true)->get();
 
+        $cat_list = HessamCategory::whereHas('categoryTranslations', function ($query) {
+            return $query->where('lang_id', '=', 1);
+        })->get();
+
+        $rootList = HessamCategory::roots()->get();
+        HessamCategory::loadSiblingsWithList($rootList);
+
         return view("blogetc_admin::categories.add_category",[
             'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
             'category_translation' => new \WebDevEtc\BlogEtc\Models\HessamCategoryTranslation(),
-            'categories_list' => HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->get(),
+            'category_tree' => $cat_list,
+            'cat_roots' => $rootList,
             'language_id' => $language_id,
             'language_list' => $language_list
         ]);
diff --git a/src/Models/HessamCategory.php b/src/Models/HessamCategory.php
index fedc8d7..f10f295 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/HessamCategory.php
@@ -42,6 +42,15 @@ public function loadSiblings(){
         $this->siblings = $this->children()->get();
     }
 
+    public static function loadSiblingsWithList($node_list){
+        for($i = 0 ; sizeof($node_list) > $i ; $i++){
+            $node_list[$i]->loadSiblings();
+            if (sizeof($node_list[$i]->siblings) > 0){
+                self::loadSiblingsWithList($node_list[$i]->siblings);
+            }
+        }
+    }
+
 //    public function parent()
 //    {
 //        return $this->belongsTo('WebDevEtc\BlogEtc\Models\HessamCategory', 'parent_id');
diff --git a/src/Views/blogetc_admin/categories/_category_partial.blade.php b/src/Views/blogetc_admin/categories/_category_partial.blade.php
new file mode 100644
index 0000000..498d4f4
--- /dev/null
+++ b/src/Views/blogetc_admin/categories/_category_partial.blade.php
@@ -0,0 +1,13 @@
+@foreach($category_tree as $category)
+    <li class="category-item-wrapper">
+         <span class="category-item" value='{{$category->category_id}}'>
+        {{$category->categoryTranslations->where('lang_id',1)->first()->category_name}}
+
+             @if( count($category->siblings) > 0)
+                 <ul>
+                 @include("blogetc_admin::categories._category_partial", ['category_tree' => $category->siblings])
+                 </ul>
+             @endif
+    </span>
+    </li>
+@endforeach
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index 7301c17..d17f9a5 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -57,21 +57,27 @@ class="form-control"
             </small>
         </div>
 
+        <div class="form-group">
+            <label for="category_slug">Category Tree</label>
+            <ul class="hessam-category-hierarchy">
+                @include("blogetc_admin::categories._category_partial", ['category_tree' => $cat_roots])
+            </ul>
+        </div>
+
         <div class="form-group">
             <label for="category_slug">Parent Category</label>
             <select id="parent_id" name='parent_id' class='form-control'>
                 <option  selected='selected' value='0'>
                     Root
                 </option>
-                @foreach($categories_list as $category)
-                    <option  value='{{$category->category_id}}'>
-                        {{$category->category_name}}
+                @foreach($category_tree as $category)
+                    <option  value='{{$category->categoryTranslations[0]['category_id']}}'>
+                        {{$category->categoryTranslations[0]['category_name']}}
                     </option>
                 @endforeach
             </select>
         </div>
 
-
         <div class="form-group">
             <label for="category_description">Category Description (optional)</label>
             <textarea name='category_description'
diff --git a/src/css/blogetc_admin_css.css b/src/css/blogetc_admin_css.css
index 77dd7da..b0e6e93 100644
--- a/src/css/blogetc_admin_css.css
+++ b/src/css/blogetc_admin_css.css
@@ -43,3 +43,20 @@ body{
 .nav-bar-full{
     height: 100% !important;
 }
+
+.hessam-category-hierarchy{
+    background-color: white;
+    border-radius: 5px;
+}
+
+.category-item{
+    border-left: #bcbbbb 3px solid;
+    padding-left: 5px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.category-item-wrapper{
+    padding-top: 10px;
+    padding-bottom: 10px;
+}

From 9cdb16de1a9f5047c19ef5f3640e8cdc0f8a029c Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 7 Nov 2020 19:54:52 +0330
Subject: [PATCH 014/118] edit post multi language support

---
 src/Controllers/HessamAdminController.php     | 83 ++++++++++++++++---
 .../HessamCategoryAdminController.php         |  7 ++
 src/Requests/UpdateBlogEtcPostRequest.php     |  2 +-
 .../blogetc_admin/posts/add_post.blade.php    | 15 +++-
 .../blogetc_admin/posts/edit_post.blade.php   | 25 +++++-
 src/Views/blogetc_admin/posts/form.blade.php  | 13 ---
 src/routes.php                                |  4 +
 7 files changed, 120 insertions(+), 29 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 8a49618..06059ab 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -164,7 +164,7 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
         }
 
         if ($request['slug']){
-            $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $request['post_id']);
+            $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $new_blog_post->id);
             if ($post_exists){
                 Helpers::flash_message("Post already exists - try to change the slug for this language");
             }else{
@@ -245,8 +245,39 @@ public function edit_post( $blogPostId , Request $request)
             'language_list' => $language_list,
             'selected_lang' => $language_id,
             'post' => $post,
-            'post_translation' => $post_translation,
-            'post_id' => -1
+            'post_translation' => $post_translation
+        ]);
+    }
+
+    /**
+     * Show form to edit post
+     *
+     * @param $blogPostId
+     * @return mixed
+     */
+    public function edit_post_toggle( $blogPostId , Request $request)
+    {
+        $language_id = $request->cookie('language_id');
+        $post_translation = HessamPostTranslation::where(
+            [
+                ['lang_id', '=', $request['selected_lang']],
+                ['post_id', '=', $blogPostId]
+            ]
+        )->first();
+        if (!$post_translation){
+            $post_translation = new HessamPostTranslation();
+        }
+
+        $post = HessamPost::findOrFail($blogPostId);
+        $language_list = HessamLanguage::where('active',true)->get();
+        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+
+        return view("blogetc_admin::posts.edit_post", [
+            'cat_ts' => $ts,
+            'language_list' => $language_list,
+            'selected_lang' => $request['selected_lang'],
+            'post' => $post,
+            'post_translation' => $post_translation
         ]);
     }
 
@@ -260,20 +291,48 @@ public function edit_post( $blogPostId , Request $request)
      */
     public function update_post(UpdateBlogEtcPostRequest $request, $blogPostId)
     {
-        /** @var HessamPost $post */
-        $post = HessamPost::findOrFail($blogPostId);
-        $post->fill($request->all());
+        $new_blog_post = HessamPost::findOrFail($blogPostId);
+        $translation = HessamPostTranslation::where(
+            [
+                ['post_id','=', $new_blog_post->id],
+                ['lang_id', '=', $request['lang_id']]
+            ]
+        )->first();
 
-        $this->processUploadedImages($request, $post);
+        if (!$translation){
+            $translation = new HessamPostTranslation();
+            $new_blog_post->posted_at = Carbon::now();
+        }
 
-        $post->save();
-        $post->categories()->sync($request->categories());
+        $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $blogPostId);
+        if ($post_exists){
+            Helpers::flash_message("Post already exists - try to change the slug for this language");
+        }else {
+            $new_blog_post->is_published = $request['is_published'];
+            $new_blog_post->user_id = \Auth::user()->id;
+            $new_blog_post->save();
+
+            $translation->title = $request['title'];
+            $translation->subtitle = $request['subtitle'];
+            $translation->short_description = $request['short_description'];
+            $translation->post_body = $request['post_body'];
+            $translation->seo_title = $request['seo_title'];
+            $translation->meta_desc = $request['meta_desc'];
+            $translation->slug = $request['slug'];
+            $translation->use_view_file = $request['use_view_file'];
+
+            $translation->lang_id = $request['lang_id'];
+            $translation->post_id = $new_blog_post->id;
 
-        Helpers::flash_message("Updated post");
-        event(new BlogPostEdited($post));
+            $this->processUploadedImages($request, $translation);
+            $translation->save();
 
-        return redirect($post->edit_url());
+            $new_blog_post->categories()->sync($request->categories());
+            Helpers::flash_message("Post Updated");
+            event(new BlogPostAdded($new_blog_post));
+        }
 
+        return redirect( route('blogetc.admin.index') );
     }
 
     public function remove_photo($postSlug)
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index b4a2677..447d6c8 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -59,6 +59,7 @@ public function create_category(Request $request){
         $rootList = HessamCategory::roots()->get();
         HessamCategory::loadSiblingsWithList($rootList);
 
+
         return view("blogetc_admin::categories.add_category",[
             'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
             'category_translation' => new \WebDevEtc\BlogEtc\Models\HessamCategoryTranslation(),
@@ -184,6 +185,12 @@ public function destroy_category(DeleteBlogEtcCategoryRequest $request, $categor
         $request=$request;
 
         $category = HessamCategory::findOrFail($categoryId);
+        $children = $category->children()->get();
+        if (sizeof($children) > 0) {
+            Helpers::flash_message("This category could not be deleted it has some sub-categories. First try to change parent category of subs.");
+            return redirect(route('blogetc.admin.categories.index'));
+        }
+
         event(new CategoryWillBeDeleted($category));
         $category->delete();
 
diff --git a/src/Requests/UpdateBlogEtcPostRequest.php b/src/Requests/UpdateBlogEtcPostRequest.php
index f8764a4..4efc47a 100755
--- a/src/Requests/UpdateBlogEtcPostRequest.php
+++ b/src/Requests/UpdateBlogEtcPostRequest.php
@@ -21,7 +21,7 @@ class UpdateBlogEtcPostRequest  extends BaseBlogEtcPostRequest {
     public function rules()
     {
         $return = $this->baseBlogPostRules();
-        $return['slug'] [] = Rule::unique("hessam_posts", "slug")->ignore($this->route()->parameter("blogPostId"));
+//        $return['slug'] [] = Rule::unique("hessam_post_translations", "slug")->ignore($this->route()->parameter("blogPostId"));
         return $return;
     }
 }
diff --git a/src/Views/blogetc_admin/posts/add_post.blade.php b/src/Views/blogetc_admin/posts/add_post.blade.php
index 867d9a7..d5f37d7 100755
--- a/src/Views/blogetc_admin/posts/add_post.blade.php
+++ b/src/Views/blogetc_admin/posts/add_post.blade.php
@@ -11,9 +11,22 @@
     'post' => $post,
     'post_translation' => $post_translation
     ])
-
+        <input id="post_id" name="post_id" type="number" value="{{$post_id}}" hidden>
         <input type='submit' name="submit_btn" class='btn btn-primary' value='Add new post' >
 
     </form>
 
+    <script>
+        //multi language
+        var store_toggle_url = '{{route("blogetc.admin.store_post_toggle")}}';
+        var preLang = $('#language_list').val();
+        $('#language_list').change(function (){
+            $('#add-post-form').attr('action', store_toggle_url);
+
+            $('#selected_lang').val($('#language_list').val());
+            $('#language_list').val(preLang);
+            console.log($('#language_list').val())
+            $('#add-post-form').trigger('submit');
+        });
+    </script>
 @endsection
diff --git a/src/Views/blogetc_admin/posts/edit_post.blade.php b/src/Views/blogetc_admin/posts/edit_post.blade.php
index b2c2922..ae06d54 100755
--- a/src/Views/blogetc_admin/posts/edit_post.blade.php
+++ b/src/Views/blogetc_admin/posts/edit_post.blade.php
@@ -3,10 +3,16 @@
 
 
     <h5>Admin - Editing post
-        <a target='_blank' href='{{$post_translation->url()}}' class='float-right btn btn-primary'>View post</a>
+        @if($post_translation->slug)
+            <a target='_blank' href='{{$post_translation->url()}}' class='float-right btn btn-primary'>View post</a>
+        @endif
     </h5>
 
-    <form method='post' action='{{route("blogetc.admin.update_post",$post->id)}}'  enctype="multipart/form-data" >
+    <form id="edit-post-form" method='post' action='{{route("blogetc.admin.update_post",$post->id)}}'  enctype="multipart/form-data" >
+
+        <p>
+            To apply changes, click save changes for each language.
+        </p>
 
         @csrf
         @method("patch")
@@ -19,4 +25,19 @@
 
     </form>
 
+    <script>
+        //multi language
+        var edit_toggle_url = '{{route("blogetc.admin.edit_post_toggle",$post->id)}}';
+        var preLang = $('#language_list').val();
+        $('#language_list').change(function (){
+            $("#edit-post-form").attr("method", "get");
+            $('#edit-post-form').attr('action', edit_toggle_url);
+
+            $('#selected_lang').val($('#language_list').val());
+            $('#language_list').val(preLang);
+            console.log($('#language_list').val())
+            $('#edit-post-form').trigger('submit');
+        });
+    </script>
+
 @endsection
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/blogetc_admin/posts/form.blade.php
index 35feced..3c16e53 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/blogetc_admin/posts/form.blade.php
@@ -218,7 +218,6 @@ class='btn btn-light btn-sm'>Show other sizes</span>
 </div>
 
 <input id="selected_lang" name="selected_lang" type="number" value="-1" hidden>
-<input id="post_id" name="post_id" type="number" value="{{$post_id}}" hidden>
 
 <script>
     SHOULD_AUTO_GEN_SLUG = false;
@@ -252,21 +251,9 @@ function populate_slug_field() {
         SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
     }
 
-    //multi language
-    var store_toggle_url = '{{route("blogetc.admin.store_post_toggle")}}';
-    var preLang = $('#language_list').val();
-    $('#language_list').change(function (){
-        $('#add-post-form').attr('action', store_toggle_url);
-
-        $('#selected_lang').val($('#language_list').val());
-        $('#language_list').val(preLang);
-        console.log($('#language_list').val())
-        $('#add-post-form').trigger('submit');
-    });
 </script>
 
 @if( config("blogetc.use_wysiwyg") && config("blogetc.echo_html"))
-    {{--    <script src="//cdn.ckeditor.com/4.14.1/full/ckeditor.js"></script>--}}
     <script src="//cdn.ckeditor.com/4.15.0/full/ckeditor.js"></script>
 
     <script>
diff --git a/src/routes.php b/src/routes.php
index ca31bda..6c18273 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -62,6 +62,10 @@
             'HessamAdminController@edit_post')
             ->name('blogetc.admin.edit_post');
 
+        Route::get('/edit_post_toggle/{blogPostId}',
+            'HessamAdminController@edit_post_toggle')
+            ->name('blogetc.admin.edit_post_toggle');
+
         Route::patch('/edit_post/{blogPostId}',
             'HessamAdminController@update_post')
             ->name('blogetc.admin.update_post');

From 2dcad4c35cfa2bf543f42fa627c5d94f2b08ac9b Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 7 Nov 2020 20:55:02 +0330
Subject: [PATCH 015/118] remove post in multi-lang

---
 src/Controllers/HessamAdminController.php | 8 ++++----
 src/Models/HessamPost.php                 | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 06059ab..e466124 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -379,18 +379,18 @@ public function remove_photo($postSlug)
      */
     public function destroy_post(DeleteBlogEtcPostRequest $request, $blogPostId)
     {
-
         $post = HessamPost::findOrFail($blogPostId);
-        event(new BlogPostWillBeDeleted($post));
+        //archive deleted post
 
         $post->delete();
+        event(new BlogPostWillBeDeleted($post));
 
         // todo - delete the featured images?
         // At the moment it just issues a warning saying the images are still on the server.
 
-        return view("blogetc_admin::posts.deleted_post")
-            ->withDeletedPost($post);
+        Helpers::flash_message("Post successfully deleted!");
 
+        return redirect( route('blogetc.admin.index') );
     }
 
     /**
diff --git a/src/Models/HessamPost.php b/src/Models/HessamPost.php
index a9086d9..0435274 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/HessamPost.php
@@ -55,6 +55,10 @@ protected static function boot()
            otherwise (which will be for most users) it should only show published posts that have a posted_at
            time <= Carbon::now(). This sets it up: */
         static::addGlobalScope(new BlogEtcPublishedScope());
+
+        static::deleting(function($post) { // before delete() method call this
+            $post->postTranslations()->delete();
+        });
     }
 
     /**

From 8a68bb5187d17b9053cf48218be7a22771e635c7 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 10 Nov 2020 05:25:03 +0330
Subject: [PATCH 016/118] major view model controller - refactor

---
 src/Captcha/CaptchaAbstract.php               |  8 ++--
 .../HessamLanguageAdminController.php         |  4 ++
 src/Controllers/HessamReaderController.php    | 39 +++++++++++++------
 src/Middleware/DetectLanguage.php             | 24 ++++++++++++
 src/Middleware/LoadLanguage.php               |  7 +++-
 src/Models/HessamComment.php                  |  2 +-
 src/Models/HessamPost.php                     |  2 +-
 src/Models/HessamPostTranslation.php          |  4 +-
 src/Views/blogetc/index.blade.php             | 20 +++++-----
 .../partials/_category_partial.blade.php      | 13 +++++++
 .../partials/add_comment_form.blade.php       |  2 +-
 .../partials/full_post_details.blade.php      |  2 +-
 .../blogetc/partials/index_loop.blade.php     | 12 +++---
 .../blogetc/sitewide/search_form.blade.php    |  2 +-
 src/Views/blogetc_admin/index.blade.php       |  6 +--
 .../layouts/admin_layout.blade.php            |  4 +-
 src/css/hessam-blog.css                       |  6 ++-
 src/routes.php                                |  3 +-
 18 files changed, 110 insertions(+), 50 deletions(-)
 create mode 100644 src/Middleware/DetectLanguage.php
 create mode 100644 src/Views/blogetc/partials/_category_partial.blade.php

diff --git a/src/Captcha/CaptchaAbstract.php b/src/Captcha/CaptchaAbstract.php
index bfacc6a..9c48211 100644
--- a/src/Captcha/CaptchaAbstract.php
+++ b/src/Captcha/CaptchaAbstract.php
@@ -2,7 +2,7 @@
 
 use Illuminate\Http\Request;
 use WebDevEtc\BlogEtc\Interfaces\CaptchaInterface;
-use WebDevEtc\BlogEtc\Models\HessamPost;
+use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
 
 abstract class CaptchaAbstract implements CaptchaInterface
 {
@@ -12,11 +12,11 @@ abstract class CaptchaAbstract implements CaptchaInterface
      * executed when viewing single post
      *
      * @param Request $request
-     * @param HessamPost $blogEtcPost
+     * @param HessamPostTranslation $blogEtcPost
      *
      * @return void
      */
-    public function runCaptchaBeforeShowingPosts(Request $request, HessamPost $blogEtcPost)
+    public function runCaptchaBeforeShowingPosts(Request $request, HessamPostTranslation $blogEtcPost)
     {
         // no code here to run! Maybe in your subclass you can make use of this?
         /*
@@ -46,4 +46,4 @@ public function runCaptchaBeforeAddingComment(Request $request, HessamPost $blog
         // no code here to run! Maybe in your subclass you can make use of this?
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/HessamLanguageAdminController.php
index 60e17d9..0dd38a9 100644
--- a/src/Controllers/HessamLanguageAdminController.php
+++ b/src/Controllers/HessamLanguageAdminController.php
@@ -31,6 +31,10 @@ public function create_language(){
     }
 
     public function store_language(Request $request){
+        if ($request['locale'] == null){
+            Helpers::flash_message("Select a language!");
+            return view("blogetc_admin::languages.add_language");
+        }
         $language = new HessamLanguage();
         $language->active = $request['active'];
         $language->iso_code = $request['iso_code'];
diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index 830945c..27617b5 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -7,8 +7,11 @@
 use Illuminate\Http\Request;
 use Swis\Laravel\Fulltext\Search;
 use WebDevEtc\BlogEtc\Captcha\UsesCaptcha;
+use WebDevEtc\BlogEtc\Middleware\DetectLanguage;
 use WebDevEtc\BlogEtc\Models\HessamCategory;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
 use WebDevEtc\BlogEtc\Models\HessamPost;
+use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
 
 /**
  * Class HessamReaderController
@@ -19,6 +22,11 @@ class HessamReaderController extends Controller
 {
     use UsesCaptcha;
 
+    public function __construct()
+    {
+        $this->middleware(DetectLanguage::class);
+    }
+
     /**
      * Show blog posts
      * If category_slug is set, then only show from that category
@@ -26,9 +34,11 @@ class HessamReaderController extends Controller
      * @param null $category_slug
      * @return mixed
      */
-    public function index($category_slug = null)
+    public function index($locale, $category_slug = null, Request $request)
     {
         // the published_at + is_published are handled by BlogEtcPublishedScope, and don't take effect if the logged in user can manageb log posts
+
+        //todo
         $title = 'Blog Page'; // default title...
 
         $categoryChain = null;
@@ -42,21 +52,28 @@ public function index($category_slug = null)
             \View::share('blogetc_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
             $title = 'Posts in ' . $category->category_name . " category"; // hardcode title here...
         } else {
-            $posts = HessamPost::query();
+            $posts = HessamPostTranslation::query();
         }
 
-        $posts = $posts->where('is_published', '=', 1)->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'))->orderBy("posted_at", "desc")->paginate(config("blogetc.per_page", 10));
+//        $posts = $posts->where('is_published', '=', 1)
+//            ->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'))
+//            ->where('lang_id', $request->get("lang_id"))
+//            ->orderBy("posted_at", "desc")
+//            ->paginate(config("blogetc.per_page", 10));
 
-        //load categories in 3 levels
-        $rootList = HessamCategory::where('parent_id' ,'=' , null)->get();
-        for($i = 0 ; sizeof($rootList) > $i ; $i++){
-            $rootList[$i]->loadSiblings();
-            for ($j = 0 ; sizeof($rootList[$i]->siblings) > $j; $j++){
-                $rootList[$i]->siblings[$j]->loadSiblings();
-            }
-        }
+        $posts = HessamPostTranslation::where('lang_id', $request->get("lang_id"))
+            ->with(['post' => function($query){
+                $query->where("is_published" , '=' , true);
+                $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
+                $query->orderBy("posted_at", "desc");
+            }])->paginate(config("blogetc.per_page", 10));
+
+        //load category hierarchy
+        $rootList = HessamCategory::roots()->get();
+        HessamCategory::loadSiblingsWithList($rootList);
 
         return view("blogetc::index", [
+            'locale' => $request->get("locale"),
             'category_chain' => $categoryChain,
             'categories' => $rootList,
             'posts' => $posts,
diff --git a/src/Middleware/DetectLanguage.php b/src/Middleware/DetectLanguage.php
new file mode 100644
index 0000000..5138362
--- /dev/null
+++ b/src/Middleware/DetectLanguage.php
@@ -0,0 +1,24 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Middleware;
+
+use Closure;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
+
+class DetectLanguage
+{
+    public function handle($request, Closure $next)
+    {
+        $lang = HessamLanguage::where('locale', $request->route('locale'))
+            ->where('active', true)
+            ->first();
+
+        if (!$lang){
+            return abort(404);
+        }
+        $request->attributes->add(['lang_id' => $lang->id, 'locale' => $lang->locale]);
+
+        return $next($request);
+    }
+}
diff --git a/src/Middleware/LoadLanguage.php b/src/Middleware/LoadLanguage.php
index 30ff3f7..524b67f 100644
--- a/src/Middleware/LoadLanguage.php
+++ b/src/Middleware/LoadLanguage.php
@@ -10,10 +10,13 @@ class LoadLanguage
 
     public function handle($request, Closure $next)
     {
-        $language_id = HessamLanguage::where('locale',config("blogetc.default_language"))->first()->id;
+        $lang = HessamLanguage::where('locale', config("blogetc.default_language"))
+            ->first();
+
+        $request->attributes->add(['locale' => $lang->locale]);
 
         $response = $next($request);
-        $response->withCookie(cookie()->forever('language_id', $language_id));
+        $response->withCookie(cookie()->forever('language_id', $lang->language_id));
         return $response;
     }
 }
diff --git a/src/Models/HessamComment.php b/src/Models/HessamComment.php
index e97a031..6a0f86a 100755
--- a/src/Models/HessamComment.php
+++ b/src/Models/HessamComment.php
@@ -42,7 +42,7 @@ protected static function boot()
      */
     public function post()
     {
-        return $this->belongsTo(HessamPost::class,"hessam_post_id");
+        return $this->belongsTo(HessamPost::class,"post_id");
     }
 
     /**
diff --git a/src/Models/HessamPost.php b/src/Models/HessamPost.php
index 0435274..75976fa 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/HessamPost.php
@@ -100,7 +100,7 @@ public function categories()
      */
     public function comments()
     {
-        return $this->hasMany(HessamComment::class);
+        return $this->hasMany(HessamComment::class, 'post_id');
     }
 
 }
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index 09f99c8..1c93689 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -224,9 +224,9 @@ public function gen_seo_title()
      *
      * @return string
      */
-    public function url()
+    public function url($loacle)
     {
-        return route("blogetc.single", $this->slug);
+        return route("blogetc.single", [$loacle, $this->slug]);
     }
 
     /**
diff --git a/src/Views/blogetc/index.blade.php b/src/Views/blogetc/index.blade.php
index 75a254c..ba53801 100755
--- a/src/Views/blogetc/index.blade.php
+++ b/src/Views/blogetc/index.blade.php
@@ -27,8 +27,8 @@ class='btn border  btn-outline-primary btn-sm '>
                         <div class="row">
                             <div class="col-md-12">
                                 @forelse($category_chain as $cat)
-                                    / <a href="{{$cat->url()}}">
-                                        <span class="cat1">{{$cat->category_name}}</span>
+                                    / <a href="{{$cat->categoryTranslations[0]->url()}}">
+                                        <span class="cat1">{{$cat->categoryTranslations[0]['category_name']}}</span>
                                     </a>
                                 @empty @endforelse
                             </div>
@@ -59,15 +59,13 @@ class='btn border  btn-outline-primary btn-sm '>
             </div>
             <div class="col-md-3">
                 <h6>Blog Categories</h6>
-                @forelse($categories as $category)
-                    <a href="{{$category->url()}}">
-                        <h6>{{$category->category_name}}</h6>
-                    </a>
-                @empty
-                    <a href="#">
-                        <h6>No Categories</h6>
-                    </a>
-                @endforelse
+                <ul class="hessam-cat-hierarchy">
+                    @if($categories)
+                        @include("blogetc::partials._category_partial", ['category_tree' => $categories])
+                    @else
+                        <span>No Categories</span>
+                    @endif
+                </ul>
             </div>
         </div>
 
diff --git a/src/Views/blogetc/partials/_category_partial.blade.php b/src/Views/blogetc/partials/_category_partial.blade.php
new file mode 100644
index 0000000..498d4f4
--- /dev/null
+++ b/src/Views/blogetc/partials/_category_partial.blade.php
@@ -0,0 +1,13 @@
+@foreach($category_tree as $category)
+    <li class="category-item-wrapper">
+         <span class="category-item" value='{{$category->category_id}}'>
+        {{$category->categoryTranslations->where('lang_id',1)->first()->category_name}}
+
+             @if( count($category->siblings) > 0)
+                 <ul>
+                 @include("blogetc_admin::categories._category_partial", ['category_tree' => $category->siblings])
+                 </ul>
+             @endif
+    </span>
+    </li>
+@endforeach
diff --git a/src/Views/blogetc/partials/add_comment_form.blade.php b/src/Views/blogetc/partials/add_comment_form.blade.php
index 7b045b0..dfacc8f 100644
--- a/src/Views/blogetc/partials/add_comment_form.blade.php
+++ b/src/Views/blogetc/partials/add_comment_form.blade.php
@@ -1,6 +1,6 @@
 <div class='add_comment_area'>
     <h5 class='text-center'>Add a comment</h5>
-    <form method='post' action='{{route("blogetc.comments.add_new_comment", $post->slug)}}'>
+    <form method='post' action='{{route("blogetc.comments.add_new_comment",[app('request')->get('locale'),$post->slug])}}'>
         @csrf
 
 
diff --git a/src/Views/blogetc/partials/full_post_details.blade.php b/src/Views/blogetc/partials/full_post_details.blade.php
index 55a5270..0b84607 100644
--- a/src/Views/blogetc/partials/full_post_details.blade.php
+++ b/src/Views/blogetc/partials/full_post_details.blade.php
@@ -23,7 +23,7 @@
 
 <hr/>
 
-Posted <strong>{{$post->posted_at->diffForHumans()}}</strong>
+Posted <strong>{{$post->post->posted_at->diffForHumans()}}</strong>
 
 @includeWhen($post->author,"blogetc::partials.author",['post'=>$post])
 @includeWhen($post->categories,"blogetc::partials.categories",['post'=>$post])
diff --git a/src/Views/blogetc/partials/index_loop.blade.php b/src/Views/blogetc/partials/index_loop.blade.php
index 1dcd6aa..15639a9 100644
--- a/src/Views/blogetc/partials/index_loop.blade.php
+++ b/src/Views/blogetc/partials/index_loop.blade.php
@@ -1,6 +1,6 @@
 {{--Used on the index page (so shows a small summary--}}
-{{--See the guide on webdevetc.com for how to copy these files to your /resources/views/ directory--}}
-{{--https://webdevetc.com/laravel/packages/blogetc-blog-system-for-your-laravel-app/help-documentation/laravel-blog-package-blogetc#guide_to_views--}}
+{{--See the guide on WebDevEtc.binshops.com for how to copy these files to your /resources/views/ directory--}}
+{{--https://WebDevEtc.binshops.com/laravel-blog-package--}}
 
 <div class="col-md-6">
     <div class="blog-item">
@@ -9,7 +9,7 @@
             <?=$post->image_tag("medium", true, ''); ?>
         </div>
         <div class="blog-inner-item">
-            <h3 class=''><a href='{{$post->url()}}'>{{$post->title}}</a></h3>
+            <h3 class=''><a href='{{$post->url($locale)}}'>{{$post->title}}</a></h3>
             <h5 class=''>{{$post->subtitle}}</h5>
 
             @if (config('blogetc.show_full_text_at_list'))
@@ -19,12 +19,12 @@
             @endif
 
             <div class="post-details-bottom">
-                <span class="light-text">Authored by: </span> {{$post->author->name}} <span class="light-text">Posted at: </span> {{date('d M Y ', strtotime($post->posted_at))}}
+                <span class="light-text">Authored by: </span> {{$post->post->author->name}} <span class="light-text">Posted at: </span> {{date('d M Y ', strtotime($post->posted_at))}}
             </div>
             <div class='text-center'>
-                <a href="{{$post->url()}}" class="btn btn-primary">View Post</a>
+                <a href="{{$post->url($locale)}}" class="btn btn-primary">View Post</a>
             </div>
         </div>
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Views/blogetc/sitewide/search_form.blade.php b/src/Views/blogetc/sitewide/search_form.blade.php
index a7c865d..5b562ec 100644
--- a/src/Views/blogetc/sitewide/search_form.blade.php
+++ b/src/Views/blogetc/sitewide/search_form.blade.php
@@ -1,5 +1,5 @@
 <div style='max-width:500px;margin:50px auto;' class='search-form-outer'>
-    <form method='get' action='{{route("blogetc.search")}}' class='text-center'>
+    <form method='get' action='{{route("blogetc.search", app('request')->get('locale'))}}' class='text-center'>
         <h4>Search for something in our blog:</h4>
         <input type='text' name='s' placeholder='Search...' class='form-control' value='{{\Request::get("s")}}'>
         <input type='submit' value='Search' class='btn btn-primary m-2'>
diff --git a/src/Views/blogetc_admin/index.blade.php b/src/Views/blogetc_admin/index.blade.php
index 7108a12..2cb7b95 100755
--- a/src/Views/blogetc_admin/index.blade.php
+++ b/src/Views/blogetc_admin/index.blade.php
@@ -7,7 +7,7 @@
     @forelse($post_translations as $post)
         <div class="card m-4" style="">
             <div class="card-body">
-                <h5 class='card-title'><a class="a-link-cart-color" href='{{$post->url()}}'>{{$post->title}}</a></h5>
+                <h5 class='card-title'><a class="a-link-cart-color" href='{{$post->url(app('request')->get('locale'))}}'>{{$post->title}}</a></h5>
                 <h5 class='card-subtitle mb-2 text-muted'>{{$post->subtitle}}</h5>
                 <p class="card-text">{{$post->html}}</p>
 
@@ -73,8 +73,8 @@
                 @endif
 
 
-                <a href="{{$post->url()}}" class="card-link btn btn-outline-secondary"><i class="fa fa-file-text-o"
-                                                                                          aria-hidden="true"></i>
+                <a href="{{$post->url(app('request')->get('locale'))}}" class="card-link btn btn-outline-secondary"><i class="fa fa-file-text-o"
+                                                                                                                       aria-hidden="true"></i>
                     View Post</a>
                 <a href="{{$post->edit_url()}}" class="card-link btn btn-primary">
                     <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
diff --git a/src/Views/blogetc_admin/layouts/admin_layout.blade.php b/src/Views/blogetc_admin/layouts/admin_layout.blade.php
index c98562a..9cc6026 100755
--- a/src/Views/blogetc_admin/layouts/admin_layout.blade.php
+++ b/src/Views/blogetc_admin/layouts/admin_layout.blade.php
@@ -60,9 +60,7 @@
                 <ul class="navbar-nav ml-auto">
                     <!-- Authentication Links -->
 
-
-                    <li class='nav-item px-2'><a class='nav-link' href='{{route("blogetc.index")}}'>Blog home</a></li>
-
+                    <li class='nav-item px-2'><a class='nav-link' href='{{route("blogetc.index" , $post->url(app('request')->get('locale')))}}'>Blog home</a></li>
 
                     <li class="nav-item ">
                         <a id="" class="nav-link " href="#" role="button"
diff --git a/src/css/hessam-blog.css b/src/css/hessam-blog.css
index 585188e..7c26fb6 100644
--- a/src/css/hessam-blog.css
+++ b/src/css/hessam-blog.css
@@ -23,4 +23,8 @@
     width: 100%;
     height: 100%;
     background-color: #E16036;
-}
\ No newline at end of file
+}
+
+.hessam-cat-hierarchy {
+    list-style-type: none !important;
+}
diff --git a/src/routes.php b/src/routes.php
index 6c18273..caf8bbb 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -2,9 +2,8 @@
 
 Route::group(['middleware' => ['web'], 'namespace' => '\WebDevEtc\BlogEtc\Controllers'], function () {
 
-
     /** The main public facing blog routes - show all posts, view a category, rss feed, view a single post, also the add comment route */
-    Route::group(['prefix' => config('blogetc.blog_prefix', 'blog')], function () {
+    Route::group(['prefix' => "/{locale}/".config('blogetc.blog_prefix', 'blog')], function () {
 
         Route::get('/', 'HessamReaderController@index')
             ->name('blogetc.index');

From 879f37c98c62e5b25255ce8579ff599b14aca89f Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 12 Nov 2020 03:25:48 +0330
Subject: [PATCH 017/118] some fixes

---
 .../HessamCategoryAdminController.php         |   5 +-
 .../HessamCommentWriterController.php         |   9 +
 .../HessamCommentsAdminController.php         |   3 +
 .../HessamImageUploadController.php           |   2 +
 .../HessamLanguageAdminController.php         |   3 +
 src/Controllers/HessamReaderController.php    |  18 +-
 src/Controllers/HessamRssFeedController.php   |   6 +
 src/Models/HessamCategoryTranslation.php      |   6 +-
 .../categories/add_category.blade.php         | 234 +++++++++---------
 .../categories/edit_category.blade.php        |  28 +--
 .../blogetc_admin/categories/form.blade.php   |   2 +-
 .../blogetc_admin/categories/index.blade.php  |   6 +-
 src/Views/blogetc_admin/posts/form.blade.php  |   3 +-
 13 files changed, 176 insertions(+), 149 deletions(-)

diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index 447d6c8..c0446b4 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -8,6 +8,7 @@
 use WebDevEtc\BlogEtc\Events\CategoryEdited;
 use WebDevEtc\BlogEtc\Events\CategoryWillBeDeleted;
 use WebDevEtc\BlogEtc\Helpers;
+use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamCategory;
 use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
@@ -28,6 +29,8 @@ class HessamCategoryAdminController extends Controller
     public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
+        $this->middleware(LoadLanguage::class);
+
     }
 
     /**
@@ -181,7 +184,7 @@ public function update_category(UpdateBlogEtcCategoryRequest $request, $category
      */
     public function destroy_category(DeleteBlogEtcCategoryRequest $request, $categoryId){
 
-        /* Please keep this in, so code inspections don't say $request was unused. Of course it might now get marked as left/right parts are equal */
+        /* Please keep this in, so code inspectiwons don't say $request was unused. Of course it might now get marked as left/right parts are equal */
         $request=$request;
 
         $category = HessamCategory::findOrFail($categoryId);
diff --git a/src/Controllers/HessamCommentWriterController.php b/src/Controllers/HessamCommentWriterController.php
index c7af89d..370358f 100755
--- a/src/Controllers/HessamCommentWriterController.php
+++ b/src/Controllers/HessamCommentWriterController.php
@@ -7,6 +7,8 @@
 use WebDevEtc\BlogEtc\Captcha\CaptchaAbstract;
 use WebDevEtc\BlogEtc\Captcha\UsesCaptcha;
 use WebDevEtc\BlogEtc\Events\CommentAdded;
+use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
+use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamComment;
 use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Requests\AddNewCommentRequest;
@@ -20,6 +22,13 @@ class HessamCommentWriterController extends Controller
 
     use UsesCaptcha;
 
+    public function __construct()
+    {
+        $this->middleware(UserCanManageBlogPosts::class);
+        $this->middleware(LoadLanguage::class);
+
+    }
+
     /**
      * Let a guest (or logged in user) submit a new comment for a blog post
      *
diff --git a/src/Controllers/HessamCommentsAdminController.php b/src/Controllers/HessamCommentsAdminController.php
index 7d3caf6..3185b76 100755
--- a/src/Controllers/HessamCommentsAdminController.php
+++ b/src/Controllers/HessamCommentsAdminController.php
@@ -7,6 +7,7 @@
 use WebDevEtc\BlogEtc\Events\CommentApproved;
 use WebDevEtc\BlogEtc\Events\CommentWillBeDeleted;
 use WebDevEtc\BlogEtc\Helpers;
+use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamComment;
 
@@ -22,6 +23,8 @@ class HessamCommentsAdminController extends Controller
     public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
+        $this->middleware(LoadLanguage::class);
+
     }
 
     /**
diff --git a/src/Controllers/HessamImageUploadController.php b/src/Controllers/HessamImageUploadController.php
index 82c1b35..482029b 100755
--- a/src/Controllers/HessamImageUploadController.php
+++ b/src/Controllers/HessamImageUploadController.php
@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
 use File;
@@ -25,6 +26,7 @@ class HessamImageUploadController extends Controller
     public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
+        $this->middleware(LoadLanguage::class);
 
         if (!is_array(config("blogetc"))) {
             throw new \RuntimeException('The config/blogetc.php does not exist. Publish the vendor files for the BlogEtc package by running the php artisan publish:vendor command');
diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/HessamLanguageAdminController.php
index 0dd38a9..19a243d 100644
--- a/src/Controllers/HessamLanguageAdminController.php
+++ b/src/Controllers/HessamLanguageAdminController.php
@@ -6,6 +6,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use WebDevEtc\BlogEtc\Helpers;
+use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamLanguage;
 
@@ -17,6 +18,8 @@ class HessamLanguageAdminController extends Controller
     public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
+        $this->middleware(LoadLanguage::class);
+
     }
 
     public function index(){
diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index 27617b5..b2e824a 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -63,10 +63,10 @@ public function index($locale, $category_slug = null, Request $request)
 
         $posts = HessamPostTranslation::where('lang_id', $request->get("lang_id"))
             ->with(['post' => function($query){
-                $query->where("is_published" , '=' , true);
-                $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
-                $query->orderBy("posted_at", "desc");
-            }])->paginate(config("blogetc.per_page", 10));
+            $query->where("is_published" , '=' , true);
+            $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
+            $query->orderBy("posted_at", "desc");
+        }])->paginate(config("blogetc.per_page", 10));
 
         //load category hierarchy
         $rootList = HessamCategory::roots()->get();
@@ -129,11 +129,13 @@ public function view_category($hierarchy)
      * @param $blogPostSlug
      * @return mixed
      */
-    public function viewSinglePost(Request $request, $blogPostSlug)
+    public function viewSinglePost(Request $request, $locale, $blogPostSlug)
     {
         // the published_at + is_published are handled by BlogEtcPublishedScope, and don't take effect if the logged in user can manage log posts
-        $blog_post = HessamPost::where("slug", $blogPostSlug)
-            ->firstOrFail();
+        $blog_post = HessamPostTranslation::where([
+            ["slug", "=", $blogPostSlug],
+            ['lang_id', "=" , $request->get("lang_id")]
+        ])->firstOrFail();
 
         if ($captcha = $this->getCaptchaObject()) {
             $captcha->runCaptchaBeforeShowingPosts($request, $blog_post);
@@ -142,7 +144,7 @@ public function viewSinglePost(Request $request, $blogPostSlug)
         return view("blogetc::single_post", [
             'post' => $blog_post,
             // the default scope only selects approved comments, ordered by id
-            'comments' => $blog_post->comments()
+            'comments' => $blog_post->post->comments()
                 ->with("user")
                 ->get(),
             'captcha' => $captcha,
diff --git a/src/Controllers/HessamRssFeedController.php b/src/Controllers/HessamRssFeedController.php
index 4fed9a0..7472ccf 100755
--- a/src/Controllers/HessamRssFeedController.php
+++ b/src/Controllers/HessamRssFeedController.php
@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Laravelium\Feed\Feed;
+use WebDevEtc\BlogEtc\Middleware\DetectLanguage;
 use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Requests\FeedRequest;
 
@@ -15,6 +16,11 @@
  */
 class HessamRssFeedController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware(DetectLanguage::class);
+    }
+    
     /**
      * @param Feed $feed
      * @param $posts
diff --git a/src/Models/HessamCategoryTranslation.php b/src/Models/HessamCategoryTranslation.php
index e67aee5..1718edf 100644
--- a/src/Models/HessamCategoryTranslation.php
+++ b/src/Models/HessamCategoryTranslation.php
@@ -37,15 +37,15 @@ public function language()
      * Returns the public facing URL of showing blog posts in this category
      * @return string
      */
-    public function url($language_id)
+    public function url($loacle)
     {
         $theChainString = "";
         $cat = $this->category()->get();
         $chain = $cat[0]->getAncestorsAndSelf();
         foreach ($chain as $category){
-            $theChainString .=  "/" . $category->slug;
+            $theChainString .=  "/" . $category->categoryTranslations()->where('lang_id' , $this->lang_id)->first()->slug;
         }
-        return route("blogetc.view_category", $theChainString);
+        return route("blogetc.view_category",[$loacle, $theChainString]);
     }
 
     /**
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index d17f9a5..b7e166c 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -37,21 +37,21 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category slug</label>
             <input
-                    maxlength='100'
-                    pattern="[a-zA-Z0-9-]+"
-                    type="text"
-                    required
-                    class="form-control"
-                    id="category_slug"
-                    oninput="SHOULD_AUTO_GEN_SLUG=false;"
-                    aria-describedby="category_slug_help"
-                    name='slug'
-                    value="{{old("slug",$category_translation->slug)}}"
+                maxlength='100'
+                pattern="[a-zA-Z0-9-]+"
+                type="text"
+                required
+                class="form-control"
+                id="category_slug"
+                oninput="SHOULD_AUTO_GEN_SLUG=false;"
+                aria-describedby="category_slug_help"
+                name='slug'
+                value="{{old("slug",$category_translation->slug)}}"
             >
 
             <small id="category_slug_help" class="form-text text-muted">
                 Letters, numbers, dash only. The slug
-                i.e. {{route("blogetc.view_category","")}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+                i.e. {{route("blogetc.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
                 share the same slug).
 
             </small>
@@ -60,132 +60,132 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category Tree</label>
             <ul class="hessam-category-hierarchy">
-                @include("blogetc_admin::categories._category_partial", ['category_tree' => $cat_roots])
+              @include("blogetc_admin::categories._category_partial", ['category_tree' => $cat_roots])
             </ul>
-        </div>
-
-        <div class="form-group">
-            <label for="category_slug">Parent Category</label>
-            <select id="parent_id" name='parent_id' class='form-control'>
-                <option  selected='selected' value='0'>
-                    Root
+    </div>
+
+    <div class="form-group">
+        <label for="category_slug">Parent Category</label>
+        <select id="parent_id" name='parent_id' class='form-control'>
+            <option  selected='selected' value='0'>
+                Root
+            </option>
+            @foreach($category_tree as $category)
+                <option  value='{{$category->categoryTranslations[0]['category_id']}}'>
+                    {{$category->categoryTranslations[0]['category_name']}}
                 </option>
-                @foreach($category_tree as $category)
-                    <option  value='{{$category->categoryTranslations[0]['category_id']}}'>
-                        {{$category->categoryTranslations[0]['category_name']}}
-                    </option>
-                @endforeach
-            </select>
-        </div>
+            @endforeach
+        </select>
+    </div>
 
-        <div class="form-group">
-            <label for="category_description">Category Description (optional)</label>
-            <textarea name='category_description'
-                      class='form-control'
-                      id='category_description'>{{old("category_description",$category_translation->category_description)}}</textarea>
+    <div class="form-group">
+        <label for="category_description">Category Description (optional)</label>
+        <textarea name='category_description'
+                  class='form-control'
+                  id='category_description'>{{old("category_description",$category_translation->category_description)}}</textarea>
 
-        </div>
+    </div>
 
-        <button type="button" class='btn btn-primary' id="submit-btn">Add new category</button>
+    <button type="button" class='btn btn-primary' id="submit-btn">Add new category</button>
 
-        <script>
-            SHOULD_AUTO_GEN_SLUG = false;
+    <script>
+        SHOULD_AUTO_GEN_SLUG = false;
 
-            /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
-            function populate_slug_field() {
+        /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
+        function populate_slug_field() {
 
 //        alert("A");
-                var cat_slug = document.getElementById('category_slug');
+            var cat_slug = document.getElementById('category_slug');
 
-                if (cat_slug.value.length < 1) {
-                    // if the slug field is empty, make sure it auto generates
-                    SHOULD_AUTO_GEN_SLUG = true;
-                }
-
-                if (SHOULD_AUTO_GEN_SLUG) {
-                    // the slug hasn't been manually changed (or it was set above), so we should generate the slug
-                    // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
-                    cat_slug.value =document.getElementById("category_name").value.toLowerCase()
-                        .replace(/[^\w-_ ]+/g, '') // replace with nothing
-                        .replace(/[_ ]+/g, '-') // replace _ and spaces with -
-                        .substring(0,99); // limit str length
+            if (cat_slug.value.length < 1) {
+                // if the slug field is empty, make sure it auto generates
+                SHOULD_AUTO_GEN_SLUG = true;
+            }
 
-                }
+            if (SHOULD_AUTO_GEN_SLUG) {
+                // the slug hasn't been manually changed (or it was set above), so we should generate the slug
+                // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
+                cat_slug.value =document.getElementById("category_name").value.toLowerCase()
+                    .replace(/[^\w-_ ]+/g, '') // replace with nothing
+                    .replace(/[_ ]+/g, '-') // replace _ and spaces with -
+                    .substring(0,99); // limit str length
 
             }
 
-            if (document.getElementById("category_slug").value.length < 1) {
-                SHOULD_AUTO_GEN_SLUG = true;
-            } else {
-                SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
+        }
+
+        if (document.getElementById("category_slug").value.length < 1) {
+            SHOULD_AUTO_GEN_SLUG = true;
+        } else {
+            SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
+        }
+
+
+        //multi-language data
+        var defalutLangId = {{$language_id}}
+        var preLangId = defalutLangId;
+        var languageList = {};
+        $("#language_list > option").each(function() {
+            languageList[this.value] = {
+                lang_id: -1,
+                category_name: "",
+                slug: "",
+                category_description: "",
+                lang_name: this.text
             }
-
-
-            //multi-language data
-            var defalutLangId = {{$language_id}}
-            var preLangId = defalutLangId;
-            var languageList = {};
-            $("#language_list > option").each(function() {
-                languageList[this.value] = {
-                    lang_id: -1,
-                    category_name: "",
-                    slug: "",
-                    category_description: "",
-                    lang_name: this.text
+        });
+
+        $('#language_list').on('change', function() {
+            fillLanguageList(this.value);
+            preLangId = this.value;
+        });
+
+        function fillLanguageList(langId){
+            languageList[preLangId].lang_id = preLangId;
+            languageList[preLangId].category_name = $('#category_name').val();
+            languageList[preLangId].slug = $('#category_slug').val();
+            languageList[preLangId].category_description = $('#category_description').val();
+
+            $('#category_name').val(languageList[langId].category_name);
+            $('#category_slug').val(languageList[langId].slug);
+            $('#category_description').val(languageList[langId].category_description);
+        }
+
+        $.ajaxSetup({
+            headers: {
+                'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+            }
+        });
+
+        $('#submit-btn').click(function (){
+            if (languageList[$('#language_list').val()].lang_id == -1){
+                if (!$('#category_name').val()){
+                    alert("Category name must not be empty");
+                    return ;
+                }else if (!$('#category_slug').val()){
+                    alert("Category slug must not be empty");
+                    return ;
                 }
-            });
-
-            $('#language_list').on('change', function() {
-                fillLanguageList(this.value);
-                preLangId = this.value;
-            });
-
-            function fillLanguageList(langId){
-                languageList[preLangId].lang_id = preLangId;
+                languageList[preLangId].lang_id = $('#language_list').val();
                 languageList[preLangId].category_name = $('#category_name').val();
                 languageList[preLangId].slug = $('#category_slug').val();
                 languageList[preLangId].category_description = $('#category_description').val();
-
-                $('#category_name').val(languageList[langId].category_name);
-                $('#category_slug').val(languageList[langId].slug);
-                $('#category_description').val(languageList[langId].category_description);
             }
-
-            $.ajaxSetup({
-                headers: {
-                    'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-                }
-            });
-
-            $('#submit-btn').click(function (){
-                if (languageList[$('#language_list').val()].lang_id == -1){
-                    if (!$('#category_name').val()){
-                        alert("Category name must not be empty");
-                        return ;
-                    }else if (!$('#category_slug').val()){
-                        alert("Category slug must not be empty");
-                        return ;
-                    }
-                    languageList[preLangId].lang_id = $('#language_list').val();
-                    languageList[preLangId].category_name = $('#category_name').val();
-                    languageList[preLangId].slug = $('#category_slug').val();
-                    languageList[preLangId].category_description = $('#category_description').val();
+            $.post('{{route("blogetc.admin.categories.store_category")}}' ,
+                {
+                    data: languageList,
+                    parent_id: parseInt($('#parent_id').val())
+                },
+                function(data, status){
+                if (data.code === 403){
+                    alert("Slug is already taken: " + languageList[data.data].lang_name);
+                }else if (data.code === 200) {
                 }
-                $.post('{{route("blogetc.admin.categories.store_category")}}' ,
-                    {
-                        data: languageList,
-                        parent_id: parseInt($('#parent_id').val())
-                    },
-                    function(data, status){
-                        if (data.code === 403){
-                            alert("Slug is already taken: " + languageList[data.data].lang_name);
-                        }else if (data.code === 200) {
-                        }
-                        window.location.replace("{{route('blogetc.admin.categories.index')}}");
-                    });
-            });
-
-        </script>
-    </form>
+                    window.location.replace("{{route('blogetc.admin.categories.index')}}");
+                });
+        });
+
+    </script>
+</form>
 
 @endsection
diff --git a/src/Views/blogetc_admin/categories/edit_category.blade.php b/src/Views/blogetc_admin/categories/edit_category.blade.php
index 0d9be64..b71fff1 100755
--- a/src/Views/blogetc_admin/categories/edit_category.blade.php
+++ b/src/Views/blogetc_admin/categories/edit_category.blade.php
@@ -55,21 +55,21 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category slug</label>
             <input
-                    maxlength='100'
-                    pattern="[a-zA-Z0-9-]+"
-                    type="text"
-                    required
-                    class="form-control"
-                    id="category_slug"
-                    oninput="SHOULD_AUTO_GEN_SLUG=false;"
-                    aria-describedby="category_slug_help"
-                    name='slug'
-                    value="{{old("slug",$category_translation->slug)}}"
+                maxlength='100'
+                pattern="[a-zA-Z0-9-]+"
+                type="text"
+                required
+                class="form-control"
+                id="category_slug"
+                oninput="SHOULD_AUTO_GEN_SLUG=false;"
+                aria-describedby="category_slug_help"
+                name='slug'
+                value="{{old("slug",$category_translation->slug)}}"
             >
 
             <small id="category_slug_help" class="form-text text-muted">
                 Letters, numbers, dash only. The slug
-                i.e. {{route("blogetc.view_category","")}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+                i.e. {{route("blogetc.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
                 share the same slug).
 
             </small>
@@ -83,9 +83,9 @@ class="form-control"
                 </option>
                 @foreach($categories_list as $category2)
                     @if($category->id != $category2->category_id)
-                        <option @if($category->parent_id == $category2->category_id) selected='selected' @endif value='{{$category2->category_id}}'>
-                            {{$category2->category_name}}
-                        </option>
+                    <option @if($category->parent_id == $category2->category_id) selected='selected' @endif value='{{$category2->category_id}}'>
+                        {{$category2->category_name}}
+                    </option>
                     @endif
                 @endforeach
             </select>
diff --git a/src/Views/blogetc_admin/categories/form.blade.php b/src/Views/blogetc_admin/categories/form.blade.php
index 1bbc152..51ac6f7 100755
--- a/src/Views/blogetc_admin/categories/form.blade.php
+++ b/src/Views/blogetc_admin/categories/form.blade.php
@@ -58,7 +58,7 @@ class="form-control"
 
     <small id="category_slug_help" class="form-text text-muted">
         Letters, numbers, dash only. The slug
-        i.e. {{route("blogetc.view_category","")}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+        i.e. {{route("blogetc.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
         share the same slug).
 
     </small>
diff --git a/src/Views/blogetc_admin/categories/index.blade.php b/src/Views/blogetc_admin/categories/index.blade.php
index cb307af..c35a9b4 100755
--- a/src/Views/blogetc_admin/categories/index.blade.php
+++ b/src/Views/blogetc_admin/categories/index.blade.php
@@ -5,10 +5,10 @@
 
         <div class="card m-4">
             <div class="card-body">
-                <h5 class='card-title'><a class="a-link-cart-color" href='{{$category->url($language_id)}}'>{{$category->category_name}}</a></h5>
+                <h5 class='card-title'><a class="a-link-cart-color" href='{{$category->url(app('request')->get('locale'))}}'>{{$category->category_name}}</a></h5>
 
 
-                <a href="{{$category->url($language_id)}}" class="card-link btn btn-outline-secondary">View Posts in this category</a>
+                <a href="{{$category->url(app('request')->get('locale'))}}" class="card-link btn btn-outline-secondary">View Posts in this category</a>
                 <a href="{{$category->edit_url()}}" class="card-link btn btn-primary">Edit Category</a>
                 <form
 
@@ -32,4 +32,4 @@
         {{$categories->appends( [] )->links()}}
     </div>
 
-    @endsection
\ No newline at end of file
+    @endsection
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/blogetc_admin/posts/form.blade.php
index 3c16e53..52eb06f 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/blogetc_admin/posts/form.blade.php
@@ -35,8 +35,7 @@
             <label for="blog_slug">Blog Post Slug</label>
             <input type="text" class="form-control" id="blog_slug" aria-describedby="blog_slug_help" name='slug'
                    value="{{old("slug",$post_translation->slug)}}">
-            <small id="blog_slug_help" class="form-text text-muted">The slug (leave blank to auto generate) -
-                i.e. {{route("blogetc.single","")}}/<u><em>this_part</em></u></small>
+            <small id="blog_slug_help" class="form-text text-muted">The slug (leave blank to auto generate) - i.e.{{route("blogetc.single", [app('request')->get('locale'), "your-slug"])}}</small>
         </div>
 
     </div>

From a3a63eea06f864ec42a79b07d48cf4530c9004d5 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 12 Nov 2020 03:27:30 +0330
Subject: [PATCH 018/118] changes category hierarchy ui

---
 .../categories/_category_partial.blade.php    |  17 +-
 .../categories/add_category.blade.php         | 234 +++++++++---------
 src/css/blogetc_admin_css.css                 |  57 ++++-
 3 files changed, 170 insertions(+), 138 deletions(-)

diff --git a/src/Views/blogetc_admin/categories/_category_partial.blade.php b/src/Views/blogetc_admin/categories/_category_partial.blade.php
index 498d4f4..da7dc94 100644
--- a/src/Views/blogetc_admin/categories/_category_partial.blade.php
+++ b/src/Views/blogetc_admin/categories/_category_partial.blade.php
@@ -1,13 +1,12 @@
 @foreach($category_tree as $category)
-    <li class="category-item-wrapper">
-         <span class="category-item" value='{{$category->category_id}}'>
+    <li>
+         <span value='{{$category->category_id}}'>
         {{$category->categoryTranslations->where('lang_id',1)->first()->category_name}}
-
-             @if( count($category->siblings) > 0)
-                 <ul>
-                 @include("blogetc_admin::categories._category_partial", ['category_tree' => $category->siblings])
-                 </ul>
-             @endif
-    </span>
+        </span>
+        @if( count($category->siblings) > 0)
+            <ul>
+                @include("blogetc_admin::categories._category_partial", ['category_tree' => $category->siblings])
+            </ul>
+        @endif
     </li>
 @endforeach
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/blogetc_admin/categories/add_category.blade.php
index b7e166c..bbafaf8 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/blogetc_admin/categories/add_category.blade.php
@@ -37,16 +37,16 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category slug</label>
             <input
-                maxlength='100'
-                pattern="[a-zA-Z0-9-]+"
-                type="text"
-                required
-                class="form-control"
-                id="category_slug"
-                oninput="SHOULD_AUTO_GEN_SLUG=false;"
-                aria-describedby="category_slug_help"
-                name='slug'
-                value="{{old("slug",$category_translation->slug)}}"
+                    maxlength='100'
+                    pattern="[a-zA-Z0-9-]+"
+                    type="text"
+                    required
+                    class="form-control"
+                    id="category_slug"
+                    oninput="SHOULD_AUTO_GEN_SLUG=false;"
+                    aria-describedby="category_slug_help"
+                    name='slug'
+                    value="{{old("slug",$category_translation->slug)}}"
             >
 
             <small id="category_slug_help" class="form-text text-muted">
@@ -59,133 +59,133 @@ class="form-control"
 
         <div class="form-group">
             <label for="category_slug">Category Tree</label>
-            <ul class="hessam-category-hierarchy">
-              @include("blogetc_admin::categories._category_partial", ['category_tree' => $cat_roots])
+            <ul class="wtree">
+                @include("blogetc_admin::categories._category_partial", ['category_tree' => $cat_roots])
             </ul>
-    </div>
-
-    <div class="form-group">
-        <label for="category_slug">Parent Category</label>
-        <select id="parent_id" name='parent_id' class='form-control'>
-            <option  selected='selected' value='0'>
-                Root
-            </option>
-            @foreach($category_tree as $category)
-                <option  value='{{$category->categoryTranslations[0]['category_id']}}'>
-                    {{$category->categoryTranslations[0]['category_name']}}
+        </div>
+
+        <div class="form-group">
+            <label for="category_slug">Parent Category</label>
+            <select id="parent_id" name='parent_id' class='form-control'>
+                <option  selected='selected' value='0'>
+                    Root
                 </option>
-            @endforeach
-        </select>
-    </div>
+                @foreach($category_tree as $category)
+                    <option  value='{{$category->categoryTranslations[0]['category_id']}}'>
+                        {{$category->categoryTranslations[0]['category_name']}}
+                    </option>
+                @endforeach
+            </select>
+        </div>
 
-    <div class="form-group">
-        <label for="category_description">Category Description (optional)</label>
-        <textarea name='category_description'
-                  class='form-control'
-                  id='category_description'>{{old("category_description",$category_translation->category_description)}}</textarea>
+        <div class="form-group">
+            <label for="category_description">Category Description (optional)</label>
+            <textarea name='category_description'
+                      class='form-control'
+                      id='category_description'>{{old("category_description",$category_translation->category_description)}}</textarea>
 
-    </div>
+        </div>
 
-    <button type="button" class='btn btn-primary' id="submit-btn">Add new category</button>
+        <button type="button" class='btn btn-primary' id="submit-btn">Add new category</button>
 
-    <script>
-        SHOULD_AUTO_GEN_SLUG = false;
+        <script>
+            SHOULD_AUTO_GEN_SLUG = false;
 
-        /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
-        function populate_slug_field() {
+            /* Generate the slug field, if it was not touched by the user (or if it was an empty string) */
+            function populate_slug_field() {
 
 //        alert("A");
-            var cat_slug = document.getElementById('category_slug');
+                var cat_slug = document.getElementById('category_slug');
 
-            if (cat_slug.value.length < 1) {
-                // if the slug field is empty, make sure it auto generates
-                SHOULD_AUTO_GEN_SLUG = true;
-            }
+                if (cat_slug.value.length < 1) {
+                    // if the slug field is empty, make sure it auto generates
+                    SHOULD_AUTO_GEN_SLUG = true;
+                }
 
-            if (SHOULD_AUTO_GEN_SLUG) {
-                // the slug hasn't been manually changed (or it was set above), so we should generate the slug
-                // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
-                cat_slug.value =document.getElementById("category_name").value.toLowerCase()
-                    .replace(/[^\w-_ ]+/g, '') // replace with nothing
-                    .replace(/[_ ]+/g, '-') // replace _ and spaces with -
-                    .substring(0,99); // limit str length
+                if (SHOULD_AUTO_GEN_SLUG) {
+                    // the slug hasn't been manually changed (or it was set above), so we should generate the slug
+                    // This is done in two stages - one to remove non words/spaces etc, the another to replace white space (and underscore) with a -
+                    cat_slug.value =document.getElementById("category_name").value.toLowerCase()
+                        .replace(/[^\w-_ ]+/g, '') // replace with nothing
+                        .replace(/[_ ]+/g, '-') // replace _ and spaces with -
+                        .substring(0,99); // limit str length
 
-            }
+                }
 
-        }
-
-        if (document.getElementById("category_slug").value.length < 1) {
-            SHOULD_AUTO_GEN_SLUG = true;
-        } else {
-            SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
-        }
-
-
-        //multi-language data
-        var defalutLangId = {{$language_id}}
-        var preLangId = defalutLangId;
-        var languageList = {};
-        $("#language_list > option").each(function() {
-            languageList[this.value] = {
-                lang_id: -1,
-                category_name: "",
-                slug: "",
-                category_description: "",
-                lang_name: this.text
             }
-        });
-
-        $('#language_list').on('change', function() {
-            fillLanguageList(this.value);
-            preLangId = this.value;
-        });
-
-        function fillLanguageList(langId){
-            languageList[preLangId].lang_id = preLangId;
-            languageList[preLangId].category_name = $('#category_name').val();
-            languageList[preLangId].slug = $('#category_slug').val();
-            languageList[preLangId].category_description = $('#category_description').val();
-
-            $('#category_name').val(languageList[langId].category_name);
-            $('#category_slug').val(languageList[langId].slug);
-            $('#category_description').val(languageList[langId].category_description);
-        }
-
-        $.ajaxSetup({
-            headers: {
-                'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+
+            if (document.getElementById("category_slug").value.length < 1) {
+                SHOULD_AUTO_GEN_SLUG = true;
+            } else {
+                SHOULD_AUTO_GEN_SLUG = false; // there is already a value in #category_slug, so lets pretend it was changed already.
             }
-        });
-
-        $('#submit-btn').click(function (){
-            if (languageList[$('#language_list').val()].lang_id == -1){
-                if (!$('#category_name').val()){
-                    alert("Category name must not be empty");
-                    return ;
-                }else if (!$('#category_slug').val()){
-                    alert("Category slug must not be empty");
-                    return ;
+
+
+            //multi-language data
+            var defalutLangId = {{$language_id}}
+            var preLangId = defalutLangId;
+            var languageList = {};
+            $("#language_list > option").each(function() {
+                languageList[this.value] = {
+                    lang_id: -1,
+                    category_name: "",
+                    slug: "",
+                    category_description: "",
+                    lang_name: this.text
                 }
-                languageList[preLangId].lang_id = $('#language_list').val();
+            });
+
+            $('#language_list').on('change', function() {
+                fillLanguageList(this.value);
+                preLangId = this.value;
+            });
+
+            function fillLanguageList(langId){
+                languageList[preLangId].lang_id = preLangId;
                 languageList[preLangId].category_name = $('#category_name').val();
                 languageList[preLangId].slug = $('#category_slug').val();
                 languageList[preLangId].category_description = $('#category_description').val();
+
+                $('#category_name').val(languageList[langId].category_name);
+                $('#category_slug').val(languageList[langId].slug);
+                $('#category_description').val(languageList[langId].category_description);
             }
-            $.post('{{route("blogetc.admin.categories.store_category")}}' ,
-                {
-                    data: languageList,
-                    parent_id: parseInt($('#parent_id').val())
-                },
-                function(data, status){
-                if (data.code === 403){
-                    alert("Slug is already taken: " + languageList[data.data].lang_name);
-                }else if (data.code === 200) {
-                }
-                    window.location.replace("{{route('blogetc.admin.categories.index')}}");
-                });
-        });
 
-    </script>
-</form>
+            $.ajaxSetup({
+                headers: {
+                    'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+                }
+            });
+
+            $('#submit-btn').click(function (){
+                if (languageList[$('#language_list').val()].lang_id == -1){
+                    if (!$('#category_name').val()){
+                        alert("Category name must not be empty");
+                        return ;
+                    }else if (!$('#category_slug').val()){
+                        alert("Category slug must not be empty");
+                        return ;
+                    }
+                    languageList[preLangId].lang_id = $('#language_list').val();
+                    languageList[preLangId].category_name = $('#category_name').val();
+                    languageList[preLangId].slug = $('#category_slug').val();
+                    languageList[preLangId].category_description = $('#category_description').val();
+                }
+                $.post('{{route("blogetc.admin.categories.store_category")}}' ,
+                    {
+                        data: languageList,
+                        parent_id: parseInt($('#parent_id').val())
+                    },
+                    function(data, status){
+                        if (data.code === 403){
+                            alert("Slug is already taken: " + languageList[data.data].lang_name);
+                        }else if (data.code === 200) {
+                        }
+                        window.location.replace("{{route('blogetc.admin.categories.index')}}");
+                    });
+            });
+
+        </script>
+    </form>
 
 @endsection
diff --git a/src/css/blogetc_admin_css.css b/src/css/blogetc_admin_css.css
index b0e6e93..413af93 100644
--- a/src/css/blogetc_admin_css.css
+++ b/src/css/blogetc_admin_css.css
@@ -44,19 +44,52 @@ body{
     height: 100% !important;
 }
 
-.hessam-category-hierarchy{
-    background-color: white;
-    border-radius: 5px;
+.wtree li {
+    list-style-type: none;
+    margin: 10px 0 10px 10px;
+    position: relative;
 }
-
-.category-item{
-    border-left: #bcbbbb 3px solid;
-    padding-left: 5px;
-    margin-top: 10px;
-    margin-bottom: 10px;
+.wtree li:before {
+    content: "";
+    position: absolute;
+    top: -10px;
+    left: -20px;
+    border-left: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    width: 20px;
+    height: 15px;
+}
+.wtree li:after {
+    position: absolute;
+    content: "";
+    top: 5px;
+    left: -20px;
+    border-left: 1px solid #ddd;
+    border-top: 1px solid #ddd;
+    width: 20px;
+    height: 100%;
+}
+.wtree li:last-child:after {
+    display: none;
+}
+.wtree li span {
+    display: block;
+    border: 1px solid #ddd;
+    padding: 5px;
+    color: #888;
+    text-decoration: none;
 }
 
-.category-item-wrapper{
-    padding-top: 10px;
-    padding-bottom: 10px;
+.wtree li span:hover, .wtree li span:focus {
+    background: #eee;
+    color: #000;
+    border: 1px solid #aaa;
+}
+.wtree li span:hover + ul li span, .wtree li span:focus + ul li span {
+    background: #eee;
+    color: #000;
+    border: 1px solid #aaa;
+}
+.wtree li span:hover + ul li:after, .wtree li span:hover + ul li:before, .wtree li span:focus + ul li:after, .wtree li span:focus + ul li:before {
+    border-color: #aaa;
 }

From f079a4f0d72dc258769a1299570a56a1a1eb0a8d Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 14 Nov 2020 02:16:55 +0330
Subject: [PATCH 019/118] some bug fixes

---
 src/Captcha/CaptchaAbstract.php               |   1 +
 src/Controllers/HessamAdminController.php     |   2 +
 .../HessamAdminSetupController.php            |  37 +
 .../HessamCommentWriterController.php         |   9 +-
 src/Controllers/HessamReaderController.php    |  13 +-
 src/Middleware/PackageSetup.php               |  27 +
 src/Models/HessamConfiguration.php            |  13 +-
 src/Views/blogetc/saved_comment.blade.php     |   2 +-
 src/Views/blogetc/search.blade.php            |  16 +-
 src/Views/blogetc_admin/setup/setup.blade.php | 427 ++++++++
 src/css/admin-setup.css                       | 954 ++++++++++++++++++
 src/routes.php                                |   3 +
 12 files changed, 1484 insertions(+), 20 deletions(-)
 create mode 100644 src/Controllers/HessamAdminSetupController.php
 create mode 100644 src/Middleware/PackageSetup.php
 create mode 100644 src/Views/blogetc_admin/setup/setup.blade.php
 create mode 100644 src/css/admin-setup.css

diff --git a/src/Captcha/CaptchaAbstract.php b/src/Captcha/CaptchaAbstract.php
index 9c48211..a614985 100644
--- a/src/Captcha/CaptchaAbstract.php
+++ b/src/Captcha/CaptchaAbstract.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Http\Request;
 use WebDevEtc\BlogEtc\Interfaces\CaptchaInterface;
+use WebDevEtc\BlogEtc\Models\HessamPost;
 use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
 
 abstract class CaptchaAbstract implements CaptchaInterface
diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index e466124..b1d05d7 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -11,6 +11,7 @@
 use WebDevEtc\BlogEtc\Events\BlogPostWillBeDeleted;
 use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
+use WebDevEtc\BlogEtc\Middleware\PackageSetup;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
 use WebDevEtc\BlogEtc\Models\HessamLanguage;
@@ -38,6 +39,7 @@ public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
         $this->middleware(LoadLanguage::class);
+        $this->middleware(PackageSetup::class);
 
         if (!is_array(config("blogetc"))) {
             throw new \RuntimeException('The config/blogetc.php does not exist. Publish the vendor files for the BlogEtc package by running the php artisan publish:vendor command');
diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
new file mode 100644
index 0000000..233f2ed
--- /dev/null
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace WebDevEtc\BlogEtc\Controllers;
+
+use Illuminate\Http\Request;
+use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
+use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
+
+/**
+ * Class HessamAdminSetupController
+ * Handles initial setup for Hessam CMS
+*/
+class HessamAdminSetupController
+{
+    /**
+     * HessamAdminSetupController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware(UserCanManageBlogPosts::class);
+        $this->middleware(LoadLanguage::class);
+
+        if (!is_array(config("blogetc"))) {
+            throw new \RuntimeException('The config/blogetc.php does not exist. Publish the vendor files for the BlogEtc package by running the php artisan publish:vendor command');
+        }
+    }
+
+    /**
+     * View all posts
+     *
+     * @return mixed
+     */
+    public function index(Request $request)
+    {
+        return view("blogetc_admin::setup.setup");
+    }
+}
diff --git a/src/Controllers/HessamCommentWriterController.php b/src/Controllers/HessamCommentWriterController.php
index 370358f..3fe02d0 100755
--- a/src/Controllers/HessamCommentWriterController.php
+++ b/src/Controllers/HessamCommentWriterController.php
@@ -11,6 +11,7 @@
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
 use WebDevEtc\BlogEtc\Models\HessamComment;
 use WebDevEtc\BlogEtc\Models\HessamPost;
+use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
 use WebDevEtc\BlogEtc\Requests\AddNewCommentRequest;
 
 /**
@@ -37,15 +38,17 @@ public function __construct()
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      * @throws \Exception
      */
-    public function addNewComment(AddNewCommentRequest $request, $blog_post_slug)
+    public function addNewComment(AddNewCommentRequest $request, $locale, $blog_post_slug)
     {
 
         if (config("blogetc.comments.type_of_comments_to_show", "built_in") !== 'built_in') {
             throw new \RuntimeException("Built in comments are disabled");
         }
 
-        $blog_post = HessamPost::where("slug", $blog_post_slug)
+        $post_translation = HessamPostTranslation::where("slug", $blog_post_slug)
+            ->with('post')
             ->firstOrFail();
+        $blog_post = $post_translation->post;
 
         /** @var CaptchaAbstract $captcha */
         $captcha = $this->getCaptchaObject();
@@ -57,7 +60,7 @@ public function addNewComment(AddNewCommentRequest $request, $blog_post_slug)
 
         return view("blogetc::saved_comment", [
             'captcha' => $captcha,
-            'blog_post' => $blog_post,
+            'blog_post' => $post_translation,
             'new_comment' => $new_comment
         ]);
 
diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index b2e824a..b3008c0 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -63,10 +63,10 @@ public function index($locale, $category_slug = null, Request $request)
 
         $posts = HessamPostTranslation::where('lang_id', $request->get("lang_id"))
             ->with(['post' => function($query){
-            $query->where("is_published" , '=' , true);
-            $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
-            $query->orderBy("posted_at", "desc");
-        }])->paginate(config("blogetc.per_page", 10));
+                $query->where("is_published" , '=' , true);
+                $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
+                $query->orderBy("posted_at", "desc");
+            }])->paginate(config("blogetc.per_page", 10));
 
         //load category hierarchy
         $rootList = HessamCategory::roots()->get();
@@ -99,10 +99,11 @@ public function search(Request $request)
 
         \View::share("title", "Search results for " . e($query));
 
-        $categories = HessamCategory::all();
+        $rootList = HessamCategory::roots()->get();
+        HessamCategory::loadSiblingsWithList($rootList);
 
         return view("blogetc::search", [
-                'categories' => $categories,
+                'categories' => $rootList,
                 'query' => $query,
                 'search_results' => $search_results]
         );
diff --git a/src/Middleware/PackageSetup.php b/src/Middleware/PackageSetup.php
new file mode 100644
index 0000000..5349abb
--- /dev/null
+++ b/src/Middleware/PackageSetup.php
@@ -0,0 +1,27 @@
+<?php
+
+
+namespace WebDevEtc\BlogEtc\Middleware;
+
+use Closure;
+use WebDevEtc\BlogEtc\Models\HessamConfiguration;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
+
+class PackageSetup
+{
+    public function handle($request, Closure $next)
+    {
+        $initial_setup = HessamConfiguration::get('INITIAL_SETUP');
+        if (!$initial_setup){
+            HessamConfiguration::set('INITIAL_SETUP', true);
+
+            return redirect( route('blogetc.admin.setup') );
+        }
+
+        if(!$initial_setup->value){
+            return redirect( route('blogetc.admin.setup') );
+        }
+
+        return $next($request);
+    }
+}
diff --git a/src/Models/HessamConfiguration.php b/src/Models/HessamConfiguration.php
index 628491d..af0c657 100644
--- a/src/Models/HessamConfiguration.php
+++ b/src/Models/HessamConfiguration.php
@@ -8,11 +8,22 @@
 
 /**
  *
-*/
+ */
 class HessamConfiguration extends Model
 {
     public $fillable = [
         'key',
         'value'
     ];
+
+    public static function get($key){
+        return HessamConfiguration::where('key', $key)->first();
+    }
+
+    public static function set($key, $value){
+        $config = new HessamConfiguration();
+        $config->key = $key;
+        $config->value = $value;
+        $config->save();
+    }
 }
diff --git a/src/Views/blogetc/saved_comment.blade.php b/src/Views/blogetc/saved_comment.blade.php
index dd72136..2f14f35 100755
--- a/src/Views/blogetc/saved_comment.blade.php
+++ b/src/Views/blogetc/saved_comment.blade.php
@@ -8,7 +8,7 @@
             <p>After an admin user approves the comment, it'll appear on the site!</p>
         @endif
 
-        <a href='{{$blog_post->url()}}' class='btn btn-primary'>Back to blog post</a>
+        <a href='{{$blog_post->url(app('request')->get('locale'))}}' class='btn btn-primary'>Back to blog post</a>
     </div>
 
 @endsection
\ No newline at end of file
diff --git a/src/Views/blogetc/search.blade.php b/src/Views/blogetc/search.blade.php
index 8bfbdfd..1f01f01 100755
--- a/src/Views/blogetc/search.blade.php
+++ b/src/Views/blogetc/search.blade.php
@@ -26,15 +26,13 @@
                 </div>
                 <div class="col-md-3">
                     <h6>Blog Categories</h6>
-                    @forelse($categories as $category)
-                        <a href="{{$category->url()}}">
-                            <h6>{{$category->category_name}}</h6>
-                        </a>
-                    @empty
-                        <a href="#">
-                            <h6>No Categories</h6>
-                        </a>
-                    @endforelse
+                    <ul class="hessam-cat-hierarchy">
+                        @if($categories)
+                            @include("blogetc::partials._category_partial", ['category_tree' => $categories])
+                        @else
+                            <span>No Categories</span>
+                        @endif
+                    </ul>
                 </div>
             </div>
 
diff --git a/src/Views/blogetc_admin/setup/setup.blade.php b/src/Views/blogetc_admin/setup/setup.blade.php
new file mode 100644
index 0000000..4694b06
--- /dev/null
+++ b/src/Views/blogetc_admin/setup/setup.blade.php
@@ -0,0 +1,427 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8" />
+	<link rel="apple-touch-icon" sizes="76x76" href="assets/img/apple-icon.png">
+	<link rel="icon" type="image/png" href="assets/img/favicon.png">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+	<title>Hessam CMS pacakge setup</title>
+
+	<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
+    <meta name="viewport" content="width=device-width" />
+
+	<!--     Fonts and icons     -->
+	<link href="http://netdna.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.css" rel="stylesheet">
+
+	<!-- CSS Files -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <link href="{{ asset('admin-setup.css') }}" rel="stylesheet">
+</head>
+
+<body>
+<div style="background-color: #e2e8f0">
+
+    <!--   Big container   -->
+    <div class="container">
+        <div class="row">
+        <div class="col-sm-8 col-sm-offset-2">
+
+            <!--      Wizard container        -->
+            <div class="wizard-container">
+                <div class="card wizard-card" data-color="green" id="wizard">
+                <form action="" method="">
+
+                    	<div class="wizard-header" style="text-align: center">
+                        	<img src="assets/img/hessam-cms.png" style="padding: 10px 10px 20px 10px;">
+                    	</div>
+						<div class="wizard-navigation">
+							<ul>
+	                            <li><a href="#location" data-toggle="tab">Language</a></li>
+	                            <li><a href="#type" data-toggle="tab">Configurations</a></li>
+	                            <li><a href="#facilities" data-toggle="tab">Facilities</a></li>
+	                            <li><a href="#description" data-toggle="tab">Description</a></li>
+	                        </ul>
+						</div>
+
+                        <div class="tab-content">
+                            <div class="tab-pane" id="location">
+                              <div class="row">
+                                  <div class="col-sm-12">
+                                    <h4 class="info-text"> Let's choose your default language</h4>
+                                  </div>
+                                  <div class="col-sm-5 col-sm-offset-1">
+                                      <div class="form-group">
+                                        <label>City</label>
+                                        <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Where is your place located?">
+                                      </div>
+                                  </div>
+                                  <div class="col-sm-5">
+                                       <div class="form-group">
+                                            <label>Country</label><br>
+                                             <select name="country" class="form-control">
+                                                <option disabled="" selected="">- country -</option>
+                                                <option value="Afghanistan"> Afghanistan </option>
+                                                <option value="Albania"> Albania </option>
+                                                <option value="Algeria"> Algeria </option>
+                                                <option value="American Samoa"> American Samoa </option>
+                                                <option value="Andorra"> Andorra </option>
+                                                <option value="Angola"> Angola </option>
+                                                <option value="Anguilla"> Anguilla </option>
+                                                <option value="Antarctica"> Antarctica </option>
+                                                <option value="...">...</option>
+                                            </select>
+                                          </div>
+                                  </div>
+                                  <div class="col-sm-5 col-sm-offset-1">
+                                      <div class="form-group">
+                                          <label>Accommodates</label>
+                                          <select class="form-control">
+                                            <option disabled="" selected="">- persons -</option>
+                                            <option>1 Person</option>
+                                            <option>2 Persons </option>
+                                            <option>3 Persons</option>
+                                            <option>4 Persons</option>
+                                            <option>5 Persons</option>
+                                            <option>6+ Persons</option>
+                                          </select>
+                                      </div>
+                                  </div>
+                                  <div class="col-sm-5">
+                                      <div class="form-group">
+                                          <label>Rent price</label>
+                                          <div class="input-group">
+                                              <input type="text" class="form-control" placeholder="Rent price per day">
+                                              <span class="input-group-addon">$</span>
+                                          </div>
+                                      </div>
+                                  </div>
+                              </div>
+                            </div>
+                            <div class="tab-pane" id="type">
+                                <h4 class="info-text">What type of location do you have? </h4>
+                                <div class="row">
+                                    <div class="col-sm-10 col-sm-offset-1">
+                                        <div class="col-sm-4 col-sm-offset-2">
+                                            <div class="choice" data-toggle="wizard-radio" rel="tooltip" title="Select this option if you have a house.">
+                                                <input type="radio" name="type" value="House">
+                                                <div class="icon">
+                                                    <i class="fa fa-home"></i>
+                                                </div>
+                                                <h6>House</h6>
+                                            </div>
+                                        </div>
+                                        <div class="col-sm-4">
+                                            <div class="choice" data-toggle="wizard-radio" rel="tooltip" title="Select this option if you have an appartment">
+                                                <input type="radio" name="type" value="Appartment">
+                                                <div class="icon">
+                                                    <i class="fa fa-building"></i>
+                                                </div>
+                                                <h6>Appartment</h6>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="tab-pane" id="facilities">
+                                <h4 class="info-text">Tell us more about facilities. </h4>
+                                <div class="row">
+                                    <div class="col-sm-5 col-sm-offset-1">
+                                      <div class="form-group">
+                                          <label>Your place is good for</label>
+                                          <select class="form-control">
+                                            <option disabled="" selected="">- type -</option>
+                                            <option>Business</option>
+                                            <option>Vacation </option>
+                                            <option>Work</option>
+                                          </select>
+                                      </div>
+                                    </div>
+                                    <div class="col-sm-5">
+                                      <div class="form-group">
+                                          <label>Is air conditioning included ?</label>
+                                          <select class="form-control">
+                                            <option disabled="" selected="">- response -</option>
+                                            <option>Yes</option>
+                                            <option>No </option>
+                                          </select>
+                                      </div>
+                                     </div>
+                                     <div class="col-sm-5 col-sm-offset-1">
+                                      <div class="form-group">
+                                          <label>Does your place have wi-fi?</label>
+                                          <select class="form-control">
+                                            <option disabled="" selected="">- response -</option>
+                                            <option>Yes</option>
+                                            <option>No </option>
+                                          </select>
+                                       </div>
+                                      </div>
+                                      <div class="col-sm-5">
+                                       <div class="form-group">
+                                          <label>Is breakfast included?</label>
+                                          <select class="form-control">
+                                            <option disabled="" selected="">- response -</option>
+                                            <option>Yes</option>
+                                            <option>No </option>
+                                          </select>
+                                       </div>
+                                      </div>
+                                </div>
+                            </div>
+                            <div class="tab-pane" id="description">
+                                <div class="row">
+                                    <h4 class="info-text"> Drop us a small description. </h4>
+                                    <div class="col-sm-6 col-sm-offset-1">
+                                         <div class="form-group">
+                                            <label>Place description</label>
+                                            <textarea class="form-control" placeholder="" rows="9">
+
+                                            </textarea>
+                                          </div>
+                                    </div>
+                                    <div class="col-sm-4">
+                                         <div class="form-group">
+                                            <label>Example</label>
+                                            <p class="description">"The place is really nice. We use it every sunday when we go fishing. It is so awesome."</p>
+                                          </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="wizard-footer">
+                            	<div class="pull-right">
+                                    <input type='button' class='btn btn-next btn-fill btn-success btn-wd btn-sm' name='next' value='Next' />
+                                    <input type='button' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Finish' />
+
+                                </div>
+                                <div class="pull-left">
+                                    <input type='button' class='btn btn-previous btn-fill btn-default btn-wd btn-sm' name='previous' value='Previous' />
+                                </div>
+                                <div class="clearfix"></div>
+                        </div>
+
+                    </form>
+                </div>
+            </div> <!-- wizard container -->
+        </div>
+        </div> <!-- row -->
+    </div> <!--  big container -->
+
+    <div class="footer">
+        <div class="container">
+					Created by Hessam CMS
+        </div>
+    </div>
+</div>
+
+</body>
+
+	<!--   Core JS Files   -->
+    <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap-wizard/1.2/jquery.bootstrap.wizard.min.js"></script>
+
+	<!--  Plugin for the Wizard -->
+    <script>
+    searchVisible = 0;
+    transparent = true;
+
+    $(document).ready(function(){
+
+        /*  Activate the tooltips      */
+        $('[rel="tooltip"]').tooltip();
+
+        // Code for the Validator
+        var $validator = $('.wizard-card form').validate({
+            rules: {
+                firstname: {
+                    required: true,
+                    minlength: 3
+                },
+                lastname: {
+                    required: true,
+                    minlength: 3
+                },
+                email: {
+                    required: true,
+                    minlength: 3,
+                }
+            }
+        });
+
+        // Wizard Initialization
+        $('.wizard-card').bootstrapWizard({
+            'tabClass': 'nav nav-pills',
+            'nextSelector': '.btn-next',
+            'previousSelector': '.btn-previous',
+
+            onNext: function(tab, navigation, index) {
+                var $valid = $('.wizard-card form').valid();
+                if(!$valid) {
+                    $validator.focusInvalid();
+                    return false;
+                }
+            },
+
+            onInit : function(tab, navigation, index){
+
+                //check number of tabs and fill the entire row
+                var $total = navigation.find('li').length;
+                $width = 100/$total;
+                var $wizard = navigation.closest('.wizard-card');
+
+                $display_width = $(document).width();
+
+                if($display_width < 600 && $total > 3){
+                    $width = 50;
+                }
+
+                navigation.find('li').css('width',$width + '%');
+                $first_li = navigation.find('li:first-child a').html();
+                $moving_div = $('<div class="moving-tab">' + $first_li + '</div>');
+                $('.wizard-card .wizard-navigation').append($moving_div);
+                refreshAnimation($wizard, index);
+                $('.moving-tab').css('transition','transform 0s');
+            },
+
+            onTabClick : function(tab, navigation, index){
+
+                var $valid = $('.wizard-card form').valid();
+
+                if(!$valid){
+                    return false;
+                } else {
+                    return true;
+                }
+            },
+
+            onTabShow: function(tab, navigation, index) {
+                var $total = navigation.find('li').length;
+                var $current = index+1;
+
+                var $wizard = navigation.closest('.wizard-card');
+
+                // If it's the last tab then hide the last button and show the finish instead
+                if($current >= $total) {
+                    $($wizard).find('.btn-next').hide();
+                    $($wizard).find('.btn-finish').show();
+                } else {
+                    $($wizard).find('.btn-next').show();
+                    $($wizard).find('.btn-finish').hide();
+                }
+
+                button_text = navigation.find('li:nth-child(' + $current + ') a').html();
+
+                setTimeout(function(){
+                    $('.moving-tab').text(button_text);
+                }, 150);
+
+                var checkbox = $('.footer-checkbox');
+
+                if( !index == 0 ){
+                    $(checkbox).css({
+                        'opacity':'0',
+                        'visibility':'hidden',
+                        'position':'absolute'
+                    });
+                } else {
+                    $(checkbox).css({
+                        'opacity':'1',
+                        'visibility':'visible'
+                    });
+                }
+
+                refreshAnimation($wizard, index);
+            }
+        });
+
+
+        // Prepare the preview for profile picture
+        $("#wizard-picture").change(function(){
+            readURL(this);
+        });
+
+        $('[data-toggle="wizard-radio"]').click(function(){
+            wizard = $(this).closest('.wizard-card');
+            wizard.find('[data-toggle="wizard-radio"]').removeClass('active');
+            $(this).addClass('active');
+            $(wizard).find('[type="radio"]').removeAttr('checked');
+            $(this).find('[type="radio"]').attr('checked','true');
+        });
+
+        $('[data-toggle="wizard-checkbox"]').click(function(){
+            if( $(this).hasClass('active')){
+                $(this).removeClass('active');
+                $(this).find('[type="checkbox"]').removeAttr('checked');
+            } else {
+                $(this).addClass('active');
+                $(this).find('[type="checkbox"]').attr('checked','true');
+            }
+        });
+
+        $('.set-full-height').css('height', 'auto');
+
+    });
+
+
+
+    //Function to show image before upload
+
+    function readURL(input) {
+        if (input.files && input.files[0]) {
+            var reader = new FileReader();
+
+            reader.onload = function (e) {
+                $('#wizardPicturePreview').attr('src', e.target.result).fadeIn('slow');
+            }
+            reader.readAsDataURL(input.files[0]);
+        }
+    }
+
+    $(window).resize(function(){
+        $('.wizard-card').each(function(){
+            $wizard = $(this);
+            index = $wizard.bootstrapWizard('currentIndex');
+            refreshAnimation($wizard, index);
+
+            $('.moving-tab').css({
+                'transition': 'transform 0s'
+            });
+        });
+    });
+
+    function refreshAnimation($wizard, index){
+        total_steps = $wizard.find('li').length;
+        move_distance = $wizard.width() / total_steps;
+        step_width = move_distance;
+        move_distance *= index;
+
+        $wizard.find('.moving-tab').css('width', step_width);
+        $('.moving-tab').css({
+            'transform':'translate3d(' + move_distance + 'px, 0, 0)',
+            'transition': 'all 0.3s ease-out'
+
+        });
+    }
+
+    function debounce(func, wait, immediate) {
+        var timeout;
+        return function() {
+            var context = this, args = arguments;
+            clearTimeout(timeout);
+            timeout = setTimeout(function() {
+                timeout = null;
+                if (!immediate) func.apply(context, args);
+            }, wait);
+            if (immediate && !timeout) func.apply(context, args);
+        };
+    };
+
+</script>
+
+	<!--  More information about jquery.validate here: http://jqueryvalidation.org/	 -->
+    <script src="https://cdn.jsdelivr.net/npm/jquery-validation@1.19.2/dist/additional-methods.js"></script>
+
+</html>
diff --git a/src/css/admin-setup.css b/src/css/admin-setup.css
new file mode 100644
index 0000000..4f34ba9
--- /dev/null
+++ b/src/css/admin-setup.css
@@ -0,0 +1,954 @@
+a {
+    color: #2CA8FF;
+}
+
+a:hover, a:focus {
+    color: #109CFF;
+}
+
+a:focus, a:active,
+button::-moz-focus-inner,
+input[type="reset"]::-moz-focus-inner,
+input[type="button"]::-moz-focus-inner,
+input[type="submit"]::-moz-focus-inner,
+select::-moz-focus-inner,
+input[type="file"] > input[type="button"]::-moz-focus-inner,
+input[type="button"]:focus {
+    outline: 0 !important;
+}
+
+.btn:focus,
+.btn:hover,
+.btn:active {
+    outline: 0;
+}
+
+/*           Animations              */
+.form-control, .input-group-addon {
+    -webkit-transition: all 300ms linear;
+    -moz-transition: all 300ms linear;
+    -o-transition: all 300ms linear;
+    -ms-transition: all 300ms linear;
+    transition: all 300ms linear;
+}
+
+.image-container {
+    min-height: 100vh;
+    background-position: center center;
+    background-size: cover;
+}
+
+.wizard-container {
+    padding-top: 100px;
+    z-index: 3;
+}
+
+.wizard-navigation {
+    position: relative;
+}
+
+.made-with-mk {
+    width: 50px;
+    height: 50px;
+    display: block;
+    position: fixed;
+    z-index: 555;
+    bottom: 40px;
+    right: 40px;
+    border-radius: 30px;
+    background-color: rgba(16, 16, 16, 0.35);
+    border: 1px solid rgba(255, 255, 255, 0.15);
+    color: #FFFFFF;
+    cursor: pointer;
+    padding: 10px 12px;
+    white-space: nowrap;
+    overflow: hidden;
+    -webkit-transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+    -moz-transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+    -o-transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+    transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+}
+.made-with-mk:hover, .made-with-mk:active, .made-with-mk:focus {
+    width: 218px;
+    color: #FFFFFF;
+    transition-duration: .55s;
+    padding: 10px 30px;
+}
+.made-with-mk:hover .made-with, .made-with-mk:active .made-with, .made-with-mk:focus .made-with {
+    opacity: 1;
+}
+.made-with-mk:hover .brand, .made-with-mk:active .brand, .made-with-mk:focus .brand {
+    left: 0;
+}
+.made-with-mk .brand,
+.made-with-mk .made-with {
+    float: left;
+}
+.made-with-mk .brand {
+    position: relative;
+    top: 3px;
+    left: -1px;
+    letter-spacing: 1px;
+    vertical-align: middle;
+    font-size: 16px;
+    font-weight: 600;
+}
+.made-with-mk .made-with {
+    color: rgba(255, 255, 255, 0.6);
+    position: absolute;
+    left: 75px;
+    top: 15px;
+    opacity: 0;
+    margin: 0;
+    -webkit-transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+    -moz-transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+    -o-transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+    transition: 0.55s cubic-bezier(0.6, 0, 0.4, 1);
+}
+.made-with-mk .made-with strong {
+    font-weight: 400;
+    color: rgba(255, 255, 255, 0.9);
+    letter-spacing: 1px;
+}
+
+/*           Font Smoothing      */
+h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6, p, .navbar, .brand, .btn-simple {
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-font-smoothing: antialiased;
+}
+
+/*           Typography          */
+h1, .h1, h2, .h2, h3, .h3, h4, .h4 {
+    font-weight: 400;
+    margin: 30px 0 15px;
+}
+
+h1, .h1 {
+    font-size: 52px;
+}
+
+h2, .h2 {
+    font-size: 36px;
+}
+
+h3, .h3 {
+    font-size: 28px;
+    margin: 20px 0 10px;
+}
+
+h4, .h4 {
+    font-size: 22px;
+}
+
+h5, .h5 {
+    font-size: 16px;
+}
+
+h6, .h6 {
+    font-size: 14px;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+
+p {
+    font-size: 16px;
+    line-height: 1.6180em;
+}
+
+h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small, h1 .small, h2 .small, h3 .small, h4 .small, h5 .small, h6 .small, .h1 .small, .h2 .small, .h3 .small, .h4 .small, .h5 .small, .h6 .small {
+    color: #999999;
+    font-weight: 300;
+    line-height: 1;
+}
+
+h1 small, h2 small, h3 small, h1 .small, h2 .small, h3 .small {
+    font-size: 60%;
+}
+
+h1 .subtitle {
+    display: block;
+    font-family: 'Grand Hotel',cursive;
+    line-height: 40px;
+    margin: 15px 0 30px;
+}
+
+.card {
+    background-color: #FFFFFF;
+    padding: 10px 0 20px;
+    width: 100%;
+}
+
+.wizard-card {
+    min-height: 410px;
+    background-color: #FFFFFF;
+    box-shadow: 0 0 15px rgba(0, 0, 0, 0.15), 0 0 1px 1px rgba(0, 0, 0, 0.1);
+    border-radius: 10px;
+    padding: 10px 0;
+}
+.wizard-card .picture-container {
+    position: relative;
+    cursor: pointer;
+    text-align: center;
+}
+.wizard-card .picture {
+    width: 106px;
+    height: 106px;
+    background-color: #999999;
+    border: 4px solid #CCCCCC;
+    color: #FFFFFF;
+    border-radius: 50%;
+    margin: 5px auto;
+    overflow: hidden;
+    transition: all 0.2s;
+    -webkit-transition: all 0.2s;
+}
+.wizard-card .picture:hover {
+    border-color: #2ca8ff;
+}
+.wizard-card .picture input[type="file"] {
+    cursor: pointer;
+    display: block;
+    height: 100%;
+    left: 0;
+    opacity: 0 !important;
+    position: absolute;
+    top: 0;
+    width: 100%;
+}
+.wizard-card .picture-src {
+    width: 100%;
+}
+.wizard-card .tab-content {
+    min-height: 340px;
+    padding: 20px 10px;
+}
+.wizard-card .wizard-footer {
+    padding: 0 10px;
+}
+.wizard-card .disabled {
+    display: none;
+}
+.wizard-card .wizard-header h3 {
+    font-weight: 200;
+    text-align: center;
+}
+.wizard-card[data-color="green"] .choice:hover .icon, .wizard-card[data-color="green"] .choice.active .icon {
+    border-color: #2787AC;
+}
+.wizard-card[data-color="green"] .picture:hover {
+    border-color: #2787AC;
+}
+.wizard-card[data-color="green"] .moving-tab {
+    position: absolute;
+    text-align: center;
+    padding: 10px;
+    font-size: 12px;
+    text-transform: uppercase;
+    -webkit-font-smoothing: subpixel-antialiased;
+    background-color: #2787AC;
+    top: 0px;
+    left: 0px;
+    color: #FFFFFF;
+    cursor: pointer;
+    font-weight: 500;
+}
+.wizard-card[data-color="azzure"] .choice:hover .icon, .wizard-card[data-color="azzure"] .choice.active .icon {
+    border-color: #2CA8FF;
+}
+.wizard-card[data-color="azzure"] .picture:hover {
+    border-color: #2CA8FF;
+}
+.wizard-card[data-color="azzure"] .moving-tab {
+    position: absolute;
+    text-align: center;
+    padding: 10px;
+    font-size: 12px;
+    text-transform: uppercase;
+    -webkit-font-smoothing: subpixel-antialiased;
+    background-color: #2CA8FF;
+    top: 0px;
+    left: 0px;
+    color: #FFFFFF;
+    cursor: pointer;
+    font-weight: 500;
+}
+.wizard-card[data-color="blue"] .choice:hover .icon, .wizard-card[data-color="blue"] .choice.active .icon {
+    border-color: #3472F7;
+}
+.wizard-card[data-color="blue"] .picture:hover {
+    border-color: #3472F7;
+}
+.wizard-card[data-color="blue"] .moving-tab {
+    position: absolute;
+    text-align: center;
+    padding: 10px;
+    font-size: 12px;
+    text-transform: uppercase;
+    -webkit-font-smoothing: subpixel-antialiased;
+    background-color: #3472F7;
+    top: 0px;
+    left: 0px;
+    color: #FFFFFF;
+    cursor: pointer;
+    font-weight: 500;
+}
+.wizard-card[data-color="orange"] .choice:hover .icon, .wizard-card[data-color="orange"] .choice.active .icon {
+    border-color: #FF9500;
+}
+.wizard-card[data-color="orange"] .picture:hover {
+    border-color: #FF9500;
+}
+.wizard-card[data-color="orange"] .moving-tab {
+    position: absolute;
+    text-align: center;
+    padding: 10px;
+    font-size: 12px;
+    text-transform: uppercase;
+    -webkit-font-smoothing: subpixel-antialiased;
+    background-color: #FF9500;
+    top: 0px;
+    left: 0px;
+    color: #FFFFFF;
+    cursor: pointer;
+    font-weight: 500;
+}
+.wizard-card[data-color="red"] .choice:hover .icon, .wizard-card[data-color="red"] .choice.active .icon {
+    border-color: #FF3B30;
+}
+.wizard-card[data-color="red"] .picture:hover {
+    border-color: #FF3B30;
+}
+.wizard-card[data-color="red"] .moving-tab {
+    position: absolute;
+    text-align: center;
+    padding: 10px;
+    font-size: 12px;
+    text-transform: uppercase;
+    -webkit-font-smoothing: subpixel-antialiased;
+    background-color: #FF3B30;
+    top: 0px;
+    left: 0px;
+    color: #FFFFFF;
+    cursor: pointer;
+    font-weight: 500;
+}
+.wizard-card .btn {
+    text-transform: uppercase;
+}
+.wizard-card .info-text {
+    text-align: center;
+    font-weight: 300;
+    margin: 10px 0 30px;
+}
+.wizard-card .choice {
+    text-align: center;
+    cursor: pointer;
+    margin-top: 20px;
+}
+.wizard-card .choice .icon {
+    text-align: center;
+    vertical-align: middle;
+    height: 116px;
+    width: 116px;
+    border-radius: 50%;
+    background-color: #999999;
+    color: #FFFFFF;
+    margin: 0 auto 20px;
+    border: 4px solid #CCCCCC;
+    transition: all 0.2s;
+    -webkit-transition: all 0.2s;
+}
+.wizard-card .choice i {
+    font-size: 30px;
+    line-height: 111px;
+}
+.wizard-card .choice:hover .icon, .wizard-card .choice.active .icon {
+    border-color: #2ca8ff;
+}
+.wizard-card .choice input[type="radio"],
+.wizard-card .choice input[type="checkbox"] {
+    position: absolute;
+    left: -10000px;
+    z-index: -1;
+}
+.wizard-card .btn-finish {
+    display: none;
+}
+.wizard-card .description {
+    color: #999999;
+    font-size: 14px;
+}
+
+/*             Inputs               */
+.form-control {
+    background-color: #FFFFFF;
+    border: 1px solid #E3E3E3;
+    border-radius: 4px;
+    box-shadow: none;
+    color: #444444;
+    height: 38px;
+    padding: 6px 16px;
+}
+.form-control:focus {
+    background-color: #FFFFFF;
+    border: 1px solid #9A9A9A;
+    box-shadow: none;
+    outline: 0 none;
+}
+.form-control + .form-control-feedback {
+    border-radius: 6px;
+    font-size: 14px;
+    padding: 0 12px 0 0;
+    position: absolute;
+    right: 25px;
+    top: 13px;
+    vertical-align: middle;
+}
+.has-success .form-control, .has-error .form-control, .has-success .form-control:focus, .has-error .form-control:focus {
+    border-color: #E3E3E3;
+    box-shadow: none;
+}
+.has-success .form-control,
+.form-control .has-success .form-control-feedback, .form-control.valid:focus {
+    border-color: #2787AC;
+    color: #2787AC;
+}
+.has-error .form-control,
+.form-control .has-error .form-control-feedback, .form-control.error {
+    color: #FF3B30;
+    border-color: #FF3B30;
+}
+.form-control:focus + .input-group-addon, .form-control:focus ~ .input-group-addon {
+    background-color: #FFFFFF;
+    border-color: #9A9A9A;
+}
+.form-control ::-moz-placeholder {
+    color: #DDDDDD;
+    opacity: 1;
+}
+.form-control ::-moz-placeholder {
+    color: #DDDDDD;
+    opacity: 1;
+}
+.form-control ::-webkit-input-placeholder {
+    color: #DDDDDD;
+    opacity: 1;
+}
+.form-control ::-ms-input-placeholder {
+    color: #DDDDDD;
+    opacity: 1;
+}
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
+    background-color: #EEEEEE;
+    color: #999999;
+    cursor: not-allowed;
+}
+
+.input-lg {
+    height: 56px;
+    padding: 10px 16px;
+}
+
+.input-group-addon {
+    background-color: #FFFFFF;
+    border: 1px solid #E3E3E3;
+    border-radius: 4px;
+}
+
+.input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, .input-group-btn:first-child > .dropdown-toggle, .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+    border-right: 0 none;
+}
+
+.input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, .input-group-btn:last-child > .dropdown-toggle, .input-group-btn:first-child > .btn:not(:first-child) {
+    border-left: 0 none;
+}
+
+.btn {
+    border-width: 2px;
+    background-color: transparent;
+    font-weight: 400;
+    opacity: 0.8;
+    padding: 8px 16px;
+}
+.btn:active, .btn.active {
+    background-image: none;
+    box-shadow: none;
+}
+.btn.disabled, .btn[disabled], fieldset[disabled] .btn {
+    opacity: 0.45;
+}
+
+.btn-round {
+    border-width: 1px;
+    border-radius: 30px !important;
+    opacity: 0.79;
+    padding: 9px 18px;
+}
+
+.btn-sm, .btn-xs {
+    border-radius: 3px;
+    font-size: 12px;
+    padding: 5px 10px;
+}
+
+.btn-xs {
+    padding: 1px 5px;
+}
+
+.btn-lg {
+    border-radius: 6px;
+    font-size: 18px;
+    font-weight: 400;
+    padding: 14px 30px;
+}
+
+.btn-wd {
+    min-width: 100px;
+}
+
+.btn-default {
+    color: #777777;
+    border-color: #999999;
+}
+
+.btn-primary {
+    color: #3472F7;
+    border-color: #3472F7;
+}
+
+.btn-info {
+    color: #2CA8FF;
+    border-color: #2CA8FF;
+}
+
+.btn-success {
+    color: #2787AC;
+    border-color: #2787AC;
+}
+
+.btn-warning {
+    color: #FF9500;
+    border-color: #FF9500;
+}
+
+.btn-danger {
+    color: #FF3B30;
+    border-color: #FF3B30;
+}
+
+.btn:hover {
+    background-color: transparent;
+    opacity: 1;
+}
+
+.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle .btn-primary {
+    color: #1D62F0;
+    border-color: #1D62F0;
+    background-color: transparent;
+}
+
+.btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active, .open .dropdown-toggle .btn-info {
+    color: #109CFF;
+    border-color: #109CFF;
+    background-color: transparent;
+}
+
+.btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active, .open .dropdown-toggle .btn-success {
+    color: #049F0C;
+    border-color: #049F0C;
+    background-color: transparent;
+}
+
+.btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .open .dropdown-toggle .btn-warning {
+    color: #ED8D00;
+    border-color: #ED8D00;
+    background-color: transparent;
+}
+
+.btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .open .dropdown-toggle .btn-danger {
+    color: #EE2D20;
+    border-color: #EE2D20;
+    background-color: transparent;
+}
+
+.btn-default:hover, .btn-default:focus, .btn-default.active, .open .dropdown-toggle .btn-default {
+    color: #666666;
+    border-color: #888888;
+    background-color: transparent;
+}
+
+.btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary.active[disabled], fieldset[disabled] .btn-primary.active {
+    background-color: transparent;
+    border-color: #3472F7;
+}
+
+.btn-info.disabled, .btn-info[disabled], fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, fieldset[disabled] .btn-info:focus, .btn-info.disabled:active, .btn-info[disabled]:active, fieldset[disabled] .btn-info:active, .btn-info.disabled.active, .btn-info.active[disabled], fieldset[disabled] .btn-info.active {
+    background-color: transparent;
+    border-color: #2CA8FF;
+}
+
+.btn-success.disabled, .btn-success[disabled], fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, fieldset[disabled] .btn-success:focus, .btn-success.disabled:active, .btn-success[disabled]:active, fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success.active[disabled], fieldset[disabled] .btn-success.active {
+    background-color: transparent;
+    border-color: #2787AC;
+}
+
+.btn-danger.disabled, .btn-danger[disabled], fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, fieldset[disabled] .btn-danger:focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger.active[disabled], fieldset[disabled] .btn-danger.active {
+    background-color: transparent;
+    border-color: #FF3B30;
+}
+
+.btn-warning.disabled, .btn-warning[disabled], fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, fieldset[disabled] .btn-warning:focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning.active[disabled], fieldset[disabled] .btn-warning.active {
+    background-color: transparent;
+    border-color: #FF9500;
+}
+
+/*           Buttons fill .btn-fill           */
+.btn-fill {
+    color: #FFFFFF;
+    opacity: 1;
+}
+.btn-fill:hover, .btn-fill:active, .btn-fill:focus {
+    color: #FFFFFF;
+}
+.btn-fill.btn-default {
+    background-color: #999999;
+    border-color: #999999;
+}
+.btn-fill.btn-default:hover, .btn-fill.btn-default:focus, .btn-fill.btn-default:active, .btn-fill.btn-default.active, .open .dropdown-toggle .btn-fill.btn-default {
+    background-color: #888888;
+    border-color: #888888;
+}
+.btn-fill.btn-primary {
+    background-color: #3472F7;
+    border-color: #3472F7;
+}
+.btn-fill.btn-primary:hover, .btn-fill.btn-primary:focus, .btn-fill.btn-primary:active, .btn-fill.btn-primary.active, .open .dropdown-toggle .btn-fill.btn-primary {
+    border-color: #1D62F0;
+    background-color: #1D62F0;
+}
+.btn-fill.btn-info {
+    background-color: #2CA8FF;
+    border-color: #2CA8FF;
+}
+.btn-fill.btn-info:hover, .btn-fill.btn-info:focus, .btn-fill.btn-info:active, .btn-fill.btn-info.active, .open .dropdown-toggle .btn-fill.btn-info {
+    background-color: #109CFF;
+    border-color: #109CFF;
+}
+.btn-fill.btn-success {
+    background-color: #2787AC;
+    border-color: #2787AC;
+}
+.btn-fill.btn-warning {
+    background-color: #FF9500;
+    border-color: #FF9500;
+}
+.btn-fill.btn-warning:hover, .btn-fill.btn-warning:focus, .btn-fill.btn-warning:active, .btn-fill.btn-warning.active, .open .dropdown-toggle .btn-fill.btn-warning {
+    background-color: #ED8D00;
+    border-color: #ED8D00;
+}
+.btn-fill.btn-danger {
+    background-color: #FF3B30;
+    border-color: #FF3B30;
+}
+.btn-fill.btn-danger:hover, .btn-fill.btn-danger:focus, .btn-fill.btn-danger:active, .btn-fill.btn-danger.active, .open .dropdown-toggle .btn-fill.btn-danger {
+    background-color: #EE2D20;
+    border-color: #EE2D20;
+}
+
+/*          End Buttons fill          */
+.btn-simple {
+    font-weight: 600;
+    border: 0;
+    padding: 10px 18px;
+}
+.btn-simple.btn-xs {
+    padding: 3px 5px;
+}
+.btn-simple.btn-sm {
+    padding: 7px 10px;
+}
+.btn-simple.btn-lg {
+    padding: 16px 60px;
+}
+
+.btn-round.btn-xs {
+    padding: 2px 5px;
+}
+.btn-round.btn-sm {
+    padding: 6px 10px;
+}
+.btn-round.btn-lg {
+    padding: 15px 30px;
+}
+
+/*            Navigation menu                */
+.nav-pills {
+    background-color: #999999;
+}
+.nav-pills > li + li {
+    margin-left: 0;
+}
+.nav-pills > li > a {
+    border: 1px solid #2CA8FF;
+    border-radius: 0;
+    color: #2CA8FF;
+    border: 0 !important;
+    text-transform: uppercase;
+    background-color: #999999;
+    text-align: center;
+    color: #FFFFFF !important;
+    font-size: 12px;
+    cursor: pointer;
+}
+.nav-pills > li > a:focus, .nav-pills > li > a:hover {
+    background-color: #999999;
+}
+.nav-pills > li.active > a,
+.nav-pills > li.active > a:focus,
+.nav-pills > li.active > a:hover {
+    background-color: inherit;
+}
+
+.text-primary, .text-primary:hover {
+    color: #3472F7;
+}
+
+.text-info, .text-info:hover {
+    color: #2CA8FF;
+}
+
+.text-success, .text-success:hover {
+    color: #2787AC;
+}
+
+.text-warning, .text-warning:hover {
+    color: #FF9500;
+}
+
+.text-danger, .text-danger:hover {
+    color: #FF3B30;
+}
+
+/*           Labels & Progress-bar              */
+.label {
+    padding: 0.2em 0.6em 0.2em;
+    border: 1px solid #999999;
+    border-radius: 3px;
+    color: #999999;
+    background-color: #FFFFFF;
+    font-weight: 500;
+    font-size: 11px;
+    text-transform: uppercase;
+}
+.label.label-fill {
+    color: #FFFFFF;
+}
+
+.label-primary {
+    border-color: #3472F7;
+    color: #3472F7;
+}
+
+.label-info {
+    border-color: #2CA8FF;
+    color: #2CA8FF;
+}
+
+.label-success {
+    border-color: #2787AC;
+    color: #2787AC;
+}
+
+.label-warning {
+    border-color: #FF9500;
+    color: #FF9500;
+}
+
+.label-danger {
+    border-color: #FF3B30;
+    color: #FF3B30;
+}
+
+label {
+    font-weight: 400;
+}
+
+label.error {
+    color: #FF3B30;
+    margin-top: 5px;
+    margin-bottom: 0;
+}
+
+label small {
+    color: #999999;
+}
+
+.label-primary.label-fill, .progress-bar, .progress-bar-primary {
+    background-color: #3472F7;
+}
+
+.label-info.label-fill, .progress-bar-info {
+    background-color: #2CA8FF;
+}
+
+.label-success.label-fill, .progress-bar-success {
+    background-color: #2787AC;
+}
+
+.label-warning.label-fill, .progress-bar-warning {
+    background-color: #FF9500;
+}
+
+.label-danger.label-fill, .progress-bar-danger {
+    background-color: #FF3B30;
+}
+
+.label-default.label-fill {
+    background-color: #999999;
+}
+
+.tooltip {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+.tooltip-arrow {
+    display: none;
+    opacity: 0;
+}
+
+.tooltip-inner {
+    background-color: #FAE6A4;
+    border-radius: 4px;
+    box-shadow: 0 1px 13px rgba(0, 0, 0, 0.14), 0 0 0 1px rgba(115, 71, 38, 0.23);
+    color: #734726;
+    max-width: 200px;
+    padding: 6px 10px;
+    text-align: center;
+    text-decoration: none;
+}
+.tooltip-inner:after {
+    content: "";
+    display: inline-block;
+    left: 100%;
+    margin-left: -56%;
+    position: absolute;
+}
+.tooltip-inner:before {
+    content: "";
+    display: inline-block;
+    left: 100%;
+    margin-left: -56%;
+    position: absolute;
+}
+
+.tooltip.top {
+    margin-top: -11px;
+    padding: 0;
+}
+.tooltip.top .tooltip-inner:after {
+    border-top: 11px solid #FAE6A4;
+    border-left: 11px solid transparent;
+    border-right: 11px solid transparent;
+    bottom: -10px;
+}
+.tooltip.top .tooltip-inner:before {
+    border-top: 11px solid rgba(0, 0, 0, 0.2);
+    border-left: 11px solid transparent;
+    border-right: 11px solid transparent;
+    bottom: -11px;
+}
+
+.tooltip.bottom {
+    margin-top: 11px;
+    padding: 0;
+}
+.tooltip.bottom .tooltip-inner:after {
+    border-bottom: 11px solid #FAE6A4;
+    border-left: 11px solid transparent;
+    border-right: 11px solid transparent;
+    top: -10px;
+}
+.tooltip.bottom .tooltip-inner:before {
+    border-bottom: 11px solid rgba(0, 0, 0, 0.2);
+    border-left: 11px solid transparent;
+    border-right: 11px solid transparent;
+    top: -11px;
+}
+
+.tooltip.left {
+    margin-left: -11px;
+    padding: 0;
+}
+.tooltip.left .tooltip-inner:after {
+    border-left: 11px solid #FAE6A4;
+    border-top: 11px solid transparent;
+    border-bottom: 11px solid transparent;
+    right: -10px;
+    left: auto;
+    margin-left: 0;
+}
+.tooltip.left .tooltip-inner:before {
+    border-left: 11px solid rgba(0, 0, 0, 0.2);
+    border-top: 11px solid transparent;
+    border-bottom: 11px solid transparent;
+    right: -11px;
+    left: auto;
+    margin-left: 0;
+}
+
+.tooltip.right {
+    margin-left: 11px;
+    padding: 0;
+}
+.tooltip.right .tooltip-inner:after {
+    border-right: 11px solid #FAE6A4;
+    border-top: 11px solid transparent;
+    border-bottom: 11px solid transparent;
+    left: -10px;
+    top: 0;
+    margin-left: 0;
+}
+.tooltip.right .tooltip-inner:before {
+    border-right: 11px solid rgba(0, 0, 0, 0.2);
+    border-top: 11px solid transparent;
+    border-bottom: 11px solid transparent;
+    left: -11px;
+    top: 0;
+    margin-left: 0;
+}
+
+.footer {
+    position: relative;
+    bottom: 20px;
+    right: 0px;
+    width: 100%;
+    color: #706f6f;
+    z-index: 4;
+    text-align: center;
+    margin-top: 60px;
+}
+.footer a {
+    color: #FFFFFF;
+}
+.footer .heart {
+    color: #FF3B30;
+}
+
+@media (max-width: 768px) {
+    .main .container {
+        margin-bottom: 50px;
+    }
+}
+@media (min-width: 768px) {
+    .navbar-form {
+        margin-top: 21px;
+        margin-bottom: 21px;
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+
+    .btn-wd {
+        min-width: 140px;
+    }
+}
diff --git a/src/routes.php b/src/routes.php
index caf8bbb..e728192 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -41,6 +41,9 @@
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
     Route::group(['prefix' => config('blogetc.admin_prefix', 'blog_admin')], function () {
 
+        Route::get('/setup', 'HessamAdminSetupController@setup')
+            ->name('blogetc.admin.setup');
+
         Route::get('/', 'HessamAdminController@index')
             ->name('blogetc.admin.index');
 

From af00ac5ef6cc3a74f5b67b99f0b03f2d8d825220 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Mon, 16 Nov 2020 01:01:50 +0330
Subject: [PATCH 020/118] made setup page ready for beta version

---
 README.md                                     |   7 +-
 composer.json                                 |   1 -
 src/Config/blogetc.php                        |   2 +-
 .../HessamAdminSetupController.php            |  21 ++
 src/Views/blogetc_admin/setup/setup.blade.php | 270 ++++++++----------
 src/routes.php                                |   3 +
 6 files changed, 151 insertions(+), 153 deletions(-)

diff --git a/README.md b/README.md
index 4774e63..eea2c23 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,9 @@
 </p>
 
 # Complete Laravel CMS Package
-## With Multi-level Categories and Full Text Search
+
+### Multi language support - Beta release - v9.0.x
+
 Easily add a wordpress functionality and CMS to your laravel web application.
 
 ## [Let's try it - Online Demo](https://cms.binshops.com/login)
@@ -121,7 +123,8 @@ Try adding this to config/app.php:
 - You might need to set a higher memory limit, or upload smaller image files. This will depend on your server. I've used it to upload huge (10mb+) jpg images without problem, once the server was set up correctly to handle larger file uploads.
 
 ## Version History    
-- **8.0.x** Compatibility with Laravel 8
+- **9.0.x** Multi-language support beta release
+- 8.0.x Compatibility with Laravel 8
 - 7.3.2 Some bug fixes
 - 7.3.0 New Admin UI
 - 7.2.2                 
diff --git a/composer.json b/composer.json
index a15e648..2d9edbc 100755
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,6 @@
         "cviebrock/eloquent-sluggable": "~8.0|~7.0|~6.0|~4.8|~4.7|~4.6|~4.5",
         "laravelium/feed": "~2.12.0|~3.0.0|3.1.*|v6.0.*|v7.0.*|v8.0.*",
         "intervention/image": "2.*",
-        "swisnl/laravel-fulltext": "^0.20.0",
         "laravel/helpers": "^1.3"
     },
     "require-dev": {
diff --git a/src/Config/blogetc.php b/src/Config/blogetc.php
index 1f537d8..524f90c 100755
--- a/src/Config/blogetc.php
+++ b/src/Config/blogetc.php
@@ -177,7 +177,7 @@
     ],
 
     'search' => [
-        'search_enabled' => true, //you can easily turn off search functionality
+        'search_enabled' => false, //you can easily turn off search functionality
     ],
 
     //Shows full text of post in listing pages like search result page or category page. Now it shows a preview
diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
index 233f2ed..dc61271 100644
--- a/src/Controllers/HessamAdminSetupController.php
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -3,8 +3,11 @@
 namespace WebDevEtc\BlogEtc\Controllers;
 
 use Illuminate\Http\Request;
+use WebDevEtc\BlogEtc\Helpers;
 use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
 use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
+use WebDevEtc\BlogEtc\Models\HessamConfiguration;
+use WebDevEtc\BlogEtc\Models\HessamLanguage;
 
 /**
  * Class HessamAdminSetupController
@@ -34,4 +37,22 @@ public function index(Request $request)
     {
         return view("blogetc_admin::setup.setup");
     }
+
+    public function setup_submit(Request $request){
+        if ($request['locale'] == null){
+            return redirect( route('blogetc.admin.setup_submit') );
+        }
+        $language = new HessamLanguage();
+        $language->active = $request['active'];
+        $language->iso_code = $request['iso_code'];
+        $language->locale = $request['locale'];
+        $language->name = $request['name'];
+        $language->date_format = $request['date_format'];
+
+        $language->save();
+        HessamConfiguration::set('INITIAL_SETUP', true);
+
+        Helpers::flash_message("Language: " . $language->name . " has been added.");
+        return redirect( route('blogetc.admin.index') );
+    }
 }
diff --git a/src/Views/blogetc_admin/setup/setup.blade.php b/src/Views/blogetc_admin/setup/setup.blade.php
index 4694b06..2b39f56 100644
--- a/src/Views/blogetc_admin/setup/setup.blade.php
+++ b/src/Views/blogetc_admin/setup/setup.blade.php
@@ -21,178 +21,150 @@
 <body>
 <div style="background-color: #e2e8f0">
 
-    <!--   Big container   -->
     <div class="container">
         <div class="row">
         <div class="col-sm-8 col-sm-offset-2">
 
-            <!--      Wizard container        -->
             <div class="wizard-container">
                 <div class="card wizard-card" data-color="green" id="wizard">
-                <form action="" method="">
+                <form action="{{route("blogetc.admin.languages.setup_submit")}}" method="post">
+                    @csrf
 
                     	<div class="wizard-header" style="text-align: center">
-                        	<img src="assets/img/hessam-cms.png" style="padding: 10px 10px 20px 10px;">
+{{--                        	<img src="assets/img/hessam-cms.png" style="padding: 10px 10px 20px 10px;">--}}
                     	</div>
 						<div class="wizard-navigation">
 							<ul>
-	                            <li><a href="#location" data-toggle="tab">Language</a></li>
-	                            <li><a href="#type" data-toggle="tab">Configurations</a></li>
-	                            <li><a href="#facilities" data-toggle="tab">Facilities</a></li>
-	                            <li><a href="#description" data-toggle="tab">Description</a></li>
+	                            <li><a href="#language" data-toggle="tab">Language</a></li>
 	                        </ul>
 						</div>
 
                         <div class="tab-content">
-                            <div class="tab-pane" id="location">
+                            <div class="tab-pane" id="language">
                               <div class="row">
                                   <div class="col-sm-12">
-                                    <h4 class="info-text"> Let's choose your default language</h4>
+                                    <h4 class="info-text">Your default language is English in Beta release. Add more language from admin panel.</h4>
                                   </div>
-                                  <div class="col-sm-5 col-sm-offset-1">
-                                      <div class="form-group">
-                                        <label>City</label>
-                                        <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Where is your place located?">
-                                      </div>
-                                  </div>
-                                  <div class="col-sm-5">
+                                  <div class="col-sm-12">
                                        <div class="form-group">
-                                            <label>Country</label><br>
-                                             <select name="country" class="form-control">
-                                                <option disabled="" selected="">- country -</option>
-                                                <option value="Afghanistan"> Afghanistan </option>
-                                                <option value="Albania"> Albania </option>
-                                                <option value="Algeria"> Algeria </option>
-                                                <option value="American Samoa"> American Samoa </option>
-                                                <option value="Andorra"> Andorra </option>
-                                                <option value="Angola"> Angola </option>
-                                                <option value="Anguilla"> Anguilla </option>
-                                                <option value="Antarctica"> Antarctica </option>
-                                                <option value="...">...</option>
-                                            </select>
-                                          </div>
-                                  </div>
-                                  <div class="col-sm-5 col-sm-offset-1">
-                                      <div class="form-group">
-                                          <label>Accommodates</label>
-                                          <select class="form-control">
-                                            <option disabled="" selected="">- persons -</option>
-                                            <option>1 Person</option>
-                                            <option>2 Persons </option>
-                                            <option>3 Persons</option>
-                                            <option>4 Persons</option>
-                                            <option>5 Persons</option>
-                                            <option>6+ Persons</option>
-                                          </select>
-                                      </div>
-                                  </div>
-                                  <div class="col-sm-5">
-                                      <div class="form-group">
-                                          <label>Rent price</label>
-                                          <div class="input-group">
-                                              <input type="text" class="form-control" placeholder="Rent price per day">
-                                              <span class="input-group-addon">$</span>
-                                          </div>
-                                      </div>
+                                            <label>Language</label><br>
+                                           <select readonly class="form-control" id="lang-name" data-placeholder="Choose a Language...">
+{{--                                               <option value="AF">Afrikaans</option>--}}
+{{--                                               <option value="SQ">Albanian</option>--}}
+{{--                                               <option value="AR">Arabic</option>--}}
+{{--                                               <option value="HY">Armenian</option>--}}
+{{--                                               <option value="EU">Basque</option>--}}
+{{--                                               <option value="BN">Bengali</option>--}}
+{{--                                               <option value="BG">Bulgarian</option>--}}
+{{--                                               <option value="CA">Catalan</option>--}}
+{{--                                               <option value="KM">Cambodian</option>--}}
+{{--                                               <option value="ZH">Chinese (Mandarin)</option>--}}
+{{--                                               <option value="HR">Croatian</option>--}}
+{{--                                               <option value="CS">Czech</option>--}}
+{{--                                               <option value="DA">Danish</option>--}}
+{{--                                               <option value="NL">Dutch</option>--}}
+{{--                                               <option value="EN">English</option>--}}
+{{--                                               <option value="ET">Estonian</option>--}}
+{{--                                               <option value="FJ">Fiji</option>--}}
+{{--                                               <option value="FI">Finnish</option>--}}
+{{--                                               <option value="FR">French</option>--}}
+{{--                                               <option value="KA">Georgian</option>--}}
+{{--                                               <option value="DE">German</option>--}}
+{{--                                               <option value="EL">Greek</option>--}}
+{{--                                               <option value="GU">Gujarati</option>--}}
+{{--                                               <option value="HE">Hebrew</option>--}}
+{{--                                               <option value="HI">Hindi</option>--}}
+{{--                                               <option value="HU">Hungarian</option>--}}
+{{--                                               <option value="IS">Icelandic</option>--}}
+{{--                                               <option value="ID">Indonesian</option>--}}
+{{--                                               <option value="GA">Irish</option>--}}
+{{--                                               <option value="IT">Italian</option>--}}
+{{--                                               <option value="JA">Japanese</option>--}}
+{{--                                               <option value="JW">Javanese</option>--}}
+{{--                                               <option value="KO">Korean</option>--}}
+{{--                                               <option value="LA">Latin</option>--}}
+{{--                                               <option value="LV">Latvian</option>--}}
+{{--                                               <option value="LT">Lithuanian</option>--}}
+{{--                                               <option value="MK">Macedonian</option>--}}
+{{--                                               <option value="MS">Malay</option>--}}
+{{--                                               <option value="ML">Malayalam</option>--}}
+{{--                                               <option value="MT">Maltese</option>--}}
+{{--                                               <option value="MI">Maori</option>--}}
+{{--                                               <option value="MR">Marathi</option>--}}
+{{--                                               <option value="MN">Mongolian</option>--}}
+{{--                                               <option value="NE">Nepali</option>--}}
+{{--                                               <option value="NO">Norwegian</option>--}}
+{{--                                               <option value="FA">Persian</option>--}}
+{{--                                               <option value="PL">Polish</option>--}}
+{{--                                               <option value="PT">Portuguese</option>--}}
+{{--                                               <option value="PA">Punjabi</option>--}}
+{{--                                               <option value="QU">Quechua</option>--}}
+{{--                                               <option value="RO">Romanian</option>--}}
+{{--                                               <option value="RU">Russian</option>--}}
+{{--                                               <option value="SM">Samoan</option>--}}
+{{--                                               <option value="SR">Serbian</option>--}}
+{{--                                               <option value="SK">Slovak</option>--}}
+{{--                                               <option value="SL">Slovenian</option>--}}
+{{--                                               <option value="ES">Spanish</option>--}}
+{{--                                               <option value="SW">Swahili</option>--}}
+{{--                                               <option value="SV">Swedish </option>--}}
+{{--                                               <option value="TA">Tamil</option>--}}
+{{--                                               <option value="TT">Tatar</option>--}}
+{{--                                               <option value="TE">Telugu</option>--}}
+{{--                                               <option value="TH">Thai</option>--}}
+{{--                                               <option value="BO">Tibetan</option>--}}
+{{--                                               <option value="TO">Tonga</option>--}}
+{{--                                               <option value="TR">Turkish</option>--}}
+{{--                                               <option value="UK">Ukrainian</option>--}}
+{{--                                               <option value="UR">Urdu</option>--}}
+{{--                                               <option value="UZ">Uzbek</option>--}}
+{{--                                               <option value="VI">Vietnamese</option>--}}
+{{--                                               <option value="CY">Welsh</option>--}}
+{{--                                               <option value="XH">Xhosa</option>--}}
+                                           </select>
+
+{{--                                           <script>--}}
+{{--                                               $('#lang-name').change(function(){--}}
+{{--                                                   var value = $(this).val().toLowerCase();--}}
+{{--                                                   $('#language_name').val($("#lang-name option:selected").text());--}}
+{{--                                                   $('#language_locale').val(value);--}}
+{{--                                                   $('#iso_code').val(value);--}}
+{{--                                                   console.log(value)--}}
+{{--                                               });--}}
+{{--                                           </script>--}}
+
+                                           <input type="text"
+                                                  class="form-control"
+                                                  id="language_name"
+                                                  required
+                                                  name='name'
+                                                  value="English"
+                                                  style="display: none">
+
+                                           <input type="text"
+                                                  class="form-control"
+                                                  id="language_locale"
+                                                  required
+                                                  name='locale'
+                                                  value="en"
+                                                  style="display: none">
+
+                                           <input name="iso_code" value="en" id="iso_code" style="display: none">
+                                           <input name="date_format" value="YYYY/MM/DD" style="display: none">
+                                           <input checked style="display: none" name="active" value="1">
+
+
+                                       </div>
                                   </div>
                               </div>
                             </div>
-                            <div class="tab-pane" id="type">
-                                <h4 class="info-text">What type of location do you have? </h4>
-                                <div class="row">
-                                    <div class="col-sm-10 col-sm-offset-1">
-                                        <div class="col-sm-4 col-sm-offset-2">
-                                            <div class="choice" data-toggle="wizard-radio" rel="tooltip" title="Select this option if you have a house.">
-                                                <input type="radio" name="type" value="House">
-                                                <div class="icon">
-                                                    <i class="fa fa-home"></i>
-                                                </div>
-                                                <h6>House</h6>
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-4">
-                                            <div class="choice" data-toggle="wizard-radio" rel="tooltip" title="Select this option if you have an appartment">
-                                                <input type="radio" name="type" value="Appartment">
-                                                <div class="icon">
-                                                    <i class="fa fa-building"></i>
-                                                </div>
-                                                <h6>Appartment</h6>
-                                            </div>
-                                        </div>
-
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="tab-pane" id="facilities">
-                                <h4 class="info-text">Tell us more about facilities. </h4>
-                                <div class="row">
-                                    <div class="col-sm-5 col-sm-offset-1">
-                                      <div class="form-group">
-                                          <label>Your place is good for</label>
-                                          <select class="form-control">
-                                            <option disabled="" selected="">- type -</option>
-                                            <option>Business</option>
-                                            <option>Vacation </option>
-                                            <option>Work</option>
-                                          </select>
-                                      </div>
-                                    </div>
-                                    <div class="col-sm-5">
-                                      <div class="form-group">
-                                          <label>Is air conditioning included ?</label>
-                                          <select class="form-control">
-                                            <option disabled="" selected="">- response -</option>
-                                            <option>Yes</option>
-                                            <option>No </option>
-                                          </select>
-                                      </div>
-                                     </div>
-                                     <div class="col-sm-5 col-sm-offset-1">
-                                      <div class="form-group">
-                                          <label>Does your place have wi-fi?</label>
-                                          <select class="form-control">
-                                            <option disabled="" selected="">- response -</option>
-                                            <option>Yes</option>
-                                            <option>No </option>
-                                          </select>
-                                       </div>
-                                      </div>
-                                      <div class="col-sm-5">
-                                       <div class="form-group">
-                                          <label>Is breakfast included?</label>
-                                          <select class="form-control">
-                                            <option disabled="" selected="">- response -</option>
-                                            <option>Yes</option>
-                                            <option>No </option>
-                                          </select>
-                                       </div>
-                                      </div>
-                                </div>
-                            </div>
-                            <div class="tab-pane" id="description">
-                                <div class="row">
-                                    <h4 class="info-text"> Drop us a small description. </h4>
-                                    <div class="col-sm-6 col-sm-offset-1">
-                                         <div class="form-group">
-                                            <label>Place description</label>
-                                            <textarea class="form-control" placeholder="" rows="9">
-
-                                            </textarea>
-                                          </div>
-                                    </div>
-                                    <div class="col-sm-4">
-                                         <div class="form-group">
-                                            <label>Example</label>
-                                            <p class="description">"The place is really nice. We use it every sunday when we go fishing. It is so awesome."</p>
-                                          </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
+
+{{--                    FOOTER--}}
                         <div class="wizard-footer">
                             	<div class="pull-right">
                                     <input type='button' class='btn btn-next btn-fill btn-success btn-wd btn-sm' name='next' value='Next' />
-                                    <input type='button' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Finish' />
+                                    <input type='submit' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Finish' />
 
                                 </div>
                                 <div class="pull-left">
@@ -203,10 +175,10 @@
 
                     </form>
                 </div>
-            </div> <!-- wizard container -->
+            </div>
         </div>
-        </div> <!-- row -->
-    </div> <!--  big container -->
+        </div>
+    </div>
 
     <div class="footer">
         <div class="container">
diff --git a/src/routes.php b/src/routes.php
index e728192..cf4451a 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -44,6 +44,9 @@
         Route::get('/setup', 'HessamAdminSetupController@setup')
             ->name('blogetc.admin.setup');
 
+        Route::get('/setup-submit', 'HessamAdminSetupController@setup_submit')
+            ->name('blogetc.admin.setup_submit');
+
         Route::get('/', 'HessamAdminController@index')
             ->name('blogetc.admin.index');
 

From d1e317bb6acb39ef8a0e5eb17158695d17960467 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Mon, 16 Nov 2020 01:39:51 +0330
Subject: [PATCH 021/118] namespace refactor

---
 .styleci.yml                                  |   2 +-
 README.md                                     |  16 +-
 composer.json                                 |   6 +-
 src/Baum/Extensions/Eloquent/Collection.php   |   4 +-
 src/Baum/Extensions/Eloquent/Model.php        |   4 +-
 src/Baum/Extensions/Query/Builder.php         |   2 +-
 src/Baum/Move.php                             |  26 +-
 src/Baum/MoveNotPossibleException.php         |   2 +-
 src/Baum/Node.php                             |  46 ++--
 src/Baum/SetBuilder.php                       |  18 +-
 src/Baum/SetMapper.php                        |  10 +-
 src/Baum/SetValidator.php                     |  10 +-
 src/Captcha/Basic.php                         |  10 +-
 src/Captcha/CaptchaAbstract.php               |  16 +-
 src/Captcha/UsesCaptcha.php                   |  10 +-
 src/Config/{blogetc.php => hessamcms.php}     |   6 +-
 src/Controllers/HessamAdminController.php     |  84 +++----
 .../HessamAdminSetupController.php            |  22 +-
 .../HessamCategoryAdminController.php         |  52 ++--
 .../HessamCommentWriterController.php         |  36 +--
 .../HessamCommentsAdminController.php         |  18 +-
 .../HessamImageUploadController.php           |  34 +--
 .../HessamLanguageAdminController.php         |  24 +-
 src/Controllers/HessamReaderController.php    |  34 +--
 src/Controllers/HessamRssFeedController.php   |  26 +-
 src/Events/BlogPostAdded.php                  |  14 +-
 src/Events/BlogPostEdited.php                 |  14 +-
 src/Events/BlogPostWillBeDeleted.php          |  14 +-
 src/Events/CategoryAdded.php                  |   8 +-
 src/Events/CategoryEdited.php                 |  14 +-
 src/Events/CategoryWillBeDeleted.php          |  14 +-
 src/Events/CommentAdded.php                   |  16 +-
 src/Events/CommentApproved.php                |   6 +-
 src/Events/CommentWillBeDeleted.php           |   6 +-
 src/Events/UploadedImage.php                  |  16 +-
 src/Helpers.php                               |  12 +-
 ...vider.php => HessamCMSServiceProvider.php} |  26 +-
 src/Interfaces/BaseRequestInterface.php       |   2 +-
 src/Interfaces/CaptchaInterface.php           |   2 +-
 src/Interfaces/SearchResultInterface.php      |   2 +-
 src/Middleware/DetectLanguage.php             |   4 +-
 src/Middleware/LoadLanguage.php               |   6 +-
 src/Middleware/PackageSetup.php               |  10 +-
 src/Middleware/UserCanManageBlogPosts.php     |   8 +-
 src/Models/HessamCategory.php                 |   8 +-
 src/Models/HessamCategoryTranslation.php      |   6 +-
 src/Models/HessamComment.php                  |  10 +-
 src/Models/HessamConfiguration.php            |   2 +-
 src/Models/HessamLanguage.php                 |   2 +-
 src/Models/HessamPost.php                     |  12 +-
 src/Models/HessamPostTranslation.php          |  32 +--
 src/Models/HessamUploadedPhoto.php            |   2 +-
 src/Requests/AddNewCommentRequest.php         |  18 +-
 ...t.php => BaseHessamCMSCategoryRequest.php} |   4 +-
 ...quest.php => BaseHessamCMSPostRequest.php} |  10 +-
 src/Requests/BaseRequest.php                  |   8 +-
 ...est.php => CreateHessamCMSPostRequest.php} |   8 +-
 .../CreateHessamPostToggleRequest.php         |   8 +-
 ...php => DeleteHessamCMSCategoryRequest.php} |   4 +-
 ...est.php => DeleteHessamCMSPostRequest.php} |   4 +-
 src/Requests/FeedRequest.php                  |   2 +-
 src/Requests/SearchRequest.php                |   4 +-
 src/Requests/Traits/HasCategoriesTrait.php    |   6 +-
 src/Requests/Traits/HasImageUploadTrait.php   |   4 +-
 ...php => UpdateHessamCMSCategoryRequest.php} |   6 +-
 ...est.php => UpdateHessamCMSPostRequest.php} |  10 +-
 src/Requests/UploadImageRequest.php           |   6 +-
 ...logCommentApprovedAndDefaultOrderScope.php |   4 +-
 ...dScope.php => HessamCMSPublishedScope.php} |   8 +-
 src/Traits/UploadFileTrait.php                |  18 +-
 .../captcha/basic.blade.php                   |   2 +-
 .../{blogetc => hessamcms}/index.blade.php    |  22 +-
 .../partials/_category_partial.blade.php      |   2 +-
 .../partials/add_comment_form.blade.php       |   8 +-
 .../partials/author.blade.php                 |   0
 .../partials/built_in_comments.blade.php      |   6 +-
 .../partials/cat_snippet.blade.php            |   0
 .../partials/categories.blade.php             |   0
 .../partials/custom_comments.blade.php        |   2 +-
 .../partials/disqus_comments.blade.php        |   4 +-
 .../partials/full_post_details.blade.php      |  10 +-
 .../partials/index_loop.blade.php             |   6 +-
 .../partials/search_form.blade.php            |   4 +-
 .../partials/show_comments.blade.php          |  10 +-
 .../partials/show_errors.blade.php            |   0
 .../partials/use_view_file.blade.php          |   8 +-
 .../saved_comment.blade.php                   |   2 +-
 .../{blogetc => hessamcms}/search.blade.php   |  10 +-
 .../single_post.blade.php                     |  14 +-
 .../sitewide/random_posts.blade.php           |   2 +-
 .../sitewide/recent_posts.blade.php           |   2 +-
 .../sitewide/search_form.blade.php            |   2 +-
 .../sitewide/show_all_categories.blade.php    |   2 +-
 .../categories/_category_partial.blade.php    |   2 +-
 .../categories/add_category.blade.php         |  12 +-
 .../categories/edit_category.blade.php        |   6 +-
 .../categories/form.blade.php                 |   2 +-
 .../categories/index.blade.php                |   4 +-
 .../comments/index.blade.php                  |   6 +-
 .../imageupload/create.blade.php              |  10 +-
 .../imageupload/index.blade.php               |  14 +-
 .../imageupload/uploaded.blade.php            |  10 +-
 .../index.blade.php                           |   4 +-
 .../languages/add_language.blade.php          |   4 +-
 .../languages/deleted_language.blade.php      |   0
 .../languages/edit_language.blade.php         |   0
 .../languages/form.blade.php                  |   0
 .../languages/index.blade.php                 |   6 +-
 .../layouts/admin_layout.blade.php            |  14 +-
 .../layouts/sidebar.blade.php                 |  60 ++---
 .../posts/add_post.blade.php                  |   8 +-
 .../posts/deleted_post.blade.php              |  16 +-
 .../posts/edit_post.blade.php                 |   8 +-
 .../posts/form.blade.php                      |  18 +-
 .../setup/setup.blade.php                     |   2 +-
 ..._admin_css.css => hessamcms_admin_css.css} |   0
 src/routes.php                                |  76 +++---
 tests/CaptchaTest.php                         |  14 +-
 tests/MainTest.php                            | 236 +++++++++---------
 119 files changed, 784 insertions(+), 784 deletions(-)
 rename src/Config/{blogetc.php => hessamcms.php} (96%)
 rename src/{BlogEtcServiceProvider.php => HessamCMSServiceProvider.php} (64%)
 rename src/Requests/{BaseBlogEtcCategoryRequest.php => BaseHessamCMSCategoryRequest.php} (82%)
 rename src/Requests/{BaseBlogEtcPostRequest.php => BaseHessamCMSPostRequest.php} (89%)
 rename src/Requests/{CreateBlogEtcPostRequest.php => CreateHessamCMSPostRequest.php} (59%)
 rename src/Requests/{DeleteBlogEtcCategoryRequest.php => DeleteHessamCMSCategoryRequest.php} (70%)
 rename src/Requests/{DeleteBlogEtcPostRequest.php => DeleteHessamCMSPostRequest.php} (73%)
 rename src/Requests/{UpdateBlogEtcCategoryRequest.php => UpdateHessamCMSCategoryRequest.php} (63%)
 rename src/Requests/{UpdateBlogEtcPostRequest.php => UpdateHessamCMSPostRequest.php} (63%)
 rename src/Scopes/{BlogEtcPublishedScope.php => HessamCMSPublishedScope.php} (73%)
 rename src/Views/{blogetc => hessamcms}/captcha/basic.blade.php (59%)
 rename src/Views/{blogetc => hessamcms}/index.blade.php (73%)
 rename src/Views/{blogetc => hessamcms}/partials/_category_partial.blade.php (76%)
 rename src/Views/{blogetc => hessamcms}/partials/add_comment_form.blade.php (89%)
 rename src/Views/{blogetc => hessamcms}/partials/author.blade.php (100%)
 rename src/Views/{blogetc => hessamcms}/partials/built_in_comments.blade.php (70%)
 rename src/Views/{blogetc => hessamcms}/partials/cat_snippet.blade.php (100%)
 rename src/Views/{blogetc => hessamcms}/partials/categories.blade.php (100%)
 rename src/Views/{blogetc => hessamcms}/partials/custom_comments.blade.php (61%)
 rename src/Views/{blogetc => hessamcms}/partials/disqus_comments.blade.php (83%)
 rename src/Views/{blogetc => hessamcms}/partials/full_post_details.blade.php (66%)
 rename src/Views/{blogetc => hessamcms}/partials/index_loop.blade.php (81%)
 rename src/Views/{blogetc => hessamcms}/partials/search_form.blade.php (51%)
 rename src/Views/{blogetc => hessamcms}/partials/show_comments.blade.php (65%)
 rename src/Views/{blogetc => hessamcms}/partials/show_errors.blade.php (100%)
 rename src/Views/{blogetc => hessamcms}/partials/use_view_file.blade.php (72%)
 rename src/Views/{blogetc => hessamcms}/saved_comment.blade.php (84%)
 rename src/Views/{blogetc => hessamcms}/search.blade.php (78%)
 rename src/Views/{blogetc => hessamcms}/single_post.blade.php (55%)
 rename src/Views/{blogetc => hessamcms}/sitewide/random_posts.blade.php (65%)
 rename src/Views/{blogetc => hessamcms}/sitewide/recent_posts.blade.php (63%)
 rename src/Views/{blogetc => hessamcms}/sitewide/search_form.blade.php (74%)
 rename src/Views/{blogetc => hessamcms}/sitewide/show_all_categories.blade.php (63%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/categories/_category_partial.blade.php (73%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/categories/add_category.blade.php (92%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/categories/edit_category.blade.php (92%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/categories/form.blade.php (95%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/categories/index.blade.php (85%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/comments/index.blade.php (87%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/imageupload/create.blade.php (76%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/imageupload/index.blade.php (87%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/imageupload/uploaded.blade.php (56%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/index.blade.php (95%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/languages/add_language.blade.php (97%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/languages/deleted_language.blade.php (100%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/languages/edit_language.blade.php (100%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/languages/form.blade.php (100%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/languages/index.blade.php (82%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/layouts/admin_layout.blade.php (90%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/layouts/sidebar.blade.php (63%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/posts/add_post.blade.php (73%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/posts/deleted_post.blade.php (65%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/posts/edit_post.blade.php (76%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/posts/form.blade.php (93%)
 rename src/Views/{blogetc_admin => hessamcms_admin}/setup/setup.blade.php (99%)
 rename src/css/{blogetc_admin_css.css => hessamcms_admin_css.css} (100%)

diff --git a/.styleci.yml b/.styleci.yml
index 837286d..5ad3ee9 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -1,4 +1,4 @@
-# Styleci for WebDevEtc.
+# Styleci for hessam.
 
 preset: laravel
 
diff --git a/README.md b/README.md
index eea2c23..2c8515d 100644
--- a/README.md
+++ b/README.md
@@ -30,14 +30,14 @@ Install with following command and follow the instructions.
 To see package on Packagist click this [Link](https://packagist.org/packages/hessam/laravel-blogger)
 
 ## Important Notes
-- For laravel 8.x's default auth User model, change user model in `blogetc.php` to: `\App\Models\User::class`
+- For laravel 8.x's default auth User model, change user model in `hessamcms.php` to: `\App\Models\User::class`
 
 ## Features
 - Compatible with latest laravel version (laravel 8.x)
 - Backward-compatibility with previous laravel versions
 - Full text search - searching throughout the blog posts
 - Multi-level category support
-- fully configurable via its `config/blogetc.php` config file
+- fully configurable via its `config/hessamcms.php` config file
 - Ready to use admin panel
 - Full customizability of admin views and front views
 - Paginated views
@@ -81,21 +81,21 @@ To see package on Packagist click this [Link](https://packagist.org/packages/hes
 
 ## How to customise the blog views/templates
 
-After doing the correct `vendor:publish`, all of the default template files will be found in /resources/views/vendor/blogetc/ and are easy to edit to match your needs.
+After doing the correct `vendor:publish`, all of the default template files will be found in /resources/views/vendor/hessamcms/ and are easy to edit to match your needs.
 
 ### Customizing admin views
 If you need to customize the admin view, just copy the files from
-`vendor/webdevetc/blogetc/src/Views/blogetc_admin`
+`vendor/hessam.binshops/hessamcms/src/Views/hessamcms_admin`
 to
-`resources/views/vendor/blogetc_admin`
+`resources/views/vendor/hessamcms_admin`
 Then you can modify them just like any other view file.
 
 ## Routes
 
-It will auto set all required routes (both public facing, and admin backend). There are some config options (such as changing the /blog/ url to something else), which can be done in the blogetc.php file.
+It will auto set all required routes (both public facing, and admin backend). There are some config options (such as changing the /blog/ url to something else), which can be done in the hessamcms.php file.
 
 ## Config options
-All config options have comments which describe what they do. Please just refer to the `blogetc.php` file in your /config/ dir.
+All config options have comments which describe what they do. Please just refer to the `hessamcms.php` file in your /config/ dir.
 
 ### Custom User Model
 You can change the default user model through the config file.
@@ -148,7 +148,7 @@ Try adding this to config/app.php:
 - 3.0.2                 - fixed default medium image size (changed to 600x400)
 - 3.0.1                 - replaced all short tags (<?) with full opening ones (<?php)
 - 3.0                   - Added separate functionality for uploading images (and save some meta data in db)
-- 2.1                   - added 'short_description' to db + form, and BlogEtcPost::generate_introduction() method will try and use this to generate intro text.
+- 2.1                   - added 'short_description' to db + form, and HessamCMSPost::generate_introduction() method will try and use this to generate intro text.
 - 2.0                   - added full text search (enable it via the config file - it is disabled by default).
 - 1.2                   - added WYSIWYG, few smaller changes
 - 1.1.1                 - added basic captcha
diff --git a/composer.json b/composer.json
index 2d9edbc..1cc0126 100755
--- a/composer.json
+++ b/composer.json
@@ -40,18 +40,18 @@
     },
     "autoload": {
         "psr-4": {
-            "WebDevEtc\\BlogEtc\\": "src"
+            "HessamCMS\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "WebDevEtc\\BlogEtc\\Tests\\": "tests"
+            "HessamCMS\\Tests\\": "tests"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "WebDevEtc\\BlogEtc\\BlogEtcServiceProvider"
+                "HessamCMSServiceProvider"
             ],
             "aliases": {
             }
diff --git a/src/Baum/Extensions/Eloquent/Collection.php b/src/Baum/Extensions/Eloquent/Collection.php
index 41884af..ae4376c 100644
--- a/src/Baum/Extensions/Eloquent/Collection.php
+++ b/src/Baum/Extensions/Eloquent/Collection.php
@@ -1,5 +1,5 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum\Extensions\Eloquent;
+namespace HessamCMS\Baum\Extensions\Eloquent;
 
 use Illuminate\Database\Eloquent\Collection as BaseCollection;
 
@@ -8,7 +8,7 @@ class Collection extends BaseCollection {
   public function toHierarchy() {
     $dict = $this->getDictionary();
 
-    // Enforce sorting by $orderColumn setting in WebDevEtc\BlogEtc\Baum\Node instance
+    // Enforce sorting by $orderColumn setting in HessamCMS\Baum\Node instance
     uasort($dict, function($a, $b){
         return ($a->getOrder() >= $b->getOrder()) ? 1 : -1;
     });
diff --git a/src/Baum/Extensions/Eloquent/Model.php b/src/Baum/Extensions/Eloquent/Model.php
index 66fb0c5..b5ad1b1 100644
--- a/src/Baum/Extensions/Eloquent/Model.php
+++ b/src/Baum/Extensions/Eloquent/Model.php
@@ -1,10 +1,10 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum\Extensions\Eloquent;
+namespace HessamCMS\Baum\Extensions\Eloquent;
 
 use Illuminate\Database\Eloquent\Model as BaseModel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
-use WebDevEtc\BlogEtc\Baum\Extensions\Query\Builder as QueryBuilder;
+use HessamCMS\Baum\Extensions\Query\Builder as QueryBuilder;
 
 abstract class Model extends BaseModel {
 
diff --git a/src/Baum/Extensions/Query/Builder.php b/src/Baum/Extensions/Query/Builder.php
index 3c21afe..3541793 100644
--- a/src/Baum/Extensions/Query/Builder.php
+++ b/src/Baum/Extensions/Query/Builder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Baum\Extensions\Query;
+namespace HessamCMS\Baum\Extensions\Query;
 
 use Illuminate\Database\Query\Builder as BaseBuilder;
 
diff --git a/src/Baum/Move.php b/src/Baum/Move.php
index 63beaf8..8645ac2 100644
--- a/src/Baum/Move.php
+++ b/src/Baum/Move.php
@@ -1,5 +1,5 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum;
+namespace HessamCMS\Baum;
 
 use \Illuminate\Events\Dispatcher;
 
@@ -11,14 +11,14 @@ class Move {
   /**
   * Node on which the move operation will be performed
   *
-  * @var \WebDevEtc\BlogEtc\Baum\Node
+  * @var \HessamCMS\Baum\Node
   */
   protected $node = NULL;
 
   /**
   * Destination node
   *
-  * @var \WebDevEtc\BlogEtc\Baum\Node | int
+  * @var \HessamCMS\Baum\Node | int
   */
   protected $target = NULL;
 
@@ -60,8 +60,8 @@ class Move {
   /**
    * Create a new Move class instance.
    *
-   * @param   \WebDevEtc\BlogEtc\Baum\Node      $node
-   * @param   \WebDevEtc\BlogEtc\Baum\Node|int  $target
+   * @param   \HessamCMS\Baum\Node      $node
+   * @param   \HessamCMS\Baum\Node|int  $target
    * @param   string          $position
    * @return  void
    */
@@ -76,10 +76,10 @@ public function __construct($node, $target, $position) {
   /**
    * Easy static accessor for performing a move operation.
    *
-   * @param   \WebDevEtc\BlogEtc\Baum\Node      $node
-   * @param   \WebDevEtc\BlogEtc\Baum\Node|int  $target
+   * @param   \HessamCMS\Baum\Node      $node
+   * @param   \HessamCMS\Baum\Node|int  $target
    * @param   string          $position
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public static function to($node, $target, $position) {
     $instance = new static($node, $target, $position);
@@ -90,7 +90,7 @@ public static function to($node, $target, $position) {
   /**
    * Perform the move operation.
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function perform() {
     $this->guardAgainstImpossibleMove();
@@ -176,14 +176,14 @@ public function updateStructure() {
 
   /**
    * Resolves suplied node. Basically returns the node unchanged if
-   * supplied parameter is an instance of \WebDevEtc\BlogEtc\Baum\Node. Otherwise it will try
+   * supplied parameter is an instance of \HessamCMS\Baum\Node. Otherwise it will try
    * to find the node in the database.
    *
-   * @param   \WebDevEtc\BlogEtc\Baum\node|int
-   * @return  \WebDevEtc\BlogEtc\Baum\Node
+   * @param   \HessamCMS\Baum\node|int
+   * @return  \HessamCMS\Baum\Node
    */
   protected function resolveNode($node) {
-    if ( $node instanceof \WebDevEtc\BlogEtc\Baum\Node ) return $node->reload();
+    if ( $node instanceof \HessamCMS\Baum\Node ) return $node->reload();
 
     return $this->node->newNestedSetQuery()->find($node);
   }
diff --git a/src/Baum/MoveNotPossibleException.php b/src/Baum/MoveNotPossibleException.php
index a05c4b2..fbd7a3c 100644
--- a/src/Baum/MoveNotPossibleException.php
+++ b/src/Baum/MoveNotPossibleException.php
@@ -1,4 +1,4 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum;
+namespace HessamCMS\Baum;
 
 class MoveNotPossibleException extends \RuntimeException {}
diff --git a/src/Baum/Node.php b/src/Baum/Node.php
index 9629c2c..e49a2d3 100644
--- a/src/Baum/Node.php
+++ b/src/Baum/Node.php
@@ -1,8 +1,8 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum;
+namespace HessamCMS\Baum;
 
-use WebDevEtc\BlogEtc\Baum\Extensions\Eloquent\Collection;
-use WebDevEtc\BlogEtc\Baum\Extensions\Eloquent\Model;
+use HessamCMS\Baum\Extensions\Eloquent\Collection;
+use HessamCMS\Baum\Extensions\Eloquent\Model;
 
 /**
  * Node
@@ -347,7 +347,7 @@ public function newNestedSetQuery($excludeDeleted = true) {
    * Overload new Collection
    *
    * @param array $models
-   * @return \WebDevEtc\BlogEtc\Baum\Extensions\Eloquent\Collection
+   * @return \HessamCMS\Baum\Extensions\Eloquent\Collection
    */
   public function newCollection(array $models = array()) {
     return new Collection($models);
@@ -887,7 +887,7 @@ public function getRightSibling() {
   /**
    * Find the left sibling and move to left of it.
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function moveLeft() {
     return $this->moveToLeftOf($this->getLeftSibling());
@@ -896,7 +896,7 @@ public function moveLeft() {
   /**
    * Find the right sibling and move to the right of it.
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function moveRight() {
     return $this->moveToRightOf($this->getRightSibling());
@@ -905,7 +905,7 @@ public function moveRight() {
   /**
    * Move to the node to the left of ...
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function moveToLeftOf($node) {
     return $this->moveTo($node, 'left');
@@ -914,7 +914,7 @@ public function moveToLeftOf($node) {
   /**
    * Move to the node to the right of ...
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function moveToRightOf($node) {
     return $this->moveTo($node, 'right');
@@ -923,7 +923,7 @@ public function moveToRightOf($node) {
   /**
    * Alias for moveToRightOf
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function makeNextSiblingOf($node) {
     return $this->moveToRightOf($node);
@@ -932,7 +932,7 @@ public function makeNextSiblingOf($node) {
   /**
    * Alias for moveToRightOf
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function makeSiblingOf($node) {
     return $this->moveToRightOf($node);
@@ -941,7 +941,7 @@ public function makeSiblingOf($node) {
   /**
    * Alias for moveToLeftOf
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function makePreviousSiblingOf($node) {
     return $this->moveToLeftOf($node);
@@ -950,7 +950,7 @@ public function makePreviousSiblingOf($node) {
   /**
    * Make the node a child of ...
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function makeChildOf($node) {
     return $this->moveTo($node, 'child');
@@ -959,7 +959,7 @@ public function makeChildOf($node) {
   /**
    * Make the node the first child of ...
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function makeFirstChildOf($node) {
     if ( $node->children()->count() == 0 )
@@ -971,7 +971,7 @@ public function makeFirstChildOf($node) {
   /**
    * Make the node the last child of ...
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function makeLastChildOf($node) {
     return $this->makeChildOf($node);
@@ -980,7 +980,7 @@ public function makeLastChildOf($node) {
   /**
    * Make current node a root node.
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function makeRoot() {
     return $this->moveTo($this, 'root');
@@ -989,7 +989,7 @@ public function makeRoot() {
   /**
    * Equals?
    *
-   * @param \WebDevEtc\BlogEtc\Baum\Node
+   * @param \HessamCMS\Baum\Node
    * @return boolean
    */
   public function equals($node) {
@@ -999,7 +999,7 @@ public function equals($node) {
   /**
    * Checkes if the given node is in the same scope as the current one.
    *
-   * @param \WebDevEtc\BlogEtc\Baum\Node
+   * @param \HessamCMS\Baum\Node
    * @return boolean
    */
   public function inSameScope($other) {
@@ -1014,7 +1014,7 @@ public function inSameScope($other) {
    * Checks wether the given node is a descendant of itself. Basically, whether
    * its in the subtree defined by the left and right indices.
    *
-   * @param \WebDevEtc\BlogEtc\Baum\Node
+   * @param \HessamCMS\Baum\Node
    * @return boolean
    */
   public function insideSubtree($node) {
@@ -1071,7 +1071,7 @@ public function moveToNewParent() {
   /**
    * Sets the depth attribute
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function setDepth() {
     $self = $this;
@@ -1091,7 +1091,7 @@ public function setDepth() {
   /**
    * Sets the depth attribute for the current node and all of its descendants.
    *
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   public function setDepthWithSubtree() {
     $self = $this;
@@ -1232,9 +1232,9 @@ public function makeTree($nodeList) {
    * Main move method. Here we handle all node movements with the corresponding
    * lft/rgt index updates.
    *
-   * @param WebDevEtc\BlogEtc\Baum\Node|int $target
+   * @param HessamCMS\Baum\Node|int $target
    * @param string        $position
-   * @return \WebDevEtc\BlogEtc\Baum\Node
+   * @return \HessamCMS\Baum\Node
    */
   protected function moveTo($target, $position) {
     return Move::to($this, $target, $position);
@@ -1259,7 +1259,7 @@ protected function computeLevel() {
   /**
    * Return an array with the last node we could reach and its nesting level
    *
-   * @param   WebDevEtc\BlogEtc\Baum\Node $node
+   * @param   HessamCMS\Baum\Node $node
    * @param   integer   $nesting
    * @return  array
    */
diff --git a/src/Baum/SetBuilder.php b/src/Baum/SetBuilder.php
index e3b57bb..2a5ba27 100644
--- a/src/Baum/SetBuilder.php
+++ b/src/Baum/SetBuilder.php
@@ -1,15 +1,15 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum;
+namespace HessamCMS\Baum;
 
-use WebDevEtc\BlogEtc\Baum\Helpers\DatabaseHelper as DB;
-use WebDevEtc\BlogEtc\Baum\Node;
+use HessamCMS\Baum\Helpers\DatabaseHelper as DB;
+use HessamCMS\Baum\Node;
 
 class SetBuilder {
 
   /**
   * Node instance for reference
   *
-  * @var \WebDevEtc\BlogEtc\Baum\Node
+  * @var \HessamCMS\Baum\Node
   */
   protected $node = NULL;
 
@@ -21,9 +21,9 @@ class SetBuilder {
   protected $bounds = array();
 
   /**
-   * Create a new \WebDevEtc\BlogEtc\Baum\SetBuilder class instance.
+   * Create a new \HessamCMS\Baum\SetBuilder class instance.
    *
-   * @param   \WebDevEtc\BlogEtc\Baum\Node      $node
+   * @param   \HessamCMS\Baum\Node      $node
    * @return  void
    */
   public function __construct($node) {
@@ -91,7 +91,7 @@ public function rebuildBounds($node, $depth = 0) {
   /**
    * Return all children for the specified node.
    *
-   * @param   WebDevEtc\BlogEtc\Baum\Node $node
+   * @param   HessamCMS\Baum\Node $node
    * @return  Illuminate\Database\Eloquent\Collection
    */
   public function children($node) {
@@ -114,7 +114,7 @@ public function children($node) {
   /**
    * Return an array of the scoped attributes of the supplied node.
    *
-   * @param   WebDevEtc\BlogEtc\Baum\Node $node
+   * @param   HessamCMS\Baum\Node $node
    * @return  array
    */
   protected function scopedAttributes($node) {
@@ -133,7 +133,7 @@ protected function scopedAttributes($node) {
    * Return a string-key for the current scoped attributes. Used for index
    * computing when a scope is defined (acsts as an scope identifier).
    *
-   * @param   WebDevEtc\BlogEtc\Baum\Node $node
+   * @param   HessamCMS\Baum\Node $node
    * @return  string
    */
   protected function scopedKey($node) {
diff --git a/src/Baum/SetMapper.php b/src/Baum/SetMapper.php
index 52f14aa..97d5818 100644
--- a/src/Baum/SetMapper.php
+++ b/src/Baum/SetMapper.php
@@ -1,16 +1,16 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum;
+namespace HessamCMS\Baum;
 
 use \Closure;
 use Illuminate\Support\Contracts\ArrayableInterface;
-use WebDevEtc\BlogEtc\Baum\Node;
+use HessamCMS\Baum\Node;
 
 class SetMapper {
 
   /**
   * Node instance for reference
   *
-  * @var \WebDevEtc\BlogEtc\Baum\Node
+  * @var \HessamCMS\Baum\Node
   */
   protected $node = NULL;
 
@@ -22,9 +22,9 @@ class SetMapper {
   protected $childrenKeyName = 'children';
 
   /**
-   * Create a new \WebDevEtc\BlogEtc\Baum\SetBuilder class instance.
+   * Create a new \HessamCMS\Baum\SetBuilder class instance.
    *
-   * @param   \WebDevEtc\BlogEtc\Baum\Node      $node
+   * @param   \HessamCMS\Baum\Node      $node
    * @return  void
    */
   public function __construct($node, $childrenKeyName = 'children') {
diff --git a/src/Baum/SetValidator.php b/src/Baum/SetValidator.php
index e6a29e3..af36f61 100644
--- a/src/Baum/SetValidator.php
+++ b/src/Baum/SetValidator.php
@@ -1,5 +1,5 @@
 <?php
-namespace WebDevEtc\BlogEtc\Baum;
+namespace HessamCMS\Baum;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 
@@ -8,14 +8,14 @@ class SetValidator {
   /**
   * Node instance for reference
   *
-  * @var \WebDevEtc\BlogEtc\Baum\Node
+  * @var \HessamCMS\Baum\Node
   */
   protected $node = NULL;
 
   /**
-   * Create a new \WebDevEtc\BlogEtc\Baum\SetValidator class instance.
+   * Create a new \HessamCMS\Baum\SetValidator class instance.
    *
-   * @param   \WebDevEtc\BlogEtc\Baum\Node      $node
+   * @param   \HessamCMS\Baum\Node      $node
    * @return  void
    */
   public function __construct($node) {
@@ -207,7 +207,7 @@ protected function groupRootsByScope($roots) {
    * Builds a single string for the given scope columns values. Useful for
    * making array keys for grouping.
    *
-   * @param WebDevEtc\BlogEtc\Baum\Node   $node
+   * @param HessamCMS\Baum\Node   $node
    * @return string
    */
   protected function keyForScope($node) {
diff --git a/src/Captcha/Basic.php b/src/Captcha/Basic.php
index c98c380..343eb24 100644
--- a/src/Captcha/Basic.php
+++ b/src/Captcha/Basic.php
@@ -1,15 +1,15 @@
-<?php namespace WebDevEtc\BlogEtc\Captcha;
+<?php namespace HessamCMS\Captcha;
 
 /**
  * Class Basic
- * @package WebDevEtc\BlogEtc\Captcha
+ * @package HessamCMS\Captcha
  */
 class Basic extends CaptchaAbstract
 {
 
     public function __construct()
     {
-        if (!config("blogetc.captcha.basic_question") || !config("blogetc.captcha.basic_answers")) {
+        if (!config("hessamcms.captcha.basic_question") || !config("hessamcms.captcha.basic_answers")) {
             throw new \DomainException("Invalid question or answers for captcha");
         }
     }
@@ -31,7 +31,7 @@ public function captcha_field_name()
      */
     public function view()
     {
-        return 'blogetc::captcha.basic';
+        return 'hessamcms::captcha.basic';
     }
 
     /**
@@ -44,7 +44,7 @@ public function view()
     public function rules()
     {
         $check_func = function ($attribute, $value, $fail) {
-            $answers = config("blogetc.captcha.basic_answers");
+            $answers = config("hessamcms.captcha.basic_answers");
             // strtolower everything
             $value = strtolower(trim($value));
             $answers = strtolower($answers);
diff --git a/src/Captcha/CaptchaAbstract.php b/src/Captcha/CaptchaAbstract.php
index a614985..a8d440f 100644
--- a/src/Captcha/CaptchaAbstract.php
+++ b/src/Captcha/CaptchaAbstract.php
@@ -1,9 +1,9 @@
-<?php namespace WebDevEtc\BlogEtc\Captcha;
+<?php namespace HessamCMS\Captcha;
 
 use Illuminate\Http\Request;
-use WebDevEtc\BlogEtc\Interfaces\CaptchaInterface;
-use WebDevEtc\BlogEtc\Models\HessamPost;
-use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
+use HessamCMS\Interfaces\CaptchaInterface;
+use HessamCMS\Models\HessamPost;
+use HessamCMS\Models\HessamPostTranslation;
 
 abstract class CaptchaAbstract implements CaptchaInterface
 {
@@ -13,11 +13,11 @@ abstract class CaptchaAbstract implements CaptchaInterface
      * executed when viewing single post
      *
      * @param Request $request
-     * @param HessamPostTranslation $blogEtcPost
+     * @param HessamPostTranslation $hessamCMSPost
      *
      * @return void
      */
-    public function runCaptchaBeforeShowingPosts(Request $request, HessamPostTranslation $blogEtcPost)
+    public function runCaptchaBeforeShowingPosts(Request $request, HessamPostTranslation $hessamCMSPost)
     {
         // no code here to run! Maybe in your subclass you can make use of this?
         /*
@@ -38,11 +38,11 @@ public function runCaptchaBeforeShowingPosts(Request $request, HessamPostTransla
      * executed when posting new comment
      *
      * @param Request $request
-     * @param HessamPost $blogEtcPost
+     * @param HessamPost $hessamCMSPost
      *
      * @return void
      */
-    public function runCaptchaBeforeAddingComment(Request $request, HessamPost $blogEtcPost)
+    public function runCaptchaBeforeAddingComment(Request $request, HessamPost $hessamCMSPost)
     {
         // no code here to run! Maybe in your subclass you can make use of this?
     }
diff --git a/src/Captcha/UsesCaptcha.php b/src/Captcha/UsesCaptcha.php
index 9b3f85d..bcf785f 100644
--- a/src/Captcha/UsesCaptcha.php
+++ b/src/Captcha/UsesCaptcha.php
@@ -1,11 +1,11 @@
-<?php namespace WebDevEtc\BlogEtc\Captcha;
+<?php namespace HessamCMS\Captcha;
 
 /**
  * Trait UsesCaptcha
  *
- * For instantiating the config("blogetc.captcha.captcha_type") object.
+ * For instantiating the config("hessamcms.captcha.captcha_type") object.
  *
- * @package WebDevEtc\BlogEtc\Captcha
+ * @package HessamCMS\Captcha
  */
 trait UsesCaptcha
 {
@@ -15,13 +15,13 @@ trait UsesCaptcha
      */
     private function getCaptchaObject()
     {
-        if (!config("blogetc.captcha.captcha_enabled")) {
+        if (!config("hessamcms.captcha.captcha_enabled")) {
             return null;
         }
 
         // else: captcha is enabled
         /** @var string $captcha_class */
-        $captcha_class = config("blogetc.captcha.captcha_type");
+        $captcha_class = config("hessamcms.captcha.captcha_type");
         return new $captcha_class;
     }
 
diff --git a/src/Config/blogetc.php b/src/Config/hessamcms.php
similarity index 96%
rename from src/Config/blogetc.php
rename to src/Config/hessamcms.php
index 524f90c..a68885b 100755
--- a/src/Config/blogetc.php
+++ b/src/Config/hessamcms.php
@@ -27,7 +27,7 @@
 
 
     'memory_limit' => '2048M', // This is used when uploading images :
-    //                              @ini_set('memory_limit', config("blogetc.memory_limit"));
+    //                              @ini_set('memory_limit', config("hessamcms.memory_limit"));
     //                            See PHP.net for detailso
     //                            Set to false to not set any value.
 
@@ -116,7 +116,7 @@
 
     'captcha' => [
         'captcha_enabled' => true, // true = we should use a captcha, false = turn it off. If comments are disabled this makes no difference.
-        'captcha_type' => \WebDevEtc\BlogEtc\Captcha\Basic::class, // this should be a class that implements the \WebDevEtc\BlogEtc\Interfaces\CaptchaInterface interface
+        'captcha_type' => \HessamCMS\Captcha\Basic::class, // this should be a class that implements the \HessamCMS\Interfaces\CaptchaInterface interface
         'basic_question' => "What is the opposite of white?", // a simple captcha question to always ask (if captcha_type is set to 'basic'
         'basic_answers' => "black,dark", // comma separated list of possible answers. Don't worry about case.
     ],
@@ -142,7 +142,7 @@
         // options:
         //      'built_in' (default, uses own database for comments),
         //      'disqus' (uses https://disqus.com/, please enter further config options below),
-        //      'custom' (will load blogetc::partials.custom_comments, which you can copy to your vendor view dir to customise
+        //      'custom' (will load hessamcms::partials.custom_comments, which you can copy to your vendor view dir to customise
         //      'disabled' (turn comments off)
         'type_of_comments_to_show' => 'built_in', // default: built_in
 
diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index b1d05d7..32ed4a3 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -1,32 +1,32 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use WebDevEtc\BlogEtc\Interfaces\BaseRequestInterface;
-use WebDevEtc\BlogEtc\Events\BlogPostAdded;
-use WebDevEtc\BlogEtc\Events\BlogPostEdited;
-use WebDevEtc\BlogEtc\Events\BlogPostWillBeDeleted;
-use WebDevEtc\BlogEtc\Helpers;
-use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
-use WebDevEtc\BlogEtc\Middleware\PackageSetup;
-use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
-use WebDevEtc\BlogEtc\Models\HessamPost;
-use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
-use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
-use WebDevEtc\BlogEtc\Requests\CreateBlogEtcPostRequest;
-use WebDevEtc\BlogEtc\Requests\CreateHessamPostToggleRequest;
-use WebDevEtc\BlogEtc\Requests\DeleteBlogEtcPostRequest;
-use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcPostRequest;
-use WebDevEtc\BlogEtc\Traits\UploadFileTrait;
+use HessamCMS\Interfaces\BaseRequestInterface;
+use HessamCMS\Events\BlogPostAdded;
+use HessamCMS\Events\BlogPostEdited;
+use HessamCMS\Events\BlogPostWillBeDeleted;
+use HessamCMS\Helpers;
+use HessamCMS\Middleware\LoadLanguage;
+use HessamCMS\Middleware\PackageSetup;
+use HessamCMS\Middleware\UserCanManageBlogPosts;
+use HessamCMS\Models\HessamCategoryTranslation;
+use HessamCMS\Models\HessamLanguage;
+use HessamCMS\Models\HessamPost;
+use HessamCMS\Models\HessamPostTranslation;
+use HessamCMS\Models\HessamUploadedPhoto;
+use HessamCMS\Requests\CreateHessamCMSPostRequest;
+use HessamCMS\Requests\CreateHessamPostToggleRequest;
+use HessamCMS\Requests\DeleteHessamCMSPostRequest;
+use HessamCMS\Requests\UpdateHessamCMSPostRequest;
+use HessamCMS\Traits\UploadFileTrait;
 
 /**
  * Class HessamAdminController
- * @package WebDevEtc\BlogEtc\Controllers
+ * @package HessamCMS\Controllers
  */
 class HessamAdminController extends Controller
 {
@@ -41,8 +41,8 @@ public function __construct()
         $this->middleware(LoadLanguage::class);
         $this->middleware(PackageSetup::class);
 
-        if (!is_array(config("blogetc"))) {
-            throw new \RuntimeException('The config/blogetc.php does not exist. Publish the vendor files for the BlogEtc package by running the php artisan publish:vendor command');
+        if (!is_array(config("hessamcms"))) {
+            throw new \RuntimeException('The config/hessamcms.php does not exist. Publish the vendor files for the HessamCMS package by running the php artisan publish:vendor command');
         }
     }
 
@@ -58,7 +58,7 @@ public function index(Request $request)
         $posts = HessamPostTranslation::orderBy("post_id", "desc")->where('lang_id', $language_id)
             ->paginate(10);
 
-        return view("blogetc_admin::index", ['post_translations'=>$posts]);
+        return view("hessamcms_admin::index", ['post_translations'=>$posts]);
     }
 
     /**
@@ -71,12 +71,12 @@ public function create_post(Request $request)
         $language_list = HessamLanguage::where('active',true)->get();
         $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
-        return view("blogetc_admin::posts.add_post", [
+        return view("hessamcms_admin::posts.add_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $language_id,
-            'post' => new \WebDevEtc\BlogEtc\Models\HessamPost(),
-            'post_translation' => new \WebDevEtc\BlogEtc\Models\HessamPostTranslation(),
+            'post' => new \HessamCMS\Models\HessamPost(),
+            'post_translation' => new \HessamCMS\Models\HessamPostTranslation(),
             'post_id' => -1
         ]);
     }
@@ -84,11 +84,11 @@ public function create_post(Request $request)
     /**
      * Save a new post - this method is called whenever add post button is clicked
      *
-     * @param CreateBlogEtcPostRequest $request
+     * @param CreateHessamCMSPostRequest $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws \Exception
      */
-    public function store_post(CreateBlogEtcPostRequest $request)
+    public function store_post(CreateHessamCMSPostRequest $request)
     {
         $new_blog_post = null;
         $translation = HessamPostTranslation::where(
@@ -137,7 +137,7 @@ public function store_post(CreateBlogEtcPostRequest $request)
             event(new BlogPostAdded($new_blog_post));
         }
 
-        return redirect( route('blogetc.admin.index') );
+        return redirect( route('hessamcms.admin.index') );
     }
 
     /**
@@ -211,7 +211,7 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
             $translation = new HessamPostTranslation();
         }
 
-        return view("blogetc_admin::posts.add_post", [
+        return view("hessamcms_admin::posts.add_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $request['selected_lang'],
@@ -242,7 +242,7 @@ public function edit_post( $blogPostId , Request $request)
         $language_list = HessamLanguage::where('active',true)->get();
         $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
-        return view("blogetc_admin::posts.edit_post", [
+        return view("hessamcms_admin::posts.edit_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $language_id,
@@ -274,7 +274,7 @@ public function edit_post_toggle( $blogPostId , Request $request)
         $language_list = HessamLanguage::where('active',true)->get();
         $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
-        return view("blogetc_admin::posts.edit_post", [
+        return view("hessamcms_admin::posts.edit_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $request['selected_lang'],
@@ -286,12 +286,12 @@ public function edit_post_toggle( $blogPostId , Request $request)
     /**
      * Save changes to a post
      *
-     * @param UpdateBlogEtcPostRequest $request
+     * @param UpdateHessamCMSPostRequest $request
      * @param $blogPostId
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws \Exception
      */
-    public function update_post(UpdateBlogEtcPostRequest $request, $blogPostId)
+    public function update_post(UpdateHessamCMSPostRequest $request, $blogPostId)
     {
         $new_blog_post = HessamPost::findOrFail($blogPostId);
         $translation = HessamPostTranslation::where(
@@ -334,14 +334,14 @@ public function update_post(UpdateBlogEtcPostRequest $request, $blogPostId)
             event(new BlogPostAdded($new_blog_post));
         }
 
-        return redirect( route('blogetc.admin.index') );
+        return redirect( route('hessamcms.admin.index') );
     }
 
     public function remove_photo($postSlug)
     {
         $post = HessamPost::where("slug", $postSlug)->firstOrFail();
 
-        $path = public_path('/' . config("blogetc.blog_upload_dir"));
+        $path = public_path('/' . config("hessamcms.blog_upload_dir"));
         if (!$this->checked_blog_image_dir_is_writable) {
             if (!is_writable($path)) {
                 throw new \RuntimeException("Image destination path is not writable ($path)");
@@ -375,11 +375,11 @@ public function remove_photo($postSlug)
     /**
      * Delete a post
      *
-     * @param DeleteBlogEtcPostRequest $request
+     * @param DeleteHessamCMSPostRequest $request
      * @param $blogPostId
      * @return mixed
      */
-    public function destroy_post(DeleteBlogEtcPostRequest $request, $blogPostId)
+    public function destroy_post(DeleteHessamCMSPostRequest $request, $blogPostId)
     {
         $post = HessamPost::findOrFail($blogPostId);
         //archive deleted post
@@ -392,7 +392,7 @@ public function destroy_post(DeleteBlogEtcPostRequest $request, $blogPostId)
 
         Helpers::flash_message("Post successfully deleted!");
 
-        return redirect( route('blogetc.admin.index') );
+        return redirect( route('hessamcms.admin.index') );
     }
 
     /**
@@ -405,7 +405,7 @@ public function destroy_post(DeleteBlogEtcPostRequest $request, $blogPostId)
      */
     protected function processUploadedImages(BaseRequestInterface $request, HessamPostTranslation $new_blog_post)
     {
-        if (!config("blogetc.image_upload_enabled")) {
+        if (!config("hessamcms.image_upload_enabled")) {
             // image upload was disabled
             return;
         }
@@ -416,7 +416,7 @@ protected function processUploadedImages(BaseRequestInterface $request, HessamPo
         $uploaded_image_details = [];
 
 
-        foreach ((array)config('blogetc.image_sizes') as $size => $image_size_details) {
+        foreach ((array)config('hessamcms.image_sizes') as $size => $image_size_details) {
 
             if ($image_size_details['enabled'] && $photo = $request->get_image_file($size)) {
                 // this image size is enabled, and
@@ -430,7 +430,7 @@ protected function processUploadedImages(BaseRequestInterface $request, HessamPo
         }
 
         // store the image upload.
-        // todo: link this to the blogetc_post row.
+        // todo: link this to the hessamcms_post row.
         if (count(array_filter($uploaded_image_details))>0) {
             HessamUploadedPhoto::create([
                 'source' => "BlogFeaturedImage",
diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
index dc61271..bdddfec 100644
--- a/src/Controllers/HessamAdminSetupController.php
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use Illuminate\Http\Request;
-use WebDevEtc\BlogEtc\Helpers;
-use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
-use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\HessamConfiguration;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
+use HessamCMS\Helpers;
+use HessamCMS\Middleware\LoadLanguage;
+use HessamCMS\Middleware\UserCanManageBlogPosts;
+use HessamCMS\Models\HessamConfiguration;
+use HessamCMS\Models\HessamLanguage;
 
 /**
  * Class HessamAdminSetupController
@@ -23,8 +23,8 @@ public function __construct()
         $this->middleware(UserCanManageBlogPosts::class);
         $this->middleware(LoadLanguage::class);
 
-        if (!is_array(config("blogetc"))) {
-            throw new \RuntimeException('The config/blogetc.php does not exist. Publish the vendor files for the BlogEtc package by running the php artisan publish:vendor command');
+        if (!is_array(config("hessamcms"))) {
+            throw new \RuntimeException('The config/hessamcms.php does not exist. Publish the vendor files for the HessamCMS package by running the php artisan publish:vendor command');
         }
     }
 
@@ -35,12 +35,12 @@ public function __construct()
      */
     public function index(Request $request)
     {
-        return view("blogetc_admin::setup.setup");
+        return view("hessamcms_admin::setup.setup");
     }
 
     public function setup_submit(Request $request){
         if ($request['locale'] == null){
-            return redirect( route('blogetc.admin.setup_submit') );
+            return redirect( route('hessamcms.admin.setup_submit') );
         }
         $language = new HessamLanguage();
         $language->active = $request['active'];
@@ -53,6 +53,6 @@ public function setup_submit(Request $request){
         HessamConfiguration::set('INITIAL_SETUP', true);
 
         Helpers::flash_message("Language: " . $language->name . " has been added.");
-        return redirect( route('blogetc.admin.index') );
+        return redirect( route('hessamcms.admin.index') );
     }
 }
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index c0446b4..9fbc41a 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -1,25 +1,25 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use WebDevEtc\BlogEtc\Events\CategoryAdded;
-use WebDevEtc\BlogEtc\Events\CategoryEdited;
-use WebDevEtc\BlogEtc\Events\CategoryWillBeDeleted;
-use WebDevEtc\BlogEtc\Helpers;
-use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
-use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\HessamCategory;
-use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
-use WebDevEtc\BlogEtc\Requests\DeleteBlogEtcCategoryRequest;
-use WebDevEtc\BlogEtc\Requests\StoreBlogEtcCategoryRequest;
-use WebDevEtc\BlogEtc\Requests\UpdateBlogEtcCategoryRequest;
+use HessamCMS\Events\CategoryAdded;
+use HessamCMS\Events\CategoryEdited;
+use HessamCMS\Events\CategoryWillBeDeleted;
+use HessamCMS\Helpers;
+use HessamCMS\Middleware\LoadLanguage;
+use HessamCMS\Middleware\UserCanManageBlogPosts;
+use HessamCMS\Models\HessamCategory;
+use HessamCMS\Models\HessamCategoryTranslation;
+use HessamCMS\Models\HessamLanguage;
+use HessamCMS\Requests\DeleteHessamCMSCategoryRequest;
+use HessamCMS\Requests\StoreHessamCMSCategoryRequest;
+use HessamCMS\Requests\UpdateHessamCMSCategoryRequest;
 
 /**
  * Class HessamCategoryAdminController
- * @package WebDevEtc\BlogEtc\Controllers
+ * @package HessamCMS\Controllers
  */
 class HessamCategoryAdminController extends Controller
 {
@@ -41,7 +41,7 @@ public function __construct()
     public function index(Request $request){
         $language_id = $request->cookie('language_id');
         $categories = HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->paginate(25);
-        return view("blogetc_admin::categories.index",[
+        return view("hessamcms_admin::categories.index",[
             'categories' => $categories,
             'language_id' => $language_id
         ]);
@@ -63,9 +63,9 @@ public function create_category(Request $request){
         HessamCategory::loadSiblingsWithList($rootList);
 
 
-        return view("blogetc_admin::categories.add_category",[
-            'category' => new \WebDevEtc\BlogEtc\Models\HessamCategory(),
-            'category_translation' => new \WebDevEtc\BlogEtc\Models\HessamCategoryTranslation(),
+        return view("hessamcms_admin::categories.add_category",[
+            'category' => new \HessamCMS\Models\HessamCategory(),
+            'category_translation' => new \HessamCMS\Models\HessamCategoryTranslation(),
             'category_tree' => $cat_list,
             'cat_roots' => $rootList,
             'language_id' => $language_id,
@@ -76,7 +76,7 @@ public function create_category(Request $request){
     /**
      * Store a new category
      *
-     * @param StoreBlogEtcCategoryRequest $request
+     * @param StoreHessamCMSCategoryRequest $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      *
      * This controller is totally REST controller
@@ -139,7 +139,7 @@ public function edit_category($categoryId, Request $request){
             ]
         )->first();
 
-        return view("blogetc_admin::categories.edit_category",[
+        return view("hessamcms_admin::categories.edit_category",[
             'category' => $category,
             'category_translation' => $cat_trans,
             'categories_list' => HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->get(),
@@ -151,11 +151,11 @@ public function edit_category($categoryId, Request $request){
     /**
      * Save submitted changes
      *
-     * @param UpdateBlogEtcCategoryRequest $request
+     * @param UpdateHessamCMSCategoryRequest $request
      * @param $categoryId
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function update_category(UpdateBlogEtcCategoryRequest $request, $categoryId){
+    public function update_category(UpdateHessamCMSCategoryRequest $request, $categoryId){
         /** @var HessamCategory $category */
         $category = HessamCategory::findOrFail($categoryId);
         $language_id = $request->cookie('language_id');
@@ -178,11 +178,11 @@ public function update_category(UpdateBlogEtcCategoryRequest $request, $category
     /**
      * Delete the category
      *
-     * @param DeleteBlogEtcCategoryRequest $request
+     * @param DeleteHessamCMSCategoryRequest $request
      * @param $categoryId
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function destroy_category(DeleteBlogEtcCategoryRequest $request, $categoryId){
+    public function destroy_category(DeleteHessamCMSCategoryRequest $request, $categoryId){
 
         /* Please keep this in, so code inspectiwons don't say $request was unused. Of course it might now get marked as left/right parts are equal */
         $request=$request;
@@ -191,14 +191,14 @@ public function destroy_category(DeleteBlogEtcCategoryRequest $request, $categor
         $children = $category->children()->get();
         if (sizeof($children) > 0) {
             Helpers::flash_message("This category could not be deleted it has some sub-categories. First try to change parent category of subs.");
-            return redirect(route('blogetc.admin.categories.index'));
+            return redirect(route('hessamcms.admin.categories.index'));
         }
 
         event(new CategoryWillBeDeleted($category));
         $category->delete();
 
         Helpers::flash_message("Category successfully deleted!");
-        return redirect( route('blogetc.admin.categories.index') );
+        return redirect( route('hessamcms.admin.categories.index') );
     }
 
 }
diff --git a/src/Controllers/HessamCommentWriterController.php b/src/Controllers/HessamCommentWriterController.php
index 3fe02d0..67154c8 100755
--- a/src/Controllers/HessamCommentWriterController.php
+++ b/src/Controllers/HessamCommentWriterController.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Auth;
-use WebDevEtc\BlogEtc\Captcha\CaptchaAbstract;
-use WebDevEtc\BlogEtc\Captcha\UsesCaptcha;
-use WebDevEtc\BlogEtc\Events\CommentAdded;
-use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
-use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\HessamComment;
-use WebDevEtc\BlogEtc\Models\HessamPost;
-use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
-use WebDevEtc\BlogEtc\Requests\AddNewCommentRequest;
+use HessamCMS\Captcha\CaptchaAbstract;
+use HessamCMS\Captcha\UsesCaptcha;
+use HessamCMS\Events\CommentAdded;
+use HessamCMS\Middleware\LoadLanguage;
+use HessamCMS\Middleware\UserCanManageBlogPosts;
+use HessamCMS\Models\HessamComment;
+use HessamCMS\Models\HessamPost;
+use HessamCMS\Models\HessamPostTranslation;
+use HessamCMS\Requests\AddNewCommentRequest;
 
 /**
  * Class HessamCommentWriterController
- * @package WebDevEtc\BlogEtc\Controllers
+ * @package HessamCMS\Controllers
  */
 class HessamCommentWriterController extends Controller
 {
@@ -41,7 +41,7 @@ public function __construct()
     public function addNewComment(AddNewCommentRequest $request, $locale, $blog_post_slug)
     {
 
-        if (config("blogetc.comments.type_of_comments_to_show", "built_in") !== 'built_in') {
+        if (config("hessamcms.comments.type_of_comments_to_show", "built_in") !== 'built_in') {
             throw new \RuntimeException("Built in comments are disabled");
         }
 
@@ -58,7 +58,7 @@ public function addNewComment(AddNewCommentRequest $request, $locale, $blog_post
 
         $new_comment = $this->createNewComment($request, $blog_post);
 
-        return view("blogetc::saved_comment", [
+        return view("hessamcms::saved_comment", [
             'captcha' => $captcha,
             'blog_post' => $post_translation,
             'new_comment' => $new_comment
@@ -75,20 +75,20 @@ protected function createNewComment(AddNewCommentRequest $request, $blog_post)
     {
         $new_comment = new HessamComment($request->all());
 
-        if (config("blogetc.comments.save_ip_address")) {
+        if (config("hessamcms.comments.save_ip_address")) {
             $new_comment->ip = $request->ip();
         }
-        if (config("blogetc.comments.ask_for_author_website")) {
+        if (config("hessamcms.comments.ask_for_author_website")) {
             $new_comment->author_website = $request->get('author_website');
         }
-        if (config("blogetc.comments.ask_for_author_website")) {
+        if (config("hessamcms.comments.ask_for_author_website")) {
             $new_comment->author_email = $request->get('author_email');
         }
-        if (config("blogetc.comments.save_user_id_if_logged_in", true) && Auth::check()) {
+        if (config("hessamcms.comments.save_user_id_if_logged_in", true) && Auth::check()) {
             $new_comment->user_id = Auth::user()->id;
         }
 
-        $new_comment->approved = config("blogetc.comments.auto_approve_comments", true) ? true : false;
+        $new_comment->approved = config("hessamcms.comments.auto_approve_comments", true) ? true : false;
 
         $blog_post->comments()->save($new_comment);
 
diff --git a/src/Controllers/HessamCommentsAdminController.php b/src/Controllers/HessamCommentsAdminController.php
index 3185b76..df6ae13 100755
--- a/src/Controllers/HessamCommentsAdminController.php
+++ b/src/Controllers/HessamCommentsAdminController.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use WebDevEtc\BlogEtc\Events\CommentApproved;
-use WebDevEtc\BlogEtc\Events\CommentWillBeDeleted;
-use WebDevEtc\BlogEtc\Helpers;
-use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
-use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\HessamComment;
+use HessamCMS\Events\CommentApproved;
+use HessamCMS\Events\CommentWillBeDeleted;
+use HessamCMS\Helpers;
+use HessamCMS\Middleware\LoadLanguage;
+use HessamCMS\Middleware\UserCanManageBlogPosts;
+use HessamCMS\Models\HessamComment;
 
 /**
  * Class HessamCommentsAdminController
- * @package WebDevEtc\BlogEtc\Controllers
+ * @package HessamCMS\Controllers
  */
 class HessamCommentsAdminController extends Controller
 {
@@ -43,7 +43,7 @@ public function index(Request $request)
         }
 
         $comments = $comments->paginate(100);
-        return view("blogetc_admin::comments.index")
+        return view("hessamcms_admin::comments.index")
             ->withComments($comments
             );
     }
diff --git a/src/Controllers/HessamImageUploadController.php b/src/Controllers/HessamImageUploadController.php
index 482029b..d7911ba 100755
--- a/src/Controllers/HessamImageUploadController.php
+++ b/src/Controllers/HessamImageUploadController.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
-use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\HessamUploadedPhoto;
+use HessamCMS\Middleware\LoadLanguage;
+use HessamCMS\Middleware\UserCanManageBlogPosts;
+use HessamCMS\Models\HessamUploadedPhoto;
 use File;
-use WebDevEtc\BlogEtc\Requests\UploadImageRequest;
-use WebDevEtc\BlogEtc\Traits\UploadFileTrait;
+use HessamCMS\Requests\UploadImageRequest;
+use HessamCMS\Traits\UploadFileTrait;
 
 /**
  * Class HessamAdminController
- * @package WebDevEtc\BlogEtc\Controllers
+ * @package HessamCMS\Controllers
  */
 class HessamImageUploadController extends Controller
 {
@@ -28,13 +28,13 @@ public function __construct()
         $this->middleware(UserCanManageBlogPosts::class);
         $this->middleware(LoadLanguage::class);
 
-        if (!is_array(config("blogetc"))) {
-            throw new \RuntimeException('The config/blogetc.php does not exist. Publish the vendor files for the BlogEtc package by running the php artisan publish:vendor command');
+        if (!is_array(config("hessamcms"))) {
+            throw new \RuntimeException('The config/hessamcms.php does not exist. Publish the vendor files for the HessamCMS package by running the php artisan publish:vendor command');
         }
 
 
-        if (!config("blogetc.image_upload_enabled")) {
-            throw new \RuntimeException("The blogetc.php config option has not enabled image uploading");
+        if (!config("hessamcms.image_upload_enabled")) {
+            throw new \RuntimeException("The hessamcms.php config option has not enabled image uploading");
         }
 
 
@@ -48,7 +48,7 @@ public function __construct()
 
     public function index()
     {
-        return view("blogetc_admin::imageupload.index", ['uploaded_photos' => HessamUploadedPhoto::orderBy("id", "desc")->paginate(10)]);
+        return view("hessamcms_admin::imageupload.index", ['uploaded_photos' => HessamUploadedPhoto::orderBy("id", "desc")->paginate(10)]);
     }
 
     /**
@@ -58,7 +58,7 @@ public function index()
      */
     public function create()
     {
-        return view("blogetc_admin::imageupload.create", []);
+        return view("hessamcms_admin::imageupload.create", []);
     }
 
     /**
@@ -72,7 +72,7 @@ public function store(UploadImageRequest $request)
     {
         $processed_images = $this->processUploadedImages($request);
 
-        return view("blogetc_admin::imageupload.uploaded", ['images' => $processed_images]);
+        return view("hessamcms_admin::imageupload.uploaded", ['images' => $processed_images]);
     }
 
     /**
@@ -95,13 +95,13 @@ protected function processUploadedImages(UploadImageRequest $request)
         $sizes_to_upload = $request->get("sizes_to_upload");
 
         // now upload a full size - this is a special case, not in the config file. We only store full size images in this class, not as part of the featured blog image uploads.
-        if (isset($sizes_to_upload['blogetc_full_size']) && $sizes_to_upload['blogetc_full_size'] === 'true') {
+        if (isset($sizes_to_upload['hessamcms_full_size']) && $sizes_to_upload['hessamcms_full_size'] === 'true') {
 
-            $uploaded_image_details['blogetc_full_size'] = $this->UploadAndResize(null, $request->get("image_title"), 'fullsize', $photo);
+            $uploaded_image_details['hessamcms_full_size'] = $this->UploadAndResize(null, $request->get("image_title"), 'fullsize', $photo);
 
         }
 
-        foreach ((array)config('blogetc.image_sizes') as $size => $image_size_details) {
+        foreach ((array)config('hessamcms.image_sizes') as $size => $image_size_details) {
 
             if (!isset($sizes_to_upload[$size]) || !$sizes_to_upload[$size] || !$image_size_details['enabled']) {
                 continue;
diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/HessamLanguageAdminController.php
index 19a243d..dacc754 100644
--- a/src/Controllers/HessamLanguageAdminController.php
+++ b/src/Controllers/HessamLanguageAdminController.php
@@ -1,14 +1,14 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use WebDevEtc\BlogEtc\Helpers;
-use WebDevEtc\BlogEtc\Middleware\LoadLanguage;
-use WebDevEtc\BlogEtc\Middleware\UserCanManageBlogPosts;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
+use HessamCMS\Helpers;
+use HessamCMS\Middleware\LoadLanguage;
+use HessamCMS\Middleware\UserCanManageBlogPosts;
+use HessamCMS\Models\HessamLanguage;
 
 class HessamLanguageAdminController extends Controller
 {
@@ -24,19 +24,19 @@ public function __construct()
 
     public function index(){
         $language_list = HessamLanguage::all();
-        return view("blogetc_admin::languages.index",[
+        return view("hessamcms_admin::languages.index",[
             'language_list' => $language_list
         ]);
     }
 
     public function create_language(){
-        return view("blogetc_admin::languages.add_language");
+        return view("hessamcms_admin::languages.add_language");
     }
 
     public function store_language(Request $request){
         if ($request['locale'] == null){
             Helpers::flash_message("Select a language!");
-            return view("blogetc_admin::languages.add_language");
+            return view("hessamcms_admin::languages.add_language");
         }
         $language = new HessamLanguage();
         $language->active = $request['active'];
@@ -48,7 +48,7 @@ public function store_language(Request $request){
         $language->save();
 
         Helpers::flash_message("Language: " . $language->name . " has been added.");
-        return redirect( route('blogetc.admin.languages.index') );
+        return redirect( route('hessamcms.admin.languages.index') );
     }
 
     public function destroy_language(Request $request, $languageId){
@@ -58,10 +58,10 @@ public function destroy_language(Request $request, $languageId){
 //        event(new CategoryWillBeDeleted($category));
             $language->delete();
             Helpers::flash_message("The language is successfully deleted!");
-            return redirect( route('blogetc.admin.languages.index') );
+            return redirect( route('hessamcms.admin.languages.index') );
         } catch (\Illuminate\Database\QueryException $e) {
             Helpers::flash_message("You can not delete this language, because it's used in posts or categoies.");
-            return redirect( route('blogetc.admin.languages.index') );
+            return redirect( route('hessamcms.admin.languages.index') );
         }
     }
 
@@ -78,6 +78,6 @@ public function toggle_language(Request $request, $languageId){
         //event
 
         Helpers::flash_message("Language: " . $language->name . " has been disabled.");
-        return redirect( route('blogetc.admin.languages.index') );
+        return redirect( route('hessamcms.admin.languages.index') );
     }
 }
diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index b3008c0..e832920 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Swis\Laravel\Fulltext\Search;
-use WebDevEtc\BlogEtc\Captcha\UsesCaptcha;
-use WebDevEtc\BlogEtc\Middleware\DetectLanguage;
-use WebDevEtc\BlogEtc\Models\HessamCategory;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
-use WebDevEtc\BlogEtc\Models\HessamPost;
-use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
+use HessamCMS\Captcha\UsesCaptcha;
+use HessamCMS\Middleware\DetectLanguage;
+use HessamCMS\Models\HessamCategory;
+use HessamCMS\Models\HessamLanguage;
+use HessamCMS\Models\HessamPost;
+use HessamCMS\Models\HessamPostTranslation;
 
 /**
  * Class HessamReaderController
  * All of the main public facing methods for viewing blog content (index, single posts)
- * @package WebDevEtc\BlogEtc\Controllers
+ * @package HessamCMS\Controllers
  */
 class HessamReaderController extends Controller
 {
@@ -36,7 +36,7 @@ public function __construct()
      */
     public function index($locale, $category_slug = null, Request $request)
     {
-        // the published_at + is_published are handled by BlogEtcPublishedScope, and don't take effect if the logged in user can manageb log posts
+        // the published_at + is_published are handled by HessamCMSPublishedScope, and don't take effect if the logged in user can manageb log posts
 
         //todo
         $title = 'Blog Page'; // default title...
@@ -49,7 +49,7 @@ public function index($locale, $category_slug = null, Request $request)
 
             // at the moment we handle this special case (viewing a category) by hard coding in the following two lines.
             // You can easily override this in the view files.
-            \View::share('blogetc_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
+            \View::share('hessamcms_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
             $title = 'Posts in ' . $category->category_name . " category"; // hardcode title here...
         } else {
             $posts = HessamPostTranslation::query();
@@ -59,20 +59,20 @@ public function index($locale, $category_slug = null, Request $request)
 //            ->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'))
 //            ->where('lang_id', $request->get("lang_id"))
 //            ->orderBy("posted_at", "desc")
-//            ->paginate(config("blogetc.per_page", 10));
+//            ->paginate(config("hessamcms.per_page", 10));
 
         $posts = HessamPostTranslation::where('lang_id', $request->get("lang_id"))
             ->with(['post' => function($query){
                 $query->where("is_published" , '=' , true);
                 $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
                 $query->orderBy("posted_at", "desc");
-            }])->paginate(config("blogetc.per_page", 10));
+            }])->paginate(config("hessamcms.per_page", 10));
 
         //load category hierarchy
         $rootList = HessamCategory::roots()->get();
         HessamCategory::loadSiblingsWithList($rootList);
 
-        return view("blogetc::index", [
+        return view("hessamcms::index", [
             'locale' => $request->get("locale"),
             'category_chain' => $categoryChain,
             'categories' => $rootList,
@@ -90,7 +90,7 @@ public function index($locale, $category_slug = null, Request $request)
      */
     public function search(Request $request)
     {
-        if (!config("blogetc.search.search_enabled")) {
+        if (!config("hessamcms.search.search_enabled")) {
             throw new \Exception("Search is disabled");
         }
         $query = $request->get("s");
@@ -102,7 +102,7 @@ public function search(Request $request)
         $rootList = HessamCategory::roots()->get();
         HessamCategory::loadSiblingsWithList($rootList);
 
-        return view("blogetc::search", [
+        return view("hessamcms::search", [
                 'categories' => $rootList,
                 'query' => $query,
                 'search_results' => $search_results]
@@ -132,7 +132,7 @@ public function view_category($hierarchy)
      */
     public function viewSinglePost(Request $request, $locale, $blogPostSlug)
     {
-        // the published_at + is_published are handled by BlogEtcPublishedScope, and don't take effect if the logged in user can manage log posts
+        // the published_at + is_published are handled by HessamCMSPublishedScope, and don't take effect if the logged in user can manage log posts
         $blog_post = HessamPostTranslation::where([
             ["slug", "=", $blogPostSlug],
             ['lang_id', "=" , $request->get("lang_id")]
@@ -142,7 +142,7 @@ public function viewSinglePost(Request $request, $locale, $blogPostSlug)
             $captcha->runCaptchaBeforeShowingPosts($request, $blog_post);
         }
 
-        return view("blogetc::single_post", [
+        return view("hessamcms::single_post", [
             'post' => $blog_post,
             // the default scope only selects approved comments, ordered by id
             'comments' => $blog_post->post->comments()
diff --git a/src/Controllers/HessamRssFeedController.php b/src/Controllers/HessamRssFeedController.php
index 7472ccf..d97a49b 100755
--- a/src/Controllers/HessamRssFeedController.php
+++ b/src/Controllers/HessamRssFeedController.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Controllers;
+namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Laravelium\Feed\Feed;
-use WebDevEtc\BlogEtc\Middleware\DetectLanguage;
-use WebDevEtc\BlogEtc\Models\HessamPost;
-use WebDevEtc\BlogEtc\Requests\FeedRequest;
+use HessamCMS\Middleware\DetectLanguage;
+use HessamCMS\Models\HessamPost;
+use HessamCMS\Requests\FeedRequest;
 
 /**
  * Class HessamRssFeedController.php
  * All RSS feed viewing methods
- * @package WebDevEtc\BlogEtc\Controllers
+ * @package HessamCMS\Controllers
  */
 class HessamRssFeedController extends Controller
 {
@@ -29,13 +29,13 @@ public function __construct()
     protected function setupFeed(Feed $feed, $posts)
     {
         $feed->title = config("app.name") . ' Blog';
-        $feed->description = config("blogetc.rssfeed.description", "Our blog RSS feed");
-        $feed->link = route('blogetc.index');
+        $feed->description = config("hessamcms.rssfeed.description", "Our blog RSS feed");
+        $feed->link = route('hessamcms.index');
         $feed->setDateFormat('carbon');
         $feed->pubdate = isset($posts[0]) ? $posts[0]->posted_at : Carbon::now()->subYear(10);
-        $feed->lang = config("blogetc.rssfeed.language", "en");
-        $feed->setShortening(config("blogetc.rssfeed.should_shorten_text", true)); // true or false
-        $feed->setTextLimit(config("blogetc.rssfeed.text_limit", 100));
+        $feed->lang = config("hessamcms.rssfeed.language", "en");
+        $feed->setShortening(config("hessamcms.rssfeed.should_shorten_text", true)); // true or false
+        $feed->setTextLimit(config("hessamcms.rssfeed.text_limit", 100));
     }
 
 
@@ -45,7 +45,7 @@ protected function setupFeed(Feed $feed, $posts)
     protected function makeFreshFeed(Feed $feed)
     {
         $posts = HessamPost::orderBy("posted_at", "desc")
-            ->limit(config("blogetc.rssfeed.posts_to_show_in_rss_feed", 10))
+            ->limit(config("hessamcms.rssfeed.posts_to_show_in_rss_feed", 10))
             ->with("author")
             ->get();
 
@@ -79,8 +79,8 @@ public function feed(FeedRequest $request, Feed $feed)
         $user_or_guest = \Auth::check() ? \Auth::user()->id : 'guest';
 
         $feed->setCache(
-            config("blogetc.rssfeed.cache_in_minutes", 60),
-            "blogetc-" . $request->getFeedType() . $user_or_guest
+            config("hessamcms.rssfeed.cache_in_minutes", 60),
+            "hessamcms-" . $request->getFeedType() . $user_or_guest
         );
 
         if (!$feed->isCached()) {
diff --git a/src/Events/BlogPostAdded.php b/src/Events/BlogPostAdded.php
index 081a6fc..bbdd79c 100644
--- a/src/Events/BlogPostAdded.php
+++ b/src/Events/BlogPostAdded.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamPost;
+use HessamCMS\Models\HessamPost;
 
 /**
  * Class BlogPostAdded
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class BlogPostAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamPost */
-    public $blogEtcPost;
+    public $hessamCMSPost;
 
     /**
      * BlogPostAdded constructor.
-     * @param HessamPost $blogEtcPost
+     * @param HessamPost $hessamCMSPost
      */
-    public function __construct(HessamPost $blogEtcPost)
+    public function __construct(HessamPost $hessamCMSPost)
     {
-        $this->blogEtcPost=$blogEtcPost;
+        $this->hessamCMSPost=$hessamCMSPost;
     }
 
 }
diff --git a/src/Events/BlogPostEdited.php b/src/Events/BlogPostEdited.php
index c19f366..24b3152 100644
--- a/src/Events/BlogPostEdited.php
+++ b/src/Events/BlogPostEdited.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamPost;
+use HessamCMS\Models\HessamPost;
 
 /**
  * Class BlogPostEdited
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class BlogPostEdited
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamPost */
-    public $blogEtcPost;
+    public $hessamCMSPost;
 
     /**
      * BlogPostEdited constructor.
-     * @param HessamPost $blogEtcPost
+     * @param HessamPost $hessamCMSPost
      */
-    public function __construct(HessamPost $blogEtcPost)
+    public function __construct(HessamPost $hessamCMSPost)
     {
-        $this->blogEtcPost=$blogEtcPost;
+        $this->hessamCMSPost=$hessamCMSPost;
     }
 
 }
diff --git a/src/Events/BlogPostWillBeDeleted.php b/src/Events/BlogPostWillBeDeleted.php
index 3770200..402dc5b 100644
--- a/src/Events/BlogPostWillBeDeleted.php
+++ b/src/Events/BlogPostWillBeDeleted.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamPost;
+use HessamCMS\Models\HessamPost;
 
 /**
  * Class BlogPostWillBeDeleted
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class BlogPostWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamPost */
-    public $blogEtcPost;
+    public $hessamCMSPost;
 
     /**
      * BlogPostWillBeDeleted constructor.
-     * @param HessamPost $blogEtcPost
+     * @param HessamPost $hessamCMSPost
      */
-    public function __construct(HessamPost $blogEtcPost)
+    public function __construct(HessamPost $hessamCMSPost)
     {
-        $this->blogEtcPost=$blogEtcPost;
+        $this->hessamCMSPost=$hessamCMSPost;
     }
 
 }
diff --git a/src/Events/CategoryAdded.php b/src/Events/CategoryAdded.php
index 0c9f2fb..5cf14e0 100644
--- a/src/Events/CategoryAdded.php
+++ b/src/Events/CategoryAdded.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamCategory;
-use WebDevEtc\BlogEtc\Models\HessamCategoryTranslation;
+use HessamCMS\Models\HessamCategory;
+use HessamCMS\Models\HessamCategoryTranslation;
 
 /**
  * Class CategoryAdded
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class CategoryAdded
 {
diff --git a/src/Events/CategoryEdited.php b/src/Events/CategoryEdited.php
index e175397..2455d30 100644
--- a/src/Events/CategoryEdited.php
+++ b/src/Events/CategoryEdited.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamCategory;
+use HessamCMS\Models\HessamCategory;
 
 /**
  * Class CategoryEdited
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class CategoryEdited
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamCategory */
-    public $blogEtcCategory;
+    public $hessamCMSCategory;
 
     /**
      * CategoryEdited constructor.
-     * @param HessamCategory $blogEtcCategory
+     * @param HessamCategory $hessamCMSCategory
      */
-    public function __construct(HessamCategory $blogEtcCategory)
+    public function __construct(HessamCategory $hessamCMSCategory)
     {
-        $this->blogEtcCategory=$blogEtcCategory;
+        $this->hessamCMSCategory=$hessamCMSCategory;
     }
 
 }
diff --git a/src/Events/CategoryWillBeDeleted.php b/src/Events/CategoryWillBeDeleted.php
index 299297c..b703c45 100644
--- a/src/Events/CategoryWillBeDeleted.php
+++ b/src/Events/CategoryWillBeDeleted.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamCategory;
+use HessamCMS\Models\HessamCategory;
 
 /**
  * Class CategoryWillBeDeleted
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class CategoryWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamCategory */
-    public $blogEtcCategory;
+    public $hessamCMSCategory;
 
     /**
      * CategoryWillBeDeleted constructor.
-     * @param HessamCategory $blogEtcCategory
+     * @param HessamCategory $hessamCMSCategory
      */
-    public function __construct(HessamCategory $blogEtcCategory)
+    public function __construct(HessamCategory $hessamCMSCategory)
     {
-        $this->blogEtcCategory=$blogEtcCategory;
+        $this->hessamCMSCategory=$hessamCMSCategory;
     }
 
 }
diff --git a/src/Events/CommentAdded.php b/src/Events/CommentAdded.php
index 60b196e..b8a92d0 100644
--- a/src/Events/CommentAdded.php
+++ b/src/Events/CommentAdded.php
@@ -1,34 +1,34 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamComment;
-use WebDevEtc\BlogEtc\Models\HessamPost;
+use HessamCMS\Models\HessamComment;
+use HessamCMS\Models\HessamPost;
 
 /**
  * Class CommentAdded
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class CommentAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamPost */
-    public $blogEtcPost;
+    public $hessamCMSPost;
     /** @var  HessamComment */
     public $newComment;
 
     /**
      * CommentAdded constructor.
-     * @param HessamPost $blogEtcPost
+     * @param HessamPost $hessamCMSPost
      * @param HessamComment $newComment
      */
-    public function __construct(HessamPost $blogEtcPost, HessamComment $newComment)
+    public function __construct(HessamPost $hessamCMSPost, HessamComment $newComment)
     {
-        $this->blogEtcPost=$blogEtcPost;
+        $this->hessamCMSPost=$hessamCMSPost;
         $this->newComment=$newComment;
     }
 
diff --git a/src/Events/CommentApproved.php b/src/Events/CommentApproved.php
index e712028..7bd012c 100644
--- a/src/Events/CommentApproved.php
+++ b/src/Events/CommentApproved.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamComment;
+use HessamCMS\Models\HessamComment;
 
 /**
  * Class CommentApproved
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class CommentApproved
 {
diff --git a/src/Events/CommentWillBeDeleted.php b/src/Events/CommentWillBeDeleted.php
index fd41e19..165f508 100644
--- a/src/Events/CommentWillBeDeleted.php
+++ b/src/Events/CommentWillBeDeleted.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamComment;
+use HessamCMS\Models\HessamComment;
 
 /**
  * Class CommentWillBeDeleted
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class CommentWillBeDeleted
 {
diff --git a/src/Events/UploadedImage.php b/src/Events/UploadedImage.php
index 54495c9..b810cdf 100644
--- a/src/Events/UploadedImage.php
+++ b/src/Events/UploadedImage.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Events;
+namespace HessamCMS\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use WebDevEtc\BlogEtc\Models\HessamPost;
-use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
+use HessamCMS\Models\HessamPost;
+use HessamCMS\Models\HessamPostTranslation;
 
 /**
  * Class UploadedImage
- * @package WebDevEtc\BlogEtc\Events
+ * @package HessamCMS\Events
  */
 class UploadedImage
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     /** @var  HessamPost|null */
-    public $blogEtcPost;
+    public $hessamCMSPost;
     /**
      * @var
      */
@@ -30,14 +30,14 @@ class UploadedImage
      * UploadedImage constructor.
      *
      * @param $image_filename - the new filename
-     * @param HessamPost $blogEtcPost
+     * @param HessamPost $hessamCMSPost
      * @param $image
      * @param $source string|null  the __METHOD__  firing this event (or other string)
      */
-    public function __construct(string $image_filename, $image, HessamPostTranslation $blogEtcPost=null, string $source='other')
+    public function __construct(string $image_filename, $image, HessamPostTranslation $hessamCMSPost=null, string $source='other')
     {
         $this->image_filename = $image_filename;
-        $this->blogEtcPost=$blogEtcPost;
+        $this->hessamCMSPost=$hessamCMSPost;
         $this->image=$image;
         $this->source=$source;
     }
diff --git a/src/Helpers.php b/src/Helpers.php
index 3fd7c47..a2303e9 100755
--- a/src/Helpers.php
+++ b/src/Helpers.php
@@ -1,18 +1,18 @@
 <?php
-namespace WebDevEtc\BlogEtc;
+namespace HessamCMS;
 
 use \Session;
 
 /**
  * Class Helpers
- * @package WebDevEtc\BlogEtc
+ * @package HessamCMS
  */
 class Helpers
 {
     /**
      * What key to use for the session::flash / pull / has
      */
-    const FLASH_MESSAGE_SESSION_KEY = "WEBDEVETC_FLASH";
+    const FLASH_MESSAGE_SESSION_KEY = "HESSAMCMS_FLASH";
 
     /**
      * Set a new message
@@ -52,8 +52,8 @@ public static function rss_html_tag()
     {
 
 
-        return '<link rel="alternate" type="application/atom+xml" title="Atom RSS Feed" href="' . e(route("blogetc.feed")) . '?type=atom" />
-  <link rel="alternate" type="application/rss+xml" title="XML RSS Feed" href="' . e(route("blogetc.feed")) . '?type=rss" />
+        return '<link rel="alternate" type="application/atom+xml" title="Atom RSS Feed" href="' . e(route("hessamcms.feed")) . '?type=atom" />
+  <link rel="alternate" type="application/rss+xml" title="XML RSS Feed" href="' . e(route("hessamcms.feed")) . '?type=rss" />
   ';
 
 
@@ -65,7 +65,7 @@ public static function rss_html_tag()
      * @deprecated
      */
     public static function image_sizes(){
-        return config("blogetc.image_sizes");
+        return config("hessamcms.image_sizes");
     }
 
 }
diff --git a/src/BlogEtcServiceProvider.php b/src/HessamCMSServiceProvider.php
similarity index 64%
rename from src/BlogEtcServiceProvider.php
rename to src/HessamCMSServiceProvider.php
index 9b92d6f..328c6de 100755
--- a/src/BlogEtcServiceProvider.php
+++ b/src/HessamCMSServiceProvider.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace WebDevEtc\BlogEtc;
+namespace HessamCMS;
 
 use Illuminate\Support\ServiceProvider;
 use Swis\Laravel\Fulltext\ModelObserver;
-use WebDevEtc\BlogEtc\Models\HessamPost;
+use HessamCMS\Models\HessamPost;
 
-class BlogEtcServiceProvider extends ServiceProvider
+class HessamCMSServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap services.
@@ -16,12 +16,12 @@ class BlogEtcServiceProvider extends ServiceProvider
     public function boot()
     {
 
-        if (config("blogetc.search.search_enabled") == false) {
+        if (config("hessamcms.search.search_enabled") == false) {
             // if search is disabled, don't allow it to sync.
             ModelObserver::disableSyncingFor(HessamPost::class);
         }
 
-        if (config("blogetc.include_default_routes", true)) {
+        if (config("hessamcms.include_default_routes", true)) {
             include(__DIR__ . "/routes.php");
         }
 
@@ -43,9 +43,9 @@ public function boot()
         }
 
         $this->publishes([
-            __DIR__ . '/Views/blogetc' => base_path('resources/views/vendor/blogetc'),
-            __DIR__ . '/Config/blogetc.php' => config_path('blogetc.php'),
-            __DIR__ . '/css/blogetc_admin_css.css' => public_path('blogetc_admin_css.css'),
+            __DIR__ . '/Views/hessamcms' => base_path('resources/views/vendor/hessamcms'),
+            __DIR__ . '/Config/hessamcms.php' => config_path('hessamcms.php'),
+            __DIR__ . '/css/hessamcms_admin_css.css' => public_path('hessamcms_admin_css.css'),
             __DIR__ . '/css/hessam-blog.css' => public_path('hessam-blog.css'),
             __DIR__ . '/js/hessam-blog.js' => public_path('hessam-blog.js'),
         ]);
@@ -61,12 +61,12 @@ public function boot()
     public function register()
     {
 
-        // for the admin backend views ( view("blogetc_admin::BLADEFILE") )
-        $this->loadViewsFrom(__DIR__ . "/Views/blogetc_admin", 'blogetc_admin');
+        // for the admin backend views ( view("hessamcms_admin::BLADEFILE") )
+        $this->loadViewsFrom(__DIR__ . "/Views/hessamcms_admin", 'hessamcms_admin');
 
-        // for public facing views (view("blogetc::BLADEFILE")):
-        // if you do the vendor:publish, these will be copied to /resources/views/vendor/blogetc anyway
-        $this->loadViewsFrom(__DIR__ . "/Views/blogetc", 'blogetc');
+        // for public facing views (view("hessamcms::BLADEFILE")):
+        // if you do the vendor:publish, these will be copied to /resources/views/vendor/hessamcms anyway
+        $this->loadViewsFrom(__DIR__ . "/Views/hessamcms", 'hessamcms');
     }
 
 }
diff --git a/src/Interfaces/BaseRequestInterface.php b/src/Interfaces/BaseRequestInterface.php
index 6ddd97d..a9cad0d 100755
--- a/src/Interfaces/BaseRequestInterface.php
+++ b/src/Interfaces/BaseRequestInterface.php
@@ -1,4 +1,4 @@
-<?php namespace WebDevEtc\BlogEtc\Interfaces;
+<?php namespace HessamCMS\Interfaces;
 
 interface BaseRequestInterface
 {
diff --git a/src/Interfaces/CaptchaInterface.php b/src/Interfaces/CaptchaInterface.php
index a5bc736..8906b38 100644
--- a/src/Interfaces/CaptchaInterface.php
+++ b/src/Interfaces/CaptchaInterface.php
@@ -1,4 +1,4 @@
-<?php namespace WebDevEtc\BlogEtc\Interfaces;
+<?php namespace HessamCMS\Interfaces;
 
 interface CaptchaInterface
 {
diff --git a/src/Interfaces/SearchResultInterface.php b/src/Interfaces/SearchResultInterface.php
index 92c97fa..52a2ae6 100644
--- a/src/Interfaces/SearchResultInterface.php
+++ b/src/Interfaces/SearchResultInterface.php
@@ -1,4 +1,4 @@
-<?php namespace WebDevEtc\BlogEtc\Interfaces;
+<?php namespace HessamCMS\Interfaces;
 
 interface SearchResultInterface
 {
diff --git a/src/Middleware/DetectLanguage.php b/src/Middleware/DetectLanguage.php
index 5138362..42f498e 100644
--- a/src/Middleware/DetectLanguage.php
+++ b/src/Middleware/DetectLanguage.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Middleware;
+namespace HessamCMS\Middleware;
 
 use Closure;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
+use HessamCMS\Models\HessamLanguage;
 
 class DetectLanguage
 {
diff --git a/src/Middleware/LoadLanguage.php b/src/Middleware/LoadLanguage.php
index 524b67f..5357616 100644
--- a/src/Middleware/LoadLanguage.php
+++ b/src/Middleware/LoadLanguage.php
@@ -1,16 +1,16 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Middleware;
+namespace HessamCMS\Middleware;
 use Closure;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
+use HessamCMS\Models\HessamLanguage;
 
 class LoadLanguage
 {
 
     public function handle($request, Closure $next)
     {
-        $lang = HessamLanguage::where('locale', config("blogetc.default_language"))
+        $lang = HessamLanguage::where('locale', config("hessamcms.default_language"))
             ->first();
 
         $request->attributes->add(['locale' => $lang->locale]);
diff --git a/src/Middleware/PackageSetup.php b/src/Middleware/PackageSetup.php
index 5349abb..456b20e 100644
--- a/src/Middleware/PackageSetup.php
+++ b/src/Middleware/PackageSetup.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Middleware;
+namespace HessamCMS\Middleware;
 
 use Closure;
-use WebDevEtc\BlogEtc\Models\HessamConfiguration;
-use WebDevEtc\BlogEtc\Models\HessamLanguage;
+use HessamCMS\Models\HessamConfiguration;
+use HessamCMS\Models\HessamLanguage;
 
 class PackageSetup
 {
@@ -15,11 +15,11 @@ public function handle($request, Closure $next)
         if (!$initial_setup){
             HessamConfiguration::set('INITIAL_SETUP', true);
 
-            return redirect( route('blogetc.admin.setup') );
+            return redirect( route('hessamcms.admin.setup') );
         }
 
         if(!$initial_setup->value){
-            return redirect( route('blogetc.admin.setup') );
+            return redirect( route('hessamcms.admin.setup') );
         }
 
         return $next($request);
diff --git a/src/Middleware/UserCanManageBlogPosts.php b/src/Middleware/UserCanManageBlogPosts.php
index ad387b5..6724a07 100755
--- a/src/Middleware/UserCanManageBlogPosts.php
+++ b/src/Middleware/UserCanManageBlogPosts.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Middleware;
+namespace HessamCMS\Middleware;
 
 use Closure;
 
 /**
  * Class UserCanManageBlogPosts
- * @package WebDevEtc\BlogEtc\Middleware
+ * @package HessamCMS\Middleware
  */
 class UserCanManageBlogPosts
 {
 
     /**
-     * Show 401 error if \Auth::user()->canManageBlogEtcPosts() == false
+     * Show 401 error if \Auth::user()->canManageHessamCMSPosts() == false
      * @param $request
      * @param Closure $next
      * @return mixed
@@ -22,7 +22,7 @@ public function handle($request, Closure $next)
         if (!\Auth::check()) {
             abort(401,"User not authorised to manage blog posts: You are not logged in");
         }
-        if (!\Auth::user()->canManageBlogEtcPosts()) {
+        if (!\Auth::user()->canManageHessamCMSPosts()) {
             abort(401,"User not authorised to manage blog posts: Your account is not authorised to edit blog posts");
         }
         return $next($request);
diff --git a/src/Models/HessamCategory.php b/src/Models/HessamCategory.php
index f10f295..2e7a102 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/HessamCategory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
-use WebDevEtc\BlogEtc\Baum\Node;
+use HessamCMS\Baum\Node;
 
 class HessamCategory extends Node
 {
@@ -53,12 +53,12 @@ public static function loadSiblingsWithList($node_list){
 
 //    public function parent()
 //    {
-//        return $this->belongsTo('WebDevEtc\BlogEtc\Models\HessamCategory', 'parent_id');
+//        return $this->belongsTo('HessamCMS\Models\HessamCategory', 'parent_id');
 //    }
 //
 //    public function children()
 //    {
-//        return $this->hasMany('WebDevEtc\BlogEtc\Models\HessamCategory', 'parent_id');
+//        return $this->hasMany('HessamCMS\Models\HessamCategory', 'parent_id');
 //    }
 //
 //    // recursive, loads all descendants
diff --git a/src/Models/HessamCategoryTranslation.php b/src/Models/HessamCategoryTranslation.php
index 1718edf..163be38 100644
--- a/src/Models/HessamCategoryTranslation.php
+++ b/src/Models/HessamCategoryTranslation.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -45,7 +45,7 @@ public function url($loacle)
         foreach ($chain as $category){
             $theChainString .=  "/" . $category->categoryTranslations()->where('lang_id' , $this->lang_id)->first()->slug;
         }
-        return route("blogetc.view_category",[$loacle, $theChainString]);
+        return route("hessamcms.view_category",[$loacle, $theChainString]);
     }
 
     /**
@@ -54,6 +54,6 @@ public function url($loacle)
      */
     public function edit_url()
     {
-        return route("blogetc.admin.categories.edit_category", $this->category_id);
+        return route("hessamcms.admin.categories.edit_category", $this->category_id);
     }
 }
diff --git a/src/Models/HessamComment.php b/src/Models/HessamComment.php
index 6a0f86a..d96dcc9 100755
--- a/src/Models/HessamComment.php
+++ b/src/Models/HessamComment.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
 use App\User;
 use Illuminate\Database\Eloquent\Model;
-use WebDevEtc\BlogEtc\Scopes\BlogCommentApprovedAndDefaultOrderScope;
+use HessamCMS\Scopes\BlogCommentApprovedAndDefaultOrderScope;
 
 class HessamComment extends Model
 {
@@ -28,7 +28,7 @@ protected static function boot()
     {
         parent::boot();
 
-        /* If user is logged in and \Auth::user()->canManageBlogEtcPosts() == true, show any/all posts.
+        /* If user is logged in and \Auth::user()->canManageHessamCMSPosts() == true, show any/all posts.
            otherwise (which will be for most users) it should only show published posts that have a posted_at
            time <= Carbon::now(). This sets it up: */
         static::addGlobalScope(new BlogCommentApprovedAndDefaultOrderScope());
@@ -51,7 +51,7 @@ public function post()
      */
     public function user()
     {
-        return $this->belongsTo(config("blogetc.user_model"), 'user_id');
+        return $this->belongsTo(config("hessamcms.user_model"), 'user_id');
     }
 
     /**
@@ -62,7 +62,7 @@ public function user()
     public function author()
     {
         if ($this->user_id) {
-            $field = config("blogetc.comments.user_field_for_author_name","name");
+            $field = config("hessamcms.comments.user_field_for_author_name","name");
             return optional($this->user)->$field;
         }
 
diff --git a/src/Models/HessamConfiguration.php b/src/Models/HessamConfiguration.php
index af0c657..c0f2620 100644
--- a/src/Models/HessamConfiguration.php
+++ b/src/Models/HessamConfiguration.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/Models/HessamLanguage.php b/src/Models/HessamLanguage.php
index 4b8889c..8c932b8 100644
--- a/src/Models/HessamLanguage.php
+++ b/src/Models/HessamLanguage.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/Models/HessamPost.php b/src/Models/HessamPost.php
index 75976fa..53d7a04 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/HessamPost.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use WebDevEtc\BlogEtc\Scopes\BlogEtcPublishedScope;
+use HessamCMS\Scopes\HessamCMSPublishedScope;
 
 /**
  * Class HessamPost
- * @package WebDevEtc\BlogEtc\Models
+ * @package HessamCMS\Models
  */
 class HessamPost extends Model
 {
@@ -51,10 +51,10 @@ protected static function boot()
     {
         parent::boot();
 
-        /* If user is logged in and \Auth::user()->canManageBlogEtcPosts() == true, show any/all posts.
+        /* If user is logged in and \Auth::user()->canManageHessamCMSPosts() == true, show any/all posts.
            otherwise (which will be for most users) it should only show published posts that have a posted_at
            time <= Carbon::now(). This sets it up: */
-        static::addGlobalScope(new BlogEtcPublishedScope());
+        static::addGlobalScope(new HessamCMSPublishedScope());
 
         static::deleting(function($post) { // before delete() method call this
             $post->postTranslations()->delete();
@@ -67,7 +67,7 @@ protected static function boot()
      */
     public function author()
     {
-        return $this->belongsTo(config("blogetc.user_model"), 'user_id');
+        return $this->belongsTo(config("hessamcms.user_model"), 'user_id');
     }
 
     /**
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index 1c93689..4669c2c 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -1,12 +1,12 @@
 <?php
 
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Model;
 use Swis\Laravel\Fulltext\Indexable;
-use WebDevEtc\BlogEtc\Interfaces\SearchResultInterface;
+use HessamCMS\Interfaces\SearchResultInterface;
 
 class HessamPostTranslation extends Model implements SearchResultInterface
 {
@@ -105,7 +105,7 @@ public function image_url($size = 'medium')
     {
         $this->check_valid_image_size($size);
         $filename = $this->{"image_" . $size};
-        return asset(config("blogetc.blog_upload_dir", "blog_images") . "/" . $filename);
+        return asset(config("hessamcms.blog_upload_dir", "blog_images") . "/" . $filename);
     }
 
     /**
@@ -144,23 +144,23 @@ public function generate_introduction($max_len = 500)
 
     public function post_body_output()
     {
-        if (config("blogetc.use_custom_view_files") && $this->use_view_file) {
+        if (config("hessamcms.use_custom_view_files") && $this->use_view_file) {
             // using custom view files is enabled, and this post has a use_view_file set, so render it:
-            $return = view("blogetc::partials.use_view_file", ['post' => $this])->render();
+            $return = view("hessamcms::partials.use_view_file", ['post' => $this])->render();
         } else {
             // just use the plain ->post_body
             $return = $this->post_body;
         }
 
 
-        if (!config("blogetc.echo_html")) {
+        if (!config("hessamcms.echo_html")) {
             // if this is not true, then we should escape the output
-            if (config("blogetc.strip_html")) {
+            if (config("hessamcms.strip_html")) {
                 $return = strip_tags($return);
             }
 
             $return = e($return);
-            if (config("blogetc.auto_nl2br")) {
+            if (config("hessamcms.auto_nl2br")) {
                 $return = nl2br($return);
             }
         }
@@ -180,7 +180,7 @@ protected function check_valid_image_size(string $size = 'medium')
     {
 
 
-        if (array_key_exists("image_" . $size, config("blogetc.image_sizes"))) {
+        if (array_key_exists("image_" . $size, config("hessamcms.image_sizes"))) {
             return true;
         }
 
@@ -188,19 +188,19 @@ protected function check_valid_image_size(string $size = 'medium')
 
         if (starts_with($size, "image_")) {
             // $size starts with image_, which is an error
-            /* the config/blogetc.php and the DB columns SHOULD have keys that start with image_$size
+            /* the config/hessamcms.php and the DB columns SHOULD have keys that start with image_$size
             however when using methods such as image_url() or has_image() it SHOULD NOT start with 'image_'
 
             To put another way: :
-                in the config/blogetc.php : config("blogetc.image_sizes.image_medium")
-                in the database table:    : blogetc_posts.image_medium
+                in the config/hessamcms.php : config("hessamcms.image_sizes.image_medium")
+                in the database table:    : hessamcms_posts.image_medium
                 when calling image_url()  : image_url("medium")
             */
-            throw new \InvalidArgumentException("Invalid image size ($size). HessamPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the blogetc.image_sizes config though!");
+            throw new \InvalidArgumentException("Invalid image size ($size). HessamPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the hessamcms.image_sizes config though!");
         }
 
 
-        throw new \InvalidArgumentException("HessamPost image size should be 'large','medium','thumbnail' or another field as defined in config/blogetc.php. Provided size ($size) is not valid");
+        throw new \InvalidArgumentException("HessamPost image size should be 'large','medium','thumbnail' or another field as defined in config/hessamcms.php. Provided size ($size) is not valid");
     }
 
 
@@ -226,7 +226,7 @@ public function gen_seo_title()
      */
     public function url($loacle)
     {
-        return route("blogetc.single", [$loacle, $this->slug]);
+        return route("hessamcms.single", [$loacle, $this->slug]);
     }
 
     /**
@@ -235,6 +235,6 @@ public function url($loacle)
      */
     public function edit_url()
     {
-        return route("blogetc.admin.edit_post", $this->post_id);
+        return route("hessamcms.admin.edit_post", $this->post_id);
     }
 }
diff --git a/src/Models/HessamUploadedPhoto.php b/src/Models/HessamUploadedPhoto.php
index 363cdf1..66adc09 100644
--- a/src/Models/HessamUploadedPhoto.php
+++ b/src/Models/HessamUploadedPhoto.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Models;
+namespace HessamCMS\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/Requests/AddNewCommentRequest.php b/src/Requests/AddNewCommentRequest.php
index 35587de..207fecd 100755
--- a/src/Requests/AddNewCommentRequest.php
+++ b/src/Requests/AddNewCommentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -9,7 +9,7 @@ class AddNewCommentRequest extends FormRequest
 
     public function authorize()
     {
-        if (config("blogetc.comments.type_of_comments_to_show") === 'built_in') {
+        if (config("hessamcms.comments.type_of_comments_to_show") === 'built_in') {
             // anyone is allowed to submit a comment, to return true always.
             return true;
         }
@@ -34,7 +34,7 @@ public function rules()
         ];
 
         // do we need author name?
-        if (\Auth::check() && config("blogetc.comments.save_user_id_if_logged_in", true)) {
+        if (\Auth::check() && config("hessamcms.comments.save_user_id_if_logged_in", true)) {
             // is logged in, so we don't need an author name (it won't get used)
             $return['author_name'][] = 'nullable';
         } else {
@@ -43,24 +43,24 @@ public function rules()
         }
 
         // is captcha enabled? If so, get the rules from its class.
-        if (config("blogetc.captcha.captcha_enabled")) {
+        if (config("hessamcms.captcha.captcha_enabled")) {
             /** @var string $captcha_class */
-            $captcha_class = config("blogetc.captcha.captcha_type");
+            $captcha_class = config("hessamcms.captcha.captcha_type");
 
-            /** @var \WebDevEtc\BlogEtc\Interfaces\CaptchaInterface $captcha */
+            /** @var \HessamCMS\Interfaces\CaptchaInterface $captcha */
             $captcha = new $captcha_class;
 
             $return[$captcha->captcha_field_name()] = $captcha->rules();
         }
 
         // in case you need to implement something custom, you can use this...
-        if (config("blogetc.comments.rules") && is_callable(config("blogetc.comments.rules"))) {
+        if (config("hessamcms.comments.rules") && is_callable(config("hessamcms.comments.rules"))) {
             /** @var callable $func */
-            $func = config('blogetc.comments.rules');
+            $func = config('hessamcms.comments.rules');
             $return = $func($return);
         }
 
-        if (config("blogetc.comments.require_author_email")) {
+        if (config("hessamcms.comments.require_author_email")) {
             $return['author_email'][] = 'required';
         }
 
diff --git a/src/Requests/BaseBlogEtcCategoryRequest.php b/src/Requests/BaseHessamCMSCategoryRequest.php
similarity index 82%
rename from src/Requests/BaseBlogEtcCategoryRequest.php
rename to src/Requests/BaseHessamCMSCategoryRequest.php
index 26e441e..c3081d2 100755
--- a/src/Requests/BaseBlogEtcCategoryRequest.php
+++ b/src/Requests/BaseHessamCMSCategoryRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
-abstract class BaseBlogEtcCategoryRequest extends BaseRequest
+abstract class BaseHessamCMSCategoryRequest extends BaseRequest
 {
     /**
      * Shared rules for categories
diff --git a/src/Requests/BaseBlogEtcPostRequest.php b/src/Requests/BaseHessamCMSPostRequest.php
similarity index 89%
rename from src/Requests/BaseBlogEtcPostRequest.php
rename to src/Requests/BaseHessamCMSPostRequest.php
index db3e5f7..6acf2d7 100755
--- a/src/Requests/BaseBlogEtcPostRequest.php
+++ b/src/Requests/BaseHessamCMSPostRequest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 use Carbon\Carbon;
 
-abstract class BaseBlogEtcPostRequest extends BaseRequest
+abstract class BaseHessamCMSPostRequest extends BaseRequest
 {
 
     /**
@@ -57,7 +57,7 @@ protected function baseBlogPostRules()
 
 
         // is use_custom_view_files true?
-        if (config('blogetc.use_custom_view_files')) {
+        if (config('hessamcms.use_custom_view_files')) {
             $return['use_view_file'] = ['nullable', 'string', 'alpha_num', 'min:1', 'max:75',];
         } else {
             // use_view_file is disabled, so give an empty if anything is submitted via this function:
@@ -65,8 +65,8 @@ protected function baseBlogPostRules()
         }
 
         // some additional rules for uploaded images
-        foreach ((array)config('blogetc.image_sizes') as $size => $image_detail) {
-            if ($image_detail['enabled'] && config("blogetc.image_upload_enabled")) {
+        foreach ((array)config('hessamcms.image_sizes') as $size => $image_detail) {
+            if ($image_detail['enabled'] && config("hessamcms.image_upload_enabled")) {
                 $return[$size] = ['nullable', 'image',];
             } else {
                 // was not enabled (or all images are disabled), so show an error if it was submitted:
diff --git a/src/Requests/BaseRequest.php b/src/Requests/BaseRequest.php
index 4412332..abadb46 100755
--- a/src/Requests/BaseRequest.php
+++ b/src/Requests/BaseRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use WebDevEtc\BlogEtc\Interfaces\BaseRequestInterface;
+use HessamCMS\Interfaces\BaseRequestInterface;
 
 /**
  * Class BaseRequest
- * @package WebDevEtc\BlogEtc\Requests
+ * @package HessamCMS\Requests
  */
 abstract class BaseRequest extends FormRequest implements BaseRequestInterface
 {
@@ -18,6 +18,6 @@ abstract class BaseRequest extends FormRequest implements BaseRequestInterface
      */
     public function authorize()
     {
-        return \Auth::check() && \Auth::user()->canManageBlogEtcPosts();
+        return \Auth::check() && \Auth::user()->canManageHessamCMSPosts();
     }
 }
diff --git a/src/Requests/CreateBlogEtcPostRequest.php b/src/Requests/CreateHessamCMSPostRequest.php
similarity index 59%
rename from src/Requests/CreateBlogEtcPostRequest.php
rename to src/Requests/CreateHessamCMSPostRequest.php
index 7defddb..c466f14 100755
--- a/src/Requests/CreateBlogEtcPostRequest.php
+++ b/src/Requests/CreateHessamCMSPostRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 
 use Illuminate\Validation\Rule;
-use WebDevEtc\BlogEtc\Requests\Traits\HasCategoriesTrait;
-use WebDevEtc\BlogEtc\Requests\Traits\HasImageUploadTrait;
+use HessamCMS\Requests\Traits\HasCategoriesTrait;
+use HessamCMS\Requests\Traits\HasImageUploadTrait;
 
-class CreateBlogEtcPostRequest extends BaseBlogEtcPostRequest
+class CreateHessamCMSPostRequest extends BaseHessamCMSPostRequest
 {
     use HasCategoriesTrait;
     use HasImageUploadTrait;
diff --git a/src/Requests/CreateHessamPostToggleRequest.php b/src/Requests/CreateHessamPostToggleRequest.php
index e746c13..3c57cd2 100755
--- a/src/Requests/CreateHessamPostToggleRequest.php
+++ b/src/Requests/CreateHessamPostToggleRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 
 use Illuminate\Validation\Rule;
-use WebDevEtc\BlogEtc\Requests\Traits\HasCategoriesTrait;
-use WebDevEtc\BlogEtc\Requests\Traits\HasImageUploadTrait;
+use HessamCMS\Requests\Traits\HasCategoriesTrait;
+use HessamCMS\Requests\Traits\HasImageUploadTrait;
 
-class CreateHessamPostToggleRequest extends BaseBlogEtcPostRequest
+class CreateHessamPostToggleRequest extends BaseHessamCMSPostRequest
 {
     use HasCategoriesTrait;
     use HasImageUploadTrait;
diff --git a/src/Requests/DeleteBlogEtcCategoryRequest.php b/src/Requests/DeleteHessamCMSCategoryRequest.php
similarity index 70%
rename from src/Requests/DeleteBlogEtcCategoryRequest.php
rename to src/Requests/DeleteHessamCMSCategoryRequest.php
index 57a3fde..1e288a7 100755
--- a/src/Requests/DeleteBlogEtcCategoryRequest.php
+++ b/src/Requests/DeleteHessamCMSCategoryRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 
-class DeleteBlogEtcCategoryRequest  extends BaseRequest {
+class DeleteHessamCMSCategoryRequest  extends BaseRequest {
 
 
     /**
diff --git a/src/Requests/DeleteBlogEtcPostRequest.php b/src/Requests/DeleteHessamCMSPostRequest.php
similarity index 73%
rename from src/Requests/DeleteBlogEtcPostRequest.php
rename to src/Requests/DeleteHessamCMSPostRequest.php
index 05955b1..3ee7778 100755
--- a/src/Requests/DeleteBlogEtcPostRequest.php
+++ b/src/Requests/DeleteHessamCMSPostRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 
-class DeleteBlogEtcPostRequest  extends BaseRequest {
+class DeleteHessamCMSPostRequest  extends BaseRequest {
 
 
     /**
diff --git a/src/Requests/FeedRequest.php b/src/Requests/FeedRequest.php
index 18f87ee..367f07b 100755
--- a/src/Requests/FeedRequest.php
+++ b/src/Requests/FeedRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/src/Requests/SearchRequest.php b/src/Requests/SearchRequest.php
index 5b0c046..3189435 100755
--- a/src/Requests/SearchRequest.php
+++ b/src/Requests/SearchRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -8,7 +8,7 @@ class SearchRequest extends FormRequest
 {
     public function authorize()
     {
-        if (config("blogetc.search.search_enabled")) {
+        if (config("hessamcms.search.search_enabled")) {
             // anyone is allowed to submit a comment, to return true always.
             return true;
         }
diff --git a/src/Requests/Traits/HasCategoriesTrait.php b/src/Requests/Traits/HasCategoriesTrait.php
index 84eb7cd..fd28c00 100755
--- a/src/Requests/Traits/HasCategoriesTrait.php
+++ b/src/Requests/Traits/HasCategoriesTrait.php
@@ -1,10 +1,10 @@
-<?php namespace WebDevEtc\BlogEtc\Requests\Traits;
+<?php namespace HessamCMS\Requests\Traits;
 
-use WebDevEtc\BlogEtc\Models\HessamCategory;
+use HessamCMS\Models\HessamCategory;
 
 /**
  * Class HasCategoriesTrait
- * @package WebDevEtc\BlogEtc\Requests\Traits
+ * @package HessamCMS\Requests\Traits
  */
 trait HasCategoriesTrait
 {
diff --git a/src/Requests/Traits/HasImageUploadTrait.php b/src/Requests/Traits/HasImageUploadTrait.php
index b561ca5..bbac2da 100755
--- a/src/Requests/Traits/HasImageUploadTrait.php
+++ b/src/Requests/Traits/HasImageUploadTrait.php
@@ -1,4 +1,4 @@
-<?php namespace WebDevEtc\BlogEtc\Requests\Traits;
+<?php namespace HessamCMS\Requests\Traits;
 
 
 
@@ -16,7 +16,7 @@ public function get_image_file($size)
         }
 
         // not found? lets cycle through all the images and see if anything was submitted, and use that instead
-        foreach (config("blogetc.image_sizes") as $image_size_name => $image_size_info) {
+        foreach (config("hessamcms.image_sizes") as $image_size_name => $image_size_info) {
             if ($this->file($image_size_name)) {
                 return $this->file($image_size_name);
             }
diff --git a/src/Requests/UpdateBlogEtcCategoryRequest.php b/src/Requests/UpdateHessamCMSCategoryRequest.php
similarity index 63%
rename from src/Requests/UpdateBlogEtcCategoryRequest.php
rename to src/Requests/UpdateHessamCMSCategoryRequest.php
index bb1ec72..8ae50ac 100755
--- a/src/Requests/UpdateBlogEtcCategoryRequest.php
+++ b/src/Requests/UpdateHessamCMSCategoryRequest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 
 use Illuminate\Validation\Rule;
-use WebDevEtc\BlogEtc\Models\HessamCategory;
+use HessamCMS\Models\HessamCategory;
 
-class UpdateBlogEtcCategoryRequest extends BaseBlogEtcCategoryRequest
+class UpdateHessamCMSCategoryRequest extends BaseHessamCMSCategoryRequest
 {
 
 
diff --git a/src/Requests/UpdateBlogEtcPostRequest.php b/src/Requests/UpdateHessamCMSPostRequest.php
similarity index 63%
rename from src/Requests/UpdateBlogEtcPostRequest.php
rename to src/Requests/UpdateHessamCMSPostRequest.php
index 4efc47a..31d4e55 100755
--- a/src/Requests/UpdateBlogEtcPostRequest.php
+++ b/src/Requests/UpdateHessamCMSPostRequest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 
 use Illuminate\Validation\Rule;
-use WebDevEtc\BlogEtc\Models\HessamPost;
-use WebDevEtc\BlogEtc\Requests\Traits\HasCategoriesTrait;
-use WebDevEtc\BlogEtc\Requests\Traits\HasImageUploadTrait;
+use HessamCMS\Models\HessamPost;
+use HessamCMS\Requests\Traits\HasCategoriesTrait;
+use HessamCMS\Requests\Traits\HasImageUploadTrait;
 
-class UpdateBlogEtcPostRequest  extends BaseBlogEtcPostRequest {
+class UpdateHessamCMSPostRequest  extends BaseHessamCMSPostRequest {
 
     use HasCategoriesTrait;
     use HasImageUploadTrait;
diff --git a/src/Requests/UploadImageRequest.php b/src/Requests/UploadImageRequest.php
index 422e9aa..b701278 100755
--- a/src/Requests/UploadImageRequest.php
+++ b/src/Requests/UploadImageRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Requests;
+namespace HessamCMS\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use WebDevEtc\BlogEtc\Interfaces\BaseRequestInterface;
+use HessamCMS\Interfaces\BaseRequestInterface;
 
 /**
  * Class BaseRequest
- * @package WebDevEtc\BlogEtc\Requests
+ * @package HessamCMS\Requests
  */
 class UploadImageRequest extends BaseRequest
 {
diff --git a/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php b/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php
index 77f16e2..25184ab 100755
--- a/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php
+++ b/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Scopes;
+namespace HessamCMS\Scopes;
 
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Database\Eloquent\Model;
@@ -23,7 +23,7 @@ public function apply(Builder $builder, Model $model)
     {
         $builder->orderBy("id", 'asc');
         // set a sane limit on num of comments. No pagination. Maybe a feature in the future.
-        $builder->limit(config("blogetc.comments.max_num_of_comments_to_show", 500));
+        $builder->limit(config("hessamcms.comments.max_num_of_comments_to_show", 500));
         $builder->where("approved", true);
     }
 }
\ No newline at end of file
diff --git a/src/Scopes/BlogEtcPublishedScope.php b/src/Scopes/HessamCMSPublishedScope.php
similarity index 73%
rename from src/Scopes/BlogEtcPublishedScope.php
rename to src/Scopes/HessamCMSPublishedScope.php
index 2d8c831..9eeb0d6 100755
--- a/src/Scopes/BlogEtcPublishedScope.php
+++ b/src/Scopes/HessamCMSPublishedScope.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Scopes;
+namespace HessamCMS\Scopes;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 
-class BlogEtcPublishedScope implements Scope
+class HessamCMSPublishedScope implements Scope
 {
     /**
-     * If user is logged in and canManageBlogEtcPosts() == true, then don't add any scope
+     * If user is logged in and canManageHessamCMSPosts() == true, then don't add any scope
      * But for everyone else then it should only show PUBLISHED posts with a POSTED_AT < NOW()
      *
      * @param  \Illuminate\Database\Eloquent\Builder $builder
@@ -19,7 +19,7 @@ class BlogEtcPublishedScope implements Scope
      */
     public function apply(Builder $builder, Model $model)
     {
-        if (!\Auth::check() || ! \Auth::user()->canManageBlogEtcPosts()) {
+        if (!\Auth::check() || ! \Auth::user()->canManageHessamCMSPosts()) {
             // user is a guest, or if logged in they can't manage blog posts
             $builder->where("is_published", true);
             $builder->where("posted_at", "<=", Carbon::now());
diff --git a/src/Traits/UploadFileTrait.php b/src/Traits/UploadFileTrait.php
index cbe3200..330e06a 100644
--- a/src/Traits/UploadFileTrait.php
+++ b/src/Traits/UploadFileTrait.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace WebDevEtc\BlogEtc\Traits;
+namespace HessamCMS\Traits;
 
 use Illuminate\Http\UploadedFile;
-use WebDevEtc\BlogEtc\Events\UploadedImage;
-use WebDevEtc\BlogEtc\Models\HessamPost;
+use HessamCMS\Events\UploadedImage;
+use HessamCMS\Models\HessamPost;
 use File;
-use WebDevEtc\BlogEtc\Models\HessamPostTranslation;
+use HessamCMS\Models\HessamPostTranslation;
 
 trait UploadFileTrait
 {
@@ -21,14 +21,14 @@ trait UploadFileTrait
 
     /**
      * Small method to increase memory limit.
-     * This can be defined in the config file. If blogetc.memory_limit is false/null then it won't do anything.
+     * This can be defined in the config file. If hessamcms.memory_limit is false/null then it won't do anything.
      * This is needed though because if you upload a large image it'll not work
      */
     protected function increaseMemoryLimit()
     {
         // increase memory - change this setting in config file
-        if (config("blogetc.memory_limit")) {
-            @ini_set('memory_limit', config("blogetc.memory_limit"));
+        if (config("hessamcms.memory_limit")) {
+            @ini_set('memory_limit', config("hessamcms.memory_limit"));
         }
     }
 
@@ -77,7 +77,7 @@ protected function getImageFilename(string $suggested_title, $image_size_details
      */
     protected function image_destination_path()
     {
-        $path = public_path('/' . config("blogetc.blog_upload_dir"));
+        $path = public_path('/' . config("hessamcms.blog_upload_dir"));
         $this->check_image_destination_path_is_writable($path);
         return $path;
     }
@@ -123,7 +123,7 @@ protected function UploadAndResize(HessamPostTranslation $new_blog_post = null,
         }
 
         // save image
-        $resizedImage->save($destinationPath . '/' . $image_filename, config("blogetc.image_quality", 80));
+        $resizedImage->save($destinationPath . '/' . $image_filename, config("hessamcms.image_quality", 80));
 
         // fireevent
         event(new UploadedImage($image_filename, $resizedImage, $new_blog_post, __METHOD__));
diff --git a/src/Views/blogetc/captcha/basic.blade.php b/src/Views/hessamcms/captcha/basic.blade.php
similarity index 59%
rename from src/Views/blogetc/captcha/basic.blade.php
rename to src/Views/hessamcms/captcha/basic.blade.php
index 976ebe4..cc48112 100644
--- a/src/Views/blogetc/captcha/basic.blade.php
+++ b/src/Views/hessamcms/captcha/basic.blade.php
@@ -1,6 +1,6 @@
 <div class="form-group ">
     <label id="captcha_label"
-           for="captcha">Captcha: {{ config("blogetc.captcha.basic_question", "[error - undefined captcha question]" )}} </label>
+           for="captcha">Captcha: {{ config("hessamcms.captcha.basic_question", "[error - undefined captcha question]" )}} </label>
     <input type='text' required class="form-control" name='captcha' id="captcha" placeholder=""
            value="{{old("captcha")}}">
 </div>
\ No newline at end of file
diff --git a/src/Views/blogetc/index.blade.php b/src/Views/hessamcms/index.blade.php
similarity index 73%
rename from src/Views/blogetc/index.blade.php
rename to src/Views/hessamcms/index.blade.php
index ba53801..7fffe51 100755
--- a/src/Views/blogetc/index.blade.php
+++ b/src/Views/hessamcms/index.blade.php
@@ -6,12 +6,12 @@
 
 @section("content")
 
-    <div class='col-sm-12 blogetc_container'>
-        @if(\Auth::check() && \Auth::user()->canManageBlogEtcPosts())
+    <div class='col-sm-12 hessamcms_container'>
+        @if(\Auth::check() && \Auth::user()->canManageHessamCMSPosts())
             <div class="text-center">
                 <p class='mb-1'>You are logged in as a blog admin user.
                     <br>
-                    <a href='{{route("blogetc.admin.index")}}'
+                    <a href='{{route("hessamcms.admin.index")}}'
                        class='btn border  btn-outline-primary btn-sm '>
                         <i class="fa fa-cogs" aria-hidden="true"></i>
                         Go To Blog Admin Panel</a>
@@ -36,11 +36,11 @@ class='btn border  btn-outline-primary btn-sm '>
                     </div>
                 @endif
 
-                @if(isset($blogetc_category) && $blogetc_category)
-                    <h2 class='text-center'> {{$blogetc_category->category_name}}</h2>
+                @if(isset($hessamcms_category) && $hessamcms_category)
+                    <h2 class='text-center'> {{$hessamcms_category->category_name}}</h2>
 
-                    @if($blogetc_category->category_description)
-                        <p class='text-center'>{{$blogetc_category->category_description}}</p>
+                    @if($hessamcms_category->category_description)
+                        <p class='text-center'>{{$hessamcms_category->category_description}}</p>
                     @endif
 
                 @endif
@@ -48,7 +48,7 @@ class='btn border  btn-outline-primary btn-sm '>
                 <div class="container">
                     <div class="row">
                         @forelse($posts as $post)
-                            @include("blogetc::partials.index_loop")
+                            @include("hessamcms::partials.index_loop")
                         @empty
                             <div class="col-md-12">
                                 <div class='alert alert-danger'>No posts!</div>
@@ -61,7 +61,7 @@ class='btn border  btn-outline-primary btn-sm '>
                 <h6>Blog Categories</h6>
                 <ul class="hessam-cat-hierarchy">
                     @if($categories)
-                        @include("blogetc::partials._category_partial", ['category_tree' => $categories])
+                        @include("hessamcms::partials._category_partial", ['category_tree' => $categories])
                     @else
                         <span>No Categories</span>
                     @endif
@@ -72,8 +72,8 @@ class='btn border  btn-outline-primary btn-sm '>
         <div class='text-center  col-sm-4 mx-auto'>
             {{$posts->appends( [] )->links()}}
         </div>
-        @if (config('blogetc.search.search_enabled') )
-            @include('blogetc::sitewide.search_form')
+        @if (config('hessamcms.search.search_enabled') )
+            @include('hessamcms::sitewide.search_form')
         @endif
     </div>
 
diff --git a/src/Views/blogetc/partials/_category_partial.blade.php b/src/Views/hessamcms/partials/_category_partial.blade.php
similarity index 76%
rename from src/Views/blogetc/partials/_category_partial.blade.php
rename to src/Views/hessamcms/partials/_category_partial.blade.php
index 498d4f4..322fe15 100644
--- a/src/Views/blogetc/partials/_category_partial.blade.php
+++ b/src/Views/hessamcms/partials/_category_partial.blade.php
@@ -5,7 +5,7 @@
 
              @if( count($category->siblings) > 0)
                  <ul>
-                 @include("blogetc_admin::categories._category_partial", ['category_tree' => $category->siblings])
+                 @include("hessamcms_admin::categories._category_partial", ['category_tree' => $category->siblings])
                  </ul>
              @endif
     </span>
diff --git a/src/Views/blogetc/partials/add_comment_form.blade.php b/src/Views/hessamcms/partials/add_comment_form.blade.php
similarity index 89%
rename from src/Views/blogetc/partials/add_comment_form.blade.php
rename to src/Views/hessamcms/partials/add_comment_form.blade.php
index dfacc8f..25b989b 100644
--- a/src/Views/blogetc/partials/add_comment_form.blade.php
+++ b/src/Views/hessamcms/partials/add_comment_form.blade.php
@@ -1,6 +1,6 @@
 <div class='add_comment_area'>
     <h5 class='text-center'>Add a comment</h5>
-    <form method='post' action='{{route("blogetc.comments.add_new_comment",[app('request')->get('locale'),$post->slug])}}'>
+    <form method='post' action='{{route("hessamcms.comments.add_new_comment",[app('request')->get('locale'),$post->slug])}}'>
         @csrf
 
 
@@ -21,7 +21,7 @@ class="form-control"
         <div class='container-fluid'>
             <div class='row'>
 
-                @if(config("blogetc.comments.save_user_id_if_logged_in", true) == false || !\Auth::check())
+                @if(config("hessamcms.comments.save_user_id_if_logged_in", true) == false || !\Auth::check())
 
                     <div class='col'>
                         <div class="form-group ">
@@ -37,7 +37,7 @@ class="form-control"
                         </div>
                     </div>
 
-                    @if(config("blogetc.comments.ask_for_author_email"))
+                    @if(config("hessamcms.comments.ask_for_author_email"))
                         <div class='col'>
                             <div class="form-group">
                                 <label id="author_email_label" for="author_email">Your Email
@@ -57,7 +57,7 @@ class="form-control"
                 @endif
 
 
-                @if(config("blogetc.comments.ask_for_author_website"))
+                @if(config("hessamcms.comments.ask_for_author_website"))
                     <div class='col'>
                         <div class="form-group">
                             <label id="author_website_label" for="author_website">Your Website
diff --git a/src/Views/blogetc/partials/author.blade.php b/src/Views/hessamcms/partials/author.blade.php
similarity index 100%
rename from src/Views/blogetc/partials/author.blade.php
rename to src/Views/hessamcms/partials/author.blade.php
diff --git a/src/Views/blogetc/partials/built_in_comments.blade.php b/src/Views/hessamcms/partials/built_in_comments.blade.php
similarity index 70%
rename from src/Views/blogetc/partials/built_in_comments.blade.php
rename to src/Views/hessamcms/partials/built_in_comments.blade.php
index e0c2785..841d1fd 100644
--- a/src/Views/blogetc/partials/built_in_comments.blade.php
+++ b/src/Views/hessamcms/partials/built_in_comments.blade.php
@@ -6,7 +6,7 @@
         <div class="card-header">
             {{$comment->author()}}
 
-            @if(config("blogetc.comments.ask_for_author_website") && $comment->author_website)
+            @if(config("hessamcms.comments.ask_for_author_website") && $comment->author_website)
                 (<a href='{{$comment->author_website}}' target='_blank' rel='noopener'>website</a>)
             @endif
 
@@ -25,8 +25,8 @@
     <div class='alert alert-info'>No comments yet! Why don't you be the first?</div>
 @endforelse
 
-@if(count($comments)> config("blogetc.comments.max_num_of_comments_to_show",500) - 1)
-    <p><em>Only the first {{config("blogetc.comments.max_num_of_comments_to_show",500)}} comments are
+@if(count($comments)> config("hessamcms.comments.max_num_of_comments_to_show",500) - 1)
+    <p><em>Only the first {{config("hessamcms.comments.max_num_of_comments_to_show",500)}} comments are
             shown.</em>
     </p>
 @endif
diff --git a/src/Views/blogetc/partials/cat_snippet.blade.php b/src/Views/hessamcms/partials/cat_snippet.blade.php
similarity index 100%
rename from src/Views/blogetc/partials/cat_snippet.blade.php
rename to src/Views/hessamcms/partials/cat_snippet.blade.php
diff --git a/src/Views/blogetc/partials/categories.blade.php b/src/Views/hessamcms/partials/categories.blade.php
similarity index 100%
rename from src/Views/blogetc/partials/categories.blade.php
rename to src/Views/hessamcms/partials/categories.blade.php
diff --git a/src/Views/blogetc/partials/custom_comments.blade.php b/src/Views/hessamcms/partials/custom_comments.blade.php
similarity index 61%
rename from src/Views/blogetc/partials/custom_comments.blade.php
rename to src/Views/hessamcms/partials/custom_comments.blade.php
index d15684c..b3fad59 100644
--- a/src/Views/blogetc/partials/custom_comments.blade.php
+++ b/src/Views/hessamcms/partials/custom_comments.blade.php
@@ -1,5 +1,5 @@
 <div class='alert alert-danger'>
     error!
     custom_comments: You must customise this by creating a file in
-    /resources/views/vendor/blogetc/partials/custom_comments.blade.php
+    /resources/views/vendor/hessamcms/partials/custom_comments.blade.php
 </div>
diff --git a/src/Views/blogetc/partials/disqus_comments.blade.php b/src/Views/hessamcms/partials/disqus_comments.blade.php
similarity index 83%
rename from src/Views/blogetc/partials/disqus_comments.blade.php
rename to src/Views/hessamcms/partials/disqus_comments.blade.php
index ab965b5..9470c0d 100644
--- a/src/Views/blogetc/partials/disqus_comments.blade.php
+++ b/src/Views/hessamcms/partials/disqus_comments.blade.php
@@ -10,9 +10,9 @@
     };
     (function() { // DON'T EDIT BELOW THIS LINE
         var d = document, s = d.createElement('script');
-        s.src = '{{config("blogetc.comments.disqus.src_url","ENTER YOUR URL HERE!!!")}}';
+        s.src = '{{config("hessamcms.comments.disqus.src_url","ENTER YOUR URL HERE!!!")}}';
         s.setAttribute('data-timestamp', +new Date());
         (d.head || d.body).appendChild(s);
     })();
 </script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus</a>, and run by <a href='https://webdevetc.com/'>WebDevEtc's BlogEtc Laravel Blog package</a></noscript>
\ No newline at end of file
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus</a>, and run by <a href='https://hessam.binshops.com/'>HessamCMS Laravel Blog package</a></noscript>
\ No newline at end of file
diff --git a/src/Views/blogetc/partials/full_post_details.blade.php b/src/Views/hessamcms/partials/full_post_details.blade.php
similarity index 66%
rename from src/Views/blogetc/partials/full_post_details.blade.php
rename to src/Views/hessamcms/partials/full_post_details.blade.php
index 0b84607..3bb877d 100644
--- a/src/Views/blogetc/partials/full_post_details.blade.php
+++ b/src/Views/hessamcms/partials/full_post_details.blade.php
@@ -1,4 +1,4 @@
-@if(\Auth::check() && \Auth::user()->canManageBlogEtcPosts())
+@if(\Auth::check() && \Auth::user()->canManageHessamCMSPosts())
     <a href="{{$post->edit_url()}}" class="btn btn-outline-secondary btn-sm pull-right float-right">Edit
         Post</a>
 @endif
@@ -12,9 +12,9 @@
 <p class="blog_body_content">
     {!! $post->post_body_output() !!}
 
-    {{--@if(config("blogetc.use_custom_view_files")  && $post->use_view_file)--}}
+    {{--@if(config("hessamcms.use_custom_view_files")  && $post->use_view_file)--}}
     {{--                                // use a custom blade file for the output of those blog post--}}
-    {{--   @include("blogetc::partials.use_view_file")--}}
+    {{--   @include("hessamcms::partials.use_view_file")--}}
     {{--@else--}}
     {{--   {!! $post->post_body !!}        // unsafe, echoing the plain html/js--}}
     {{--   {{ $post->post_body }}          // for safe escaping --}}
@@ -25,5 +25,5 @@
 
 Posted <strong>{{$post->post->posted_at->diffForHumans()}}</strong>
 
-@includeWhen($post->author,"blogetc::partials.author",['post'=>$post])
-@includeWhen($post->categories,"blogetc::partials.categories",['post'=>$post])
+@includeWhen($post->author,"hessamcms::partials.author",['post'=>$post])
+@includeWhen($post->categories,"hessamcms::partials.categories",['post'=>$post])
diff --git a/src/Views/blogetc/partials/index_loop.blade.php b/src/Views/hessamcms/partials/index_loop.blade.php
similarity index 81%
rename from src/Views/blogetc/partials/index_loop.blade.php
rename to src/Views/hessamcms/partials/index_loop.blade.php
index 15639a9..6ce4335 100644
--- a/src/Views/blogetc/partials/index_loop.blade.php
+++ b/src/Views/hessamcms/partials/index_loop.blade.php
@@ -1,6 +1,6 @@
 {{--Used on the index page (so shows a small summary--}}
-{{--See the guide on WebDevEtc.binshops.com for how to copy these files to your /resources/views/ directory--}}
-{{--https://WebDevEtc.binshops.com/laravel-blog-package--}}
+{{--See the guide on hessam.binshops.com for how to copy these files to your /resources/views/ directory--}}
+{{--https://hessam.binshops.com/laravel-blog-package--}}
 
 <div class="col-md-6">
     <div class="blog-item">
@@ -12,7 +12,7 @@
             <h3 class=''><a href='{{$post->url($locale)}}'>{{$post->title}}</a></h3>
             <h5 class=''>{{$post->subtitle}}</h5>
 
-            @if (config('blogetc.show_full_text_at_list'))
+            @if (config('hessamcms.show_full_text_at_list'))
                 <p>{!! $post->post_body_output() !!}</p>
             @else
                 <p>{!! mb_strimwidth($post->post_body_output(), 0, 400, "...") !!}</p>
diff --git a/src/Views/blogetc/partials/search_form.blade.php b/src/Views/hessamcms/partials/search_form.blade.php
similarity index 51%
rename from src/Views/blogetc/partials/search_form.blade.php
rename to src/Views/hessamcms/partials/search_form.blade.php
index f5579e0..c3e53e2 100644
--- a/src/Views/blogetc/partials/search_form.blade.php
+++ b/src/Views/hessamcms/partials/search_form.blade.php
@@ -1,4 +1,4 @@
 {{--This is only included for backwards compatibility. It will be removed at a future stage.--}}
-@if (config('blogetc.search.search_enabled') )
-    @include('blogetc::sitewide.search_form')
+@if (config('hessamcms.search.search_enabled') )
+    @include('hessamcms::sitewide.search_form')
 @endif
\ No newline at end of file
diff --git a/src/Views/blogetc/partials/show_comments.blade.php b/src/Views/hessamcms/partials/show_comments.blade.php
similarity index 65%
rename from src/Views/blogetc/partials/show_comments.blade.php
rename to src/Views/hessamcms/partials/show_comments.blade.php
index 2ea555f..7f1f594 100644
--- a/src/Views/blogetc/partials/show_comments.blade.php
+++ b/src/Views/hessamcms/partials/show_comments.blade.php
@@ -1,20 +1,20 @@
-@switch(config("blogetc.comments.type_of_comments_to_show","built_in"))
+@switch(config("hessamcms.comments.type_of_comments_to_show","built_in"))
 
 @case("built_in")
 {{-- default - show our own comments--}}
-@include("blogetc::partials.built_in_comments")
-@include("blogetc::partials.add_comment_form")
+@include("hessamcms::partials.built_in_comments")
+@include("hessamcms::partials.add_comment_form")
 @break
 
 @case("disqus")
 {{--use disqus--}}
-@include("blogetc::partials.disqus_comments")
+@include("hessamcms::partials.disqus_comments")
 @break
 
 
 @case("custom")
 {{--use custom - you should create the custom_comments in your vendor view dir and customise it--}}
-@include("blogetc::partials.custom_comments")
+@include("hessamcms::partials.custom_comments")
 @break
 
 @case("disabled")
diff --git a/src/Views/blogetc/partials/show_errors.blade.php b/src/Views/hessamcms/partials/show_errors.blade.php
similarity index 100%
rename from src/Views/blogetc/partials/show_errors.blade.php
rename to src/Views/hessamcms/partials/show_errors.blade.php
diff --git a/src/Views/blogetc/partials/use_view_file.blade.php b/src/Views/hessamcms/partials/use_view_file.blade.php
similarity index 72%
rename from src/Views/blogetc/partials/use_view_file.blade.php
rename to src/Views/hessamcms/partials/use_view_file.blade.php
index 420c850..71d36ba 100644
--- a/src/Views/blogetc/partials/use_view_file.blade.php
+++ b/src/Views/hessamcms/partials/use_view_file.blade.php
@@ -8,16 +8,16 @@
 
     {{--uh oh! the view file wasn't there. Show a detailed error if user is logged in and can manage the blog, otherwise show generic error.--}}
 
-    @if(\Auth::check() && \Auth::user()->canManageBlogEtcPosts())
-         {{--is logged in + canManageBlogEtcPosts() == true, so show a detailed error--}}
+    @if(\Auth::check() && \Auth::user()->canManageHessamCMSPosts())
+         {{--is logged in + canManageHessamCMSPosts() == true, so show a detailed error--}}
         <div class='alert alert-danger'>Custom blog post blade view file
                         (<code>{{$post->full_view_file_path()}}</code>) not found. <a
-                    href='https://webdevetc.com/laravel/packages/help-documentation/laravel-blog-package-blogetc'
+                    href='https://hessam.binshops.com/laravel/packages/help-documentation/laravel-blog-package-hessamcms'
                     target='_blank'>See Laravel Blog Package help here</a>.
                     </div>
 
     @else
-        {{--is not logged in, or User::canManageBlogEtcPosts() for current user == false--}}
+        {{--is not logged in, or User::canManageHessamCMSPosts() for current user == false--}}
         {{--show basic error message--}}
         <div class='alert alert-danger'>Sorry, but there is an error showing that blog post. Please come back later.</div>
     @endif
diff --git a/src/Views/blogetc/saved_comment.blade.php b/src/Views/hessamcms/saved_comment.blade.php
similarity index 84%
rename from src/Views/blogetc/saved_comment.blade.php
rename to src/Views/hessamcms/saved_comment.blade.php
index 2f14f35..23a5927 100755
--- a/src/Views/blogetc/saved_comment.blade.php
+++ b/src/Views/hessamcms/saved_comment.blade.php
@@ -4,7 +4,7 @@
     <div class='text-center'>
         <h3>Thanks! Your comment has been saved!</h3>
 
-        @if(!config("blogetc.comments.auto_approve_comments",false) )
+        @if(!config("hessamcms.comments.auto_approve_comments",false) )
             <p>After an admin user approves the comment, it'll appear on the site!</p>
         @endif
 
diff --git a/src/Views/blogetc/search.blade.php b/src/Views/hessamcms/search.blade.php
similarity index 78%
rename from src/Views/blogetc/search.blade.php
rename to src/Views/hessamcms/search.blade.php
index 1f01f01..3a03f5d 100755
--- a/src/Views/blogetc/search.blade.php
+++ b/src/Views/hessamcms/search.blade.php
@@ -12,9 +12,9 @@
                         @if(isset($result->indexable))
                             @php $search_count += $search_count + 1; @endphp
                             <?php $post = $result->indexable; ?>
-                            @if($post && is_a($post,\WebDevEtc\BlogEtc\Models\HessamPost::class))
+                            @if($post && is_a($post,\HessamCMS\Models\HessamPost::class))
                                 <h2>Search result #{{$search_count}}</h2>
-                                @include("blogetc::partials.index_loop")
+                                @include("hessamcms::partials.index_loop")
                             @else
 
                                 <div class='alert alert-danger'>Unable to show this search result - unknown type</div>
@@ -28,7 +28,7 @@
                     <h6>Blog Categories</h6>
                     <ul class="hessam-cat-hierarchy">
                         @if($categories)
-                            @include("blogetc::partials._category_partial", ['category_tree' => $categories])
+                            @include("hessamcms::partials._category_partial", ['category_tree' => $categories])
                         @else
                             <span>No Categories</span>
                         @endif
@@ -36,8 +36,8 @@
                 </div>
             </div>
 
-            @if (config('blogetc.search.search_enabled') )
-                @include('blogetc::sitewide.search_form')
+            @if (config('hessamcms.search.search_enabled') )
+                @include('hessamcms::sitewide.search_form')
             @endif
 
         </div>
diff --git a/src/Views/blogetc/single_post.blade.php b/src/Views/hessamcms/single_post.blade.php
similarity index 55%
rename from src/Views/blogetc/single_post.blade.php
rename to src/Views/hessamcms/single_post.blade.php
index 856f364..d76ba5a 100755
--- a/src/Views/blogetc/single_post.blade.php
+++ b/src/Views/hessamcms/single_post.blade.php
@@ -6,26 +6,26 @@
 
 @section("content")
 
-    @if(config("blogetc.reading_progress_bar"))
+    @if(config("hessamcms.reading_progress_bar"))
         <div id="scrollbar">
             <div id="scrollbar-bg"></div>
         </div>
     @endif
 
-    {{--https://webdevetc.com/laravel/packages/blogetc-blog-system-for-your-laravel-app/help-documentation/laravel-blog-package-blogetc#guide_to_views--}}
+    {{--https://hessam.binshops.com/laravel/packages/hessamcms-blog-system-for-your-laravel-app/help-documentation/laravel-blog-package-hessamcms#guide_to_views--}}
 
     <div class='container'>
     <div class='row'>
         <div class='col-sm-12 col-md-12 col-lg-12'>
 
-            @include("blogetc::partials.show_errors")
-            @include("blogetc::partials.full_post_details")
+            @include("hessamcms::partials.show_errors")
+            @include("hessamcms::partials.full_post_details")
 
 
-            @if(config("blogetc.comments.type_of_comments_to_show","built_in") !== 'disabled')
+            @if(config("hessamcms.comments.type_of_comments_to_show","built_in") !== 'disabled')
                 <div class="" id='maincommentscontainer'>
-                    <h2 class='text-center' id='blogetccomments'>Comments</h2>
-                    @include("blogetc::partials.show_comments")
+                    <h2 class='text-center' id='hessamcmscomments'>Comments</h2>
+                    @include("hessamcms::partials.show_comments")
                 </div>
             @else
                 {{--Comments are disabled--}}
diff --git a/src/Views/blogetc/sitewide/random_posts.blade.php b/src/Views/hessamcms/sitewide/random_posts.blade.php
similarity index 65%
rename from src/Views/blogetc/sitewide/random_posts.blade.php
rename to src/Views/hessamcms/sitewide/random_posts.blade.php
index 650ac7a..84ff385 100644
--- a/src/Views/blogetc/sitewide/random_posts.blade.php
+++ b/src/Views/hessamcms/sitewide/random_posts.blade.php
@@ -1,6 +1,6 @@
 <h5>Random Posts</h5>
 <ul class="nav">
-    @foreach(\WebDevEtc\BlogEtc\Models\HessamPost::inRandomOrder()->limit(5)->get() as $post)
+    @foreach(\HessamCMS\Models\HessamPost::inRandomOrder()->limit(5)->get() as $post)
         <li class="nav-item">
             <a class='nav-link' href='{{$post->url()}}'>{{$post->title}}</a>
         </li>
diff --git a/src/Views/blogetc/sitewide/recent_posts.blade.php b/src/Views/hessamcms/sitewide/recent_posts.blade.php
similarity index 63%
rename from src/Views/blogetc/sitewide/recent_posts.blade.php
rename to src/Views/hessamcms/sitewide/recent_posts.blade.php
index 66468fc..7f73ba0 100644
--- a/src/Views/blogetc/sitewide/recent_posts.blade.php
+++ b/src/Views/hessamcms/sitewide/recent_posts.blade.php
@@ -1,6 +1,6 @@
 <h5>Recent Posts</h5>
 <ul class="nav">
-    @foreach(\WebDevEtc\BlogEtc\Models\HessamPost::orderBy("posted_at","desc")->limit(5)->get() as $post)
+    @foreach(\HessamCMS\Models\HessamPost::orderBy("posted_at","desc")->limit(5)->get() as $post)
         <li class="nav-item">
             <a class='nav-link' href='{{$post->url()}}'>{{$post->title}}</a>
         </li>
diff --git a/src/Views/blogetc/sitewide/search_form.blade.php b/src/Views/hessamcms/sitewide/search_form.blade.php
similarity index 74%
rename from src/Views/blogetc/sitewide/search_form.blade.php
rename to src/Views/hessamcms/sitewide/search_form.blade.php
index 5b562ec..9eaf109 100644
--- a/src/Views/blogetc/sitewide/search_form.blade.php
+++ b/src/Views/hessamcms/sitewide/search_form.blade.php
@@ -1,5 +1,5 @@
 <div style='max-width:500px;margin:50px auto;' class='search-form-outer'>
-    <form method='get' action='{{route("blogetc.search", app('request')->get('locale'))}}' class='text-center'>
+    <form method='get' action='{{route("hessamcms.search", app('request')->get('locale'))}}' class='text-center'>
         <h4>Search for something in our blog:</h4>
         <input type='text' name='s' placeholder='Search...' class='form-control' value='{{\Request::get("s")}}'>
         <input type='submit' value='Search' class='btn btn-primary m-2'>
diff --git a/src/Views/blogetc/sitewide/show_all_categories.blade.php b/src/Views/hessamcms/sitewide/show_all_categories.blade.php
similarity index 63%
rename from src/Views/blogetc/sitewide/show_all_categories.blade.php
rename to src/Views/hessamcms/sitewide/show_all_categories.blade.php
index eead550..66468be 100644
--- a/src/Views/blogetc/sitewide/show_all_categories.blade.php
+++ b/src/Views/hessamcms/sitewide/show_all_categories.blade.php
@@ -1,6 +1,6 @@
 <h5>Post Categories</h5>
 <ul class="nav">
-    @foreach(\WebDevEtc\BlogEtc\Models\HessamCategory::orderBy("category_name")->limit(200)->get() as $category)
+    @foreach(\HessamCMS\Models\HessamCategory::orderBy("category_name")->limit(200)->get() as $category)
         <li class="nav-item">
             <a class='nav-link' href='{{$category->url()}}'>{{$category->category_name}}</a>
         </li>
diff --git a/src/Views/blogetc_admin/categories/_category_partial.blade.php b/src/Views/hessamcms_admin/categories/_category_partial.blade.php
similarity index 73%
rename from src/Views/blogetc_admin/categories/_category_partial.blade.php
rename to src/Views/hessamcms_admin/categories/_category_partial.blade.php
index da7dc94..b68d40d 100644
--- a/src/Views/blogetc_admin/categories/_category_partial.blade.php
+++ b/src/Views/hessamcms_admin/categories/_category_partial.blade.php
@@ -5,7 +5,7 @@
         </span>
         @if( count($category->siblings) > 0)
             <ul>
-                @include("blogetc_admin::categories._category_partial", ['category_tree' => $category->siblings])
+                @include("hessamcms_admin::categories._category_partial", ['category_tree' => $category->siblings])
             </ul>
         @endif
     </li>
diff --git a/src/Views/blogetc_admin/categories/add_category.blade.php b/src/Views/hessamcms_admin/categories/add_category.blade.php
similarity index 92%
rename from src/Views/blogetc_admin/categories/add_category.blade.php
rename to src/Views/hessamcms_admin/categories/add_category.blade.php
index bbafaf8..d1db446 100755
--- a/src/Views/blogetc_admin/categories/add_category.blade.php
+++ b/src/Views/hessamcms_admin/categories/add_category.blade.php
@@ -1,8 +1,8 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
     <h5>Admin - Add Category</h5>
-    <form method='post' action='{{route("blogetc.admin.categories.create_category")}}'  enctype="multipart/form-data" >
+    <form method='post' action='{{route("hessamcms.admin.categories.create_category")}}'  enctype="multipart/form-data" >
 
         @csrf
 
@@ -51,7 +51,7 @@ class="form-control"
 
             <small id="category_slug_help" class="form-text text-muted">
                 Letters, numbers, dash only. The slug
-                i.e. {{route("blogetc.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+                i.e. {{route("hessamcms.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
                 share the same slug).
 
             </small>
@@ -60,7 +60,7 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category Tree</label>
             <ul class="wtree">
-                @include("blogetc_admin::categories._category_partial", ['category_tree' => $cat_roots])
+                @include("hessamcms_admin::categories._category_partial", ['category_tree' => $cat_roots])
             </ul>
         </div>
 
@@ -171,7 +171,7 @@ function fillLanguageList(langId){
                     languageList[preLangId].slug = $('#category_slug').val();
                     languageList[preLangId].category_description = $('#category_description').val();
                 }
-                $.post('{{route("blogetc.admin.categories.store_category")}}' ,
+                $.post('{{route("hessamcms.admin.categories.store_category")}}' ,
                     {
                         data: languageList,
                         parent_id: parseInt($('#parent_id').val())
@@ -181,7 +181,7 @@ function(data, status){
                             alert("Slug is already taken: " + languageList[data.data].lang_name);
                         }else if (data.code === 200) {
                         }
-                        window.location.replace("{{route('blogetc.admin.categories.index')}}");
+                        window.location.replace("{{route('hessamcms.admin.categories.index')}}");
                     });
             });
 
diff --git a/src/Views/blogetc_admin/categories/edit_category.blade.php b/src/Views/hessamcms_admin/categories/edit_category.blade.php
similarity index 92%
rename from src/Views/blogetc_admin/categories/edit_category.blade.php
rename to src/Views/hessamcms_admin/categories/edit_category.blade.php
index b71fff1..b2e701d 100755
--- a/src/Views/blogetc_admin/categories/edit_category.blade.php
+++ b/src/Views/hessamcms_admin/categories/edit_category.blade.php
@@ -1,10 +1,10 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
     <h5>Admin - Edit Category</h5>
 
-    <form method='post' action='{{route("blogetc.admin.categories.edit_category",$category->id)}}'  enctype="multipart/form-data" >
+    <form method='post' action='{{route("hessamcms.admin.categories.edit_category",$category->id)}}'  enctype="multipart/form-data" >
 
         @csrf
         @method("patch")
@@ -69,7 +69,7 @@ class="form-control"
 
             <small id="category_slug_help" class="form-text text-muted">
                 Letters, numbers, dash only. The slug
-                i.e. {{route("blogetc.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+                i.e. {{route("hessamcms.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
                 share the same slug).
 
             </small>
diff --git a/src/Views/blogetc_admin/categories/form.blade.php b/src/Views/hessamcms_admin/categories/form.blade.php
similarity index 95%
rename from src/Views/blogetc_admin/categories/form.blade.php
rename to src/Views/hessamcms_admin/categories/form.blade.php
index 51ac6f7..f550912 100755
--- a/src/Views/blogetc_admin/categories/form.blade.php
+++ b/src/Views/hessamcms_admin/categories/form.blade.php
@@ -58,7 +58,7 @@ class="form-control"
 
     <small id="category_slug_help" class="form-text text-muted">
         Letters, numbers, dash only. The slug
-        i.e. {{route("blogetc.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+        i.e. {{route("hessamcms.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
         share the same slug).
 
     </small>
diff --git a/src/Views/blogetc_admin/categories/index.blade.php b/src/Views/hessamcms_admin/categories/index.blade.php
similarity index 85%
rename from src/Views/blogetc_admin/categories/index.blade.php
rename to src/Views/hessamcms_admin/categories/index.blade.php
index c35a9b4..dd92621 100755
--- a/src/Views/blogetc_admin/categories/index.blade.php
+++ b/src/Views/hessamcms_admin/categories/index.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
     @forelse ($categories as $category)
@@ -14,7 +14,7 @@
 
                         onsubmit="return confirm('Are you sure you want to delete this blog post category?\n You cannot undo this action!');"
 
-                        method='post' action='{{route("blogetc.admin.categories.destroy_category", $category->category_id)}}' class='float-right'>
+                        method='post' action='{{route("hessamcms.admin.categories.destroy_category", $category->category_id)}}' class='float-right'>
                     @csrf
                     @method("DELETE")
                     <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
diff --git a/src/Views/blogetc_admin/comments/index.blade.php b/src/Views/hessamcms_admin/comments/index.blade.php
similarity index 87%
rename from src/Views/blogetc_admin/comments/index.blade.php
rename to src/Views/hessamcms_admin/comments/index.blade.php
index ead49a6..bfc00e8 100755
--- a/src/Views/blogetc_admin/comments/index.blade.php
+++ b/src/Views/hessamcms_admin/comments/index.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
     @forelse ($comments as $comment)
@@ -43,7 +43,7 @@
 
                 @if(!$comment->approved)
                     {{--APPROVE BUTTON--}}
-                    <form method='post' action='{{route("blogetc.admin.comments.approve", $comment->id)}}' class='float-right'>
+                    <form method='post' action='{{route("hessamcms.admin.comments.approve", $comment->id)}}' class='float-right'>
                         @csrf
                         @method("PATCH")
                         <input type='submit' class='btn btn-success btn-sm' value='Approve'/>
@@ -53,7 +53,7 @@
                 {{--DELETE BUTTON--}}
                 <form
                         onsubmit="return confirm('Are you sure you want to delete this blog post comment?\n You cannot undo this action!');"
-                        method='post' action='{{route("blogetc.admin.comments.delete", $comment->id)}}' class='float-right'>
+                        method='post' action='{{route("hessamcms.admin.comments.delete", $comment->id)}}' class='float-right'>
                     @csrf
                     @method("DELETE")
                     <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
diff --git a/src/Views/blogetc_admin/imageupload/create.blade.php b/src/Views/hessamcms_admin/imageupload/create.blade.php
similarity index 76%
rename from src/Views/blogetc_admin/imageupload/create.blade.php
rename to src/Views/hessamcms_admin/imageupload/create.blade.php
index b2803fc..26b1d95 100644
--- a/src/Views/blogetc_admin/imageupload/create.blade.php
+++ b/src/Views/hessamcms_admin/imageupload/create.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -7,7 +7,7 @@
     <p>You can use this to upload images.</p>
 
 
-    <form method='post' action='{{route("blogetc.admin.images.store")}}' enctype="multipart/form-data">
+    <form method='post' action='{{route("hessamcms.admin.images.store")}}' enctype="multipart/form-data">
 
         @csrf
 
@@ -37,12 +37,12 @@
             <label >Sizes to convert to</label>
 
             <div>
-                <input type='checkbox' name='sizes_to_upload[blogetc_full_size]' value='true' checked id='size_blogetc_full_size'>
-            <label for='size_blogetc_full_size'>Full size (no resizing)</label>
+                <input type='checkbox' name='sizes_to_upload[hessamcms_full_size]' value='true' checked id='size_hessamcms_full_size'>
+            <label for='size_hessamcms_full_size'>Full size (no resizing)</label>
                 </div>
 
 
-            @foreach((array)config('blogetc.image_sizes') as $size => $image_size_details)
+            @foreach((array)config('hessamcms.image_sizes') as $size => $image_size_details)
             <div>
                 <input type='checkbox' name='sizes_to_upload[{{$size}}]' value='true' checked id='size_{{$size}}'>
                 <label for='size_{{$size}}'>{{$image_size_details['name']}} - {{$image_size_details['w']}} x {{$image_size_details['h']}}px</label>
diff --git a/src/Views/blogetc_admin/imageupload/index.blade.php b/src/Views/hessamcms_admin/imageupload/index.blade.php
similarity index 87%
rename from src/Views/blogetc_admin/imageupload/index.blade.php
rename to src/Views/hessamcms_admin/imageupload/index.blade.php
index fc516a0..e189cca 100644
--- a/src/Views/blogetc_admin/imageupload/index.blade.php
+++ b/src/Views/hessamcms_admin/imageupload/index.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -46,11 +46,11 @@ function show_uploaded_file_row(id, img) {
                             <h6 class='text-center mt-3'><strong>{{$file_key}}</strong> - {{$file['w']}}
                                 x {{$file['h']}}:</h6>
                             <p class='text-center'><a
-                                        href='{{asset(     config("blogetc.blog_upload_dir") . "/". $file['filename'])}}'
+                                        href='{{asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])}}'
                                         target='_blank'>[link]</a> / <span
                                         class='btn btn-sm btn-primary'
                                         style='cursor: zoom-in;'
-                                        onclick='show_uploaded_file_row("{{$id}}","{{asset(     config("blogetc.blog_upload_dir") . "/". $file['filename'])}}")'>show</span>
+                                        onclick='show_uploaded_file_row("{{$id}}","{{asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])}}")'>show</span>
                             </p>
 
                             <div id="{{$id}}"></div>
@@ -59,7 +59,7 @@ class='btn btn-sm btn-primary'
                             <div style=''>
                                 <small class='text-muted'>Image URL</small>
                                 <input type='text' readonly='readonly' class='form-control'
-                                       value='{{asset(     config("blogetc.blog_upload_dir") . "/". $file['filename'])}}'>
+                                       value='{{asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])}}'>
                             </div>
                         </div>
                         <div class='col-md-6 {{$id}}' style='display:none;'>
@@ -67,7 +67,7 @@ class='btn btn-sm btn-primary'
                             <div style=''>
                                 <small class='text-muted'>img tag</small>
                                 <input type='text' readonly='readonly' class='form-control'
-                                       value='{{"<img src='".asset(     config("blogetc.blog_upload_dir") . "/". $file['filename'])."' alt='" . e($uploadedPhoto->image_title) . "' >"}}'>
+                                       value='{{"<img src='".asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])."' alt='" . e($uploadedPhoto->image_title) . "' >"}}'>
                             </div>
                         </div>
 
@@ -89,9 +89,9 @@ class='btn btn-sm btn-primary'
 
 
                         <div style='text-align:center;'>
-                            <a style='cursor: zoom-in;' href='{{asset(     config("blogetc.blog_upload_dir") . "/". $smallest['filename'])}}'
+                            <a style='cursor: zoom-in;' href='{{asset(     config("hessamcms.blog_upload_dir") . "/". $smallest['filename'])}}'
                                target='_blank'>
-                                <img src='{{asset(     config("blogetc.blog_upload_dir") . "/". $smallest['filename'])}}'
+                                <img src='{{asset(     config("hessamcms.blog_upload_dir") . "/". $smallest['filename'])}}'
                                      style='max-width:100%; height: auto;'>
                             </a>
                         </div>
diff --git a/src/Views/blogetc_admin/imageupload/uploaded.blade.php b/src/Views/hessamcms_admin/imageupload/uploaded.blade.php
similarity index 56%
rename from src/Views/blogetc_admin/imageupload/uploaded.blade.php
rename to src/Views/hessamcms_admin/imageupload/uploaded.blade.php
index 8456868..825c723 100644
--- a/src/Views/blogetc_admin/imageupload/uploaded.blade.php
+++ b/src/Views/hessamcms_admin/imageupload/uploaded.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -15,12 +15,12 @@
                 <small>{{$image['w'] . "x" . $image['h']}}</small>
             </h6>
 
-            <a href='{{asset(     config("blogetc.blog_upload_dir") . "/". $image['filename'])}}' target='_blank'>
-                <img src='{{asset(     config("blogetc.blog_upload_dir") . "/". $image['filename'])}}'
+            <a href='{{asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])}}' target='_blank'>
+                <img src='{{asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])}}'
                      style='max-width:400px; height: auto;'>
             </a>
-            <input type='text' readonly='readonly' class='form-control' value='{{asset(     config("blogetc.blog_upload_dir") . "/". $image['filename'])}}'>
-            <input type='text' readonly='readonly' class='form-control' value='{{"<img src='".asset(     config("blogetc.blog_upload_dir") . "/". $image['filename'])."' alt='' >"}}'>
+            <input type='text' readonly='readonly' class='form-control' value='{{asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])}}'>
+            <input type='text' readonly='readonly' class='form-control' value='{{"<img src='".asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])."' alt='' >"}}'>
 
 
         </div>
diff --git a/src/Views/blogetc_admin/index.blade.php b/src/Views/hessamcms_admin/index.blade.php
similarity index 95%
rename from src/Views/blogetc_admin/index.blade.php
rename to src/Views/hessamcms_admin/index.blade.php
index 2cb7b95..eac3332 100755
--- a/src/Views/blogetc_admin/index.blade.php
+++ b/src/Views/hessamcms_admin/index.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -80,7 +80,7 @@
                     <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                     Edit Post</a>
                 <form onsubmit="return confirm('Are you sure you want to delete this blog post?\n You cannot undo this action!');"
-                      method='post' action='{{route("blogetc.admin.destroy_post", $post->post_id)}}' class='float-right'>
+                      method='post' action='{{route("hessamcms.admin.destroy_post", $post->post_id)}}' class='float-right'>
                     @csrf
                     <input name="_method" type="hidden" value="DELETE"/>
                     <button type='submit' class='btn btn-danger btn-sm'>
diff --git a/src/Views/blogetc_admin/languages/add_language.blade.php b/src/Views/hessamcms_admin/languages/add_language.blade.php
similarity index 97%
rename from src/Views/blogetc_admin/languages/add_language.blade.php
rename to src/Views/hessamcms_admin/languages/add_language.blade.php
index fad322d..835a926 100755
--- a/src/Views/blogetc_admin/languages/add_language.blade.php
+++ b/src/Views/hessamcms_admin/languages/add_language.blade.php
@@ -1,10 +1,10 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
     <h5>Add new Language</h5>
 
-    <form method='post' action='{{route("blogetc.admin.languages.store_language")}}'  enctype="multipart/form-data" >
+    <form method='post' action='{{route("hessamcms.admin.languages.store_language")}}'  enctype="multipart/form-data" >
         @csrf
 
         <div class="form-group">
diff --git a/src/Views/blogetc_admin/languages/deleted_language.blade.php b/src/Views/hessamcms_admin/languages/deleted_language.blade.php
similarity index 100%
rename from src/Views/blogetc_admin/languages/deleted_language.blade.php
rename to src/Views/hessamcms_admin/languages/deleted_language.blade.php
diff --git a/src/Views/blogetc_admin/languages/edit_language.blade.php b/src/Views/hessamcms_admin/languages/edit_language.blade.php
similarity index 100%
rename from src/Views/blogetc_admin/languages/edit_language.blade.php
rename to src/Views/hessamcms_admin/languages/edit_language.blade.php
diff --git a/src/Views/blogetc_admin/languages/form.blade.php b/src/Views/hessamcms_admin/languages/form.blade.php
similarity index 100%
rename from src/Views/blogetc_admin/languages/form.blade.php
rename to src/Views/hessamcms_admin/languages/form.blade.php
diff --git a/src/Views/blogetc_admin/languages/index.blade.php b/src/Views/hessamcms_admin/languages/index.blade.php
similarity index 82%
rename from src/Views/blogetc_admin/languages/index.blade.php
rename to src/Views/hessamcms_admin/languages/index.blade.php
index 1fe14e2..5fc22c1 100755
--- a/src/Views/blogetc_admin/languages/index.blade.php
+++ b/src/Views/hessamcms_admin/languages/index.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
     @forelse ($language_list as $language)
@@ -19,7 +19,7 @@
                 <form
                         onsubmit="return confirm('Are you sure you want to do this action?');"
 
-                        method='post' action='{{route("blogetc.admin.languages.toggle_language", $language->id)}}' class='float-left'>
+                        method='post' action='{{route("hessamcms.admin.languages.toggle_language", $language->id)}}' class='float-left'>
                     @csrf
 
                     @if($language->active == 1)
@@ -34,7 +34,7 @@
                 <form
                         onsubmit="return confirm('Are you sure you want to delete this language?\n You cannot undo this action!');"
 
-                        method='post' action='{{route("blogetc.admin.languages.destroy_language", $language->id)}}' class='float-right'>
+                        method='post' action='{{route("hessamcms.admin.languages.destroy_language", $language->id)}}' class='float-right'>
                     @csrf
                     @method("DELETE")
                     <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
diff --git a/src/Views/blogetc_admin/layouts/admin_layout.blade.php b/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
similarity index 90%
rename from src/Views/blogetc_admin/layouts/admin_layout.blade.php
rename to src/Views/hessamcms_admin/layouts/admin_layout.blade.php
index 9cc6026..b6130df 100755
--- a/src/Views/blogetc_admin/layouts/admin_layout.blade.php
+++ b/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
@@ -26,8 +26,8 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito" crossorigin="anonymous">
 
     <!-- Styles -->
-{{--    @if(file_exists(public_path("blogetc_admin_css.css")))--}}
-        <link href="{{ asset('blogetc_admin_css.css') }}" rel="stylesheet">
+{{--    @if(file_exists(public_path("hessamcms_admin_css.css")))--}}
+        <link href="{{ asset('hessamcms_admin_css.css') }}" rel="stylesheet">
 {{--    @else--}}
 {{--        <link href="{{ asset('css/app.css') }}" rel="stylesheet">--}}
         {{--Edited your css/app.css file? Uncomment these lines to use plain bootstrap:--}}
@@ -41,7 +41,7 @@
 <div id="app">
     <nav class="navbar navbar-expand-md navbar-light navbar-laravel">
         <div class="container">
-            <a class="navbar-brand hessam-blog-title" href="{{ route('blogetc.admin.index') }}">
+            <a class="navbar-brand hessam-blog-title" href="{{ route('hessamcms.admin.index') }}">
                 {{ config('app.name', 'Laravel') }} Blog Dashboard
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
@@ -60,7 +60,7 @@
                 <ul class="navbar-nav ml-auto">
                     <!-- Authentication Links -->
 
-                    <li class='nav-item px-2'><a class='nav-link' href='{{route("blogetc.index" , $post->url(app('request')->get('locale')))}}'>Blog home</a></li>
+                    <li class='nav-item px-2'><a class='nav-link' href='{{route("hessamcms.index" , $post->url(app('request')->get('locale')))}}'>Blog home</a></li>
 
                     <li class="nav-item ">
                         <a id="" class="nav-link " href="#" role="button"
@@ -87,7 +87,7 @@
         <div class="container">
             <div class='row full-width-div nav-bar-full'>
                 <div class='list-group-color'>
-                    @include("blogetc_admin::layouts.sidebar")
+                    @include("hessamcms_admin::layouts.sidebar")
                     <div class=' list-group-color text-center mt-5 mb-3 text-muted hessam-version'>
                         <small><a href='https://github.com/vhessam/laravel-blogger'>Hessam CMS</a></small>
 
@@ -112,9 +112,9 @@
 
                     {{--REPLACING THIS FILE WITH YOUR OWN LAYOUT FILE? Don't forget to include the following section!--}}
 
-                    @if(\WebDevEtc\BlogEtc\Helpers::has_flashed_message())
+                    @if(\HessamCMS\Helpers::has_flashed_message())
                         <div class='alert alert-info'>
-                            <h3>{{\WebDevEtc\BlogEtc\Helpers::pull_flashed_message() }}</h3>
+                            <h3>{{\HessamCMS\Helpers::pull_flashed_message() }}</h3>
                         </div>
                     @endif
 
diff --git a/src/Views/blogetc_admin/layouts/sidebar.blade.php b/src/Views/hessamcms_admin/layouts/sidebar.blade.php
similarity index 63%
rename from src/Views/blogetc_admin/layouts/sidebar.blade.php
rename to src/Views/hessamcms_admin/layouts/sidebar.blade.php
index 7390a20..e4a6d0a 100755
--- a/src/Views/blogetc_admin/layouts/sidebar.blade.php
+++ b/src/Views/hessamcms_admin/layouts/sidebar.blade.php
@@ -1,9 +1,9 @@
 <ul class="list-group">
     <li class="list-group-item list-group-color justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('blogetc.admin.index') }}">Dashboard</a>
+            <h6 class="my-0"><a href="{{ route('hessamcms.admin.index') }}">Dashboard</a>
                 <span class="text-muted">(<?php
-                    $categoryCount = \WebDevEtc\BlogEtc\Models\HessamPost::count();
+                    $categoryCount = \HessamCMS\Models\HessamPost::count();
 
                     echo $categoryCount . " " . str_plural("Post", $categoryCount);
 
@@ -13,13 +13,13 @@
 
             <div class="list-group ">
 
-                <a href='{{ route('blogetc.admin.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action @if(\Request::route()->getName() === 'blogetc.admin.index') active @endif  '><i
+                <a href='{{ route('hessamcms.admin.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action @if(\Request::route()->getName() === 'hessamcms.admin.index') active @endif  '><i
                             class="fa fa-th fa-fw"
                             aria-hidden="true"></i>
                     All Posts</a>
-                <a href='{{ route('blogetc.admin.create_post') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.create_post') active @endif  '><i
+                <a href='{{ route('hessamcms.admin.create_post') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.create_post') active @endif  '><i
                             class="fa fa-plus fa-fw" aria-hidden="true"></i>
                     Add Post</a>
             </div>
@@ -29,10 +29,10 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
 
     <li class="list-group-item list-group-color justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('blogetc.admin.comments.index') }}">Comments</a>
+            <h6 class="my-0"><a href="{{ route('hessamcms.admin.comments.index') }}">Comments</a>
 
                 <span class="text-muted">(<?php
-                    $commentCount = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->count();
+                    $commentCount = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->count();
 
                     echo $commentCount . " " . str_plural("Comment", $commentCount);
 
@@ -41,16 +41,16 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
             <small class="text-muted">Manage your comments</small>
 
             <div class="list-group ">
-                <a href='{{ route('blogetc.admin.comments.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.comments.index' && !\Request::get("waiting_for_approval")) active @endif   '><i
+                <a href='{{ route('hessamcms.admin.comments.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.comments.index' && !\Request::get("waiting_for_approval")) active @endif   '><i
                             class="fa  fa-fw fa-comments" aria-hidden="true"></i>
                     All Comments</a>
 
 
-                <?php $comment_approval_count = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where("approved", false)->count(); ?>
+                <?php $comment_approval_count = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where("approved", false)->count(); ?>
 
-                <a href='{{ route('blogetc.admin.comments.index') }}?waiting_for_approval=true'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.comments.index' && \Request::get("waiting_for_approval")) active @elseif($comment_approval_count>0) list-group-item list-group-color-warning @endif  '><i
+                <a href='{{ route('hessamcms.admin.comments.index') }}?waiting_for_approval=true'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.comments.index' && \Request::get("waiting_for_approval")) active @elseif($comment_approval_count>0) list-group-item list-group-color-warning @endif  '><i
                             class="fa  fa-fw fa-comments" aria-hidden="true"></i>
                     {{ $comment_approval_count }}
                     Waiting for approval </a>
@@ -62,9 +62,9 @@ class="fa  fa-fw fa-comments" aria-hidden="true"></i>
 
     <li class="list-group-item list-group-color  justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('blogetc.admin.categories.index') }}">Categories</a>
+            <h6 class="my-0"><a href="{{ route('hessamcms.admin.categories.index') }}">Categories</a>
                 <span class="text-muted">(<?php
-                    $postCount = \WebDevEtc\BlogEtc\Models\HessamCategory::count();
+                    $postCount = \HessamCMS\Models\HessamCategory::count();
                     echo $postCount . " " . str_plural("Category", $postCount);
                     ?>)</span>
             </h6>
@@ -73,12 +73,12 @@ class="fa  fa-fw fa-comments" aria-hidden="true"></i>
             <small class="text-muted">Blog post categories</small>
 
             <div class="list-group ">
-                <a href='{{ route('blogetc.admin.categories.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.categories.index') active @endif  '><i
+                <a href='{{ route('hessamcms.admin.categories.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.categories.index') active @endif  '><i
                             class="fa fa-object-group fa-fw" aria-hidden="true"></i>
                     All Categories</a>
-                <a href='{{ route('blogetc.admin.categories.create_category') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.categories.create_category') active @endif  '><i
+                <a href='{{ route('hessamcms.admin.categories.create_category') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.categories.create_category') active @endif  '><i
                             class="fa fa-plus fa-fw" aria-hidden="true"></i>
                     Add Category</a>
             </div>
@@ -89,17 +89,17 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
 
     <li class="list-group-item list-group-color  justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('blogetc.admin.images.upload') }}">Languages</a></h6>
+            <h6 class="my-0"><a href="{{ route('hessamcms.admin.images.upload') }}">Languages</a></h6>
 
             <div class="list-group ">
 
-                <a href='{{ route('blogetc.admin.languages.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.languages.index') active @endif  '><i
+                <a href='{{ route('hessamcms.admin.languages.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.languages.index') active @endif  '><i
                             class="fa fa-language fa-fw" aria-hidden="true"></i>
                     All Languages</a>
 
-                <a href='{{ route('blogetc.admin.languages.create_language') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.languages.create_language') active @endif  '><i
+                <a href='{{ route('hessamcms.admin.languages.create_language') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.languages.create_language') active @endif  '><i
                             class="fa fa-plus fa-fw" aria-hidden="true"></i>
                     Add new Language</a>
             </div>
@@ -107,20 +107,20 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
     </li>
 
 
-    @if(config("blogetc.image_upload_enabled"))
+    @if(config("hessamcms.image_upload_enabled"))
         <li class="list-group-item list-group-color  justify-content-between lh-condensed">
             <div>
-                <h6 class="my-0"><a href="{{ route('blogetc.admin.images.upload') }}">Upload images</a></h6>
+                <h6 class="my-0"><a href="{{ route('hessamcms.admin.images.upload') }}">Upload images</a></h6>
 
                 <div class="list-group ">
 
-                    <a href='{{ route('blogetc.admin.images.all') }}'
-                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.images.all') active @endif  '><i
+                    <a href='{{ route('hessamcms.admin.images.all') }}'
+                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.images.all') active @endif  '><i
                                 class="fa fa-picture-o fa-fw" aria-hidden="true"></i>
                         View All</a>
 
-                    <a href='{{ route('blogetc.admin.images.upload') }}'
-                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'blogetc.admin.images.upload') active @endif  '><i
+                    <a href='{{ route('hessamcms.admin.images.upload') }}'
+                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.images.upload') active @endif  '><i
                                 class="fa fa-upload fa-fw" aria-hidden="true"></i>
                         Upload</a>
                 </div>
diff --git a/src/Views/blogetc_admin/posts/add_post.blade.php b/src/Views/hessamcms_admin/posts/add_post.blade.php
similarity index 73%
rename from src/Views/blogetc_admin/posts/add_post.blade.php
rename to src/Views/hessamcms_admin/posts/add_post.blade.php
index d5f37d7..7da4f71 100755
--- a/src/Views/blogetc_admin/posts/add_post.blade.php
+++ b/src/Views/hessamcms_admin/posts/add_post.blade.php
@@ -1,13 +1,13 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
     <h5>Admin - Add post</h5>
     <p>Change language option to translate your post in different language</p>
-    <form id="add-post-form" method='post' action='{{route("blogetc.admin.store_post")}}'  enctype="multipart/form-data" >
+    <form id="add-post-form" method='post' action='{{route("hessamcms.admin.store_post")}}'  enctype="multipart/form-data" >
 
         @csrf
-        @include("blogetc_admin::posts.form", [
+        @include("hessamcms_admin::posts.form", [
     'post' => $post,
     'post_translation' => $post_translation
     ])
@@ -18,7 +18,7 @@
 
     <script>
         //multi language
-        var store_toggle_url = '{{route("blogetc.admin.store_post_toggle")}}';
+        var store_toggle_url = '{{route("hessamcms.admin.store_post_toggle")}}';
         var preLang = $('#language_list').val();
         $('#language_list').change(function (){
             $('#add-post-form').attr('action', store_toggle_url);
diff --git a/src/Views/blogetc_admin/posts/deleted_post.blade.php b/src/Views/hessamcms_admin/posts/deleted_post.blade.php
similarity index 65%
rename from src/Views/blogetc_admin/posts/deleted_post.blade.php
rename to src/Views/hessamcms_admin/posts/deleted_post.blade.php
index 7010d9a..8145729 100755
--- a/src/Views/blogetc_admin/posts/deleted_post.blade.php
+++ b/src/Views/hessamcms_admin/posts/deleted_post.blade.php
@@ -1,13 +1,13 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
     <div class='alert alert-success'><b>Deleted that post</b>
-        <br/><a href='{{ route('blogetc.admin.index') }}' class='btn btn-primary '>Back to posts overview</a></div>
+        <br/><a href='{{ route('hessamcms.admin.index') }}' class='btn btn-primary '>Back to posts overview</a></div>
 
     <?php
     $images_to_delete = [];
-    foreach ((array) config("blogetc.image_sizes") as $image_size => $image_size_info) {
+    foreach ((array) config("hessamcms.image_sizes") as $image_size => $image_size_info) {
         if (!$deletedPost->$image_size) {
             continue;
         }
@@ -32,25 +32,25 @@
 
 
                     <td class='text-center'><a
-                                href='{{asset(config("blogetc.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
+                                href='{{asset(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
                                 target='_blank' class='btn btn-primary m-1'>view</a>
 
-                        <img src='{{asset(config("blogetc.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
+                        <img src='{{asset(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
                              width=100>
 
                     </td>
                     <td><code>{{$deletedPost->$image_size}}</code>
 
             {{--check filesize returns something, so we don't divide by 0--}}
-                        @if(filesize(public_path(config("blogetc.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)))
+                        @if(filesize(public_path(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)))
 
-                        ({{ (round(filesize(public_path(config("blogetc.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)) / 1000 ,1)). " kb"}})
+                        ({{ (round(filesize(public_path(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)) / 1000 ,1)). " kb"}})
 
                         @endif
 
                     </td>
                     <td><code>
-                            <small>{{ public_path(config("blogetc.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}</small>
+                            <small>{{ public_path(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}</small>
                         </code></td>
                 </tr>
 
diff --git a/src/Views/blogetc_admin/posts/edit_post.blade.php b/src/Views/hessamcms_admin/posts/edit_post.blade.php
similarity index 76%
rename from src/Views/blogetc_admin/posts/edit_post.blade.php
rename to src/Views/hessamcms_admin/posts/edit_post.blade.php
index ae06d54..3ec1cff 100755
--- a/src/Views/blogetc_admin/posts/edit_post.blade.php
+++ b/src/Views/hessamcms_admin/posts/edit_post.blade.php
@@ -1,4 +1,4 @@
-@extends("blogetc_admin::layouts.admin_layout")
+@extends("hessamcms_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -8,7 +8,7 @@
         @endif
     </h5>
 
-    <form id="edit-post-form" method='post' action='{{route("blogetc.admin.update_post",$post->id)}}'  enctype="multipart/form-data" >
+    <form id="edit-post-form" method='post' action='{{route("hessamcms.admin.update_post",$post->id)}}'  enctype="multipart/form-data" >
 
         <p>
             To apply changes, click save changes for each language.
@@ -16,7 +16,7 @@
 
         @csrf
         @method("patch")
-        @include("blogetc_admin::posts.form", [
+        @include("hessamcms_admin::posts.form", [
           'post' => $post,
           'post_translation' => $post_translation
         ])
@@ -27,7 +27,7 @@
 
     <script>
         //multi language
-        var edit_toggle_url = '{{route("blogetc.admin.edit_post_toggle",$post->id)}}';
+        var edit_toggle_url = '{{route("hessamcms.admin.edit_post_toggle",$post->id)}}';
         var preLang = $('#language_list').val();
         $('#language_list').change(function (){
             $("#edit-post-form").attr("method", "get");
diff --git a/src/Views/blogetc_admin/posts/form.blade.php b/src/Views/hessamcms_admin/posts/form.blade.php
similarity index 93%
rename from src/Views/blogetc_admin/posts/form.blade.php
rename to src/Views/hessamcms_admin/posts/form.blade.php
index 52eb06f..ac4361d 100755
--- a/src/Views/blogetc_admin/posts/form.blade.php
+++ b/src/Views/hessamcms_admin/posts/form.blade.php
@@ -35,7 +35,7 @@
             <label for="blog_slug">Blog Post Slug</label>
             <input type="text" class="form-control" id="blog_slug" aria-describedby="blog_slug_help" name='slug'
                    value="{{old("slug",$post_translation->slug)}}">
-            <small id="blog_slug_help" class="form-text text-muted">The slug (leave blank to auto generate) - i.e.{{route("blogetc.single", [app('request')->get('locale'), "your-slug"])}}</small>
+            <small id="blog_slug_help" class="form-text text-muted">The slug (leave blank to auto generate) - i.e.{{route("hessamcms.single", [app('request')->get('locale'), "your-slug"])}}</small>
         </div>
 
     </div>
@@ -84,7 +84,7 @@
 
 <div class="form-group">
     <label for="blog_post_body">Post Body
-        @if(config("blogetc.echo_html"))
+        @if(config("hessamcms.echo_html"))
             (HTML)
         @else
          (Html will be escaped)
@@ -101,7 +101,7 @@
 </div>
 
 
-@if(config("blogetc.use_custom_view_files",true))
+@if(config("hessamcms.use_custom_view_files",true))
     <div class="form-group">
         <label for="blog_use_view_file">Custom View File</label>
         <input type="text" class="form-control" id="blog_use_view_file" aria-describedby="blog_use_view_file_help"
@@ -137,7 +137,7 @@
     <small id="blog_short_description_help" class="form-text text-muted">Short description (optional - only useful if you use in your template views)</small>
 </div>
 
-@if(config("blogetc.image_upload_enabled",true))
+@if(config("hessamcms.image_upload_enabled",true))
 
     <div class='bg-white pt-4 px-4 pb-0 my-2 mb-4 rounded border'>
         <style>
@@ -148,7 +148,7 @@
         <h4>Featured Images</h4>
 
 
-        @foreach(config("blogetc.image_sizes") as $size_key =>$size_info)
+        @foreach(config("hessamcms.image_sizes") as $size_key =>$size_info)
             <div class="form-group mb-4 p-2
         @if($loop->iteration>1)
                     image_upload_other_sizes
@@ -171,7 +171,7 @@
                        aria-describedby="blog_{{$size_key}}_help">
 
                 @if($post_translation->has_image($size_info['basic_key']))
-                    <a style="color: darkred" href="{{route("blogetc.admin.remove_photo", $post_translation->slug)}}">Remove Image</a>
+                    <a style="color: darkred" href="{{route("hessamcms.admin.remove_photo", $post_translation->slug)}}">Remove Image</a>
                 @endif
             </div>
         @endforeach
@@ -184,7 +184,7 @@ class='btn btn-light btn-sm'>Show other sizes</span>
 
     </div>
 @else
-    <div class='alert alert-warning'>Image uploads were disabled in blogetc.php config</div>
+    <div class='alert alert-warning'>Image uploads were disabled in hessamcms.php config</div>
 @endif
 
 
@@ -209,7 +209,7 @@ class='btn btn-light btn-sm'>Show other sizes</span>
 
         <div class='col-md-12 my-3 text-center'>
 
-            <em><a class="a-link-cart-color" target='_blank' href='{{route("blogetc.admin.categories.create_category")}}'><i class="fa fa-external-link" aria-hidden="true"></i>
+            <em><a class="a-link-cart-color" target='_blank' href='{{route("hessamcms.admin.categories.create_category")}}'><i class="fa fa-external-link" aria-hidden="true"></i>
                     Add new categories
                     here</a></em>
         </div>
@@ -252,7 +252,7 @@ function populate_slug_field() {
 
 </script>
 
-@if( config("blogetc.use_wysiwyg") && config("blogetc.echo_html"))
+@if( config("hessamcms.use_wysiwyg") && config("hessamcms.echo_html"))
     <script src="//cdn.ckeditor.com/4.15.0/full/ckeditor.js"></script>
 
     <script>
diff --git a/src/Views/blogetc_admin/setup/setup.blade.php b/src/Views/hessamcms_admin/setup/setup.blade.php
similarity index 99%
rename from src/Views/blogetc_admin/setup/setup.blade.php
rename to src/Views/hessamcms_admin/setup/setup.blade.php
index 2b39f56..8d17ff6 100644
--- a/src/Views/blogetc_admin/setup/setup.blade.php
+++ b/src/Views/hessamcms_admin/setup/setup.blade.php
@@ -27,7 +27,7 @@
 
             <div class="wizard-container">
                 <div class="card wizard-card" data-color="green" id="wizard">
-                <form action="{{route("blogetc.admin.languages.setup_submit")}}" method="post">
+                <form action="{{route("hessamcms.admin.languages.setup_submit")}}" method="post">
                     @csrf
 
                     	<div class="wizard-header" style="text-align: center">
diff --git a/src/css/blogetc_admin_css.css b/src/css/hessamcms_admin_css.css
similarity index 100%
rename from src/css/blogetc_admin_css.css
rename to src/css/hessamcms_admin_css.css
diff --git a/src/routes.php b/src/routes.php
index cf4451a..2e31544 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -1,28 +1,28 @@
 <?php
 
-Route::group(['middleware' => ['web'], 'namespace' => '\WebDevEtc\BlogEtc\Controllers'], function () {
+Route::group(['middleware' => ['web'], 'namespace' => '\HessamCMS\Controllers'], function () {
 
     /** The main public facing blog routes - show all posts, view a category, rss feed, view a single post, also the add comment route */
-    Route::group(['prefix' => "/{locale}/".config('blogetc.blog_prefix', 'blog')], function () {
+    Route::group(['prefix' => "/{locale}/".config('hessamcms.blog_prefix', 'blog')], function () {
 
         Route::get('/', 'HessamReaderController@index')
-            ->name('blogetc.index');
+            ->name('hessamcms.index');
 
         Route::get('/search', 'HessamReaderController@search')
-            ->name('blogetc.search');
+            ->name('hessamcms.search');
 
         Route::get('/feed', 'HessamRssFeedController@feed')
-            ->name('blogetc.feed'); //RSS feed
+            ->name('hessamcms.feed'); //RSS feed
 
-        Route::get('/category{subcategories}', 'HessamReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('blogetc.view_category');
+        Route::get('/category{subcategories}', 'HessamReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('hessamcms.view_category');
 
 //        Route::get('/category/{categorySlug}',
 //            'HessamReaderController@view_category')
-//            ->name('blogetc.view_category');
+//            ->name('hessamcms.view_category');
 
         Route::get('/{blogPostSlug}',
             'HessamReaderController@viewSinglePost')
-            ->name('blogetc.single');
+            ->name('hessamcms.single');
 
 
         // throttle to a max of 10 attempts in 3 minutes:
@@ -30,7 +30,7 @@
 
             Route::post('save_comment/{blogPostSlug}',
                 'HessamCommentWriterController@addNewComment')
-                ->name('blogetc.comments.add_new_comment');
+                ->name('hessamcms.comments.add_new_comment');
 
 
         });
@@ -39,99 +39,99 @@
 
 
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
-    Route::group(['prefix' => config('blogetc.admin_prefix', 'blog_admin')], function () {
+    Route::group(['prefix' => config('hessamcms.admin_prefix', 'blog_admin')], function () {
 
         Route::get('/setup', 'HessamAdminSetupController@setup')
-            ->name('blogetc.admin.setup');
+            ->name('hessamcms.admin.setup');
 
         Route::get('/setup-submit', 'HessamAdminSetupController@setup_submit')
-            ->name('blogetc.admin.setup_submit');
+            ->name('hessamcms.admin.setup_submit');
 
         Route::get('/', 'HessamAdminController@index')
-            ->name('blogetc.admin.index');
+            ->name('hessamcms.admin.index');
 
         Route::get('/add_post',
             'HessamAdminController@create_post')
-            ->name('blogetc.admin.create_post');
+            ->name('hessamcms.admin.create_post');
 
 
         Route::post('/add_post',
             'HessamAdminController@store_post')
-            ->name('blogetc.admin.store_post');
+            ->name('hessamcms.admin.store_post');
 
         Route::post('/add_post_toggle',
             'HessamAdminController@store_post_toggle')
-            ->name('blogetc.admin.store_post_toggle');
+            ->name('hessamcms.admin.store_post_toggle');
 
         Route::get('/edit_post/{blogPostId}',
             'HessamAdminController@edit_post')
-            ->name('blogetc.admin.edit_post');
+            ->name('hessamcms.admin.edit_post');
 
         Route::get('/edit_post_toggle/{blogPostId}',
             'HessamAdminController@edit_post_toggle')
-            ->name('blogetc.admin.edit_post_toggle');
+            ->name('hessamcms.admin.edit_post_toggle');
 
         Route::patch('/edit_post/{blogPostId}',
             'HessamAdminController@update_post')
-            ->name('blogetc.admin.update_post');
+            ->name('hessamcms.admin.update_post');
 
         //Removes post's photo
         Route::get('/remove_photo/{slug}',
             'HessamAdminController@remove_photo')
-            ->name('blogetc.admin.remove_photo');
+            ->name('hessamcms.admin.remove_photo');
 
         Route::group(['prefix' => "image_uploads",], function () {
 
-            Route::get("/", "HessamImageUploadController@index")->name("blogetc.admin.images.all");
+            Route::get("/", "HessamImageUploadController@index")->name("hessamcms.admin.images.all");
 
-            Route::get("/upload", "HessamImageUploadController@create")->name("blogetc.admin.images.upload");
-            Route::post("/upload", "HessamImageUploadController@store")->name("blogetc.admin.images.store");
+            Route::get("/upload", "HessamImageUploadController@create")->name("hessamcms.admin.images.upload");
+            Route::post("/upload", "HessamImageUploadController@store")->name("hessamcms.admin.images.store");
 
         });
 
 
         Route::delete('/delete_post/{blogPostId}',
             'HessamAdminController@destroy_post')
-            ->name('blogetc.admin.destroy_post');
+            ->name('hessamcms.admin.destroy_post');
 
         Route::group(['prefix' => 'comments',], function () {
 
             Route::get('/',
                 'HessamCommentsAdminController@index')
-                ->name('blogetc.admin.comments.index');
+                ->name('hessamcms.admin.comments.index');
 
             Route::patch('/{commentId}',
                 'HessamCommentsAdminController@approve')
-                ->name('blogetc.admin.comments.approve');
+                ->name('hessamcms.admin.comments.approve');
             Route::delete('/{commentId}',
                 'HessamCommentsAdminController@destroy')
-                ->name('blogetc.admin.comments.delete');
+                ->name('hessamcms.admin.comments.delete');
         });
 
         Route::group(['prefix' => 'categories'], function () {
 
             Route::get('/',
                 'HessamCategoryAdminController@index')
-                ->name('blogetc.admin.categories.index');
+                ->name('hessamcms.admin.categories.index');
 
             Route::get('/add_category',
                 'HessamCategoryAdminController@create_category')
-                ->name('blogetc.admin.categories.create_category');
+                ->name('hessamcms.admin.categories.create_category');
             Route::post('/store_category',
                 'HessamCategoryAdminController@store_category')
-                ->name('blogetc.admin.categories.store_category');
+                ->name('hessamcms.admin.categories.store_category');
 
             Route::get('/edit_category/{categoryId}',
                 'HessamCategoryAdminController@edit_category')
-                ->name('blogetc.admin.categories.edit_category');
+                ->name('hessamcms.admin.categories.edit_category');
 
             Route::patch('/edit_category/{categoryId}',
                 'HessamCategoryAdminController@update_category')
-                ->name('blogetc.admin.categories.update_category');
+                ->name('hessamcms.admin.categories.update_category');
 
             Route::delete('/delete_category/{categoryId}',
                 'HessamCategoryAdminController@destroy_category')
-                ->name('blogetc.admin.categories.destroy_category');
+                ->name('hessamcms.admin.categories.destroy_category');
 
         });
 
@@ -140,22 +140,22 @@
 
             Route::get('/',
                 'HessamLanguageAdminController@index')
-                ->name('blogetc.admin.languages.index');
+                ->name('hessamcms.admin.languages.index');
 
             Route::get('/add_language',
                 'HessamLanguageAdminController@create_language')
-                ->name('blogetc.admin.languages.create_language');
+                ->name('hessamcms.admin.languages.create_language');
             Route::post('/add_language',
                 'HessamLanguageAdminController@store_language')
-                ->name('blogetc.admin.languages.store_language');
+                ->name('hessamcms.admin.languages.store_language');
 
             Route::delete('/delete_language/{languageId}',
                 'HessamLanguageAdminController@destroy_language')
-                ->name('blogetc.admin.languages.destroy_language');
+                ->name('hessamcms.admin.languages.destroy_language');
 
             Route::post('/toggle_language/{languageId}',
                 'HessamLanguageAdminController@toggle_language')
-                ->name('blogetc.admin.languages.toggle_language');
+                ->name('hessamcms.admin.languages.toggle_language');
 
         });
     });
diff --git a/tests/CaptchaTest.php b/tests/CaptchaTest.php
index 649adb3..305fa6a 100644
--- a/tests/CaptchaTest.php
+++ b/tests/CaptchaTest.php
@@ -6,7 +6,7 @@ class CaptchaTest extends \Tests\TestCase
     public function testBasicCaptchaMethodsReturnCorrectType()
     {
 
-        $captcha = new \WebDevEtc\BlogEtc\Captcha\Basic();
+        $captcha = new \HessamCMS\Captcha\Basic();
         $this->assertEquals(gettype($captcha->captcha_field_name()), "string");
         $this->assertEquals(gettype($captcha->view()), "string");
         $this->assertEquals(gettype($captcha->rules()), "array");
@@ -16,7 +16,7 @@ public function testBasicCaptchaMethodsReturnCorrectType()
     public function testRuleCustomValidationFunctionReturnsCorrectly()
     {
 
-        $captcha = new \WebDevEtc\BlogEtc\Captcha\Basic();
+        $captcha = new \HessamCMS\Captcha\Basic();
 
         foreach ($captcha->rules() as $rule) {
 
@@ -31,32 +31,32 @@ public function testRuleCustomValidationFunctionReturnsCorrectly()
 
 
                 // testing CORRECT answer (should return null)
-                \Config::set('blogetc.captcha.basic_answers', "ignoreme,dark,ignoreme2");
+                \Config::set('hessamcms.captcha.basic_answers', "ignoreme,dark,ignoreme2");
                 $this->assertNull($rule('correct1', 'dark', function () {
                     return "lookingforthis";
                 }));
 
                 // testing WRONG answer
-                \Config::set('blogetc.captcha.basic_answers', "ignoreme,dark,ignoreme2");
+                \Config::set('hessamcms.captcha.basic_answers', "ignoreme,dark,ignoreme2");
                 $this->assertEquals($rule('wrong1', 'light', function () {
                     return "lookingforthis";
                 }), "lookingforthis");
 
                 // testing CORRECT answer
-                \Config::set('blogetc.captcha.basic_answers', "bLAcK");
+                \Config::set('hessamcms.captcha.basic_answers', "bLAcK");
                 $this->assertNull($rule('wrong1', 'black', function () {
                     return "lookingforthis";
                 }));
 
                 // testing CORRECT answer
-                \Config::set('blogetc.captcha.basic_answers', "bLAcK");
+                \Config::set('hessamcms.captcha.basic_answers', "bLAcK");
                 $this->assertNull($rule('wrong1', ' black', function () {
                     return "lookingforthis";
                 }));
 
 
                 // testing CORRECT answer
-                \Config::set('blogetc.captcha.basic_answers', "ignoreme, BLACK , jgnoreme2");
+                \Config::set('hessamcms.captcha.basic_answers', "ignoreme, BLACK , jgnoreme2");
                 $this->assertNull($rule('wrong1', ' black', function () {
                     return "lookingforthis";
                 }));
diff --git a/tests/MainTest.php b/tests/MainTest.php
index bd5679d..3b3b252 100644
--- a/tests/MainTest.php
+++ b/tests/MainTest.php
@@ -20,11 +20,11 @@ class MainTest extends \Tests\TestCase
     Testing the author_email, author_website.
 
     /blog/...
-        blogetc.index                       YES
-        blogetc.feed                        YES
-        blogetc.view_category               no - but this is basically blogetc.index
-        blogetc.single                      YES
-        blogetc.comments.add_new_comment    YES - tested multiple times with/without basic captcha on/off/correct/incorrect.
+        hessamcms.index                       YES
+        hessamcms.feed                        YES
+        hessamcms.view_category               no - but this is basically hessamcms.index
+        hessamcms.single                      YES
+        hessamcms.comments.add_new_comment    YES - tested multiple times with/without basic captcha on/off/correct/incorrect.
                                                 Also tested with diff configs for comment form:
                                                     disabled
                                                     built_in
@@ -32,27 +32,27 @@ class MainTest extends \Tests\TestCase
                                                     custom
 
     /blog_admin/...
-        blogetc.admin.index                 YES
-        blogetc.admin.create_post           no - but is just a form
-        blogetc.admin.store_post            YES
-        blogetc.admin.edit_post             YES - but no extra checks
-        blogetc.admin.update_post           YES
-        blogetc.admin.destroy_post          YES
+        hessamcms.admin.index                 YES
+        hessamcms.admin.create_post           no - but is just a form
+        hessamcms.admin.store_post            YES
+        hessamcms.admin.edit_post             YES - but no extra checks
+        hessamcms.admin.update_post           YES
+        hessamcms.admin.destroy_post          YES
 
      /blog_admin/comments/...
 
-            blogetc.admin.comments.index    YES
-            blogetc.admin.comments.approve  YES
-            blogetc.admin.comments.delete   YES
+            hessamcms.admin.comments.index    YES
+            hessamcms.admin.comments.approve  YES
+            hessamcms.admin.comments.delete   YES
 
      /blog_admin/categories/...
 
-            blogetc.admin.categories.index
-            blogetc.admin.categories.create_category    no - but is just a form
-            blogetc.admin.categories.store_category     YES
-            blogetc.admin.categories.edit_category      no - but is just a form
-            blogetc.admin.categories.update_category
-            blogetc.admin.categories.destroy_category   YES
+            hessamcms.admin.categories.index
+            hessamcms.admin.categories.create_category    no - but is just a form
+            hessamcms.admin.categories.store_category     YES
+            hessamcms.admin.categories.edit_category      no - but is just a form
+            hessamcms.admin.categories.update_category
+            hessamcms.admin.categories.destroy_category   YES
 
 
 
@@ -63,16 +63,16 @@ class MainTest extends \Tests\TestCase
 
     public function testFilesArePresent()
     {
-        $this->assertFileExists(config_path("blogetc.php"), "/config/blogetc.php should exist - currently no file with that filename is found");
-        $this->assertTrue(is_array(include(config_path("blogetc.php"))), "/config/blogetc.php should exist - currently no file with that filename is found");
+        $this->assertFileExists(config_path("hessamcms.php"), "/config/hessamcms.php should exist - currently no file with that filename is found");
+        $this->assertTrue(is_array(include(config_path("hessamcms.php"))), "/config/hessamcms.php should exist - currently no file with that filename is found");
     }
 
     public function testImageSizesAreSane()
     {
 
-        $this->assertTrue(count(config("blogetc.image_sizes")) >=  3);
+        $this->assertTrue(count(config("hessamcms.image_sizes")) >=  3);
 
-        foreach (config("blogetc.image_sizes") as $image_key => $image_info) {
+        foreach (config("hessamcms.image_sizes") as $image_key => $image_info) {
 
             $this->assertArrayHasKey("w", $image_info);
             $this->assertArrayHasKey("h", $image_info);
@@ -94,13 +94,13 @@ public function testImageSizesAreSane()
     }
 
 
-    public function testUserHasNanManageBlogEtcPostsMethod()
+    public function testUserHasNanManageHessamCMSPostsMethod()
     {
 
-        $this->assertTrue(method_exists(\App\User::class, "canManageBlogEtcPosts"), "Your User model must have the canManageBlogEtcPosts method");
+        $this->assertTrue(method_exists(\App\User::class, "canManageHessamCMSPosts"), "Your User model must have the canManageHessamCMSPosts method");
 
         $user = new \App\User();
-        $this->assertTrue(is_bool($user->canManageBlogEtcPosts()));
+        $this->assertTrue(is_bool($user->canManageHessamCMSPosts()));
 
     }
 
@@ -109,7 +109,7 @@ public function testUserHasNanManageBlogEtcPostsMethod()
     public function testCanSeeAdminPanel()
     {
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
 
         \Auth::logout();
         // without a logged in user, should give error
@@ -126,7 +126,7 @@ public function testCanSeeAdminPanel()
         $response->assertStatus(200);
 
         // check user can see admin area:
-        $this->assertTrue($user->canManageBlogEtcPosts());
+        $this->assertTrue($user->canManageHessamCMSPosts());
 
         $response = $this->get($admin_panel_url);
         // check if we can see the admin panel correctly
@@ -138,10 +138,10 @@ public function testCanSeeAdminPanel()
         $response->assertSee("Add Category");
 
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
 //        $user=$this->create_admin_user();
 
-        $this->assertTrue($user->canManageBlogEtcPosts());
+        $this->assertTrue($user->canManageHessamCMSPosts());
 
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
@@ -174,9 +174,9 @@ public function testCanCreatePost()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageBlogEtcPosts());
+        $this->assertTrue($user->canManageHessamCMSPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -206,9 +206,9 @@ public function testCanCreatePostThenEditIt()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageBlogEtcPosts());
+        $this->assertTrue($user->canManageHessamCMSPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -227,7 +227,7 @@ public function testCanCreatePostThenEditIt()
         $response->assertStatus(302); // redirect
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
+        $justCreatedRow = \HessamCMS\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
 
 
         $new_object_vals['title'] = "New title " . str_random();
@@ -246,9 +246,9 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageBlogEtcPosts());
+        $this->assertTrue($user->canManageHessamCMSPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -267,13 +267,13 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
 
         // check we don't see it at moment
-        $response = $this->get(config("blogetc.blog_prefix", "blog"));
+        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
         $response->assertDontSee($new_object_vals['slug']);
 
         // must clear the cache, as the /feed is cached
         \Artisan::call('cache:clear');
 
-        $response = $this->get(config("blogetc.blog_prefix", "blog") . "/feed");
+        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/feed");
         $response->assertDontSee($new_object_vals['slug']);
 
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
@@ -285,7 +285,7 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
         // logout - so we are guest user
         \Auth::logout();
-        $response = $this->get(config("blogetc.blog_prefix", "blog"));
+        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
         // if we see the slug (which is str_random()) we can safely assume that there was a link to the post, so it is working ok. of course it would depend a bit on your template but this should work.
         $response->assertSee($new_object_vals['slug']);
 
@@ -293,14 +293,14 @@ public function testCreatePostThenCheckIsViewableToPublic()
         // must clear the cache, as the /feed is cached
         \Artisan::call('cache:clear');
 
-        $response = $this->get(config("blogetc.blog_prefix", "blog") . "/feed");
+        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/feed");
         $response->assertSee($new_object_vals['slug']);
         $response->assertSee($new_object_vals['title']);
 
 
         // now check single post is viewable
 
-        $response = $this->get(route("blogetc.single", $new_object_vals['slug']));
+        $response = $this->get(route("hessamcms.single", $new_object_vals['slug']));
         $response->assertStatus(200);
         $response->assertSee($new_object_vals['slug']);
         $response->assertSee($new_object_vals['title']);
@@ -313,7 +313,7 @@ public function testCreatePostWithNotPublishedThenCheckIsNotViewableToPublic()
     {
 
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         list($new_object_vals, $search_for_obj) = $this->prepare_post_creation();
 
         $new_object_vals['is_published'] = false;
@@ -328,14 +328,14 @@ public function testCreatePostWithNotPublishedThenCheckIsNotViewableToPublic()
         // must log out, as the admin user can see posts dated in future
         \Auth::logout();
 
-        $response = $this->get(config("blogetc.blog_prefix", "blog"));
+        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
         // if we see the slug (which is str_random()) we can safely assume that there was a link to the post, so it is working ok. of course it would depend a bit on your template but this should work.
         $response->assertDontSee($new_object_vals['slug']);
 
 
         // now check single post is viewable
 
-        $response = $this->get(config("blogetc.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
+        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
         $response->assertStatus(404);
         $response->assertDontSee($new_object_vals['slug']);
         $response->assertDontSee($new_object_vals['title']);
@@ -348,7 +348,7 @@ public function testCreatePostWithFuturePostedAtThenCheckIsNotViewableToPublic()
     {
 
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         list($new_object_vals, $search_for_obj) = $this->prepare_post_creation();
 
         $new_object_vals['posted_at'] = \Carbon\Carbon::now()->addMonths(12);
@@ -363,14 +363,14 @@ public function testCreatePostWithFuturePostedAtThenCheckIsNotViewableToPublic()
         // must log out, as the admin user can see posts dated in future
         \Auth::logout();
 
-        $response = $this->get(config("blogetc.blog_prefix", "blog"));
+        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
         // if we see the slug (which is str_random()) we can safely assume that there was a link to the post, so it is working ok. of course it would depend a bit on your template but this should work.
         $response->assertDontSee($new_object_vals['slug']);
 
 
         // now check single post is viewable
 
-        $response = $this->get(config("blogetc.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
+        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
         $response->assertStatus(404);
         $response->assertDontSee($new_object_vals['slug']);
         $response->assertDontSee($new_object_vals['title']);
@@ -383,16 +383,16 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
     {
 
 
-        \Config::set('blogetc.comments.auto_approve_comments', false);
-        \Config::set('blogetc.captcha.captcha_enabled', true);
-        \Config::set('blogetc.captcha.captcha_type', \WebDevEtc\BlogEtc\Captcha\Basic::class);
-        $captcha = new \WebDevEtc\BlogEtc\Captcha\Basic();
-        \Config::set('blogetc.captcha.basic_question', "a test question");
-        \Config::set('blogetc.captcha.basic_answers', "answer1,answer2");
+        \Config::set('hessamcms.comments.auto_approve_comments', false);
+        \Config::set('hessamcms.captcha.captcha_enabled', true);
+        \Config::set('hessamcms.captcha.captcha_type', \HessamCMS\Captcha\Basic::class);
+        $captcha = new \HessamCMS\Captcha\Basic();
+        \Config::set('hessamcms.captcha.basic_question', "a test question");
+        \Config::set('hessamcms.captcha.basic_answers', "answer1,answer2");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -412,7 +412,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
 
-        \Config::set('blogetc.comments.type_of_comments_to_show', 'built_in');
+        \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
 
 
         $comment_detail = [
@@ -422,7 +422,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             $captcha->captcha_field_name() => "wronganswer1", // << WRONG CAPTCHA
         ];
         $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("blogetc.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(302);
 
         $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
@@ -435,7 +435,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             // << NO CAPTCHA FIELD
         ];
         $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("blogetc.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(302);
 
         $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
@@ -448,14 +448,14 @@ public function testCreatePostThenSetCommentsToDisabledAndCheckNoneShow()
     {
 
 
-        \Config::set('blogetc.comments.type_of_comments_to_show', "disabled");
+        \Config::set('hessamcms.comments.type_of_comments_to_show', "disabled");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \WebDevEtc\BlogEtc\Models\HessamPost;
+        $newblogpost = new \HessamCMS\Models\HessamPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -480,14 +480,14 @@ public function testCreatePostThenSetCommentsToDisabledAndCheckNoneShow()
     }
     public function testCreatePostThenSetCommentsToDisqusAndCheckDisqusJSIsShown()
     {
-        \Config::set('blogetc.comments.type_of_comments_to_show', "disqus");
+        \Config::set('hessamcms.comments.type_of_comments_to_show', "disqus");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \WebDevEtc\BlogEtc\Models\HessamPost;
+        $newblogpost = new \HessamCMS\Models\HessamPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -510,14 +510,14 @@ public function testCreatePostThenSetCommentsToCustomAndCheckCustomErrorShows()
     {
 
 
-        \Config::set('blogetc.comments.type_of_comments_to_show', "custom");
+        \Config::set('hessamcms.comments.type_of_comments_to_show', "custom");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \WebDevEtc\BlogEtc\Models\HessamPost;
+        $newblogpost = new \HessamCMS\Models\HessamPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -541,16 +541,16 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
     {
 
 
-        \Config::set('blogetc.comments.auto_approve_comments', false);
-        \Config::set('blogetc.captcha.captcha_enabled', true);
-        \Config::set('blogetc.captcha.captcha_type', \WebDevEtc\BlogEtc\Captcha\Basic::class);
-        $captcha = new \WebDevEtc\BlogEtc\Captcha\Basic();
-        \Config::set('blogetc.captcha.basic_question', "a test question");
-        \Config::set('blogetc.captcha.basic_answers', "answer1,answer2");
+        \Config::set('hessamcms.comments.auto_approve_comments', false);
+        \Config::set('hessamcms.captcha.captcha_enabled', true);
+        \Config::set('hessamcms.captcha.captcha_type', \HessamCMS\Captcha\Basic::class);
+        $captcha = new \HessamCMS\Captcha\Basic();
+        \Config::set('hessamcms.captcha.basic_question', "a test question");
+        \Config::set('hessamcms.captcha.basic_answers', "answer1,answer2");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -569,7 +569,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
 
-        \Config::set('blogetc.comments.type_of_comments_to_show', 'built_in');
+        \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
 
 
         $comment_detail = [
@@ -579,22 +579,22 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             $captcha->captcha_field_name() => "AnsWer2",
         ];
         $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("blogetc.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(200);
 
-        \Config::set('blogetc.captcha.auto_approve_comments', false);
+        \Config::set('hessamcms.captcha.auto_approve_comments', false);
 
         $this->assertDatabaseHas('blog_etc_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
-        $justAddedRow = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+        $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
-        $response = $this->get(route("blogetc.admin.comments.index"));
+        $response = $this->get(route("hessamcms.admin.comments.index"));
         $response->assertSee($justAddedRow->author_name);
 
 
         // approve it:
-        $response = $this->patch(route("blogetc.admin.comments.approve", $justAddedRow->id), [
+        $response = $this->patch(route("hessamcms.admin.comments.approve", $justAddedRow->id), [
             '_token' => csrf_token(),
         ]);
         // check it was approved
@@ -607,12 +607,12 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
 
     public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
     {
-        \Config::set('blogetc.comments.auto_approve_comments', false);
-        \Config::set('blogetc.captcha.captcha_enabled', false);
+        \Config::set('hessamcms.comments.auto_approve_comments', false);
+        \Config::set('hessamcms.captcha.captcha_enabled', false);
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -631,8 +631,8 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
 
-        \Config::set('blogetc.comments.type_of_comments_to_show', 'built_in');
-        \Config::set('blogetc.captcha.captcha_enabled', false);
+        \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
+        \Config::set('hessamcms.captcha.captcha_enabled', false);
 
 
         $comment_detail = [
@@ -641,23 +641,23 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
             'comment' => str_random(),
         ];
         $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("blogetc.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
 
         $response->assertStatus(200);
 
-        \Config::set('blogetc.captcha.auto_approve_comments', false);
+        \Config::set('hessamcms.captcha.auto_approve_comments', false);
 
         $this->assertDatabaseHas('blog_etc_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
-        $justAddedRow = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+        $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
-        $response = $this->get(route("blogetc.admin.comments.index"));
+        $response = $this->get(route("hessamcms.admin.comments.index"));
         $response->assertSee($justAddedRow->author_name);
 
 
         // approve it:
-        $response = $this->patch(route("blogetc.admin.comments.approve", $justAddedRow->id), [
+        $response = $this->patch(route("hessamcms.admin.comments.approve", $justAddedRow->id), [
             '_token' => csrf_token(),
         ]);
         // check it was approved
@@ -670,12 +670,12 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
 
     public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
     {
-        \Config::set('blogetc.comments.auto_approve_comments', false);
-        \Config::set('blogetc.captcha.captcha_enabled', false);
+        \Config::set('hessamcms.comments.auto_approve_comments', false);
+        \Config::set('hessamcms.captcha.captcha_enabled', false);
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -694,29 +694,29 @@ public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
 
-        if (config("blogetc.comments.type_of_comments_to_show") === 'built_in') {
+        if (config("hessamcms.comments.type_of_comments_to_show") === 'built_in') {
             $comment_detail = [
                 '_token' => csrf_token(),
                 'author_name' => str_random(),
                 'comment' => str_random(),
             ];
             $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
-            $response = $this->post(config("blogetc.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+            $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
             $response->assertSessionHasNoErrors();
             $response->assertStatus(200);
 
             $this->assertDatabaseHas('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
 
 
-            $justAddedRow = \WebDevEtc\BlogEtc\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+            $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
             // check the just added row exists...
-            $response = $this->get(route("blogetc.admin.comments.index"));
+            $response = $this->get(route("hessamcms.admin.comments.index"));
             $response->assertSee($justAddedRow->author_name);
 
 
             // delete it:
-            $response = $this->delete(route("blogetc.admin.comments.delete", $justAddedRow->id), [
+            $response = $this->delete(route("hessamcms.admin.comments.delete", $justAddedRow->id), [
                 '_token' => csrf_token(),
             ]);
             // check it was deleted (it will deleted if approved)
@@ -727,7 +727,7 @@ public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
 
 
         } else {
-            dump("NOT TESTING COMMENT FEATURE, as config(\"blogetc.comments.type_of_comments_to_show\") is not set to 'built_in')");
+            dump("NOT TESTING COMMENT FEATURE, as config(\"hessamcms.comments.type_of_comments_to_show\") is not set to 'built_in')");
         }
 
     }
@@ -739,9 +739,9 @@ public function testCanCreateThenDeletePost()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageBlogEtcPosts());
+        $this->assertTrue($user->canManageHessamCMSPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -763,7 +763,7 @@ public function testCanCreateThenDeletePost()
         $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
 
 
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
+        $justCreatedRow = \HessamCMS\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
         $id = $justCreatedRow->id;
         $delete_url = $admin_panel_url . "/delete_post/" . $id;
 
@@ -777,7 +777,7 @@ public function testCanCreateThenDeletePost()
 
     public function testCanCreateCategory()
     {
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $this->create_admin_user();
         // now lets create a category
         $new_cat_vals = [
@@ -800,7 +800,7 @@ public function testCanCreateCategoryThenEditIt()
     {
 
 
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
 
 
         $this->create_admin_user();
@@ -822,7 +822,7 @@ public function testCanCreateCategoryThenEditIt()
 
 
         // get the just inserted row
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
+        $justCreatedRow = \HessamCMS\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
 
 
         // get the edit page (form)
@@ -842,7 +842,7 @@ public function testCanCreateCategoryThenEditIt()
 
         // send the request to save the changes
         $response = $this->patch(
-            route("blogetc.admin.categories.update_category", $justCreatedRow->id),
+            route("hessamcms.admin.categories.update_category", $justCreatedRow->id),
             $new_object_vals
         );
 
@@ -858,7 +858,7 @@ public function testCanCreateCategoryThenEditIt()
 
     public function testCanDeleteCategory()
     {
-        $admin_panel_url = config("blogetc.admin_prefix", "blog_admin");
+        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
         $this->create_admin_user();
         // now lets create a category
         $new_cat_vals = [
@@ -874,7 +874,7 @@ public function testCanDeleteCategory()
         $this->assertDatabaseHas('blog_etc_categories', $search_for_new_cat);
 
 
-        $justCreatedRow = \WebDevEtc\BlogEtc\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
+        $justCreatedRow = \HessamCMS\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
         $id = $justCreatedRow->id;
 
         $delete_url = $admin_panel_url . "/categories/delete_category/$id";
@@ -914,7 +914,7 @@ protected function create_admin_user()
         $user = $this->getMockBuilder(\App\User::class)
             ->getMock();
         // make sure the user can see admin panel
-        $user->method("canManageBlogEtcPosts")
+        $user->method("canManageHessamCMSPosts")
             ->will($this->returnCallback(function () {
                 return true;
             }));
@@ -942,7 +942,7 @@ protected function prepare_post_creation()
     {
         $user = $this->create_admin_user();
 
-        $this->assertTrue($user->canManageBlogEtcPosts());
+        $this->assertTrue($user->canManageHessamCMSPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -958,27 +958,27 @@ protected function prepare_post_creation()
         $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
 
         // check we don't see it at moment
-        $response = $this->get(config("blogetc.blog_prefix", "blog"));
+        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
         $response->assertDontSee($new_object_vals['slug']);
         return array($new_object_vals, $search_for_obj);
     }
 
-    public function testUserModelHasCanManageBlogEtcPostsMethod()
+    public function testUserModelHasCanManageHessamCMSPostsMethod()
     {
         $u = new \App\User();
-        $this->assertTrue(method_exists($u,"canManageBlogEtcPosts"),"canManageBlogEtcPosts() must be added to User model. Please see WebDevEtc BlogEtc docs for details. It should return true ONLY for the admin users");
+        $this->assertTrue(method_exists($u,"canManageHessamCMSPosts"),"canManageHessamCMSPosts() must be added to User model. Please see hessam HessamCMS docs for details. It should return true ONLY for the admin users");
     }
-    public function testUserModelCanManageBlogEtcPostsMethodDoesntAlwaysReturnTrue()
+    public function testUserModelCanManageHessamCMSPostsMethodDoesntAlwaysReturnTrue()
     {
         $u = new \App\User();
 
-        $u->id = 9999999; // in case the logic on canManageBlogEtcPosts() checks for a low ID
+        $u->id = 9999999; // in case the logic on canManageHessamCMSPosts() checks for a low ID
         $u->email = str_random(); // in case the logic looks for a certain email or something.
 
-        $this->assertTrue(method_exists($u,"canManageBlogEtcPosts"));
+        $this->assertTrue(method_exists($u,"canManageHessamCMSPosts"));
 
         // because this user is just a randomly made one, it probably should not be allowed to edit blog posts.
-        $this->assertFalse($u->canManageBlogEtcPosts(), "User::canManageBlogEtcPosts() returns true, but it PROBABLY should return false! Otherwise every single user on your site has access to the blog admin panel! This might not be an error though, if your system doesn't allow public registration. But you should look into this. I know this isn't a good way to handle this test, but it seems to make sense.");
+        $this->assertFalse($u->canManageHessamCMSPosts(), "User::canManageHessamCMSPosts() returns true, but it PROBABLY should return false! Otherwise every single user on your site has access to the blog admin panel! This might not be an error though, if your system doesn't allow public registration. But you should look into this. I know this isn't a good way to handle this test, but it seems to make sense.");
     }
 
 

From f07d4d4d43c2d3a2bef755962b9f31b1f9ed9da6 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Mon, 16 Nov 2020 22:47:44 +0330
Subject: [PATCH 022/118] changes some links

---
 README.md     | 2 +-
 composer.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2c8515d..dc6fd83 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ After doing the correct `vendor:publish`, all of the default template files will
 
 ### Customizing admin views
 If you need to customize the admin view, just copy the files from
-`vendor/hessam.binshops/hessamcms/src/Views/hessamcms_admin`
+`vendor/hessamcms/src/Views/hessamcms_admin`
 to
 `resources/views/vendor/hessamcms_admin`
 Then you can modify them just like any other view file.
diff --git a/composer.json b/composer.json
index 1cc0126..560a939 100755
--- a/composer.json
+++ b/composer.json
@@ -22,8 +22,8 @@
     "authors": [
         {
             "name": "Hessam",
-            "homepage": "http://hessam.binshops.com",
-            "role": "developer",
+            "homepage": "http://hessam.binshops.com/laravel-blog-package",
+            "role": "owner",
             "email": "hessam.modaberi@gmail.com"
         }
     ],

From dc3069bb4903c8f25b80f4f4a369f03bd3edb661 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 00:26:01 +0330
Subject: [PATCH 023/118] adds language list to index page

---
 src/Controllers/HessamReaderController.php | 1 +
 src/Views/hessamcms/index.blade.php        | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index e832920..e1f96bb 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -73,6 +73,7 @@ public function index($locale, $category_slug = null, Request $request)
         HessamCategory::loadSiblingsWithList($rootList);
 
         return view("hessamcms::index", [
+            'lang_list' => HessamLanguage::all('locale','name'),
             'locale' => $request->get("locale"),
             'category_chain' => $categoryChain,
             'categories' => $rootList,
diff --git a/src/Views/hessamcms/index.blade.php b/src/Views/hessamcms/index.blade.php
index 7fffe51..81fbdf5 100755
--- a/src/Views/hessamcms/index.blade.php
+++ b/src/Views/hessamcms/index.blade.php
@@ -75,6 +75,15 @@ class='btn border  btn-outline-primary btn-sm '>
         @if (config('hessamcms.search.search_enabled') )
             @include('hessamcms::sitewide.search_form')
         @endif
+            <div class="row">
+                <div class="col-md-12 text-center">
+                    @forelse($lang_list as $lang)
+                        <a href="{{route("hessamcms.index" , $lang->locale)}}">
+                            <span>{{$lang->name}}</span>
+                        </a>
+                    @endforelse
+                </div>
+            </div>
     </div>
 
 @endsection

From 8eda87743866d6f8dbb96e9d9f4546a63c99e5f7 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 01:45:54 +0330
Subject: [PATCH 024/118] namespace fix

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 560a939..9b43355 100755
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "HessamCMSServiceProvider"
+                "HessamCMS\\HessamCMSServiceProvider"
             ],
             "aliases": {
             }

From 50b7ac91fcf0d3e39e73c6d976da97364e51d87b Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 02:01:06 +0330
Subject: [PATCH 025/118] fix for package removal

---
 src/HessamCMSServiceProvider.php     | 10 +++++-----
 src/Models/HessamPostTranslation.php | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/HessamCMSServiceProvider.php b/src/HessamCMSServiceProvider.php
index 328c6de..b076d47 100755
--- a/src/HessamCMSServiceProvider.php
+++ b/src/HessamCMSServiceProvider.php
@@ -3,7 +3,7 @@
 namespace HessamCMS;
 
 use Illuminate\Support\ServiceProvider;
-use Swis\Laravel\Fulltext\ModelObserver;
+//use Swis\Laravel\Fulltext\ModelObserver;
 use HessamCMS\Models\HessamPost;
 
 class HessamCMSServiceProvider extends ServiceProvider
@@ -16,10 +16,10 @@ class HessamCMSServiceProvider extends ServiceProvider
     public function boot()
     {
 
-        if (config("hessamcms.search.search_enabled") == false) {
-            // if search is disabled, don't allow it to sync.
-            ModelObserver::disableSyncingFor(HessamPost::class);
-        }
+//        if (config("hessamcms.search.search_enabled") == false) {
+//            // if search is disabled, don't allow it to sync.
+//            ModelObserver::disableSyncingFor(HessamPost::class);
+//        }
 
         if (config("hessamcms.include_default_routes", true)) {
             include(__DIR__ . "/routes.php");
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index 4669c2c..e7cdf34 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -5,16 +5,17 @@
 
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Model;
-use Swis\Laravel\Fulltext\Indexable;
+//use Swis\Laravel\Fulltext\Indexable;
 use HessamCMS\Interfaces\SearchResultInterface;
 
-class HessamPostTranslation extends Model implements SearchResultInterface
+//class HessamPostTranslation extends Model implements SearchResultInterface
+class HessamPostTranslation extends Model
 {
     use Sluggable;
-    use Indexable;
-
-    protected $indexContentColumns = ['post_body', 'short_description', 'meta_desc',];
-    protected $indexTitleColumns = ['title', 'subtitle', 'seo_title',];
+//    use Indexable;
+//
+//    protected $indexContentColumns = ['post_body', 'short_description', 'meta_desc',];
+//    protected $indexTitleColumns = ['title', 'subtitle', 'seo_title',];
 
     public $fillable = [
         'title',

From f1e4739d2f3879e5c904ace934d3b1fa5d1732c4 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 02:27:57 +0330
Subject: [PATCH 026/118] migeration name fix in provider

---
 src/HessamCMSServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/HessamCMSServiceProvider.php b/src/HessamCMSServiceProvider.php
index b076d47..a58e830 100755
--- a/src/HessamCMSServiceProvider.php
+++ b/src/HessamCMSServiceProvider.php
@@ -33,7 +33,7 @@ public function boot()
                      '2020_10_16_010049_create_hessam_post_translations_table.php',
                      '2020_10_16_121230_create_hessam_comments_table.php',
                      '2020_10_16_121728_create_hessam_uploaded_photos_table.php',
-                     '2020_10_16_124241_create_hessam_languages_table.php'
+                     '2020_10_16_004241_create_hessam_languages_table.php'
                  ] as $file) {
 
             $this->publishes([

From 2ad58069dd14aa2515e55bcea61ab8c884d10f4d Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 02:48:06 +0330
Subject: [PATCH 027/118] foreign key fix in migrations

---
 ...0_10_16_005425_create_hessam_category_translations_table.php | 2 +-
 .../2020_10_16_010049_create_hessam_post_translations_table.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
index 4e15525..c92ba81 100644
--- a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
+++ b/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
@@ -23,7 +23,7 @@ public function up()
             $table->mediumText("category_description")->nullable();
 
             $table->unsignedInteger("lang_id")->index();
-            $table->foreign('lang_id')->references('lang_id')->on('hessam_languages');
+            $table->foreign('lang_id')->references('id')->on('hessam_languages');
 
             $table->timestamps();
         });
diff --git a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
index 89edc67..cdb81b7 100644
--- a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
+++ b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
@@ -31,7 +31,7 @@ public function up()
             $table->string('image_thumbnail')->nullable();
 
             $table->unsignedInteger("lang_id")->index();
-            $table->foreign('lang_id')->references('lang_id')->on('hessam_languages');
+            $table->foreign('lang_id')->references('id')->on('hessam_languages');
 
             $table->timestamps();
         });

From dddc03412f7865259869303bd8f74f6e4298c2c0 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 03:02:04 +0330
Subject: [PATCH 028/118] foreign key fix in migrations

---
 migrations/2020_10_16_010039_create_hessam_posts_table.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/migrations/2020_10_16_010039_create_hessam_posts_table.php b/migrations/2020_10_16_010039_create_hessam_posts_table.php
index a4b5fd3..1766bb4 100644
--- a/migrations/2020_10_16_010039_create_hessam_posts_table.php
+++ b/migrations/2020_10_16_010039_create_hessam_posts_table.php
@@ -27,10 +27,10 @@ public function up()
             $table->increments('id');
 
             $table->unsignedInteger("post_id")->index();
-            $table->foreign('post_id')->references('post_id')->on('hessam_posts')->onDelete("cascade");
+            $table->foreign('post_id')->references('id')->on('hessam_posts')->onDelete("cascade");
 
             $table->unsignedInteger("category_id")->index();
-            $table->foreign('category_id')->references('category_id')->on('hessam_categories')->onDelete("cascade");
+            $table->foreign('category_id')->references('id')->on('hessam_categories')->onDelete("cascade");
         });
     }
 

From 7907230ba116433e7eadf5acdd91f21b41af9456 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 03:19:34 +0330
Subject: [PATCH 029/118] foreign key fix in migrations

---
 migrations/2020_10_16_121230_create_hessam_comments_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migrations/2020_10_16_121230_create_hessam_comments_table.php b/migrations/2020_10_16_121230_create_hessam_comments_table.php
index 297b5b6..1aad4b8 100644
--- a/migrations/2020_10_16_121230_create_hessam_comments_table.php
+++ b/migrations/2020_10_16_121230_create_hessam_comments_table.php
@@ -17,7 +17,7 @@ public function up()
             $table->increments('id');
 
             $table->unsignedInteger("post_id")->index();
-            $table->foreign('post_id')->references('post_id')->on('hessam_posts');
+            $table->foreign('post_id')->references('id')->on('hessam_posts');
             $table->unsignedInteger("user_id")->nullable()->index()->comment("if user was logged in");
 
             $table->string("ip")->nullable()->comment("if enabled in the config file");

From 393b618b9c76e635244bd01328f4561854af4771 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 03:41:24 +0330
Subject: [PATCH 030/118] bug fix for pacakge setup

---
 src/Controllers/HessamAdminSetupController.php | 1 -
 src/Middleware/PackageSetup.php                | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
index bdddfec..1adbf9c 100644
--- a/src/Controllers/HessamAdminSetupController.php
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -21,7 +21,6 @@ class HessamAdminSetupController
     public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
-        $this->middleware(LoadLanguage::class);
 
         if (!is_array(config("hessamcms"))) {
             throw new \RuntimeException('The config/hessamcms.php does not exist. Publish the vendor files for the HessamCMS package by running the php artisan publish:vendor command');
diff --git a/src/Middleware/PackageSetup.php b/src/Middleware/PackageSetup.php
index 456b20e..f469bdb 100644
--- a/src/Middleware/PackageSetup.php
+++ b/src/Middleware/PackageSetup.php
@@ -5,20 +5,13 @@
 
 use Closure;
 use HessamCMS\Models\HessamConfiguration;
-use HessamCMS\Models\HessamLanguage;
 
 class PackageSetup
 {
     public function handle($request, Closure $next)
     {
         $initial_setup = HessamConfiguration::get('INITIAL_SETUP');
-        if (!$initial_setup){
-            HessamConfiguration::set('INITIAL_SETUP', true);
-
-            return redirect( route('hessamcms.admin.setup') );
-        }
-
-        if(!$initial_setup->value){
+        if (!$initial_setup || !$initial_setup->value){
             return redirect( route('hessamcms.admin.setup') );
         }
 

From c826addf205bae314954401b7e2458e84fdab3cb Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 03:55:57 +0330
Subject: [PATCH 031/118] fix for setup controller

---
 src/Controllers/HessamAdminSetupController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
index 1adbf9c..50fb45d 100644
--- a/src/Controllers/HessamAdminSetupController.php
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -2,9 +2,9 @@
 
 namespace HessamCMS\Controllers;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use HessamCMS\Helpers;
-use HessamCMS\Middleware\LoadLanguage;
 use HessamCMS\Middleware\UserCanManageBlogPosts;
 use HessamCMS\Models\HessamConfiguration;
 use HessamCMS\Models\HessamLanguage;
@@ -13,7 +13,7 @@
  * Class HessamAdminSetupController
  * Handles initial setup for Hessam CMS
 */
-class HessamAdminSetupController
+class HessamAdminSetupController extends Controller
 {
     /**
      * HessamAdminSetupController constructor.

From e41b0713b94a6637285543057d0c50e8035b4f3c Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 04:03:50 +0330
Subject: [PATCH 032/118] fix for setup controller

---
 src/Controllers/HessamAdminSetupController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
index 50fb45d..5cf3ab8 100644
--- a/src/Controllers/HessamAdminSetupController.php
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -32,7 +32,7 @@ public function __construct()
      *
      * @return mixed
      */
-    public function index(Request $request)
+    public function setup(Request $request)
     {
         return view("hessamcms_admin::setup.setup");
     }

From cb28116bf46d03049572a7b2908db3108563f78c Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 17 Nov 2020 04:46:50 +0330
Subject: [PATCH 033/118] some bug fixes for setup section

---
 src/HessamCMSServiceProvider.php              |   4 +-
 .../hessamcms_admin/setup/setup.blade.php     | 321 +++++++++---------
 src/routes.php                                |   2 +-
 3 files changed, 165 insertions(+), 162 deletions(-)

diff --git a/src/HessamCMSServiceProvider.php b/src/HessamCMSServiceProvider.php
index a58e830..9821209 100755
--- a/src/HessamCMSServiceProvider.php
+++ b/src/HessamCMSServiceProvider.php
@@ -33,7 +33,8 @@ public function boot()
                      '2020_10_16_010049_create_hessam_post_translations_table.php',
                      '2020_10_16_121230_create_hessam_comments_table.php',
                      '2020_10_16_121728_create_hessam_uploaded_photos_table.php',
-                     '2020_10_16_004241_create_hessam_languages_table.php'
+                     '2020_10_16_004241_create_hessam_languages_table.php',
+                     '2020_10_22_132005_create_hessam_configurations_table.php'
                  ] as $file) {
 
             $this->publishes([
@@ -47,6 +48,7 @@ public function boot()
             __DIR__ . '/Config/hessamcms.php' => config_path('hessamcms.php'),
             __DIR__ . '/css/hessamcms_admin_css.css' => public_path('hessamcms_admin_css.css'),
             __DIR__ . '/css/hessam-blog.css' => public_path('hessam-blog.css'),
+            __DIR__ . '/css/admin-setup.css' => public_path('admin-setup.css'),
             __DIR__ . '/js/hessam-blog.js' => public_path('hessam-blog.js'),
         ]);
 
diff --git a/src/Views/hessamcms_admin/setup/setup.blade.php b/src/Views/hessamcms_admin/setup/setup.blade.php
index 8d17ff6..4dba6ef 100644
--- a/src/Views/hessamcms_admin/setup/setup.blade.php
+++ b/src/Views/hessamcms_admin/setup/setup.blade.php
@@ -1,20 +1,21 @@
 <!doctype html>
 <html lang="en">
 <head>
-	<meta charset="utf-8" />
-	<link rel="apple-touch-icon" sizes="76x76" href="assets/img/apple-icon.png">
-	<link rel="icon" type="image/png" href="assets/img/favicon.png">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	<title>Hessam CMS pacakge setup</title>
+    <meta charset="utf-8" />
+    <link rel="apple-touch-icon" sizes="76x76" href="assets/img/apple-icon.png">
+    <link rel="icon" type="image/png" href="assets/img/favicon.png">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <title>Hessam CMS pacakge setup</title>
 
-	<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
+    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
     <meta name="viewport" content="width=device-width" />
 
-	<!--     Fonts and icons     -->
-	<link href="http://netdna.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.css" rel="stylesheet">
+    <!--     Fonts and icons     -->
+    <link href="http://netdna.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.css" rel="stylesheet">
+
+    <!-- CSS Files -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
 
-	<!-- CSS Files -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
     <link href="{{ asset('admin-setup.css') }}" rel="stylesheet">
 </head>
 
@@ -23,146 +24,146 @@
 
     <div class="container">
         <div class="row">
-        <div class="col-sm-8 col-sm-offset-2">
-
-            <div class="wizard-container">
-                <div class="card wizard-card" data-color="green" id="wizard">
-                <form action="{{route("hessamcms.admin.languages.setup_submit")}}" method="post">
-                    @csrf
-
-                    	<div class="wizard-header" style="text-align: center">
-{{--                        	<img src="assets/img/hessam-cms.png" style="padding: 10px 10px 20px 10px;">--}}
-                    	</div>
-						<div class="wizard-navigation">
-							<ul>
-	                            <li><a href="#language" data-toggle="tab">Language</a></li>
-	                        </ul>
-						</div>
-
-                        <div class="tab-content">
-                            <div class="tab-pane" id="language">
-                              <div class="row">
-                                  <div class="col-sm-12">
-                                    <h4 class="info-text">Your default language is English in Beta release. Add more language from admin panel.</h4>
-                                  </div>
-                                  <div class="col-sm-12">
-                                       <div class="form-group">
-                                            <label>Language</label><br>
-                                           <select readonly class="form-control" id="lang-name" data-placeholder="Choose a Language...">
-{{--                                               <option value="AF">Afrikaans</option>--}}
-{{--                                               <option value="SQ">Albanian</option>--}}
-{{--                                               <option value="AR">Arabic</option>--}}
-{{--                                               <option value="HY">Armenian</option>--}}
-{{--                                               <option value="EU">Basque</option>--}}
-{{--                                               <option value="BN">Bengali</option>--}}
-{{--                                               <option value="BG">Bulgarian</option>--}}
-{{--                                               <option value="CA">Catalan</option>--}}
-{{--                                               <option value="KM">Cambodian</option>--}}
-{{--                                               <option value="ZH">Chinese (Mandarin)</option>--}}
-{{--                                               <option value="HR">Croatian</option>--}}
-{{--                                               <option value="CS">Czech</option>--}}
-{{--                                               <option value="DA">Danish</option>--}}
-{{--                                               <option value="NL">Dutch</option>--}}
-{{--                                               <option value="EN">English</option>--}}
-{{--                                               <option value="ET">Estonian</option>--}}
-{{--                                               <option value="FJ">Fiji</option>--}}
-{{--                                               <option value="FI">Finnish</option>--}}
-{{--                                               <option value="FR">French</option>--}}
-{{--                                               <option value="KA">Georgian</option>--}}
-{{--                                               <option value="DE">German</option>--}}
-{{--                                               <option value="EL">Greek</option>--}}
-{{--                                               <option value="GU">Gujarati</option>--}}
-{{--                                               <option value="HE">Hebrew</option>--}}
-{{--                                               <option value="HI">Hindi</option>--}}
-{{--                                               <option value="HU">Hungarian</option>--}}
-{{--                                               <option value="IS">Icelandic</option>--}}
-{{--                                               <option value="ID">Indonesian</option>--}}
-{{--                                               <option value="GA">Irish</option>--}}
-{{--                                               <option value="IT">Italian</option>--}}
-{{--                                               <option value="JA">Japanese</option>--}}
-{{--                                               <option value="JW">Javanese</option>--}}
-{{--                                               <option value="KO">Korean</option>--}}
-{{--                                               <option value="LA">Latin</option>--}}
-{{--                                               <option value="LV">Latvian</option>--}}
-{{--                                               <option value="LT">Lithuanian</option>--}}
-{{--                                               <option value="MK">Macedonian</option>--}}
-{{--                                               <option value="MS">Malay</option>--}}
-{{--                                               <option value="ML">Malayalam</option>--}}
-{{--                                               <option value="MT">Maltese</option>--}}
-{{--                                               <option value="MI">Maori</option>--}}
-{{--                                               <option value="MR">Marathi</option>--}}
-{{--                                               <option value="MN">Mongolian</option>--}}
-{{--                                               <option value="NE">Nepali</option>--}}
-{{--                                               <option value="NO">Norwegian</option>--}}
-{{--                                               <option value="FA">Persian</option>--}}
-{{--                                               <option value="PL">Polish</option>--}}
-{{--                                               <option value="PT">Portuguese</option>--}}
-{{--                                               <option value="PA">Punjabi</option>--}}
-{{--                                               <option value="QU">Quechua</option>--}}
-{{--                                               <option value="RO">Romanian</option>--}}
-{{--                                               <option value="RU">Russian</option>--}}
-{{--                                               <option value="SM">Samoan</option>--}}
-{{--                                               <option value="SR">Serbian</option>--}}
-{{--                                               <option value="SK">Slovak</option>--}}
-{{--                                               <option value="SL">Slovenian</option>--}}
-{{--                                               <option value="ES">Spanish</option>--}}
-{{--                                               <option value="SW">Swahili</option>--}}
-{{--                                               <option value="SV">Swedish </option>--}}
-{{--                                               <option value="TA">Tamil</option>--}}
-{{--                                               <option value="TT">Tatar</option>--}}
-{{--                                               <option value="TE">Telugu</option>--}}
-{{--                                               <option value="TH">Thai</option>--}}
-{{--                                               <option value="BO">Tibetan</option>--}}
-{{--                                               <option value="TO">Tonga</option>--}}
-{{--                                               <option value="TR">Turkish</option>--}}
-{{--                                               <option value="UK">Ukrainian</option>--}}
-{{--                                               <option value="UR">Urdu</option>--}}
-{{--                                               <option value="UZ">Uzbek</option>--}}
-{{--                                               <option value="VI">Vietnamese</option>--}}
-{{--                                               <option value="CY">Welsh</option>--}}
-{{--                                               <option value="XH">Xhosa</option>--}}
-                                           </select>
-
-{{--                                           <script>--}}
-{{--                                               $('#lang-name').change(function(){--}}
-{{--                                                   var value = $(this).val().toLowerCase();--}}
-{{--                                                   $('#language_name').val($("#lang-name option:selected").text());--}}
-{{--                                                   $('#language_locale').val(value);--}}
-{{--                                                   $('#iso_code').val(value);--}}
-{{--                                                   console.log(value)--}}
-{{--                                               });--}}
-{{--                                           </script>--}}
-
-                                           <input type="text"
-                                                  class="form-control"
-                                                  id="language_name"
-                                                  required
-                                                  name='name'
-                                                  value="English"
-                                                  style="display: none">
-
-                                           <input type="text"
-                                                  class="form-control"
-                                                  id="language_locale"
-                                                  required
-                                                  name='locale'
-                                                  value="en"
-                                                  style="display: none">
-
-                                           <input name="iso_code" value="en" id="iso_code" style="display: none">
-                                           <input name="date_format" value="YYYY/MM/DD" style="display: none">
-                                           <input checked style="display: none" name="active" value="1">
-
-
-                                       </div>
-                                  </div>
-                              </div>
+            <div class="col-sm-8 col-sm-offset-2">
+
+                <div class="wizard-container">
+                    <div class="card wizard-card" data-color="green" id="wizard">
+                        <form action="{{route("hessamcms.admin.setup_submit")}}" method="post">
+                            @csrf
+
+                            <div class="wizard-header" style="text-align: center">
+                                {{--                        	<img src="assets/img/hessam-cms.png" style="padding: 10px 10px 20px 10px;">--}}
+                            </div>
+                            <div class="wizard-navigation">
+                                <ul>
+                                    <li><a href="#language" data-toggle="tab">Language</a></li>
+                                </ul>
                             </div>
-                        </div>
 
-{{--                    FOOTER--}}
-                        <div class="wizard-footer">
-                            	<div class="pull-right">
+                            <div class="tab-content">
+                                <div class="tab-pane" id="language">
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <h4 class="info-text">Your default language is English in Beta release. Add more language from admin panel.</h4>
+                                        </div>
+                                        <div class="col-sm-12">
+                                            <div class="form-group">
+                                                <label>Language</label><br>
+                                                <select readonly class="form-control" id="lang-name" data-placeholder="Choose a Language...">
+                                                    {{--                                               <option value="AF">Afrikaans</option>--}}
+                                                    {{--                                               <option value="SQ">Albanian</option>--}}
+                                                    {{--                                               <option value="AR">Arabic</option>--}}
+                                                    {{--                                               <option value="HY">Armenian</option>--}}
+                                                    {{--                                               <option value="EU">Basque</option>--}}
+                                                    {{--                                               <option value="BN">Bengali</option>--}}
+                                                    {{--                                               <option value="BG">Bulgarian</option>--}}
+                                                    {{--                                               <option value="CA">Catalan</option>--}}
+                                                    {{--                                               <option value="KM">Cambodian</option>--}}
+                                                    {{--                                               <option value="ZH">Chinese (Mandarin)</option>--}}
+                                                    {{--                                               <option value="HR">Croatian</option>--}}
+                                                    {{--                                               <option value="CS">Czech</option>--}}
+                                                    {{--                                               <option value="DA">Danish</option>--}}
+                                                    {{--                                               <option value="NL">Dutch</option>--}}
+                                                                                                   <option value="EN">English</option>
+                                                    {{--                                               <option value="ET">Estonian</option>--}}
+                                                    {{--                                               <option value="FJ">Fiji</option>--}}
+                                                    {{--                                               <option value="FI">Finnish</option>--}}
+                                                    {{--                                               <option value="FR">French</option>--}}
+                                                    {{--                                               <option value="KA">Georgian</option>--}}
+                                                    {{--                                               <option value="DE">German</option>--}}
+                                                    {{--                                               <option value="EL">Greek</option>--}}
+                                                    {{--                                               <option value="GU">Gujarati</option>--}}
+                                                    {{--                                               <option value="HE">Hebrew</option>--}}
+                                                    {{--                                               <option value="HI">Hindi</option>--}}
+                                                    {{--                                               <option value="HU">Hungarian</option>--}}
+                                                    {{--                                               <option value="IS">Icelandic</option>--}}
+                                                    {{--                                               <option value="ID">Indonesian</option>--}}
+                                                    {{--                                               <option value="GA">Irish</option>--}}
+                                                    {{--                                               <option value="IT">Italian</option>--}}
+                                                    {{--                                               <option value="JA">Japanese</option>--}}
+                                                    {{--                                               <option value="JW">Javanese</option>--}}
+                                                    {{--                                               <option value="KO">Korean</option>--}}
+                                                    {{--                                               <option value="LA">Latin</option>--}}
+                                                    {{--                                               <option value="LV">Latvian</option>--}}
+                                                    {{--                                               <option value="LT">Lithuanian</option>--}}
+                                                    {{--                                               <option value="MK">Macedonian</option>--}}
+                                                    {{--                                               <option value="MS">Malay</option>--}}
+                                                    {{--                                               <option value="ML">Malayalam</option>--}}
+                                                    {{--                                               <option value="MT">Maltese</option>--}}
+                                                    {{--                                               <option value="MI">Maori</option>--}}
+                                                    {{--                                               <option value="MR">Marathi</option>--}}
+                                                    {{--                                               <option value="MN">Mongolian</option>--}}
+                                                    {{--                                               <option value="NE">Nepali</option>--}}
+                                                    {{--                                               <option value="NO">Norwegian</option>--}}
+                                                    {{--                                               <option value="FA">Persian</option>--}}
+                                                    {{--                                               <option value="PL">Polish</option>--}}
+                                                    {{--                                               <option value="PT">Portuguese</option>--}}
+                                                    {{--                                               <option value="PA">Punjabi</option>--}}
+                                                    {{--                                               <option value="QU">Quechua</option>--}}
+                                                    {{--                                               <option value="RO">Romanian</option>--}}
+                                                    {{--                                               <option value="RU">Russian</option>--}}
+                                                    {{--                                               <option value="SM">Samoan</option>--}}
+                                                    {{--                                               <option value="SR">Serbian</option>--}}
+                                                    {{--                                               <option value="SK">Slovak</option>--}}
+                                                    {{--                                               <option value="SL">Slovenian</option>--}}
+                                                    {{--                                               <option value="ES">Spanish</option>--}}
+                                                    {{--                                               <option value="SW">Swahili</option>--}}
+                                                    {{--                                               <option value="SV">Swedish </option>--}}
+                                                    {{--                                               <option value="TA">Tamil</option>--}}
+                                                    {{--                                               <option value="TT">Tatar</option>--}}
+                                                    {{--                                               <option value="TE">Telugu</option>--}}
+                                                    {{--                                               <option value="TH">Thai</option>--}}
+                                                    {{--                                               <option value="BO">Tibetan</option>--}}
+                                                    {{--                                               <option value="TO">Tonga</option>--}}
+                                                    {{--                                               <option value="TR">Turkish</option>--}}
+                                                    {{--                                               <option value="UK">Ukrainian</option>--}}
+                                                    {{--                                               <option value="UR">Urdu</option>--}}
+                                                    {{--                                               <option value="UZ">Uzbek</option>--}}
+                                                    {{--                                               <option value="VI">Vietnamese</option>--}}
+                                                    {{--                                               <option value="CY">Welsh</option>--}}
+                                                    {{--                                               <option value="XH">Xhosa</option>--}}
+                                                </select>
+
+                                                {{--                                           <script>--}}
+                                                {{--                                               $('#lang-name').change(function(){--}}
+                                                {{--                                                   var value = $(this).val().toLowerCase();--}}
+                                                {{--                                                   $('#language_name').val($("#lang-name option:selected").text());--}}
+                                                {{--                                                   $('#language_locale').val(value);--}}
+                                                {{--                                                   $('#iso_code').val(value);--}}
+                                                {{--                                                   console.log(value)--}}
+                                                {{--                                               });--}}
+                                                {{--                                           </script>--}}
+
+                                                <input type="text"
+                                                       class="form-control"
+                                                       id="language_name"
+                                                       required
+                                                       name='name'
+                                                       value="English"
+                                                       style="display: none">
+
+                                                <input type="text"
+                                                       class="form-control"
+                                                       id="language_locale"
+                                                       required
+                                                       name='locale'
+                                                       value="en"
+                                                       style="display: none">
+
+                                                <input name="iso_code" value="en" id="iso_code" style="display: none">
+                                                <input name="date_format" value="YYYY/MM/DD" style="display: none">
+                                                <input checked style="display: none" name="active" value="1">
+
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            {{--                    FOOTER--}}
+                            <div class="wizard-footer">
+                                <div class="pull-right">
                                     <input type='button' class='btn btn-next btn-fill btn-success btn-wd btn-sm' name='next' value='Next' />
                                     <input type='submit' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Finish' />
 
@@ -171,32 +172,32 @@ class="form-control"
                                     <input type='button' class='btn btn-previous btn-fill btn-default btn-wd btn-sm' name='previous' value='Previous' />
                                 </div>
                                 <div class="clearfix"></div>
-                        </div>
+                            </div>
 
-                    </form>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
-        </div>
     </div>
 
     <div class="footer">
         <div class="container">
-					Created by Hessam CMS
+            Created by Hessam CMS
         </div>
     </div>
 </div>
 
 </body>
 
-	<!--   Core JS Files   -->
-    <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<!--   Core JS Files   -->
+<script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap-wizard/1.2/jquery.bootstrap.wizard.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap-wizard/1.2/jquery.bootstrap.wizard.js"></script>
 
-	<!--  Plugin for the Wizard -->
-    <script>
+<!--  Plugin for the Wizard -->
+<script>
     searchVisible = 0;
     transparent = true;
 
@@ -393,7 +394,7 @@ function debounce(func, wait, immediate) {
 
 </script>
 
-	<!--  More information about jquery.validate here: http://jqueryvalidation.org/	 -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery-validation@1.19.2/dist/additional-methods.js"></script>
+<!--  More information about jquery.validate here: http://jqueryvalidation.org/	 -->
+<script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js"></script>
 
 </html>
diff --git a/src/routes.php b/src/routes.php
index 2e31544..b8ebd62 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -44,7 +44,7 @@
         Route::get('/setup', 'HessamAdminSetupController@setup')
             ->name('hessamcms.admin.setup');
 
-        Route::get('/setup-submit', 'HessamAdminSetupController@setup_submit')
+        Route::post('/setup-submit', 'HessamAdminSetupController@setup_submit')
             ->name('hessamcms.admin.setup_submit');
 
         Route::get('/', 'HessamAdminController@index')

From 08b8c249d6f84df1239ced4da0f65d0081fbace5 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 18 Nov 2020 01:41:58 +0330
Subject: [PATCH 034/118] changes setup page

---
 .../hessamcms_admin/setup/setup.blade.php     | 305 +++++++++++-------
 1 file changed, 183 insertions(+), 122 deletions(-)

diff --git a/src/Views/hessamcms_admin/setup/setup.blade.php b/src/Views/hessamcms_admin/setup/setup.blade.php
index 4dba6ef..15318dc 100644
--- a/src/Views/hessamcms_admin/setup/setup.blade.php
+++ b/src/Views/hessamcms_admin/setup/setup.blade.php
@@ -31,8 +31,54 @@
                         <form action="{{route("hessamcms.admin.setup_submit")}}" method="post">
                             @csrf
 
-                            <div class="wizard-header" style="text-align: center">
-                                {{--                        	<img src="assets/img/hessam-cms.png" style="padding: 10px 10px 20px 10px;">--}}
+                            <div class="wizard-header" style="padding: 10px; text-align: center">
+
+                                <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+                                     width="197.000000pt" height="65.000000pt" viewBox="0 0 197.000000 65.000000"
+                                     preserveAspectRatio="xMidYMid meet">
+
+                                    <g transform="translate(0.000000,65.000000) scale(0.100000,-0.100000)"
+                                       fill="#000000" stroke="none">
+                                        <path style="fill: #2787AC;" d="M424 636 c-20 -22 -38 -60 -59 -125 -20 -62 -22 -64 -74 -83 -29 -11
+-55 -18 -57 -15 -3 3 10 45 29 93 19 49 31 93 27 97 -12 13 -59 -3 -75 -25 -7
+-12 -28 -65 -45 -119 -32 -99 -32 -99 -85 -131 -52 -31 -86 -71 -71 -85 3 -4
+27 3 51 15 25 12 48 22 51 22 6 0 3 -33 -12 -131 -6 -40 13 -69 46 -69 14 0
+19 11 25 58 3 31 13 87 21 123 15 65 15 65 66 87 28 12 53 21 54 19 2 -1 -8
+-56 -21 -122 -31 -155 -33 -220 -4 -235 36 -20 46 -6 59 87 16 121 56 295 70
+303 6 4 53 15 105 25 101 20 114 32 69 62 -23 15 -33 15 -86 4 -33 -7 -63 -10
+-66 -7 -3 3 7 36 21 74 15 37 27 73 27 80 0 16 -52 15 -66 -2z"/>
+                                        <path style="fill: #b6b8ba;" d="M1422 340 c-72 -32 -91 -113 -40 -167 29 -32 78 -30 108 2 17 19 21
+28 13 36 -9 9 -19 6 -39 -10 -24 -19 -30 -20 -48 -8 -39 26 -30 81 19 113 19
+13 27 13 44 2 23 -14 36 -6 28 16 -12 30 -41 36 -85 16z"/>
+                                        <path style="fill: #b6b8ba;" d="M1686 339 c-9 -13 -16 -26 -16 -30 0 -4 -7 -24 -16 -45 l-16 -38 -31
+60 c-45 84 -64 83 -72 -3 -11 -122 -11 -127 6 -131 12 -2 18 10 25 55 l9 58
+28 -53 c16 -29 33 -52 40 -49 7 2 20 27 31 55 10 28 22 50 26 47 4 -3 11 -30
+15 -60 4 -35 11 -55 20 -55 22 0 23 21 6 107 -20 97 -32 115 -55 82z"/>
+                                        <path style="fill: #b6b8ba;" d="M1802 334 c-17 -12 -22 -24 -20 -47 3 -27 9 -34 48 -47 46 -16 63
+-43 34 -54 -9 -3 -30 1 -47 9 -20 10 -34 12 -40 6 -14 -14 8 -38 48 -51 38
+-12 58 -6 90 30 18 20 18 23 3 48 -10 16 -34 33 -58 42 -54 19 -56 34 -5 38
+47 4 67 18 45 32 -23 15 -73 12 -98 -6z"/>
+                                        <path style="fill: #b6b8ba;" d="M608 286 c-14 -32 -5 -53 29 -68 37 -16 36 -15 28 -28 -5 -8 -14 -6
+-32 5 -36 24 -56 3 -26 -26 26 -27 72 -28 90 -3 21 29 12 57 -24 74 -39 18
+-44 35 -8 26 29 -7 48 20 24 35 -28 18 -69 10 -81 -15z"/>
+                                        <path style="fill: #b6b8ba;" d="M737 289 c-21 -29 -10 -55 29 -74 19 -9 32 -21 28 -26 -3 -6 -15 -4
+-31 6 -33 22 -55 5 -29 -24 39 -43 96 -25 96 30 0 25 -6 33 -30 42 -36 14 -40
+32 -6 23 29 -7 43 9 26 29 -18 22 -66 19 -83 -6z"/>
+                                        <path style="fill: #b6b8ba;" d="M1014 296 c-3 -7 -4 -42 -2 -77 2 -51 6 -64 21 -67 14 -3 17 5 17 52
+0 31 5 56 10 56 6 0 13 1 18 3 4 1 9 -23 12 -53 4 -40 9 -55 20 -55 11 0 16
+15 20 55 4 40 9 55 20 55 11 0 16 -14 18 -58 3 -49 6 -58 20 -55 18 3 29 70
+18 113 -7 29 -51 49 -77 35 -11 -6 -24 -8 -31 -4 -21 13 -79 13 -84 0z"/>
+                                        <path style="fill: #b6b8ba;" d="M460 282 c-28 -23 -31 -83 -5 -112 29 -32 115 -21 115 15 0 11 -11
+14 -47 10 -47 -5 -47 -4 -15 7 72 25 78 98 8 98 -19 0 -44 -8 -56 -18z m65
+-31 c-6 -5 -21 -12 -35 -16 -22 -7 -23 -6 -11 9 7 9 23 16 34 16 13 0 17 -4
+12 -9z"/>
+                                        <path style="fill: #b6b8ba;" d="M886 274 c-19 -19 -26 -37 -26 -64 0 -49 15 -60 78 -59 l51 2 -5 61
+c-3 33 -7 67 -10 74 -6 22 -60 14 -88 -14z m54 -48 c0 -31 -19 -53 -34 -39
+-10 11 -7 48 6 61 20 20 28 14 28 -22z"/>
+                                    </g>
+                                </svg>
+
+
                             </div>
                             <div class="wizard-navigation">
                                 <ul>
@@ -45,134 +91,149 @@
                                     <div class="row">
                                         <div class="col-sm-12">
                                             <h4 class="info-text">Your default language is English in Beta release. Add more language from admin panel.</h4>
+                                            <h5 class="info-text">
+                                                More configurations will be added to this setup section.
+                                            </h5>
+                                            <h6 class="info-text">
+                                                Beta release v9.0.x
+                                            </h6>
                                         </div>
-                                        <div class="col-sm-12">
-                                            <div class="form-group">
-                                                <label>Language</label><br>
-                                                <select readonly class="form-control" id="lang-name" data-placeholder="Choose a Language...">
-                                                    {{--                                               <option value="AF">Afrikaans</option>--}}
-                                                    {{--                                               <option value="SQ">Albanian</option>--}}
-                                                    {{--                                               <option value="AR">Arabic</option>--}}
-                                                    {{--                                               <option value="HY">Armenian</option>--}}
-                                                    {{--                                               <option value="EU">Basque</option>--}}
-                                                    {{--                                               <option value="BN">Bengali</option>--}}
-                                                    {{--                                               <option value="BG">Bulgarian</option>--}}
-                                                    {{--                                               <option value="CA">Catalan</option>--}}
-                                                    {{--                                               <option value="KM">Cambodian</option>--}}
-                                                    {{--                                               <option value="ZH">Chinese (Mandarin)</option>--}}
-                                                    {{--                                               <option value="HR">Croatian</option>--}}
-                                                    {{--                                               <option value="CS">Czech</option>--}}
-                                                    {{--                                               <option value="DA">Danish</option>--}}
-                                                    {{--                                               <option value="NL">Dutch</option>--}}
-                                                                                                   <option value="EN">English</option>
-                                                    {{--                                               <option value="ET">Estonian</option>--}}
-                                                    {{--                                               <option value="FJ">Fiji</option>--}}
-                                                    {{--                                               <option value="FI">Finnish</option>--}}
-                                                    {{--                                               <option value="FR">French</option>--}}
-                                                    {{--                                               <option value="KA">Georgian</option>--}}
-                                                    {{--                                               <option value="DE">German</option>--}}
-                                                    {{--                                               <option value="EL">Greek</option>--}}
-                                                    {{--                                               <option value="GU">Gujarati</option>--}}
-                                                    {{--                                               <option value="HE">Hebrew</option>--}}
-                                                    {{--                                               <option value="HI">Hindi</option>--}}
-                                                    {{--                                               <option value="HU">Hungarian</option>--}}
-                                                    {{--                                               <option value="IS">Icelandic</option>--}}
-                                                    {{--                                               <option value="ID">Indonesian</option>--}}
-                                                    {{--                                               <option value="GA">Irish</option>--}}
-                                                    {{--                                               <option value="IT">Italian</option>--}}
-                                                    {{--                                               <option value="JA">Japanese</option>--}}
-                                                    {{--                                               <option value="JW">Javanese</option>--}}
-                                                    {{--                                               <option value="KO">Korean</option>--}}
-                                                    {{--                                               <option value="LA">Latin</option>--}}
-                                                    {{--                                               <option value="LV">Latvian</option>--}}
-                                                    {{--                                               <option value="LT">Lithuanian</option>--}}
-                                                    {{--                                               <option value="MK">Macedonian</option>--}}
-                                                    {{--                                               <option value="MS">Malay</option>--}}
-                                                    {{--                                               <option value="ML">Malayalam</option>--}}
-                                                    {{--                                               <option value="MT">Maltese</option>--}}
-                                                    {{--                                               <option value="MI">Maori</option>--}}
-                                                    {{--                                               <option value="MR">Marathi</option>--}}
-                                                    {{--                                               <option value="MN">Mongolian</option>--}}
-                                                    {{--                                               <option value="NE">Nepali</option>--}}
-                                                    {{--                                               <option value="NO">Norwegian</option>--}}
-                                                    {{--                                               <option value="FA">Persian</option>--}}
-                                                    {{--                                               <option value="PL">Polish</option>--}}
-                                                    {{--                                               <option value="PT">Portuguese</option>--}}
-                                                    {{--                                               <option value="PA">Punjabi</option>--}}
-                                                    {{--                                               <option value="QU">Quechua</option>--}}
-                                                    {{--                                               <option value="RO">Romanian</option>--}}
-                                                    {{--                                               <option value="RU">Russian</option>--}}
-                                                    {{--                                               <option value="SM">Samoan</option>--}}
-                                                    {{--                                               <option value="SR">Serbian</option>--}}
-                                                    {{--                                               <option value="SK">Slovak</option>--}}
-                                                    {{--                                               <option value="SL">Slovenian</option>--}}
-                                                    {{--                                               <option value="ES">Spanish</option>--}}
-                                                    {{--                                               <option value="SW">Swahili</option>--}}
-                                                    {{--                                               <option value="SV">Swedish </option>--}}
-                                                    {{--                                               <option value="TA">Tamil</option>--}}
-                                                    {{--                                               <option value="TT">Tatar</option>--}}
-                                                    {{--                                               <option value="TE">Telugu</option>--}}
-                                                    {{--                                               <option value="TH">Thai</option>--}}
-                                                    {{--                                               <option value="BO">Tibetan</option>--}}
-                                                    {{--                                               <option value="TO">Tonga</option>--}}
-                                                    {{--                                               <option value="TR">Turkish</option>--}}
-                                                    {{--                                               <option value="UK">Ukrainian</option>--}}
-                                                    {{--                                               <option value="UR">Urdu</option>--}}
-                                                    {{--                                               <option value="UZ">Uzbek</option>--}}
-                                                    {{--                                               <option value="VI">Vietnamese</option>--}}
-                                                    {{--                                               <option value="CY">Welsh</option>--}}
-                                                    {{--                                               <option value="XH">Xhosa</option>--}}
-                                                </select>
-
-                                                {{--                                           <script>--}}
-                                                {{--                                               $('#lang-name').change(function(){--}}
-                                                {{--                                                   var value = $(this).val().toLowerCase();--}}
-                                                {{--                                                   $('#language_name').val($("#lang-name option:selected").text());--}}
-                                                {{--                                                   $('#language_locale').val(value);--}}
-                                                {{--                                                   $('#iso_code').val(value);--}}
-                                                {{--                                                   console.log(value)--}}
-                                                {{--                                               });--}}
-                                                {{--                                           </script>--}}
-
-                                                <input type="text"
-                                                       class="form-control"
-                                                       id="language_name"
-                                                       required
-                                                       name='name'
-                                                       value="English"
-                                                       style="display: none">
-
-                                                <input type="text"
-                                                       class="form-control"
-                                                       id="language_locale"
-                                                       required
-                                                       name='locale'
-                                                       value="en"
-                                                       style="display: none">
-
-                                                <input name="iso_code" value="en" id="iso_code" style="display: none">
-                                                <input name="date_format" value="YYYY/MM/DD" style="display: none">
-                                                <input checked style="display: none" name="active" value="1">
-
-
-                                            </div>
-                                        </div>
+                                        {{--                                        <div class="col-sm-12">--}}
+                                        {{--                                            <div class="form-group">--}}
+                                        {{--                                                <label>Language</label><br>--}}
+                                        {{--                                                <select readonly class="form-control" id="lang-name" data-placeholder="Choose a Language...">--}}
+                                        {{--                                                    --}}{{--                                               <option value="AF">Afrikaans</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="SQ">Albanian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="AR">Arabic</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="HY">Armenian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="EU">Basque</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="BN">Bengali</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="BG">Bulgarian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="CA">Catalan</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="KM">Cambodian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="ZH">Chinese (Mandarin)</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="HR">Croatian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="CS">Czech</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="DA">Danish</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="NL">Dutch</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="EN">English</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="ET">Estonian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="FJ">Fiji</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="FI">Finnish</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="FR">French</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="KA">Georgian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="DE">German</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="EL">Greek</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="GU">Gujarati</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="HE">Hebrew</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="HI">Hindi</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="HU">Hungarian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="IS">Icelandic</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="ID">Indonesian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="GA">Irish</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="IT">Italian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="JA">Japanese</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="JW">Javanese</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="KO">Korean</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="LA">Latin</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="LV">Latvian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="LT">Lithuanian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="MK">Macedonian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="MS">Malay</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="ML">Malayalam</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="MT">Maltese</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="MI">Maori</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="MR">Marathi</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="MN">Mongolian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="NE">Nepali</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="NO">Norwegian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="FA">Persian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="PL">Polish</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="PT">Portuguese</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="PA">Punjabi</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="QU">Quechua</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="RO">Romanian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="RU">Russian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="SM">Samoan</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="SR">Serbian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="SK">Slovak</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="SL">Slovenian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="ES">Spanish</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="SW">Swahili</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="SV">Swedish </option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="TA">Tamil</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="TT">Tatar</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="TE">Telugu</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="TH">Thai</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="BO">Tibetan</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="TO">Tonga</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="TR">Turkish</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="UK">Ukrainian</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="UR">Urdu</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="UZ">Uzbek</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="VI">Vietnamese</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="CY">Welsh</option>--}}
+                                        {{--                                                    --}}{{--                                               <option value="XH">Xhosa</option>--}}
+                                        {{--                                                </select>--}}
+
+                                        {{--                                                --}}{{--                                           <script>--}}
+                                        {{--                                                --}}{{--                                               $('#lang-name').change(function(){--}}
+                                        {{--                                                --}}{{--                                                   var value = $(this).val().toLowerCase();--}}
+                                        {{--                                                --}}{{--                                                   $('#language_name').val($("#lang-name option:selected").text());--}}
+                                        {{--                                                --}}{{--                                                   $('#language_locale').val(value);--}}
+                                        {{--                                                --}}{{--                                                   $('#iso_code').val(value);--}}
+                                        {{--                                                --}}{{--                                                   console.log(value)--}}
+                                        {{--                                                --}}{{--                                               });--}}
+                                        {{--                                                --}}{{--                                           </script>--}}
+
+                                        {{--                                                <input type="text"--}}
+                                        {{--                                                       class="form-control"--}}
+                                        {{--                                                       id="language_name"--}}
+                                        {{--                                                       required--}}
+                                        {{--                                                       name='name'--}}
+                                        {{--                                                       value="English"--}}
+                                        {{--                                                       style="display: none">--}}
+
+                                        {{--                                                <input type="text"--}}
+                                        {{--                                                       class="form-control"--}}
+                                        {{--                                                       id="language_locale"--}}
+                                        {{--                                                       required--}}
+                                        {{--                                                       name='locale'--}}
+                                        {{--                                                       value="en"--}}
+                                        {{--                                                       style="display: none">--}}
+
+                                        {{--                                                <input name="iso_code" value="en" id="iso_code" style="display: none">--}}
+                                        {{--                                                <input name="date_format" value="YYYY/MM/DD" style="display: none">--}}
+                                        {{--                                                <input checked style="display: none" name="active" value="1">--}}
+
+
+                                        {{--                                            </div>--}}
+                                        {{--                                        </div>--}}
+
+
+
                                     </div>
                                 </div>
                             </div>
 
-                            {{--                    FOOTER--}}
-                            <div class="wizard-footer">
-                                <div class="pull-right">
-                                    <input type='button' class='btn btn-next btn-fill btn-success btn-wd btn-sm' name='next' value='Next' />
-                                    <input type='submit' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Finish' />
+                            <div class="row">
+                                <div class="col-md-12" style="text-align: center">
+                                    <input type='submit' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Setup Package' />
 
                                 </div>
-                                <div class="pull-left">
-                                    <input type='button' class='btn btn-previous btn-fill btn-default btn-wd btn-sm' name='previous' value='Previous' />
-                                </div>
-                                <div class="clearfix"></div>
                             </div>
+                            {{--                    FOOTER--}}
+                            {{--                            <div class="wizard-footer ">--}}
+                            {{--                                <div class="pull-right">--}}
+                            {{--                                    <input type='button' class='btn btn-next btn-fill btn-success btn-wd btn-sm' name='next' value='Next' />--}}
+                            {{--                                    <input type='submit' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Finish' />--}}
+
+                            {{--                                </div>--}}
+                            {{--                                <div class="pull-left">--}}
+                            {{--                                    <input type='button' class='btn btn-previous btn-fill btn-default btn-wd btn-sm' name='previous' value='Previous' />--}}
+                            {{--                                </div>--}}
+                            {{--                                <div class="clearfix"></div>--}}
+                            {{--                            </div>--}}
 
                         </form>
                     </div>

From 50c9f168fba4b3866957bdb74b8229f87eb8e5cc Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 18 Nov 2020 02:57:08 +0330
Subject: [PATCH 035/118] bug fixes for loading default language in panel

---
 src/Controllers/HessamAdminController.php     | 10 ++---
 .../HessamAdminSetupController.php            |  7 +++-
 .../HessamCategoryAdminController.php         | 10 ++---
 src/Middleware/LoadLanguage.php               | 13 ++++---
 src/Middleware/PackageSetup.php               |  2 +-
 src/Models/HessamConfiguration.php            |  2 +-
 src/Views/hessamcms/index.blade.php           | 16 ++++----
 .../categories/add_category.blade.php         |  2 +-
 .../layouts/admin_layout.blade.php            | 22 +++++------
 .../hessamcms_admin/setup/setup.blade.php     | 38 +++++++++----------
 10 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 32ed4a3..a9df0e8 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -54,7 +54,7 @@ public function __construct()
      */
     public function index(Request $request)
     {
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $posts = HessamPostTranslation::orderBy("post_id", "desc")->where('lang_id', $language_id)
             ->paginate(10);
 
@@ -67,7 +67,7 @@ public function index(Request $request)
      */
     public function create_post(Request $request)
     {
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $language_list = HessamLanguage::where('active',true)->get();
         $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
@@ -197,7 +197,7 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
 
         //todo: generate event
 
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $language_list = HessamLanguage::where('active',true)->get();
         $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
@@ -229,7 +229,7 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
      */
     public function edit_post( $blogPostId , Request $request)
     {
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
 
         $post_translation = HessamPostTranslation::where(
             [
@@ -259,7 +259,7 @@ public function edit_post( $blogPostId , Request $request)
      */
     public function edit_post_toggle( $blogPostId , Request $request)
     {
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $post_translation = HessamPostTranslation::where(
             [
                 ['lang_id', '=', $request['selected_lang']],
diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
index 5cf3ab8..631b4e5 100644
--- a/src/Controllers/HessamAdminSetupController.php
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -12,7 +12,7 @@
 /**
  * Class HessamAdminSetupController
  * Handles initial setup for Hessam CMS
-*/
+ */
 class HessamAdminSetupController extends Controller
 {
     /**
@@ -49,7 +49,10 @@ public function setup_submit(Request $request){
         $language->date_format = $request['date_format'];
 
         $language->save();
-        HessamConfiguration::set('INITIAL_SETUP', true);
+        if (!HessamConfiguration::get('INITIAL_SETUP')){
+            HessamConfiguration::set('INITIAL_SETUP', true);
+            HessamConfiguration::set('DEFAULT_LANGUAGE_LOCALE', $request['locale']);
+        }
 
         Helpers::flash_message("Language: " . $language->name . " has been added.");
         return redirect( route('hessamcms.admin.index') );
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index 9fbc41a..08c3832 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -39,7 +39,7 @@ public function __construct()
      * @return mixed
      */
     public function index(Request $request){
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $categories = HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->paginate(25);
         return view("hessamcms_admin::categories.index",[
             'categories' => $categories,
@@ -52,7 +52,7 @@ public function index(Request $request){
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function create_category(Request $request){
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $language_list = HessamLanguage::where('active',true)->get();
 
         $cat_list = HessamCategory::whereHas('categoryTranslations', function ($query) {
@@ -82,7 +82,7 @@ public function create_category(Request $request){
      * This controller is totally REST controller
      */
     public function store_category(Request $request){
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $language_list = $request['data'];
 
         if ($request['parent_id']== 0){
@@ -128,7 +128,7 @@ public function store_category(Request $request){
      * @return mixed
      */
     public function edit_category($categoryId, Request $request){
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $language_list = HessamLanguage::where('active',true)->get();
 
         $category = HessamCategory::findOrFail($categoryId);
@@ -158,7 +158,7 @@ public function edit_category($categoryId, Request $request){
     public function update_category(UpdateHessamCMSCategoryRequest $request, $categoryId){
         /** @var HessamCategory $category */
         $category = HessamCategory::findOrFail($categoryId);
-        $language_id = $request->cookie('language_id');
+        $language_id = $request->get('language_id');
         $translation = HessamCategoryTranslation::where(
             [
                 ['lang_id', '=', $language_id],
diff --git a/src/Middleware/LoadLanguage.php b/src/Middleware/LoadLanguage.php
index 5357616..2f14cc8 100644
--- a/src/Middleware/LoadLanguage.php
+++ b/src/Middleware/LoadLanguage.php
@@ -3,6 +3,7 @@
 
 namespace HessamCMS\Middleware;
 use Closure;
+use HessamCMS\Models\HessamConfiguration;
 use HessamCMS\Models\HessamLanguage;
 
 class LoadLanguage
@@ -10,13 +11,15 @@ class LoadLanguage
 
     public function handle($request, Closure $next)
     {
-        $lang = HessamLanguage::where('locale', config("hessamcms.default_language"))
+        $default_locale = HessamConfiguration::get('DEFAULT_LANGUAGE_LOCALE');
+        $lang = HessamLanguage::where('locale', $default_locale)
             ->first();
 
-        $request->attributes->add(['locale' => $lang->locale]);
+        $request->attributes->add([
+            'locale' => $lang->locale,
+            'language_id' => $lang->id
+        ]);
 
-        $response = $next($request);
-        $response->withCookie(cookie()->forever('language_id', $lang->language_id));
-        return $response;
+        return $next($request);
     }
 }
diff --git a/src/Middleware/PackageSetup.php b/src/Middleware/PackageSetup.php
index f469bdb..c94eb06 100644
--- a/src/Middleware/PackageSetup.php
+++ b/src/Middleware/PackageSetup.php
@@ -11,7 +11,7 @@ class PackageSetup
     public function handle($request, Closure $next)
     {
         $initial_setup = HessamConfiguration::get('INITIAL_SETUP');
-        if (!$initial_setup || !$initial_setup->value){
+        if (!$initial_setup){
             return redirect( route('hessamcms.admin.setup') );
         }
 
diff --git a/src/Models/HessamConfiguration.php b/src/Models/HessamConfiguration.php
index c0f2620..7a7783f 100644
--- a/src/Models/HessamConfiguration.php
+++ b/src/Models/HessamConfiguration.php
@@ -17,7 +17,7 @@ class HessamConfiguration extends Model
     ];
 
     public static function get($key){
-        return HessamConfiguration::where('key', $key)->first();
+        return HessamConfiguration::where('key', $key)->first()->value;
     }
 
     public static function set($key, $value){
diff --git a/src/Views/hessamcms/index.blade.php b/src/Views/hessamcms/index.blade.php
index 81fbdf5..c2ea759 100755
--- a/src/Views/hessamcms/index.blade.php
+++ b/src/Views/hessamcms/index.blade.php
@@ -75,15 +75,15 @@ class='btn border  btn-outline-primary btn-sm '>
         @if (config('hessamcms.search.search_enabled') )
             @include('hessamcms::sitewide.search_form')
         @endif
-            <div class="row">
-                <div class="col-md-12 text-center">
-                    @forelse($lang_list as $lang)
-                        <a href="{{route("hessamcms.index" , $lang->locale)}}">
-                            <span>{{$lang->name}}</span>
-                        </a>
-                    @endforelse
-                </div>
+        <div class="row">
+            <div class="col-md-12 text-center">
+                @foreach($lang_list as $lang)
+                    <a href="{{route("hessamcms.index" , $lang->locale)}}">
+                        <span>{{$lang->name}}</span>
+                    </a>
+                @endforeach
             </div>
+        </div>
     </div>
 
 @endsection
diff --git a/src/Views/hessamcms_admin/categories/add_category.blade.php b/src/Views/hessamcms_admin/categories/add_category.blade.php
index d1db446..7cd586d 100755
--- a/src/Views/hessamcms_admin/categories/add_category.blade.php
+++ b/src/Views/hessamcms_admin/categories/add_category.blade.php
@@ -122,7 +122,7 @@ function populate_slug_field() {
 
 
             //multi-language data
-            var defalutLangId = {{$language_id}}
+            var defalutLangId = {{$language_id}};
             var preLangId = defalutLangId;
             var languageList = {};
             $("#language_list > option").each(function() {
diff --git a/src/Views/hessamcms_admin/layouts/admin_layout.blade.php b/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
index b6130df..92fa813 100755
--- a/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
+++ b/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
@@ -26,14 +26,14 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito" crossorigin="anonymous">
 
     <!-- Styles -->
-{{--    @if(file_exists(public_path("hessamcms_admin_css.css")))--}}
-        <link href="{{ asset('hessamcms_admin_css.css') }}" rel="stylesheet">
-{{--    @else--}}
-{{--        <link href="{{ asset('css/app.css') }}" rel="stylesheet">--}}
-        {{--Edited your css/app.css file? Uncomment these lines to use plain bootstrap:--}}
-        {{--<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">--}}
-        {{--<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">--}}
-{{--    @endif--}}
+    {{--    @if(file_exists(public_path("hessamcms_admin_css.css")))--}}
+    <link href="{{ asset('hessamcms_admin_css.css') }}" rel="stylesheet">
+    {{--    @else--}}
+    {{--        <link href="{{ asset('css/app.css') }}" rel="stylesheet">--}}
+    {{--Edited your css/app.css file? Uncomment these lines to use plain bootstrap:--}}
+    {{--<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">--}}
+    {{--<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">--}}
+    {{--    @endif--}}
 
 
 </head>
@@ -60,7 +60,7 @@
                 <ul class="navbar-nav ml-auto">
                     <!-- Authentication Links -->
 
-                    <li class='nav-item px-2'><a class='nav-link' href='{{route("hessamcms.index" , $post->url(app('request')->get('locale')))}}'>Blog home</a></li>
+                    <li class='nav-item px-2'><a class='nav-link' href='{{route("hessamcms.index" , app('request')->get('locale'))}}'>Blog home</a></li>
 
                     <li class="nav-item ">
                         <a id="" class="nav-link " href="#" role="button"
@@ -70,9 +70,9 @@
                     </li>
                     <li class="nav-item ">
                         <a class="nav-link" href="{{ route('logout') }}"
-                                       onclick="event.preventDefault();
+                           onclick="event.preventDefault();
                                                      document.getElementById('logout-form').submit();">
-                                        {{ __('Logout') }}
+                            {{ __('Logout') }}
                         </a>
                         <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
                             @csrf
diff --git a/src/Views/hessamcms_admin/setup/setup.blade.php b/src/Views/hessamcms_admin/setup/setup.blade.php
index 15318dc..1cef970 100644
--- a/src/Views/hessamcms_admin/setup/setup.blade.php
+++ b/src/Views/hessamcms_admin/setup/setup.blade.php
@@ -90,7 +90,7 @@
                                 <div class="tab-pane" id="language">
                                     <div class="row">
                                         <div class="col-sm-12">
-                                            <h4 class="info-text">Your default language is English in Beta release. Add more language from admin panel.</h4>
+                                            <h4 class="info-text">Your default language is English in Beta release. You can add more language from admin panel.</h4>
                                             <h5 class="info-text">
                                                 More configurations will be added to this setup section.
                                             </h5>
@@ -186,25 +186,25 @@
                                         {{--                                                --}}{{--                                               });--}}
                                         {{--                                                --}}{{--                                           </script>--}}
 
-                                        {{--                                                <input type="text"--}}
-                                        {{--                                                       class="form-control"--}}
-                                        {{--                                                       id="language_name"--}}
-                                        {{--                                                       required--}}
-                                        {{--                                                       name='name'--}}
-                                        {{--                                                       value="English"--}}
-                                        {{--                                                       style="display: none">--}}
+                                        <input type="text"
+                                               class="form-control"
+                                               id="language_name"
+                                               required
+                                               name='name'
+                                               value="English"
+                                               style="display: none">
 
-                                        {{--                                                <input type="text"--}}
-                                        {{--                                                       class="form-control"--}}
-                                        {{--                                                       id="language_locale"--}}
-                                        {{--                                                       required--}}
-                                        {{--                                                       name='locale'--}}
-                                        {{--                                                       value="en"--}}
-                                        {{--                                                       style="display: none">--}}
+                                        <input type="text"
+                                               class="form-control"
+                                               id="language_locale"
+                                               required
+                                               name='locale'
+                                               value="en"
+                                               style="display: none">
 
-                                        {{--                                                <input name="iso_code" value="en" id="iso_code" style="display: none">--}}
-                                        {{--                                                <input name="date_format" value="YYYY/MM/DD" style="display: none">--}}
-                                        {{--                                                <input checked style="display: none" name="active" value="1">--}}
+                                        <input name="iso_code" value="en" id="iso_code" style="display: none">
+                                        <input name="date_format" value="YYYY/MM/DD" style="display: none">
+                                        <input checked style="display: none" name="active" value="1">
 
 
                                         {{--                                            </div>--}}
@@ -218,7 +218,7 @@
 
                             <div class="row">
                                 <div class="col-md-12" style="text-align: center">
-                                    <input type='submit' class='btn btn-finish btn-fill btn-success btn-wd btn-sm' name='finish' value='Setup Package' />
+                                    <input type='submit' class='btn  btn-fill btn-success btn-wd btn-sm' value='Setup Package' />
 
                                 </div>
                             </div>

From 3bd82bb56a49a575d21bc5bffb3fc83533f75b06 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 18 Nov 2020 03:24:54 +0330
Subject: [PATCH 036/118] a fix for category translations

---
 src/Controllers/HessamAdminController.php                    | 5 ++++-
 src/Controllers/HessamCategoryAdminController.php            | 4 ++--
 .../hessamcms_admin/categories/_category_partial.blade.php   | 2 +-
 src/Views/hessamcms_admin/index.blade.php                    | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index a9df0e8..09a4fb6 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -58,7 +58,10 @@ public function index(Request $request)
         $posts = HessamPostTranslation::orderBy("post_id", "desc")->where('lang_id', $language_id)
             ->paginate(10);
 
-        return view("hessamcms_admin::index", ['post_translations'=>$posts]);
+        return view("hessamcms_admin::index", [
+            'post_translations'=>$posts,
+            'language_id' => $language_id
+        ]);
     }
 
     /**
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/HessamCategoryAdminController.php
index 08c3832..91bfdd9 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/HessamCategoryAdminController.php
@@ -55,8 +55,8 @@ public function create_category(Request $request){
         $language_id = $request->get('language_id');
         $language_list = HessamLanguage::where('active',true)->get();
 
-        $cat_list = HessamCategory::whereHas('categoryTranslations', function ($query) {
-            return $query->where('lang_id', '=', 1);
+        $cat_list = HessamCategory::whereHas('categoryTranslations', function ($query) use ($language_id) {
+            return $query->where('lang_id', '=', $language_id);
         })->get();
 
         $rootList = HessamCategory::roots()->get();
diff --git a/src/Views/hessamcms_admin/categories/_category_partial.blade.php b/src/Views/hessamcms_admin/categories/_category_partial.blade.php
index b68d40d..f86bd14 100644
--- a/src/Views/hessamcms_admin/categories/_category_partial.blade.php
+++ b/src/Views/hessamcms_admin/categories/_category_partial.blade.php
@@ -1,7 +1,7 @@
 @foreach($category_tree as $category)
     <li>
          <span value='{{$category->category_id}}'>
-        {{$category->categoryTranslations->where('lang_id',1)->first()->category_name}}
+        {{$category->categoryTranslations->where('lang_id', $language_id)->first()->category_name}}
         </span>
         @if( count($category->siblings) > 0)
             <ul>
diff --git a/src/Views/hessamcms_admin/index.blade.php b/src/Views/hessamcms_admin/index.blade.php
index eac3332..252f1ff 100755
--- a/src/Views/hessamcms_admin/index.blade.php
+++ b/src/Views/hessamcms_admin/index.blade.php
@@ -31,10 +31,10 @@
                     <dd class="">
                         @if(count($post->post->categories))
                             @foreach($post->post->categories as $category)
-                                <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->edit_url()}}'>
+                                <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->categoryTranslations->where('lang_id' , $language_id)->first()->edit_url()}}'>
                                     <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
 
-                                    {{$category->category_name}}
+                                    {{$category->categoryTranslations->where('lang_id' , $language_id)->first()->category_name}}
                                 </a>
                             @endforeach
                         @else No Categories

From 00b954d5d0431578ab288ea1645508484e1a63e7 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 18 Nov 2020 03:39:49 +0330
Subject: [PATCH 037/118] url fix in edit post - panel

---
 src/Controllers/HessamAdminController.php           | 5 +++--
 src/Views/hessamcms_admin/posts/edit_post.blade.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 09a4fb6..747c7ac 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -249,6 +249,7 @@ public function edit_post( $blogPostId , Request $request)
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $language_id,
+            'selected_locale' => HessamLanguage::where('id', $language_id)->first()->locale,
             'post' => $post,
             'post_translation' => $post_translation
         ]);
@@ -262,7 +263,6 @@ public function edit_post( $blogPostId , Request $request)
      */
     public function edit_post_toggle( $blogPostId , Request $request)
     {
-        $language_id = $request->get('language_id');
         $post_translation = HessamPostTranslation::where(
             [
                 ['lang_id', '=', $request['selected_lang']],
@@ -275,12 +275,13 @@ public function edit_post_toggle( $blogPostId , Request $request)
 
         $post = HessamPost::findOrFail($blogPostId);
         $language_list = HessamLanguage::where('active',true)->get();
-        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+        $ts = HessamCategoryTranslation::where("lang_id", $request['selected_lang'])->limit(1000)->get();
 
         return view("hessamcms_admin::posts.edit_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $request['selected_lang'],
+            'selected_locale' => HessamLanguage::where('id', $request['selected_lang'])->first()->locale,
             'post' => $post,
             'post_translation' => $post_translation
         ]);
diff --git a/src/Views/hessamcms_admin/posts/edit_post.blade.php b/src/Views/hessamcms_admin/posts/edit_post.blade.php
index 3ec1cff..ef736dd 100755
--- a/src/Views/hessamcms_admin/posts/edit_post.blade.php
+++ b/src/Views/hessamcms_admin/posts/edit_post.blade.php
@@ -4,7 +4,7 @@
 
     <h5>Admin - Editing post
         @if($post_translation->slug)
-            <a target='_blank' href='{{$post_translation->url()}}' class='float-right btn btn-primary'>View post</a>
+            <a target='_blank' href='{{$post_translation->url($selected_locale)}}' class='float-right btn btn-primary'>View post</a>
         @endif
     </h5>
 

From 4e5001976ff3b9ac18b1b1a83fa02475397e341d Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 18 Nov 2020 03:44:53 +0330
Subject: [PATCH 038/118] readme update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc6fd83..1a2715a 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 # Complete Laravel CMS Package
 
-### Multi language support - Beta release - v9.0.x
+### A Surprising Feature, The Multi-Language Support (Nov-2020 version 9.0.x)
 
 Easily add a wordpress functionality and CMS to your laravel web application.
 

From 24d2685aea6d6a51587639eda23c96d907195685 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 19 Nov 2020 01:03:42 +0330
Subject: [PATCH 039/118] adds rtl to language

---
 ...6_004241_create_hessam_languages_table.php |  1 +
 .../HessamLanguageAdminController.php         |  1 +
 .../languages/add_language.blade.php          | 27 +++++++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/migrations/2020_10_16_004241_create_hessam_languages_table.php b/migrations/2020_10_16_004241_create_hessam_languages_table.php
index 51735b1..61bafdc 100644
--- a/migrations/2020_10_16_004241_create_hessam_languages_table.php
+++ b/migrations/2020_10_16_004241_create_hessam_languages_table.php
@@ -21,6 +21,7 @@ public function up()
             $table->string("iso_code")->unique();
             $table->string("date_format");
             $table->boolean("active")->default(true);
+            $table->boolean("rtl")->default(false);
 
             $table->timestamps();
         });
diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/HessamLanguageAdminController.php
index dacc754..13d108e 100644
--- a/src/Controllers/HessamLanguageAdminController.php
+++ b/src/Controllers/HessamLanguageAdminController.php
@@ -44,6 +44,7 @@ public function store_language(Request $request){
         $language->locale = $request['locale'];
         $language->name = $request['name'];
         $language->date_format = $request['date_format'];
+        $language->rtl = $request['rtl'];
 
         $language->save();
 
diff --git a/src/Views/hessamcms_admin/languages/add_language.blade.php b/src/Views/hessamcms_admin/languages/add_language.blade.php
index 835a926..06f242f 100755
--- a/src/Views/hessamcms_admin/languages/add_language.blade.php
+++ b/src/Views/hessamcms_admin/languages/add_language.blade.php
@@ -7,14 +7,6 @@
     <form method='post' action='{{route("hessamcms.admin.languages.store_language")}}'  enctype="multipart/form-data" >
         @csrf
 
-        <div class="form-group">
-            <label for="active"> Active</label>
-            <input checked type="radio" id="active" name="active" value="1">
-            <label for="deactive"> Deactive</label>
-            <input type="radio" id="deactive" name="active" value="0">
-            <br>
-
-        </div>
         <div class="form-group">
             <select id="lang-name" data-placeholder="Choose a Language...">
                 <option value="AF">Afrikaans</option>
@@ -92,6 +84,25 @@
             </select>
         </div>
 
+        <div class="form-group">
+            <label for="active"> Active</label>
+            <input checked type="radio" id="active" name="active" value="1">
+            <label for="deactive"> Deactive</label>
+            <input type="radio" id="deactive" name="active" value="0">
+            <br>
+
+        </div>
+
+        <div class="form-group">
+            <span>RTL: </span>
+
+            <label for="no">No</label>
+            <input checked type="radio" id="no" name="rtl" value="0">
+            <label for="yes">Yes</label>
+            <input type="radio" id="yes" name="rtl" value="1">
+            <br>
+        </div>
+
         <script>
             $('#lang-name').change(function(){
                 var value = $(this).val().toLowerCase();

From caf16bdb596a494f916ffa7ab51513b540598b91 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 19 Nov 2020 02:44:24 +0330
Subject: [PATCH 040/118] fix for remove photo and make is_published enbled by
 default

---
 src/Controllers/HessamAdminController.php          | 13 ++++++++++---
 src/Views/hessamcms_admin/languages/form.blade.php |  0
 src/Views/hessamcms_admin/posts/form.blade.php     |  6 +++++-
 src/routes.php                                     |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)
 delete mode 100755 src/Views/hessamcms_admin/languages/form.blade.php

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 747c7ac..ad3e973 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -74,11 +74,14 @@ public function create_post(Request $request)
         $language_list = HessamLanguage::where('active',true)->get();
         $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
+        $new_post = new HessamPost();
+        $new_post->is_published = true;
+
         return view("hessamcms_admin::posts.add_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $language_id,
-            'post' => new \HessamCMS\Models\HessamPost(),
+            'post' => $new_post,
             'post_translation' => new \HessamCMS\Models\HessamPostTranslation(),
             'post_id' => -1
         ]);
@@ -162,6 +165,7 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
         if ($request['post_id'] == -1 || $request['post_id'] == null){
             //cretes new post
             $new_blog_post = new HessamPost();
+            $new_blog_post->is_published = true;
             $new_blog_post->posted_at = Carbon::now();
         }else{
             //edits post
@@ -341,9 +345,12 @@ public function update_post(UpdateHessamCMSPostRequest $request, $blogPostId)
         return redirect( route('hessamcms.admin.index') );
     }
 
-    public function remove_photo($postSlug)
+    public function remove_photo($postSlug, $lang_id)
     {
-        $post = HessamPost::where("slug", $postSlug)->firstOrFail();
+        $post = HessamPostTranslation::where([
+            "slug", '=', $postSlug,
+            'lang_id', '=', $lang_id
+        ])->firstOrFail();
 
         $path = public_path('/' . config("hessamcms.blog_upload_dir"));
         if (!$this->checked_blog_image_dir_is_writable) {
diff --git a/src/Views/hessamcms_admin/languages/form.blade.php b/src/Views/hessamcms_admin/languages/form.blade.php
deleted file mode 100755
index e69de29..0000000
diff --git a/src/Views/hessamcms_admin/posts/form.blade.php b/src/Views/hessamcms_admin/posts/form.blade.php
index ac4361d..11eecf6 100755
--- a/src/Views/hessamcms_admin/posts/form.blade.php
+++ b/src/Views/hessamcms_admin/posts/form.blade.php
@@ -171,7 +171,11 @@
                        aria-describedby="blog_{{$size_key}}_help">
 
                 @if($post_translation->has_image($size_info['basic_key']))
-                    <a style="color: darkred" href="{{route("hessamcms.admin.remove_photo", $post_translation->slug)}}">Remove Image</a>
+                    <a style="color: darkred" href="{{route("hessamcms.admin.remove_photo",[
+     $post_translation->slug,
+     $selected_lang
+    ]
+    )}}">Remove Image</a>
                 @endif
             </div>
         @endforeach
diff --git a/src/routes.php b/src/routes.php
index b8ebd62..3efb0df 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -76,7 +76,7 @@
             ->name('hessamcms.admin.update_post');
 
         //Removes post's photo
-        Route::get('/remove_photo/{slug}',
+        Route::get('/remove_photo/{slug}/{lang_id}',
             'HessamAdminController@remove_photo')
             ->name('hessamcms.admin.remove_photo');
 

From bde92ae2cb6f8bc614fe17b740ea013be59debda Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 19 Nov 2020 03:50:36 +0330
Subject: [PATCH 041/118] fix problem when storing multi lang post

---
 src/Controllers/HessamAdminController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index ad3e973..4cc352c 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -104,7 +104,11 @@ public function store_post(CreateHessamCMSPostRequest $request)
             ]
         )->first();
 
-        if ($request['post_id'] == -1 || !$translation){
+        if (!$translation){
+            $translation = new HessamPostTranslation();
+        }
+
+        if ($request['post_id'] == -1 || $request['post_id'] == null){
             //cretes new post
             $new_blog_post = new HessamPost();
             $translation = new HessamPostTranslation();
@@ -112,7 +116,7 @@ public function store_post(CreateHessamCMSPostRequest $request)
             $new_blog_post->posted_at = Carbon::now();
         }else{
             //edits post
-            $new_blog_post = HessamPost::findOrFail($translation->post_id);
+            $new_blog_post = HessamPost::findOrFail($request['post_id']);
         }
 
         $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $request['post_id']);

From d688995d9cb7e74ed51697a56dbc4e3bc73e8907 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 20 Nov 2020 18:18:49 +0330
Subject: [PATCH 042/118] fix for hessam configuration and setup page

---
 src/Controllers/HessamAdminSetupController.php | 1 -
 src/Models/HessamConfiguration.php             | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
index 631b4e5..adb7ca6 100644
--- a/src/Controllers/HessamAdminSetupController.php
+++ b/src/Controllers/HessamAdminSetupController.php
@@ -54,7 +54,6 @@ public function setup_submit(Request $request){
             HessamConfiguration::set('DEFAULT_LANGUAGE_LOCALE', $request['locale']);
         }
 
-        Helpers::flash_message("Language: " . $language->name . " has been added.");
         return redirect( route('hessamcms.admin.index') );
     }
 }
diff --git a/src/Models/HessamConfiguration.php b/src/Models/HessamConfiguration.php
index 7a7783f..0114d3f 100644
--- a/src/Models/HessamConfiguration.php
+++ b/src/Models/HessamConfiguration.php
@@ -17,7 +17,13 @@ class HessamConfiguration extends Model
     ];
 
     public static function get($key){
-        return HessamConfiguration::where('key', $key)->first()->value;
+        $obj = HessamConfiguration::where('key', $key)->first();
+        if ($obj){
+            return $obj->value;
+        }
+        else{
+            return null;
+        }
     }
 
     public static function set($key, $value){

From 60027751564bac9b95e96ac94edd97cb4ab44039 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 21 Nov 2020 13:55:33 +0330
Subject: [PATCH 043/118] full text search functionality

---
 ...4_152913_create_laravel_fulltext_table.php | 40 ++++++++
 ..._create_hessam_post_translations_table.php |  2 +
 src/Config/hessamcms.php                      | 13 ++-
 src/Controllers/HessamReaderController.php    |  3 +-
 src/FulltextSearch/src/Commands/Index.php     | 29 ++++++
 src/FulltextSearch/src/Commands/IndexOne.php  | 29 ++++++
 .../src/Commands/UnindexOne.php               | 29 ++++++
 src/FulltextSearch/src/Indexable.php          | 95 +++++++++++++++++++
 src/FulltextSearch/src/IndexedRecord.php      | 29 ++++++
 src/FulltextSearch/src/Indexer.php            | 42 ++++++++
 src/FulltextSearch/src/ModelObserver.php      | 95 +++++++++++++++++++
 src/FulltextSearch/src/Search.php             | 72 ++++++++++++++
 src/FulltextSearch/src/SearchInterface.php    | 12 +++
 src/FulltextSearch/src/TermBuilder.php        | 25 +++++
 src/HessamCMSServiceProvider.php              | 30 ++++--
 src/Models/HessamPostTranslation.php          | 13 ++-
 src/Views/hessamcms/search.blade.php          |  4 +-
 17 files changed, 542 insertions(+), 20 deletions(-)
 create mode 100644 migrations/2016_11_04_152913_create_laravel_fulltext_table.php
 create mode 100644 src/FulltextSearch/src/Commands/Index.php
 create mode 100644 src/FulltextSearch/src/Commands/IndexOne.php
 create mode 100644 src/FulltextSearch/src/Commands/UnindexOne.php
 create mode 100644 src/FulltextSearch/src/Indexable.php
 create mode 100644 src/FulltextSearch/src/IndexedRecord.php
 create mode 100644 src/FulltextSearch/src/Indexer.php
 create mode 100644 src/FulltextSearch/src/ModelObserver.php
 create mode 100644 src/FulltextSearch/src/Search.php
 create mode 100644 src/FulltextSearch/src/SearchInterface.php
 create mode 100644 src/FulltextSearch/src/TermBuilder.php

diff --git a/migrations/2016_11_04_152913_create_laravel_fulltext_table.php b/migrations/2016_11_04_152913_create_laravel_fulltext_table.php
new file mode 100644
index 0000000..4ce7812
--- /dev/null
+++ b/migrations/2016_11_04_152913_create_laravel_fulltext_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateLaravelFulltextTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::connection(config('laravel-fulltext.db_connection'))->create('laravel_fulltext', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('indexable_id');
+            $table->string('indexable_type');
+            $table->text('indexed_title');
+            $table->text('indexed_content');
+
+            $table->unique(['indexable_type', 'indexable_id']);
+
+            $table->timestamps();
+        });
+
+        DB::connection(config('laravel-fulltext.db_connection'))->statement('ALTER TABLE laravel_fulltext ADD FULLTEXT fulltext_title(indexed_title)');
+        DB::connection(config('laravel-fulltext.db_connection'))->statement('ALTER TABLE laravel_fulltext ADD FULLTEXT fulltext_title_content(indexed_title, indexed_content)');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::connection(config('laravel-fulltext.db_connection'))->drop('laravel_fulltext');
+    }
+}
diff --git a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
index cdb81b7..c077865 100644
--- a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
+++ b/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
@@ -14,6 +14,8 @@ class CreateHessamPostTranslationsTable extends Migration
     public function up()
     {
         Schema::create('hessam_post_translations', function (Blueprint $table) {
+            $table->increments('id');
+
             $table->unsignedInteger('post_id')->nullable();
 
             $table->string("slug");
diff --git a/src/Config/hessamcms.php b/src/Config/hessamcms.php
index a68885b..26ca2a9 100755
--- a/src/Config/hessamcms.php
+++ b/src/Config/hessamcms.php
@@ -6,8 +6,8 @@
     'default_language' => 'en',
 
     //Your custom User model
-    //Change it to \App\Models\User::class for laravel 8.x's default auth User model
-    'user_model'=>\App\User::class,
+    //Change it to \App\User::class for previous laravel versions
+    'user_model'=>\App\Models\User::class,
 
     // reading progress bar is the bar which shows on top of your post when you are scrolling down the page. You can disable this feature if you want
     'reading_progress_bar' => true,
@@ -177,7 +177,14 @@
     ],
 
     'search' => [
-        'search_enabled' => false, //you can easily turn off search functionality
+        'search_enabled' => true, //you can easily turn off search functionality
+
+        'limit-results'=> 50,
+        'enable_wildcards' => true,
+        'weight' => [
+            'title' => 1.5,
+            'content' => 1,
+        ],
     ],
 
     //Shows full text of post in listing pages like search result page or category page. Now it shows a preview
diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index e1f96bb..02d9d36 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -4,8 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
+use HessamCMS\Laravel\Fulltext\Search;
 use Illuminate\Http\Request;
-use Swis\Laravel\Fulltext\Search;
 use HessamCMS\Captcha\UsesCaptcha;
 use HessamCMS\Middleware\DetectLanguage;
 use HessamCMS\Models\HessamCategory;
@@ -104,6 +104,7 @@ public function search(Request $request)
         HessamCategory::loadSiblingsWithList($rootList);
 
         return view("hessamcms::search", [
+                'locale' => $request->get("locale"),
                 'categories' => $rootList,
                 'query' => $query,
                 'search_results' => $search_results]
diff --git a/src/FulltextSearch/src/Commands/Index.php b/src/FulltextSearch/src/Commands/Index.php
new file mode 100644
index 0000000..5b8cf6d
--- /dev/null
+++ b/src/FulltextSearch/src/Commands/Index.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext\Commands;
+
+use Illuminate\Console\Command;
+use HessamCMS\Laravel\Fulltext\Indexer;
+
+class Index extends Command
+{
+    protected $signature = 'laravel-fulltext:all {model_class}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Build the searchindex';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $indexer = new Indexer();
+        $indexer->indexAllByClass($this->argument('model_class'));
+    }
+}
diff --git a/src/FulltextSearch/src/Commands/IndexOne.php b/src/FulltextSearch/src/Commands/IndexOne.php
new file mode 100644
index 0000000..61ff8f1
--- /dev/null
+++ b/src/FulltextSearch/src/Commands/IndexOne.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext\Commands;
+
+use Illuminate\Console\Command;
+use HessamCMS\Laravel\Fulltext\Indexer;
+
+class IndexOne extends Command
+{
+    protected $signature = 'laravel-fulltext:one {model_class} {id}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update the searchindex for a single record';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $indexer = new Indexer();
+        $indexer->indexOneByClass($this->argument('model_class'), $this->argument('id'));
+    }
+}
diff --git a/src/FulltextSearch/src/Commands/UnindexOne.php b/src/FulltextSearch/src/Commands/UnindexOne.php
new file mode 100644
index 0000000..a7a0bf0
--- /dev/null
+++ b/src/FulltextSearch/src/Commands/UnindexOne.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext\Commands;
+
+use Illuminate\Console\Command;
+use HessamCMS\Laravel\Fulltext\Indexer;
+
+class UnindexOne extends Command
+{
+    protected $signature = 'laravel-fulltext:unindex {model_class} {id}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Remove a single record from the searchindex';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $indexer = new Indexer();
+        $indexer->unIndexOneByClass($this->argument('model_class'), $this->argument('id'));
+    }
+}
diff --git a/src/FulltextSearch/src/Indexable.php b/src/FulltextSearch/src/Indexable.php
new file mode 100644
index 0000000..a8f25fe
--- /dev/null
+++ b/src/FulltextSearch/src/Indexable.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+/**
+ * @property \HessamCMS\Laravel\Fulltext\IndexedRecord|null $indexedRecord
+ */
+trait Indexable
+{
+    /**
+     * Boot the trait.
+     */
+    public static function bootIndexable()
+    {
+        static::observe(new ModelObserver());
+    }
+
+    public function getIndexContent()
+    {
+        return $this->getIndexDataFromColumns($this->indexContentColumns);
+    }
+
+    public function getIndexTitle()
+    {
+        return $this->getIndexDataFromColumns($this->indexTitleColumns);
+    }
+
+    public function indexedRecord()
+    {
+        return $this->morphOne(IndexedRecord::class, 'indexable');
+    }
+
+    public function indexRecord()
+    {
+        if (null === $this->indexedRecord) {
+            $this->indexedRecord = new IndexedRecord();
+            $this->indexedRecord->indexable()->associate($this);
+        }
+        $this->indexedRecord->updateIndex();
+    }
+
+    public function unIndexRecord()
+    {
+        if (null !== $this->indexedRecord) {
+            $this->indexedRecord->delete();
+        }
+    }
+
+    protected function getIndexDataFromColumns($columns)
+    {
+        $indexData = [];
+        foreach ($columns as $column) {
+            if ($this->indexDataIsRelation($column)) {
+                $indexData[] = $this->getIndexValueFromRelation($column);
+            } else {
+                $indexData[] = trim($this->{$column});
+            }
+        }
+
+        return implode(' ', array_filter($indexData));
+    }
+
+    /**
+     * @param $column
+     *
+     * @return bool
+     */
+    protected function indexDataIsRelation($column)
+    {
+        return (int) strpos($column, '.') > 0;
+    }
+
+    /**
+     * @param $column
+     *
+     * @return string
+     */
+    protected function getIndexValueFromRelation($column)
+    {
+        list($relation, $column) = explode('.', $column);
+        if (is_null($this->{$relation})) {
+            return '';
+        }
+
+        $relationship = $this->{$relation}();
+        if ($relationship instanceof BelongsTo || $relationship instanceof HasOne) {
+            return $this->{$relation}->{$column};
+        }
+
+        return $this->{$relation}->pluck($column)->implode(', ');
+    }
+}
diff --git a/src/FulltextSearch/src/IndexedRecord.php b/src/FulltextSearch/src/IndexedRecord.php
new file mode 100644
index 0000000..87e6694
--- /dev/null
+++ b/src/FulltextSearch/src/IndexedRecord.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext;
+
+use Illuminate\Database\Eloquent\Model;
+
+class IndexedRecord extends Model
+{
+    protected $table = 'laravel_fulltext';
+
+    public function __construct(array $attributes = [])
+    {
+        $this->connection = config('hessamcms.search.db_connection');
+
+        parent::__construct($attributes);
+    }
+
+    public function indexable()
+    {
+        return $this->morphTo();
+    }
+
+    public function updateIndex()
+    {
+        $this->setAttribute('indexed_title', $this->indexable->getIndexTitle());
+        $this->setAttribute('indexed_content', $this->indexable->getIndexContent());
+        $this->save();
+    }
+}
diff --git a/src/FulltextSearch/src/Indexer.php b/src/FulltextSearch/src/Indexer.php
new file mode 100644
index 0000000..a529207
--- /dev/null
+++ b/src/FulltextSearch/src/Indexer.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Indexer
+{
+    public function indexModel(Model $model)
+    {
+        $model->indexRecord();
+    }
+
+    public function unIndexOneByClass($class, $id)
+    {
+        $record = IndexedRecord::where('indexable_id', $id)->where('indexable_type', $class);
+        if ($record->exists) {
+            $record->delete();
+        }
+    }
+
+    public function indexOneByClass($class, $id)
+    {
+        $model = call_user_func([$class, 'find'], $id);
+        if (in_array(Indexable::class, class_uses($model), true)) {
+            $this->indexModel($model);
+        }
+    }
+
+    public function indexAllByClass($class)
+    {
+        $model = new $class();
+        $self = $this;
+        if (in_array(Indexable::class, class_uses($model), true)) {
+            $model->chunk(100, function ($chunk) use ($self) {
+                foreach ($chunk as $modelRecord) {
+                    $self->indexModel($modelRecord);
+                }
+            });
+        }
+    }
+}
diff --git a/src/FulltextSearch/src/ModelObserver.php b/src/FulltextSearch/src/ModelObserver.php
new file mode 100644
index 0000000..9daaef2
--- /dev/null
+++ b/src/FulltextSearch/src/ModelObserver.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext;
+
+class ModelObserver
+{
+    /**
+     * The class names that syncing is disabled for.
+     *
+     * @var array
+     */
+    protected static $syncingDisabledFor = [];
+
+    /**
+     * Enable syncing for the given class.
+     *
+     * @param string $class
+     */
+    public static function enableSyncingFor($class)
+    {
+        unset(static::$syncingDisabledFor[$class]);
+    }
+
+    /**
+     * Disable syncing for the given class.
+     *
+     * @param string $class
+     */
+    public static function disableSyncingFor($class)
+    {
+        static::$syncingDisabledFor[$class] = true;
+    }
+
+    /**
+     * Determine if syncing is disabled for the given class or model.
+     *
+     * @param object|string $class
+     *
+     * @return bool
+     */
+    public static function syncingDisabledFor($class)
+    {
+        $class = is_object($class) ? get_class($class) : $class;
+
+        return isset(static::$syncingDisabledFor[$class]);
+    }
+
+    /**
+     * Handle the created event for the model.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $model
+     */
+    public function created($model)
+    {
+        if (static::syncingDisabledFor($model)) {
+            return;
+        }
+
+        $model->indexRecord();
+    }
+
+    /**
+     * Handle the updated event for the model.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $model
+     */
+    public function updated($model)
+    {
+        $this->created($model);
+    }
+
+    /**
+     * Handle the deleted event for the model.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $model
+     */
+    public function deleted($model)
+    {
+        if (static::syncingDisabledFor($model)) {
+            return;
+        }
+
+        $model->unIndexRecord();
+    }
+
+    /**
+     * Handle the restored event for the model.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $model
+     */
+    public function restored($model)
+    {
+        $this->created($model);
+    }
+}
diff --git a/src/FulltextSearch/src/Search.php b/src/FulltextSearch/src/Search.php
new file mode 100644
index 0000000..d1d7e8b
--- /dev/null
+++ b/src/FulltextSearch/src/Search.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext;
+
+class Search implements SearchInterface
+{
+    /**
+     * @param string $search
+     *
+     * @return \Illuminate\Database\Eloquent\Collection|\HessamCMS\Laravel\Fulltext\IndexedRecord[]
+     */
+    public function run($search)
+    {
+        $query = $this->searchQuery($search);
+
+        return $query->get();
+    }
+
+    /**
+     * @param $search
+     * @param $class
+     *
+     * @return \Illuminate\Database\Eloquent\Collection|\HessamCMS\Laravel\Fulltext\IndexedRecord[]
+     */
+    public function runForClass($search, $class)
+    {
+        $query = $this->searchQuery($search);
+        $query->where('indexable_type', $class);
+
+        return $query->get();
+    }
+
+    /**
+     * @param string $search
+     *
+     * This search query is designed for post queries - todo:
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function searchQuery($search)
+    {
+        $termsBool = '';
+        $termsMatch = '';
+
+        if ($search) {
+            $terms = TermBuilder::terms($search);
+
+            $termsBool = '+'.$terms->implode(' +');
+            $termsMatch = ''.$terms->implode(' ');
+        }
+
+        $titleWeight = str_replace(',', '.', (float) config('hessamcms.search.weight.title', 1.5));
+        $contentWeight = str_replace(',', '.', (float) config('hessamcms.search.weight.content', 1.0));
+
+        $query = IndexedRecord::query()
+          ->whereRaw('MATCH (indexed_title, indexed_content) AGAINST (? IN BOOLEAN MODE)', [$termsBool])
+          ->orderByRaw(
+              '('.$titleWeight.' * (MATCH (indexed_title) AGAINST (?)) +
+              '.$contentWeight.' * (MATCH (indexed_title, indexed_content) AGAINST (?))
+             ) DESC',
+                [$termsMatch, $termsMatch])
+            ->limit(config('hessamcms.search.limit-results'));
+
+        $query->with(['indexable' => function ($query) {
+            $query->with(['post' => function($query){
+                $query->where('is_published', '=', true);
+            }]);
+        }]);
+
+        return $query;
+    }
+}
diff --git a/src/FulltextSearch/src/SearchInterface.php b/src/FulltextSearch/src/SearchInterface.php
new file mode 100644
index 0000000..7e07761
--- /dev/null
+++ b/src/FulltextSearch/src/SearchInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext;
+
+interface SearchInterface
+{
+    public function run($search);
+
+    public function runForClass($search, $class);
+
+    public function searchQuery($search);
+}
diff --git a/src/FulltextSearch/src/TermBuilder.php b/src/FulltextSearch/src/TermBuilder.php
new file mode 100644
index 0000000..968d8e9
--- /dev/null
+++ b/src/FulltextSearch/src/TermBuilder.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace HessamCMS\Laravel\Fulltext;
+
+class TermBuilder
+{
+    public static function terms($search)
+    {
+        $wildcards = config('hessamcms.search.enable_wildcards');
+
+        // Remove every boolean operator (+, -, > <, ( ), ~, *, ", @distance) from the search query
+        // else we will break the MySQL query.
+        $search = trim(preg_replace('/[+\-><\(\)~*\"@]+/', ' ', $search));
+
+        $terms = collect(preg_split('/[\s,]+/', $search));
+
+        if ($wildcards === true) {
+            $terms->transform(function ($term) {
+                return $term.'*';
+            });
+        }
+
+        return $terms;
+    }
+}
diff --git a/src/HessamCMSServiceProvider.php b/src/HessamCMSServiceProvider.php
index 9821209..88e9cc9 100755
--- a/src/HessamCMSServiceProvider.php
+++ b/src/HessamCMSServiceProvider.php
@@ -2,12 +2,24 @@
 
 namespace HessamCMS;
 
+use HessamCMS\Models\HessamPostTranslation;
 use Illuminate\Support\ServiceProvider;
-//use Swis\Laravel\Fulltext\ModelObserver;
 use HessamCMS\Models\HessamPost;
+use HessamCMS\Laravel\Fulltext\Commands\Index;
+use HessamCMS\Laravel\Fulltext\Commands\IndexOne;
+use HessamCMS\Laravel\Fulltext\Commands\UnindexOne;
+use HessamCMS\Laravel\Fulltext\ModelObserver;
+use HessamCMS\Laravel\Fulltext\Search;
+use HessamCMS\Laravel\Fulltext\SearchInterface;
 
 class HessamCMSServiceProvider extends ServiceProvider
 {
+
+    protected $commands = [
+        Index::class,
+        IndexOne::class,
+        UnindexOne::class,
+    ];
     /**
      * Bootstrap services.
      *
@@ -16,16 +28,15 @@ class HessamCMSServiceProvider extends ServiceProvider
     public function boot()
     {
 
-//        if (config("hessamcms.search.search_enabled") == false) {
-//            // if search is disabled, don't allow it to sync.
-//            ModelObserver::disableSyncingFor(HessamPost::class);
-//        }
+        if (config("hessamcms.search.search_enabled") == false) {
+            // if search is disabled, don't allow it to sync.
+            ModelObserver::disableSyncingFor(HessamPostTranslation::class);
+        }
 
         if (config("hessamcms.include_default_routes", true)) {
             include(__DIR__ . "/routes.php");
         }
 
-
         foreach ([
                      '2020_10_16_005400_create_hessam_categories_table.php',
                      '2020_10_16_005425_create_hessam_category_translations_table.php',
@@ -34,7 +45,8 @@ public function boot()
                      '2020_10_16_121230_create_hessam_comments_table.php',
                      '2020_10_16_121728_create_hessam_uploaded_photos_table.php',
                      '2020_10_16_004241_create_hessam_languages_table.php',
-                     '2020_10_22_132005_create_hessam_configurations_table.php'
+                     '2020_10_22_132005_create_hessam_configurations_table.php',
+                     '2016_11_04_152913_create_laravel_fulltext_table.php'
                  ] as $file) {
 
             $this->publishes([
@@ -62,6 +74,10 @@ public function boot()
      */
     public function register()
     {
+        $this->app->bind(
+            SearchInterface::class,
+            Search::class
+        );
 
         // for the admin backend views ( view("hessamcms_admin::BLADEFILE") )
         $this->loadViewsFrom(__DIR__ . "/Views/hessamcms_admin", 'hessamcms_admin');
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index e7cdf34..bad4a15 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -4,18 +4,17 @@
 namespace HessamCMS\Models;
 
 use Cviebrock\EloquentSluggable\Sluggable;
+use HessamCMS\Laravel\Fulltext\Indexable;
 use Illuminate\Database\Eloquent\Model;
-//use Swis\Laravel\Fulltext\Indexable;
 use HessamCMS\Interfaces\SearchResultInterface;
 
-//class HessamPostTranslation extends Model implements SearchResultInterface
-class HessamPostTranslation extends Model
+class HessamPostTranslation extends Model implements SearchResultInterface
 {
     use Sluggable;
-//    use Indexable;
-//
-//    protected $indexContentColumns = ['post_body', 'short_description', 'meta_desc',];
-//    protected $indexTitleColumns = ['title', 'subtitle', 'seo_title',];
+    use Indexable;
+
+    protected $indexContentColumns = ['post_body', 'short_description', 'meta_desc',];
+    protected $indexTitleColumns = ['title', 'subtitle', 'seo_title',];
 
     public $fillable = [
         'title',
diff --git a/src/Views/hessamcms/search.blade.php b/src/Views/hessamcms/search.blade.php
index 3a03f5d..f08703c 100755
--- a/src/Views/hessamcms/search.blade.php
+++ b/src/Views/hessamcms/search.blade.php
@@ -12,7 +12,7 @@
                         @if(isset($result->indexable))
                             @php $search_count += $search_count + 1; @endphp
                             <?php $post = $result->indexable; ?>
-                            @if($post && is_a($post,\HessamCMS\Models\HessamPost::class))
+                            @if($post && is_a($post,\HessamCMS\Models\HessamPostTranslation::class))
                                 <h2>Search result #{{$search_count}}</h2>
                                 @include("hessamcms::partials.index_loop")
                             @else
@@ -44,4 +44,4 @@
     </div>
 
 
-@endsection
\ No newline at end of file
+@endsection

From 8cbd2cfa08c921eb1b91e8ca513ee5fcb629ddfe Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 21 Nov 2020 16:11:12 +0330
Subject: [PATCH 044/118] restrict for default language removal

---
 src/Controllers/HessamLanguageAdminController.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/HessamLanguageAdminController.php
index 13d108e..0d10c94 100644
--- a/src/Controllers/HessamLanguageAdminController.php
+++ b/src/Controllers/HessamLanguageAdminController.php
@@ -4,6 +4,7 @@
 namespace HessamCMS\Controllers;
 
 use App\Http\Controllers\Controller;
+use HessamCMS\Models\HessamConfiguration;
 use Illuminate\Http\Request;
 use HessamCMS\Helpers;
 use HessamCMS\Middleware\LoadLanguage;
@@ -53,6 +54,12 @@ public function store_language(Request $request){
     }
 
     public function destroy_language(Request $request, $languageId){
+        $lang = HessamLanguage::where('locale', HessamConfiguration::get('DEFAULT_LANGUAGE_LOCALE'))->first();
+        if ($languageId == $lang->id){
+            Helpers::flash_message("The default language can not be deleted!");
+            return redirect( route('hessamcms.admin.languages.index') );
+        }
+
         try {
             $language = HessamLanguage::findOrFail($languageId);
             //todo

From dec14a8e22fbf563ef097f903989e8b9895ace9e Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 21 Nov 2020 16:12:11 +0330
Subject: [PATCH 045/118] readme update

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1a2715a..f1362e8 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@
 
 Easily add a wordpress functionality and CMS to your laravel web application.
 
-## [Let's try it - Online Demo](https://cms.binshops.com/login)
-You can try Hessam CMS online: [https://cms.binshops.com](https://cms.binshops.com/login)
+## [Let's try it - Online Demo](https://cms.binshops.com)
+You can try Hessam CMS online: [https://cms.binshops.com](https://cms.binshops.com)
 
 ### Quick and easy installation
 

From c1ad15530576e1ccc992ce99681dd22971cdb5b7 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 21 Nov 2020 22:25:03 +0330
Subject: [PATCH 046/118] fix for category hierarchy

---
 src/Controllers/HessamReaderController.php               | 1 +
 src/Views/hessamcms/partials/_category_partial.blade.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index 02d9d36..1392117 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -75,6 +75,7 @@ public function index($locale, $category_slug = null, Request $request)
         return view("hessamcms::index", [
             'lang_list' => HessamLanguage::all('locale','name'),
             'locale' => $request->get("locale"),
+            'lang_id' => $request->get('lang_id'),
             'category_chain' => $categoryChain,
             'categories' => $rootList,
             'posts' => $posts,
diff --git a/src/Views/hessamcms/partials/_category_partial.blade.php b/src/Views/hessamcms/partials/_category_partial.blade.php
index 322fe15..2f170fe 100644
--- a/src/Views/hessamcms/partials/_category_partial.blade.php
+++ b/src/Views/hessamcms/partials/_category_partial.blade.php
@@ -1,7 +1,7 @@
 @foreach($category_tree as $category)
     <li class="category-item-wrapper">
          <span class="category-item" value='{{$category->category_id}}'>
-        {{$category->categoryTranslations->where('lang_id',1)->first()->category_name}}
+        {{$category->categoryTranslations->where('lang_id',$lang_id)->first()->category_name}}
 
              @if( count($category->siblings) > 0)
                  <ul>

From a657bb7c843e1ffb3ee607265de82e9f4d9cf192 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 21 Nov 2020 22:41:54 +0330
Subject: [PATCH 047/118] category partial fix

---
 src/Views/hessamcms/partials/_category_partial.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/hessamcms/partials/_category_partial.blade.php b/src/Views/hessamcms/partials/_category_partial.blade.php
index 2f170fe..64d9e83 100644
--- a/src/Views/hessamcms/partials/_category_partial.blade.php
+++ b/src/Views/hessamcms/partials/_category_partial.blade.php
@@ -5,7 +5,7 @@
 
              @if( count($category->siblings) > 0)
                  <ul>
-                 @include("hessamcms_admin::categories._category_partial", ['category_tree' => $category->siblings])
+                 @include("hessamcms::partials._category_partial", ['category_tree' => $category->siblings])
                  </ul>
              @endif
     </span>

From 3c34a619d7b131ea5e1ab92f57e1789beb9b7d74 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 24 Nov 2020 22:52:12 +0330
Subject: [PATCH 048/118] some view fixes - and redirect to login if not logged
 in for setup

---
 src/Middleware/UserCanManageBlogPosts.php                | 1 +
 src/Views/hessamcms/partials/_category_partial.blade.php | 9 ++++++---
 src/Views/hessamcms/partials/index_loop.blade.php        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Middleware/UserCanManageBlogPosts.php b/src/Middleware/UserCanManageBlogPosts.php
index 6724a07..e840600 100755
--- a/src/Middleware/UserCanManageBlogPosts.php
+++ b/src/Middleware/UserCanManageBlogPosts.php
@@ -21,6 +21,7 @@ public function handle($request, Closure $next)
     {
         if (!\Auth::check()) {
             abort(401,"User not authorised to manage blog posts: You are not logged in");
+            return redirect('/login');
         }
         if (!\Auth::user()->canManageHessamCMSPosts()) {
             abort(401,"User not authorised to manage blog posts: Your account is not authorised to edit blog posts");
diff --git a/src/Views/hessamcms/partials/_category_partial.blade.php b/src/Views/hessamcms/partials/_category_partial.blade.php
index 64d9e83..11b8995 100644
--- a/src/Views/hessamcms/partials/_category_partial.blade.php
+++ b/src/Views/hessamcms/partials/_category_partial.blade.php
@@ -1,7 +1,9 @@
 @foreach($category_tree as $category)
-    <li class="category-item-wrapper">
+    @php $trans =  $category->categoryTranslations->where('lang_id',$lang_id)->first();@endphp
+    @if($trans != null)
+        <li class="category-item-wrapper">
          <span class="category-item" value='{{$category->category_id}}'>
-        {{$category->categoryTranslations->where('lang_id',$lang_id)->first()->category_name}}
+        {{$trans->category_name}}
 
              @if( count($category->siblings) > 0)
                  <ul>
@@ -9,5 +11,6 @@
                  </ul>
              @endif
     </span>
-    </li>
+        </li>
+    @endif
 @endforeach
diff --git a/src/Views/hessamcms/partials/index_loop.blade.php b/src/Views/hessamcms/partials/index_loop.blade.php
index 6ce4335..24a1319 100644
--- a/src/Views/hessamcms/partials/index_loop.blade.php
+++ b/src/Views/hessamcms/partials/index_loop.blade.php
@@ -19,7 +19,7 @@
             @endif
 
             <div class="post-details-bottom">
-                <span class="light-text">Authored by: </span> {{$post->post->author->name}} <span class="light-text">Posted at: </span> {{date('d M Y ', strtotime($post->posted_at))}}
+                <span class="light-text">Authored by: </span> {{$post->post->author->name}} <span class="light-text">Posted at: </span> {{date('d M Y ', strtotime($post->post->posted_at))}}
             </div>
             <div class='text-center'>
                 <a href="{{$post->url($locale)}}" class="btn btn-primary">View Post</a>

From 9df01d8c0fb24a676b63c1cb79974172f8c95005 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 24 Nov 2020 23:04:30 +0330
Subject: [PATCH 049/118] fix for search

---
 src/Controllers/HessamReaderController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index 1392117..f5c535e 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -105,6 +105,7 @@ public function search(Request $request)
         HessamCategory::loadSiblingsWithList($rootList);
 
         return view("hessamcms::search", [
+                'lang_id' => $request->get('lang_id'),
                 'locale' => $request->get("locale"),
                 'categories' => $rootList,
                 'query' => $query,

From 0257d4a29365828908409197d199575751501b56 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 24 Nov 2020 23:18:12 +0330
Subject: [PATCH 050/118] readme update

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f1362e8..b6a1ca7 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@
 
 Easily add a wordpress functionality and CMS to your laravel web application.
 
+### Let's give star to this repository - Your support motivates me to develop this package much more ;)
+
 ## [Let's try it - Online Demo](https://cms.binshops.com)
 You can try Hessam CMS online: [https://cms.binshops.com](https://cms.binshops.com)
 

From 35171d78f9de66f1c1436af384d23ec222bf0435 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 28 Nov 2020 21:28:23 +0330
Subject: [PATCH 051/118] panel - bug fix in comment approval pacge

---
 README.md                                     |  2 +-
 .../hessamcms_admin/comments/index.blade.php  | 30 +++++--------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index b6a1ca7..8b1d6f3 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 
 Easily add a wordpress functionality and CMS to your laravel web application.
 
-### Let's give star to this repository - Your support motivates me to develop this package much more ;)
+### Your support motivates me to develop this package much more - Let's give a star ;)
 
 ## [Let's try it - Online Demo](https://cms.binshops.com)
 You can try Hessam CMS online: [https://cms.binshops.com](https://cms.binshops.com)
diff --git a/src/Views/hessamcms_admin/comments/index.blade.php b/src/Views/hessamcms_admin/comments/index.blade.php
index bfc00e8..447a764 100755
--- a/src/Views/hessamcms_admin/comments/index.blade.php
+++ b/src/Views/hessamcms_admin/comments/index.blade.php
@@ -5,42 +5,28 @@
 
         <div class="card m-4" >
             <div class="card-body">
-
                 <h5 class='card-title'>
-
-
                     {{$comment->author()}} commented on:
 
                     @if($comment->post)
-                    <a class="a-link-cart-color" href='{{$comment->post->url()}}'>{{$comment->post->title}}</a>
-                        @else
+                        <a class="a-link-cart-color" href='{{$comment->post->postTranslations()->get()[0]->url(app('request')->get('locale'))}}'>{{$comment->post->title}}</a>
+                    @else
                         Unknown blog post
-
-                        @endif
+                    @endif
 
                     on {{$comment->created_at}} </h5>
-
-
                 <p class='m-3 p-2'>{{$comment->comment}}</p>
 
-
-
-
                 @if($comment->post)
-
                     {{--VIEW + EDIT POST LINKS--}}
-                    <a href="{{$comment->post->url()}}" class="card-link btn btn-outline-secondary"><i class="fa fa-file-text-o"
-                                                                                              aria-hidden="true"></i>
+                    <a href='{{$comment->post->postTranslations()->get()[0]->url(app('request')->get('locale'))}}' class="card-link btn btn-outline-secondary"><i class="fa fa-file-text-o"
+                                                                                                                                                                  aria-hidden="true"></i>
                         View Post</a>
-                    <a href="{{$comment->post->edit_url()}}" class="card-link btn btn-primary">
+                    <a href='{{$comment->post->postTranslations()->get()[0]->edit_url()}}' class="card-link btn btn-primary">
                         <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                         Edit Post</a>
-
-
                 @endif
 
-
-
                 @if(!$comment->approved)
                     {{--APPROVE BUTTON--}}
                     <form method='post' action='{{route("hessamcms.admin.comments.approve", $comment->id)}}' class='float-right'>
@@ -61,14 +47,12 @@
             </div>
         </div>
 
-
     @empty
         <div class='alert alert-danger'>None found</div>
     @endforelse
 
-
     <div class='text-center'>
         {{$comments->appends( [] )->links()}}
     </div>
 
-@endsection
\ No newline at end of file
+@endsection

From c183f812d0b244181d01d591934006284472c01f Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Tue, 1 Dec 2020 11:54:42 +0330
Subject: [PATCH 052/118] readme change

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 8b1d6f3..ae810a4 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,6 @@ Easily add a wordpress functionality and CMS to your laravel web application.
 
 ### Your support motivates me to develop this package much more - Let's give a star ;)
 
-## [Let's try it - Online Demo](https://cms.binshops.com)
-You can try Hessam CMS online: [https://cms.binshops.com](https://cms.binshops.com)
-
 ### Quick and easy installation
 
 Install with following command and follow the instructions. 

From f0a1a62a4512b7c14b336d8b682255ca93e7c790 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 4 Dec 2020 01:32:54 +0330
Subject: [PATCH 053/118] fix - comment migration

---
 migrations/2020_10_16_121230_create_hessam_comments_table.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/migrations/2020_10_16_121230_create_hessam_comments_table.php b/migrations/2020_10_16_121230_create_hessam_comments_table.php
index 1aad4b8..d553ab1 100644
--- a/migrations/2020_10_16_121230_create_hessam_comments_table.php
+++ b/migrations/2020_10_16_121230_create_hessam_comments_table.php
@@ -17,7 +17,6 @@ public function up()
             $table->increments('id');
 
             $table->unsignedInteger("post_id")->index();
-            $table->foreign('post_id')->references('id')->on('hessam_posts');
             $table->unsignedInteger("user_id")->nullable()->index()->comment("if user was logged in");
 
             $table->string("ip")->nullable()->comment("if enabled in the config file");

From b521532bc51d4ae2365207dd57b14f7eeda34853 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 5 Dec 2020 00:02:17 +0330
Subject: [PATCH 054/118] some fixes

---
 ..._005400_create_hessam_categories_table.php |  2 +-
 src/Config/hessamcms.php                      |  4 +-
 src/Controllers/HessamReaderController.php    | 39 +++++----
 src/Views/hessamcms/index.blade.php           | 10 +--
 .../partials/_category_partial.blade.php      | 19 +++--
 src/Views/hessamcms/search.blade.php          |  5 +-
 tests/MainTest.php                            | 84 +++++++++----------
 7 files changed, 88 insertions(+), 75 deletions(-)

diff --git a/migrations/2020_10_16_005400_create_hessam_categories_table.php b/migrations/2020_10_16_005400_create_hessam_categories_table.php
index a2d13d4..3bb5d73 100644
--- a/migrations/2020_10_16_005400_create_hessam_categories_table.php
+++ b/migrations/2020_10_16_005400_create_hessam_categories_table.php
@@ -19,7 +19,7 @@ public function up()
             $table->unsignedInteger("created_by")->nullable()->index()->comment("user id");
 
             //columns related to multi-level categories
-            $table->integer('parent_id')->nullable()->default(0);
+            $table->integer('parent_id')->nullable();
             $table->integer('lft')->nullable();
             $table->integer('rgt')->nullable();
             $table->integer('depth')->nullable();
diff --git a/src/Config/hessamcms.php b/src/Config/hessamcms.php
index 26ca2a9..2d356b1 100755
--- a/src/Config/hessamcms.php
+++ b/src/Config/hessamcms.php
@@ -90,7 +90,7 @@
         ],
 
         // you can add more fields here, but make sure that you create the relevant database columns too!
-        // They must be in the same format as the default ones - image_xxxxx (and this db column must exist on the blog_etc_posts table)
+        // They must be in the same format as the default ones - image_xxxxx (and this db column must exist on the hessam_posts table)
 
         /*
         'image_custom_example_size' => [ // << MAKE A DB COLUM WITH THIS NAME.
@@ -104,7 +104,7 @@
             ],
         */
         // Create the custom db table by doing
-        //  php artisan make:migration --table=blog_etc_posts AddCustomBlogImageSize
+        //  php artisan make:migration --table=hessam_posts AddCustomBlogImageSize
         //   then adding in the up() method:
         //       $table->string("image_custom_example_size")->nullable();
         //    and in the down() method:
diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/HessamReaderController.php
index f5c535e..bd15239 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/HessamReaderController.php
@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use HessamCMS\Laravel\Fulltext\Search;
+use HessamCMS\Models\HessamCategoryTranslation;
 use Illuminate\Http\Request;
 use HessamCMS\Captcha\UsesCaptcha;
 use HessamCMS\Middleware\DetectLanguage;
@@ -42,32 +43,34 @@ public function index($locale, $category_slug = null, Request $request)
         $title = 'Blog Page'; // default title...
 
         $categoryChain = null;
+        $posts = array();
         if ($category_slug) {
-            $category = HessamCategory::where("slug", $category_slug)->firstOrFail();
+            $category = HessamCategoryTranslation::where("slug", $category_slug)->with('category')->firstOrFail()->category;
             $categoryChain = $category->getAncestorsAndSelf();
-            $posts = $category->posts()->where("blog_etc_post_categories.blog_etc_category_id", $category->id);
+            $posts_1 = $category->posts()->where("hessam_post_categories.category_id", $category->id)->with([ 'postTranslations' => function($query) use ($request){
+                $query->where("lang_id" , '=' , $request->get("lang_id"));
+            }
+            ])->paginate(config("hessamcms.per_page", 10));
+
+            foreach ($posts_1 as $post) {
+                $trans = $post->postTranslations[0];
+                $trans->post = $post;
+                array_push($posts, $trans);
+            }
 
             // at the moment we handle this special case (viewing a category) by hard coding in the following two lines.
             // You can easily override this in the view files.
             \View::share('hessamcms_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
             $title = 'Posts in ' . $category->category_name . " category"; // hardcode title here...
         } else {
-            $posts = HessamPostTranslation::query();
+            $posts = HessamPostTranslation::where('lang_id', $request->get("lang_id"))
+                ->with(['post' => function($query){
+                    $query->where("is_published" , '=' , true);
+                    $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
+                    $query->orderBy("posted_at", "desc");
+                }])->paginate(config("hessamcms.per_page", 10));
         }
 
-//        $posts = $posts->where('is_published', '=', 1)
-//            ->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'))
-//            ->where('lang_id', $request->get("lang_id"))
-//            ->orderBy("posted_at", "desc")
-//            ->paginate(config("hessamcms.per_page", 10));
-
-        $posts = HessamPostTranslation::where('lang_id', $request->get("lang_id"))
-            ->with(['post' => function($query){
-                $query->where("is_published" , '=' , true);
-                $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
-                $query->orderBy("posted_at", "desc");
-            }])->paginate(config("hessamcms.per_page", 10));
-
         //load category hierarchy
         $rootList = HessamCategory::roots()->get();
         HessamCategory::loadSiblingsWithList($rootList);
@@ -121,10 +124,10 @@ public function search(Request $request)
      * @param $category_slug
      * @return mixed
      */
-    public function view_category($hierarchy)
+    public function view_category($locale, $hierarchy, Request $request)
     {
         $categories = explode('/', $hierarchy);
-        return $this->index(end($categories));
+        return $this->index($locale, end($categories), $request);
     }
 
     /**
diff --git a/src/Views/hessamcms/index.blade.php b/src/Views/hessamcms/index.blade.php
index c2ea759..9d7df11 100755
--- a/src/Views/hessamcms/index.blade.php
+++ b/src/Views/hessamcms/index.blade.php
@@ -27,7 +27,7 @@ class='btn border  btn-outline-primary btn-sm '>
                         <div class="row">
                             <div class="col-md-12">
                                 @forelse($category_chain as $cat)
-                                    / <a href="{{$cat->categoryTranslations[0]->url()}}">
+                                    / <a href="{{$cat->categoryTranslations[0]->url($locale)}}">
                                         <span class="cat1">{{$cat->categoryTranslations[0]['category_name']}}</span>
                                     </a>
                                 @empty @endforelse
@@ -61,7 +61,10 @@ class='btn border  btn-outline-primary btn-sm '>
                 <h6>Blog Categories</h6>
                 <ul class="hessam-cat-hierarchy">
                     @if($categories)
-                        @include("hessamcms::partials._category_partial", ['category_tree' => $categories])
+                        @include("hessamcms::partials._category_partial", [
+    'category_tree' => $categories,
+    'name_chain' => $nameChain = ""
+    ])
                     @else
                         <span>No Categories</span>
                     @endif
@@ -69,9 +72,6 @@ class='btn border  btn-outline-primary btn-sm '>
             </div>
         </div>
 
-        <div class='text-center  col-sm-4 mx-auto'>
-            {{$posts->appends( [] )->links()}}
-        </div>
         @if (config('hessamcms.search.search_enabled') )
             @include('hessamcms::sitewide.search_form')
         @endif
diff --git a/src/Views/hessamcms/partials/_category_partial.blade.php b/src/Views/hessamcms/partials/_category_partial.blade.php
index 11b8995..b385ab3 100644
--- a/src/Views/hessamcms/partials/_category_partial.blade.php
+++ b/src/Views/hessamcms/partials/_category_partial.blade.php
@@ -2,15 +2,22 @@
     @php $trans =  $category->categoryTranslations->where('lang_id',$lang_id)->first();@endphp
     @if($trans != null)
         <li class="category-item-wrapper">
-         <span class="category-item" value='{{$category->category_id}}'>
+            @php $nameChain = $nameChain .'/'. $trans->slug @endphp
+
+            <a href="{{route("hessamcms.view_category",[$locale, $nameChain ])}}">
+                 <span class="category-item" value='{{$category->category_id}}'>
         {{$trans->category_name}}
 
-             @if( count($category->siblings) > 0)
-                 <ul>
-                 @include("hessamcms::partials._category_partial", ['category_tree' => $category->siblings])
+                     @if( count($category->siblings) > 0)
+                         <ul>
+                 @include("hessamcms::partials._category_partial", [
+    'category_tree' => $category->siblings,
+    'name_chain' => $nameChain
+    ])
                  </ul>
-             @endif
-    </span>
+                     @endif
+                 </span>
+            </a>
         </li>
     @endif
 @endforeach
diff --git a/src/Views/hessamcms/search.blade.php b/src/Views/hessamcms/search.blade.php
index f08703c..0d0201e 100755
--- a/src/Views/hessamcms/search.blade.php
+++ b/src/Views/hessamcms/search.blade.php
@@ -28,7 +28,10 @@
                     <h6>Blog Categories</h6>
                     <ul class="hessam-cat-hierarchy">
                         @if($categories)
-                            @include("hessamcms::partials._category_partial", ['category_tree' => $categories])
+                            @include("hessamcms::partials._category_partial", [
+    'category_tree' => $categories,
+    'name_chain' => $nameChain = ""
+    ])
                         @else
                             <span>No Categories</span>
                         @endif
diff --git a/tests/MainTest.php b/tests/MainTest.php
index 3b3b252..a435738 100644
--- a/tests/MainTest.php
+++ b/tests/MainTest.php
@@ -155,7 +155,7 @@ public function testCanSeeAdminPanel()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
 
         $response->assertSessionHasNoErrors();
@@ -163,7 +163,7 @@ public function testCanSeeAdminPanel()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
 
     }
@@ -188,13 +188,13 @@ public function testCanCreatePost()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
         $response->assertSessionHasNoErrors();
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
 
     }
@@ -221,20 +221,20 @@ public function testCanCreatePostThenEditIt()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
         $justCreatedRow = \HessamCMS\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
 
 
         $new_object_vals['title'] = "New title " . str_random();
-        $this->assertDatabaseMissing('blog_etc_posts', ['title' => $new_object_vals['title']]);
+        $this->assertDatabaseMissing('hessam_posts', ['title' => $new_object_vals['title']]);
         $response = $this->patch($admin_panel_url . "/edit_post/" . $justCreatedRow->id, $new_object_vals);
         $response->assertStatus(302);
-        $this->assertDatabaseHas('blog_etc_posts', ['title' => $new_object_vals['title']]);
+        $this->assertDatabaseHas('hessam_posts', ['title' => $new_object_vals['title']]);
 
 
     }
@@ -263,7 +263,7 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
 
 
         // check we don't see it at moment
@@ -281,7 +281,7 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
         // logout - so we are guest user
         \Auth::logout();
@@ -323,7 +323,7 @@ public function testCreatePostWithNotPublishedThenCheckIsNotViewableToPublic()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
         // must log out, as the admin user can see posts dated in future
         \Auth::logout();
@@ -358,7 +358,7 @@ public function testCreatePostWithFuturePostedAtThenCheckIsNotViewableToPublic()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
         // must log out, as the admin user can see posts dated in future
         \Auth::logout();
@@ -409,7 +409,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
 
         \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
@@ -421,11 +421,11 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             'comment' => str_random(),
             $captcha->captcha_field_name() => "wronganswer1", // << WRONG CAPTCHA
         ];
-        $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
         $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(302);
 
-        $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
 
 
         $comment_detail = [
@@ -434,11 +434,11 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             'comment' => str_random(),
             // << NO CAPTCHA FIELD
         ];
-        $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
         $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(302);
 
-        $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
 
 
     }
@@ -566,7 +566,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
 
         \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
@@ -578,13 +578,13 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             'comment' => str_random(),
             $captcha->captcha_field_name() => "AnsWer2",
         ];
-        $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
         $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(200);
 
         \Config::set('hessamcms.captcha.auto_approve_comments', false);
 
-        $this->assertDatabaseHas('blog_etc_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseHas('hessam_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
         $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
@@ -599,7 +599,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
         ]);
         // check it was approved
         $response->assertStatus(302);
-        $this->assertDatabaseHas('blog_etc_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
+        $this->assertDatabaseHas('hessam_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
 
 
     }
@@ -628,7 +628,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
 
         \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
@@ -640,14 +640,14 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
             'author_name' => str_random(),
             'comment' => str_random(),
         ];
-        $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
         $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
 
         $response->assertStatus(200);
 
         \Config::set('hessamcms.captcha.auto_approve_comments', false);
 
-        $this->assertDatabaseHas('blog_etc_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseHas('hessam_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
         $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
@@ -662,7 +662,7 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
         ]);
         // check it was approved
         $response->assertStatus(302);
-        $this->assertDatabaseHas('blog_etc_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
+        $this->assertDatabaseHas('hessam_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
 
 
     }
@@ -691,7 +691,7 @@ public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
 
         if (config("hessamcms.comments.type_of_comments_to_show") === 'built_in') {
@@ -700,12 +700,12 @@ public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
                 'author_name' => str_random(),
                 'comment' => str_random(),
             ];
-            $this->assertDatabaseMissing('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+            $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
             $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
             $response->assertSessionHasNoErrors();
             $response->assertStatus(200);
 
-            $this->assertDatabaseHas('blog_etc_comments', ['author_name' => $comment_detail['author_name']]);
+            $this->assertDatabaseHas('hessam_comments', ['author_name' => $comment_detail['author_name']]);
 
 
             $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
@@ -723,7 +723,7 @@ public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
             $response->assertStatus(302);
 
             //check it doesnt exist in database
-            $this->assertDatabaseMissing('blog_etc_comments', ['id' => $justAddedRow->id,]);
+            $this->assertDatabaseMissing('hessam_comments', ['id' => $justAddedRow->id,]);
 
 
         } else {
@@ -754,13 +754,13 @@ public function testCanCreateThenDeletePost()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
         $response->assertSessionHasNoErrors();
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
 
 
         $justCreatedRow = \HessamCMS\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
@@ -770,7 +770,7 @@ public function testCanCreateThenDeletePost()
         $response = $this->delete($delete_url, ['_token' => csrf_token()]);
         $response->assertStatus(200);
 
-        $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
 
     }
 
@@ -786,11 +786,11 @@ public function testCanCreateCategory()
         ];
         $search_for_new_cat = $new_cat_vals;
         $new_cat_vals['_token'] = csrf_token();
-        $this->assertDatabaseMissing('blog_etc_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
         $response = $this->post($admin_panel_url . "/categories/add_category", $new_cat_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_categories', $search_for_new_cat);
+        $this->assertDatabaseHas('hessam_categories', $search_for_new_cat);
 
 
     }
@@ -814,11 +814,11 @@ public function testCanCreateCategoryThenEditIt()
         // create a post so we can edit it later
         $search_for_new_cat = $new_cat_vals;
         $new_cat_vals['_token'] = csrf_token();
-        $this->assertDatabaseMissing('blog_etc_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
         $response = $this->post($admin_panel_url . "/categories/add_category", $new_cat_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_categories', $search_for_new_cat);
+        $this->assertDatabaseHas('hessam_categories', $search_for_new_cat);
 
 
         // get the just inserted row
@@ -837,7 +837,7 @@ public function testCanCreateCategoryThenEditIt()
         $new_object_vals['_token'] = csrf_token();
 
 
-        $this->assertDatabaseMissing('blog_etc_categories', ['category_name' => $new_object_vals['category_name']]);
+        $this->assertDatabaseMissing('hessam_categories', ['category_name' => $new_object_vals['category_name']]);
 
 
         // send the request to save the changes
@@ -850,7 +850,7 @@ public function testCanCreateCategoryThenEditIt()
         $response->assertStatus(302); // check it was a redirect
 
         // check that the edited category name is in the database.
-        $this->assertDatabaseHas('blog_etc_categories', ['slug' => $new_object_vals['slug'], 'category_name' => $new_object_vals['category_name']]);
+        $this->assertDatabaseHas('hessam_categories', ['slug' => $new_object_vals['slug'], 'category_name' => $new_object_vals['category_name']]);
 
 
     }
@@ -867,11 +867,11 @@ public function testCanDeleteCategory()
         ];
         $search_for_new_cat = $new_cat_vals;
         $new_cat_vals['_token'] = csrf_token();
-        $this->assertDatabaseMissing('blog_etc_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
         $response = $this->post($admin_panel_url . "/categories/add_category", $new_cat_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('blog_etc_categories', $search_for_new_cat);
+        $this->assertDatabaseHas('hessam_categories', $search_for_new_cat);
 
 
         $justCreatedRow = \HessamCMS\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
@@ -881,7 +881,7 @@ public function testCanDeleteCategory()
 
         $response = $this->delete($delete_url, ['_token' => csrf_token()]);
         $response->assertStatus(200);
-        $this->assertDatabaseMissing('blog_etc_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
 
     }
 
@@ -955,7 +955,7 @@ protected function prepare_post_creation()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('blog_etc_posts', $search_for_obj);
+        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
 
         // check we don't see it at moment
         $response = $this->get(config("hessamcms.blog_prefix", "blog"));

From af51391328860cdc35894998fa7de6a2645a346d Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 5 Dec 2020 00:43:46 +0330
Subject: [PATCH 055/118] some changes in setup page

---
 src/Views/hessamcms_admin/setup/setup.blade.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Views/hessamcms_admin/setup/setup.blade.php b/src/Views/hessamcms_admin/setup/setup.blade.php
index 1cef970..fadbdb6 100644
--- a/src/Views/hessamcms_admin/setup/setup.blade.php
+++ b/src/Views/hessamcms_admin/setup/setup.blade.php
@@ -90,12 +90,10 @@
                                 <div class="tab-pane" id="language">
                                     <div class="row">
                                         <div class="col-sm-12">
-                                            <h4 class="info-text">Your default language is English in Beta release. You can add more language from admin panel.</h4>
-                                            <h5 class="info-text">
-                                                More configurations will be added to this setup section.
-                                            </h5>
+                                            <h4 class="info-text">Your default language is set to English. You can add more language from admin panel.</h4>
+
                                             <h6 class="info-text">
-                                                Beta release v9.0.x
+                                                Version v9.0.x
                                             </h6>
                                         </div>
                                         {{--                                        <div class="col-sm-12">--}}

From 22f77782945be4434f2554268b6e04c1ed9acded Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 24 Dec 2020 23:13:04 +0330
Subject: [PATCH 056/118] updates readme file

---
 README.md                                     | 11 +--
 .../hessamcms_admin/setup/setup.blade.php     | 89 +++++++++----------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index ae810a4..12f57af 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-<p align="center"><a href="cms.binshops.com/" target="_blank"><img src="https://cms.binshops.com/img/hessam-cms.png"></a></p>
-
 <p align="center">
    <a href="https://packagist.org/packages/hessam/laravel-blogger">
       <img src="https://poser.pugx.org/hessam/laravel-blogger/v/stable.png" alt="Latest Stable Version">
@@ -12,11 +10,14 @@
 
 # Complete Laravel CMS Package
 
-### A Surprising Feature, The Multi-Language Support (Nov-2020 version 9.0.x)
+Easily add a blog to your existing laravel website.
 
-Easily add a wordpress functionality and CMS to your laravel web application.
+## Outstanding Features
+- Fulltext Search - search throughout all blog posts
+- Multi Level Category - nested sets using Baum
+- Multi Language Support 
 
-### Your support motivates me to develop this package much more - Let's give a star ;)
+### Tell me your needs for any customization
 
 ### Quick and easy installation
 
diff --git a/src/Views/hessamcms_admin/setup/setup.blade.php b/src/Views/hessamcms_admin/setup/setup.blade.php
index fadbdb6..e7b7790 100644
--- a/src/Views/hessamcms_admin/setup/setup.blade.php
+++ b/src/Views/hessamcms_admin/setup/setup.blade.php
@@ -33,51 +33,50 @@
 
                             <div class="wizard-header" style="padding: 10px; text-align: center">
 
-                                <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
-                                     width="197.000000pt" height="65.000000pt" viewBox="0 0 197.000000 65.000000"
-                                     preserveAspectRatio="xMidYMid meet">
-
-                                    <g transform="translate(0.000000,65.000000) scale(0.100000,-0.100000)"
-                                       fill="#000000" stroke="none">
-                                        <path style="fill: #2787AC;" d="M424 636 c-20 -22 -38 -60 -59 -125 -20 -62 -22 -64 -74 -83 -29 -11
--55 -18 -57 -15 -3 3 10 45 29 93 19 49 31 93 27 97 -12 13 -59 -3 -75 -25 -7
--12 -28 -65 -45 -119 -32 -99 -32 -99 -85 -131 -52 -31 -86 -71 -71 -85 3 -4
-27 3 51 15 25 12 48 22 51 22 6 0 3 -33 -12 -131 -6 -40 13 -69 46 -69 14 0
-19 11 25 58 3 31 13 87 21 123 15 65 15 65 66 87 28 12 53 21 54 19 2 -1 -8
--56 -21 -122 -31 -155 -33 -220 -4 -235 36 -20 46 -6 59 87 16 121 56 295 70
-303 6 4 53 15 105 25 101 20 114 32 69 62 -23 15 -33 15 -86 4 -33 -7 -63 -10
--66 -7 -3 3 7 36 21 74 15 37 27 73 27 80 0 16 -52 15 -66 -2z"/>
-                                        <path style="fill: #b6b8ba;" d="M1422 340 c-72 -32 -91 -113 -40 -167 29 -32 78 -30 108 2 17 19 21
-28 13 36 -9 9 -19 6 -39 -10 -24 -19 -30 -20 -48 -8 -39 26 -30 81 19 113 19
-13 27 13 44 2 23 -14 36 -6 28 16 -12 30 -41 36 -85 16z"/>
-                                        <path style="fill: #b6b8ba;" d="M1686 339 c-9 -13 -16 -26 -16 -30 0 -4 -7 -24 -16 -45 l-16 -38 -31
-60 c-45 84 -64 83 -72 -3 -11 -122 -11 -127 6 -131 12 -2 18 10 25 55 l9 58
-28 -53 c16 -29 33 -52 40 -49 7 2 20 27 31 55 10 28 22 50 26 47 4 -3 11 -30
-15 -60 4 -35 11 -55 20 -55 22 0 23 21 6 107 -20 97 -32 115 -55 82z"/>
-                                        <path style="fill: #b6b8ba;" d="M1802 334 c-17 -12 -22 -24 -20 -47 3 -27 9 -34 48 -47 46 -16 63
--43 34 -54 -9 -3 -30 1 -47 9 -20 10 -34 12 -40 6 -14 -14 8 -38 48 -51 38
--12 58 -6 90 30 18 20 18 23 3 48 -10 16 -34 33 -58 42 -54 19 -56 34 -5 38
-47 4 67 18 45 32 -23 15 -73 12 -98 -6z"/>
-                                        <path style="fill: #b6b8ba;" d="M608 286 c-14 -32 -5 -53 29 -68 37 -16 36 -15 28 -28 -5 -8 -14 -6
--32 5 -36 24 -56 3 -26 -26 26 -27 72 -28 90 -3 21 29 12 57 -24 74 -39 18
--44 35 -8 26 29 -7 48 20 24 35 -28 18 -69 10 -81 -15z"/>
-                                        <path style="fill: #b6b8ba;" d="M737 289 c-21 -29 -10 -55 29 -74 19 -9 32 -21 28 -26 -3 -6 -15 -4
--31 6 -33 22 -55 5 -29 -24 39 -43 96 -25 96 30 0 25 -6 33 -30 42 -36 14 -40
-32 -6 23 29 -7 43 9 26 29 -18 22 -66 19 -83 -6z"/>
-                                        <path style="fill: #b6b8ba;" d="M1014 296 c-3 -7 -4 -42 -2 -77 2 -51 6 -64 21 -67 14 -3 17 5 17 52
-0 31 5 56 10 56 6 0 13 1 18 3 4 1 9 -23 12 -53 4 -40 9 -55 20 -55 11 0 16
-15 20 55 4 40 9 55 20 55 11 0 16 -14 18 -58 3 -49 6 -58 20 -55 18 3 29 70
-18 113 -7 29 -51 49 -77 35 -11 -6 -24 -8 -31 -4 -21 13 -79 13 -84 0z"/>
-                                        <path style="fill: #b6b8ba;" d="M460 282 c-28 -23 -31 -83 -5 -112 29 -32 115 -21 115 15 0 11 -11
-14 -47 10 -47 -5 -47 -4 -15 7 72 25 78 98 8 98 -19 0 -44 -8 -56 -18z m65
--31 c-6 -5 -21 -12 -35 -16 -22 -7 -23 -6 -11 9 7 9 23 16 34 16 13 0 17 -4
-12 -9z"/>
-                                        <path style="fill: #b6b8ba;" d="M886 274 c-19 -19 -26 -37 -26 -64 0 -49 15 -60 78 -59 l51 2 -5 61
-c-3 33 -7 67 -10 74 -6 22 -60 14 -88 -14z m54 -48 c0 -31 -19 -53 -34 -39
--10 11 -7 48 6 61 20 20 28 14 28 -22z"/>
-                                    </g>
-                                </svg>
-
+{{--                                <svg version="1.0" xmlns="http://www.w3.org/2000/svg"--}}
+{{--                                     width="197.000000pt" height="65.000000pt" viewBox="0 0 197.000000 65.000000"--}}
+{{--                                     preserveAspectRatio="xMidYMid meet">--}}
+
+{{--                                    <g transform="translate(0.000000,65.000000) scale(0.100000,-0.100000)"--}}
+{{--                                       fill="#000000" stroke="none">--}}
+{{--                                        <path style="fill: #2787AC;" d="M424 636 c-20 -22 -38 -60 -59 -125 -20 -62 -22 -64 -74 -83 -29 -11--}}
+{{---55 -18 -57 -15 -3 3 10 45 29 93 19 49 31 93 27 97 -12 13 -59 -3 -75 -25 -7--}}
+{{---12 -28 -65 -45 -119 -32 -99 -32 -99 -85 -131 -52 -31 -86 -71 -71 -85 3 -4--}}
+{{--27 3 51 15 25 12 48 22 51 22 6 0 3 -33 -12 -131 -6 -40 13 -69 46 -69 14 0--}}
+{{--19 11 25 58 3 31 13 87 21 123 15 65 15 65 66 87 28 12 53 21 54 19 2 -1 -8--}}
+{{---56 -21 -122 -31 -155 -33 -220 -4 -235 36 -20 46 -6 59 87 16 121 56 295 70--}}
+{{--303 6 4 53 15 105 25 101 20 114 32 69 62 -23 15 -33 15 -86 4 -33 -7 -63 -10--}}
+{{---66 -7 -3 3 7 36 21 74 15 37 27 73 27 80 0 16 -52 15 -66 -2z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M1422 340 c-72 -32 -91 -113 -40 -167 29 -32 78 -30 108 2 17 19 21--}}
+{{--28 13 36 -9 9 -19 6 -39 -10 -24 -19 -30 -20 -48 -8 -39 26 -30 81 19 113 19--}}
+{{--13 27 13 44 2 23 -14 36 -6 28 16 -12 30 -41 36 -85 16z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M1686 339 c-9 -13 -16 -26 -16 -30 0 -4 -7 -24 -16 -45 l-16 -38 -31--}}
+{{--60 c-45 84 -64 83 -72 -3 -11 -122 -11 -127 6 -131 12 -2 18 10 25 55 l9 58--}}
+{{--28 -53 c16 -29 33 -52 40 -49 7 2 20 27 31 55 10 28 22 50 26 47 4 -3 11 -30--}}
+{{--15 -60 4 -35 11 -55 20 -55 22 0 23 21 6 107 -20 97 -32 115 -55 82z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M1802 334 c-17 -12 -22 -24 -20 -47 3 -27 9 -34 48 -47 46 -16 63--}}
+{{---43 34 -54 -9 -3 -30 1 -47 9 -20 10 -34 12 -40 6 -14 -14 8 -38 48 -51 38--}}
+{{---12 58 -6 90 30 18 20 18 23 3 48 -10 16 -34 33 -58 42 -54 19 -56 34 -5 38--}}
+{{--47 4 67 18 45 32 -23 15 -73 12 -98 -6z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M608 286 c-14 -32 -5 -53 29 -68 37 -16 36 -15 28 -28 -5 -8 -14 -6--}}
+{{---32 5 -36 24 -56 3 -26 -26 26 -27 72 -28 90 -3 21 29 12 57 -24 74 -39 18--}}
+{{---44 35 -8 26 29 -7 48 20 24 35 -28 18 -69 10 -81 -15z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M737 289 c-21 -29 -10 -55 29 -74 19 -9 32 -21 28 -26 -3 -6 -15 -4--}}
+{{---31 6 -33 22 -55 5 -29 -24 39 -43 96 -25 96 30 0 25 -6 33 -30 42 -36 14 -40--}}
+{{--32 -6 23 29 -7 43 9 26 29 -18 22 -66 19 -83 -6z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M1014 296 c-3 -7 -4 -42 -2 -77 2 -51 6 -64 21 -67 14 -3 17 5 17 52--}}
+{{--0 31 5 56 10 56 6 0 13 1 18 3 4 1 9 -23 12 -53 4 -40 9 -55 20 -55 11 0 16--}}
+{{--15 20 55 4 40 9 55 20 55 11 0 16 -14 18 -58 3 -49 6 -58 20 -55 18 3 29 70--}}
+{{--18 113 -7 29 -51 49 -77 35 -11 -6 -24 -8 -31 -4 -21 13 -79 13 -84 0z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M460 282 c-28 -23 -31 -83 -5 -112 29 -32 115 -21 115 15 0 11 -11--}}
+{{--14 -47 10 -47 -5 -47 -4 -15 7 72 25 78 98 8 98 -19 0 -44 -8 -56 -18z m65--}}
+{{---31 c-6 -5 -21 -12 -35 -16 -22 -7 -23 -6 -11 9 7 9 23 16 34 16 13 0 17 -4--}}
+{{--12 -9z"/>--}}
+{{--                                        <path style="fill: #b6b8ba;" d="M886 274 c-19 -19 -26 -37 -26 -64 0 -49 15 -60 78 -59 l51 2 -5 61--}}
+{{--c-3 33 -7 67 -10 74 -6 22 -60 14 -88 -14z m54 -48 c0 -31 -19 -53 -34 -39--}}
+{{---10 11 -7 48 6 61 20 20 28 14 28 -22z"/>--}}
+{{--                                    </g>--}}
+{{--                                </svg>--}}
 
                             </div>
                             <div class="wizard-navigation">

From 51f3b19d14937547738a752d0e4b7d3bb1bc0852 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 2 Jan 2021 23:02:49 +0330
Subject: [PATCH 057/118] readme file update

---
 README.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 12f57af..312b933 100644
--- a/README.md
+++ b/README.md
@@ -8,17 +8,23 @@
   </a>
 </p>
 
-# Complete Laravel CMS Package
+# Complete Laravel Blog Package
 
-Easily add a blog to your existing laravel website.
+Briefly... 
+### Lightweight and Comprehensive
+
+Incredible features with a lightweight laravel blog package. I highly recommend it because:
+- Quick installation (<3 minutes)
+- It's very easy to extend
+- Included great features out-of-box
+- Its simplicity allows to be easily made compatible with latest laravel
+- No additional concept except laravel knowledge
 
 ## Outstanding Features
 - Fulltext Search - search throughout all blog posts
 - Multi Level Category - nested sets using Baum
 - Multi Language Support 
 
-### Tell me your needs for any customization
-
 ### Quick and easy installation
 
 Install with following command and follow the instructions. 

From 41dee06e4a68c95fa6f0c541647df29797cdb468 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 20 Jan 2021 15:12:43 +0330
Subject: [PATCH 058/118] composer update

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9b43355..7b4f199 100755
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
     },
     "autoload": {
         "psr-4": {
-            "HessamCMS\\": "src"
+            "HessamCMS\\": "src",
+            "HessamCMS\\Laravel\\Fulltext\\": "src/FulltextSearch/src/" 
         }
     },
     "autoload-dev": {

From 4f47a43b1f0a058e605cd6c29e7572b1b591449a Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Wed, 20 Jan 2021 18:04:08 +0330
Subject: [PATCH 059/118] readme update

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 312b933..d8964ae 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@
 
 # Complete Laravel Blog Package
 
-Briefly... 
 ### Lightweight and Comprehensive
 
 Incredible features with a lightweight laravel blog package. I highly recommend it because:

From 2b375d0ec12cb4f514d2ed7145d3b417ad067599 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 21 Jan 2021 01:34:36 +0330
Subject: [PATCH 060/118] readme update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d8964ae..580c301 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@
 </p>
 
 # Complete Laravel Blog Package
+Have you worked with Wordpress? Developers call it wordpress-like laravel package.
 
 ### Lightweight and Comprehensive
 

From 3ab12c28b1fd368444d1d6521e0fc3d18d28c31e Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 21 Jan 2021 12:34:23 +0330
Subject: [PATCH 061/118] fix for primary key for HessamConfiguration model

---
 src/Models/HessamConfiguration.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Models/HessamConfiguration.php b/src/Models/HessamConfiguration.php
index 0114d3f..5540ef5 100644
--- a/src/Models/HessamConfiguration.php
+++ b/src/Models/HessamConfiguration.php
@@ -11,6 +11,8 @@
  */
 class HessamConfiguration extends Model
 {
+    protected $primaryKey = 'key';
+
     public $fillable = [
         'key',
         'value'

From 0062528254b2e65f2a41986bed87d68fdcc17f3b Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 29 Jan 2021 14:29:11 +0330
Subject: [PATCH 062/118] bug fix when removing featured image

---
 src/Controllers/HessamAdminController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/HessamAdminController.php
index 4cc352c..b3e3bca 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/HessamAdminController.php
@@ -352,8 +352,8 @@ public function update_post(UpdateHessamCMSPostRequest $request, $blogPostId)
     public function remove_photo($postSlug, $lang_id)
     {
         $post = HessamPostTranslation::where([
-            "slug", '=', $postSlug,
-            'lang_id', '=', $lang_id
+            ["slug", '=', $postSlug],
+            ['lang_id', '=', $lang_id]
         ])->firstOrFail();
 
         $path = public_path('/' . config("hessamcms.blog_upload_dir"));

From 781cca17680220c595b4663438f536d432c92190 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sun, 31 Jan 2021 21:03:19 +0330
Subject: [PATCH 063/118] updates readme file

---
 README.md | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 580c301..78a19c7 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,9 @@
 # Complete Laravel Blog Package
 Have you worked with Wordpress? Developers call it wordpress-like laravel package.
 
+### Contact us for any customization:
+contact@binshops.com
+
 ### Lightweight and Comprehensive
 
 Incredible features with a lightweight laravel blog package. I highly recommend it because:
@@ -27,10 +30,47 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 
 ### Quick and easy installation
 
-Install with following command and follow the instructions. 
+1- Install the package: 
 
     composer require hessam/laravel-blogger
 
+2- Run the following commands to copy config file, migration files, and view files
+
+`php artisan vendor:publish --provider="HessamCMS\HessamCMSServiceProvider"`
+
+3- Execute migrations to create tables
+
+`php artisan migrate;`
+
+4- You must add one method to your \App\User (in laravel 8 \App\Models\User) model. As the name of this method shows it determines which user can manage posts. Place your logic there.
+
+`public function canManageHessamCMSPosts()
+{
+// Enter the logic needed for your app.
+// Maybe you can just hardcode in a user id that you
+//   know is always an admin ID?
+        if (       $this->id === 1
+             && $this->email === "your_admin_user@your_site.com"
+           ){
+
+           // return true so this user CAN edit/post/delete
+           // blog posts (and post any HTML/JS)
+
+           return true;
+        }
+
+        // otherwise return false, so they have no access
+        // to the admin panel (but can still view posts)
+
+        return false;
+    }`
+
+5- Create a directory in `public/` named `blog_images`
+6- Login as ADMIN and setup your package: `/blog_admin/setup`
+7- Congrats! Your blog is ready to use. (URLs are customizable in the config file)
+`Admin panel URI: /blog_admin`
+`Front URI: /en/blog`
+
 ### For Complete Setup Instructions (with video guide), please Visit [The Install Guide](https://hessam.binshops.com/laravel-blog-package#setup)
 
 To see package on Packagist click this [Link](https://packagist.org/packages/hessam/laravel-blogger)

From 5ae4c904a01d70b7446456f26d275c877643040c Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sun, 31 Jan 2021 21:05:59 +0330
Subject: [PATCH 064/118] updates readme file

---
 README.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 78a19c7..8cf5b5b 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,8 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 
 4- You must add one method to your \App\User (in laravel 8 \App\Models\User) model. As the name of this method shows it determines which user can manage posts. Place your logic there.
 
-`public function canManageHessamCMSPosts()
+```
+public function canManageHessamCMSPosts()
 {
 // Enter the logic needed for your app.
 // Maybe you can just hardcode in a user id that you
@@ -63,13 +64,18 @@ Incredible features with a lightweight laravel blog package. I highly recommend
         // to the admin panel (but can still view posts)
 
         return false;
-    }`
+}
+```
 
 5- Create a directory in `public/` named `blog_images`
+
 6- Login as ADMIN and setup your package: `/blog_admin/setup`
+
 7- Congrats! Your blog is ready to use. (URLs are customizable in the config file)
-`Admin panel URI: /blog_admin`
-`Front URI: /en/blog`
+```
+Admin panel URI: /blog_admin
+Front URI: /en/blog
+```
 
 ### For Complete Setup Instructions (with video guide), please Visit [The Install Guide](https://hessam.binshops.com/laravel-blog-package#setup)
 

From a1af68aa48742ea9c05864c5afb37ad075ecd9ed Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 5 Feb 2021 16:29:06 +0330
Subject: [PATCH 065/118] readme update

---
 README.md | 59 ++++++++++---------------------------------------------
 1 file changed, 10 insertions(+), 49 deletions(-)

diff --git a/README.md b/README.md
index 8cf5b5b..107cbf0 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 Have you worked with Wordpress? Developers call it wordpress-like laravel package.
 
 ### Contact us for any customization:
-contact@binshops.com
+sam@binshops.com
 
 ### Lightweight and Comprehensive
 
@@ -22,6 +22,7 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 - Included great features out-of-box
 - Its simplicity allows to be easily made compatible with latest laravel
 - No additional concept except laravel knowledge
+- Compatible with other Laravel platforms like Bagisto
 
 ## Outstanding Features
 - Fulltext Search - search throughout all blog posts
@@ -30,57 +31,15 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 
 ### Quick and easy installation
 
-1- Install the package: 
-
-    composer require hessam/laravel-blogger
-
-2- Run the following commands to copy config file, migration files, and view files
-
-`php artisan vendor:publish --provider="HessamCMS\HessamCMSServiceProvider"`
-
-3- Execute migrations to create tables
-
-`php artisan migrate;`
-
-4- You must add one method to your \App\User (in laravel 8 \App\Models\User) model. As the name of this method shows it determines which user can manage posts. Place your logic there.
-
-```
-public function canManageHessamCMSPosts()
-{
-// Enter the logic needed for your app.
-// Maybe you can just hardcode in a user id that you
-//   know is always an admin ID?
-        if (       $this->id === 1
-             && $this->email === "your_admin_user@your_site.com"
-           ){
-
-           // return true so this user CAN edit/post/delete
-           // blog posts (and post any HTML/JS)
-
-           return true;
-        }
-
-        // otherwise return false, so they have no access
-        // to the admin panel (but can still view posts)
-
-        return false;
-}
-```
-
-5- Create a directory in `public/` named `blog_images`
-
-6- Login as ADMIN and setup your package: `/blog_admin/setup`
-
-7- Congrats! Your blog is ready to use. (URLs are customizable in the config file)
-```
-Admin panel URI: /blog_admin
-Front URI: /en/blog
-```
+`composer require hessam/laravel-blogger`
 
 ### For Complete Setup Instructions (with video guide), please Visit [The Install Guide](https://hessam.binshops.com/laravel-blog-package#setup)
 
 To see package on Packagist click this [Link](https://packagist.org/packages/hessam/laravel-blogger)
 
+### Bagisto version
+To see the Bagisto version of this package go to `bagisto-compatible` branch 
+
 ## Important Notes
 - For laravel 8.x's default auth User model, change user model in `hessamcms.php` to: `\App\Models\User::class`
 
@@ -99,7 +58,8 @@ To see package on Packagist click this [Link](https://packagist.org/packages/hes
 - Other options include using Disqus comments or disabling comments
 
 ## Recent Changes  
-- **8.0.x** Compatibility with Laravel 8.x
+- **9.1.x** Multi language support
+- 8.0.x Compatibility with Laravel 8.x
 
 ## Screen Shots
 
@@ -175,7 +135,8 @@ Try adding this to config/app.php:
 - You might need to set a higher memory limit, or upload smaller image files. This will depend on your server. I've used it to upload huge (10mb+) jpg images without problem, once the server was set up correctly to handle larger file uploads.
 
 ## Version History    
-- **9.0.x** Multi-language support beta release
+- **9.1.x** Stable version of package
+- 9.0.x Multi-language support beta release
 - 8.0.x Compatibility with Laravel 8
 - 7.3.2 Some bug fixes
 - 7.3.0 New Admin UI

From 27d79b87655eded802a0db4d5d52543090f42c73 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 11 Feb 2021 13:13:42 +0330
Subject: [PATCH 066/118] fix for image_tag method

---
 src/Models/HessamPostTranslation.php                     | 2 +-
 src/Views/hessamcms_admin/layouts/admin_layout.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Models/HessamPostTranslation.php b/src/Models/HessamPostTranslation.php
index bad4a15..7f8aeff 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/HessamPostTranslation.php
@@ -126,7 +126,7 @@ public function image_tag($size = 'medium', $auto_link = true, $img_class = null
         $url = e($this->image_url($size));
         $alt = e($this->title);
         $img = "<img src='$url' alt='$alt' class='" . e($img_class) . "' >";
-        return $auto_link ? "<a class='" . e($anchor_class) . "' href='" . e($this->url()) . "'>$img</a>" : $img;
+        return $auto_link ? "<a class='" . e($anchor_class) . "' href='" . e($this->url( app()->getLocale() )) . "'>$img</a>" : $img;
 
     }
 
diff --git a/src/Views/hessamcms_admin/layouts/admin_layout.blade.php b/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
index 92fa813..d576a3b 100755
--- a/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
+++ b/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
@@ -92,7 +92,7 @@
                         <small><a href='https://github.com/vhessam/laravel-blogger'>Hessam CMS</a></small>
 
                         <small>
-                            Version 9.0.x
+                            Version 9.1.x
                         </small>
                     </div>
                 </div>

From 7ac30be359eb127cea9e6bdc1a3581b9accdcef1 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Thu, 11 Feb 2021 22:48:39 +0330
Subject: [PATCH 067/118] readme update

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 107cbf0..29fe259 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@
   </a>
 </p>
 
-# Complete Laravel Blog Package
-Have you worked with Wordpress? Developers call it wordpress-like laravel package.
+# Laravel Blog
+Have you worked with Wordpress? Developers call it wordpress-like laravel blog.
 
 ### Contact us for any customization:
 sam@binshops.com
@@ -87,9 +87,9 @@ To see the Bagisto version of this package go to `bagisto-compatible` branch
 ## What/who this package is for:
 
  - For websites running Laravel
- - Who wants to have a site blog, and have an easy to use interface to write blog posts/assign categories/manage existing posts
+ - Who wants to have a site blog. This laravel blog gives an easy to use interface to write blog posts/assign categories/manage existing posts
  - Where only admin users can edit/manage the blog (this is not suitable for every user on your site to be able to manage posts)
- - For anyone who likes to add a wordpress-like CMS to her/his web app
+ - For anyone who likes to add a wordpress-like laravel blog to laravel website
 
 ## How to customise the blog views/templates
 
@@ -170,7 +170,7 @@ Try adding this to config/app.php:
 - 0.3                   - Small changes, packagist settings.
 - 0.1                   - Initial release
 
-Contact: hessam.modaberi@gmail.com
+Contact: sam@binshops.com
 
 
 

From 0a2f544d770a29ba6d8eb3caa3e52aac9bd73bd5 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 12:40:59 -0500
Subject: [PATCH 068/118] refactor

---
 .styleci.yml                                  |   2 +-
 LICENSE.txt                                   |   2 +-
 README.md                                     |  41 ++-
 composer.json                                 |  21 +-
 ...04241_create_binshops_languages_table.php} |   6 +-
 ...5400_create_binshops_categories_table.php} |   6 +-
 ..._binshops_category_translations_table.php} |   8 +-
 ...16_010039_create_binshops_posts_table.php} |  12 +-
 ...eate_binshops_post_translations_table.php} |   8 +-
 ...121230_create_binshops_comments_table.php} |   6 +-
 ...create_binshops_uploaded_photos_table.php} |   6 +-
 ..._create_binshops_configurations_table.php} |   6 +-
 src/Baum/Extensions/Eloquent/Collection.php   |   4 +-
 src/Baum/Extensions/Eloquent/Model.php        |   4 +-
 src/Baum/Extensions/Query/Builder.php         |   2 +-
 src/Baum/Move.php                             |  26 +-
 src/Baum/MoveNotPossibleException.php         |   2 +-
 src/Baum/Node.php                             |  46 +--
 src/Baum/SetBuilder.php                       |  18 +-
 src/Baum/SetMapper.php                        |  10 +-
 src/Baum/SetValidator.php                     |  10 +-
 src/BinshopsBlogServiceProvider.php           |  90 +++++
 src/Captcha/Basic.php                         |  10 +-
 src/Captcha/CaptchaAbstract.php               |  16 +-
 src/Captcha/UsesCaptcha.php                   |  10 +-
 .../{hessamcms.php => binshopsblog.php}       |  14 +-
 ...roller.php => BinshopsAdminController.php} | 162 ++++-----
 .../BinshopsAdminSetupController.php          |  59 ++++
 ...hp => BinshopsCategoryAdminController.php} |  90 ++---
 ...hp => BinshopsCommentWriterController.php} |  46 +--
 ...hp => BinshopsCommentsAdminController.php} |  30 +-
 ....php => BinshopsImageUploadController.php} |  44 +--
 ...hp => BinshopsLanguageAdminController.php} |  42 +--
 ...oller.php => BinshopsReaderController.php} |  60 ++--
 ...ller.php => BinshopsRssFeedController.php} |  34 +-
 .../HessamAdminSetupController.php            |  59 ----
 src/Events/BlogPostAdded.php                  |  16 +-
 src/Events/BlogPostEdited.php                 |  16 +-
 src/Events/BlogPostWillBeDeleted.php          |  16 +-
 src/Events/CategoryAdded.php                  |  22 +-
 src/Events/CategoryEdited.php                 |  16 +-
 src/Events/CategoryWillBeDeleted.php          |  16 +-
 src/Events/CommentAdded.php                   |  22 +-
 src/Events/CommentApproved.php                |  12 +-
 src/Events/CommentWillBeDeleted.php           |  12 +-
 src/Events/UploadedImage.php                  |  18 +-
 src/FulltextSearch/src/Commands/Index.php     |   4 +-
 src/FulltextSearch/src/Commands/IndexOne.php  |   4 +-
 .../src/Commands/UnindexOne.php               |   4 +-
 src/FulltextSearch/src/Indexable.php          |   4 +-
 src/FulltextSearch/src/IndexedRecord.php      |   4 +-
 src/FulltextSearch/src/Indexer.php            |   2 +-
 src/FulltextSearch/src/ModelObserver.php      |   2 +-
 src/FulltextSearch/src/Search.php             |  12 +-
 src/FulltextSearch/src/SearchInterface.php    |   2 +-
 src/FulltextSearch/src/TermBuilder.php        |   4 +-
 src/Helpers.php                               |  12 +-
 src/HessamCMSServiceProvider.php              |  90 -----
 src/Interfaces/BaseRequestInterface.php       |   2 +-
 src/Interfaces/CaptchaInterface.php           |   2 +-
 src/Interfaces/SearchResultInterface.php      |   2 +-
 src/Middleware/DetectLanguage.php             |   6 +-
 src/Middleware/LoadLanguage.php               |  10 +-
 src/Middleware/PackageSetup.php               |   8 +-
 src/Middleware/UserCanManageBlogPosts.php     |   8 +-
 ...essamCategory.php => BinshopsCategory.php} |  14 +-
 ...on.php => BinshopsCategoryTranslation.php} |  12 +-
 ...{HessamComment.php => BinshopsComment.php} |  16 +-
 ...guration.php => BinshopsConfiguration.php} |   8 +-
 ...essamLanguage.php => BinshopsLanguage.php} |   8 +-
 .../{HessamPost.php => BinshopsPost.php}      |  22 +-
 ...lation.php => BinshopsPostTranslation.php} |  40 +--
 ...dedPhoto.php => BinshopsUploadedPhoto.php} |   6 +-
 src/Requests/AddNewCommentRequest.php         |  18 +-
 ...hp => BaseBinshopsBlogCategoryRequest.php} |   4 +-
 ...st.php => BaseBinshopsBlogPostRequest.php} |  10 +-
 src/Requests/BaseRequest.php                  |   8 +-
 ....php => CreateBinshopsBlogPostRequest.php} |   8 +-
 ...hp => CreateBinshopsPostToggleRequest.php} |   8 +-
 ... => DeleteBinshopsBlogCategoryRequest.php} |   4 +-
 ....php => DeleteBinshopsBlogPostRequest.php} |   4 +-
 src/Requests/FeedRequest.php                  |   2 +-
 src/Requests/SearchRequest.php                |   4 +-
 src/Requests/Traits/HasCategoriesTrait.php    |   8 +-
 src/Requests/Traits/HasImageUploadTrait.php   |   4 +-
 ... => UpdateBinshopsBlogCategoryRequest.php} |   6 +-
 .../UpdateBinshopsBlogPostRequest.php         |  27 ++
 src/Requests/UpdateHessamCMSPostRequest.php   |  27 --
 src/Requests/UploadImageRequest.php           |   6 +-
 ...ope.php => BinshopsBlogPublishedScope.php} |   8 +-
 ...logCommentApprovedAndDefaultOrderScope.php |   4 +-
 src/Traits/UploadFileTrait.php                |  22 +-
 .../captcha/basic.blade.php                   |   2 +-
 .../index.blade.php                           |  28 +-
 .../partials/_category_partial.blade.php      |   4 +-
 .../partials/add_comment_form.blade.php       |   8 +-
 .../partials/author.blade.php                 |   0
 .../partials/built_in_comments.blade.php      |   6 +-
 .../partials/cat_snippet.blade.php            |   0
 .../partials/categories.blade.php             |   0
 .../partials/custom_comments.blade.php        |   2 +-
 .../partials/disqus_comments.blade.php        |   6 +-
 .../partials/full_post_details.blade.php      |  10 +-
 .../partials/index_loop.blade.php             |   6 +-
 .../partials/search_form.blade.php            |   4 +-
 .../partials/show_comments.blade.php          |  10 +-
 .../partials/show_errors.blade.php            |   0
 .../partials/use_view_file.blade.php          |   8 +-
 .../saved_comment.blade.php                   |   2 +-
 .../search.blade.php                          |  12 +-
 src/Views/binshopsblog/single_post.blade.php  |  43 +++
 .../sitewide/random_posts.blade.php           |   2 +-
 .../sitewide/recent_posts.blade.php           |   2 +-
 .../sitewide/search_form.blade.php            |   2 +-
 .../sitewide/show_all_categories.blade.php    |   2 +-
 .../categories/_category_partial.blade.php    |   2 +-
 .../categories/add_category.blade.php         |  12 +-
 .../categories/edit_category.blade.php        |   6 +-
 .../categories/form.blade.php                 |   2 +-
 .../categories/index.blade.php                |   4 +-
 .../comments/index.blade.php                  |   6 +-
 .../imageupload/create.blade.php              |  10 +-
 .../imageupload/index.blade.php               |  14 +-
 .../imageupload/uploaded.blade.php            |  10 +-
 .../index.blade.php                           |   4 +-
 .../languages/add_language.blade.php          |   4 +-
 .../languages/deleted_language.blade.php      |   0
 .../languages/edit_language.blade.php         |   0
 .../languages/index.blade.php                 |   6 +-
 .../layouts/admin_layout.blade.php            |  20 +-
 .../layouts/sidebar.blade.php                 |  60 ++--
 .../posts/add_post.blade.php                  |   8 +-
 .../posts/deleted_post.blade.php              |  16 +-
 .../posts/edit_post.blade.php                 |   8 +-
 .../posts/form.blade.php                      |  18 +-
 .../setup/setup.blade.php                     |   6 +-
 src/Views/hessamcms/single_post.blade.php     |  43 ---
 .../{hessam-blog.css => binshops-blog.css}    |   2 +-
 ...min_css.css => binshopsblog_admin_css.css} |   4 +-
 src/js/{hessam-blog.js => binshops-blog.js}   |   0
 src/routes.php                                | 138 ++++----
 tests/CaptchaTest.php                         |  14 +-
 tests/MainTest.php                            | 320 +++++++++---------
 143 files changed, 1282 insertions(+), 1282 deletions(-)
 rename migrations/{2020_10_16_004241_create_hessam_languages_table.php => 2020_10_16_004241_create_binshops_languages_table.php} (80%)
 rename migrations/{2020_10_16_005400_create_hessam_categories_table.php => 2020_10_16_005400_create_binshops_categories_table.php} (81%)
 rename migrations/{2020_10_16_005425_create_hessam_category_translations_table.php => 2020_10_16_005425_create_binshops_category_translations_table.php} (71%)
 rename migrations/{2020_10_16_010039_create_hessam_posts_table.php => 2020_10_16_010039_create_binshops_posts_table.php} (70%)
 rename migrations/{2020_10_16_010049_create_hessam_post_translations_table.php => 2020_10_16_010049_create_binshops_post_translations_table.php} (81%)
 rename migrations/{2020_10_16_121230_create_hessam_comments_table.php => 2020_10_16_121230_create_binshops_comments_table.php} (85%)
 rename migrations/{2020_10_16_121728_create_hessam_uploaded_photos_table.php => 2020_10_16_121728_create_binshops_uploaded_photos_table.php} (77%)
 rename migrations/{2020_10_22_132005_create_hessam_configurations_table.php => 2020_10_22_132005_create_binshops_configurations_table.php} (71%)
 create mode 100755 src/BinshopsBlogServiceProvider.php
 rename src/Config/{hessamcms.php => binshopsblog.php} (93%)
 rename src/Controllers/{HessamAdminController.php => BinshopsAdminController.php} (70%)
 create mode 100644 src/Controllers/BinshopsAdminSetupController.php
 rename src/Controllers/{HessamCategoryAdminController.php => BinshopsCategoryAdminController.php} (61%)
 rename src/Controllers/{HessamCommentWriterController.php => BinshopsCommentWriterController.php} (58%)
 rename src/Controllers/{HessamCommentsAdminController.php => BinshopsCommentsAdminController.php} (63%)
 rename src/Controllers/{HessamImageUploadController.php => BinshopsImageUploadController.php} (60%)
 rename src/Controllers/{HessamLanguageAdminController.php => BinshopsLanguageAdminController.php} (60%)
 rename src/Controllers/{HessamReaderController.php => BinshopsReaderController.php} (65%)
 rename src/Controllers/{HessamRssFeedController.php => BinshopsRssFeedController.php} (64%)
 delete mode 100644 src/Controllers/HessamAdminSetupController.php
 delete mode 100755 src/HessamCMSServiceProvider.php
 rename src/Models/{HessamCategory.php => BinshopsCategory.php} (77%)
 rename src/Models/{HessamCategoryTranslation.php => BinshopsCategoryTranslation.php} (73%)
 rename src/Models/{HessamComment.php => BinshopsComment.php} (70%)
 rename src/Models/{HessamConfiguration.php => BinshopsConfiguration.php} (71%)
 rename src/Models/{HessamLanguage.php => BinshopsLanguage.php} (71%)
 rename src/Models/{HessamPost.php => BinshopsPost.php} (73%)
 rename src/Models/{HessamPostTranslation.php => BinshopsPostTranslation.php} (77%)
 rename src/Models/{HessamUploadedPhoto.php => BinshopsUploadedPhoto.php} (66%)
 rename src/Requests/{BaseHessamCMSCategoryRequest.php => BaseBinshopsBlogCategoryRequest.php} (82%)
 rename src/Requests/{BaseHessamCMSPostRequest.php => BaseBinshopsBlogPostRequest.php} (89%)
 rename src/Requests/{CreateHessamCMSPostRequest.php => CreateBinshopsBlogPostRequest.php} (60%)
 rename src/Requests/{CreateHessamPostToggleRequest.php => CreateBinshopsPostToggleRequest.php} (57%)
 rename src/Requests/{DeleteHessamCMSCategoryRequest.php => DeleteBinshopsBlogCategoryRequest.php} (70%)
 rename src/Requests/{DeleteHessamCMSPostRequest.php => DeleteBinshopsBlogPostRequest.php} (73%)
 rename src/Requests/{UpdateHessamCMSCategoryRequest.php => UpdateBinshopsBlogCategoryRequest.php} (62%)
 create mode 100755 src/Requests/UpdateBinshopsBlogPostRequest.php
 delete mode 100755 src/Requests/UpdateHessamCMSPostRequest.php
 rename src/Scopes/{HessamCMSPublishedScope.php => BinshopsBlogPublishedScope.php} (72%)
 rename src/Views/{hessamcms => binshopsblog}/captcha/basic.blade.php (59%)
 rename src/Views/{hessamcms => binshopsblog}/index.blade.php (69%)
 rename src/Views/{hessamcms => binshopsblog}/partials/_category_partial.blade.php (81%)
 rename src/Views/{hessamcms => binshopsblog}/partials/add_comment_form.blade.php (89%)
 rename src/Views/{hessamcms => binshopsblog}/partials/author.blade.php (100%)
 rename src/Views/{hessamcms => binshopsblog}/partials/built_in_comments.blade.php (70%)
 rename src/Views/{hessamcms => binshopsblog}/partials/cat_snippet.blade.php (100%)
 rename src/Views/{hessamcms => binshopsblog}/partials/categories.blade.php (100%)
 rename src/Views/{hessamcms => binshopsblog}/partials/custom_comments.blade.php (60%)
 rename src/Views/{hessamcms => binshopsblog}/partials/disqus_comments.blade.php (82%)
 rename src/Views/{hessamcms => binshopsblog}/partials/full_post_details.blade.php (66%)
 rename src/Views/{hessamcms => binshopsblog}/partials/index_loop.blade.php (81%)
 rename src/Views/{hessamcms => binshopsblog}/partials/search_form.blade.php (50%)
 rename src/Views/{hessamcms => binshopsblog}/partials/show_comments.blade.php (64%)
 rename src/Views/{hessamcms => binshopsblog}/partials/show_errors.blade.php (100%)
 rename src/Views/{hessamcms => binshopsblog}/partials/use_view_file.blade.php (71%)
 rename src/Views/{hessamcms => binshopsblog}/saved_comment.blade.php (84%)
 rename src/Views/{hessamcms => binshopsblog}/search.blade.php (76%)
 create mode 100755 src/Views/binshopsblog/single_post.blade.php
 rename src/Views/{hessamcms => binshopsblog}/sitewide/random_posts.blade.php (66%)
 rename src/Views/{hessamcms => binshopsblog}/sitewide/recent_posts.blade.php (63%)
 rename src/Views/{hessamcms => binshopsblog}/sitewide/search_form.blade.php (73%)
 rename src/Views/{hessamcms => binshopsblog}/sitewide/show_all_categories.blade.php (64%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/categories/_category_partial.blade.php (73%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/categories/add_category.blade.php (92%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/categories/edit_category.blade.php (92%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/categories/form.blade.php (95%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/categories/index.blade.php (84%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/comments/index.blade.php (88%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/imageupload/create.blade.php (75%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/imageupload/index.blade.php (87%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/imageupload/uploaded.blade.php (55%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/index.blade.php (95%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/languages/add_language.blade.php (97%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/languages/deleted_language.blade.php (100%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/languages/edit_language.blade.php (100%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/languages/index.blade.php (82%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/layouts/admin_layout.blade.php (86%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/layouts/sidebar.blade.php (62%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/posts/add_post.blade.php (73%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/posts/deleted_post.blade.php (65%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/posts/edit_post.blade.php (76%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/posts/form.blade.php (93%)
 rename src/Views/{hessamcms_admin => binshopsblog_admin}/setup/setup.blade.php (99%)
 delete mode 100755 src/Views/hessamcms/single_post.blade.php
 rename src/css/{hessam-blog.css => binshops-blog.css} (93%)
 rename src/css/{hessamcms_admin_css.css => binshopsblog_admin_css.css} (99%)
 rename src/js/{hessam-blog.js => binshops-blog.js} (100%)

diff --git a/.styleci.yml b/.styleci.yml
index 5ad3ee9..6400542 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -1,4 +1,4 @@
-# Styleci for hessam.
+# Styleci for binshops.
 
 preset: laravel
 
diff --git a/LICENSE.txt b/LICENSE.txt
index 00f04a7..bac0ded 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Hessam.
+Copyright (c) 2020 Binshops.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 29fe259..eba071e 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 <p align="center">
-   <a href="https://packagist.org/packages/hessam/laravel-blogger">
-      <img src="https://poser.pugx.org/hessam/laravel-blogger/v/stable.png" alt="Latest Stable Version">
+   <a href="https://packagist.org/packages/binshops/laravel-blogger">
+      <img src="https://poser.pugx.org/binshops/laravel-blogger/v/stable.png" alt="Latest Stable Version">
   </a>
 
-  <a href="https://packagist.org/packages/hessam/laravel-blogger">
-    <img src="https://poser.pugx.org/hessam/laravel-blogger/license.png" alt="License">
+  <a href="https://packagist.org/packages/binshops/laravel-blogger">
+    <img src="https://poser.pugx.org/binshops/laravel-blogger/license.png" alt="License">
   </a>
 </p>
 
@@ -12,7 +12,7 @@
 Have you worked with Wordpress? Developers call it wordpress-like laravel blog.
 
 ### Contact us for any customization:
-sam@binshops.com
+contact@binshops.com
 
 ### Lightweight and Comprehensive
 
@@ -31,24 +31,23 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 
 ### Quick and easy installation
 
-`composer require hessam/laravel-blogger`
+`composer require binshops/laravel-blog`
 
-### For Complete Setup Instructions (with video guide), please Visit [The Install Guide](https://hessam.binshops.com/laravel-blog-package#setup)
 
-To see package on Packagist click this [Link](https://packagist.org/packages/hessam/laravel-blogger)
+To see package on Packagist click this [Link](https://packagist.org/packages/binshops/laravel-blog)
 
 ### Bagisto version
 To see the Bagisto version of this package go to `bagisto-compatible` branch 
 
 ## Important Notes
-- For laravel 8.x's default auth User model, change user model in `hessamcms.php` to: `\App\Models\User::class`
+- For laravel 8.x's default auth User model, change user model in `binshopsblog.php` to: `\App\Models\User::class`
 
 ## Features
 - Compatible with latest laravel version (laravel 8.x)
 - Backward-compatibility with previous laravel versions
 - Full text search - searching throughout the blog posts
 - Multi-level category support
-- fully configurable via its `config/hessamcms.php` config file
+- fully configurable via its `config/binshopsblog.php` config file
 - Ready to use admin panel
 - Full customizability of admin views and front views
 - Paginated views
@@ -64,21 +63,21 @@ To see the Bagisto version of this package go to `bagisto-compatible` branch
 ## Screen Shots
 
   <p align="center">
-    <img src="https://hessam.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.23.35-PM-1024x560.png" width="500px" title="Add post">
+    <img src="https://binshops.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.23.35-PM-1024x560.png" width="500px" title="Add post">
   </p>
   <p align="center">
   Add post
   </p>
 
   <p align="center">
-    <img src="https://hessam.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.19.42-PM-1024x558.png" width="500px" title="All posts">
+    <img src="https://binshops.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.19.42-PM-1024x558.png" width="500px" title="All posts">
   </p>
    <p align="center">
     All posts
     </p>
   
   <p align="center">
-    <img src="https://hessam.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.03.39-PM-1-1024x560.png" width="500px" title="Add category">
+    <img src="https://binshops.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.03.39-PM-1-1024x560.png" width="500px" title="Add category">
   </p>
   <p align="center">
       Add category
@@ -93,21 +92,21 @@ To see the Bagisto version of this package go to `bagisto-compatible` branch
 
 ## How to customise the blog views/templates
 
-After doing the correct `vendor:publish`, all of the default template files will be found in /resources/views/vendor/hessamcms/ and are easy to edit to match your needs.
+After doing the correct `vendor:publish`, all of the default template files will be found in /resources/views/vendor/binshopsblog/ and are easy to edit to match your needs.
 
 ### Customizing admin views
 If you need to customize the admin view, just copy the files from
-`vendor/hessamcms/src/Views/hessamcms_admin`
+`vendor/binshopsblog/src/Views/binshopsblog_admin`
 to
-`resources/views/vendor/hessamcms_admin`
+`resources/views/vendor/binshopsblog_admin`
 Then you can modify them just like any other view file.
 
 ## Routes
 
-It will auto set all required routes (both public facing, and admin backend). There are some config options (such as changing the /blog/ url to something else), which can be done in the hessamcms.php file.
+It will auto set all required routes (both public facing, and admin backend). There are some config options (such as changing the /blog/ url to something else), which can be done in the binshopsblog.php file.
 
 ## Config options
-All config options have comments which describe what they do. Please just refer to the `hessamcms.php` file in your /config/ dir.
+All config options have comments which describe what they do. Please just refer to the `binshopsblog.php` file in your /config/ dir.
 
 ### Custom User Model
 You can change the default user model through the config file.
@@ -122,7 +121,7 @@ Add these (and an Event Listener) to your `EventServiceProvider.php` file to mak
 
 There is a built in captcha (anti spam comment) system built in, which will be easy for you to replace with your own implementation.
 
-  Please see [this Captcha docs](https://hessam.binshops.com/laravel-blog-package#captcha) for  more details.
+  Please see [this Captcha docs](https://binshops.binshops.com/laravel-blog-package#captcha) for  more details.
 
 ## Image upload errors
 
@@ -161,7 +160,7 @@ Try adding this to config/app.php:
 - 3.0.2                 - fixed default medium image size (changed to 600x400)
 - 3.0.1                 - replaced all short tags (<?) with full opening ones (<?php)
 - 3.0                   - Added separate functionality for uploading images (and save some meta data in db)
-- 2.1                   - added 'short_description' to db + form, and HessamCMSPost::generate_introduction() method will try and use this to generate intro text.
+- 2.1                   - added 'short_description' to db + form, and BinshopsBlogPost::generate_introduction() method will try and use this to generate intro text.
 - 2.0                   - added full text search (enable it via the config file - it is disabled by default).
 - 1.2                   - added WYSIWYG, few smaller changes
 - 1.1.1                 - added basic captcha
@@ -170,7 +169,7 @@ Try adding this to config/app.php:
 - 0.3                   - Small changes, packagist settings.
 - 0.1                   - Initial release
 
-Contact: sam@binshops.com
+Contact: contact@binshops.com
 
 
 
diff --git a/composer.json b/composer.json
index 7b4f199..aec4477 100755
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "hessam/laravel-blogger",
+    "name": "binshops/laravel-blog",
     "keywords": [
         "laravel",
         "blog",
@@ -12,19 +12,20 @@
         "posts",
         "news",
         "update",
-        "hessam-blog"
+        "laravel blog",
+        "binshops"
     ],
     "description": "Simple blog package (with admin panel) for Laravel (6.x and 7.x). Includes all views, controllers, routes and can add a blog to any existing Laravel app. Fully customisable blog (view, urls, and many other options). Includes image uploads and a pretty admin interface to manage your blog. Defaults to /blog but you can change it to anything.",
     "license": "MIT",
     "support": {
-        "docs": "https://hessam.binshops.com/laravel-blog-package/"
+        "docs": "https://github.com/binshops/laravel-blog"
     },
     "authors": [
         {
-            "name": "Hessam",
-            "homepage": "http://hessam.binshops.com/laravel-blog-package",
+            "name": "Binshops",
+            "homepage": "https://github.com/binshops/laravel-blog",
             "role": "owner",
-            "email": "hessam.modaberi@gmail.com"
+            "email": "contact@binshops.com"
         }
     ],
     "require": {
@@ -40,19 +41,19 @@
     },
     "autoload": {
         "psr-4": {
-            "HessamCMS\\": "src",
-            "HessamCMS\\Laravel\\Fulltext\\": "src/FulltextSearch/src/" 
+            "BinshopsBlog\\": "src",
+            "BinshopsBlog\\Laravel\\Fulltext\\": "src/FulltextSearch/src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "HessamCMS\\Tests\\": "tests"
+            "BinshopsBlog\\Tests\\": "tests"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "HessamCMS\\HessamCMSServiceProvider"
+                "BinshopsBlog\\BinshopsBlogServiceProvider"
             ],
             "aliases": {
             }
diff --git a/migrations/2020_10_16_004241_create_hessam_languages_table.php b/migrations/2020_10_16_004241_create_binshops_languages_table.php
similarity index 80%
rename from migrations/2020_10_16_004241_create_hessam_languages_table.php
rename to migrations/2020_10_16_004241_create_binshops_languages_table.php
index 61bafdc..cbf41a9 100644
--- a/migrations/2020_10_16_004241_create_hessam_languages_table.php
+++ b/migrations/2020_10_16_004241_create_binshops_languages_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamLanguagesTable extends Migration
+class CreateBinshopsLanguagesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamLanguagesTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_languages', function (Blueprint $table) {
+        Schema::create('binshops_languages', function (Blueprint $table) {
             $table->increments('id');
 
             $table->string("name")->unique();
@@ -34,6 +34,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_languages');
+        Schema::dropIfExists('binshops_languages');
     }
 }
diff --git a/migrations/2020_10_16_005400_create_hessam_categories_table.php b/migrations/2020_10_16_005400_create_binshops_categories_table.php
similarity index 81%
rename from migrations/2020_10_16_005400_create_hessam_categories_table.php
rename to migrations/2020_10_16_005400_create_binshops_categories_table.php
index 3bb5d73..1e1c566 100644
--- a/migrations/2020_10_16_005400_create_hessam_categories_table.php
+++ b/migrations/2020_10_16_005400_create_binshops_categories_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamCategoriesTable extends Migration
+class CreateBinshopsCategoriesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamCategoriesTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_categories', function (Blueprint $table) {
+        Schema::create('binshops_categories', function (Blueprint $table) {
             $table->increments('id');
 
             $table->unsignedInteger("created_by")->nullable()->index()->comment("user id");
@@ -36,6 +36,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_categories');
+        Schema::dropIfExists('binshops_categories');
     }
 }
diff --git a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php b/migrations/2020_10_16_005425_create_binshops_category_translations_table.php
similarity index 71%
rename from migrations/2020_10_16_005425_create_hessam_category_translations_table.php
rename to migrations/2020_10_16_005425_create_binshops_category_translations_table.php
index c92ba81..713197b 100644
--- a/migrations/2020_10_16_005425_create_hessam_category_translations_table.php
+++ b/migrations/2020_10_16_005425_create_binshops_category_translations_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamCategoryTranslationsTable extends Migration
+class CreateBinshopsCategoryTranslationsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamCategoryTranslationsTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_category_translations', function (Blueprint $table) {
+        Schema::create('binshops_category_translations', function (Blueprint $table) {
             $table->increments('id');
 
             $table->unsignedInteger('category_id')->nullable();
@@ -23,7 +23,7 @@ public function up()
             $table->mediumText("category_description")->nullable();
 
             $table->unsignedInteger("lang_id")->index();
-            $table->foreign('lang_id')->references('id')->on('hessam_languages');
+            $table->foreign('lang_id')->references('id')->on('binshops_languages');
 
             $table->timestamps();
         });
@@ -36,6 +36,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_category_translations');
+        Schema::dropIfExists('binshops_category_translations');
     }
 }
diff --git a/migrations/2020_10_16_010039_create_hessam_posts_table.php b/migrations/2020_10_16_010039_create_binshops_posts_table.php
similarity index 70%
rename from migrations/2020_10_16_010039_create_hessam_posts_table.php
rename to migrations/2020_10_16_010039_create_binshops_posts_table.php
index 1766bb4..398b44e 100644
--- a/migrations/2020_10_16_010039_create_hessam_posts_table.php
+++ b/migrations/2020_10_16_010039_create_binshops_posts_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamPostsTable extends Migration
+class CreateBinshopsPostsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamPostsTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_posts', function (Blueprint $table) {
+        Schema::create('binshops_posts', function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger("user_id")->index()->nullable();
 
@@ -23,14 +23,14 @@ public function up()
             $table->timestamps();
         });
 
-        Schema::create('hessam_post_categories', function (Blueprint $table) {
+        Schema::create('binshops_post_categories', function (Blueprint $table) {
             $table->increments('id');
 
             $table->unsignedInteger("post_id")->index();
-            $table->foreign('post_id')->references('id')->on('hessam_posts')->onDelete("cascade");
+            $table->foreign('post_id')->references('id')->on('binshops_posts')->onDelete("cascade");
 
             $table->unsignedInteger("category_id")->index();
-            $table->foreign('category_id')->references('id')->on('hessam_categories')->onDelete("cascade");
+            $table->foreign('category_id')->references('id')->on('binshops_categories')->onDelete("cascade");
         });
     }
 
@@ -41,6 +41,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_posts');
+        Schema::dropIfExists('binshops_posts');
     }
 }
diff --git a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php b/migrations/2020_10_16_010049_create_binshops_post_translations_table.php
similarity index 81%
rename from migrations/2020_10_16_010049_create_hessam_post_translations_table.php
rename to migrations/2020_10_16_010049_create_binshops_post_translations_table.php
index c077865..3c52d9f 100644
--- a/migrations/2020_10_16_010049_create_hessam_post_translations_table.php
+++ b/migrations/2020_10_16_010049_create_binshops_post_translations_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamPostTranslationsTable extends Migration
+class CreateBinshopsPostTranslationsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamPostTranslationsTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_post_translations', function (Blueprint $table) {
+        Schema::create('binshops_post_translations', function (Blueprint $table) {
             $table->increments('id');
 
             $table->unsignedInteger('post_id')->nullable();
@@ -33,7 +33,7 @@ public function up()
             $table->string('image_thumbnail')->nullable();
 
             $table->unsignedInteger("lang_id")->index();
-            $table->foreign('lang_id')->references('id')->on('hessam_languages');
+            $table->foreign('lang_id')->references('id')->on('binshops_languages');
 
             $table->timestamps();
         });
@@ -46,6 +46,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_post_translations');
+        Schema::dropIfExists('binshops_post_translations');
     }
 }
diff --git a/migrations/2020_10_16_121230_create_hessam_comments_table.php b/migrations/2020_10_16_121230_create_binshops_comments_table.php
similarity index 85%
rename from migrations/2020_10_16_121230_create_hessam_comments_table.php
rename to migrations/2020_10_16_121230_create_binshops_comments_table.php
index d553ab1..91091d8 100644
--- a/migrations/2020_10_16_121230_create_hessam_comments_table.php
+++ b/migrations/2020_10_16_121230_create_binshops_comments_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamCommentsTable extends Migration
+class CreateBinshopsCommentsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamCommentsTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_comments', function (Blueprint $table) {
+        Schema::create('binshops_comments', function (Blueprint $table) {
             $table->increments('id');
 
             $table->unsignedInteger("post_id")->index();
@@ -40,6 +40,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_comments');
+        Schema::dropIfExists('binshops_comments');
     }
 }
diff --git a/migrations/2020_10_16_121728_create_hessam_uploaded_photos_table.php b/migrations/2020_10_16_121728_create_binshops_uploaded_photos_table.php
similarity index 77%
rename from migrations/2020_10_16_121728_create_hessam_uploaded_photos_table.php
rename to migrations/2020_10_16_121728_create_binshops_uploaded_photos_table.php
index 66a1d5c..9485997 100644
--- a/migrations/2020_10_16_121728_create_hessam_uploaded_photos_table.php
+++ b/migrations/2020_10_16_121728_create_binshops_uploaded_photos_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamUploadedPhotosTable extends Migration
+class CreateBinshopsUploadedPhotosTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamUploadedPhotosTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_uploaded_photos', function (Blueprint $table) {
+        Schema::create('binshops_uploaded_photos', function (Blueprint $table) {
             $table->increments('id');
             $table->text("uploaded_images")->nullable();
             $table->string("image_title")->nullable();
@@ -30,6 +30,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_uploaded_photos');
+        Schema::dropIfExists('binshops_uploaded_photos');
     }
 }
diff --git a/migrations/2020_10_22_132005_create_hessam_configurations_table.php b/migrations/2020_10_22_132005_create_binshops_configurations_table.php
similarity index 71%
rename from migrations/2020_10_22_132005_create_hessam_configurations_table.php
rename to migrations/2020_10_22_132005_create_binshops_configurations_table.php
index 72ffee1..b62c443 100644
--- a/migrations/2020_10_22_132005_create_hessam_configurations_table.php
+++ b/migrations/2020_10_22_132005_create_binshops_configurations_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateHessamConfigurationsTable extends Migration
+class CreateBinshopsConfigurationsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateHessamConfigurationsTable extends Migration
      */
     public function up()
     {
-        Schema::create('hessam_configurations', function (Blueprint $table) {
+        Schema::create('binshops_configurations', function (Blueprint $table) {
             $table->string("key")->primary();
             $table->string("value");
             $table->timestamps();
@@ -27,6 +27,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('hessam_configurations');
+        Schema::dropIfExists('binshops_configurations');
     }
 }
diff --git a/src/Baum/Extensions/Eloquent/Collection.php b/src/Baum/Extensions/Eloquent/Collection.php
index ae4376c..5fb8a4a 100644
--- a/src/Baum/Extensions/Eloquent/Collection.php
+++ b/src/Baum/Extensions/Eloquent/Collection.php
@@ -1,5 +1,5 @@
 <?php
-namespace HessamCMS\Baum\Extensions\Eloquent;
+namespace BinshopsBlog\Baum\Extensions\Eloquent;
 
 use Illuminate\Database\Eloquent\Collection as BaseCollection;
 
@@ -8,7 +8,7 @@ class Collection extends BaseCollection {
   public function toHierarchy() {
     $dict = $this->getDictionary();
 
-    // Enforce sorting by $orderColumn setting in HessamCMS\Baum\Node instance
+    // Enforce sorting by $orderColumn setting in BinshopsBlog\Baum\Node instance
     uasort($dict, function($a, $b){
         return ($a->getOrder() >= $b->getOrder()) ? 1 : -1;
     });
diff --git a/src/Baum/Extensions/Eloquent/Model.php b/src/Baum/Extensions/Eloquent/Model.php
index b5ad1b1..2a2cb2b 100644
--- a/src/Baum/Extensions/Eloquent/Model.php
+++ b/src/Baum/Extensions/Eloquent/Model.php
@@ -1,10 +1,10 @@
 <?php
-namespace HessamCMS\Baum\Extensions\Eloquent;
+namespace BinshopsBlog\Baum\Extensions\Eloquent;
 
 use Illuminate\Database\Eloquent\Model as BaseModel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
-use HessamCMS\Baum\Extensions\Query\Builder as QueryBuilder;
+use BinshopsBlog\Baum\Extensions\Query\Builder as QueryBuilder;
 
 abstract class Model extends BaseModel {
 
diff --git a/src/Baum/Extensions/Query/Builder.php b/src/Baum/Extensions/Query/Builder.php
index 3541793..ac74915 100644
--- a/src/Baum/Extensions/Query/Builder.php
+++ b/src/Baum/Extensions/Query/Builder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Baum\Extensions\Query;
+namespace BinshopsBlog\Baum\Extensions\Query;
 
 use Illuminate\Database\Query\Builder as BaseBuilder;
 
diff --git a/src/Baum/Move.php b/src/Baum/Move.php
index 8645ac2..1cd3b5f 100644
--- a/src/Baum/Move.php
+++ b/src/Baum/Move.php
@@ -1,5 +1,5 @@
 <?php
-namespace HessamCMS\Baum;
+namespace BinshopsBlog\Baum;
 
 use \Illuminate\Events\Dispatcher;
 
@@ -11,14 +11,14 @@ class Move {
   /**
   * Node on which the move operation will be performed
   *
-  * @var \HessamCMS\Baum\Node
+  * @var \BinshopsBlog\Baum\Node
   */
   protected $node = NULL;
 
   /**
   * Destination node
   *
-  * @var \HessamCMS\Baum\Node | int
+  * @var \BinshopsBlog\Baum\Node | int
   */
   protected $target = NULL;
 
@@ -60,8 +60,8 @@ class Move {
   /**
    * Create a new Move class instance.
    *
-   * @param   \HessamCMS\Baum\Node      $node
-   * @param   \HessamCMS\Baum\Node|int  $target
+   * @param   \BinshopsBlog\Baum\Node      $node
+   * @param   \BinshopsBlog\Baum\Node|int  $target
    * @param   string          $position
    * @return  void
    */
@@ -76,10 +76,10 @@ public function __construct($node, $target, $position) {
   /**
    * Easy static accessor for performing a move operation.
    *
-   * @param   \HessamCMS\Baum\Node      $node
-   * @param   \HessamCMS\Baum\Node|int  $target
+   * @param   \BinshopsBlog\Baum\Node      $node
+   * @param   \BinshopsBlog\Baum\Node|int  $target
    * @param   string          $position
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public static function to($node, $target, $position) {
     $instance = new static($node, $target, $position);
@@ -90,7 +90,7 @@ public static function to($node, $target, $position) {
   /**
    * Perform the move operation.
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function perform() {
     $this->guardAgainstImpossibleMove();
@@ -176,14 +176,14 @@ public function updateStructure() {
 
   /**
    * Resolves suplied node. Basically returns the node unchanged if
-   * supplied parameter is an instance of \HessamCMS\Baum\Node. Otherwise it will try
+   * supplied parameter is an instance of \BinshopsBlog\Baum\Node. Otherwise it will try
    * to find the node in the database.
    *
-   * @param   \HessamCMS\Baum\node|int
-   * @return  \HessamCMS\Baum\Node
+   * @param   \BinshopsBlog\Baum\node|int
+   * @return  \BinshopsBlog\Baum\Node
    */
   protected function resolveNode($node) {
-    if ( $node instanceof \HessamCMS\Baum\Node ) return $node->reload();
+    if ( $node instanceof \BinshopsBlog\Baum\Node ) return $node->reload();
 
     return $this->node->newNestedSetQuery()->find($node);
   }
diff --git a/src/Baum/MoveNotPossibleException.php b/src/Baum/MoveNotPossibleException.php
index fbd7a3c..8056c90 100644
--- a/src/Baum/MoveNotPossibleException.php
+++ b/src/Baum/MoveNotPossibleException.php
@@ -1,4 +1,4 @@
 <?php
-namespace HessamCMS\Baum;
+namespace BinshopsBlog\Baum;
 
 class MoveNotPossibleException extends \RuntimeException {}
diff --git a/src/Baum/Node.php b/src/Baum/Node.php
index e49a2d3..07758f6 100644
--- a/src/Baum/Node.php
+++ b/src/Baum/Node.php
@@ -1,8 +1,8 @@
 <?php
-namespace HessamCMS\Baum;
+namespace BinshopsBlog\Baum;
 
-use HessamCMS\Baum\Extensions\Eloquent\Collection;
-use HessamCMS\Baum\Extensions\Eloquent\Model;
+use BinshopsBlog\Baum\Extensions\Eloquent\Collection;
+use BinshopsBlog\Baum\Extensions\Eloquent\Model;
 
 /**
  * Node
@@ -347,7 +347,7 @@ public function newNestedSetQuery($excludeDeleted = true) {
    * Overload new Collection
    *
    * @param array $models
-   * @return \HessamCMS\Baum\Extensions\Eloquent\Collection
+   * @return \BinshopsBlog\Baum\Extensions\Eloquent\Collection
    */
   public function newCollection(array $models = array()) {
     return new Collection($models);
@@ -887,7 +887,7 @@ public function getRightSibling() {
   /**
    * Find the left sibling and move to left of it.
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function moveLeft() {
     return $this->moveToLeftOf($this->getLeftSibling());
@@ -896,7 +896,7 @@ public function moveLeft() {
   /**
    * Find the right sibling and move to the right of it.
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function moveRight() {
     return $this->moveToRightOf($this->getRightSibling());
@@ -905,7 +905,7 @@ public function moveRight() {
   /**
    * Move to the node to the left of ...
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function moveToLeftOf($node) {
     return $this->moveTo($node, 'left');
@@ -914,7 +914,7 @@ public function moveToLeftOf($node) {
   /**
    * Move to the node to the right of ...
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function moveToRightOf($node) {
     return $this->moveTo($node, 'right');
@@ -923,7 +923,7 @@ public function moveToRightOf($node) {
   /**
    * Alias for moveToRightOf
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function makeNextSiblingOf($node) {
     return $this->moveToRightOf($node);
@@ -932,7 +932,7 @@ public function makeNextSiblingOf($node) {
   /**
    * Alias for moveToRightOf
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function makeSiblingOf($node) {
     return $this->moveToRightOf($node);
@@ -941,7 +941,7 @@ public function makeSiblingOf($node) {
   /**
    * Alias for moveToLeftOf
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function makePreviousSiblingOf($node) {
     return $this->moveToLeftOf($node);
@@ -950,7 +950,7 @@ public function makePreviousSiblingOf($node) {
   /**
    * Make the node a child of ...
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function makeChildOf($node) {
     return $this->moveTo($node, 'child');
@@ -959,7 +959,7 @@ public function makeChildOf($node) {
   /**
    * Make the node the first child of ...
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function makeFirstChildOf($node) {
     if ( $node->children()->count() == 0 )
@@ -971,7 +971,7 @@ public function makeFirstChildOf($node) {
   /**
    * Make the node the last child of ...
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function makeLastChildOf($node) {
     return $this->makeChildOf($node);
@@ -980,7 +980,7 @@ public function makeLastChildOf($node) {
   /**
    * Make current node a root node.
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function makeRoot() {
     return $this->moveTo($this, 'root');
@@ -989,7 +989,7 @@ public function makeRoot() {
   /**
    * Equals?
    *
-   * @param \HessamCMS\Baum\Node
+   * @param \BinshopsBlog\Baum\Node
    * @return boolean
    */
   public function equals($node) {
@@ -999,7 +999,7 @@ public function equals($node) {
   /**
    * Checkes if the given node is in the same scope as the current one.
    *
-   * @param \HessamCMS\Baum\Node
+   * @param \BinshopsBlog\Baum\Node
    * @return boolean
    */
   public function inSameScope($other) {
@@ -1014,7 +1014,7 @@ public function inSameScope($other) {
    * Checks wether the given node is a descendant of itself. Basically, whether
    * its in the subtree defined by the left and right indices.
    *
-   * @param \HessamCMS\Baum\Node
+   * @param \BinshopsBlog\Baum\Node
    * @return boolean
    */
   public function insideSubtree($node) {
@@ -1071,7 +1071,7 @@ public function moveToNewParent() {
   /**
    * Sets the depth attribute
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function setDepth() {
     $self = $this;
@@ -1091,7 +1091,7 @@ public function setDepth() {
   /**
    * Sets the depth attribute for the current node and all of its descendants.
    *
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   public function setDepthWithSubtree() {
     $self = $this;
@@ -1232,9 +1232,9 @@ public function makeTree($nodeList) {
    * Main move method. Here we handle all node movements with the corresponding
    * lft/rgt index updates.
    *
-   * @param HessamCMS\Baum\Node|int $target
+   * @param BinshopsBlog\Baum\Node|int $target
    * @param string        $position
-   * @return \HessamCMS\Baum\Node
+   * @return \BinshopsBlog\Baum\Node
    */
   protected function moveTo($target, $position) {
     return Move::to($this, $target, $position);
@@ -1259,7 +1259,7 @@ protected function computeLevel() {
   /**
    * Return an array with the last node we could reach and its nesting level
    *
-   * @param   HessamCMS\Baum\Node $node
+   * @param   BinshopsBlog\Baum\Node $node
    * @param   integer   $nesting
    * @return  array
    */
diff --git a/src/Baum/SetBuilder.php b/src/Baum/SetBuilder.php
index 2a5ba27..0374ddc 100644
--- a/src/Baum/SetBuilder.php
+++ b/src/Baum/SetBuilder.php
@@ -1,15 +1,15 @@
 <?php
-namespace HessamCMS\Baum;
+namespace BinshopsBlog\Baum;
 
-use HessamCMS\Baum\Helpers\DatabaseHelper as DB;
-use HessamCMS\Baum\Node;
+use BinshopsBlog\Baum\Helpers\DatabaseHelper as DB;
+use BinshopsBlog\Baum\Node;
 
 class SetBuilder {
 
   /**
   * Node instance for reference
   *
-  * @var \HessamCMS\Baum\Node
+  * @var \BinshopsBlog\Baum\Node
   */
   protected $node = NULL;
 
@@ -21,9 +21,9 @@ class SetBuilder {
   protected $bounds = array();
 
   /**
-   * Create a new \HessamCMS\Baum\SetBuilder class instance.
+   * Create a new \BinshopsBlog\Baum\SetBuilder class instance.
    *
-   * @param   \HessamCMS\Baum\Node      $node
+   * @param   \BinshopsBlog\Baum\Node      $node
    * @return  void
    */
   public function __construct($node) {
@@ -91,7 +91,7 @@ public function rebuildBounds($node, $depth = 0) {
   /**
    * Return all children for the specified node.
    *
-   * @param   HessamCMS\Baum\Node $node
+   * @param   BinshopsBlog\Baum\Node $node
    * @return  Illuminate\Database\Eloquent\Collection
    */
   public function children($node) {
@@ -114,7 +114,7 @@ public function children($node) {
   /**
    * Return an array of the scoped attributes of the supplied node.
    *
-   * @param   HessamCMS\Baum\Node $node
+   * @param   BinshopsBlog\Baum\Node $node
    * @return  array
    */
   protected function scopedAttributes($node) {
@@ -133,7 +133,7 @@ protected function scopedAttributes($node) {
    * Return a string-key for the current scoped attributes. Used for index
    * computing when a scope is defined (acsts as an scope identifier).
    *
-   * @param   HessamCMS\Baum\Node $node
+   * @param   BinshopsBlog\Baum\Node $node
    * @return  string
    */
   protected function scopedKey($node) {
diff --git a/src/Baum/SetMapper.php b/src/Baum/SetMapper.php
index 97d5818..9a68833 100644
--- a/src/Baum/SetMapper.php
+++ b/src/Baum/SetMapper.php
@@ -1,16 +1,16 @@
 <?php
-namespace HessamCMS\Baum;
+namespace BinshopsBlog\Baum;
 
 use \Closure;
 use Illuminate\Support\Contracts\ArrayableInterface;
-use HessamCMS\Baum\Node;
+use BinshopsBlog\Baum\Node;
 
 class SetMapper {
 
   /**
   * Node instance for reference
   *
-  * @var \HessamCMS\Baum\Node
+  * @var \BinshopsBlog\Baum\Node
   */
   protected $node = NULL;
 
@@ -22,9 +22,9 @@ class SetMapper {
   protected $childrenKeyName = 'children';
 
   /**
-   * Create a new \HessamCMS\Baum\SetBuilder class instance.
+   * Create a new \BinshopsBlog\Baum\SetBuilder class instance.
    *
-   * @param   \HessamCMS\Baum\Node      $node
+   * @param   \BinshopsBlog\Baum\Node      $node
    * @return  void
    */
   public function __construct($node, $childrenKeyName = 'children') {
diff --git a/src/Baum/SetValidator.php b/src/Baum/SetValidator.php
index af36f61..c6bd03d 100644
--- a/src/Baum/SetValidator.php
+++ b/src/Baum/SetValidator.php
@@ -1,5 +1,5 @@
 <?php
-namespace HessamCMS\Baum;
+namespace BinshopsBlog\Baum;
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 
@@ -8,14 +8,14 @@ class SetValidator {
   /**
   * Node instance for reference
   *
-  * @var \HessamCMS\Baum\Node
+  * @var \BinshopsBlog\Baum\Node
   */
   protected $node = NULL;
 
   /**
-   * Create a new \HessamCMS\Baum\SetValidator class instance.
+   * Create a new \BinshopsBlog\Baum\SetValidator class instance.
    *
-   * @param   \HessamCMS\Baum\Node      $node
+   * @param   \BinshopsBlog\Baum\Node      $node
    * @return  void
    */
   public function __construct($node) {
@@ -207,7 +207,7 @@ protected function groupRootsByScope($roots) {
    * Builds a single string for the given scope columns values. Useful for
    * making array keys for grouping.
    *
-   * @param HessamCMS\Baum\Node   $node
+   * @param BinshopsBlog\Baum\Node   $node
    * @return string
    */
   protected function keyForScope($node) {
diff --git a/src/BinshopsBlogServiceProvider.php b/src/BinshopsBlogServiceProvider.php
new file mode 100755
index 0000000..a1fa100
--- /dev/null
+++ b/src/BinshopsBlogServiceProvider.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace BinshopsBlog;
+
+use BinshopsBlog\Models\BinshopsPostTranslation;
+use Illuminate\Support\ServiceProvider;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Laravel\Fulltext\Commands\Index;
+use BinshopsBlog\Laravel\Fulltext\Commands\IndexOne;
+use BinshopsBlog\Laravel\Fulltext\Commands\UnindexOne;
+use BinshopsBlog\Laravel\Fulltext\ModelObserver;
+use BinshopsBlog\Laravel\Fulltext\Search;
+use BinshopsBlog\Laravel\Fulltext\SearchInterface;
+
+class BinshopsBlogServiceProvider extends ServiceProvider
+{
+
+    protected $commands = [
+        Index::class,
+        IndexOne::class,
+        UnindexOne::class,
+    ];
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+
+        if (config("binshopsblog.search.search_enabled") == false) {
+            // if search is disabled, don't allow it to sync.
+            ModelObserver::disableSyncingFor(BinshopsPostTranslation::class);
+        }
+
+        if (config("binshopsblog.include_default_routes", true)) {
+            include(__DIR__ . "/routes.php");
+        }
+
+        foreach ([
+                     '2020_10_16_005400_create_binshops_categories_table.php',
+                     '2020_10_16_005425_create_binshops_category_translations_table.php',
+                     '2020_10_16_010039_create_binshops_posts_table.php',
+                     '2020_10_16_010049_create_binshops_post_translations_table.php',
+                     '2020_10_16_121230_create_binshops_comments_table.php',
+                     '2020_10_16_121728_create_binshops_uploaded_photos_table.php',
+                     '2020_10_16_004241_create_binshops_languages_table.php',
+                     '2020_10_22_132005_create_binshops_configurations_table.php',
+                     '2016_11_04_152913_create_laravel_fulltext_table.php'
+                 ] as $file) {
+
+            $this->publishes([
+                __DIR__ . '/../migrations/' . $file => database_path('migrations/' . $file)
+            ]);
+
+        }
+
+        $this->publishes([
+            __DIR__ . '/Views/binshopsblog' => base_path('resources/views/vendor/binshopsblog'),
+            __DIR__ . '/Config/binshopsblog.php' => config_path('binshopsblog.php'),
+            __DIR__ . '/css/binshopsblog_admin_css.css' => public_path('binshopsblog_admin_css.css'),
+            __DIR__ . '/css/binshops-blog.css' => public_path('binshops-blog.css'),
+            __DIR__ . '/css/admin-setup.css' => public_path('admin-setup.css'),
+            __DIR__ . '/js/binshops-blog.js' => public_path('binshops-blog.js'),
+        ]);
+
+
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->bind(
+            SearchInterface::class,
+            Search::class
+        );
+
+        // for the admin backend views ( view("binshopsblog_admin::BLADEFILE") )
+        $this->loadViewsFrom(__DIR__ . "/Views/binshopsblog_admin", 'binshopsblog_admin');
+
+        // for public facing views (view("binshopsblog::BLADEFILE")):
+        // if you do the vendor:publish, these will be copied to /resources/views/vendor/binshopsblog anyway
+        $this->loadViewsFrom(__DIR__ . "/Views/binshopsblog", 'binshopsblog');
+    }
+
+}
diff --git a/src/Captcha/Basic.php b/src/Captcha/Basic.php
index 343eb24..f65694e 100644
--- a/src/Captcha/Basic.php
+++ b/src/Captcha/Basic.php
@@ -1,15 +1,15 @@
-<?php namespace HessamCMS\Captcha;
+<?php namespace BinshopsBlog\Captcha;
 
 /**
  * Class Basic
- * @package HessamCMS\Captcha
+ * @package BinshopsBlog\Captcha
  */
 class Basic extends CaptchaAbstract
 {
 
     public function __construct()
     {
-        if (!config("hessamcms.captcha.basic_question") || !config("hessamcms.captcha.basic_answers")) {
+        if (!config("binshopsblog.captcha.basic_question") || !config("binshopsblog.captcha.basic_answers")) {
             throw new \DomainException("Invalid question or answers for captcha");
         }
     }
@@ -31,7 +31,7 @@ public function captcha_field_name()
      */
     public function view()
     {
-        return 'hessamcms::captcha.basic';
+        return 'binshopsblog::captcha.basic';
     }
 
     /**
@@ -44,7 +44,7 @@ public function view()
     public function rules()
     {
         $check_func = function ($attribute, $value, $fail) {
-            $answers = config("hessamcms.captcha.basic_answers");
+            $answers = config("binshopsblog.captcha.basic_answers");
             // strtolower everything
             $value = strtolower(trim($value));
             $answers = strtolower($answers);
diff --git a/src/Captcha/CaptchaAbstract.php b/src/Captcha/CaptchaAbstract.php
index a8d440f..ec7b828 100644
--- a/src/Captcha/CaptchaAbstract.php
+++ b/src/Captcha/CaptchaAbstract.php
@@ -1,9 +1,9 @@
-<?php namespace HessamCMS\Captcha;
+<?php namespace BinshopsBlog\Captcha;
 
 use Illuminate\Http\Request;
-use HessamCMS\Interfaces\CaptchaInterface;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Models\HessamPostTranslation;
+use BinshopsBlog\Interfaces\CaptchaInterface;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Models\BinshopsPostTranslation;
 
 abstract class CaptchaAbstract implements CaptchaInterface
 {
@@ -13,11 +13,11 @@ abstract class CaptchaAbstract implements CaptchaInterface
      * executed when viewing single post
      *
      * @param Request $request
-     * @param HessamPostTranslation $hessamCMSPost
+     * @param BinshopsPostTranslation $binshopsBlogPost
      *
      * @return void
      */
-    public function runCaptchaBeforeShowingPosts(Request $request, HessamPostTranslation $hessamCMSPost)
+    public function runCaptchaBeforeShowingPosts(Request $request, BinshopsPostTranslation $binshopsBlogPost)
     {
         // no code here to run! Maybe in your subclass you can make use of this?
         /*
@@ -38,11 +38,11 @@ public function runCaptchaBeforeShowingPosts(Request $request, HessamPostTransla
      * executed when posting new comment
      *
      * @param Request $request
-     * @param HessamPost $hessamCMSPost
+     * @param BinshopsPost $binshopsBlogPost
      *
      * @return void
      */
-    public function runCaptchaBeforeAddingComment(Request $request, HessamPost $hessamCMSPost)
+    public function runCaptchaBeforeAddingComment(Request $request, BinshopsPost $binshopsBlogPost)
     {
         // no code here to run! Maybe in your subclass you can make use of this?
     }
diff --git a/src/Captcha/UsesCaptcha.php b/src/Captcha/UsesCaptcha.php
index bcf785f..3076ab2 100644
--- a/src/Captcha/UsesCaptcha.php
+++ b/src/Captcha/UsesCaptcha.php
@@ -1,11 +1,11 @@
-<?php namespace HessamCMS\Captcha;
+<?php namespace BinshopsBlog\Captcha;
 
 /**
  * Trait UsesCaptcha
  *
- * For instantiating the config("hessamcms.captcha.captcha_type") object.
+ * For instantiating the config("binshopsblog.captcha.captcha_type") object.
  *
- * @package HessamCMS\Captcha
+ * @package BinshopsBlog\Captcha
  */
 trait UsesCaptcha
 {
@@ -15,13 +15,13 @@ trait UsesCaptcha
      */
     private function getCaptchaObject()
     {
-        if (!config("hessamcms.captcha.captcha_enabled")) {
+        if (!config("binshopsblog.captcha.captcha_enabled")) {
             return null;
         }
 
         // else: captcha is enabled
         /** @var string $captcha_class */
-        $captcha_class = config("hessamcms.captcha.captcha_type");
+        $captcha_class = config("binshopsblog.captcha.captcha_type");
         return new $captcha_class;
     }
 
diff --git a/src/Config/hessamcms.php b/src/Config/binshopsblog.php
similarity index 93%
rename from src/Config/hessamcms.php
rename to src/Config/binshopsblog.php
index 2d356b1..37aeed2 100755
--- a/src/Config/hessamcms.php
+++ b/src/Config/binshopsblog.php
@@ -1,6 +1,6 @@
 <?php
 
-//config for hessam/laravel-blogger
+//config for binshops/laravel-blogger
 
 return [
     'default_language' => 'en',
@@ -12,7 +12,7 @@
     // reading progress bar is the bar which shows on top of your post when you are scrolling down the page. You can disable this feature if you want
     'reading_progress_bar' => true,
 
-    'include_default_routes' => true, // set to false to not include routes.php for HessamReaderController and admin related routes. Default: true. If you disable this, you will have to manually copy over the data from routes.php and add it to your web.php.
+    'include_default_routes' => true, // set to false to not include routes.php for BinshopsReaderController and admin related routes. Default: true. If you disable this, you will have to manually copy over the data from routes.php and add it to your web.php.
 
     'blog_prefix' => "blog", // used in routes.php. If you want to your http://yoursite.com/latest-news (or anything else), then enter that here. Default: blog
     'admin_prefix' => "blog_admin", // similar to above, but used for the admin panel for the blog. Default: blog_admin
@@ -27,7 +27,7 @@
 
 
     'memory_limit' => '2048M', // This is used when uploading images :
-    //                              @ini_set('memory_limit', config("hessamcms.memory_limit"));
+    //                              @ini_set('memory_limit', config("binshopsblog.memory_limit"));
     //                            See PHP.net for detailso
     //                            Set to false to not set any value.
 
@@ -90,7 +90,7 @@
         ],
 
         // you can add more fields here, but make sure that you create the relevant database columns too!
-        // They must be in the same format as the default ones - image_xxxxx (and this db column must exist on the hessam_posts table)
+        // They must be in the same format as the default ones - image_xxxxx (and this db column must exist on the binshops_posts table)
 
         /*
         'image_custom_example_size' => [ // << MAKE A DB COLUM WITH THIS NAME.
@@ -104,7 +104,7 @@
             ],
         */
         // Create the custom db table by doing
-        //  php artisan make:migration --table=hessam_posts AddCustomBlogImageSize
+        //  php artisan make:migration --table=binshops_posts AddCustomBlogImageSize
         //   then adding in the up() method:
         //       $table->string("image_custom_example_size")->nullable();
         //    and in the down() method:
@@ -116,7 +116,7 @@
 
     'captcha' => [
         'captcha_enabled' => true, // true = we should use a captcha, false = turn it off. If comments are disabled this makes no difference.
-        'captcha_type' => \HessamCMS\Captcha\Basic::class, // this should be a class that implements the \HessamCMS\Interfaces\CaptchaInterface interface
+        'captcha_type' => \BinshopsBlog\Captcha\Basic::class, // this should be a class that implements the \BinshopsBlog\Interfaces\CaptchaInterface interface
         'basic_question' => "What is the opposite of white?", // a simple captcha question to always ask (if captcha_type is set to 'basic'
         'basic_answers' => "black,dark", // comma separated list of possible answers. Don't worry about case.
     ],
@@ -142,7 +142,7 @@
         // options:
         //      'built_in' (default, uses own database for comments),
         //      'disqus' (uses https://disqus.com/, please enter further config options below),
-        //      'custom' (will load hessamcms::partials.custom_comments, which you can copy to your vendor view dir to customise
+        //      'custom' (will load binshopsblog::partials.custom_comments, which you can copy to your vendor view dir to customise
         //      'disabled' (turn comments off)
         'type_of_comments_to_show' => 'built_in', // default: built_in
 
diff --git a/src/Controllers/HessamAdminController.php b/src/Controllers/BinshopsAdminController.php
similarity index 70%
rename from src/Controllers/HessamAdminController.php
rename to src/Controllers/BinshopsAdminController.php
index b3e3bca..fa2c5b9 100755
--- a/src/Controllers/HessamAdminController.php
+++ b/src/Controllers/BinshopsAdminController.php
@@ -1,39 +1,39 @@
 <?php
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use HessamCMS\Interfaces\BaseRequestInterface;
-use HessamCMS\Events\BlogPostAdded;
-use HessamCMS\Events\BlogPostEdited;
-use HessamCMS\Events\BlogPostWillBeDeleted;
-use HessamCMS\Helpers;
-use HessamCMS\Middleware\LoadLanguage;
-use HessamCMS\Middleware\PackageSetup;
-use HessamCMS\Middleware\UserCanManageBlogPosts;
-use HessamCMS\Models\HessamCategoryTranslation;
-use HessamCMS\Models\HessamLanguage;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Models\HessamPostTranslation;
-use HessamCMS\Models\HessamUploadedPhoto;
-use HessamCMS\Requests\CreateHessamCMSPostRequest;
-use HessamCMS\Requests\CreateHessamPostToggleRequest;
-use HessamCMS\Requests\DeleteHessamCMSPostRequest;
-use HessamCMS\Requests\UpdateHessamCMSPostRequest;
-use HessamCMS\Traits\UploadFileTrait;
+use BinshopsBlog\Interfaces\BaseRequestInterface;
+use BinshopsBlog\Events\BlogPostAdded;
+use BinshopsBlog\Events\BlogPostEdited;
+use BinshopsBlog\Events\BlogPostWillBeDeleted;
+use BinshopsBlog\Helpers;
+use BinshopsBlog\Middleware\LoadLanguage;
+use BinshopsBlog\Middleware\PackageSetup;
+use BinshopsBlog\Middleware\UserCanManageBlogPosts;
+use BinshopsBlog\Models\BinshopsCategoryTranslation;
+use BinshopsBlog\Models\BinshopsLanguage;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Models\BinshopsPostTranslation;
+use BinshopsBlog\Models\BinshopsUploadedPhoto;
+use BinshopsBlog\Requests\CreateBinshopsBlogPostRequest;
+use BinshopsBlog\Requests\CreateBinshopsPostToggleRequest;
+use BinshopsBlog\Requests\DeleteBinshopsBlogPostRequest;
+use BinshopsBlog\Requests\UpdateBinshopsBlogPostRequest;
+use BinshopsBlog\Traits\UploadFileTrait;
 
 /**
- * Class HessamAdminController
- * @package HessamCMS\Controllers
+ * Class BinshopsAdminController
+ * @package BinshopsBlog\Controllers
  */
-class HessamAdminController extends Controller
+class BinshopsAdminController extends Controller
 {
     use UploadFileTrait;
 
     /**
-     * HessamAdminController constructor.
+     * BinshopsAdminController constructor.
      */
     public function __construct()
     {
@@ -41,8 +41,8 @@ public function __construct()
         $this->middleware(LoadLanguage::class);
         $this->middleware(PackageSetup::class);
 
-        if (!is_array(config("hessamcms"))) {
-            throw new \RuntimeException('The config/hessamcms.php does not exist. Publish the vendor files for the HessamCMS package by running the php artisan publish:vendor command');
+        if (!is_array(config("binshopsblog"))) {
+            throw new \RuntimeException('The config/binshopsblog.php does not exist. Publish the vendor files for the BinshopsBlog package by running the php artisan publish:vendor command');
         }
     }
 
@@ -55,10 +55,10 @@ public function __construct()
     public function index(Request $request)
     {
         $language_id = $request->get('language_id');
-        $posts = HessamPostTranslation::orderBy("post_id", "desc")->where('lang_id', $language_id)
+        $posts = BinshopsPostTranslation::orderBy("post_id", "desc")->where('lang_id', $language_id)
             ->paginate(10);
 
-        return view("hessamcms_admin::index", [
+        return view("binshopsblog_admin::index", [
             'post_translations'=>$posts,
             'language_id' => $language_id
         ]);
@@ -71,18 +71,18 @@ public function index(Request $request)
     public function create_post(Request $request)
     {
         $language_id = $request->get('language_id');
-        $language_list = HessamLanguage::where('active',true)->get();
-        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+        $language_list = BinshopsLanguage::where('active',true)->get();
+        $ts = BinshopsCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
-        $new_post = new HessamPost();
+        $new_post = new BinshopsPost();
         $new_post->is_published = true;
 
-        return view("hessamcms_admin::posts.add_post", [
+        return view("binshopsblog_admin::posts.add_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $language_id,
             'post' => $new_post,
-            'post_translation' => new \HessamCMS\Models\HessamPostTranslation(),
+            'post_translation' => new \BinshopsBlog\Models\BinshopsPostTranslation(),
             'post_id' => -1
         ]);
     }
@@ -90,14 +90,14 @@ public function create_post(Request $request)
     /**
      * Save a new post - this method is called whenever add post button is clicked
      *
-     * @param CreateHessamCMSPostRequest $request
+     * @param CreateBinshopsBlogPostRequest $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws \Exception
      */
-    public function store_post(CreateHessamCMSPostRequest $request)
+    public function store_post(CreateBinshopsBlogPostRequest $request)
     {
         $new_blog_post = null;
-        $translation = HessamPostTranslation::where(
+        $translation = BinshopsPostTranslation::where(
             [
                 ['post_id','=',$request['post_id']],
                 ['lang_id', '=', $request['lang_id']]
@@ -105,18 +105,18 @@ public function store_post(CreateHessamCMSPostRequest $request)
         )->first();
 
         if (!$translation){
-            $translation = new HessamPostTranslation();
+            $translation = new BinshopsPostTranslation();
         }
 
         if ($request['post_id'] == -1 || $request['post_id'] == null){
             //cretes new post
-            $new_blog_post = new HessamPost();
-            $translation = new HessamPostTranslation();
+            $new_blog_post = new BinshopsPost();
+            $translation = new BinshopsPostTranslation();
 
             $new_blog_post->posted_at = Carbon::now();
         }else{
             //edits post
-            $new_blog_post = HessamPost::findOrFail($request['post_id']);
+            $new_blog_post = BinshopsPost::findOrFail($request['post_id']);
         }
 
         $post_exists = $this->check_if_same_post_exists($request['slug'] , $request['lang_id'], $request['post_id']);
@@ -147,15 +147,15 @@ public function store_post(CreateHessamCMSPostRequest $request)
             event(new BlogPostAdded($new_blog_post));
         }
 
-        return redirect( route('hessamcms.admin.index') );
+        return redirect( route('binshopsblog.admin.index') );
     }
 
     /**
      *  This method is called whenever a language is selected
      */
-    public function store_post_toggle(CreateHessamPostToggleRequest $request){
+    public function store_post_toggle(CreateBinshopsPostToggleRequest $request){
         $new_blog_post = null;
-        $translation = HessamPostTranslation::where(
+        $translation = BinshopsPostTranslation::where(
             [
                 ['post_id','=',$request['post_id']],
                 ['lang_id', '=', $request['lang_id']]
@@ -163,17 +163,17 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
         )->first();
 
         if (!$translation){
-            $translation = new HessamPostTranslation();
+            $translation = new BinshopsPostTranslation();
         }
 
         if ($request['post_id'] == -1 || $request['post_id'] == null){
             //cretes new post
-            $new_blog_post = new HessamPost();
+            $new_blog_post = new BinshopsPost();
             $new_blog_post->is_published = true;
             $new_blog_post->posted_at = Carbon::now();
         }else{
             //edits post
-            $new_blog_post = HessamPost::findOrFail($request['post_id']);
+            $new_blog_post = BinshopsPost::findOrFail($request['post_id']);
         }
 
         if ($request['slug']){
@@ -209,20 +209,20 @@ public function store_post_toggle(CreateHessamPostToggleRequest $request){
         //todo: generate event
 
         $language_id = $request->get('language_id');
-        $language_list = HessamLanguage::where('active',true)->get();
-        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+        $language_list = BinshopsLanguage::where('active',true)->get();
+        $ts = BinshopsCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
-        $translation = HessamPostTranslation::where(
+        $translation = BinshopsPostTranslation::where(
             [
                 ['post_id','=',$request['post_id']],
                 ['lang_id', '=', $request['selected_lang']]
             ]
         )->first();
         if (!$translation){
-            $translation = new HessamPostTranslation();
+            $translation = new BinshopsPostTranslation();
         }
 
-        return view("hessamcms_admin::posts.add_post", [
+        return view("binshopsblog_admin::posts.add_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $request['selected_lang'],
@@ -242,22 +242,22 @@ public function edit_post( $blogPostId , Request $request)
     {
         $language_id = $request->get('language_id');
 
-        $post_translation = HessamPostTranslation::where(
+        $post_translation = BinshopsPostTranslation::where(
             [
                 ['lang_id', '=', $language_id],
                 ['post_id', '=', $blogPostId]
             ]
         )->first();
 
-        $post = HessamPost::findOrFail($blogPostId);
-        $language_list = HessamLanguage::where('active',true)->get();
-        $ts = HessamCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
+        $post = BinshopsPost::findOrFail($blogPostId);
+        $language_list = BinshopsLanguage::where('active',true)->get();
+        $ts = BinshopsCategoryTranslation::where("lang_id",$language_id)->limit(1000)->get();
 
-        return view("hessamcms_admin::posts.edit_post", [
+        return view("binshopsblog_admin::posts.edit_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $language_id,
-            'selected_locale' => HessamLanguage::where('id', $language_id)->first()->locale,
+            'selected_locale' => BinshopsLanguage::where('id', $language_id)->first()->locale,
             'post' => $post,
             'post_translation' => $post_translation
         ]);
@@ -271,25 +271,25 @@ public function edit_post( $blogPostId , Request $request)
      */
     public function edit_post_toggle( $blogPostId , Request $request)
     {
-        $post_translation = HessamPostTranslation::where(
+        $post_translation = BinshopsPostTranslation::where(
             [
                 ['lang_id', '=', $request['selected_lang']],
                 ['post_id', '=', $blogPostId]
             ]
         )->first();
         if (!$post_translation){
-            $post_translation = new HessamPostTranslation();
+            $post_translation = new BinshopsPostTranslation();
         }
 
-        $post = HessamPost::findOrFail($blogPostId);
-        $language_list = HessamLanguage::where('active',true)->get();
-        $ts = HessamCategoryTranslation::where("lang_id", $request['selected_lang'])->limit(1000)->get();
+        $post = BinshopsPost::findOrFail($blogPostId);
+        $language_list = BinshopsLanguage::where('active',true)->get();
+        $ts = BinshopsCategoryTranslation::where("lang_id", $request['selected_lang'])->limit(1000)->get();
 
-        return view("hessamcms_admin::posts.edit_post", [
+        return view("binshopsblog_admin::posts.edit_post", [
             'cat_ts' => $ts,
             'language_list' => $language_list,
             'selected_lang' => $request['selected_lang'],
-            'selected_locale' => HessamLanguage::where('id', $request['selected_lang'])->first()->locale,
+            'selected_locale' => BinshopsLanguage::where('id', $request['selected_lang'])->first()->locale,
             'post' => $post,
             'post_translation' => $post_translation
         ]);
@@ -298,15 +298,15 @@ public function edit_post_toggle( $blogPostId , Request $request)
     /**
      * Save changes to a post
      *
-     * @param UpdateHessamCMSPostRequest $request
+     * @param UpdateBinshopsBlogPostRequest $request
      * @param $blogPostId
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws \Exception
      */
-    public function update_post(UpdateHessamCMSPostRequest $request, $blogPostId)
+    public function update_post(UpdateBinshopsBlogPostRequest $request, $blogPostId)
     {
-        $new_blog_post = HessamPost::findOrFail($blogPostId);
-        $translation = HessamPostTranslation::where(
+        $new_blog_post = BinshopsPost::findOrFail($blogPostId);
+        $translation = BinshopsPostTranslation::where(
             [
                 ['post_id','=', $new_blog_post->id],
                 ['lang_id', '=', $request['lang_id']]
@@ -314,7 +314,7 @@ public function update_post(UpdateHessamCMSPostRequest $request, $blogPostId)
         )->first();
 
         if (!$translation){
-            $translation = new HessamPostTranslation();
+            $translation = new BinshopsPostTranslation();
             $new_blog_post->posted_at = Carbon::now();
         }
 
@@ -346,17 +346,17 @@ public function update_post(UpdateHessamCMSPostRequest $request, $blogPostId)
             event(new BlogPostAdded($new_blog_post));
         }
 
-        return redirect( route('hessamcms.admin.index') );
+        return redirect( route('binshopsblog.admin.index') );
     }
 
     public function remove_photo($postSlug, $lang_id)
     {
-        $post = HessamPostTranslation::where([
+        $post = BinshopsPostTranslation::where([
             ["slug", '=', $postSlug],
             ['lang_id', '=', $lang_id]
         ])->firstOrFail();
 
-        $path = public_path('/' . config("hessamcms.blog_upload_dir"));
+        $path = public_path('/' . config("binshopsblog.blog_upload_dir"));
         if (!$this->checked_blog_image_dir_is_writable) {
             if (!is_writable($path)) {
                 throw new \RuntimeException("Image destination path is not writable ($path)");
@@ -390,13 +390,13 @@ public function remove_photo($postSlug, $lang_id)
     /**
      * Delete a post
      *
-     * @param DeleteHessamCMSPostRequest $request
+     * @param DeleteBinshopsBlogPostRequest $request
      * @param $blogPostId
      * @return mixed
      */
-    public function destroy_post(DeleteHessamCMSPostRequest $request, $blogPostId)
+    public function destroy_post(DeleteBinshopsBlogPostRequest $request, $blogPostId)
     {
-        $post = HessamPost::findOrFail($blogPostId);
+        $post = BinshopsPost::findOrFail($blogPostId);
         //archive deleted post
 
         $post->delete();
@@ -407,7 +407,7 @@ public function destroy_post(DeleteHessamCMSPostRequest $request, $blogPostId)
 
         Helpers::flash_message("Post successfully deleted!");
 
-        return redirect( route('hessamcms.admin.index') );
+        return redirect( route('binshopsblog.admin.index') );
     }
 
     /**
@@ -418,9 +418,9 @@ public function destroy_post(DeleteHessamCMSPostRequest $request, $blogPostId)
      * @throws \Exception
      * @todo - next full release, tidy this up!
      */
-    protected function processUploadedImages(BaseRequestInterface $request, HessamPostTranslation $new_blog_post)
+    protected function processUploadedImages(BaseRequestInterface $request, BinshopsPostTranslation $new_blog_post)
     {
-        if (!config("hessamcms.image_upload_enabled")) {
+        if (!config("binshopsblog.image_upload_enabled")) {
             // image upload was disabled
             return;
         }
@@ -431,7 +431,7 @@ protected function processUploadedImages(BaseRequestInterface $request, HessamPo
         $uploaded_image_details = [];
 
 
-        foreach ((array)config('hessamcms.image_sizes') as $size => $image_size_details) {
+        foreach ((array)config('binshopsblog.image_sizes') as $size => $image_size_details) {
 
             if ($image_size_details['enabled'] && $photo = $request->get_image_file($size)) {
                 // this image size is enabled, and
@@ -445,9 +445,9 @@ protected function processUploadedImages(BaseRequestInterface $request, HessamPo
         }
 
         // store the image upload.
-        // todo: link this to the hessamcms_post row.
+        // todo: link this to the binshopsblog_post row.
         if (count(array_filter($uploaded_image_details))>0) {
-            HessamUploadedPhoto::create([
+            BinshopsUploadedPhoto::create([
                 'source' => "BlogFeaturedImage",
                 'uploaded_images' => $uploaded_image_details,
             ]);
@@ -456,7 +456,7 @@ protected function processUploadedImages(BaseRequestInterface $request, HessamPo
 
     //translations for the same psots are ignored
     protected function check_if_same_post_exists($slug, $lang_id, $post_id){
-        $slg = HessamPostTranslation::where(
+        $slg = BinshopsPostTranslation::where(
             [
                 ['slug','=', $slug],
                 ['lang_id', '=', $lang_id],
diff --git a/src/Controllers/BinshopsAdminSetupController.php b/src/Controllers/BinshopsAdminSetupController.php
new file mode 100644
index 0000000..8612907
--- /dev/null
+++ b/src/Controllers/BinshopsAdminSetupController.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace BinshopsBlog\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use BinshopsBlog\Helpers;
+use BinshopsBlog\Middleware\UserCanManageBlogPosts;
+use BinshopsBlog\Models\BinshopsConfiguration;
+use BinshopsBlog\Models\BinshopsLanguage;
+
+/**
+ * Class BinshopsAdminSetupController
+ * Handles initial setup for Binshops Blog
+ */
+class BinshopsAdminSetupController extends Controller
+{
+    /**
+     * BinshopsAdminSetupController constructor.
+     */
+    public function __construct()
+    {
+        $this->middleware(UserCanManageBlogPosts::class);
+
+        if (!is_array(config("binshopsblog"))) {
+            throw new \RuntimeException('The config/binshopsblog.php does not exist. Publish the vendor files for the BinshopsBlog package by running the php artisan publish:vendor command');
+        }
+    }
+
+    /**
+     * View all posts
+     *
+     * @return mixed
+     */
+    public function setup(Request $request)
+    {
+        return view("binshopsblog_admin::setup.setup");
+    }
+
+    public function setup_submit(Request $request){
+        if ($request['locale'] == null){
+            return redirect( route('binshopsblog.admin.setup_submit') );
+        }
+        $language = new BinshopsLanguage();
+        $language->active = $request['active'];
+        $language->iso_code = $request['iso_code'];
+        $language->locale = $request['locale'];
+        $language->name = $request['name'];
+        $language->date_format = $request['date_format'];
+
+        $language->save();
+        if (!BinshopsConfiguration::get('INITIAL_SETUP')){
+            BinshopsConfiguration::set('INITIAL_SETUP', true);
+            BinshopsConfiguration::set('DEFAULT_LANGUAGE_LOCALE', $request['locale']);
+        }
+
+        return redirect( route('binshopsblog.admin.index') );
+    }
+}
diff --git a/src/Controllers/HessamCategoryAdminController.php b/src/Controllers/BinshopsCategoryAdminController.php
similarity index 61%
rename from src/Controllers/HessamCategoryAdminController.php
rename to src/Controllers/BinshopsCategoryAdminController.php
index 91bfdd9..6350495 100755
--- a/src/Controllers/HessamCategoryAdminController.php
+++ b/src/Controllers/BinshopsCategoryAdminController.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use HessamCMS\Events\CategoryAdded;
-use HessamCMS\Events\CategoryEdited;
-use HessamCMS\Events\CategoryWillBeDeleted;
-use HessamCMS\Helpers;
-use HessamCMS\Middleware\LoadLanguage;
-use HessamCMS\Middleware\UserCanManageBlogPosts;
-use HessamCMS\Models\HessamCategory;
-use HessamCMS\Models\HessamCategoryTranslation;
-use HessamCMS\Models\HessamLanguage;
-use HessamCMS\Requests\DeleteHessamCMSCategoryRequest;
-use HessamCMS\Requests\StoreHessamCMSCategoryRequest;
-use HessamCMS\Requests\UpdateHessamCMSCategoryRequest;
+use BinshopsBlog\Events\CategoryAdded;
+use BinshopsBlog\Events\CategoryEdited;
+use BinshopsBlog\Events\CategoryWillBeDeleted;
+use BinshopsBlog\Helpers;
+use BinshopsBlog\Middleware\LoadLanguage;
+use BinshopsBlog\Middleware\UserCanManageBlogPosts;
+use BinshopsBlog\Models\BinshopsCategory;
+use BinshopsBlog\Models\BinshopsCategoryTranslation;
+use BinshopsBlog\Models\BinshopsLanguage;
+use BinshopsBlog\Requests\DeleteBinshopsBlogCategoryRequest;
+use BinshopsBlog\Requests\StoreBinshopsBlogCategoryRequest;
+use BinshopsBlog\Requests\UpdateBinshopsBlogCategoryRequest;
 
 /**
- * Class HessamCategoryAdminController
- * @package HessamCMS\Controllers
+ * Class BinshopsCategoryAdminController
+ * @package BinshopsBlog\Controllers
  */
-class HessamCategoryAdminController extends Controller
+class BinshopsCategoryAdminController extends Controller
 {
     /**
-     * HessamCategoryAdminController constructor.
+     * BinshopsCategoryAdminController constructor.
      */
     public function __construct()
     {
@@ -40,8 +40,8 @@ public function __construct()
      */
     public function index(Request $request){
         $language_id = $request->get('language_id');
-        $categories = HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->paginate(25);
-        return view("hessamcms_admin::categories.index",[
+        $categories = BinshopsCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->paginate(25);
+        return view("binshopsblog_admin::categories.index",[
             'categories' => $categories,
             'language_id' => $language_id
         ]);
@@ -53,19 +53,19 @@ public function index(Request $request){
      */
     public function create_category(Request $request){
         $language_id = $request->get('language_id');
-        $language_list = HessamLanguage::where('active',true)->get();
+        $language_list = BinshopsLanguage::where('active',true)->get();
 
-        $cat_list = HessamCategory::whereHas('categoryTranslations', function ($query) use ($language_id) {
+        $cat_list = BinshopsCategory::whereHas('categoryTranslations', function ($query) use ($language_id) {
             return $query->where('lang_id', '=', $language_id);
         })->get();
 
-        $rootList = HessamCategory::roots()->get();
-        HessamCategory::loadSiblingsWithList($rootList);
+        $rootList = BinshopsCategory::roots()->get();
+        BinshopsCategory::loadSiblingsWithList($rootList);
 
 
-        return view("hessamcms_admin::categories.add_category",[
-            'category' => new \HessamCMS\Models\HessamCategory(),
-            'category_translation' => new \HessamCMS\Models\HessamCategoryTranslation(),
+        return view("binshopsblog_admin::categories.add_category",[
+            'category' => new \BinshopsBlog\Models\BinshopsCategory(),
+            'category_translation' => new \BinshopsBlog\Models\BinshopsCategoryTranslation(),
             'category_tree' => $cat_list,
             'cat_roots' => $rootList,
             'language_id' => $language_id,
@@ -76,7 +76,7 @@ public function create_category(Request $request){
     /**
      * Store a new category
      *
-     * @param StoreHessamCMSCategoryRequest $request
+     * @param StoreBinshopsBlogCategoryRequest $request
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      *
      * This controller is totally REST controller
@@ -88,16 +88,16 @@ public function store_category(Request $request){
         if ($request['parent_id']== 0){
             $request['parent_id'] = null;
         }
-        $new_category = HessamCategory::create([
+        $new_category = BinshopsCategory::create([
             'parent_id' => $request['parent_id']
         ]);
 
         foreach ($language_list as $key => $value) {
             if ($value['lang_id'] != -1){
                 //check for slug availability
-                $obj = HessamCategoryTranslation::where('slug',$value['slug'])->first();
+                $obj = BinshopsCategoryTranslation::where('slug',$value['slug'])->first();
                 if ($obj){
-                    HessamCategory::destroy($new_category->id);
+                    BinshopsCategory::destroy($new_category->id);
                     return response()->json([
                         'code' => 403,
                         'message' => "slug is already taken",
@@ -129,20 +129,20 @@ public function store_category(Request $request){
      */
     public function edit_category($categoryId, Request $request){
         $language_id = $request->get('language_id');
-        $language_list = HessamLanguage::where('active',true)->get();
+        $language_list = BinshopsLanguage::where('active',true)->get();
 
-        $category = HessamCategory::findOrFail($categoryId);
-        $cat_trans = HessamCategoryTranslation::where(
+        $category = BinshopsCategory::findOrFail($categoryId);
+        $cat_trans = BinshopsCategoryTranslation::where(
             [
                 ['lang_id', '=', $language_id],
                 ['category_id', '=', $categoryId]
             ]
         )->first();
 
-        return view("hessamcms_admin::categories.edit_category",[
+        return view("binshopsblog_admin::categories.edit_category",[
             'category' => $category,
             'category_translation' => $cat_trans,
-            'categories_list' => HessamCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->get(),
+            'categories_list' => BinshopsCategoryTranslation::orderBy("category_id")->where('lang_id', $language_id)->get(),
             'language_id' => $language_id,
             'language_list' => $language_list
         ]);
@@ -151,15 +151,15 @@ public function edit_category($categoryId, Request $request){
     /**
      * Save submitted changes
      *
-     * @param UpdateHessamCMSCategoryRequest $request
+     * @param UpdateBinshopsBlogCategoryRequest $request
      * @param $categoryId
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function update_category(UpdateHessamCMSCategoryRequest $request, $categoryId){
-        /** @var HessamCategory $category */
-        $category = HessamCategory::findOrFail($categoryId);
+    public function update_category(UpdateBinshopsBlogCategoryRequest $request, $categoryId){
+        /** @var BinshopsCategory $category */
+        $category = BinshopsCategory::findOrFail($categoryId);
         $language_id = $request->get('language_id');
-        $translation = HessamCategoryTranslation::where(
+        $translation = BinshopsCategoryTranslation::where(
             [
                 ['lang_id', '=', $language_id],
                 ['category_id', '=', $categoryId]
@@ -178,27 +178,27 @@ public function update_category(UpdateHessamCMSCategoryRequest $request, $catego
     /**
      * Delete the category
      *
-     * @param DeleteHessamCMSCategoryRequest $request
+     * @param DeleteBinshopsBlogCategoryRequest $request
      * @param $categoryId
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function destroy_category(DeleteHessamCMSCategoryRequest $request, $categoryId){
+    public function destroy_category(DeleteBinshopsBlogCategoryRequest $request, $categoryId){
 
         /* Please keep this in, so code inspectiwons don't say $request was unused. Of course it might now get marked as left/right parts are equal */
         $request=$request;
 
-        $category = HessamCategory::findOrFail($categoryId);
+        $category = BinshopsCategory::findOrFail($categoryId);
         $children = $category->children()->get();
         if (sizeof($children) > 0) {
             Helpers::flash_message("This category could not be deleted it has some sub-categories. First try to change parent category of subs.");
-            return redirect(route('hessamcms.admin.categories.index'));
+            return redirect(route('binshopsblog.admin.categories.index'));
         }
 
         event(new CategoryWillBeDeleted($category));
         $category->delete();
 
         Helpers::flash_message("Category successfully deleted!");
-        return redirect( route('hessamcms.admin.categories.index') );
+        return redirect( route('binshopsblog.admin.categories.index') );
     }
 
 }
diff --git a/src/Controllers/HessamCommentWriterController.php b/src/Controllers/BinshopsCommentWriterController.php
similarity index 58%
rename from src/Controllers/HessamCommentWriterController.php
rename to src/Controllers/BinshopsCommentWriterController.php
index 67154c8..4e2e6ff 100755
--- a/src/Controllers/HessamCommentWriterController.php
+++ b/src/Controllers/BinshopsCommentWriterController.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
 use Auth;
-use HessamCMS\Captcha\CaptchaAbstract;
-use HessamCMS\Captcha\UsesCaptcha;
-use HessamCMS\Events\CommentAdded;
-use HessamCMS\Middleware\LoadLanguage;
-use HessamCMS\Middleware\UserCanManageBlogPosts;
-use HessamCMS\Models\HessamComment;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Models\HessamPostTranslation;
-use HessamCMS\Requests\AddNewCommentRequest;
+use BinshopsBlog\Captcha\CaptchaAbstract;
+use BinshopsBlog\Captcha\UsesCaptcha;
+use BinshopsBlog\Events\CommentAdded;
+use BinshopsBlog\Middleware\LoadLanguage;
+use BinshopsBlog\Middleware\UserCanManageBlogPosts;
+use BinshopsBlog\Models\BinshopsComment;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Models\BinshopsPostTranslation;
+use BinshopsBlog\Requests\AddNewCommentRequest;
 
 /**
- * Class HessamCommentWriterController
- * @package HessamCMS\Controllers
+ * Class BinshopsCommentWriterController
+ * @package BinshopsBlog\Controllers
  */
-class HessamCommentWriterController extends Controller
+class BinshopsCommentWriterController extends Controller
 {
 
     use UsesCaptcha;
@@ -41,11 +41,11 @@ public function __construct()
     public function addNewComment(AddNewCommentRequest $request, $locale, $blog_post_slug)
     {
 
-        if (config("hessamcms.comments.type_of_comments_to_show", "built_in") !== 'built_in') {
+        if (config("binshopsblog.comments.type_of_comments_to_show", "built_in") !== 'built_in') {
             throw new \RuntimeException("Built in comments are disabled");
         }
 
-        $post_translation = HessamPostTranslation::where("slug", $blog_post_slug)
+        $post_translation = BinshopsPostTranslation::where("slug", $blog_post_slug)
             ->with('post')
             ->firstOrFail();
         $blog_post = $post_translation->post;
@@ -58,7 +58,7 @@ public function addNewComment(AddNewCommentRequest $request, $locale, $blog_post
 
         $new_comment = $this->createNewComment($request, $blog_post);
 
-        return view("hessamcms::saved_comment", [
+        return view("binshopsblog::saved_comment", [
             'captcha' => $captcha,
             'blog_post' => $post_translation,
             'new_comment' => $new_comment
@@ -69,26 +69,26 @@ public function addNewComment(AddNewCommentRequest $request, $locale, $blog_post
     /**
      * @param AddNewCommentRequest $request
      * @param $blog_post
-     * @return HessamComment
+     * @return BinshopsComment
      */
     protected function createNewComment(AddNewCommentRequest $request, $blog_post)
     {
-        $new_comment = new HessamComment($request->all());
+        $new_comment = new BinshopsComment($request->all());
 
-        if (config("hessamcms.comments.save_ip_address")) {
+        if (config("binshopsblog.comments.save_ip_address")) {
             $new_comment->ip = $request->ip();
         }
-        if (config("hessamcms.comments.ask_for_author_website")) {
+        if (config("binshopsblog.comments.ask_for_author_website")) {
             $new_comment->author_website = $request->get('author_website');
         }
-        if (config("hessamcms.comments.ask_for_author_website")) {
+        if (config("binshopsblog.comments.ask_for_author_website")) {
             $new_comment->author_email = $request->get('author_email');
         }
-        if (config("hessamcms.comments.save_user_id_if_logged_in", true) && Auth::check()) {
+        if (config("binshopsblog.comments.save_user_id_if_logged_in", true) && Auth::check()) {
             $new_comment->user_id = Auth::user()->id;
         }
 
-        $new_comment->approved = config("hessamcms.comments.auto_approve_comments", true) ? true : false;
+        $new_comment->approved = config("binshopsblog.comments.auto_approve_comments", true) ? true : false;
 
         $blog_post->comments()->save($new_comment);
 
diff --git a/src/Controllers/HessamCommentsAdminController.php b/src/Controllers/BinshopsCommentsAdminController.php
similarity index 63%
rename from src/Controllers/HessamCommentsAdminController.php
rename to src/Controllers/BinshopsCommentsAdminController.php
index df6ae13..6574900 100755
--- a/src/Controllers/HessamCommentsAdminController.php
+++ b/src/Controllers/BinshopsCommentsAdminController.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use HessamCMS\Events\CommentApproved;
-use HessamCMS\Events\CommentWillBeDeleted;
-use HessamCMS\Helpers;
-use HessamCMS\Middleware\LoadLanguage;
-use HessamCMS\Middleware\UserCanManageBlogPosts;
-use HessamCMS\Models\HessamComment;
+use BinshopsBlog\Events\CommentApproved;
+use BinshopsBlog\Events\CommentWillBeDeleted;
+use BinshopsBlog\Helpers;
+use BinshopsBlog\Middleware\LoadLanguage;
+use BinshopsBlog\Middleware\UserCanManageBlogPosts;
+use BinshopsBlog\Models\BinshopsComment;
 
 /**
- * Class HessamCommentsAdminController
- * @package HessamCMS\Controllers
+ * Class BinshopsCommentsAdminController
+ * @package BinshopsBlog\Controllers
  */
-class HessamCommentsAdminController extends Controller
+class BinshopsCommentsAdminController extends Controller
 {
     /**
-     * HessamCommentsAdminController constructor.
+     * BinshopsCommentsAdminController constructor.
      */
     public function __construct()
     {
@@ -35,7 +35,7 @@ public function __construct()
      */
     public function index(Request $request)
     {
-        $comments = HessamComment::withoutGlobalScopes()->orderBy("created_at", "desc")
+        $comments = BinshopsComment::withoutGlobalScopes()->orderBy("created_at", "desc")
             ->with("post");
 
         if ($request->get("waiting_for_approval")) {
@@ -43,7 +43,7 @@ public function index(Request $request)
         }
 
         $comments = $comments->paginate(100);
-        return view("hessamcms_admin::comments.index")
+        return view("binshopsblog_admin::comments.index")
             ->withComments($comments
             );
     }
@@ -57,7 +57,7 @@ public function index(Request $request)
      */
     public function approve($blogCommentId)
     {
-        $comment = HessamComment::withoutGlobalScopes()->findOrFail($blogCommentId);
+        $comment = BinshopsComment::withoutGlobalScopes()->findOrFail($blogCommentId);
         $comment->approved = true;
         $comment->save();
 
@@ -76,7 +76,7 @@ public function approve($blogCommentId)
      */
     public function destroy($blogCommentId)
     {
-        $comment = HessamComment::withoutGlobalScopes()->findOrFail($blogCommentId);
+        $comment = BinshopsComment::withoutGlobalScopes()->findOrFail($blogCommentId);
         event(new CommentWillBeDeleted($comment));
 
         $comment->delete();
diff --git a/src/Controllers/HessamImageUploadController.php b/src/Controllers/BinshopsImageUploadController.php
similarity index 60%
rename from src/Controllers/HessamImageUploadController.php
rename to src/Controllers/BinshopsImageUploadController.php
index d7911ba..eaa4b2d 100755
--- a/src/Controllers/HessamImageUploadController.php
+++ b/src/Controllers/BinshopsImageUploadController.php
@@ -1,40 +1,40 @@
 <?php
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use HessamCMS\Middleware\LoadLanguage;
-use HessamCMS\Middleware\UserCanManageBlogPosts;
-use HessamCMS\Models\HessamUploadedPhoto;
+use BinshopsBlog\Middleware\LoadLanguage;
+use BinshopsBlog\Middleware\UserCanManageBlogPosts;
+use BinshopsBlog\Models\BinshopsUploadedPhoto;
 use File;
-use HessamCMS\Requests\UploadImageRequest;
-use HessamCMS\Traits\UploadFileTrait;
+use BinshopsBlog\Requests\UploadImageRequest;
+use BinshopsBlog\Traits\UploadFileTrait;
 
 /**
- * Class HessamAdminController
- * @package HessamCMS\Controllers
+ * Class BinshopsAdminController
+ * @package BinshopsBlog\Controllers
  */
-class HessamImageUploadController extends Controller
+class BinshopsImageUploadController extends Controller
 {
 
     use UploadFileTrait;
 
     /**
-     * HessamAdminController constructor.
+     * BinshopsAdminController constructor.
      */
     public function __construct()
     {
         $this->middleware(UserCanManageBlogPosts::class);
         $this->middleware(LoadLanguage::class);
 
-        if (!is_array(config("hessamcms"))) {
-            throw new \RuntimeException('The config/hessamcms.php does not exist. Publish the vendor files for the HessamCMS package by running the php artisan publish:vendor command');
+        if (!is_array(config("binshopsblog"))) {
+            throw new \RuntimeException('The config/binshopsblog.php does not exist. Publish the vendor files for the BinshopsBlog package by running the php artisan publish:vendor command');
         }
 
 
-        if (!config("hessamcms.image_upload_enabled")) {
-            throw new \RuntimeException("The hessamcms.php config option has not enabled image uploading");
+        if (!config("binshopsblog.image_upload_enabled")) {
+            throw new \RuntimeException("The binshopsblog.php config option has not enabled image uploading");
         }
 
 
@@ -48,7 +48,7 @@ public function __construct()
 
     public function index()
     {
-        return view("hessamcms_admin::imageupload.index", ['uploaded_photos' => HessamUploadedPhoto::orderBy("id", "desc")->paginate(10)]);
+        return view("binshopsblog_admin::imageupload.index", ['uploaded_photos' => BinshopsUploadedPhoto::orderBy("id", "desc")->paginate(10)]);
     }
 
     /**
@@ -58,7 +58,7 @@ public function index()
      */
     public function create()
     {
-        return view("hessamcms_admin::imageupload.create", []);
+        return view("binshopsblog_admin::imageupload.create", []);
     }
 
     /**
@@ -72,7 +72,7 @@ public function store(UploadImageRequest $request)
     {
         $processed_images = $this->processUploadedImages($request);
 
-        return view("hessamcms_admin::imageupload.uploaded", ['images' => $processed_images]);
+        return view("binshopsblog_admin::imageupload.uploaded", ['images' => $processed_images]);
     }
 
     /**
@@ -82,7 +82,7 @@ public function store(UploadImageRequest $request)
      *
      * @return array returns an array of details about each file resized.
      * @throws \Exception
-     * @todo - This class was added after the other main features, so this duplicates some code from the main blog post admin controller (HessamAdminController). For next full release this should be tided up.
+     * @todo - This class was added after the other main features, so this duplicates some code from the main blog post admin controller (BinshopsAdminController). For next full release this should be tided up.
      */
     protected function processUploadedImages(UploadImageRequest $request)
     {
@@ -95,13 +95,13 @@ protected function processUploadedImages(UploadImageRequest $request)
         $sizes_to_upload = $request->get("sizes_to_upload");
 
         // now upload a full size - this is a special case, not in the config file. We only store full size images in this class, not as part of the featured blog image uploads.
-        if (isset($sizes_to_upload['hessamcms_full_size']) && $sizes_to_upload['hessamcms_full_size'] === 'true') {
+        if (isset($sizes_to_upload['binshopsblog_full_size']) && $sizes_to_upload['binshopsblog_full_size'] === 'true') {
 
-            $uploaded_image_details['hessamcms_full_size'] = $this->UploadAndResize(null, $request->get("image_title"), 'fullsize', $photo);
+            $uploaded_image_details['binshopsblog_full_size'] = $this->UploadAndResize(null, $request->get("image_title"), 'fullsize', $photo);
 
         }
 
-        foreach ((array)config('hessamcms.image_sizes') as $size => $image_size_details) {
+        foreach ((array)config('binshopsblog.image_sizes') as $size => $image_size_details) {
 
             if (!isset($sizes_to_upload[$size]) || !$sizes_to_upload[$size] || !$image_size_details['enabled']) {
                 continue;
@@ -114,7 +114,7 @@ protected function processUploadedImages(UploadImageRequest $request)
 
 
         // store the image upload.
-        HessamUploadedPhoto::create([
+        BinshopsUploadedPhoto::create([
             'image_title' => $request->get("image_title"),
             'source' => "ImageUpload",
             'uploader_id' => optional(\Auth::user())->id,
diff --git a/src/Controllers/HessamLanguageAdminController.php b/src/Controllers/BinshopsLanguageAdminController.php
similarity index 60%
rename from src/Controllers/HessamLanguageAdminController.php
rename to src/Controllers/BinshopsLanguageAdminController.php
index 0d10c94..6f6addc 100644
--- a/src/Controllers/HessamLanguageAdminController.php
+++ b/src/Controllers/BinshopsLanguageAdminController.php
@@ -1,20 +1,20 @@
 <?php
 
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
-use HessamCMS\Models\HessamConfiguration;
+use BinshopsBlog\Models\BinshopsConfiguration;
 use Illuminate\Http\Request;
-use HessamCMS\Helpers;
-use HessamCMS\Middleware\LoadLanguage;
-use HessamCMS\Middleware\UserCanManageBlogPosts;
-use HessamCMS\Models\HessamLanguage;
+use BinshopsBlog\Helpers;
+use BinshopsBlog\Middleware\LoadLanguage;
+use BinshopsBlog\Middleware\UserCanManageBlogPosts;
+use BinshopsBlog\Models\BinshopsLanguage;
 
-class HessamLanguageAdminController extends Controller
+class BinshopsLanguageAdminController extends Controller
 {
     /**
-     * HessamLanguageAdminController constructor.
+     * BinshopsLanguageAdminController constructor.
      */
     public function __construct()
     {
@@ -24,22 +24,22 @@ public function __construct()
     }
 
     public function index(){
-        $language_list = HessamLanguage::all();
-        return view("hessamcms_admin::languages.index",[
+        $language_list = BinshopsLanguage::all();
+        return view("binshopsblog_admin::languages.index",[
             'language_list' => $language_list
         ]);
     }
 
     public function create_language(){
-        return view("hessamcms_admin::languages.add_language");
+        return view("binshopsblog_admin::languages.add_language");
     }
 
     public function store_language(Request $request){
         if ($request['locale'] == null){
             Helpers::flash_message("Select a language!");
-            return view("hessamcms_admin::languages.add_language");
+            return view("binshopsblog_admin::languages.add_language");
         }
-        $language = new HessamLanguage();
+        $language = new BinshopsLanguage();
         $language->active = $request['active'];
         $language->iso_code = $request['iso_code'];
         $language->locale = $request['locale'];
@@ -50,31 +50,31 @@ public function store_language(Request $request){
         $language->save();
 
         Helpers::flash_message("Language: " . $language->name . " has been added.");
-        return redirect( route('hessamcms.admin.languages.index') );
+        return redirect( route('binshopsblog.admin.languages.index') );
     }
 
     public function destroy_language(Request $request, $languageId){
-        $lang = HessamLanguage::where('locale', HessamConfiguration::get('DEFAULT_LANGUAGE_LOCALE'))->first();
+        $lang = BinshopsLanguage::where('locale', BinshopsConfiguration::get('DEFAULT_LANGUAGE_LOCALE'))->first();
         if ($languageId == $lang->id){
             Helpers::flash_message("The default language can not be deleted!");
-            return redirect( route('hessamcms.admin.languages.index') );
+            return redirect( route('binshopsblog.admin.languages.index') );
         }
 
         try {
-            $language = HessamLanguage::findOrFail($languageId);
+            $language = BinshopsLanguage::findOrFail($languageId);
             //todo
 //        event(new CategoryWillBeDeleted($category));
             $language->delete();
             Helpers::flash_message("The language is successfully deleted!");
-            return redirect( route('hessamcms.admin.languages.index') );
+            return redirect( route('binshopsblog.admin.languages.index') );
         } catch (\Illuminate\Database\QueryException $e) {
             Helpers::flash_message("You can not delete this language, because it's used in posts or categoies.");
-            return redirect( route('hessamcms.admin.languages.index') );
+            return redirect( route('binshopsblog.admin.languages.index') );
         }
     }
 
     public function toggle_language(Request $request, $languageId){
-        $language = HessamLanguage::findOrFail($languageId);
+        $language = BinshopsLanguage::findOrFail($languageId);
         if ($language->active == 1){
             $language->active = 0;
         }else if ($language->active == 0){
@@ -86,6 +86,6 @@ public function toggle_language(Request $request, $languageId){
         //event
 
         Helpers::flash_message("Language: " . $language->name . " has been disabled.");
-        return redirect( route('hessamcms.admin.languages.index') );
+        return redirect( route('binshopsblog.admin.languages.index') );
     }
 }
diff --git a/src/Controllers/HessamReaderController.php b/src/Controllers/BinshopsReaderController.php
similarity index 65%
rename from src/Controllers/HessamReaderController.php
rename to src/Controllers/BinshopsReaderController.php
index bd15239..f744781 100755
--- a/src/Controllers/HessamReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -1,25 +1,25 @@
 <?php
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
-use HessamCMS\Laravel\Fulltext\Search;
-use HessamCMS\Models\HessamCategoryTranslation;
+use BinshopsBlog\Laravel\Fulltext\Search;
+use BinshopsBlog\Models\BinshopsCategoryTranslation;
 use Illuminate\Http\Request;
-use HessamCMS\Captcha\UsesCaptcha;
-use HessamCMS\Middleware\DetectLanguage;
-use HessamCMS\Models\HessamCategory;
-use HessamCMS\Models\HessamLanguage;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Models\HessamPostTranslation;
+use BinshopsBlog\Captcha\UsesCaptcha;
+use BinshopsBlog\Middleware\DetectLanguage;
+use BinshopsBlog\Models\BinshopsCategory;
+use BinshopsBlog\Models\BinshopsLanguage;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Models\BinshopsPostTranslation;
 
 /**
- * Class HessamReaderController
+ * Class BinshopsReaderController
  * All of the main public facing methods for viewing blog content (index, single posts)
- * @package HessamCMS\Controllers
+ * @package BinshopsBlog\Controllers
  */
-class HessamReaderController extends Controller
+class BinshopsReaderController extends Controller
 {
     use UsesCaptcha;
 
@@ -37,7 +37,7 @@ public function __construct()
      */
     public function index($locale, $category_slug = null, Request $request)
     {
-        // the published_at + is_published are handled by HessamCMSPublishedScope, and don't take effect if the logged in user can manageb log posts
+        // the published_at + is_published are handled by BinshopsBlogPublishedScope, and don't take effect if the logged in user can manageb log posts
 
         //todo
         $title = 'Blog Page'; // default title...
@@ -45,12 +45,12 @@ public function index($locale, $category_slug = null, Request $request)
         $categoryChain = null;
         $posts = array();
         if ($category_slug) {
-            $category = HessamCategoryTranslation::where("slug", $category_slug)->with('category')->firstOrFail()->category;
+            $category = BinshopsCategoryTranslation::where("slug", $category_slug)->with('category')->firstOrFail()->category;
             $categoryChain = $category->getAncestorsAndSelf();
-            $posts_1 = $category->posts()->where("hessam_post_categories.category_id", $category->id)->with([ 'postTranslations' => function($query) use ($request){
+            $posts_1 = $category->posts()->where("binshops_post_categories.category_id", $category->id)->with([ 'postTranslations' => function($query) use ($request){
                 $query->where("lang_id" , '=' , $request->get("lang_id"));
             }
-            ])->paginate(config("hessamcms.per_page", 10));
+            ])->paginate(config("binshopsblog.per_page", 10));
 
             foreach ($posts_1 as $post) {
                 $trans = $post->postTranslations[0];
@@ -60,23 +60,23 @@ public function index($locale, $category_slug = null, Request $request)
 
             // at the moment we handle this special case (viewing a category) by hard coding in the following two lines.
             // You can easily override this in the view files.
-            \View::share('hessamcms_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
+            \View::share('binshopsblog_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
             $title = 'Posts in ' . $category->category_name . " category"; // hardcode title here...
         } else {
-            $posts = HessamPostTranslation::where('lang_id', $request->get("lang_id"))
+            $posts = BinshopsPostTranslation::where('lang_id', $request->get("lang_id"))
                 ->with(['post' => function($query){
                     $query->where("is_published" , '=' , true);
                     $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
                     $query->orderBy("posted_at", "desc");
-                }])->paginate(config("hessamcms.per_page", 10));
+                }])->paginate(config("binshopsblog.per_page", 10));
         }
 
         //load category hierarchy
-        $rootList = HessamCategory::roots()->get();
-        HessamCategory::loadSiblingsWithList($rootList);
+        $rootList = BinshopsCategory::roots()->get();
+        BinshopsCategory::loadSiblingsWithList($rootList);
 
-        return view("hessamcms::index", [
-            'lang_list' => HessamLanguage::all('locale','name'),
+        return view("binshopsblog::index", [
+            'lang_list' => BinshopsLanguage::all('locale','name'),
             'locale' => $request->get("locale"),
             'lang_id' => $request->get('lang_id'),
             'category_chain' => $categoryChain,
@@ -95,7 +95,7 @@ public function index($locale, $category_slug = null, Request $request)
      */
     public function search(Request $request)
     {
-        if (!config("hessamcms.search.search_enabled")) {
+        if (!config("binshopsblog.search.search_enabled")) {
             throw new \Exception("Search is disabled");
         }
         $query = $request->get("s");
@@ -104,10 +104,10 @@ public function search(Request $request)
 
         \View::share("title", "Search results for " . e($query));
 
-        $rootList = HessamCategory::roots()->get();
-        HessamCategory::loadSiblingsWithList($rootList);
+        $rootList = BinshopsCategory::roots()->get();
+        BinshopsCategory::loadSiblingsWithList($rootList);
 
-        return view("hessamcms::search", [
+        return view("binshopsblog::search", [
                 'lang_id' => $request->get('lang_id'),
                 'locale' => $request->get("locale"),
                 'categories' => $rootList,
@@ -139,8 +139,8 @@ public function view_category($locale, $hierarchy, Request $request)
      */
     public function viewSinglePost(Request $request, $locale, $blogPostSlug)
     {
-        // the published_at + is_published are handled by HessamCMSPublishedScope, and don't take effect if the logged in user can manage log posts
-        $blog_post = HessamPostTranslation::where([
+        // the published_at + is_published are handled by BinshopsBlogPublishedScope, and don't take effect if the logged in user can manage log posts
+        $blog_post = BinshopsPostTranslation::where([
             ["slug", "=", $blogPostSlug],
             ['lang_id', "=" , $request->get("lang_id")]
         ])->firstOrFail();
@@ -149,7 +149,7 @@ public function viewSinglePost(Request $request, $locale, $blogPostSlug)
             $captcha->runCaptchaBeforeShowingPosts($request, $blog_post);
         }
 
-        return view("hessamcms::single_post", [
+        return view("binshopsblog::single_post", [
             'post' => $blog_post,
             // the default scope only selects approved comments, ordered by id
             'comments' => $blog_post->post->comments()
diff --git a/src/Controllers/HessamRssFeedController.php b/src/Controllers/BinshopsRssFeedController.php
similarity index 64%
rename from src/Controllers/HessamRssFeedController.php
rename to src/Controllers/BinshopsRssFeedController.php
index d97a49b..e9a8f7f 100755
--- a/src/Controllers/HessamRssFeedController.php
+++ b/src/Controllers/BinshopsRssFeedController.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace HessamCMS\Controllers;
+namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
 use Carbon\Carbon;
 use Laravelium\Feed\Feed;
-use HessamCMS\Middleware\DetectLanguage;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Requests\FeedRequest;
+use BinshopsBlog\Middleware\DetectLanguage;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Requests\FeedRequest;
 
 /**
- * Class HessamRssFeedController.php
+ * Class BinshopsRssFeedController.php
  * All RSS feed viewing methods
- * @package HessamCMS\Controllers
+ * @package BinshopsBlog\Controllers
  */
-class HessamRssFeedController extends Controller
+class BinshopsRssFeedController extends Controller
 {
     public function __construct()
     {
@@ -29,13 +29,13 @@ public function __construct()
     protected function setupFeed(Feed $feed, $posts)
     {
         $feed->title = config("app.name") . ' Blog';
-        $feed->description = config("hessamcms.rssfeed.description", "Our blog RSS feed");
-        $feed->link = route('hessamcms.index');
+        $feed->description = config("binshopsblog.rssfeed.description", "Our blog RSS feed");
+        $feed->link = route('binshopsblog.index');
         $feed->setDateFormat('carbon');
         $feed->pubdate = isset($posts[0]) ? $posts[0]->posted_at : Carbon::now()->subYear(10);
-        $feed->lang = config("hessamcms.rssfeed.language", "en");
-        $feed->setShortening(config("hessamcms.rssfeed.should_shorten_text", true)); // true or false
-        $feed->setTextLimit(config("hessamcms.rssfeed.text_limit", 100));
+        $feed->lang = config("binshopsblog.rssfeed.language", "en");
+        $feed->setShortening(config("binshopsblog.rssfeed.should_shorten_text", true)); // true or false
+        $feed->setTextLimit(config("binshopsblog.rssfeed.text_limit", 100));
     }
 
 
@@ -44,14 +44,14 @@ protected function setupFeed(Feed $feed, $posts)
      */
     protected function makeFreshFeed(Feed $feed)
     {
-        $posts = HessamPost::orderBy("posted_at", "desc")
-            ->limit(config("hessamcms.rssfeed.posts_to_show_in_rss_feed", 10))
+        $posts = BinshopsPost::orderBy("posted_at", "desc")
+            ->limit(config("binshopsblog.rssfeed.posts_to_show_in_rss_feed", 10))
             ->with("author")
             ->get();
 
         $this->setupFeed($feed, $posts);
 
-        /** @var HessamPost $post */
+        /** @var BinshopsPost $post */
         foreach ($posts as $post) {
             $feed->add($post->title,
                 $post->author_string(),
@@ -79,8 +79,8 @@ public function feed(FeedRequest $request, Feed $feed)
         $user_or_guest = \Auth::check() ? \Auth::user()->id : 'guest';
 
         $feed->setCache(
-            config("hessamcms.rssfeed.cache_in_minutes", 60),
-            "hessamcms-" . $request->getFeedType() . $user_or_guest
+            config("binshopsblog.rssfeed.cache_in_minutes", 60),
+            "binshopsblog-" . $request->getFeedType() . $user_or_guest
         );
 
         if (!$feed->isCached()) {
diff --git a/src/Controllers/HessamAdminSetupController.php b/src/Controllers/HessamAdminSetupController.php
deleted file mode 100644
index adb7ca6..0000000
--- a/src/Controllers/HessamAdminSetupController.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace HessamCMS\Controllers;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use HessamCMS\Helpers;
-use HessamCMS\Middleware\UserCanManageBlogPosts;
-use HessamCMS\Models\HessamConfiguration;
-use HessamCMS\Models\HessamLanguage;
-
-/**
- * Class HessamAdminSetupController
- * Handles initial setup for Hessam CMS
- */
-class HessamAdminSetupController extends Controller
-{
-    /**
-     * HessamAdminSetupController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware(UserCanManageBlogPosts::class);
-
-        if (!is_array(config("hessamcms"))) {
-            throw new \RuntimeException('The config/hessamcms.php does not exist. Publish the vendor files for the HessamCMS package by running the php artisan publish:vendor command');
-        }
-    }
-
-    /**
-     * View all posts
-     *
-     * @return mixed
-     */
-    public function setup(Request $request)
-    {
-        return view("hessamcms_admin::setup.setup");
-    }
-
-    public function setup_submit(Request $request){
-        if ($request['locale'] == null){
-            return redirect( route('hessamcms.admin.setup_submit') );
-        }
-        $language = new HessamLanguage();
-        $language->active = $request['active'];
-        $language->iso_code = $request['iso_code'];
-        $language->locale = $request['locale'];
-        $language->name = $request['name'];
-        $language->date_format = $request['date_format'];
-
-        $language->save();
-        if (!HessamConfiguration::get('INITIAL_SETUP')){
-            HessamConfiguration::set('INITIAL_SETUP', true);
-            HessamConfiguration::set('DEFAULT_LANGUAGE_LOCALE', $request['locale']);
-        }
-
-        return redirect( route('hessamcms.admin.index') );
-    }
-}
diff --git a/src/Events/BlogPostAdded.php b/src/Events/BlogPostAdded.php
index bbdd79c..4aef3b5 100644
--- a/src/Events/BlogPostAdded.php
+++ b/src/Events/BlogPostAdded.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamPost;
+use BinshopsBlog\Models\BinshopsPost;
 
 /**
  * Class BlogPostAdded
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class BlogPostAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamPost */
-    public $hessamCMSPost;
+    /** @var  BinshopsPost */
+    public $binshopsBlogPost;
 
     /**
      * BlogPostAdded constructor.
-     * @param HessamPost $hessamCMSPost
+     * @param BinshopsPost $binshopsBlogPost
      */
-    public function __construct(HessamPost $hessamCMSPost)
+    public function __construct(BinshopsPost $binshopsBlogPost)
     {
-        $this->hessamCMSPost=$hessamCMSPost;
+        $this->binshopsBlogPost=$binshopsBlogPost;
     }
 
 }
diff --git a/src/Events/BlogPostEdited.php b/src/Events/BlogPostEdited.php
index 24b3152..94d4b13 100644
--- a/src/Events/BlogPostEdited.php
+++ b/src/Events/BlogPostEdited.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamPost;
+use BinshopsBlog\Models\BinshopsPost;
 
 /**
  * Class BlogPostEdited
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class BlogPostEdited
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamPost */
-    public $hessamCMSPost;
+    /** @var  BinshopsPost */
+    public $binshopsBlogPost;
 
     /**
      * BlogPostEdited constructor.
-     * @param HessamPost $hessamCMSPost
+     * @param BinshopsPost $binshopsBlogPost
      */
-    public function __construct(HessamPost $hessamCMSPost)
+    public function __construct(BinshopsPost $binshopsBlogPost)
     {
-        $this->hessamCMSPost=$hessamCMSPost;
+        $this->binshopsBlogPost=$binshopsBlogPost;
     }
 
 }
diff --git a/src/Events/BlogPostWillBeDeleted.php b/src/Events/BlogPostWillBeDeleted.php
index 402dc5b..07c473e 100644
--- a/src/Events/BlogPostWillBeDeleted.php
+++ b/src/Events/BlogPostWillBeDeleted.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamPost;
+use BinshopsBlog\Models\BinshopsPost;
 
 /**
  * Class BlogPostWillBeDeleted
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class BlogPostWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamPost */
-    public $hessamCMSPost;
+    /** @var  BinshopsPost */
+    public $binshopsBlogPost;
 
     /**
      * BlogPostWillBeDeleted constructor.
-     * @param HessamPost $hessamCMSPost
+     * @param BinshopsPost $binshopsBlogPost
      */
-    public function __construct(HessamPost $hessamCMSPost)
+    public function __construct(BinshopsPost $binshopsBlogPost)
     {
-        $this->hessamCMSPost=$hessamCMSPost;
+        $this->binshopsBlogPost=$binshopsBlogPost;
     }
 
 }
diff --git a/src/Events/CategoryAdded.php b/src/Events/CategoryAdded.php
index 5cf14e0..a090f31 100644
--- a/src/Events/CategoryAdded.php
+++ b/src/Events/CategoryAdded.php
@@ -1,33 +1,33 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamCategory;
-use HessamCMS\Models\HessamCategoryTranslation;
+use BinshopsBlog\Models\BinshopsCategory;
+use BinshopsBlog\Models\BinshopsCategoryTranslation;
 
 /**
  * Class CategoryAdded
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class CategoryAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamCategory */
-    public $hessamCategory;
-    public $hessamCategoryTranslation;
+    /** @var  BinshopsCategory */
+    public $binshopsCategory;
+    public $binshopsCategoryTranslation;
 
     /**
      * CategoryAdded constructor.
-     * @param HessamCategory $hessamCategory
+     * @param BinshopsCategory $binshopsCategory
      */
-    public function __construct(HessamCategory $hessamCategory, HessamCategoryTranslation  $hessamCategoryTranslation)
+    public function __construct(BinshopsCategory $binshopsCategory, BinshopsCategoryTranslation  $binshopsCategoryTranslation)
     {
-        $this->hessamCategory=$hessamCategory;
-        $this->hessamCategoryTranslation = $hessamCategoryTranslation;
+        $this->binshopsCategory=$binshopsCategory;
+        $this->binshopsCategoryTranslation = $binshopsCategoryTranslation;
     }
 
 }
diff --git a/src/Events/CategoryEdited.php b/src/Events/CategoryEdited.php
index 2455d30..f8cbf19 100644
--- a/src/Events/CategoryEdited.php
+++ b/src/Events/CategoryEdited.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamCategory;
+use BinshopsBlog\Models\BinshopsCategory;
 
 /**
  * Class CategoryEdited
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class CategoryEdited
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamCategory */
-    public $hessamCMSCategory;
+    /** @var  BinshopsCategory */
+    public $binshopsBlogCategory;
 
     /**
      * CategoryEdited constructor.
-     * @param HessamCategory $hessamCMSCategory
+     * @param BinshopsCategory $binshopsBlogCategory
      */
-    public function __construct(HessamCategory $hessamCMSCategory)
+    public function __construct(BinshopsCategory $binshopsBlogCategory)
     {
-        $this->hessamCMSCategory=$hessamCMSCategory;
+        $this->binshopsBlogCategory=$binshopsBlogCategory;
     }
 
 }
diff --git a/src/Events/CategoryWillBeDeleted.php b/src/Events/CategoryWillBeDeleted.php
index b703c45..f831fa7 100644
--- a/src/Events/CategoryWillBeDeleted.php
+++ b/src/Events/CategoryWillBeDeleted.php
@@ -1,30 +1,30 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamCategory;
+use BinshopsBlog\Models\BinshopsCategory;
 
 /**
  * Class CategoryWillBeDeleted
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class CategoryWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamCategory */
-    public $hessamCMSCategory;
+    /** @var  BinshopsCategory */
+    public $binshopsBlogCategory;
 
     /**
      * CategoryWillBeDeleted constructor.
-     * @param HessamCategory $hessamCMSCategory
+     * @param BinshopsCategory $binshopsBlogCategory
      */
-    public function __construct(HessamCategory $hessamCMSCategory)
+    public function __construct(BinshopsCategory $binshopsBlogCategory)
     {
-        $this->hessamCMSCategory=$hessamCMSCategory;
+        $this->binshopsBlogCategory=$binshopsBlogCategory;
     }
 
 }
diff --git a/src/Events/CommentAdded.php b/src/Events/CommentAdded.php
index b8a92d0..e0332f3 100644
--- a/src/Events/CommentAdded.php
+++ b/src/Events/CommentAdded.php
@@ -1,34 +1,34 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamComment;
-use HessamCMS\Models\HessamPost;
+use BinshopsBlog\Models\BinshopsComment;
+use BinshopsBlog\Models\BinshopsPost;
 
 /**
  * Class CommentAdded
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class CommentAdded
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamPost */
-    public $hessamCMSPost;
-    /** @var  HessamComment */
+    /** @var  BinshopsPost */
+    public $binshopsBlogPost;
+    /** @var  BinshopsComment */
     public $newComment;
 
     /**
      * CommentAdded constructor.
-     * @param HessamPost $hessamCMSPost
-     * @param HessamComment $newComment
+     * @param BinshopsPost $binshopsBlogPost
+     * @param BinshopsComment $newComment
      */
-    public function __construct(HessamPost $hessamCMSPost, HessamComment $newComment)
+    public function __construct(BinshopsPost $binshopsBlogPost, BinshopsComment $newComment)
     {
-        $this->hessamCMSPost=$hessamCMSPost;
+        $this->binshopsBlogPost=$binshopsBlogPost;
         $this->newComment=$newComment;
     }
 
diff --git a/src/Events/CommentApproved.php b/src/Events/CommentApproved.php
index 7bd012c..8c4555e 100644
--- a/src/Events/CommentApproved.php
+++ b/src/Events/CommentApproved.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamComment;
+use BinshopsBlog\Models\BinshopsComment;
 
 /**
  * Class CommentApproved
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class CommentApproved
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamComment */
+    /** @var  BinshopsComment */
     public $comment;
 
     /**
      * CommentApproved constructor.
-     * @param HessamComment $comment
+     * @param BinshopsComment $comment
      */
-    public function __construct(HessamComment $comment)
+    public function __construct(BinshopsComment $comment)
     {
         $this->comment=$comment;
         // you can get the blog post via $comment->post
diff --git a/src/Events/CommentWillBeDeleted.php b/src/Events/CommentWillBeDeleted.php
index 165f508..25ba513 100644
--- a/src/Events/CommentWillBeDeleted.php
+++ b/src/Events/CommentWillBeDeleted.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamComment;
+use BinshopsBlog\Models\BinshopsComment;
 
 /**
  * Class CommentWillBeDeleted
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class CommentWillBeDeleted
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamComment */
+    /** @var  BinshopsComment */
     public $comment;
 
     /**
      * CommentWillBeDeleted constructor.
-     * @param HessamComment $comment
+     * @param BinshopsComment $comment
      */
-    public function __construct(HessamComment $comment)
+    public function __construct(BinshopsComment $comment)
     {
         $this->comment=$comment;
     }
diff --git a/src/Events/UploadedImage.php b/src/Events/UploadedImage.php
index b810cdf..cb3ac03 100644
--- a/src/Events/UploadedImage.php
+++ b/src/Events/UploadedImage.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace HessamCMS\Events;
+namespace BinshopsBlog\Events;
 
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Models\HessamPostTranslation;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Models\BinshopsPostTranslation;
 
 /**
  * Class UploadedImage
- * @package HessamCMS\Events
+ * @package BinshopsBlog\Events
  */
 class UploadedImage
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    /** @var  HessamPost|null */
-    public $hessamCMSPost;
+    /** @var  BinshopsPost|null */
+    public $binshopsBlogPost;
     /**
      * @var
      */
@@ -30,14 +30,14 @@ class UploadedImage
      * UploadedImage constructor.
      *
      * @param $image_filename - the new filename
-     * @param HessamPost $hessamCMSPost
+     * @param BinshopsPost $binshopsBlogPost
      * @param $image
      * @param $source string|null  the __METHOD__  firing this event (or other string)
      */
-    public function __construct(string $image_filename, $image, HessamPostTranslation $hessamCMSPost=null, string $source='other')
+    public function __construct(string $image_filename, $image, BinshopsPostTranslation $binshopsBlogPost=null, string $source='other')
     {
         $this->image_filename = $image_filename;
-        $this->hessamCMSPost=$hessamCMSPost;
+        $this->binshopsBlogPost=$binshopsBlogPost;
         $this->image=$image;
         $this->source=$source;
     }
diff --git a/src/FulltextSearch/src/Commands/Index.php b/src/FulltextSearch/src/Commands/Index.php
index 5b8cf6d..def85d8 100644
--- a/src/FulltextSearch/src/Commands/Index.php
+++ b/src/FulltextSearch/src/Commands/Index.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext\Commands;
+namespace BinshopsBlog\Laravel\Fulltext\Commands;
 
 use Illuminate\Console\Command;
-use HessamCMS\Laravel\Fulltext\Indexer;
+use BinshopsBlog\Laravel\Fulltext\Indexer;
 
 class Index extends Command
 {
diff --git a/src/FulltextSearch/src/Commands/IndexOne.php b/src/FulltextSearch/src/Commands/IndexOne.php
index 61ff8f1..564bbe6 100644
--- a/src/FulltextSearch/src/Commands/IndexOne.php
+++ b/src/FulltextSearch/src/Commands/IndexOne.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext\Commands;
+namespace BinshopsBlog\Laravel\Fulltext\Commands;
 
 use Illuminate\Console\Command;
-use HessamCMS\Laravel\Fulltext\Indexer;
+use BinshopsBlog\Laravel\Fulltext\Indexer;
 
 class IndexOne extends Command
 {
diff --git a/src/FulltextSearch/src/Commands/UnindexOne.php b/src/FulltextSearch/src/Commands/UnindexOne.php
index a7a0bf0..a8b69fe 100644
--- a/src/FulltextSearch/src/Commands/UnindexOne.php
+++ b/src/FulltextSearch/src/Commands/UnindexOne.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext\Commands;
+namespace BinshopsBlog\Laravel\Fulltext\Commands;
 
 use Illuminate\Console\Command;
-use HessamCMS\Laravel\Fulltext\Indexer;
+use BinshopsBlog\Laravel\Fulltext\Indexer;
 
 class UnindexOne extends Command
 {
diff --git a/src/FulltextSearch/src/Indexable.php b/src/FulltextSearch/src/Indexable.php
index a8f25fe..438a451 100644
--- a/src/FulltextSearch/src/Indexable.php
+++ b/src/FulltextSearch/src/Indexable.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext;
+namespace BinshopsBlog\Laravel\Fulltext;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
- * @property \HessamCMS\Laravel\Fulltext\IndexedRecord|null $indexedRecord
+ * @property \BinshopsBlog\Laravel\Fulltext\IndexedRecord|null $indexedRecord
  */
 trait Indexable
 {
diff --git a/src/FulltextSearch/src/IndexedRecord.php b/src/FulltextSearch/src/IndexedRecord.php
index 87e6694..4c572ab 100644
--- a/src/FulltextSearch/src/IndexedRecord.php
+++ b/src/FulltextSearch/src/IndexedRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext;
+namespace BinshopsBlog\Laravel\Fulltext;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -10,7 +10,7 @@ class IndexedRecord extends Model
 
     public function __construct(array $attributes = [])
     {
-        $this->connection = config('hessamcms.search.db_connection');
+        $this->connection = config('binshopsblog.search.db_connection');
 
         parent::__construct($attributes);
     }
diff --git a/src/FulltextSearch/src/Indexer.php b/src/FulltextSearch/src/Indexer.php
index a529207..394c493 100644
--- a/src/FulltextSearch/src/Indexer.php
+++ b/src/FulltextSearch/src/Indexer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext;
+namespace BinshopsBlog\Laravel\Fulltext;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/FulltextSearch/src/ModelObserver.php b/src/FulltextSearch/src/ModelObserver.php
index 9daaef2..8cc3d88 100644
--- a/src/FulltextSearch/src/ModelObserver.php
+++ b/src/FulltextSearch/src/ModelObserver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext;
+namespace BinshopsBlog\Laravel\Fulltext;
 
 class ModelObserver
 {
diff --git a/src/FulltextSearch/src/Search.php b/src/FulltextSearch/src/Search.php
index d1d7e8b..01a95d0 100644
--- a/src/FulltextSearch/src/Search.php
+++ b/src/FulltextSearch/src/Search.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext;
+namespace BinshopsBlog\Laravel\Fulltext;
 
 class Search implements SearchInterface
 {
     /**
      * @param string $search
      *
-     * @return \Illuminate\Database\Eloquent\Collection|\HessamCMS\Laravel\Fulltext\IndexedRecord[]
+     * @return \Illuminate\Database\Eloquent\Collection|\BinshopsBlog\Laravel\Fulltext\IndexedRecord[]
      */
     public function run($search)
     {
@@ -20,7 +20,7 @@ public function run($search)
      * @param $search
      * @param $class
      *
-     * @return \Illuminate\Database\Eloquent\Collection|\HessamCMS\Laravel\Fulltext\IndexedRecord[]
+     * @return \Illuminate\Database\Eloquent\Collection|\BinshopsBlog\Laravel\Fulltext\IndexedRecord[]
      */
     public function runForClass($search, $class)
     {
@@ -49,8 +49,8 @@ public function searchQuery($search)
             $termsMatch = ''.$terms->implode(' ');
         }
 
-        $titleWeight = str_replace(',', '.', (float) config('hessamcms.search.weight.title', 1.5));
-        $contentWeight = str_replace(',', '.', (float) config('hessamcms.search.weight.content', 1.0));
+        $titleWeight = str_replace(',', '.', (float) config('binshopsblog.search.weight.title', 1.5));
+        $contentWeight = str_replace(',', '.', (float) config('binshopsblog.search.weight.content', 1.0));
 
         $query = IndexedRecord::query()
           ->whereRaw('MATCH (indexed_title, indexed_content) AGAINST (? IN BOOLEAN MODE)', [$termsBool])
@@ -59,7 +59,7 @@ public function searchQuery($search)
               '.$contentWeight.' * (MATCH (indexed_title, indexed_content) AGAINST (?))
              ) DESC',
                 [$termsMatch, $termsMatch])
-            ->limit(config('hessamcms.search.limit-results'));
+            ->limit(config('binshopsblog.search.limit-results'));
 
         $query->with(['indexable' => function ($query) {
             $query->with(['post' => function($query){
diff --git a/src/FulltextSearch/src/SearchInterface.php b/src/FulltextSearch/src/SearchInterface.php
index 7e07761..22e0ae2 100644
--- a/src/FulltextSearch/src/SearchInterface.php
+++ b/src/FulltextSearch/src/SearchInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext;
+namespace BinshopsBlog\Laravel\Fulltext;
 
 interface SearchInterface
 {
diff --git a/src/FulltextSearch/src/TermBuilder.php b/src/FulltextSearch/src/TermBuilder.php
index 968d8e9..a07ba6c 100644
--- a/src/FulltextSearch/src/TermBuilder.php
+++ b/src/FulltextSearch/src/TermBuilder.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace HessamCMS\Laravel\Fulltext;
+namespace BinshopsBlog\Laravel\Fulltext;
 
 class TermBuilder
 {
     public static function terms($search)
     {
-        $wildcards = config('hessamcms.search.enable_wildcards');
+        $wildcards = config('binshopsblog.search.enable_wildcards');
 
         // Remove every boolean operator (+, -, > <, ( ), ~, *, ", @distance) from the search query
         // else we will break the MySQL query.
diff --git a/src/Helpers.php b/src/Helpers.php
index a2303e9..733c6c9 100755
--- a/src/Helpers.php
+++ b/src/Helpers.php
@@ -1,18 +1,18 @@
 <?php
-namespace HessamCMS;
+namespace BinshopsBlog;
 
 use \Session;
 
 /**
  * Class Helpers
- * @package HessamCMS
+ * @package BinshopsBlog
  */
 class Helpers
 {
     /**
      * What key to use for the session::flash / pull / has
      */
-    const FLASH_MESSAGE_SESSION_KEY = "HESSAMCMS_FLASH";
+    const FLASH_MESSAGE_SESSION_KEY = "BINSHOPSBLOG_FLASH";
 
     /**
      * Set a new message
@@ -52,8 +52,8 @@ public static function rss_html_tag()
     {
 
 
-        return '<link rel="alternate" type="application/atom+xml" title="Atom RSS Feed" href="' . e(route("hessamcms.feed")) . '?type=atom" />
-  <link rel="alternate" type="application/rss+xml" title="XML RSS Feed" href="' . e(route("hessamcms.feed")) . '?type=rss" />
+        return '<link rel="alternate" type="application/atom+xml" title="Atom RSS Feed" href="' . e(route("binshopsblog.feed")) . '?type=atom" />
+  <link rel="alternate" type="application/rss+xml" title="XML RSS Feed" href="' . e(route("binshopsblog.feed")) . '?type=rss" />
   ';
 
 
@@ -65,7 +65,7 @@ public static function rss_html_tag()
      * @deprecated
      */
     public static function image_sizes(){
-        return config("hessamcms.image_sizes");
+        return config("binshopsblog.image_sizes");
     }
 
 }
diff --git a/src/HessamCMSServiceProvider.php b/src/HessamCMSServiceProvider.php
deleted file mode 100755
index 88e9cc9..0000000
--- a/src/HessamCMSServiceProvider.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace HessamCMS;
-
-use HessamCMS\Models\HessamPostTranslation;
-use Illuminate\Support\ServiceProvider;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Laravel\Fulltext\Commands\Index;
-use HessamCMS\Laravel\Fulltext\Commands\IndexOne;
-use HessamCMS\Laravel\Fulltext\Commands\UnindexOne;
-use HessamCMS\Laravel\Fulltext\ModelObserver;
-use HessamCMS\Laravel\Fulltext\Search;
-use HessamCMS\Laravel\Fulltext\SearchInterface;
-
-class HessamCMSServiceProvider extends ServiceProvider
-{
-
-    protected $commands = [
-        Index::class,
-        IndexOne::class,
-        UnindexOne::class,
-    ];
-    /**
-     * Bootstrap services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-
-        if (config("hessamcms.search.search_enabled") == false) {
-            // if search is disabled, don't allow it to sync.
-            ModelObserver::disableSyncingFor(HessamPostTranslation::class);
-        }
-
-        if (config("hessamcms.include_default_routes", true)) {
-            include(__DIR__ . "/routes.php");
-        }
-
-        foreach ([
-                     '2020_10_16_005400_create_hessam_categories_table.php',
-                     '2020_10_16_005425_create_hessam_category_translations_table.php',
-                     '2020_10_16_010039_create_hessam_posts_table.php',
-                     '2020_10_16_010049_create_hessam_post_translations_table.php',
-                     '2020_10_16_121230_create_hessam_comments_table.php',
-                     '2020_10_16_121728_create_hessam_uploaded_photos_table.php',
-                     '2020_10_16_004241_create_hessam_languages_table.php',
-                     '2020_10_22_132005_create_hessam_configurations_table.php',
-                     '2016_11_04_152913_create_laravel_fulltext_table.php'
-                 ] as $file) {
-
-            $this->publishes([
-                __DIR__ . '/../migrations/' . $file => database_path('migrations/' . $file)
-            ]);
-
-        }
-
-        $this->publishes([
-            __DIR__ . '/Views/hessamcms' => base_path('resources/views/vendor/hessamcms'),
-            __DIR__ . '/Config/hessamcms.php' => config_path('hessamcms.php'),
-            __DIR__ . '/css/hessamcms_admin_css.css' => public_path('hessamcms_admin_css.css'),
-            __DIR__ . '/css/hessam-blog.css' => public_path('hessam-blog.css'),
-            __DIR__ . '/css/admin-setup.css' => public_path('admin-setup.css'),
-            __DIR__ . '/js/hessam-blog.js' => public_path('hessam-blog.js'),
-        ]);
-
-
-    }
-
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->bind(
-            SearchInterface::class,
-            Search::class
-        );
-
-        // for the admin backend views ( view("hessamcms_admin::BLADEFILE") )
-        $this->loadViewsFrom(__DIR__ . "/Views/hessamcms_admin", 'hessamcms_admin');
-
-        // for public facing views (view("hessamcms::BLADEFILE")):
-        // if you do the vendor:publish, these will be copied to /resources/views/vendor/hessamcms anyway
-        $this->loadViewsFrom(__DIR__ . "/Views/hessamcms", 'hessamcms');
-    }
-
-}
diff --git a/src/Interfaces/BaseRequestInterface.php b/src/Interfaces/BaseRequestInterface.php
index a9cad0d..c45580a 100755
--- a/src/Interfaces/BaseRequestInterface.php
+++ b/src/Interfaces/BaseRequestInterface.php
@@ -1,4 +1,4 @@
-<?php namespace HessamCMS\Interfaces;
+<?php namespace BinshopsBlog\Interfaces;
 
 interface BaseRequestInterface
 {
diff --git a/src/Interfaces/CaptchaInterface.php b/src/Interfaces/CaptchaInterface.php
index 8906b38..0ecdd20 100644
--- a/src/Interfaces/CaptchaInterface.php
+++ b/src/Interfaces/CaptchaInterface.php
@@ -1,4 +1,4 @@
-<?php namespace HessamCMS\Interfaces;
+<?php namespace BinshopsBlog\Interfaces;
 
 interface CaptchaInterface
 {
diff --git a/src/Interfaces/SearchResultInterface.php b/src/Interfaces/SearchResultInterface.php
index 52a2ae6..f15b892 100644
--- a/src/Interfaces/SearchResultInterface.php
+++ b/src/Interfaces/SearchResultInterface.php
@@ -1,4 +1,4 @@
-<?php namespace HessamCMS\Interfaces;
+<?php namespace BinshopsBlog\Interfaces;
 
 interface SearchResultInterface
 {
diff --git a/src/Middleware/DetectLanguage.php b/src/Middleware/DetectLanguage.php
index 42f498e..a2bf3cb 100644
--- a/src/Middleware/DetectLanguage.php
+++ b/src/Middleware/DetectLanguage.php
@@ -1,16 +1,16 @@
 <?php
 
 
-namespace HessamCMS\Middleware;
+namespace BinshopsBlog\Middleware;
 
 use Closure;
-use HessamCMS\Models\HessamLanguage;
+use BinshopsBlog\Models\BinshopsLanguage;
 
 class DetectLanguage
 {
     public function handle($request, Closure $next)
     {
-        $lang = HessamLanguage::where('locale', $request->route('locale'))
+        $lang = BinshopsLanguage::where('locale', $request->route('locale'))
             ->where('active', true)
             ->first();
 
diff --git a/src/Middleware/LoadLanguage.php b/src/Middleware/LoadLanguage.php
index 2f14cc8..08c7479 100644
--- a/src/Middleware/LoadLanguage.php
+++ b/src/Middleware/LoadLanguage.php
@@ -1,18 +1,18 @@
 <?php
 
 
-namespace HessamCMS\Middleware;
+namespace BinshopsBlog\Middleware;
 use Closure;
-use HessamCMS\Models\HessamConfiguration;
-use HessamCMS\Models\HessamLanguage;
+use BinshopsBlog\Models\BinshopsConfiguration;
+use BinshopsBlog\Models\BinshopsLanguage;
 
 class LoadLanguage
 {
 
     public function handle($request, Closure $next)
     {
-        $default_locale = HessamConfiguration::get('DEFAULT_LANGUAGE_LOCALE');
-        $lang = HessamLanguage::where('locale', $default_locale)
+        $default_locale = BinshopsConfiguration::get('DEFAULT_LANGUAGE_LOCALE');
+        $lang = BinshopsLanguage::where('locale', $default_locale)
             ->first();
 
         $request->attributes->add([
diff --git a/src/Middleware/PackageSetup.php b/src/Middleware/PackageSetup.php
index c94eb06..fe71282 100644
--- a/src/Middleware/PackageSetup.php
+++ b/src/Middleware/PackageSetup.php
@@ -1,18 +1,18 @@
 <?php
 
 
-namespace HessamCMS\Middleware;
+namespace BinshopsBlog\Middleware;
 
 use Closure;
-use HessamCMS\Models\HessamConfiguration;
+use BinshopsBlog\Models\BinshopsConfiguration;
 
 class PackageSetup
 {
     public function handle($request, Closure $next)
     {
-        $initial_setup = HessamConfiguration::get('INITIAL_SETUP');
+        $initial_setup = BinshopsConfiguration::get('INITIAL_SETUP');
         if (!$initial_setup){
-            return redirect( route('hessamcms.admin.setup') );
+            return redirect( route('binshopsblog.admin.setup') );
         }
 
         return $next($request);
diff --git a/src/Middleware/UserCanManageBlogPosts.php b/src/Middleware/UserCanManageBlogPosts.php
index e840600..d26fb54 100755
--- a/src/Middleware/UserCanManageBlogPosts.php
+++ b/src/Middleware/UserCanManageBlogPosts.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace HessamCMS\Middleware;
+namespace BinshopsBlog\Middleware;
 
 use Closure;
 
 /**
  * Class UserCanManageBlogPosts
- * @package HessamCMS\Middleware
+ * @package BinshopsBlog\Middleware
  */
 class UserCanManageBlogPosts
 {
 
     /**
-     * Show 401 error if \Auth::user()->canManageHessamCMSPosts() == false
+     * Show 401 error if \Auth::user()->canManageBinshopsBlogPosts() == false
      * @param $request
      * @param Closure $next
      * @return mixed
@@ -23,7 +23,7 @@ public function handle($request, Closure $next)
             abort(401,"User not authorised to manage blog posts: You are not logged in");
             return redirect('/login');
         }
-        if (!\Auth::user()->canManageHessamCMSPosts()) {
+        if (!\Auth::user()->canManageBinshopsBlogPosts()) {
             abort(401,"User not authorised to manage blog posts: Your account is not authorised to edit blog posts");
         }
         return $next($request);
diff --git a/src/Models/HessamCategory.php b/src/Models/BinshopsCategory.php
similarity index 77%
rename from src/Models/HessamCategory.php
rename to src/Models/BinshopsCategory.php
index 2e7a102..e7d400a 100755
--- a/src/Models/HessamCategory.php
+++ b/src/Models/BinshopsCategory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
-use HessamCMS\Baum\Node;
+use BinshopsBlog\Baum\Node;
 
-class HessamCategory extends Node
+class BinshopsCategory extends Node
 {
     protected $parentColumn = 'parent_id';
     public $siblings = array();
@@ -27,7 +27,7 @@ public static function boot() {
      */
     public function categoryTranslations()
     {
-        return $this->hasMany(HessamCategoryTranslation::class,"category_id");
+        return $this->hasMany(BinshopsCategoryTranslation::class,"category_id");
     }
 
     /**
@@ -35,7 +35,7 @@ public function categoryTranslations()
      */
     public function posts()
     {
-        return $this->belongsToMany(HessamPost::class, 'hessam_post_categories','category_id', 'post_id');
+        return $this->belongsToMany(BinshopsPost::class, 'binshops_post_categories','category_id', 'post_id');
     }
 
     public function loadSiblings(){
@@ -53,12 +53,12 @@ public static function loadSiblingsWithList($node_list){
 
 //    public function parent()
 //    {
-//        return $this->belongsTo('HessamCMS\Models\HessamCategory', 'parent_id');
+//        return $this->belongsTo('BinshopsBlog\Models\BinshopsCategory', 'parent_id');
 //    }
 //
 //    public function children()
 //    {
-//        return $this->hasMany('HessamCMS\Models\HessamCategory', 'parent_id');
+//        return $this->hasMany('BinshopsBlog\Models\BinshopsCategory', 'parent_id');
 //    }
 //
 //    // recursive, loads all descendants
diff --git a/src/Models/HessamCategoryTranslation.php b/src/Models/BinshopsCategoryTranslation.php
similarity index 73%
rename from src/Models/HessamCategoryTranslation.php
rename to src/Models/BinshopsCategoryTranslation.php
index 163be38..955fcd3 100644
--- a/src/Models/HessamCategoryTranslation.php
+++ b/src/Models/BinshopsCategoryTranslation.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class HessamCategoryTranslation extends Model
+class BinshopsCategoryTranslation extends Model
 {
 
     public $fillable = [
@@ -21,7 +21,7 @@ class HessamCategoryTranslation extends Model
      */
     public function category()
     {
-        return $this->belongsTo(HessamCategory::class, 'category_id');
+        return $this->belongsTo(BinshopsCategory::class, 'category_id');
     }
 
     /**
@@ -30,7 +30,7 @@ public function category()
      */
     public function language()
     {
-        return $this->hasOne(HessamLanguage::class,"lang_id");
+        return $this->hasOne(BinshopsLanguage::class,"lang_id");
     }
 
     /**
@@ -45,7 +45,7 @@ public function url($loacle)
         foreach ($chain as $category){
             $theChainString .=  "/" . $category->categoryTranslations()->where('lang_id' , $this->lang_id)->first()->slug;
         }
-        return route("hessamcms.view_category",[$loacle, $theChainString]);
+        return route("binshopsblog.view_category",[$loacle, $theChainString]);
     }
 
     /**
@@ -54,6 +54,6 @@ public function url($loacle)
      */
     public function edit_url()
     {
-        return route("hessamcms.admin.categories.edit_category", $this->category_id);
+        return route("binshopsblog.admin.categories.edit_category", $this->category_id);
     }
 }
diff --git a/src/Models/HessamComment.php b/src/Models/BinshopsComment.php
similarity index 70%
rename from src/Models/HessamComment.php
rename to src/Models/BinshopsComment.php
index d96dcc9..b621d0e 100755
--- a/src/Models/HessamComment.php
+++ b/src/Models/BinshopsComment.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
 use App\User;
 use Illuminate\Database\Eloquent\Model;
-use HessamCMS\Scopes\BlogCommentApprovedAndDefaultOrderScope;
+use BinshopsBlog\Scopes\BlogCommentApprovedAndDefaultOrderScope;
 
-class HessamComment extends Model
+class BinshopsComment extends Model
 {
     public $casts = [
         'approved' => 'boolean',
@@ -28,7 +28,7 @@ protected static function boot()
     {
         parent::boot();
 
-        /* If user is logged in and \Auth::user()->canManageHessamCMSPosts() == true, show any/all posts.
+        /* If user is logged in and \Auth::user()->canManageBinshopsBlogPosts() == true, show any/all posts.
            otherwise (which will be for most users) it should only show published posts that have a posted_at
            time <= Carbon::now(). This sets it up: */
         static::addGlobalScope(new BlogCommentApprovedAndDefaultOrderScope());
@@ -37,12 +37,12 @@ protected static function boot()
 
 
     /**
-     * The associated HessamPost
+     * The associated BinshopsPost
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function post()
     {
-        return $this->belongsTo(HessamPost::class,"post_id");
+        return $this->belongsTo(BinshopsPost::class,"post_id");
     }
 
     /**
@@ -51,7 +51,7 @@ public function post()
      */
     public function user()
     {
-        return $this->belongsTo(config("hessamcms.user_model"), 'user_id');
+        return $this->belongsTo(config("binshopsblog.user_model"), 'user_id');
     }
 
     /**
@@ -62,7 +62,7 @@ public function user()
     public function author()
     {
         if ($this->user_id) {
-            $field = config("hessamcms.comments.user_field_for_author_name","name");
+            $field = config("binshopsblog.comments.user_field_for_author_name","name");
             return optional($this->user)->$field;
         }
 
diff --git a/src/Models/HessamConfiguration.php b/src/Models/BinshopsConfiguration.php
similarity index 71%
rename from src/Models/HessamConfiguration.php
rename to src/Models/BinshopsConfiguration.php
index 5540ef5..59a583e 100644
--- a/src/Models/HessamConfiguration.php
+++ b/src/Models/BinshopsConfiguration.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -9,7 +9,7 @@
 /**
  *
  */
-class HessamConfiguration extends Model
+class BinshopsConfiguration extends Model
 {
     protected $primaryKey = 'key';
 
@@ -19,7 +19,7 @@ class HessamConfiguration extends Model
     ];
 
     public static function get($key){
-        $obj = HessamConfiguration::where('key', $key)->first();
+        $obj = BinshopsConfiguration::where('key', $key)->first();
         if ($obj){
             return $obj->value;
         }
@@ -29,7 +29,7 @@ public static function get($key){
     }
 
     public static function set($key, $value){
-        $config = new HessamConfiguration();
+        $config = new BinshopsConfiguration();
         $config->key = $key;
         $config->value = $value;
         $config->save();
diff --git a/src/Models/HessamLanguage.php b/src/Models/BinshopsLanguage.php
similarity index 71%
rename from src/Models/HessamLanguage.php
rename to src/Models/BinshopsLanguage.php
index 8c932b8..1ba7a87 100644
--- a/src/Models/HessamLanguage.php
+++ b/src/Models/BinshopsLanguage.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class HessamLanguage extends Model
+class BinshopsLanguage extends Model
 {
     public $fillable = [
         'name',
@@ -22,7 +22,7 @@ class HessamLanguage extends Model
      */
     public function post()
     {
-        return $this->belongsTo(HessamPost::class, 'post_id');
+        return $this->belongsTo(BinshopsPost::class, 'post_id');
     }
 
     /**
@@ -31,7 +31,7 @@ public function post()
      */
     public function category()
     {
-        return $this->belongsTo(HessamCategory::class, 'category_id');
+        return $this->belongsTo(BinshopsCategory::class, 'category_id');
     }
 
 }
\ No newline at end of file
diff --git a/src/Models/HessamPost.php b/src/Models/BinshopsPost.php
similarity index 73%
rename from src/Models/HessamPost.php
rename to src/Models/BinshopsPost.php
index 53d7a04..d2cd89d 100755
--- a/src/Models/HessamPost.php
+++ b/src/Models/BinshopsPost.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use HessamCMS\Scopes\HessamCMSPublishedScope;
+use BinshopsBlog\Scopes\BinshopsBlogPublishedScope;
 
 /**
- * Class HessamPost
- * @package HessamCMS\Models
+ * Class BinshopsPost
+ * @package BinshopsBlog\Models
  */
-class HessamPost extends Model
+class BinshopsPost extends Model
 {
     /**
      * @var array
@@ -39,7 +39,7 @@ class HessamPost extends Model
      */
     public function postTranslations()
     {
-        return $this->hasMany(HessamPostTranslation::class,"post_id");
+        return $this->hasMany(BinshopsPostTranslation::class,"post_id");
     }
 
     /**
@@ -51,10 +51,10 @@ protected static function boot()
     {
         parent::boot();
 
-        /* If user is logged in and \Auth::user()->canManageHessamCMSPosts() == true, show any/all posts.
+        /* If user is logged in and \Auth::user()->canManageBinshopsBlogPosts() == true, show any/all posts.
            otherwise (which will be for most users) it should only show published posts that have a posted_at
            time <= Carbon::now(). This sets it up: */
-        static::addGlobalScope(new HessamCMSPublishedScope());
+        static::addGlobalScope(new BinshopsBlogPublishedScope());
 
         static::deleting(function($post) { // before delete() method call this
             $post->postTranslations()->delete();
@@ -67,7 +67,7 @@ protected static function boot()
      */
     public function author()
     {
-        return $this->belongsTo(config("hessamcms.user_model"), 'user_id');
+        return $this->belongsTo(config("binshopsblog.user_model"), 'user_id');
     }
 
     /**
@@ -90,7 +90,7 @@ public function author_string()
      */
     public function categories()
     {
-        return $this->belongsToMany(HessamCategory::class, 'hessam_post_categories','post_id','category_id');
+        return $this->belongsToMany(BinshopsCategory::class, 'binshops_post_categories','post_id','category_id');
     }
 
     /**
@@ -100,7 +100,7 @@ public function categories()
      */
     public function comments()
     {
-        return $this->hasMany(HessamComment::class, 'post_id');
+        return $this->hasMany(BinshopsComment::class, 'post_id');
     }
 
 }
diff --git a/src/Models/HessamPostTranslation.php b/src/Models/BinshopsPostTranslation.php
similarity index 77%
rename from src/Models/HessamPostTranslation.php
rename to src/Models/BinshopsPostTranslation.php
index 7f8aeff..614a87f 100644
--- a/src/Models/HessamPostTranslation.php
+++ b/src/Models/BinshopsPostTranslation.php
@@ -1,14 +1,14 @@
 <?php
 
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
 use Cviebrock\EloquentSluggable\Sluggable;
-use HessamCMS\Laravel\Fulltext\Indexable;
+use BinshopsBlog\Laravel\Fulltext\Indexable;
 use Illuminate\Database\Eloquent\Model;
-use HessamCMS\Interfaces\SearchResultInterface;
+use BinshopsBlog\Interfaces\SearchResultInterface;
 
-class HessamPostTranslation extends Model implements SearchResultInterface
+class BinshopsPostTranslation extends Model implements SearchResultInterface
 {
     use Sluggable;
     use Indexable;
@@ -32,7 +32,7 @@ class HessamPostTranslation extends Model implements SearchResultInterface
      */
     public function post()
     {
-        return $this->belongsTo(HessamPost::class, 'post_id');
+        return $this->belongsTo(BinshopsPost::class, 'post_id');
     }
 
     /**
@@ -41,7 +41,7 @@ public function post()
      */
     public function language()
     {
-        return $this->hasOne(HessamLanguage::class,"lang_id");
+        return $this->hasOne(BinshopsLanguage::class,"lang_id");
     }
 
     /**
@@ -105,7 +105,7 @@ public function image_url($size = 'medium')
     {
         $this->check_valid_image_size($size);
         $filename = $this->{"image_" . $size};
-        return asset(config("hessamcms.blog_upload_dir", "blog_images") . "/" . $filename);
+        return asset(config("binshopsblog.blog_upload_dir", "blog_images") . "/" . $filename);
     }
 
     /**
@@ -144,23 +144,23 @@ public function generate_introduction($max_len = 500)
 
     public function post_body_output()
     {
-        if (config("hessamcms.use_custom_view_files") && $this->use_view_file) {
+        if (config("binshopsblog.use_custom_view_files") && $this->use_view_file) {
             // using custom view files is enabled, and this post has a use_view_file set, so render it:
-            $return = view("hessamcms::partials.use_view_file", ['post' => $this])->render();
+            $return = view("binshopsblog::partials.use_view_file", ['post' => $this])->render();
         } else {
             // just use the plain ->post_body
             $return = $this->post_body;
         }
 
 
-        if (!config("hessamcms.echo_html")) {
+        if (!config("binshopsblog.echo_html")) {
             // if this is not true, then we should escape the output
-            if (config("hessamcms.strip_html")) {
+            if (config("binshopsblog.strip_html")) {
                 $return = strip_tags($return);
             }
 
             $return = e($return);
-            if (config("hessamcms.auto_nl2br")) {
+            if (config("binshopsblog.auto_nl2br")) {
                 $return = nl2br($return);
             }
         }
@@ -180,7 +180,7 @@ protected function check_valid_image_size(string $size = 'medium')
     {
 
 
-        if (array_key_exists("image_" . $size, config("hessamcms.image_sizes"))) {
+        if (array_key_exists("image_" . $size, config("binshopsblog.image_sizes"))) {
             return true;
         }
 
@@ -188,19 +188,19 @@ protected function check_valid_image_size(string $size = 'medium')
 
         if (starts_with($size, "image_")) {
             // $size starts with image_, which is an error
-            /* the config/hessamcms.php and the DB columns SHOULD have keys that start with image_$size
+            /* the config/binshopsblog.php and the DB columns SHOULD have keys that start with image_$size
             however when using methods such as image_url() or has_image() it SHOULD NOT start with 'image_'
 
             To put another way: :
-                in the config/hessamcms.php : config("hessamcms.image_sizes.image_medium")
-                in the database table:    : hessamcms_posts.image_medium
+                in the config/binshopsblog.php : config("binshopsblog.image_sizes.image_medium")
+                in the database table:    : binshopsblog_posts.image_medium
                 when calling image_url()  : image_url("medium")
             */
-            throw new \InvalidArgumentException("Invalid image size ($size). HessamPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the hessamcms.image_sizes config though!");
+            throw new \InvalidArgumentException("Invalid image size ($size). BinshopsPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the binshopsblog.image_sizes config though!");
         }
 
 
-        throw new \InvalidArgumentException("HessamPost image size should be 'large','medium','thumbnail' or another field as defined in config/hessamcms.php. Provided size ($size) is not valid");
+        throw new \InvalidArgumentException("BinshopsPost image size should be 'large','medium','thumbnail' or another field as defined in config/binshopsblog.php. Provided size ($size) is not valid");
     }
 
 
@@ -226,7 +226,7 @@ public function gen_seo_title()
      */
     public function url($loacle)
     {
-        return route("hessamcms.single", [$loacle, $this->slug]);
+        return route("binshopsblog.single", [$loacle, $this->slug]);
     }
 
     /**
@@ -235,6 +235,6 @@ public function url($loacle)
      */
     public function edit_url()
     {
-        return route("hessamcms.admin.edit_post", $this->post_id);
+        return route("binshopsblog.admin.edit_post", $this->post_id);
     }
 }
diff --git a/src/Models/HessamUploadedPhoto.php b/src/Models/BinshopsUploadedPhoto.php
similarity index 66%
rename from src/Models/HessamUploadedPhoto.php
rename to src/Models/BinshopsUploadedPhoto.php
index 66adc09..dfe1916 100644
--- a/src/Models/HessamUploadedPhoto.php
+++ b/src/Models/BinshopsUploadedPhoto.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace HessamCMS\Models;
+namespace BinshopsBlog\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class HessamUploadedPhoto extends Model
+class BinshopsUploadedPhoto extends Model
 {
-    public $table = 'hessam_uploaded_photos';
+    public $table = 'binshops_uploaded_photos';
     public $casts = [
         'uploaded_images' => 'array',
     ];
diff --git a/src/Requests/AddNewCommentRequest.php b/src/Requests/AddNewCommentRequest.php
index 207fecd..bc46526 100755
--- a/src/Requests/AddNewCommentRequest.php
+++ b/src/Requests/AddNewCommentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -9,7 +9,7 @@ class AddNewCommentRequest extends FormRequest
 
     public function authorize()
     {
-        if (config("hessamcms.comments.type_of_comments_to_show") === 'built_in') {
+        if (config("binshopsblog.comments.type_of_comments_to_show") === 'built_in') {
             // anyone is allowed to submit a comment, to return true always.
             return true;
         }
@@ -34,7 +34,7 @@ public function rules()
         ];
 
         // do we need author name?
-        if (\Auth::check() && config("hessamcms.comments.save_user_id_if_logged_in", true)) {
+        if (\Auth::check() && config("binshopsblog.comments.save_user_id_if_logged_in", true)) {
             // is logged in, so we don't need an author name (it won't get used)
             $return['author_name'][] = 'nullable';
         } else {
@@ -43,24 +43,24 @@ public function rules()
         }
 
         // is captcha enabled? If so, get the rules from its class.
-        if (config("hessamcms.captcha.captcha_enabled")) {
+        if (config("binshopsblog.captcha.captcha_enabled")) {
             /** @var string $captcha_class */
-            $captcha_class = config("hessamcms.captcha.captcha_type");
+            $captcha_class = config("binshopsblog.captcha.captcha_type");
 
-            /** @var \HessamCMS\Interfaces\CaptchaInterface $captcha */
+            /** @var \BinshopsBlog\Interfaces\CaptchaInterface $captcha */
             $captcha = new $captcha_class;
 
             $return[$captcha->captcha_field_name()] = $captcha->rules();
         }
 
         // in case you need to implement something custom, you can use this...
-        if (config("hessamcms.comments.rules") && is_callable(config("hessamcms.comments.rules"))) {
+        if (config("binshopsblog.comments.rules") && is_callable(config("binshopsblog.comments.rules"))) {
             /** @var callable $func */
-            $func = config('hessamcms.comments.rules');
+            $func = config('binshopsblog.comments.rules');
             $return = $func($return);
         }
 
-        if (config("hessamcms.comments.require_author_email")) {
+        if (config("binshopsblog.comments.require_author_email")) {
             $return['author_email'][] = 'required';
         }
 
diff --git a/src/Requests/BaseHessamCMSCategoryRequest.php b/src/Requests/BaseBinshopsBlogCategoryRequest.php
similarity index 82%
rename from src/Requests/BaseHessamCMSCategoryRequest.php
rename to src/Requests/BaseBinshopsBlogCategoryRequest.php
index c3081d2..4e5f8e8 100755
--- a/src/Requests/BaseHessamCMSCategoryRequest.php
+++ b/src/Requests/BaseBinshopsBlogCategoryRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
-abstract class BaseHessamCMSCategoryRequest extends BaseRequest
+abstract class BaseBinshopsBlogCategoryRequest extends BaseRequest
 {
     /**
      * Shared rules for categories
diff --git a/src/Requests/BaseHessamCMSPostRequest.php b/src/Requests/BaseBinshopsBlogPostRequest.php
similarity index 89%
rename from src/Requests/BaseHessamCMSPostRequest.php
rename to src/Requests/BaseBinshopsBlogPostRequest.php
index 6acf2d7..3c26770 100755
--- a/src/Requests/BaseHessamCMSPostRequest.php
+++ b/src/Requests/BaseBinshopsBlogPostRequest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 use Carbon\Carbon;
 
-abstract class BaseHessamCMSPostRequest extends BaseRequest
+abstract class BaseBinshopsBlogPostRequest extends BaseRequest
 {
 
     /**
@@ -57,7 +57,7 @@ protected function baseBlogPostRules()
 
 
         // is use_custom_view_files true?
-        if (config('hessamcms.use_custom_view_files')) {
+        if (config('binshopsblog.use_custom_view_files')) {
             $return['use_view_file'] = ['nullable', 'string', 'alpha_num', 'min:1', 'max:75',];
         } else {
             // use_view_file is disabled, so give an empty if anything is submitted via this function:
@@ -65,8 +65,8 @@ protected function baseBlogPostRules()
         }
 
         // some additional rules for uploaded images
-        foreach ((array)config('hessamcms.image_sizes') as $size => $image_detail) {
-            if ($image_detail['enabled'] && config("hessamcms.image_upload_enabled")) {
+        foreach ((array)config('binshopsblog.image_sizes') as $size => $image_detail) {
+            if ($image_detail['enabled'] && config("binshopsblog.image_upload_enabled")) {
                 $return[$size] = ['nullable', 'image',];
             } else {
                 // was not enabled (or all images are disabled), so show an error if it was submitted:
diff --git a/src/Requests/BaseRequest.php b/src/Requests/BaseRequest.php
index abadb46..5d3b9b4 100755
--- a/src/Requests/BaseRequest.php
+++ b/src/Requests/BaseRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use HessamCMS\Interfaces\BaseRequestInterface;
+use BinshopsBlog\Interfaces\BaseRequestInterface;
 
 /**
  * Class BaseRequest
- * @package HessamCMS\Requests
+ * @package BinshopsBlog\Requests
  */
 abstract class BaseRequest extends FormRequest implements BaseRequestInterface
 {
@@ -18,6 +18,6 @@ abstract class BaseRequest extends FormRequest implements BaseRequestInterface
      */
     public function authorize()
     {
-        return \Auth::check() && \Auth::user()->canManageHessamCMSPosts();
+        return \Auth::check() && \Auth::user()->canManageBinshopsBlogPosts();
     }
 }
diff --git a/src/Requests/CreateHessamCMSPostRequest.php b/src/Requests/CreateBinshopsBlogPostRequest.php
similarity index 60%
rename from src/Requests/CreateHessamCMSPostRequest.php
rename to src/Requests/CreateBinshopsBlogPostRequest.php
index c466f14..f874d6a 100755
--- a/src/Requests/CreateHessamCMSPostRequest.php
+++ b/src/Requests/CreateBinshopsBlogPostRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 
 use Illuminate\Validation\Rule;
-use HessamCMS\Requests\Traits\HasCategoriesTrait;
-use HessamCMS\Requests\Traits\HasImageUploadTrait;
+use BinshopsBlog\Requests\Traits\HasCategoriesTrait;
+use BinshopsBlog\Requests\Traits\HasImageUploadTrait;
 
-class CreateHessamCMSPostRequest extends BaseHessamCMSPostRequest
+class CreateBinshopsBlogPostRequest extends BaseBinshopsBlogPostRequest
 {
     use HasCategoriesTrait;
     use HasImageUploadTrait;
diff --git a/src/Requests/CreateHessamPostToggleRequest.php b/src/Requests/CreateBinshopsPostToggleRequest.php
similarity index 57%
rename from src/Requests/CreateHessamPostToggleRequest.php
rename to src/Requests/CreateBinshopsPostToggleRequest.php
index 3c57cd2..f5cc5ba 100755
--- a/src/Requests/CreateHessamPostToggleRequest.php
+++ b/src/Requests/CreateBinshopsPostToggleRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 
 use Illuminate\Validation\Rule;
-use HessamCMS\Requests\Traits\HasCategoriesTrait;
-use HessamCMS\Requests\Traits\HasImageUploadTrait;
+use BinshopsBlog\Requests\Traits\HasCategoriesTrait;
+use BinshopsBlog\Requests\Traits\HasImageUploadTrait;
 
-class CreateHessamPostToggleRequest extends BaseHessamCMSPostRequest
+class CreateBinshopsPostToggleRequest extends BaseBinshopsBlogPostRequest
 {
     use HasCategoriesTrait;
     use HasImageUploadTrait;
diff --git a/src/Requests/DeleteHessamCMSCategoryRequest.php b/src/Requests/DeleteBinshopsBlogCategoryRequest.php
similarity index 70%
rename from src/Requests/DeleteHessamCMSCategoryRequest.php
rename to src/Requests/DeleteBinshopsBlogCategoryRequest.php
index 1e288a7..35ae88a 100755
--- a/src/Requests/DeleteHessamCMSCategoryRequest.php
+++ b/src/Requests/DeleteBinshopsBlogCategoryRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 
-class DeleteHessamCMSCategoryRequest  extends BaseRequest {
+class DeleteBinshopsBlogCategoryRequest  extends BaseRequest {
 
 
     /**
diff --git a/src/Requests/DeleteHessamCMSPostRequest.php b/src/Requests/DeleteBinshopsBlogPostRequest.php
similarity index 73%
rename from src/Requests/DeleteHessamCMSPostRequest.php
rename to src/Requests/DeleteBinshopsBlogPostRequest.php
index 3ee7778..aa3ad64 100755
--- a/src/Requests/DeleteHessamCMSPostRequest.php
+++ b/src/Requests/DeleteBinshopsBlogPostRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 
-class DeleteHessamCMSPostRequest  extends BaseRequest {
+class DeleteBinshopsBlogPostRequest  extends BaseRequest {
 
 
     /**
diff --git a/src/Requests/FeedRequest.php b/src/Requests/FeedRequest.php
index 367f07b..410a970 100755
--- a/src/Requests/FeedRequest.php
+++ b/src/Requests/FeedRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/src/Requests/SearchRequest.php b/src/Requests/SearchRequest.php
index 3189435..8bbd716 100755
--- a/src/Requests/SearchRequest.php
+++ b/src/Requests/SearchRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -8,7 +8,7 @@ class SearchRequest extends FormRequest
 {
     public function authorize()
     {
-        if (config("hessamcms.search.search_enabled")) {
+        if (config("binshopsblog.search.search_enabled")) {
             // anyone is allowed to submit a comment, to return true always.
             return true;
         }
diff --git a/src/Requests/Traits/HasCategoriesTrait.php b/src/Requests/Traits/HasCategoriesTrait.php
index fd28c00..ec560aa 100755
--- a/src/Requests/Traits/HasCategoriesTrait.php
+++ b/src/Requests/Traits/HasCategoriesTrait.php
@@ -1,10 +1,10 @@
-<?php namespace HessamCMS\Requests\Traits;
+<?php namespace BinshopsBlog\Requests\Traits;
 
-use HessamCMS\Models\HessamCategory;
+use BinshopsBlog\Models\BinshopsCategory;
 
 /**
  * Class HasCategoriesTrait
- * @package HessamCMS\Requests\Traits
+ * @package BinshopsBlog\Requests\Traits
  */
 trait HasCategoriesTrait
 {
@@ -25,7 +25,7 @@ public function categories()
 
         // check they are valid, return the IDs
         // limit to 1000 ... just in case someone submits with too many for the web server. No error is given if they submit more than 1k.
-        $vals = HessamCategory::whereIn("id", array_keys($this->get("category")))->select("id")->limit(1000)->get();
+        $vals = BinshopsCategory::whereIn("id", array_keys($this->get("category")))->select("id")->limit(1000)->get();
         $vals = array_values($vals->pluck("id")->toArray());
 
         return $vals;
diff --git a/src/Requests/Traits/HasImageUploadTrait.php b/src/Requests/Traits/HasImageUploadTrait.php
index bbac2da..e25f12a 100755
--- a/src/Requests/Traits/HasImageUploadTrait.php
+++ b/src/Requests/Traits/HasImageUploadTrait.php
@@ -1,4 +1,4 @@
-<?php namespace HessamCMS\Requests\Traits;
+<?php namespace BinshopsBlog\Requests\Traits;
 
 
 
@@ -16,7 +16,7 @@ public function get_image_file($size)
         }
 
         // not found? lets cycle through all the images and see if anything was submitted, and use that instead
-        foreach (config("hessamcms.image_sizes") as $image_size_name => $image_size_info) {
+        foreach (config("binshopsblog.image_sizes") as $image_size_name => $image_size_info) {
             if ($this->file($image_size_name)) {
                 return $this->file($image_size_name);
             }
diff --git a/src/Requests/UpdateHessamCMSCategoryRequest.php b/src/Requests/UpdateBinshopsBlogCategoryRequest.php
similarity index 62%
rename from src/Requests/UpdateHessamCMSCategoryRequest.php
rename to src/Requests/UpdateBinshopsBlogCategoryRequest.php
index 8ae50ac..8674045 100755
--- a/src/Requests/UpdateHessamCMSCategoryRequest.php
+++ b/src/Requests/UpdateBinshopsBlogCategoryRequest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 
 use Illuminate\Validation\Rule;
-use HessamCMS\Models\HessamCategory;
+use BinshopsBlog\Models\BinshopsCategory;
 
-class UpdateHessamCMSCategoryRequest extends BaseHessamCMSCategoryRequest
+class UpdateBinshopsBlogCategoryRequest extends BaseBinshopsBlogCategoryRequest
 {
 
 
diff --git a/src/Requests/UpdateBinshopsBlogPostRequest.php b/src/Requests/UpdateBinshopsBlogPostRequest.php
new file mode 100755
index 0000000..4f30db2
--- /dev/null
+++ b/src/Requests/UpdateBinshopsBlogPostRequest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace BinshopsBlog\Requests;
+
+
+use Illuminate\Validation\Rule;
+use BinshopsBlog\Models\BinshopsPost;
+use BinshopsBlog\Requests\Traits\HasCategoriesTrait;
+use BinshopsBlog\Requests\Traits\HasImageUploadTrait;
+
+class UpdateBinshopsBlogPostRequest  extends BaseBinshopsBlogPostRequest {
+
+    use HasCategoriesTrait;
+    use HasImageUploadTrait;
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $return = $this->baseBlogPostRules();
+//        $return['slug'] [] = Rule::unique("binshops_post_translations", "slug")->ignore($this->route()->parameter("blogPostId"));
+        return $return;
+    }
+}
diff --git a/src/Requests/UpdateHessamCMSPostRequest.php b/src/Requests/UpdateHessamCMSPostRequest.php
deleted file mode 100755
index 31d4e55..0000000
--- a/src/Requests/UpdateHessamCMSPostRequest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace HessamCMS\Requests;
-
-
-use Illuminate\Validation\Rule;
-use HessamCMS\Models\HessamPost;
-use HessamCMS\Requests\Traits\HasCategoriesTrait;
-use HessamCMS\Requests\Traits\HasImageUploadTrait;
-
-class UpdateHessamCMSPostRequest  extends BaseHessamCMSPostRequest {
-
-    use HasCategoriesTrait;
-    use HasImageUploadTrait;
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        $return = $this->baseBlogPostRules();
-//        $return['slug'] [] = Rule::unique("hessam_post_translations", "slug")->ignore($this->route()->parameter("blogPostId"));
-        return $return;
-    }
-}
diff --git a/src/Requests/UploadImageRequest.php b/src/Requests/UploadImageRequest.php
index b701278..6128b4e 100755
--- a/src/Requests/UploadImageRequest.php
+++ b/src/Requests/UploadImageRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace HessamCMS\Requests;
+namespace BinshopsBlog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use HessamCMS\Interfaces\BaseRequestInterface;
+use BinshopsBlog\Interfaces\BaseRequestInterface;
 
 /**
  * Class BaseRequest
- * @package HessamCMS\Requests
+ * @package BinshopsBlog\Requests
  */
 class UploadImageRequest extends BaseRequest
 {
diff --git a/src/Scopes/HessamCMSPublishedScope.php b/src/Scopes/BinshopsBlogPublishedScope.php
similarity index 72%
rename from src/Scopes/HessamCMSPublishedScope.php
rename to src/Scopes/BinshopsBlogPublishedScope.php
index 9eeb0d6..c3a0c59 100755
--- a/src/Scopes/HessamCMSPublishedScope.php
+++ b/src/Scopes/BinshopsBlogPublishedScope.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace HessamCMS\Scopes;
+namespace BinshopsBlog\Scopes;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 
-class HessamCMSPublishedScope implements Scope
+class BinshopsBlogPublishedScope implements Scope
 {
     /**
-     * If user is logged in and canManageHessamCMSPosts() == true, then don't add any scope
+     * If user is logged in and canManageBinshopsBlogPosts() == true, then don't add any scope
      * But for everyone else then it should only show PUBLISHED posts with a POSTED_AT < NOW()
      *
      * @param  \Illuminate\Database\Eloquent\Builder $builder
@@ -19,7 +19,7 @@ class HessamCMSPublishedScope implements Scope
      */
     public function apply(Builder $builder, Model $model)
     {
-        if (!\Auth::check() || ! \Auth::user()->canManageHessamCMSPosts()) {
+        if (!\Auth::check() || ! \Auth::user()->canManageBinshopsBlogPosts()) {
             // user is a guest, or if logged in they can't manage blog posts
             $builder->where("is_published", true);
             $builder->where("posted_at", "<=", Carbon::now());
diff --git a/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php b/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php
index 25184ab..70615f4 100755
--- a/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php
+++ b/src/Scopes/BlogCommentApprovedAndDefaultOrderScope.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace HessamCMS\Scopes;
+namespace BinshopsBlog\Scopes;
 
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Database\Eloquent\Model;
@@ -23,7 +23,7 @@ public function apply(Builder $builder, Model $model)
     {
         $builder->orderBy("id", 'asc');
         // set a sane limit on num of comments. No pagination. Maybe a feature in the future.
-        $builder->limit(config("hessamcms.comments.max_num_of_comments_to_show", 500));
+        $builder->limit(config("binshopsblog.comments.max_num_of_comments_to_show", 500));
         $builder->where("approved", true);
     }
 }
\ No newline at end of file
diff --git a/src/Traits/UploadFileTrait.php b/src/Traits/UploadFileTrait.php
index 330e06a..a1c793c 100644
--- a/src/Traits/UploadFileTrait.php
+++ b/src/Traits/UploadFileTrait.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace HessamCMS\Traits;
+namespace BinshopsBlog\Traits;
 
 use Illuminate\Http\UploadedFile;
-use HessamCMS\Events\UploadedImage;
-use HessamCMS\Models\HessamPost;
+use BinshopsBlog\Events\UploadedImage;
+use BinshopsBlog\Models\BinshopsPost;
 use File;
-use HessamCMS\Models\HessamPostTranslation;
+use BinshopsBlog\Models\BinshopsPostTranslation;
 
 trait UploadFileTrait
 {
@@ -21,14 +21,14 @@ trait UploadFileTrait
 
     /**
      * Small method to increase memory limit.
-     * This can be defined in the config file. If hessamcms.memory_limit is false/null then it won't do anything.
+     * This can be defined in the config file. If binshopsblog.memory_limit is false/null then it won't do anything.
      * This is needed though because if you upload a large image it'll not work
      */
     protected function increaseMemoryLimit()
     {
         // increase memory - change this setting in config file
-        if (config("hessamcms.memory_limit")) {
-            @ini_set('memory_limit', config("hessamcms.memory_limit"));
+        if (config("binshopsblog.memory_limit")) {
+            @ini_set('memory_limit', config("binshopsblog.memory_limit"));
         }
     }
 
@@ -77,21 +77,21 @@ protected function getImageFilename(string $suggested_title, $image_size_details
      */
     protected function image_destination_path()
     {
-        $path = public_path('/' . config("hessamcms.blog_upload_dir"));
+        $path = public_path('/' . config("binshopsblog.blog_upload_dir"));
         $this->check_image_destination_path_is_writable($path);
         return $path;
     }
 
 
     /**
-     * @param HessamPost $new_blog_post
+     * @param BinshopsPost $new_blog_post
      * @param $suggested_title - used to help generate the filename
      * @param $image_size_details - either an array (with 'w' and 'h') or a string (and it'll be uploaded at full size, no size reduction, but will use this string to generate the filename)
      * @param $photo
      * @return array
      * @throws \Exception
      */
-    protected function UploadAndResize(HessamPostTranslation $new_blog_post = null, $suggested_title, $image_size_details, $photo)
+    protected function UploadAndResize(BinshopsPostTranslation $new_blog_post = null, $suggested_title, $image_size_details, $photo)
     {
         // get the filename/filepath
         $image_filename = $this->getImageFilename($suggested_title, $image_size_details, $photo);
@@ -123,7 +123,7 @@ protected function UploadAndResize(HessamPostTranslation $new_blog_post = null,
         }
 
         // save image
-        $resizedImage->save($destinationPath . '/' . $image_filename, config("hessamcms.image_quality", 80));
+        $resizedImage->save($destinationPath . '/' . $image_filename, config("binshopsblog.image_quality", 80));
 
         // fireevent
         event(new UploadedImage($image_filename, $resizedImage, $new_blog_post, __METHOD__));
diff --git a/src/Views/hessamcms/captcha/basic.blade.php b/src/Views/binshopsblog/captcha/basic.blade.php
similarity index 59%
rename from src/Views/hessamcms/captcha/basic.blade.php
rename to src/Views/binshopsblog/captcha/basic.blade.php
index cc48112..e3b9f79 100644
--- a/src/Views/hessamcms/captcha/basic.blade.php
+++ b/src/Views/binshopsblog/captcha/basic.blade.php
@@ -1,6 +1,6 @@
 <div class="form-group ">
     <label id="captcha_label"
-           for="captcha">Captcha: {{ config("hessamcms.captcha.basic_question", "[error - undefined captcha question]" )}} </label>
+           for="captcha">Captcha: {{ config("binshopsblog.captcha.basic_question", "[error - undefined captcha question]" )}} </label>
     <input type='text' required class="form-control" name='captcha' id="captcha" placeholder=""
            value="{{old("captcha")}}">
 </div>
\ No newline at end of file
diff --git a/src/Views/hessamcms/index.blade.php b/src/Views/binshopsblog/index.blade.php
similarity index 69%
rename from src/Views/hessamcms/index.blade.php
rename to src/Views/binshopsblog/index.blade.php
index 9d7df11..f0f0832 100755
--- a/src/Views/hessamcms/index.blade.php
+++ b/src/Views/binshopsblog/index.blade.php
@@ -1,17 +1,17 @@
 @extends("layouts.app",['title'=>$title])
 
 @section('blog-custom-css')
-    <link type="text/css" href="{{ asset('hessam-blog.css') }}" rel="stylesheet">
+    <link type="text/css" href="{{ asset('binshops-blog.css') }}" rel="stylesheet">
 @endsection
 
 @section("content")
 
-    <div class='col-sm-12 hessamcms_container'>
-        @if(\Auth::check() && \Auth::user()->canManageHessamCMSPosts())
+    <div class='col-sm-12 binshopsblog_container'>
+        @if(\Auth::check() && \Auth::user()->canManageBinshopsBlogPosts())
             <div class="text-center">
                 <p class='mb-1'>You are logged in as a blog admin user.
                     <br>
-                    <a href='{{route("hessamcms.admin.index")}}'
+                    <a href='{{route("binshopsblog.admin.index")}}'
                        class='btn border  btn-outline-primary btn-sm '>
                         <i class="fa fa-cogs" aria-hidden="true"></i>
                         Go To Blog Admin Panel</a>
@@ -36,11 +36,11 @@ class='btn border  btn-outline-primary btn-sm '>
                     </div>
                 @endif
 
-                @if(isset($hessamcms_category) && $hessamcms_category)
-                    <h2 class='text-center'> {{$hessamcms_category->category_name}}</h2>
+                @if(isset($binshopsblog_category) && $binshopsblog_category)
+                    <h2 class='text-center'> {{$binshopsblog_category->category_name}}</h2>
 
-                    @if($hessamcms_category->category_description)
-                        <p class='text-center'>{{$hessamcms_category->category_description}}</p>
+                    @if($binshopsblog_category->category_description)
+                        <p class='text-center'>{{$binshopsblog_category->category_description}}</p>
                     @endif
 
                 @endif
@@ -48,7 +48,7 @@ class='btn border  btn-outline-primary btn-sm '>
                 <div class="container">
                     <div class="row">
                         @forelse($posts as $post)
-                            @include("hessamcms::partials.index_loop")
+                            @include("binshopsblog::partials.index_loop")
                         @empty
                             <div class="col-md-12">
                                 <div class='alert alert-danger'>No posts!</div>
@@ -59,9 +59,9 @@ class='btn border  btn-outline-primary btn-sm '>
             </div>
             <div class="col-md-3">
                 <h6>Blog Categories</h6>
-                <ul class="hessam-cat-hierarchy">
+                <ul class="binshops-cat-hierarchy">
                     @if($categories)
-                        @include("hessamcms::partials._category_partial", [
+                        @include("binshopsblog::partials._category_partial", [
     'category_tree' => $categories,
     'name_chain' => $nameChain = ""
     ])
@@ -72,13 +72,13 @@ class='btn border  btn-outline-primary btn-sm '>
             </div>
         </div>
 
-        @if (config('hessamcms.search.search_enabled') )
-            @include('hessamcms::sitewide.search_form')
+        @if (config('binshopsblog.search.search_enabled') )
+            @include('binshopsblog::sitewide.search_form')
         @endif
         <div class="row">
             <div class="col-md-12 text-center">
                 @foreach($lang_list as $lang)
-                    <a href="{{route("hessamcms.index" , $lang->locale)}}">
+                    <a href="{{route("binshopsblog.index" , $lang->locale)}}">
                         <span>{{$lang->name}}</span>
                     </a>
                 @endforeach
diff --git a/src/Views/hessamcms/partials/_category_partial.blade.php b/src/Views/binshopsblog/partials/_category_partial.blade.php
similarity index 81%
rename from src/Views/hessamcms/partials/_category_partial.blade.php
rename to src/Views/binshopsblog/partials/_category_partial.blade.php
index b385ab3..6464935 100644
--- a/src/Views/hessamcms/partials/_category_partial.blade.php
+++ b/src/Views/binshopsblog/partials/_category_partial.blade.php
@@ -4,13 +4,13 @@
         <li class="category-item-wrapper">
             @php $nameChain = $nameChain .'/'. $trans->slug @endphp
 
-            <a href="{{route("hessamcms.view_category",[$locale, $nameChain ])}}">
+            <a href="{{route("binshopsblog.view_category",[$locale, $nameChain ])}}">
                  <span class="category-item" value='{{$category->category_id}}'>
         {{$trans->category_name}}
 
                      @if( count($category->siblings) > 0)
                          <ul>
-                 @include("hessamcms::partials._category_partial", [
+                 @include("binshopsblog::partials._category_partial", [
     'category_tree' => $category->siblings,
     'name_chain' => $nameChain
     ])
diff --git a/src/Views/hessamcms/partials/add_comment_form.blade.php b/src/Views/binshopsblog/partials/add_comment_form.blade.php
similarity index 89%
rename from src/Views/hessamcms/partials/add_comment_form.blade.php
rename to src/Views/binshopsblog/partials/add_comment_form.blade.php
index 25b989b..97a49f2 100644
--- a/src/Views/hessamcms/partials/add_comment_form.blade.php
+++ b/src/Views/binshopsblog/partials/add_comment_form.blade.php
@@ -1,6 +1,6 @@
 <div class='add_comment_area'>
     <h5 class='text-center'>Add a comment</h5>
-    <form method='post' action='{{route("hessamcms.comments.add_new_comment",[app('request')->get('locale'),$post->slug])}}'>
+    <form method='post' action='{{route("binshopsblog.comments.add_new_comment",[app('request')->get('locale'),$post->slug])}}'>
         @csrf
 
 
@@ -21,7 +21,7 @@ class="form-control"
         <div class='container-fluid'>
             <div class='row'>
 
-                @if(config("hessamcms.comments.save_user_id_if_logged_in", true) == false || !\Auth::check())
+                @if(config("binshopsblog.comments.save_user_id_if_logged_in", true) == false || !\Auth::check())
 
                     <div class='col'>
                         <div class="form-group ">
@@ -37,7 +37,7 @@ class="form-control"
                         </div>
                     </div>
 
-                    @if(config("hessamcms.comments.ask_for_author_email"))
+                    @if(config("binshopsblog.comments.ask_for_author_email"))
                         <div class='col'>
                             <div class="form-group">
                                 <label id="author_email_label" for="author_email">Your Email
@@ -57,7 +57,7 @@ class="form-control"
                 @endif
 
 
-                @if(config("hessamcms.comments.ask_for_author_website"))
+                @if(config("binshopsblog.comments.ask_for_author_website"))
                     <div class='col'>
                         <div class="form-group">
                             <label id="author_website_label" for="author_website">Your Website
diff --git a/src/Views/hessamcms/partials/author.blade.php b/src/Views/binshopsblog/partials/author.blade.php
similarity index 100%
rename from src/Views/hessamcms/partials/author.blade.php
rename to src/Views/binshopsblog/partials/author.blade.php
diff --git a/src/Views/hessamcms/partials/built_in_comments.blade.php b/src/Views/binshopsblog/partials/built_in_comments.blade.php
similarity index 70%
rename from src/Views/hessamcms/partials/built_in_comments.blade.php
rename to src/Views/binshopsblog/partials/built_in_comments.blade.php
index 841d1fd..89b5244 100644
--- a/src/Views/hessamcms/partials/built_in_comments.blade.php
+++ b/src/Views/binshopsblog/partials/built_in_comments.blade.php
@@ -6,7 +6,7 @@
         <div class="card-header">
             {{$comment->author()}}
 
-            @if(config("hessamcms.comments.ask_for_author_website") && $comment->author_website)
+            @if(config("binshopsblog.comments.ask_for_author_website") && $comment->author_website)
                 (<a href='{{$comment->author_website}}' target='_blank' rel='noopener'>website</a>)
             @endif
 
@@ -25,8 +25,8 @@
     <div class='alert alert-info'>No comments yet! Why don't you be the first?</div>
 @endforelse
 
-@if(count($comments)> config("hessamcms.comments.max_num_of_comments_to_show",500) - 1)
-    <p><em>Only the first {{config("hessamcms.comments.max_num_of_comments_to_show",500)}} comments are
+@if(count($comments)> config("binshopsblog.comments.max_num_of_comments_to_show",500) - 1)
+    <p><em>Only the first {{config("binshopsblog.comments.max_num_of_comments_to_show",500)}} comments are
             shown.</em>
     </p>
 @endif
diff --git a/src/Views/hessamcms/partials/cat_snippet.blade.php b/src/Views/binshopsblog/partials/cat_snippet.blade.php
similarity index 100%
rename from src/Views/hessamcms/partials/cat_snippet.blade.php
rename to src/Views/binshopsblog/partials/cat_snippet.blade.php
diff --git a/src/Views/hessamcms/partials/categories.blade.php b/src/Views/binshopsblog/partials/categories.blade.php
similarity index 100%
rename from src/Views/hessamcms/partials/categories.blade.php
rename to src/Views/binshopsblog/partials/categories.blade.php
diff --git a/src/Views/hessamcms/partials/custom_comments.blade.php b/src/Views/binshopsblog/partials/custom_comments.blade.php
similarity index 60%
rename from src/Views/hessamcms/partials/custom_comments.blade.php
rename to src/Views/binshopsblog/partials/custom_comments.blade.php
index b3fad59..9c586c0 100644
--- a/src/Views/hessamcms/partials/custom_comments.blade.php
+++ b/src/Views/binshopsblog/partials/custom_comments.blade.php
@@ -1,5 +1,5 @@
 <div class='alert alert-danger'>
     error!
     custom_comments: You must customise this by creating a file in
-    /resources/views/vendor/hessamcms/partials/custom_comments.blade.php
+    /resources/views/vendor/binshopsblog/partials/custom_comments.blade.php
 </div>
diff --git a/src/Views/hessamcms/partials/disqus_comments.blade.php b/src/Views/binshopsblog/partials/disqus_comments.blade.php
similarity index 82%
rename from src/Views/hessamcms/partials/disqus_comments.blade.php
rename to src/Views/binshopsblog/partials/disqus_comments.blade.php
index 9470c0d..1ff5dfd 100644
--- a/src/Views/hessamcms/partials/disqus_comments.blade.php
+++ b/src/Views/binshopsblog/partials/disqus_comments.blade.php
@@ -2,7 +2,7 @@
 <script>
 
     /**
-     *  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
+     *  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR Blog.
      *  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables*/
     var disqus_config = function () {
         this.page.url = "{{$post->url()}}";  // Replace PAGE_URL with your page's canonical URL variable
@@ -10,9 +10,9 @@
     };
     (function() { // DON'T EDIT BELOW THIS LINE
         var d = document, s = d.createElement('script');
-        s.src = '{{config("hessamcms.comments.disqus.src_url","ENTER YOUR URL HERE!!!")}}';
+        s.src = '{{config("binshopsblog.comments.disqus.src_url","ENTER YOUR URL HERE!!!")}}';
         s.setAttribute('data-timestamp', +new Date());
         (d.head || d.body).appendChild(s);
     })();
 </script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus</a>, and run by <a href='https://hessam.binshops.com/'>HessamCMS Laravel Blog package</a></noscript>
\ No newline at end of file
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus</a>, and run by <a href='https://binshops.binshops.com/'>BinshopsBlog Laravel Blog package</a></noscript>
\ No newline at end of file
diff --git a/src/Views/hessamcms/partials/full_post_details.blade.php b/src/Views/binshopsblog/partials/full_post_details.blade.php
similarity index 66%
rename from src/Views/hessamcms/partials/full_post_details.blade.php
rename to src/Views/binshopsblog/partials/full_post_details.blade.php
index c5fc3f4..4deb8da 100644
--- a/src/Views/hessamcms/partials/full_post_details.blade.php
+++ b/src/Views/binshopsblog/partials/full_post_details.blade.php
@@ -1,4 +1,4 @@
-@if(\Auth::check() && \Auth::user()->canManageHessamCMSPosts())
+@if(\Auth::check() && \Auth::user()->canManageBinshopsBlogPosts())
     <a href="{{$post->edit_url()}}" class="btn btn-outline-secondary btn-sm pull-right float-right">Edit
         Post</a>
 @endif
@@ -12,9 +12,9 @@
 <p class="blog_body_content">
     {!! $post->post_body_output() !!}
 
-    {{--@if(config("hessamcms.use_custom_view_files")  && $post->use_view_file)--}}
+    {{--@if(config("binshopsblog.use_custom_view_files")  && $post->use_view_file)--}}
     {{--                                // use a custom blade file for the output of those blog post--}}
-    {{--   @include("hessamcms::partials.use_view_file")--}}
+    {{--   @include("binshopsblog::partials.use_view_file")--}}
     {{--@else--}}
     {{--   {!! $post->post_body !!}        // unsafe, echoing the plain html/js--}}
     {{--   {{ $post->post_body }}          // for safe escaping --}}
@@ -25,5 +25,5 @@
 
 Posted <strong>{{$post->post->posted_at->diffForHumans()}}</strong>
 
-@includeWhen($post->author,"hessamcms::partials.author",['post'=>$post])
-@includeWhen($post->categories,"hessamcms::partials.categories",['post'=>$post])
+@includeWhen($post->author,"binshopsblog::partials.author",['post'=>$post])
+@includeWhen($post->categories,"binshopsblog::partials.categories",['post'=>$post])
diff --git a/src/Views/hessamcms/partials/index_loop.blade.php b/src/Views/binshopsblog/partials/index_loop.blade.php
similarity index 81%
rename from src/Views/hessamcms/partials/index_loop.blade.php
rename to src/Views/binshopsblog/partials/index_loop.blade.php
index 24a1319..391712e 100644
--- a/src/Views/hessamcms/partials/index_loop.blade.php
+++ b/src/Views/binshopsblog/partials/index_loop.blade.php
@@ -1,6 +1,6 @@
 {{--Used on the index page (so shows a small summary--}}
-{{--See the guide on hessam.binshops.com for how to copy these files to your /resources/views/ directory--}}
-{{--https://hessam.binshops.com/laravel-blog-package--}}
+{{--See the guide on binshops.binshops.com for how to copy these files to your /resources/views/ directory--}}
+{{--https://binshops.binshops.com/laravel-blog-package--}}
 
 <div class="col-md-6">
     <div class="blog-item">
@@ -12,7 +12,7 @@
             <h3 class=''><a href='{{$post->url($locale)}}'>{{$post->title}}</a></h3>
             <h5 class=''>{{$post->subtitle}}</h5>
 
-            @if (config('hessamcms.show_full_text_at_list'))
+            @if (config('binshopsblog.show_full_text_at_list'))
                 <p>{!! $post->post_body_output() !!}</p>
             @else
                 <p>{!! mb_strimwidth($post->post_body_output(), 0, 400, "...") !!}</p>
diff --git a/src/Views/hessamcms/partials/search_form.blade.php b/src/Views/binshopsblog/partials/search_form.blade.php
similarity index 50%
rename from src/Views/hessamcms/partials/search_form.blade.php
rename to src/Views/binshopsblog/partials/search_form.blade.php
index c3e53e2..5d671f5 100644
--- a/src/Views/hessamcms/partials/search_form.blade.php
+++ b/src/Views/binshopsblog/partials/search_form.blade.php
@@ -1,4 +1,4 @@
 {{--This is only included for backwards compatibility. It will be removed at a future stage.--}}
-@if (config('hessamcms.search.search_enabled') )
-    @include('hessamcms::sitewide.search_form')
+@if (config('binshopsblog.search.search_enabled') )
+    @include('binshopsblog::sitewide.search_form')
 @endif
\ No newline at end of file
diff --git a/src/Views/hessamcms/partials/show_comments.blade.php b/src/Views/binshopsblog/partials/show_comments.blade.php
similarity index 64%
rename from src/Views/hessamcms/partials/show_comments.blade.php
rename to src/Views/binshopsblog/partials/show_comments.blade.php
index 7f1f594..313bb9e 100644
--- a/src/Views/hessamcms/partials/show_comments.blade.php
+++ b/src/Views/binshopsblog/partials/show_comments.blade.php
@@ -1,20 +1,20 @@
-@switch(config("hessamcms.comments.type_of_comments_to_show","built_in"))
+@switch(config("binshopsblog.comments.type_of_comments_to_show","built_in"))
 
 @case("built_in")
 {{-- default - show our own comments--}}
-@include("hessamcms::partials.built_in_comments")
-@include("hessamcms::partials.add_comment_form")
+@include("binshopsblog::partials.built_in_comments")
+@include("binshopsblog::partials.add_comment_form")
 @break
 
 @case("disqus")
 {{--use disqus--}}
-@include("hessamcms::partials.disqus_comments")
+@include("binshopsblog::partials.disqus_comments")
 @break
 
 
 @case("custom")
 {{--use custom - you should create the custom_comments in your vendor view dir and customise it--}}
-@include("hessamcms::partials.custom_comments")
+@include("binshopsblog::partials.custom_comments")
 @break
 
 @case("disabled")
diff --git a/src/Views/hessamcms/partials/show_errors.blade.php b/src/Views/binshopsblog/partials/show_errors.blade.php
similarity index 100%
rename from src/Views/hessamcms/partials/show_errors.blade.php
rename to src/Views/binshopsblog/partials/show_errors.blade.php
diff --git a/src/Views/hessamcms/partials/use_view_file.blade.php b/src/Views/binshopsblog/partials/use_view_file.blade.php
similarity index 71%
rename from src/Views/hessamcms/partials/use_view_file.blade.php
rename to src/Views/binshopsblog/partials/use_view_file.blade.php
index 71d36ba..1a67edd 100644
--- a/src/Views/hessamcms/partials/use_view_file.blade.php
+++ b/src/Views/binshopsblog/partials/use_view_file.blade.php
@@ -8,16 +8,16 @@
 
     {{--uh oh! the view file wasn't there. Show a detailed error if user is logged in and can manage the blog, otherwise show generic error.--}}
 
-    @if(\Auth::check() && \Auth::user()->canManageHessamCMSPosts())
-         {{--is logged in + canManageHessamCMSPosts() == true, so show a detailed error--}}
+    @if(\Auth::check() && \Auth::user()->canManageBinshopsBlogPosts())
+         {{--is logged in + canManageBinshopsBlogPosts() == true, so show a detailed error--}}
         <div class='alert alert-danger'>Custom blog post blade view file
                         (<code>{{$post->full_view_file_path()}}</code>) not found. <a
-                    href='https://hessam.binshops.com/laravel/packages/help-documentation/laravel-blog-package-hessamcms'
+                    href='https://binshops.binshops.com/laravel/packages/help-documentation/laravel-blog-package-binshopsblog'
                     target='_blank'>See Laravel Blog Package help here</a>.
                     </div>
 
     @else
-        {{--is not logged in, or User::canManageHessamCMSPosts() for current user == false--}}
+        {{--is not logged in, or User::canManageBinshopsBlogPosts() for current user == false--}}
         {{--show basic error message--}}
         <div class='alert alert-danger'>Sorry, but there is an error showing that blog post. Please come back later.</div>
     @endif
diff --git a/src/Views/hessamcms/saved_comment.blade.php b/src/Views/binshopsblog/saved_comment.blade.php
similarity index 84%
rename from src/Views/hessamcms/saved_comment.blade.php
rename to src/Views/binshopsblog/saved_comment.blade.php
index 23a5927..59cc977 100755
--- a/src/Views/hessamcms/saved_comment.blade.php
+++ b/src/Views/binshopsblog/saved_comment.blade.php
@@ -4,7 +4,7 @@
     <div class='text-center'>
         <h3>Thanks! Your comment has been saved!</h3>
 
-        @if(!config("hessamcms.comments.auto_approve_comments",false) )
+        @if(!config("binshopsblog.comments.auto_approve_comments",false) )
             <p>After an admin user approves the comment, it'll appear on the site!</p>
         @endif
 
diff --git a/src/Views/hessamcms/search.blade.php b/src/Views/binshopsblog/search.blade.php
similarity index 76%
rename from src/Views/hessamcms/search.blade.php
rename to src/Views/binshopsblog/search.blade.php
index 0d0201e..6bb266e 100755
--- a/src/Views/hessamcms/search.blade.php
+++ b/src/Views/binshopsblog/search.blade.php
@@ -12,9 +12,9 @@
                         @if(isset($result->indexable))
                             @php $search_count += $search_count + 1; @endphp
                             <?php $post = $result->indexable; ?>
-                            @if($post && is_a($post,\HessamCMS\Models\HessamPostTranslation::class))
+                            @if($post && is_a($post,\BinshopsBlog\Models\BinshopsPostTranslation::class))
                                 <h2>Search result #{{$search_count}}</h2>
-                                @include("hessamcms::partials.index_loop")
+                                @include("binshopsblog::partials.index_loop")
                             @else
 
                                 <div class='alert alert-danger'>Unable to show this search result - unknown type</div>
@@ -26,9 +26,9 @@
                 </div>
                 <div class="col-md-3">
                     <h6>Blog Categories</h6>
-                    <ul class="hessam-cat-hierarchy">
+                    <ul class="binshops-cat-hierarchy">
                         @if($categories)
-                            @include("hessamcms::partials._category_partial", [
+                            @include("binshopsblog::partials._category_partial", [
     'category_tree' => $categories,
     'name_chain' => $nameChain = ""
     ])
@@ -39,8 +39,8 @@
                 </div>
             </div>
 
-            @if (config('hessamcms.search.search_enabled') )
-                @include('hessamcms::sitewide.search_form')
+            @if (config('binshopsblog.search.search_enabled') )
+                @include('binshopsblog::sitewide.search_form')
             @endif
 
         </div>
diff --git a/src/Views/binshopsblog/single_post.blade.php b/src/Views/binshopsblog/single_post.blade.php
new file mode 100755
index 0000000..e32fbc5
--- /dev/null
+++ b/src/Views/binshopsblog/single_post.blade.php
@@ -0,0 +1,43 @@
+@extends("layouts.app",['title'=>$post->gen_seo_title()])
+
+@section('blog-custom-css')
+    <link type="text/css" href="{{ asset('binshops-blog.css') }}" rel="stylesheet">
+@endsection
+
+@section("content")
+
+    @if(config("binshopsblog.reading_progress_bar"))
+        <div id="scrollbar">
+            <div id="scrollbar-bg"></div>
+        </div>
+    @endif
+
+    {{--https://binshops.binshops.com/laravel/packages/binshopsblog-blog-system-for-your-laravel-app/help-documentation/laravel-blog-package-binshopsblog#guide_to_views--}}
+
+    <div class='container'>
+    <div class='row'>
+        <div class='col-sm-12 col-md-12 col-lg-12'>
+
+            @include("binshopsblog::partials.show_errors")
+            @include("binshopsblog::partials.full_post_details")
+
+
+            @if(config("binshopsblog.comments.type_of_comments_to_show","built_in") !== 'disabled')
+                <div class="" id='maincommentscontainer'>
+                    <h2 class='text-center' id='binshopsblogcomments'>Comments</h2>
+                    @include("binshopsblog::partials.show_comments")
+                </div>
+            @else
+                {{--Comments are disabled--}}
+            @endif
+
+
+        </div>
+    </div>
+    </div>
+
+@endsection
+
+@section('blog-custom-js')
+    <script src="{{asset('binshops-blog.js')}}"></script>
+@endsection
\ No newline at end of file
diff --git a/src/Views/hessamcms/sitewide/random_posts.blade.php b/src/Views/binshopsblog/sitewide/random_posts.blade.php
similarity index 66%
rename from src/Views/hessamcms/sitewide/random_posts.blade.php
rename to src/Views/binshopsblog/sitewide/random_posts.blade.php
index 84ff385..cd5a0c2 100644
--- a/src/Views/hessamcms/sitewide/random_posts.blade.php
+++ b/src/Views/binshopsblog/sitewide/random_posts.blade.php
@@ -1,6 +1,6 @@
 <h5>Random Posts</h5>
 <ul class="nav">
-    @foreach(\HessamCMS\Models\HessamPost::inRandomOrder()->limit(5)->get() as $post)
+    @foreach(\BinshopsBlog\Models\BinshopsPost::inRandomOrder()->limit(5)->get() as $post)
         <li class="nav-item">
             <a class='nav-link' href='{{$post->url()}}'>{{$post->title}}</a>
         </li>
diff --git a/src/Views/hessamcms/sitewide/recent_posts.blade.php b/src/Views/binshopsblog/sitewide/recent_posts.blade.php
similarity index 63%
rename from src/Views/hessamcms/sitewide/recent_posts.blade.php
rename to src/Views/binshopsblog/sitewide/recent_posts.blade.php
index 7f73ba0..4f1e54b 100644
--- a/src/Views/hessamcms/sitewide/recent_posts.blade.php
+++ b/src/Views/binshopsblog/sitewide/recent_posts.blade.php
@@ -1,6 +1,6 @@
 <h5>Recent Posts</h5>
 <ul class="nav">
-    @foreach(\HessamCMS\Models\HessamPost::orderBy("posted_at","desc")->limit(5)->get() as $post)
+    @foreach(\BinshopsBlog\Models\BinshopsPost::orderBy("posted_at","desc")->limit(5)->get() as $post)
         <li class="nav-item">
             <a class='nav-link' href='{{$post->url()}}'>{{$post->title}}</a>
         </li>
diff --git a/src/Views/hessamcms/sitewide/search_form.blade.php b/src/Views/binshopsblog/sitewide/search_form.blade.php
similarity index 73%
rename from src/Views/hessamcms/sitewide/search_form.blade.php
rename to src/Views/binshopsblog/sitewide/search_form.blade.php
index 9eaf109..d845cc9 100644
--- a/src/Views/hessamcms/sitewide/search_form.blade.php
+++ b/src/Views/binshopsblog/sitewide/search_form.blade.php
@@ -1,5 +1,5 @@
 <div style='max-width:500px;margin:50px auto;' class='search-form-outer'>
-    <form method='get' action='{{route("hessamcms.search", app('request')->get('locale'))}}' class='text-center'>
+    <form method='get' action='{{route("binshopsblog.search", app('request')->get('locale'))}}' class='text-center'>
         <h4>Search for something in our blog:</h4>
         <input type='text' name='s' placeholder='Search...' class='form-control' value='{{\Request::get("s")}}'>
         <input type='submit' value='Search' class='btn btn-primary m-2'>
diff --git a/src/Views/hessamcms/sitewide/show_all_categories.blade.php b/src/Views/binshopsblog/sitewide/show_all_categories.blade.php
similarity index 64%
rename from src/Views/hessamcms/sitewide/show_all_categories.blade.php
rename to src/Views/binshopsblog/sitewide/show_all_categories.blade.php
index 66468be..0cb3a22 100644
--- a/src/Views/hessamcms/sitewide/show_all_categories.blade.php
+++ b/src/Views/binshopsblog/sitewide/show_all_categories.blade.php
@@ -1,6 +1,6 @@
 <h5>Post Categories</h5>
 <ul class="nav">
-    @foreach(\HessamCMS\Models\HessamCategory::orderBy("category_name")->limit(200)->get() as $category)
+    @foreach(\BinshopsBlog\Models\BinshopsCategory::orderBy("category_name")->limit(200)->get() as $category)
         <li class="nav-item">
             <a class='nav-link' href='{{$category->url()}}'>{{$category->category_name}}</a>
         </li>
diff --git a/src/Views/hessamcms_admin/categories/_category_partial.blade.php b/src/Views/binshopsblog_admin/categories/_category_partial.blade.php
similarity index 73%
rename from src/Views/hessamcms_admin/categories/_category_partial.blade.php
rename to src/Views/binshopsblog_admin/categories/_category_partial.blade.php
index f86bd14..5f85ad8 100644
--- a/src/Views/hessamcms_admin/categories/_category_partial.blade.php
+++ b/src/Views/binshopsblog_admin/categories/_category_partial.blade.php
@@ -5,7 +5,7 @@
         </span>
         @if( count($category->siblings) > 0)
             <ul>
-                @include("hessamcms_admin::categories._category_partial", ['category_tree' => $category->siblings])
+                @include("binshopsblog_admin::categories._category_partial", ['category_tree' => $category->siblings])
             </ul>
         @endif
     </li>
diff --git a/src/Views/hessamcms_admin/categories/add_category.blade.php b/src/Views/binshopsblog_admin/categories/add_category.blade.php
similarity index 92%
rename from src/Views/hessamcms_admin/categories/add_category.blade.php
rename to src/Views/binshopsblog_admin/categories/add_category.blade.php
index 7cd586d..60098f2 100755
--- a/src/Views/hessamcms_admin/categories/add_category.blade.php
+++ b/src/Views/binshopsblog_admin/categories/add_category.blade.php
@@ -1,8 +1,8 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
     <h5>Admin - Add Category</h5>
-    <form method='post' action='{{route("hessamcms.admin.categories.create_category")}}'  enctype="multipart/form-data" >
+    <form method='post' action='{{route("binshopsblog.admin.categories.create_category")}}'  enctype="multipart/form-data" >
 
         @csrf
 
@@ -51,7 +51,7 @@ class="form-control"
 
             <small id="category_slug_help" class="form-text text-muted">
                 Letters, numbers, dash only. The slug
-                i.e. {{route("hessamcms.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+                i.e. {{route("binshopsblog.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
                 share the same slug).
 
             </small>
@@ -60,7 +60,7 @@ class="form-control"
         <div class="form-group">
             <label for="category_slug">Category Tree</label>
             <ul class="wtree">
-                @include("hessamcms_admin::categories._category_partial", ['category_tree' => $cat_roots])
+                @include("binshopsblog_admin::categories._category_partial", ['category_tree' => $cat_roots])
             </ul>
         </div>
 
@@ -171,7 +171,7 @@ function fillLanguageList(langId){
                     languageList[preLangId].slug = $('#category_slug').val();
                     languageList[preLangId].category_description = $('#category_description').val();
                 }
-                $.post('{{route("hessamcms.admin.categories.store_category")}}' ,
+                $.post('{{route("binshopsblog.admin.categories.store_category")}}' ,
                     {
                         data: languageList,
                         parent_id: parseInt($('#parent_id').val())
@@ -181,7 +181,7 @@ function(data, status){
                             alert("Slug is already taken: " + languageList[data.data].lang_name);
                         }else if (data.code === 200) {
                         }
-                        window.location.replace("{{route('hessamcms.admin.categories.index')}}");
+                        window.location.replace("{{route('binshopsblog.admin.categories.index')}}");
                     });
             });
 
diff --git a/src/Views/hessamcms_admin/categories/edit_category.blade.php b/src/Views/binshopsblog_admin/categories/edit_category.blade.php
similarity index 92%
rename from src/Views/hessamcms_admin/categories/edit_category.blade.php
rename to src/Views/binshopsblog_admin/categories/edit_category.blade.php
index b2e701d..76174f7 100755
--- a/src/Views/hessamcms_admin/categories/edit_category.blade.php
+++ b/src/Views/binshopsblog_admin/categories/edit_category.blade.php
@@ -1,10 +1,10 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
     <h5>Admin - Edit Category</h5>
 
-    <form method='post' action='{{route("hessamcms.admin.categories.edit_category",$category->id)}}'  enctype="multipart/form-data" >
+    <form method='post' action='{{route("binshopsblog.admin.categories.edit_category",$category->id)}}'  enctype="multipart/form-data" >
 
         @csrf
         @method("patch")
@@ -69,7 +69,7 @@ class="form-control"
 
             <small id="category_slug_help" class="form-text text-muted">
                 Letters, numbers, dash only. The slug
-                i.e. {{route("hessamcms.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+                i.e. {{route("binshopsblog.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
                 share the same slug).
 
             </small>
diff --git a/src/Views/hessamcms_admin/categories/form.blade.php b/src/Views/binshopsblog_admin/categories/form.blade.php
similarity index 95%
rename from src/Views/hessamcms_admin/categories/form.blade.php
rename to src/Views/binshopsblog_admin/categories/form.blade.php
index f550912..c4f4823 100755
--- a/src/Views/hessamcms_admin/categories/form.blade.php
+++ b/src/Views/binshopsblog_admin/categories/form.blade.php
@@ -58,7 +58,7 @@ class="form-control"
 
     <small id="category_slug_help" class="form-text text-muted">
         Letters, numbers, dash only. The slug
-        i.e. {{route("hessamcms.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
+        i.e. {{route("binshopsblog.view_category",[app('request')->get('locale'),""])}}/<u><em>this_part</em></u>. This must be unique (two categories can't
         share the same slug).
 
     </small>
diff --git a/src/Views/hessamcms_admin/categories/index.blade.php b/src/Views/binshopsblog_admin/categories/index.blade.php
similarity index 84%
rename from src/Views/hessamcms_admin/categories/index.blade.php
rename to src/Views/binshopsblog_admin/categories/index.blade.php
index dd92621..7410836 100755
--- a/src/Views/hessamcms_admin/categories/index.blade.php
+++ b/src/Views/binshopsblog_admin/categories/index.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
     @forelse ($categories as $category)
@@ -14,7 +14,7 @@
 
                         onsubmit="return confirm('Are you sure you want to delete this blog post category?\n You cannot undo this action!');"
 
-                        method='post' action='{{route("hessamcms.admin.categories.destroy_category", $category->category_id)}}' class='float-right'>
+                        method='post' action='{{route("binshopsblog.admin.categories.destroy_category", $category->category_id)}}' class='float-right'>
                     @csrf
                     @method("DELETE")
                     <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
diff --git a/src/Views/hessamcms_admin/comments/index.blade.php b/src/Views/binshopsblog_admin/comments/index.blade.php
similarity index 88%
rename from src/Views/hessamcms_admin/comments/index.blade.php
rename to src/Views/binshopsblog_admin/comments/index.blade.php
index 447a764..7ed1462 100755
--- a/src/Views/hessamcms_admin/comments/index.blade.php
+++ b/src/Views/binshopsblog_admin/comments/index.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
     @forelse ($comments as $comment)
@@ -29,7 +29,7 @@
 
                 @if(!$comment->approved)
                     {{--APPROVE BUTTON--}}
-                    <form method='post' action='{{route("hessamcms.admin.comments.approve", $comment->id)}}' class='float-right'>
+                    <form method='post' action='{{route("binshopsblog.admin.comments.approve", $comment->id)}}' class='float-right'>
                         @csrf
                         @method("PATCH")
                         <input type='submit' class='btn btn-success btn-sm' value='Approve'/>
@@ -39,7 +39,7 @@
                 {{--DELETE BUTTON--}}
                 <form
                         onsubmit="return confirm('Are you sure you want to delete this blog post comment?\n You cannot undo this action!');"
-                        method='post' action='{{route("hessamcms.admin.comments.delete", $comment->id)}}' class='float-right'>
+                        method='post' action='{{route("binshopsblog.admin.comments.delete", $comment->id)}}' class='float-right'>
                     @csrf
                     @method("DELETE")
                     <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
diff --git a/src/Views/hessamcms_admin/imageupload/create.blade.php b/src/Views/binshopsblog_admin/imageupload/create.blade.php
similarity index 75%
rename from src/Views/hessamcms_admin/imageupload/create.blade.php
rename to src/Views/binshopsblog_admin/imageupload/create.blade.php
index 26b1d95..3d1f80f 100644
--- a/src/Views/hessamcms_admin/imageupload/create.blade.php
+++ b/src/Views/binshopsblog_admin/imageupload/create.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -7,7 +7,7 @@
     <p>You can use this to upload images.</p>
 
 
-    <form method='post' action='{{route("hessamcms.admin.images.store")}}' enctype="multipart/form-data">
+    <form method='post' action='{{route("binshopsblog.admin.images.store")}}' enctype="multipart/form-data">
 
         @csrf
 
@@ -37,12 +37,12 @@
             <label >Sizes to convert to</label>
 
             <div>
-                <input type='checkbox' name='sizes_to_upload[hessamcms_full_size]' value='true' checked id='size_hessamcms_full_size'>
-            <label for='size_hessamcms_full_size'>Full size (no resizing)</label>
+                <input type='checkbox' name='sizes_to_upload[binshopsblog_full_size]' value='true' checked id='size_binshopsblog_full_size'>
+            <label for='size_binshopsblog_full_size'>Full size (no resizing)</label>
                 </div>
 
 
-            @foreach((array)config('hessamcms.image_sizes') as $size => $image_size_details)
+            @foreach((array)config('binshopsblog.image_sizes') as $size => $image_size_details)
             <div>
                 <input type='checkbox' name='sizes_to_upload[{{$size}}]' value='true' checked id='size_{{$size}}'>
                 <label for='size_{{$size}}'>{{$image_size_details['name']}} - {{$image_size_details['w']}} x {{$image_size_details['h']}}px</label>
diff --git a/src/Views/hessamcms_admin/imageupload/index.blade.php b/src/Views/binshopsblog_admin/imageupload/index.blade.php
similarity index 87%
rename from src/Views/hessamcms_admin/imageupload/index.blade.php
rename to src/Views/binshopsblog_admin/imageupload/index.blade.php
index e189cca..d7ef5a6 100644
--- a/src/Views/hessamcms_admin/imageupload/index.blade.php
+++ b/src/Views/binshopsblog_admin/imageupload/index.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -46,11 +46,11 @@ function show_uploaded_file_row(id, img) {
                             <h6 class='text-center mt-3'><strong>{{$file_key}}</strong> - {{$file['w']}}
                                 x {{$file['h']}}:</h6>
                             <p class='text-center'><a
-                                        href='{{asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])}}'
+                                        href='{{asset(     config("binshopsblog.blog_upload_dir") . "/". $file['filename'])}}'
                                         target='_blank'>[link]</a> / <span
                                         class='btn btn-sm btn-primary'
                                         style='cursor: zoom-in;'
-                                        onclick='show_uploaded_file_row("{{$id}}","{{asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])}}")'>show</span>
+                                        onclick='show_uploaded_file_row("{{$id}}","{{asset(     config("binshopsblog.blog_upload_dir") . "/". $file['filename'])}}")'>show</span>
                             </p>
 
                             <div id="{{$id}}"></div>
@@ -59,7 +59,7 @@ class='btn btn-sm btn-primary'
                             <div style=''>
                                 <small class='text-muted'>Image URL</small>
                                 <input type='text' readonly='readonly' class='form-control'
-                                       value='{{asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])}}'>
+                                       value='{{asset(     config("binshopsblog.blog_upload_dir") . "/". $file['filename'])}}'>
                             </div>
                         </div>
                         <div class='col-md-6 {{$id}}' style='display:none;'>
@@ -67,7 +67,7 @@ class='btn btn-sm btn-primary'
                             <div style=''>
                                 <small class='text-muted'>img tag</small>
                                 <input type='text' readonly='readonly' class='form-control'
-                                       value='{{"<img src='".asset(     config("hessamcms.blog_upload_dir") . "/". $file['filename'])."' alt='" . e($uploadedPhoto->image_title) . "' >"}}'>
+                                       value='{{"<img src='".asset(     config("binshopsblog.blog_upload_dir") . "/". $file['filename'])."' alt='" . e($uploadedPhoto->image_title) . "' >"}}'>
                             </div>
                         </div>
 
@@ -89,9 +89,9 @@ class='btn btn-sm btn-primary'
 
 
                         <div style='text-align:center;'>
-                            <a style='cursor: zoom-in;' href='{{asset(     config("hessamcms.blog_upload_dir") . "/". $smallest['filename'])}}'
+                            <a style='cursor: zoom-in;' href='{{asset(     config("binshopsblog.blog_upload_dir") . "/". $smallest['filename'])}}'
                                target='_blank'>
-                                <img src='{{asset(     config("hessamcms.blog_upload_dir") . "/". $smallest['filename'])}}'
+                                <img src='{{asset(     config("binshopsblog.blog_upload_dir") . "/". $smallest['filename'])}}'
                                      style='max-width:100%; height: auto;'>
                             </a>
                         </div>
diff --git a/src/Views/hessamcms_admin/imageupload/uploaded.blade.php b/src/Views/binshopsblog_admin/imageupload/uploaded.blade.php
similarity index 55%
rename from src/Views/hessamcms_admin/imageupload/uploaded.blade.php
rename to src/Views/binshopsblog_admin/imageupload/uploaded.blade.php
index 825c723..97b46e7 100644
--- a/src/Views/hessamcms_admin/imageupload/uploaded.blade.php
+++ b/src/Views/binshopsblog_admin/imageupload/uploaded.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -15,12 +15,12 @@
                 <small>{{$image['w'] . "x" . $image['h']}}</small>
             </h6>
 
-            <a href='{{asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])}}' target='_blank'>
-                <img src='{{asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])}}'
+            <a href='{{asset(     config("binshopsblog.blog_upload_dir") . "/". $image['filename'])}}' target='_blank'>
+                <img src='{{asset(     config("binshopsblog.blog_upload_dir") . "/". $image['filename'])}}'
                      style='max-width:400px; height: auto;'>
             </a>
-            <input type='text' readonly='readonly' class='form-control' value='{{asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])}}'>
-            <input type='text' readonly='readonly' class='form-control' value='{{"<img src='".asset(     config("hessamcms.blog_upload_dir") . "/". $image['filename'])."' alt='' >"}}'>
+            <input type='text' readonly='readonly' class='form-control' value='{{asset(     config("binshopsblog.blog_upload_dir") . "/". $image['filename'])}}'>
+            <input type='text' readonly='readonly' class='form-control' value='{{"<img src='".asset(     config("binshopsblog.blog_upload_dir") . "/". $image['filename'])."' alt='' >"}}'>
 
 
         </div>
diff --git a/src/Views/hessamcms_admin/index.blade.php b/src/Views/binshopsblog_admin/index.blade.php
similarity index 95%
rename from src/Views/hessamcms_admin/index.blade.php
rename to src/Views/binshopsblog_admin/index.blade.php
index 252f1ff..524ad2e 100755
--- a/src/Views/hessamcms_admin/index.blade.php
+++ b/src/Views/binshopsblog_admin/index.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -80,7 +80,7 @@
                     <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                     Edit Post</a>
                 <form onsubmit="return confirm('Are you sure you want to delete this blog post?\n You cannot undo this action!');"
-                      method='post' action='{{route("hessamcms.admin.destroy_post", $post->post_id)}}' class='float-right'>
+                      method='post' action='{{route("binshopsblog.admin.destroy_post", $post->post_id)}}' class='float-right'>
                     @csrf
                     <input name="_method" type="hidden" value="DELETE"/>
                     <button type='submit' class='btn btn-danger btn-sm'>
diff --git a/src/Views/hessamcms_admin/languages/add_language.blade.php b/src/Views/binshopsblog_admin/languages/add_language.blade.php
similarity index 97%
rename from src/Views/hessamcms_admin/languages/add_language.blade.php
rename to src/Views/binshopsblog_admin/languages/add_language.blade.php
index 06f242f..9faeb52 100755
--- a/src/Views/hessamcms_admin/languages/add_language.blade.php
+++ b/src/Views/binshopsblog_admin/languages/add_language.blade.php
@@ -1,10 +1,10 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
     <h5>Add new Language</h5>
 
-    <form method='post' action='{{route("hessamcms.admin.languages.store_language")}}'  enctype="multipart/form-data" >
+    <form method='post' action='{{route("binshopsblog.admin.languages.store_language")}}'  enctype="multipart/form-data" >
         @csrf
 
         <div class="form-group">
diff --git a/src/Views/hessamcms_admin/languages/deleted_language.blade.php b/src/Views/binshopsblog_admin/languages/deleted_language.blade.php
similarity index 100%
rename from src/Views/hessamcms_admin/languages/deleted_language.blade.php
rename to src/Views/binshopsblog_admin/languages/deleted_language.blade.php
diff --git a/src/Views/hessamcms_admin/languages/edit_language.blade.php b/src/Views/binshopsblog_admin/languages/edit_language.blade.php
similarity index 100%
rename from src/Views/hessamcms_admin/languages/edit_language.blade.php
rename to src/Views/binshopsblog_admin/languages/edit_language.blade.php
diff --git a/src/Views/hessamcms_admin/languages/index.blade.php b/src/Views/binshopsblog_admin/languages/index.blade.php
similarity index 82%
rename from src/Views/hessamcms_admin/languages/index.blade.php
rename to src/Views/binshopsblog_admin/languages/index.blade.php
index 5fc22c1..af509cd 100755
--- a/src/Views/hessamcms_admin/languages/index.blade.php
+++ b/src/Views/binshopsblog_admin/languages/index.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
     @forelse ($language_list as $language)
@@ -19,7 +19,7 @@
                 <form
                         onsubmit="return confirm('Are you sure you want to do this action?');"
 
-                        method='post' action='{{route("hessamcms.admin.languages.toggle_language", $language->id)}}' class='float-left'>
+                        method='post' action='{{route("binshopsblog.admin.languages.toggle_language", $language->id)}}' class='float-left'>
                     @csrf
 
                     @if($language->active == 1)
@@ -34,7 +34,7 @@
                 <form
                         onsubmit="return confirm('Are you sure you want to delete this language?\n You cannot undo this action!');"
 
-                        method='post' action='{{route("hessamcms.admin.languages.destroy_language", $language->id)}}' class='float-right'>
+                        method='post' action='{{route("binshopsblog.admin.languages.destroy_language", $language->id)}}' class='float-right'>
                     @csrf
                     @method("DELETE")
                     <input type='submit' class='btn btn-danger btn-sm' value='Delete'/>
diff --git a/src/Views/hessamcms_admin/layouts/admin_layout.blade.php b/src/Views/binshopsblog_admin/layouts/admin_layout.blade.php
similarity index 86%
rename from src/Views/hessamcms_admin/layouts/admin_layout.blade.php
rename to src/Views/binshopsblog_admin/layouts/admin_layout.blade.php
index d576a3b..593a427 100755
--- a/src/Views/hessamcms_admin/layouts/admin_layout.blade.php
+++ b/src/Views/binshopsblog_admin/layouts/admin_layout.blade.php
@@ -26,8 +26,8 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito" crossorigin="anonymous">
 
     <!-- Styles -->
-    {{--    @if(file_exists(public_path("hessamcms_admin_css.css")))--}}
-    <link href="{{ asset('hessamcms_admin_css.css') }}" rel="stylesheet">
+    {{--    @if(file_exists(public_path("binshopsblog_admin_css.css")))--}}
+    <link href="{{ asset('binshopsblog_admin_css.css') }}" rel="stylesheet">
     {{--    @else--}}
     {{--        <link href="{{ asset('css/app.css') }}" rel="stylesheet">--}}
     {{--Edited your css/app.css file? Uncomment these lines to use plain bootstrap:--}}
@@ -41,7 +41,7 @@
 <div id="app">
     <nav class="navbar navbar-expand-md navbar-light navbar-laravel">
         <div class="container">
-            <a class="navbar-brand hessam-blog-title" href="{{ route('hessamcms.admin.index') }}">
+            <a class="navbar-brand binshops-blog-title" href="{{ route('binshopsblog.admin.index') }}">
                 {{ config('app.name', 'Laravel') }} Blog Dashboard
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
@@ -60,7 +60,7 @@
                 <ul class="navbar-nav ml-auto">
                     <!-- Authentication Links -->
 
-                    <li class='nav-item px-2'><a class='nav-link' href='{{route("hessamcms.index" , app('request')->get('locale'))}}'>Blog home</a></li>
+                    <li class='nav-item px-2'><a class='nav-link' href='{{route("binshopsblog.index" , app('request')->get('locale'))}}'>Blog home</a></li>
 
                     <li class="nav-item ">
                         <a id="" class="nav-link " href="#" role="button"
@@ -87,12 +87,12 @@
         <div class="container">
             <div class='row full-width-div nav-bar-full'>
                 <div class='list-group-color'>
-                    @include("hessamcms_admin::layouts.sidebar")
-                    <div class=' list-group-color text-center mt-5 mb-3 text-muted hessam-version'>
-                        <small><a href='https://github.com/vhessam/laravel-blogger'>Hessam CMS</a></small>
+                    @include("binshopsblog_admin::layouts.sidebar")
+                    <div class=' list-group-color text-center mt-5 mb-3 text-muted binshops-version'>
+                        <small><a href='https://github.com/binshops/laravel-blog'>Binshops Blog</a></small>
 
                         <small>
-                            Version 9.1.x
+                            Version 9.2.x
                         </small>
                     </div>
                 </div>
@@ -112,9 +112,9 @@
 
                     {{--REPLACING THIS FILE WITH YOUR OWN LAYOUT FILE? Don't forget to include the following section!--}}
 
-                    @if(\HessamCMS\Helpers::has_flashed_message())
+                    @if(\BinshopsBlog\Helpers::has_flashed_message())
                         <div class='alert alert-info'>
-                            <h3>{{\HessamCMS\Helpers::pull_flashed_message() }}</h3>
+                            <h3>{{\BinshopsBlog\Helpers::pull_flashed_message() }}</h3>
                         </div>
                     @endif
 
diff --git a/src/Views/hessamcms_admin/layouts/sidebar.blade.php b/src/Views/binshopsblog_admin/layouts/sidebar.blade.php
similarity index 62%
rename from src/Views/hessamcms_admin/layouts/sidebar.blade.php
rename to src/Views/binshopsblog_admin/layouts/sidebar.blade.php
index e4a6d0a..f26192b 100755
--- a/src/Views/hessamcms_admin/layouts/sidebar.blade.php
+++ b/src/Views/binshopsblog_admin/layouts/sidebar.blade.php
@@ -1,9 +1,9 @@
 <ul class="list-group">
     <li class="list-group-item list-group-color justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('hessamcms.admin.index') }}">Dashboard</a>
+            <h6 class="my-0"><a href="{{ route('binshopsblog.admin.index') }}">Dashboard</a>
                 <span class="text-muted">(<?php
-                    $categoryCount = \HessamCMS\Models\HessamPost::count();
+                    $categoryCount = \BinshopsBlog\Models\BinshopsPost::count();
 
                     echo $categoryCount . " " . str_plural("Post", $categoryCount);
 
@@ -13,13 +13,13 @@
 
             <div class="list-group ">
 
-                <a href='{{ route('hessamcms.admin.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action @if(\Request::route()->getName() === 'hessamcms.admin.index') active @endif  '><i
+                <a href='{{ route('binshopsblog.admin.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action @if(\Request::route()->getName() === 'binshopsblog.admin.index') active @endif  '><i
                             class="fa fa-th fa-fw"
                             aria-hidden="true"></i>
                     All Posts</a>
-                <a href='{{ route('hessamcms.admin.create_post') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.create_post') active @endif  '><i
+                <a href='{{ route('binshopsblog.admin.create_post') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.create_post') active @endif  '><i
                             class="fa fa-plus fa-fw" aria-hidden="true"></i>
                     Add Post</a>
             </div>
@@ -29,10 +29,10 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
 
     <li class="list-group-item list-group-color justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('hessamcms.admin.comments.index') }}">Comments</a>
+            <h6 class="my-0"><a href="{{ route('binshopsblog.admin.comments.index') }}">Comments</a>
 
                 <span class="text-muted">(<?php
-                    $commentCount = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->count();
+                    $commentCount = \BinshopsBlog\Models\BinshopsComment::withoutGlobalScopes()->count();
 
                     echo $commentCount . " " . str_plural("Comment", $commentCount);
 
@@ -41,16 +41,16 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
             <small class="text-muted">Manage your comments</small>
 
             <div class="list-group ">
-                <a href='{{ route('hessamcms.admin.comments.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.comments.index' && !\Request::get("waiting_for_approval")) active @endif   '><i
+                <a href='{{ route('binshopsblog.admin.comments.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.comments.index' && !\Request::get("waiting_for_approval")) active @endif   '><i
                             class="fa  fa-fw fa-comments" aria-hidden="true"></i>
                     All Comments</a>
 
 
-                <?php $comment_approval_count = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where("approved", false)->count(); ?>
+                <?php $comment_approval_count = \BinshopsBlog\Models\BinshopsComment::withoutGlobalScopes()->where("approved", false)->count(); ?>
 
-                <a href='{{ route('hessamcms.admin.comments.index') }}?waiting_for_approval=true'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.comments.index' && \Request::get("waiting_for_approval")) active @elseif($comment_approval_count>0) list-group-item list-group-color-warning @endif  '><i
+                <a href='{{ route('binshopsblog.admin.comments.index') }}?waiting_for_approval=true'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.comments.index' && \Request::get("waiting_for_approval")) active @elseif($comment_approval_count>0) list-group-item list-group-color-warning @endif  '><i
                             class="fa  fa-fw fa-comments" aria-hidden="true"></i>
                     {{ $comment_approval_count }}
                     Waiting for approval </a>
@@ -62,9 +62,9 @@ class="fa  fa-fw fa-comments" aria-hidden="true"></i>
 
     <li class="list-group-item list-group-color  justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('hessamcms.admin.categories.index') }}">Categories</a>
+            <h6 class="my-0"><a href="{{ route('binshopsblog.admin.categories.index') }}">Categories</a>
                 <span class="text-muted">(<?php
-                    $postCount = \HessamCMS\Models\HessamCategory::count();
+                    $postCount = \BinshopsBlog\Models\BinshopsCategory::count();
                     echo $postCount . " " . str_plural("Category", $postCount);
                     ?>)</span>
             </h6>
@@ -73,12 +73,12 @@ class="fa  fa-fw fa-comments" aria-hidden="true"></i>
             <small class="text-muted">Blog post categories</small>
 
             <div class="list-group ">
-                <a href='{{ route('hessamcms.admin.categories.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.categories.index') active @endif  '><i
+                <a href='{{ route('binshopsblog.admin.categories.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.categories.index') active @endif  '><i
                             class="fa fa-object-group fa-fw" aria-hidden="true"></i>
                     All Categories</a>
-                <a href='{{ route('hessamcms.admin.categories.create_category') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.categories.create_category') active @endif  '><i
+                <a href='{{ route('binshopsblog.admin.categories.create_category') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.categories.create_category') active @endif  '><i
                             class="fa fa-plus fa-fw" aria-hidden="true"></i>
                     Add Category</a>
             </div>
@@ -89,17 +89,17 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
 
     <li class="list-group-item list-group-color  justify-content-between lh-condensed">
         <div>
-            <h6 class="my-0"><a href="{{ route('hessamcms.admin.images.upload') }}">Languages</a></h6>
+            <h6 class="my-0"><a href="{{ route('binshopsblog.admin.images.upload') }}">Languages</a></h6>
 
             <div class="list-group ">
 
-                <a href='{{ route('hessamcms.admin.languages.index') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.languages.index') active @endif  '><i
+                <a href='{{ route('binshopsblog.admin.languages.index') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.languages.index') active @endif  '><i
                             class="fa fa-language fa-fw" aria-hidden="true"></i>
                     All Languages</a>
 
-                <a href='{{ route('hessamcms.admin.languages.create_language') }}'
-                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.languages.create_language') active @endif  '><i
+                <a href='{{ route('binshopsblog.admin.languages.create_language') }}'
+                   class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.languages.create_language') active @endif  '><i
                             class="fa fa-plus fa-fw" aria-hidden="true"></i>
                     Add new Language</a>
             </div>
@@ -107,20 +107,20 @@ class="fa fa-plus fa-fw" aria-hidden="true"></i>
     </li>
 
 
-    @if(config("hessamcms.image_upload_enabled"))
+    @if(config("binshopsblog.image_upload_enabled"))
         <li class="list-group-item list-group-color  justify-content-between lh-condensed">
             <div>
-                <h6 class="my-0"><a href="{{ route('hessamcms.admin.images.upload') }}">Upload images</a></h6>
+                <h6 class="my-0"><a href="{{ route('binshopsblog.admin.images.upload') }}">Upload images</a></h6>
 
                 <div class="list-group ">
 
-                    <a href='{{ route('hessamcms.admin.images.all') }}'
-                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.images.all') active @endif  '><i
+                    <a href='{{ route('binshopsblog.admin.images.all') }}'
+                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.images.all') active @endif  '><i
                                 class="fa fa-picture-o fa-fw" aria-hidden="true"></i>
                         View All</a>
 
-                    <a href='{{ route('hessamcms.admin.images.upload') }}'
-                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'hessamcms.admin.images.upload') active @endif  '><i
+                    <a href='{{ route('binshopsblog.admin.images.upload') }}'
+                       class='list-group-item list-group-color list-group-item list-group-color-action  @if(\Request::route()->getName() === 'binshopsblog.admin.images.upload') active @endif  '><i
                                 class="fa fa-upload fa-fw" aria-hidden="true"></i>
                         Upload</a>
                 </div>
diff --git a/src/Views/hessamcms_admin/posts/add_post.blade.php b/src/Views/binshopsblog_admin/posts/add_post.blade.php
similarity index 73%
rename from src/Views/hessamcms_admin/posts/add_post.blade.php
rename to src/Views/binshopsblog_admin/posts/add_post.blade.php
index 7da4f71..ed805d9 100755
--- a/src/Views/hessamcms_admin/posts/add_post.blade.php
+++ b/src/Views/binshopsblog_admin/posts/add_post.blade.php
@@ -1,13 +1,13 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
     <h5>Admin - Add post</h5>
     <p>Change language option to translate your post in different language</p>
-    <form id="add-post-form" method='post' action='{{route("hessamcms.admin.store_post")}}'  enctype="multipart/form-data" >
+    <form id="add-post-form" method='post' action='{{route("binshopsblog.admin.store_post")}}'  enctype="multipart/form-data" >
 
         @csrf
-        @include("hessamcms_admin::posts.form", [
+        @include("binshopsblog_admin::posts.form", [
     'post' => $post,
     'post_translation' => $post_translation
     ])
@@ -18,7 +18,7 @@
 
     <script>
         //multi language
-        var store_toggle_url = '{{route("hessamcms.admin.store_post_toggle")}}';
+        var store_toggle_url = '{{route("binshopsblog.admin.store_post_toggle")}}';
         var preLang = $('#language_list').val();
         $('#language_list').change(function (){
             $('#add-post-form').attr('action', store_toggle_url);
diff --git a/src/Views/hessamcms_admin/posts/deleted_post.blade.php b/src/Views/binshopsblog_admin/posts/deleted_post.blade.php
similarity index 65%
rename from src/Views/hessamcms_admin/posts/deleted_post.blade.php
rename to src/Views/binshopsblog_admin/posts/deleted_post.blade.php
index 8145729..ce7ce24 100755
--- a/src/Views/hessamcms_admin/posts/deleted_post.blade.php
+++ b/src/Views/binshopsblog_admin/posts/deleted_post.blade.php
@@ -1,13 +1,13 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
     <div class='alert alert-success'><b>Deleted that post</b>
-        <br/><a href='{{ route('hessamcms.admin.index') }}' class='btn btn-primary '>Back to posts overview</a></div>
+        <br/><a href='{{ route('binshopsblog.admin.index') }}' class='btn btn-primary '>Back to posts overview</a></div>
 
     <?php
     $images_to_delete = [];
-    foreach ((array) config("hessamcms.image_sizes") as $image_size => $image_size_info) {
+    foreach ((array) config("binshopsblog.image_sizes") as $image_size => $image_size_info) {
         if (!$deletedPost->$image_size) {
             continue;
         }
@@ -32,25 +32,25 @@
 
 
                     <td class='text-center'><a
-                                href='{{asset(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
+                                href='{{asset(config("binshopsblog.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
                                 target='_blank' class='btn btn-primary m-1'>view</a>
 
-                        <img src='{{asset(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
+                        <img src='{{asset(config("binshopsblog.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}'
                              width=100>
 
                     </td>
                     <td><code>{{$deletedPost->$image_size}}</code>
 
             {{--check filesize returns something, so we don't divide by 0--}}
-                        @if(filesize(public_path(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)))
+                        @if(filesize(public_path(config("binshopsblog.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)))
 
-                        ({{ (round(filesize(public_path(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)) / 1000 ,1)). " kb"}})
+                        ({{ (round(filesize(public_path(config("binshopsblog.blog_upload_dir","blog_images")."/".$deletedPost->$image_size)) / 1000 ,1)). " kb"}})
 
                         @endif
 
                     </td>
                     <td><code>
-                            <small>{{ public_path(config("hessamcms.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}</small>
+                            <small>{{ public_path(config("binshopsblog.blog_upload_dir","blog_images")."/".$deletedPost->$image_size) }}</small>
                         </code></td>
                 </tr>
 
diff --git a/src/Views/hessamcms_admin/posts/edit_post.blade.php b/src/Views/binshopsblog_admin/posts/edit_post.blade.php
similarity index 76%
rename from src/Views/hessamcms_admin/posts/edit_post.blade.php
rename to src/Views/binshopsblog_admin/posts/edit_post.blade.php
index ef736dd..1af6265 100755
--- a/src/Views/hessamcms_admin/posts/edit_post.blade.php
+++ b/src/Views/binshopsblog_admin/posts/edit_post.blade.php
@@ -1,4 +1,4 @@
-@extends("hessamcms_admin::layouts.admin_layout")
+@extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
 
@@ -8,7 +8,7 @@
         @endif
     </h5>
 
-    <form id="edit-post-form" method='post' action='{{route("hessamcms.admin.update_post",$post->id)}}'  enctype="multipart/form-data" >
+    <form id="edit-post-form" method='post' action='{{route("binshopsblog.admin.update_post",$post->id)}}'  enctype="multipart/form-data" >
 
         <p>
             To apply changes, click save changes for each language.
@@ -16,7 +16,7 @@
 
         @csrf
         @method("patch")
-        @include("hessamcms_admin::posts.form", [
+        @include("binshopsblog_admin::posts.form", [
           'post' => $post,
           'post_translation' => $post_translation
         ])
@@ -27,7 +27,7 @@
 
     <script>
         //multi language
-        var edit_toggle_url = '{{route("hessamcms.admin.edit_post_toggle",$post->id)}}';
+        var edit_toggle_url = '{{route("binshopsblog.admin.edit_post_toggle",$post->id)}}';
         var preLang = $('#language_list').val();
         $('#language_list').change(function (){
             $("#edit-post-form").attr("method", "get");
diff --git a/src/Views/hessamcms_admin/posts/form.blade.php b/src/Views/binshopsblog_admin/posts/form.blade.php
similarity index 93%
rename from src/Views/hessamcms_admin/posts/form.blade.php
rename to src/Views/binshopsblog_admin/posts/form.blade.php
index 11eecf6..a37ff4f 100755
--- a/src/Views/hessamcms_admin/posts/form.blade.php
+++ b/src/Views/binshopsblog_admin/posts/form.blade.php
@@ -35,7 +35,7 @@
             <label for="blog_slug">Blog Post Slug</label>
             <input type="text" class="form-control" id="blog_slug" aria-describedby="blog_slug_help" name='slug'
                    value="{{old("slug",$post_translation->slug)}}">
-            <small id="blog_slug_help" class="form-text text-muted">The slug (leave blank to auto generate) - i.e.{{route("hessamcms.single", [app('request')->get('locale'), "your-slug"])}}</small>
+            <small id="blog_slug_help" class="form-text text-muted">The slug (leave blank to auto generate) - i.e.{{route("binshopsblog.single", [app('request')->get('locale'), "your-slug"])}}</small>
         </div>
 
     </div>
@@ -84,7 +84,7 @@
 
 <div class="form-group">
     <label for="blog_post_body">Post Body
-        @if(config("hessamcms.echo_html"))
+        @if(config("binshopsblog.echo_html"))
             (HTML)
         @else
          (Html will be escaped)
@@ -101,7 +101,7 @@
 </div>
 
 
-@if(config("hessamcms.use_custom_view_files",true))
+@if(config("binshopsblog.use_custom_view_files",true))
     <div class="form-group">
         <label for="blog_use_view_file">Custom View File</label>
         <input type="text" class="form-control" id="blog_use_view_file" aria-describedby="blog_use_view_file_help"
@@ -137,7 +137,7 @@
     <small id="blog_short_description_help" class="form-text text-muted">Short description (optional - only useful if you use in your template views)</small>
 </div>
 
-@if(config("hessamcms.image_upload_enabled",true))
+@if(config("binshopsblog.image_upload_enabled",true))
 
     <div class='bg-white pt-4 px-4 pb-0 my-2 mb-4 rounded border'>
         <style>
@@ -148,7 +148,7 @@
         <h4>Featured Images</h4>
 
 
-        @foreach(config("hessamcms.image_sizes") as $size_key =>$size_info)
+        @foreach(config("binshopsblog.image_sizes") as $size_key =>$size_info)
             <div class="form-group mb-4 p-2
         @if($loop->iteration>1)
                     image_upload_other_sizes
@@ -171,7 +171,7 @@
                        aria-describedby="blog_{{$size_key}}_help">
 
                 @if($post_translation->has_image($size_info['basic_key']))
-                    <a style="color: darkred" href="{{route("hessamcms.admin.remove_photo",[
+                    <a style="color: darkred" href="{{route("binshopsblog.admin.remove_photo",[
      $post_translation->slug,
      $selected_lang
     ]
@@ -188,7 +188,7 @@ class='btn btn-light btn-sm'>Show other sizes</span>
 
     </div>
 @else
-    <div class='alert alert-warning'>Image uploads were disabled in hessamcms.php config</div>
+    <div class='alert alert-warning'>Image uploads were disabled in binshopsblog.php config</div>
 @endif
 
 
@@ -213,7 +213,7 @@ class='btn btn-light btn-sm'>Show other sizes</span>
 
         <div class='col-md-12 my-3 text-center'>
 
-            <em><a class="a-link-cart-color" target='_blank' href='{{route("hessamcms.admin.categories.create_category")}}'><i class="fa fa-external-link" aria-hidden="true"></i>
+            <em><a class="a-link-cart-color" target='_blank' href='{{route("binshopsblog.admin.categories.create_category")}}'><i class="fa fa-external-link" aria-hidden="true"></i>
                     Add new categories
                     here</a></em>
         </div>
@@ -256,7 +256,7 @@ function populate_slug_field() {
 
 </script>
 
-@if( config("hessamcms.use_wysiwyg") && config("hessamcms.echo_html"))
+@if( config("binshopsblog.use_wysiwyg") && config("binshopsblog.echo_html"))
     <script src="//cdn.ckeditor.com/4.15.0/full/ckeditor.js"></script>
 
     <script>
diff --git a/src/Views/hessamcms_admin/setup/setup.blade.php b/src/Views/binshopsblog_admin/setup/setup.blade.php
similarity index 99%
rename from src/Views/hessamcms_admin/setup/setup.blade.php
rename to src/Views/binshopsblog_admin/setup/setup.blade.php
index e7b7790..72dc1a8 100644
--- a/src/Views/hessamcms_admin/setup/setup.blade.php
+++ b/src/Views/binshopsblog_admin/setup/setup.blade.php
@@ -5,7 +5,7 @@
     <link rel="apple-touch-icon" sizes="76x76" href="assets/img/apple-icon.png">
     <link rel="icon" type="image/png" href="assets/img/favicon.png">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>Hessam CMS pacakge setup</title>
+    <title>Binshops Blog pacakge setup</title>
 
     <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
     <meta name="viewport" content="width=device-width" />
@@ -28,7 +28,7 @@
 
                 <div class="wizard-container">
                     <div class="card wizard-card" data-color="green" id="wizard">
-                        <form action="{{route("hessamcms.admin.setup_submit")}}" method="post">
+                        <form action="{{route("binshopsblog.admin.setup_submit")}}" method="post">
                             @csrf
 
                             <div class="wizard-header" style="padding: 10px; text-align: center">
@@ -241,7 +241,7 @@ class="form-control"
 
     <div class="footer">
         <div class="container">
-            Created by Hessam CMS
+            Created by Binshops Blog
         </div>
     </div>
 </div>
diff --git a/src/Views/hessamcms/single_post.blade.php b/src/Views/hessamcms/single_post.blade.php
deleted file mode 100755
index d76ba5a..0000000
--- a/src/Views/hessamcms/single_post.blade.php
+++ /dev/null
@@ -1,43 +0,0 @@
-@extends("layouts.app",['title'=>$post->gen_seo_title()])
-
-@section('blog-custom-css')
-    <link type="text/css" href="{{ asset('hessam-blog.css') }}" rel="stylesheet">
-@endsection
-
-@section("content")
-
-    @if(config("hessamcms.reading_progress_bar"))
-        <div id="scrollbar">
-            <div id="scrollbar-bg"></div>
-        </div>
-    @endif
-
-    {{--https://hessam.binshops.com/laravel/packages/hessamcms-blog-system-for-your-laravel-app/help-documentation/laravel-blog-package-hessamcms#guide_to_views--}}
-
-    <div class='container'>
-    <div class='row'>
-        <div class='col-sm-12 col-md-12 col-lg-12'>
-
-            @include("hessamcms::partials.show_errors")
-            @include("hessamcms::partials.full_post_details")
-
-
-            @if(config("hessamcms.comments.type_of_comments_to_show","built_in") !== 'disabled')
-                <div class="" id='maincommentscontainer'>
-                    <h2 class='text-center' id='hessamcmscomments'>Comments</h2>
-                    @include("hessamcms::partials.show_comments")
-                </div>
-            @else
-                {{--Comments are disabled--}}
-            @endif
-
-
-        </div>
-    </div>
-    </div>
-
-@endsection
-
-@section('blog-custom-js')
-    <script src="{{asset('hessam-blog.js')}}"></script>
-@endsection
\ No newline at end of file
diff --git a/src/css/hessam-blog.css b/src/css/binshops-blog.css
similarity index 93%
rename from src/css/hessam-blog.css
rename to src/css/binshops-blog.css
index 7c26fb6..e8edc54 100644
--- a/src/css/hessam-blog.css
+++ b/src/css/binshops-blog.css
@@ -25,6 +25,6 @@
     background-color: #E16036;
 }
 
-.hessam-cat-hierarchy {
+.binshops-cat-hierarchy {
     list-style-type: none !important;
 }
diff --git a/src/css/hessamcms_admin_css.css b/src/css/binshopsblog_admin_css.css
similarity index 99%
rename from src/css/hessamcms_admin_css.css
rename to src/css/binshopsblog_admin_css.css
index 413af93..48562d3 100644
--- a/src/css/hessamcms_admin_css.css
+++ b/src/css/binshopsblog_admin_css.css
@@ -22,7 +22,7 @@ From laravel 5.6
     background-color: #212529 !important;
 }
 
-.hessam-version{
+.binshops-version{
     margin: 0px !important;
     padding: 10px;
 }
@@ -31,7 +31,7 @@ From laravel 5.6
     color: #212529 !important;
 }
 
-.hessam-blog-title{
+.binshops-blog-title{
     position: absolute;
     left: 20px;
 }
diff --git a/src/js/hessam-blog.js b/src/js/binshops-blog.js
similarity index 100%
rename from src/js/hessam-blog.js
rename to src/js/binshops-blog.js
diff --git a/src/routes.php b/src/routes.php
index 3efb0df..406b2a9 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -1,36 +1,36 @@
 <?php
 
-Route::group(['middleware' => ['web'], 'namespace' => '\HessamCMS\Controllers'], function () {
+Route::group(['middleware' => ['web'], 'namespace' => '\BinshopsBlog\Controllers'], function () {
 
     /** The main public facing blog routes - show all posts, view a category, rss feed, view a single post, also the add comment route */
-    Route::group(['prefix' => "/{locale}/".config('hessamcms.blog_prefix', 'blog')], function () {
+    Route::group(['prefix' => "/{locale}/".config('binshopsblog.blog_prefix', 'blog')], function () {
 
-        Route::get('/', 'HessamReaderController@index')
-            ->name('hessamcms.index');
+        Route::get('/', 'BinshopsReaderController@index')
+            ->name('binshopsblog.index');
 
-        Route::get('/search', 'HessamReaderController@search')
-            ->name('hessamcms.search');
+        Route::get('/search', 'BinshopsReaderController@search')
+            ->name('binshopsblog.search');
 
-        Route::get('/feed', 'HessamRssFeedController@feed')
-            ->name('hessamcms.feed'); //RSS feed
+        Route::get('/feed', 'BinshopsRssFeedController@feed')
+            ->name('binshopsblog.feed'); //RSS feed
 
-        Route::get('/category{subcategories}', 'HessamReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('hessamcms.view_category');
+        Route::get('/category{subcategories}', 'BinshopsReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('binshopsblog.view_category');
 
 //        Route::get('/category/{categorySlug}',
-//            'HessamReaderController@view_category')
-//            ->name('hessamcms.view_category');
+//            'BinshopsReaderController@view_category')
+//            ->name('binshopsblog.view_category');
 
         Route::get('/{blogPostSlug}',
-            'HessamReaderController@viewSinglePost')
-            ->name('hessamcms.single');
+            'BinshopsReaderController@viewSinglePost')
+            ->name('binshopsblog.single');
 
 
         // throttle to a max of 10 attempts in 3 minutes:
         Route::group(['middleware' => 'throttle:10,3'], function () {
 
             Route::post('save_comment/{blogPostSlug}',
-                'HessamCommentWriterController@addNewComment')
-                ->name('hessamcms.comments.add_new_comment');
+                'BinshopsCommentWriterController@addNewComment')
+                ->name('binshopsblog.comments.add_new_comment');
 
 
         });
@@ -39,99 +39,99 @@
 
 
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
-    Route::group(['prefix' => config('hessamcms.admin_prefix', 'blog_admin')], function () {
+    Route::group(['prefix' => config('binshopsblog.admin_prefix', 'blog_admin')], function () {
 
-        Route::get('/setup', 'HessamAdminSetupController@setup')
-            ->name('hessamcms.admin.setup');
+        Route::get('/setup', 'BinshopsAdminSetupController@setup')
+            ->name('binshopsblog.admin.setup');
 
-        Route::post('/setup-submit', 'HessamAdminSetupController@setup_submit')
-            ->name('hessamcms.admin.setup_submit');
+        Route::post('/setup-submit', 'BinshopsAdminSetupController@setup_submit')
+            ->name('binshopsblog.admin.setup_submit');
 
-        Route::get('/', 'HessamAdminController@index')
-            ->name('hessamcms.admin.index');
+        Route::get('/', 'BinshopsAdminController@index')
+            ->name('binshopsblog.admin.index');
 
         Route::get('/add_post',
-            'HessamAdminController@create_post')
-            ->name('hessamcms.admin.create_post');
+            'BinshopsAdminController@create_post')
+            ->name('binshopsblog.admin.create_post');
 
 
         Route::post('/add_post',
-            'HessamAdminController@store_post')
-            ->name('hessamcms.admin.store_post');
+            'BinshopsAdminController@store_post')
+            ->name('binshopsblog.admin.store_post');
 
         Route::post('/add_post_toggle',
-            'HessamAdminController@store_post_toggle')
-            ->name('hessamcms.admin.store_post_toggle');
+            'BinshopsAdminController@store_post_toggle')
+            ->name('binshopsblog.admin.store_post_toggle');
 
         Route::get('/edit_post/{blogPostId}',
-            'HessamAdminController@edit_post')
-            ->name('hessamcms.admin.edit_post');
+            'BinshopsAdminController@edit_post')
+            ->name('binshopsblog.admin.edit_post');
 
         Route::get('/edit_post_toggle/{blogPostId}',
-            'HessamAdminController@edit_post_toggle')
-            ->name('hessamcms.admin.edit_post_toggle');
+            'BinshopsAdminController@edit_post_toggle')
+            ->name('binshopsblog.admin.edit_post_toggle');
 
         Route::patch('/edit_post/{blogPostId}',
-            'HessamAdminController@update_post')
-            ->name('hessamcms.admin.update_post');
+            'BinshopsAdminController@update_post')
+            ->name('binshopsblog.admin.update_post');
 
         //Removes post's photo
         Route::get('/remove_photo/{slug}/{lang_id}',
-            'HessamAdminController@remove_photo')
-            ->name('hessamcms.admin.remove_photo');
+            'BinshopsAdminController@remove_photo')
+            ->name('binshopsblog.admin.remove_photo');
 
         Route::group(['prefix' => "image_uploads",], function () {
 
-            Route::get("/", "HessamImageUploadController@index")->name("hessamcms.admin.images.all");
+            Route::get("/", "BinshopsImageUploadController@index")->name("binshopsblog.admin.images.all");
 
-            Route::get("/upload", "HessamImageUploadController@create")->name("hessamcms.admin.images.upload");
-            Route::post("/upload", "HessamImageUploadController@store")->name("hessamcms.admin.images.store");
+            Route::get("/upload", "BinshopsImageUploadController@create")->name("binshopsblog.admin.images.upload");
+            Route::post("/upload", "BinshopsImageUploadController@store")->name("binshopsblog.admin.images.store");
 
         });
 
 
         Route::delete('/delete_post/{blogPostId}',
-            'HessamAdminController@destroy_post')
-            ->name('hessamcms.admin.destroy_post');
+            'BinshopsAdminController@destroy_post')
+            ->name('binshopsblog.admin.destroy_post');
 
         Route::group(['prefix' => 'comments',], function () {
 
             Route::get('/',
-                'HessamCommentsAdminController@index')
-                ->name('hessamcms.admin.comments.index');
+                'BinshopsCommentsAdminController@index')
+                ->name('binshopsblog.admin.comments.index');
 
             Route::patch('/{commentId}',
-                'HessamCommentsAdminController@approve')
-                ->name('hessamcms.admin.comments.approve');
+                'BinshopsCommentsAdminController@approve')
+                ->name('binshopsblog.admin.comments.approve');
             Route::delete('/{commentId}',
-                'HessamCommentsAdminController@destroy')
-                ->name('hessamcms.admin.comments.delete');
+                'BinshopsCommentsAdminController@destroy')
+                ->name('binshopsblog.admin.comments.delete');
         });
 
         Route::group(['prefix' => 'categories'], function () {
 
             Route::get('/',
-                'HessamCategoryAdminController@index')
-                ->name('hessamcms.admin.categories.index');
+                'BinshopsCategoryAdminController@index')
+                ->name('binshopsblog.admin.categories.index');
 
             Route::get('/add_category',
-                'HessamCategoryAdminController@create_category')
-                ->name('hessamcms.admin.categories.create_category');
+                'BinshopsCategoryAdminController@create_category')
+                ->name('binshopsblog.admin.categories.create_category');
             Route::post('/store_category',
-                'HessamCategoryAdminController@store_category')
-                ->name('hessamcms.admin.categories.store_category');
+                'BinshopsCategoryAdminController@store_category')
+                ->name('binshopsblog.admin.categories.store_category');
 
             Route::get('/edit_category/{categoryId}',
-                'HessamCategoryAdminController@edit_category')
-                ->name('hessamcms.admin.categories.edit_category');
+                'BinshopsCategoryAdminController@edit_category')
+                ->name('binshopsblog.admin.categories.edit_category');
 
             Route::patch('/edit_category/{categoryId}',
-                'HessamCategoryAdminController@update_category')
-                ->name('hessamcms.admin.categories.update_category');
+                'BinshopsCategoryAdminController@update_category')
+                ->name('binshopsblog.admin.categories.update_category');
 
             Route::delete('/delete_category/{categoryId}',
-                'HessamCategoryAdminController@destroy_category')
-                ->name('hessamcms.admin.categories.destroy_category');
+                'BinshopsCategoryAdminController@destroy_category')
+                ->name('binshopsblog.admin.categories.destroy_category');
 
         });
 
@@ -139,23 +139,23 @@
         Route::group(['prefix' => 'languages'], function () {
 
             Route::get('/',
-                'HessamLanguageAdminController@index')
-                ->name('hessamcms.admin.languages.index');
+                'BinshopsLanguageAdminController@index')
+                ->name('binshopsblog.admin.languages.index');
 
             Route::get('/add_language',
-                'HessamLanguageAdminController@create_language')
-                ->name('hessamcms.admin.languages.create_language');
+                'BinshopsLanguageAdminController@create_language')
+                ->name('binshopsblog.admin.languages.create_language');
             Route::post('/add_language',
-                'HessamLanguageAdminController@store_language')
-                ->name('hessamcms.admin.languages.store_language');
+                'BinshopsLanguageAdminController@store_language')
+                ->name('binshopsblog.admin.languages.store_language');
 
             Route::delete('/delete_language/{languageId}',
-                'HessamLanguageAdminController@destroy_language')
-                ->name('hessamcms.admin.languages.destroy_language');
+                'BinshopsLanguageAdminController@destroy_language')
+                ->name('binshopsblog.admin.languages.destroy_language');
 
             Route::post('/toggle_language/{languageId}',
-                'HessamLanguageAdminController@toggle_language')
-                ->name('hessamcms.admin.languages.toggle_language');
+                'BinshopsLanguageAdminController@toggle_language')
+                ->name('binshopsblog.admin.languages.toggle_language');
 
         });
     });
diff --git a/tests/CaptchaTest.php b/tests/CaptchaTest.php
index 305fa6a..dfa7f34 100644
--- a/tests/CaptchaTest.php
+++ b/tests/CaptchaTest.php
@@ -6,7 +6,7 @@ class CaptchaTest extends \Tests\TestCase
     public function testBasicCaptchaMethodsReturnCorrectType()
     {
 
-        $captcha = new \HessamCMS\Captcha\Basic();
+        $captcha = new \BinshopsBlog\Captcha\Basic();
         $this->assertEquals(gettype($captcha->captcha_field_name()), "string");
         $this->assertEquals(gettype($captcha->view()), "string");
         $this->assertEquals(gettype($captcha->rules()), "array");
@@ -16,7 +16,7 @@ public function testBasicCaptchaMethodsReturnCorrectType()
     public function testRuleCustomValidationFunctionReturnsCorrectly()
     {
 
-        $captcha = new \HessamCMS\Captcha\Basic();
+        $captcha = new \BinshopsBlog\Captcha\Basic();
 
         foreach ($captcha->rules() as $rule) {
 
@@ -31,32 +31,32 @@ public function testRuleCustomValidationFunctionReturnsCorrectly()
 
 
                 // testing CORRECT answer (should return null)
-                \Config::set('hessamcms.captcha.basic_answers', "ignoreme,dark,ignoreme2");
+                \Config::set('binshopsblog.captcha.basic_answers', "ignoreme,dark,ignoreme2");
                 $this->assertNull($rule('correct1', 'dark', function () {
                     return "lookingforthis";
                 }));
 
                 // testing WRONG answer
-                \Config::set('hessamcms.captcha.basic_answers', "ignoreme,dark,ignoreme2");
+                \Config::set('binshopsblog.captcha.basic_answers', "ignoreme,dark,ignoreme2");
                 $this->assertEquals($rule('wrong1', 'light', function () {
                     return "lookingforthis";
                 }), "lookingforthis");
 
                 // testing CORRECT answer
-                \Config::set('hessamcms.captcha.basic_answers', "bLAcK");
+                \Config::set('binshopsblog.captcha.basic_answers', "bLAcK");
                 $this->assertNull($rule('wrong1', 'black', function () {
                     return "lookingforthis";
                 }));
 
                 // testing CORRECT answer
-                \Config::set('hessamcms.captcha.basic_answers', "bLAcK");
+                \Config::set('binshopsblog.captcha.basic_answers', "bLAcK");
                 $this->assertNull($rule('wrong1', ' black', function () {
                     return "lookingforthis";
                 }));
 
 
                 // testing CORRECT answer
-                \Config::set('hessamcms.captcha.basic_answers', "ignoreme, BLACK , jgnoreme2");
+                \Config::set('binshopsblog.captcha.basic_answers', "ignoreme, BLACK , jgnoreme2");
                 $this->assertNull($rule('wrong1', ' black', function () {
                     return "lookingforthis";
                 }));
diff --git a/tests/MainTest.php b/tests/MainTest.php
index a435738..5f7ea7f 100644
--- a/tests/MainTest.php
+++ b/tests/MainTest.php
@@ -20,11 +20,11 @@ class MainTest extends \Tests\TestCase
     Testing the author_email, author_website.
 
     /blog/...
-        hessamcms.index                       YES
-        hessamcms.feed                        YES
-        hessamcms.view_category               no - but this is basically hessamcms.index
-        hessamcms.single                      YES
-        hessamcms.comments.add_new_comment    YES - tested multiple times with/without basic captcha on/off/correct/incorrect.
+        binshopsblog.index                       YES
+        binshopsblog.feed                        YES
+        binshopsblog.view_category               no - but this is basically binshopsblog.index
+        binshopsblog.single                      YES
+        binshopsblog.comments.add_new_comment    YES - tested multiple times with/without basic captcha on/off/correct/incorrect.
                                                 Also tested with diff configs for comment form:
                                                     disabled
                                                     built_in
@@ -32,27 +32,27 @@ class MainTest extends \Tests\TestCase
                                                     custom
 
     /blog_admin/...
-        hessamcms.admin.index                 YES
-        hessamcms.admin.create_post           no - but is just a form
-        hessamcms.admin.store_post            YES
-        hessamcms.admin.edit_post             YES - but no extra checks
-        hessamcms.admin.update_post           YES
-        hessamcms.admin.destroy_post          YES
+        binshopsblog.admin.index                 YES
+        binshopsblog.admin.create_post           no - but is just a form
+        binshopsblog.admin.store_post            YES
+        binshopsblog.admin.edit_post             YES - but no extra checks
+        binshopsblog.admin.update_post           YES
+        binshopsblog.admin.destroy_post          YES
 
      /blog_admin/comments/...
 
-            hessamcms.admin.comments.index    YES
-            hessamcms.admin.comments.approve  YES
-            hessamcms.admin.comments.delete   YES
+            binshopsblog.admin.comments.index    YES
+            binshopsblog.admin.comments.approve  YES
+            binshopsblog.admin.comments.delete   YES
 
      /blog_admin/categories/...
 
-            hessamcms.admin.categories.index
-            hessamcms.admin.categories.create_category    no - but is just a form
-            hessamcms.admin.categories.store_category     YES
-            hessamcms.admin.categories.edit_category      no - but is just a form
-            hessamcms.admin.categories.update_category
-            hessamcms.admin.categories.destroy_category   YES
+            binshopsblog.admin.categories.index
+            binshopsblog.admin.categories.create_category    no - but is just a form
+            binshopsblog.admin.categories.store_category     YES
+            binshopsblog.admin.categories.edit_category      no - but is just a form
+            binshopsblog.admin.categories.update_category
+            binshopsblog.admin.categories.destroy_category   YES
 
 
 
@@ -63,16 +63,16 @@ class MainTest extends \Tests\TestCase
 
     public function testFilesArePresent()
     {
-        $this->assertFileExists(config_path("hessamcms.php"), "/config/hessamcms.php should exist - currently no file with that filename is found");
-        $this->assertTrue(is_array(include(config_path("hessamcms.php"))), "/config/hessamcms.php should exist - currently no file with that filename is found");
+        $this->assertFileExists(config_path("binshopsblog.php"), "/config/binshopsblog.php should exist - currently no file with that filename is found");
+        $this->assertTrue(is_array(include(config_path("binshopsblog.php"))), "/config/binshopsblog.php should exist - currently no file with that filename is found");
     }
 
     public function testImageSizesAreSane()
     {
 
-        $this->assertTrue(count(config("hessamcms.image_sizes")) >=  3);
+        $this->assertTrue(count(config("binshopsblog.image_sizes")) >=  3);
 
-        foreach (config("hessamcms.image_sizes") as $image_key => $image_info) {
+        foreach (config("binshopsblog.image_sizes") as $image_key => $image_info) {
 
             $this->assertArrayHasKey("w", $image_info);
             $this->assertArrayHasKey("h", $image_info);
@@ -94,13 +94,13 @@ public function testImageSizesAreSane()
     }
 
 
-    public function testUserHasNanManageHessamCMSPostsMethod()
+    public function testUserHasNanManageBinshopsBlogPostsMethod()
     {
 
-        $this->assertTrue(method_exists(\App\User::class, "canManageHessamCMSPosts"), "Your User model must have the canManageHessamCMSPosts method");
+        $this->assertTrue(method_exists(\App\User::class, "canManageBinshopsBlogPosts"), "Your User model must have the canManageBinshopsBlogPosts method");
 
         $user = new \App\User();
-        $this->assertTrue(is_bool($user->canManageHessamCMSPosts()));
+        $this->assertTrue(is_bool($user->canManageBinshopsBlogPosts()));
 
     }
 
@@ -109,7 +109,7 @@ public function testUserHasNanManageHessamCMSPostsMethod()
     public function testCanSeeAdminPanel()
     {
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
 
         \Auth::logout();
         // without a logged in user, should give error
@@ -126,7 +126,7 @@ public function testCanSeeAdminPanel()
         $response->assertStatus(200);
 
         // check user can see admin area:
-        $this->assertTrue($user->canManageHessamCMSPosts());
+        $this->assertTrue($user->canManageBinshopsBlogPosts());
 
         $response = $this->get($admin_panel_url);
         // check if we can see the admin panel correctly
@@ -138,10 +138,10 @@ public function testCanSeeAdminPanel()
         $response->assertSee("Add Category");
 
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
 //        $user=$this->create_admin_user();
 
-        $this->assertTrue($user->canManageHessamCMSPosts());
+        $this->assertTrue($user->canManageBinshopsBlogPosts());
 
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
@@ -155,7 +155,7 @@ public function testCanSeeAdminPanel()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
+        $this->assertDatabaseMissing('binshops_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
 
         $response->assertSessionHasNoErrors();
@@ -163,7 +163,7 @@ public function testCanSeeAdminPanel()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
 
     }
@@ -174,9 +174,9 @@ public function testCanCreatePost()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageHessamCMSPosts());
+        $this->assertTrue($user->canManageBinshopsBlogPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -188,13 +188,13 @@ public function testCanCreatePost()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
+        $this->assertDatabaseMissing('binshops_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
         $response->assertSessionHasNoErrors();
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
 
     }
@@ -206,9 +206,9 @@ public function testCanCreatePostThenEditIt()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageHessamCMSPosts());
+        $this->assertTrue($user->canManageBinshopsBlogPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -221,20 +221,20 @@ public function testCanCreatePostThenEditIt()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
+        $this->assertDatabaseMissing('binshops_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
-        $justCreatedRow = \HessamCMS\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
+        $justCreatedRow = \BinshopsBlog\Models\BinshopsPost::where("slug", $new_object_vals['slug'])->firstOrFail();
 
 
         $new_object_vals['title'] = "New title " . str_random();
-        $this->assertDatabaseMissing('hessam_posts', ['title' => $new_object_vals['title']]);
+        $this->assertDatabaseMissing('binshops_posts', ['title' => $new_object_vals['title']]);
         $response = $this->patch($admin_panel_url . "/edit_post/" . $justCreatedRow->id, $new_object_vals);
         $response->assertStatus(302);
-        $this->assertDatabaseHas('hessam_posts', ['title' => $new_object_vals['title']]);
+        $this->assertDatabaseHas('binshops_posts', ['title' => $new_object_vals['title']]);
 
 
     }
@@ -246,9 +246,9 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageHessamCMSPosts());
+        $this->assertTrue($user->canManageBinshopsBlogPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -263,17 +263,17 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
+        $this->assertDatabaseMissing('binshops_posts', $search_for_obj);
 
 
         // check we don't see it at moment
-        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog"));
         $response->assertDontSee($new_object_vals['slug']);
 
         // must clear the cache, as the /feed is cached
         \Artisan::call('cache:clear');
 
-        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/feed");
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog") . "/feed");
         $response->assertDontSee($new_object_vals['slug']);
 
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
@@ -281,11 +281,11 @@ public function testCreatePostThenCheckIsViewableToPublic()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
         // logout - so we are guest user
         \Auth::logout();
-        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog"));
         // if we see the slug (which is str_random()) we can safely assume that there was a link to the post, so it is working ok. of course it would depend a bit on your template but this should work.
         $response->assertSee($new_object_vals['slug']);
 
@@ -293,14 +293,14 @@ public function testCreatePostThenCheckIsViewableToPublic()
         // must clear the cache, as the /feed is cached
         \Artisan::call('cache:clear');
 
-        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/feed");
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog") . "/feed");
         $response->assertSee($new_object_vals['slug']);
         $response->assertSee($new_object_vals['title']);
 
 
         // now check single post is viewable
 
-        $response = $this->get(route("hessamcms.single", $new_object_vals['slug']));
+        $response = $this->get(route("binshopsblog.single", $new_object_vals['slug']));
         $response->assertStatus(200);
         $response->assertSee($new_object_vals['slug']);
         $response->assertSee($new_object_vals['title']);
@@ -313,7 +313,7 @@ public function testCreatePostWithNotPublishedThenCheckIsNotViewableToPublic()
     {
 
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         list($new_object_vals, $search_for_obj) = $this->prepare_post_creation();
 
         $new_object_vals['is_published'] = false;
@@ -323,19 +323,19 @@ public function testCreatePostWithNotPublishedThenCheckIsNotViewableToPublic()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
         // must log out, as the admin user can see posts dated in future
         \Auth::logout();
 
-        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog"));
         // if we see the slug (which is str_random()) we can safely assume that there was a link to the post, so it is working ok. of course it would depend a bit on your template but this should work.
         $response->assertDontSee($new_object_vals['slug']);
 
 
         // now check single post is viewable
 
-        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
         $response->assertStatus(404);
         $response->assertDontSee($new_object_vals['slug']);
         $response->assertDontSee($new_object_vals['title']);
@@ -348,7 +348,7 @@ public function testCreatePostWithFuturePostedAtThenCheckIsNotViewableToPublic()
     {
 
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         list($new_object_vals, $search_for_obj) = $this->prepare_post_creation();
 
         $new_object_vals['posted_at'] = \Carbon\Carbon::now()->addMonths(12);
@@ -358,19 +358,19 @@ public function testCreatePostWithFuturePostedAtThenCheckIsNotViewableToPublic()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
         // must log out, as the admin user can see posts dated in future
         \Auth::logout();
 
-        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog"));
         // if we see the slug (which is str_random()) we can safely assume that there was a link to the post, so it is working ok. of course it would depend a bit on your template but this should work.
         $response->assertDontSee($new_object_vals['slug']);
 
 
         // now check single post is viewable
 
-        $response = $this->get(config("hessamcms.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog") . "/" . $new_object_vals['slug']);
         $response->assertStatus(404);
         $response->assertDontSee($new_object_vals['slug']);
         $response->assertDontSee($new_object_vals['title']);
@@ -383,16 +383,16 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
     {
 
 
-        \Config::set('hessamcms.comments.auto_approve_comments', false);
-        \Config::set('hessamcms.captcha.captcha_enabled', true);
-        \Config::set('hessamcms.captcha.captcha_type', \HessamCMS\Captcha\Basic::class);
-        $captcha = new \HessamCMS\Captcha\Basic();
-        \Config::set('hessamcms.captcha.basic_question', "a test question");
-        \Config::set('hessamcms.captcha.basic_answers', "answer1,answer2");
+        \Config::set('binshopsblog.comments.auto_approve_comments', false);
+        \Config::set('binshopsblog.captcha.captcha_enabled', true);
+        \Config::set('binshopsblog.captcha.captcha_type', \BinshopsBlog\Captcha\Basic::class);
+        $captcha = new \BinshopsBlog\Captcha\Basic();
+        \Config::set('binshopsblog.captcha.basic_question', "a test question");
+        \Config::set('binshopsblog.captcha.basic_answers', "answer1,answer2");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -409,10 +409,10 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
 
-        \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
+        \Config::set('binshopsblog.comments.type_of_comments_to_show', 'built_in');
 
 
         $comment_detail = [
@@ -421,11 +421,11 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             'comment' => str_random(),
             $captcha->captcha_field_name() => "wronganswer1", // << WRONG CAPTCHA
         ];
-        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $this->assertDatabaseMissing('binshops_comments', ['author_name' => $comment_detail['author_name']]);
+        $response = $this->post(config("binshopsblog.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(302);
 
-        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('binshops_comments', ['author_name' => $comment_detail['author_name']]);
 
 
         $comment_detail = [
@@ -434,11 +434,11 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             'comment' => str_random(),
             // << NO CAPTCHA FIELD
         ];
-        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $this->assertDatabaseMissing('binshops_comments', ['author_name' => $comment_detail['author_name']]);
+        $response = $this->post(config("binshopsblog.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(302);
 
-        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseMissing('binshops_comments', ['author_name' => $comment_detail['author_name']]);
 
 
     }
@@ -448,14 +448,14 @@ public function testCreatePostThenSetCommentsToDisabledAndCheckNoneShow()
     {
 
 
-        \Config::set('hessamcms.comments.type_of_comments_to_show', "disabled");
+        \Config::set('binshopsblog.comments.type_of_comments_to_show', "disabled");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \HessamCMS\Models\HessamPost;
+        $newblogpost = new \BinshopsBlog\Models\BinshopsPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -480,14 +480,14 @@ public function testCreatePostThenSetCommentsToDisabledAndCheckNoneShow()
     }
     public function testCreatePostThenSetCommentsToDisqusAndCheckDisqusJSIsShown()
     {
-        \Config::set('hessamcms.comments.type_of_comments_to_show', "disqus");
+        \Config::set('binshopsblog.comments.type_of_comments_to_show', "disqus");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \HessamCMS\Models\HessamPost;
+        $newblogpost = new \BinshopsBlog\Models\BinshopsPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -510,14 +510,14 @@ public function testCreatePostThenSetCommentsToCustomAndCheckCustomErrorShows()
     {
 
 
-        \Config::set('hessamcms.comments.type_of_comments_to_show', "custom");
+        \Config::set('binshopsblog.comments.type_of_comments_to_show', "custom");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
-        $newblogpost = new \HessamCMS\Models\HessamPost;
+        $newblogpost = new \BinshopsBlog\Models\BinshopsPost;
 
         $newblogpost->title=__METHOD__ . " " . time();
 
@@ -541,16 +541,16 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
     {
 
 
-        \Config::set('hessamcms.comments.auto_approve_comments', false);
-        \Config::set('hessamcms.captcha.captcha_enabled', true);
-        \Config::set('hessamcms.captcha.captcha_type', \HessamCMS\Captcha\Basic::class);
-        $captcha = new \HessamCMS\Captcha\Basic();
-        \Config::set('hessamcms.captcha.basic_question', "a test question");
-        \Config::set('hessamcms.captcha.basic_answers', "answer1,answer2");
+        \Config::set('binshopsblog.comments.auto_approve_comments', false);
+        \Config::set('binshopsblog.captcha.captcha_enabled', true);
+        \Config::set('binshopsblog.captcha.captcha_type', \BinshopsBlog\Captcha\Basic::class);
+        $captcha = new \BinshopsBlog\Captcha\Basic();
+        \Config::set('binshopsblog.captcha.basic_question', "a test question");
+        \Config::set('binshopsblog.captcha.basic_answers', "answer1,answer2");
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -566,10 +566,10 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
 
-        \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
+        \Config::set('binshopsblog.comments.type_of_comments_to_show', 'built_in');
 
 
         $comment_detail = [
@@ -578,28 +578,28 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
             'comment' => str_random(),
             $captcha->captcha_field_name() => "AnsWer2",
         ];
-        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $this->assertDatabaseMissing('binshops_comments', ['author_name' => $comment_detail['author_name']]);
+        $response = $this->post(config("binshopsblog.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
         $response->assertStatus(200);
 
-        \Config::set('hessamcms.captcha.auto_approve_comments', false);
+        \Config::set('binshopsblog.captcha.auto_approve_comments', false);
 
-        $this->assertDatabaseHas('hessam_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseHas('binshops_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
-        $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+        $justAddedRow = \BinshopsBlog\Models\BinshopsComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
-        $response = $this->get(route("hessamcms.admin.comments.index"));
+        $response = $this->get(route("binshopsblog.admin.comments.index"));
         $response->assertSee($justAddedRow->author_name);
 
 
         // approve it:
-        $response = $this->patch(route("hessamcms.admin.comments.approve", $justAddedRow->id), [
+        $response = $this->patch(route("binshopsblog.admin.comments.approve", $justAddedRow->id), [
             '_token' => csrf_token(),
         ]);
         // check it was approved
         $response->assertStatus(302);
-        $this->assertDatabaseHas('hessam_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
+        $this->assertDatabaseHas('binshops_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
 
 
     }
@@ -607,12 +607,12 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveCommentWithBas
 
     public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
     {
-        \Config::set('hessamcms.comments.auto_approve_comments', false);
-        \Config::set('hessamcms.captcha.captcha_enabled', false);
+        \Config::set('binshopsblog.comments.auto_approve_comments', false);
+        \Config::set('binshopsblog.captcha.captcha_enabled', false);
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -628,11 +628,11 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
 
-        \Config::set('hessamcms.comments.type_of_comments_to_show', 'built_in');
-        \Config::set('hessamcms.captcha.captcha_enabled', false);
+        \Config::set('binshopsblog.comments.type_of_comments_to_show', 'built_in');
+        \Config::set('binshopsblog.captcha.captcha_enabled', false);
 
 
         $comment_detail = [
@@ -640,29 +640,29 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
             'author_name' => str_random(),
             'comment' => str_random(),
         ];
-        $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
-        $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+        $this->assertDatabaseMissing('binshops_comments', ['author_name' => $comment_detail['author_name']]);
+        $response = $this->post(config("binshopsblog.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
 
         $response->assertStatus(200);
 
-        \Config::set('hessamcms.captcha.auto_approve_comments', false);
+        \Config::set('binshopsblog.captcha.auto_approve_comments', false);
 
-        $this->assertDatabaseHas('hessam_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
+        $this->assertDatabaseHas('binshops_comments', ['approved' => false, 'author_name' => $comment_detail['author_name']]);
 
 
-        $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+        $justAddedRow = \BinshopsBlog\Models\BinshopsComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
-        $response = $this->get(route("hessamcms.admin.comments.index"));
+        $response = $this->get(route("binshopsblog.admin.comments.index"));
         $response->assertSee($justAddedRow->author_name);
 
 
         // approve it:
-        $response = $this->patch(route("hessamcms.admin.comments.approve", $justAddedRow->id), [
+        $response = $this->patch(route("binshopsblog.admin.comments.approve", $justAddedRow->id), [
             '_token' => csrf_token(),
         ]);
         // check it was approved
         $response->assertStatus(302);
-        $this->assertDatabaseHas('hessam_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
+        $this->assertDatabaseHas('binshops_comments', ['approved' => 1, 'author_name' => $justAddedRow->author_name]);
 
 
     }
@@ -670,12 +670,12 @@ public function testCreatePostThenCheckCanCreateCommentThenApproveComment()
 
     public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
     {
-        \Config::set('hessamcms.comments.auto_approve_comments', false);
-        \Config::set('hessamcms.captcha.captcha_enabled', false);
+        \Config::set('binshopsblog.comments.auto_approve_comments', false);
+        \Config::set('binshopsblog.captcha.captcha_enabled', false);
 
         $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
         // to verify this was added to database. Use a different variable, so we can add things (like _token) and still be able to assertDatabaseHas later.
@@ -691,43 +691,43 @@ public function testCreatePostThenCheckCanCreateCommentThenDeleteComment()
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
 
-        if (config("hessamcms.comments.type_of_comments_to_show") === 'built_in') {
+        if (config("binshopsblog.comments.type_of_comments_to_show") === 'built_in') {
             $comment_detail = [
                 '_token' => csrf_token(),
                 'author_name' => str_random(),
                 'comment' => str_random(),
             ];
-            $this->assertDatabaseMissing('hessam_comments', ['author_name' => $comment_detail['author_name']]);
-            $response = $this->post(config("hessamcms.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
+            $this->assertDatabaseMissing('binshops_comments', ['author_name' => $comment_detail['author_name']]);
+            $response = $this->post(config("binshopsblog.blog_prefix", "blog") . "/save_comment/" . $new_object_vals['slug'], $comment_detail);
             $response->assertSessionHasNoErrors();
             $response->assertStatus(200);
 
-            $this->assertDatabaseHas('hessam_comments', ['author_name' => $comment_detail['author_name']]);
+            $this->assertDatabaseHas('binshops_comments', ['author_name' => $comment_detail['author_name']]);
 
 
-            $justAddedRow = \HessamCMS\Models\HessamComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
+            $justAddedRow = \BinshopsBlog\Models\BinshopsComment::withoutGlobalScopes()->where('author_name', $comment_detail['author_name'])->firstOrFail();
 
             // check the just added row exists...
-            $response = $this->get(route("hessamcms.admin.comments.index"));
+            $response = $this->get(route("binshopsblog.admin.comments.index"));
             $response->assertSee($justAddedRow->author_name);
 
 
             // delete it:
-            $response = $this->delete(route("hessamcms.admin.comments.delete", $justAddedRow->id), [
+            $response = $this->delete(route("binshopsblog.admin.comments.delete", $justAddedRow->id), [
                 '_token' => csrf_token(),
             ]);
             // check it was deleted (it will deleted if approved)
             $response->assertStatus(302);
 
             //check it doesnt exist in database
-            $this->assertDatabaseMissing('hessam_comments', ['id' => $justAddedRow->id,]);
+            $this->assertDatabaseMissing('binshops_comments', ['id' => $justAddedRow->id,]);
 
 
         } else {
-            dump("NOT TESTING COMMENT FEATURE, as config(\"hessamcms.comments.type_of_comments_to_show\") is not set to 'built_in')");
+            dump("NOT TESTING COMMENT FEATURE, as config(\"binshopsblog.comments.type_of_comments_to_show\") is not set to 'built_in')");
         }
 
     }
@@ -739,9 +739,9 @@ public function testCanCreateThenDeletePost()
 
         $user = $this->create_admin_user();
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
 
-        $this->assertTrue($user->canManageHessamCMSPosts());
+        $this->assertTrue($user->canManageBinshopsBlogPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -754,30 +754,30 @@ public function testCanCreateThenDeletePost()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
+        $this->assertDatabaseMissing('binshops_posts', $search_for_obj);
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
         $response->assertSessionHasNoErrors();
 
 
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_posts', $search_for_obj);
+        $this->assertDatabaseHas('binshops_posts', $search_for_obj);
 
 
-        $justCreatedRow = \HessamCMS\Models\HessamPost::where("slug", $new_object_vals['slug'])->firstOrFail();
+        $justCreatedRow = \BinshopsBlog\Models\BinshopsPost::where("slug", $new_object_vals['slug'])->firstOrFail();
         $id = $justCreatedRow->id;
         $delete_url = $admin_panel_url . "/delete_post/" . $id;
 
         $response = $this->delete($delete_url, ['_token' => csrf_token()]);
         $response->assertStatus(200);
 
-        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
+        $this->assertDatabaseMissing('binshops_posts', $search_for_obj);
 
     }
 
 
     public function testCanCreateCategory()
     {
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $this->create_admin_user();
         // now lets create a category
         $new_cat_vals = [
@@ -786,11 +786,11 @@ public function testCanCreateCategory()
         ];
         $search_for_new_cat = $new_cat_vals;
         $new_cat_vals['_token'] = csrf_token();
-        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('binshops_categories', $search_for_new_cat);
         $response = $this->post($admin_panel_url . "/categories/add_category", $new_cat_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_categories', $search_for_new_cat);
+        $this->assertDatabaseHas('binshops_categories', $search_for_new_cat);
 
 
     }
@@ -800,7 +800,7 @@ public function testCanCreateCategoryThenEditIt()
     {
 
 
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
 
 
         $this->create_admin_user();
@@ -814,15 +814,15 @@ public function testCanCreateCategoryThenEditIt()
         // create a post so we can edit it later
         $search_for_new_cat = $new_cat_vals;
         $new_cat_vals['_token'] = csrf_token();
-        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('binshops_categories', $search_for_new_cat);
         $response = $this->post($admin_panel_url . "/categories/add_category", $new_cat_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_categories', $search_for_new_cat);
+        $this->assertDatabaseHas('binshops_categories', $search_for_new_cat);
 
 
         // get the just inserted row
-        $justCreatedRow = \HessamCMS\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
+        $justCreatedRow = \BinshopsBlog\Models\BinshopsCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
 
 
         // get the edit page (form)
@@ -837,12 +837,12 @@ public function testCanCreateCategoryThenEditIt()
         $new_object_vals['_token'] = csrf_token();
 
 
-        $this->assertDatabaseMissing('hessam_categories', ['category_name' => $new_object_vals['category_name']]);
+        $this->assertDatabaseMissing('binshops_categories', ['category_name' => $new_object_vals['category_name']]);
 
 
         // send the request to save the changes
         $response = $this->patch(
-            route("hessamcms.admin.categories.update_category", $justCreatedRow->id),
+            route("binshopsblog.admin.categories.update_category", $justCreatedRow->id),
             $new_object_vals
         );
 
@@ -850,7 +850,7 @@ public function testCanCreateCategoryThenEditIt()
         $response->assertStatus(302); // check it was a redirect
 
         // check that the edited category name is in the database.
-        $this->assertDatabaseHas('hessam_categories', ['slug' => $new_object_vals['slug'], 'category_name' => $new_object_vals['category_name']]);
+        $this->assertDatabaseHas('binshops_categories', ['slug' => $new_object_vals['slug'], 'category_name' => $new_object_vals['category_name']]);
 
 
     }
@@ -858,7 +858,7 @@ public function testCanCreateCategoryThenEditIt()
 
     public function testCanDeleteCategory()
     {
-        $admin_panel_url = config("hessamcms.admin_prefix", "blog_admin");
+        $admin_panel_url = config("binshopsblog.admin_prefix", "blog_admin");
         $this->create_admin_user();
         // now lets create a category
         $new_cat_vals = [
@@ -867,21 +867,21 @@ public function testCanDeleteCategory()
         ];
         $search_for_new_cat = $new_cat_vals;
         $new_cat_vals['_token'] = csrf_token();
-        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('binshops_categories', $search_for_new_cat);
         $response = $this->post($admin_panel_url . "/categories/add_category", $new_cat_vals);
         $response->assertSessionHasNoErrors();
         $response->assertStatus(302); // redirect
-        $this->assertDatabaseHas('hessam_categories', $search_for_new_cat);
+        $this->assertDatabaseHas('binshops_categories', $search_for_new_cat);
 
 
-        $justCreatedRow = \HessamCMS\Models\HessamCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
+        $justCreatedRow = \BinshopsBlog\Models\BinshopsCategory::where("slug", $new_cat_vals['slug'])->firstOrFail();
         $id = $justCreatedRow->id;
 
         $delete_url = $admin_panel_url . "/categories/delete_category/$id";
 
         $response = $this->delete($delete_url, ['_token' => csrf_token()]);
         $response->assertStatus(200);
-        $this->assertDatabaseMissing('hessam_categories', $search_for_new_cat);
+        $this->assertDatabaseMissing('binshops_categories', $search_for_new_cat);
 
     }
 
@@ -914,7 +914,7 @@ protected function create_admin_user()
         $user = $this->getMockBuilder(\App\User::class)
             ->getMock();
         // make sure the user can see admin panel
-        $user->method("canManageHessamCMSPosts")
+        $user->method("canManageBinshopsBlogPosts")
             ->will($this->returnCallback(function () {
                 return true;
             }));
@@ -942,7 +942,7 @@ protected function prepare_post_creation()
     {
         $user = $this->create_admin_user();
 
-        $this->assertTrue($user->canManageHessamCMSPosts());
+        $this->assertTrue($user->canManageBinshopsBlogPosts());
 
         $new_object_vals = $this->generate_basic_blog_post_with_random_data();
 
@@ -955,30 +955,30 @@ protected function prepare_post_creation()
 
         $new_object_vals['_token'] = csrf_token();
 
-        $this->assertDatabaseMissing('hessam_posts', $search_for_obj);
+        $this->assertDatabaseMissing('binshops_posts', $search_for_obj);
 
         // check we don't see it at moment
-        $response = $this->get(config("hessamcms.blog_prefix", "blog"));
+        $response = $this->get(config("binshopsblog.blog_prefix", "blog"));
         $response->assertDontSee($new_object_vals['slug']);
         return array($new_object_vals, $search_for_obj);
     }
 
-    public function testUserModelHasCanManageHessamCMSPostsMethod()
+    public function testUserModelHasCanManageBinshopsBlogPostsMethod()
     {
         $u = new \App\User();
-        $this->assertTrue(method_exists($u,"canManageHessamCMSPosts"),"canManageHessamCMSPosts() must be added to User model. Please see hessam HessamCMS docs for details. It should return true ONLY for the admin users");
+        $this->assertTrue(method_exists($u,"canManageBinshopsBlogPosts"),"canManageBinshopsBlogPosts() must be added to User model. Please see binshops BinshopsBlog docs for details. It should return true ONLY for the admin users");
     }
-    public function testUserModelCanManageHessamCMSPostsMethodDoesntAlwaysReturnTrue()
+    public function testUserModelCanManageBinshopsBlogPostsMethodDoesntAlwaysReturnTrue()
     {
         $u = new \App\User();
 
-        $u->id = 9999999; // in case the logic on canManageHessamCMSPosts() checks for a low ID
+        $u->id = 9999999; // in case the logic on canManageBinshopsBlogPosts() checks for a low ID
         $u->email = str_random(); // in case the logic looks for a certain email or something.
 
-        $this->assertTrue(method_exists($u,"canManageHessamCMSPosts"));
+        $this->assertTrue(method_exists($u,"canManageBinshopsBlogPosts"));
 
         // because this user is just a randomly made one, it probably should not be allowed to edit blog posts.
-        $this->assertFalse($u->canManageHessamCMSPosts(), "User::canManageHessamCMSPosts() returns true, but it PROBABLY should return false! Otherwise every single user on your site has access to the blog admin panel! This might not be an error though, if your system doesn't allow public registration. But you should look into this. I know this isn't a good way to handle this test, but it seems to make sense.");
+        $this->assertFalse($u->canManageBinshopsBlogPosts(), "User::canManageBinshopsBlogPosts() returns true, but it PROBABLY should return false! Otherwise every single user on your site has access to the blog admin panel! This might not be an error though, if your system doesn't allow public registration. But you should look into this. I know this isn't a good way to handle this test, but it seems to make sense.");
     }
 
 

From c3242c232d22240a273c9d97cdec4593495a4712 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 12:45:57 -0500
Subject: [PATCH 069/118] updates readme

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index eba071e..31f83e3 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 <p align="center">
-   <a href="https://packagist.org/packages/binshops/laravel-blogger">
-      <img src="https://poser.pugx.org/binshops/laravel-blogger/v/stable.png" alt="Latest Stable Version">
+   <a href="https://packagist.org/packages/binshops/laravel-blog">
+      <img src="https://poser.pugx.org/binshops/laravel-blog/v/stable.png" alt="Latest Stable Version">
   </a>
 
-  <a href="https://packagist.org/packages/binshops/laravel-blogger">
-    <img src="https://poser.pugx.org/binshops/laravel-blogger/license.png" alt="License">
+  <a href="https://packagist.org/packages/binshops/laravel-blog">
+    <img src="https://poser.pugx.org/binshops/laravel-blog/license.png" alt="License">
   </a>
 </p>
 
 # Laravel Blog
-Have you worked with Wordpress? Developers call it wordpress-like laravel blog.
+Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 
 ### Contact us for any customization:
 contact@binshops.com
@@ -134,7 +134,7 @@ Try adding this to config/app.php:
 - You might need to set a higher memory limit, or upload smaller image files. This will depend on your server. I've used it to upload huge (10mb+) jpg images without problem, once the server was set up correctly to handle larger file uploads.
 
 ## Version History    
-- **9.1.x** Stable version of package
+- **9.2.x** Stable version of package
 - 9.0.x Multi-language support beta release
 - 8.0.x Compatibility with Laravel 8
 - 7.3.2 Some bug fixes

From 763ab2810380701a43d2c74f94967ca8dbc1983e Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 13:25:49 -0500
Subject: [PATCH 070/118] readme update

---
 README.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/README.md b/README.md
index 31f83e3..c66bc5e 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,3 @@
-<p align="center">
-   <a href="https://packagist.org/packages/binshops/laravel-blog">
-      <img src="https://poser.pugx.org/binshops/laravel-blog/v/stable.png" alt="Latest Stable Version">
-  </a>
-
-  <a href="https://packagist.org/packages/binshops/laravel-blog">
-    <img src="https://poser.pugx.org/binshops/laravel-blog/license.png" alt="License">
-  </a>
-</p>
-
 # Laravel Blog
 Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 

From 8f5fc920362114616750f039365abe1667a5b1bd Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 16:35:31 -0500
Subject: [PATCH 071/118] readme update

---
 README.md | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/README.md b/README.md
index c66bc5e..e5493b2 100644
--- a/README.md
+++ b/README.md
@@ -49,29 +49,6 @@ To see the Bagisto version of this package go to `bagisto-compatible` branch
 ## Recent Changes  
 - **9.1.x** Multi language support
 - 8.0.x Compatibility with Laravel 8.x
-
-## Screen Shots
-
-  <p align="center">
-    <img src="https://binshops.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.23.35-PM-1024x560.png" width="500px" title="Add post">
-  </p>
-  <p align="center">
-  Add post
-  </p>
-
-  <p align="center">
-    <img src="https://binshops.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.19.42-PM-1024x558.png" width="500px" title="All posts">
-  </p>
-   <p align="center">
-    All posts
-    </p>
-  
-  <p align="center">
-    <img src="https://binshops.binshops.com/wp-content/uploads/2020/08/Screen-Shot-2020-08-08-at-6.03.39-PM-1-1024x560.png" width="500px" title="Add category">
-  </p>
-  <p align="center">
-      Add category
-   </p>
   
 ## What/who this package is for:
 

From fac0debfdb1f72f3ac2c8a322efb3d384ae91a90 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 16:58:26 -0500
Subject: [PATCH 072/118] readme update

---
 README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e5493b2..529a43a 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,53 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 - Multi Language Support 
 
 ### Quick and easy installation
-
+1- Install via composer
 `composer require binshops/laravel-blog`
-
+For a fresh Laravel installation run the following too:
+```
+composer require laravel/ui
+php artisan ui vue --auth
+```
+2- Run the following two commands to copy config file, migration files, and view files
+`php artisan vendor:publish --provider="HessamCMS\HessamCMSServiceProvider"`
+3- Execute migrations to create tables
+`php artisan migrate;`
+4- You must add one method to your \App\User (in laravel 8 \App\Models\User) model. As the name of this method shows it determines which user can manage posts. Place your logic there
+```
+ /**
+     * Enter your own logic (e.g. if ($this->id === 1) to
+     *   enable this user to be able to add/edit blog posts
+     *
+     * @return bool - true = they can edit / manage blog posts,
+     *        false = they have no access to the blog admin panel
+     */
+    public function canManageBinshopsBlogPosts()
+    {
+        // Enter the logic needed for your app.
+        // Maybe you can just hardcode in a user id that you
+        //   know is always an admin ID?
+
+        if (       $this->id === 1
+             && $this->email === "your_admin_user@your_site.com"
+           ){
+
+           // return true so this user CAN edit/post/delete
+           // blog posts (and post any HTML/JS)
+
+           return true;
+        }
+
+        // otherwise return false, so they have no access
+        // to the admin panel (but can still view posts)
+
+        return false;
+    }
+```
+5- Create a directory in `public/` named `blog_images`
+6- Login as admin and setup your package: `/blog_admin/setup`
+- Congrats! Your blog is ready to use. (URLs are customizable in the config file)
+  Admin panel URI: `/blog_admin`
+  Front URI: `/en/blog`
 
 To see package on Packagist click this [Link](https://packagist.org/packages/binshops/laravel-blog)
 

From 10ef6b639a1fb0e95d315611478e554823511218 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 17:00:48 -0500
Subject: [PATCH 073/118] readme update

---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 529a43a..ac9611f 100644
--- a/README.md
+++ b/README.md
@@ -21,17 +21,26 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 
 ### Quick and easy installation
 1- Install via composer
+
 `composer require binshops/laravel-blog`
+
 For a fresh Laravel installation run the following too:
+
 ```
 composer require laravel/ui
 php artisan ui vue --auth
 ```
+
 2- Run the following two commands to copy config file, migration files, and view files
+
 `php artisan vendor:publish --provider="HessamCMS\HessamCMSServiceProvider"`
+
 3- Execute migrations to create tables
+
 `php artisan migrate;`
+
 4- You must add one method to your \App\User (in laravel 8 \App\Models\User) model. As the name of this method shows it determines which user can manage posts. Place your logic there
+
 ```
  /**
      * Enter your own logic (e.g. if ($this->id === 1) to
@@ -62,9 +71,13 @@ php artisan ui vue --auth
         return false;
     }
 ```
+
 5- Create a directory in `public/` named `blog_images`
+
 6- Login as admin and setup your package: `/blog_admin/setup`
+
 - Congrats! Your blog is ready to use. (URLs are customizable in the config file)
+  
   Admin panel URI: `/blog_admin`
   Front URI: `/en/blog`
 

From 9128d1043ba71c76b95bcb2e1250c1ecc9e99d76 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 17:02:01 -0500
Subject: [PATCH 074/118] readme update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ac9611f..632fade 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ php artisan ui vue --auth
 
 2- Run the following two commands to copy config file, migration files, and view files
 
-`php artisan vendor:publish --provider="HessamCMS\HessamCMSServiceProvider"`
+`php artisan vendor:publish --provider="BinshopsBlog\BinshopsBlogServiceProvider"`
 
 3- Execute migrations to create tables
 

From 254b4c37436fc7badf19c1bc8ad2434e4696e395 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 17:02:49 -0500
Subject: [PATCH 075/118] readme update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 632fade..2420764 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ php artisan ui vue --auth
 
 6- Login as admin and setup your package: `/blog_admin/setup`
 
-- Congrats! Your blog is ready to use. (URLs are customizable in the config file)
+Congrats! Your blog is ready to use. (URLs are customizable in the config file)
   
   Admin panel URI: `/blog_admin`
   Front URI: `/en/blog`

From 2d984de3a927d87d824fe7dc0bc192e4fe790f75 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Fri, 19 Mar 2021 17:52:32 -0500
Subject: [PATCH 076/118] fix for adding new category

---
 .../BinshopsCategoryAdminController.php       |  2 +-
 .../categories/_category_partial.blade.php    | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Controllers/BinshopsCategoryAdminController.php b/src/Controllers/BinshopsCategoryAdminController.php
index 6350495..e041e9b 100755
--- a/src/Controllers/BinshopsCategoryAdminController.php
+++ b/src/Controllers/BinshopsCategoryAdminController.php
@@ -93,7 +93,7 @@ public function store_category(Request $request){
         ]);
 
         foreach ($language_list as $key => $value) {
-            if ($value['lang_id'] != -1){
+            if ($value['lang_id'] != -1 && $value['category_name'] !== null){
                 //check for slug availability
                 $obj = BinshopsCategoryTranslation::where('slug',$value['slug'])->first();
                 if ($obj){
diff --git a/src/Views/binshopsblog_admin/categories/_category_partial.blade.php b/src/Views/binshopsblog_admin/categories/_category_partial.blade.php
index 5f85ad8..d65a1da 100644
--- a/src/Views/binshopsblog_admin/categories/_category_partial.blade.php
+++ b/src/Views/binshopsblog_admin/categories/_category_partial.blade.php
@@ -1,12 +1,17 @@
 @foreach($category_tree as $category)
-    <li>
+    @php
+        $ct = $category->categoryTranslations->where('lang_id', $language_id)->first();
+    @endphp
+    @if(isset($ct))
+        <li>
          <span value='{{$category->category_id}}'>
         {{$category->categoryTranslations->where('lang_id', $language_id)->first()->category_name}}
         </span>
-        @if( count($category->siblings) > 0)
-            <ul>
-                @include("binshopsblog_admin::categories._category_partial", ['category_tree' => $category->siblings])
-            </ul>
-        @endif
-    </li>
+            @if( count($category->siblings) > 0)
+                <ul>
+                    @include("binshopsblog_admin::categories._category_partial", ['category_tree' => $category->siblings])
+                </ul>
+            @endif
+        </li>
+    @endif
 @endforeach

From 08685151f75d2c7c9b05e13c2fb209d068863866 Mon Sep 17 00:00:00 2001
From: Hessam <hessam.modaberi@gmail.com>
Date: Sat, 27 Mar 2021 15:20:21 -0500
Subject: [PATCH 077/118] readme update for single language version

---
 README.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2420764..b4541d8 100644
--- a/README.md
+++ b/README.md
@@ -83,8 +83,18 @@ Congrats! Your blog is ready to use. (URLs are customizable in the config file)
 
 To see package on Packagist click this [Link](https://packagist.org/packages/binshops/laravel-blog)
 
-### Bagisto version
-To see the Bagisto version of this package go to `bagisto-compatible` branch 
+### Single Language Version
+To install the single language version of the package use version v8.1x:
+
+1- `composer require binshops/laravel-blog:v8.1.1`
+
+2- `php artisan vendor:publish --provider="BinshopsBlog\BinshopsBlogServiceProvider"`
+
+3- `php artisan vendor:publish --tag=laravel-fulltext`
+
+4- `php artisan migrate;`
+
+You can see the single version in "single-lang" branch.
 
 ## Important Notes
 - For laravel 8.x's default auth User model, change user model in `binshopsblog.php` to: `\App\Models\User::class`

From 3952e9add02204c3af1c6fae82b92f16ffffa13d Mon Sep 17 00:00:00 2001
From: Edward B <31439728+Edbtvplays@users.noreply.github.com>
Date: Sat, 3 Apr 2021 22:31:22 +0100
Subject: [PATCH 078/118] Fixes Needing to be a type array to return

---
 src/Models/BinshopsPostTranslation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/BinshopsPostTranslation.php b/src/Models/BinshopsPostTranslation.php
index 614a87f..e05c7c1 100644
--- a/src/Models/BinshopsPostTranslation.php
+++ b/src/Models/BinshopsPostTranslation.php
@@ -49,7 +49,7 @@ public function language()
      *
      * @return array
      */
-    public function sluggable()
+    public function sluggable(): array
     {
         return [
             'slug' => [

From 63ce823b1fbc4a8d871191846fa386d76764f9b9 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Wed, 12 May 2021 16:28:27 -0500
Subject: [PATCH 079/118] updates readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b4541d8..c26be05 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 - Multi Level Category - nested sets using Baum
 - Multi Language Support 
 
-### Quick and easy installation
+### Quick and easy installation (Multi-lang version)
 1- Install via composer
 
 `composer require binshops/laravel-blog`
@@ -86,7 +86,7 @@ To see package on Packagist click this [Link](https://packagist.org/packages/bin
 ### Single Language Version
 To install the single language version of the package use version v8.1x:
 
-1- `composer require binshops/laravel-blog:v8.1.1`
+1- `composer require binshops/laravel-blog:v8.1.2`
 
 2- `php artisan vendor:publish --provider="BinshopsBlog\BinshopsBlogServiceProvider"`
 

From 580888428cc9c668baeffb8a4acc66e46f7aed9e Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Sat, 2 Oct 2021 14:47:56 -0500
Subject: [PATCH 080/118] readme update

---
 README.md | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c26be05..31b47dd 100644
--- a/README.md
+++ b/README.md
@@ -153,9 +153,31 @@ Add these (and an Event Listener) to your `EventServiceProvider.php` file to mak
 
 ## Built in CAPTCHA / anti spam
 
-There is a built in captcha (anti spam comment) system built in, which will be easy for you to replace with your own implementation.
+There is a built-in captcha (anti-spam comment) system built in, which will be easy for you to replace with your own implementation.
 
-  Please see [this Captcha docs](https://binshops.binshops.com/laravel-blog-package#captcha) for  more details.
+There is a basic anti-spam captcha function built-in.
+
+See the config/binshops.php captcha section. There is a built in system (basic!) that will prevent most automated spam attempts.
+Writing your own captcha system:
+
+I wrote the captcha system simple on purpose, so you can add your own captcha options. It should be easy to add any other captcha system to this.
+
+If you want to write your own implementation then create your own class that implements \BinshopsBlog\Interfaces\CaptchaInterface, then update the config/binshopsblog.php file (change the captcha_type option).
+
+There are three methods you need to implement:
+public function captcha_field_name() : string
+
+Return a string such as "captcha". It is used for the form validation and <input name=???>.
+public function view() : string
+
+What view file should the binshops::partials.add_comment_form view include? You can set this to whatever you need, and then create your own view file. The default included basic captcha class will return "binshops::captcha.basic".
+public function rules() : array
+
+Return an array for the rules (which are just the standard Laravel validation rules. This is where you can check if the captcha was successful or not.
+Optional:
+public function runCaptchaBeforeShowingPosts() : null
+
+This isn't part of the interface, it isn't required. By default it does nothing. But you can put some code in this method and it'll be run in the BinshopsReaderController::viewSinglePost method.
 
 ## Image upload errors
 

From 2ae7ab524778bcf2773944ac3850f27dfc7f21b6 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Sat, 2 Oct 2021 14:55:54 -0500
Subject: [PATCH 081/118] updates readme file

---
 README.md | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 31b47dd..e02f75b 100644
--- a/README.md
+++ b/README.md
@@ -193,38 +193,22 @@ Try adding this to config/app.php:
 - **9.2.x** Stable version of package
 - 9.0.x Multi-language support beta release
 - 8.0.x Compatibility with Laravel 8
-- 7.3.2 Some bug fixes
 - 7.3.0 New Admin UI
-- 7.2.2                 
-    - bug fix: do not show search bar when it's disabled
-    - feature: configure to show full text post or preview 
-- 7.2.1                 - adds logout button at admin panel
-- 7.2.0                 
-    - adds sub-category functionality to blog
-    - adds reading progress bar feature (if you upgrade, re-publish config file and view files)
-- 7.1.8                 - ability to remove images from posts (this feature does not work for old posts)
-- 7.1.7                 - updates CKEditor
-- 7.1.5                 - minor fix for recent posts
-- 7.1.4                 - updates fulltext search package which solves the search issue
-- 7.1.2                 - shows categories on blog home page - minor fix (if you upgrade try to re-publish view files)
-- 7.1.1                 - minor fix and some admin panel text changes
-- 7.1.0                 - Adds support for custom user model (if you upgrade, try to publish new config)
-- 7.0.2                 - Bug fix for listing posts and search page
-- 7.0.1                 - made compatible with Laravel 6.x & 7.x
-- 3.1                   - minor fixes
-- 3.0.3                 - fixed RSS feed cache issue
-- 3.0.2                 - fixed default medium image size (changed to 600x400)
 - 3.0.1                 - replaced all short tags (<?) with full opening ones (<?php)
-- 3.0                   - Added separate functionality for uploading images (and save some meta data in db)
-- 2.1                   - added 'short_description' to db + form, and BinshopsBlogPost::generate_introduction() method will try and use this to generate intro text.
 - 2.0                   - added full text search (enable it via the config file - it is disabled by default).
-- 1.2                   - added WYSIWYG, few smaller changes
 - 1.1.1                 - added basic captcha
 - 1.0.5                 - composer.json changes.
 - 1.0                   - First release
-- 0.3                   - Small changes, packagist settings.
 - 0.1                   - Initial release
 
+## Contributors ✨
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/samberrry"><img src="https://avatars.githubusercontent.com/u/20775532?v=4" width="80px;" alt=""/><br /><sub><b>Sam Berry</b></sub></a><br /></td>
+<td align="center"><a href="https://github.com/dasscheman"><img src="https://avatars.githubusercontent.com/u/6064248?v=4" width="80px;" alt=""/><br /><sub><b>Alef Barbeli</b></sub></a><br /> </td>
+
+  </tr>
+</table>
 Contact: contact@binshops.com
 
 

From f8ca785716d8bb8139f1dfe18fdabe2849828409 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Sat, 2 Oct 2021 14:56:49 -0500
Subject: [PATCH 082/118] update readme

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index e02f75b..5e79125 100644
--- a/README.md
+++ b/README.md
@@ -209,8 +209,3 @@ Try adding this to config/app.php:
 
   </tr>
 </table>
-Contact: contact@binshops.com
-
-
-
-

From 93259d3dafe7884f253107d333a60fc650c202cd Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Mon, 18 Oct 2021 17:32:19 -0500
Subject: [PATCH 083/118] fix for unpublished posts

---
 src/Controllers/BinshopsReaderController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Controllers/BinshopsReaderController.php b/src/Controllers/BinshopsReaderController.php
index f744781..09ed004 100755
--- a/src/Controllers/BinshopsReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -63,12 +63,12 @@ public function index($locale, $category_slug = null, Request $request)
             \View::share('binshopsblog_category', $category); // so the view can say "You are viewing $CATEGORYNAME category posts"
             $title = 'Posts in ' . $category->category_name . " category"; // hardcode title here...
         } else {
-            $posts = BinshopsPostTranslation::where('lang_id', $request->get("lang_id"))
-                ->with(['post' => function($query){
-                    $query->where("is_published" , '=' , true);
-                    $query->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'));
-                    $query->orderBy("posted_at", "desc");
-                }])->paginate(config("binshopsblog.per_page", 10));
+            $posts = BinshopsPostTranslation::join('binshops_posts', 'binshops_post_translations.post_id', '=', 'binshops_posts.id')
+                ->where('lang_id', $request->get("lang_id"))
+                ->where("is_published" , '=' , true)
+                ->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'))
+                ->orderBy("posted_at", "desc")
+                ->paginate(config("binshopsblog.per_page", 10));
         }
 
         //load category hierarchy

From 87261c7e3a1b9e4a0c39e9050d3a1d440ebf54f7 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Fri, 22 Oct 2021 07:28:53 -0500
Subject: [PATCH 084/118] fix for $category_slug parameter

---
 src/Controllers/BinshopsReaderController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Controllers/BinshopsReaderController.php b/src/Controllers/BinshopsReaderController.php
index 09ed004..ca1e96e 100755
--- a/src/Controllers/BinshopsReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -35,7 +35,7 @@ public function __construct()
      * @param null $category_slug
      * @return mixed
      */
-    public function index($locale, $category_slug = null, Request $request)
+    public function index($locale, Request $request, $category_slug = null)
     {
         // the published_at + is_published are handled by BinshopsBlogPublishedScope, and don't take effect if the logged in user can manageb log posts
 
@@ -127,7 +127,7 @@ public function search(Request $request)
     public function view_category($locale, $hierarchy, Request $request)
     {
         $categories = explode('/', $hierarchy);
-        return $this->index($locale, end($categories), $request);
+        return $this->index($locale, $request, end($categories));
     }
 
     /**

From 667d1660788d14159024fa58c6b3065d96c9d2a1 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Thu, 2 Dec 2021 12:29:52 -0600
Subject: [PATCH 085/118] readme update

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5e79125..3ad895b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
 # Laravel Blog
 Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 
-### Contact us for any customization:
-contact@binshops.com
+## To support us give it a Star :star: :heart_eyes:
 
 ### Lightweight and Comprehensive
 

From 326d25904ea5cebea440809369578b146fc5f87e Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Fri, 3 Dec 2021 05:19:09 -0600
Subject: [PATCH 086/118] readme update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3ad895b..bd85d18 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Laravel Blog
 Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 
-## To support us give it a Star :star: :heart_eyes:
+## Give it a Star to support us :star: :heart_eyes:
 
 ### Lightweight and Comprehensive
 

From f2605930d3bd0d14a32a5f0704e6aef91256437c Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Tue, 14 Dec 2021 13:55:53 -0600
Subject: [PATCH 087/118] setup page ui

---
 .../binshopsblog_admin/setup/setup.blade.php  | 137 +-----------------
 1 file changed, 2 insertions(+), 135 deletions(-)

diff --git a/src/Views/binshopsblog_admin/setup/setup.blade.php b/src/Views/binshopsblog_admin/setup/setup.blade.php
index 72dc1a8..6bf8823 100644
--- a/src/Views/binshopsblog_admin/setup/setup.blade.php
+++ b/src/Views/binshopsblog_admin/setup/setup.blade.php
@@ -19,7 +19,7 @@
     <link href="{{ asset('admin-setup.css') }}" rel="stylesheet">
 </head>
 
-<body>
+<body style="background-color: #e2e8f0">
 <div style="background-color: #e2e8f0">
 
     <div class="container">
@@ -32,52 +32,6 @@
                             @csrf
 
                             <div class="wizard-header" style="padding: 10px; text-align: center">
-
-{{--                                <svg version="1.0" xmlns="http://www.w3.org/2000/svg"--}}
-{{--                                     width="197.000000pt" height="65.000000pt" viewBox="0 0 197.000000 65.000000"--}}
-{{--                                     preserveAspectRatio="xMidYMid meet">--}}
-
-{{--                                    <g transform="translate(0.000000,65.000000) scale(0.100000,-0.100000)"--}}
-{{--                                       fill="#000000" stroke="none">--}}
-{{--                                        <path style="fill: #2787AC;" d="M424 636 c-20 -22 -38 -60 -59 -125 -20 -62 -22 -64 -74 -83 -29 -11--}}
-{{---55 -18 -57 -15 -3 3 10 45 29 93 19 49 31 93 27 97 -12 13 -59 -3 -75 -25 -7--}}
-{{---12 -28 -65 -45 -119 -32 -99 -32 -99 -85 -131 -52 -31 -86 -71 -71 -85 3 -4--}}
-{{--27 3 51 15 25 12 48 22 51 22 6 0 3 -33 -12 -131 -6 -40 13 -69 46 -69 14 0--}}
-{{--19 11 25 58 3 31 13 87 21 123 15 65 15 65 66 87 28 12 53 21 54 19 2 -1 -8--}}
-{{---56 -21 -122 -31 -155 -33 -220 -4 -235 36 -20 46 -6 59 87 16 121 56 295 70--}}
-{{--303 6 4 53 15 105 25 101 20 114 32 69 62 -23 15 -33 15 -86 4 -33 -7 -63 -10--}}
-{{---66 -7 -3 3 7 36 21 74 15 37 27 73 27 80 0 16 -52 15 -66 -2z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M1422 340 c-72 -32 -91 -113 -40 -167 29 -32 78 -30 108 2 17 19 21--}}
-{{--28 13 36 -9 9 -19 6 -39 -10 -24 -19 -30 -20 -48 -8 -39 26 -30 81 19 113 19--}}
-{{--13 27 13 44 2 23 -14 36 -6 28 16 -12 30 -41 36 -85 16z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M1686 339 c-9 -13 -16 -26 -16 -30 0 -4 -7 -24 -16 -45 l-16 -38 -31--}}
-{{--60 c-45 84 -64 83 -72 -3 -11 -122 -11 -127 6 -131 12 -2 18 10 25 55 l9 58--}}
-{{--28 -53 c16 -29 33 -52 40 -49 7 2 20 27 31 55 10 28 22 50 26 47 4 -3 11 -30--}}
-{{--15 -60 4 -35 11 -55 20 -55 22 0 23 21 6 107 -20 97 -32 115 -55 82z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M1802 334 c-17 -12 -22 -24 -20 -47 3 -27 9 -34 48 -47 46 -16 63--}}
-{{---43 34 -54 -9 -3 -30 1 -47 9 -20 10 -34 12 -40 6 -14 -14 8 -38 48 -51 38--}}
-{{---12 58 -6 90 30 18 20 18 23 3 48 -10 16 -34 33 -58 42 -54 19 -56 34 -5 38--}}
-{{--47 4 67 18 45 32 -23 15 -73 12 -98 -6z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M608 286 c-14 -32 -5 -53 29 -68 37 -16 36 -15 28 -28 -5 -8 -14 -6--}}
-{{---32 5 -36 24 -56 3 -26 -26 26 -27 72 -28 90 -3 21 29 12 57 -24 74 -39 18--}}
-{{---44 35 -8 26 29 -7 48 20 24 35 -28 18 -69 10 -81 -15z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M737 289 c-21 -29 -10 -55 29 -74 19 -9 32 -21 28 -26 -3 -6 -15 -4--}}
-{{---31 6 -33 22 -55 5 -29 -24 39 -43 96 -25 96 30 0 25 -6 33 -30 42 -36 14 -40--}}
-{{--32 -6 23 29 -7 43 9 26 29 -18 22 -66 19 -83 -6z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M1014 296 c-3 -7 -4 -42 -2 -77 2 -51 6 -64 21 -67 14 -3 17 5 17 52--}}
-{{--0 31 5 56 10 56 6 0 13 1 18 3 4 1 9 -23 12 -53 4 -40 9 -55 20 -55 11 0 16--}}
-{{--15 20 55 4 40 9 55 20 55 11 0 16 -14 18 -58 3 -49 6 -58 20 -55 18 3 29 70--}}
-{{--18 113 -7 29 -51 49 -77 35 -11 -6 -24 -8 -31 -4 -21 13 -79 13 -84 0z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M460 282 c-28 -23 -31 -83 -5 -112 29 -32 115 -21 115 15 0 11 -11--}}
-{{--14 -47 10 -47 -5 -47 -4 -15 7 72 25 78 98 8 98 -19 0 -44 -8 -56 -18z m65--}}
-{{---31 c-6 -5 -21 -12 -35 -16 -22 -7 -23 -6 -11 9 7 9 23 16 34 16 13 0 17 -4--}}
-{{--12 -9z"/>--}}
-{{--                                        <path style="fill: #b6b8ba;" d="M886 274 c-19 -19 -26 -37 -26 -64 0 -49 15 -60 78 -59 l51 2 -5 61--}}
-{{--c-3 33 -7 67 -10 74 -6 22 -60 14 -88 -14z m54 -48 c0 -31 -19 -53 -34 -39--}}
-{{---10 11 -7 48 6 61 20 20 28 14 28 -22z"/>--}}
-{{--                                    </g>--}}
-{{--                                </svg>--}}
-
                             </div>
                             <div class="wizard-navigation">
                                 <ul>
@@ -92,96 +46,9 @@
                                             <h4 class="info-text">Your default language is set to English. You can add more language from admin panel.</h4>
 
                                             <h6 class="info-text">
-                                                Version v9.0.x
+                                                Version v9.2.x
                                             </h6>
                                         </div>
-                                        {{--                                        <div class="col-sm-12">--}}
-                                        {{--                                            <div class="form-group">--}}
-                                        {{--                                                <label>Language</label><br>--}}
-                                        {{--                                                <select readonly class="form-control" id="lang-name" data-placeholder="Choose a Language...">--}}
-                                        {{--                                                    --}}{{--                                               <option value="AF">Afrikaans</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="SQ">Albanian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="AR">Arabic</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="HY">Armenian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="EU">Basque</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="BN">Bengali</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="BG">Bulgarian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="CA">Catalan</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="KM">Cambodian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="ZH">Chinese (Mandarin)</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="HR">Croatian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="CS">Czech</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="DA">Danish</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="NL">Dutch</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="EN">English</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="ET">Estonian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="FJ">Fiji</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="FI">Finnish</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="FR">French</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="KA">Georgian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="DE">German</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="EL">Greek</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="GU">Gujarati</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="HE">Hebrew</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="HI">Hindi</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="HU">Hungarian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="IS">Icelandic</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="ID">Indonesian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="GA">Irish</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="IT">Italian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="JA">Japanese</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="JW">Javanese</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="KO">Korean</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="LA">Latin</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="LV">Latvian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="LT">Lithuanian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="MK">Macedonian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="MS">Malay</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="ML">Malayalam</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="MT">Maltese</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="MI">Maori</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="MR">Marathi</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="MN">Mongolian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="NE">Nepali</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="NO">Norwegian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="FA">Persian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="PL">Polish</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="PT">Portuguese</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="PA">Punjabi</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="QU">Quechua</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="RO">Romanian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="RU">Russian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="SM">Samoan</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="SR">Serbian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="SK">Slovak</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="SL">Slovenian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="ES">Spanish</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="SW">Swahili</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="SV">Swedish </option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="TA">Tamil</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="TT">Tatar</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="TE">Telugu</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="TH">Thai</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="BO">Tibetan</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="TO">Tonga</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="TR">Turkish</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="UK">Ukrainian</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="UR">Urdu</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="UZ">Uzbek</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="VI">Vietnamese</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="CY">Welsh</option>--}}
-                                        {{--                                                    --}}{{--                                               <option value="XH">Xhosa</option>--}}
-                                        {{--                                                </select>--}}
-
-                                        {{--                                                --}}{{--                                           <script>--}}
-                                        {{--                                                --}}{{--                                               $('#lang-name').change(function(){--}}
-                                        {{--                                                --}}{{--                                                   var value = $(this).val().toLowerCase();--}}
-                                        {{--                                                --}}{{--                                                   $('#language_name').val($("#lang-name option:selected").text());--}}
-                                        {{--                                                --}}{{--                                                   $('#language_locale').val(value);--}}
-                                        {{--                                                --}}{{--                                                   $('#iso_code').val(value);--}}
-                                        {{--                                                --}}{{--                                                   console.log(value)--}}
-                                        {{--                                                --}}{{--                                               });--}}
-                                        {{--                                                --}}{{--                                           </script>--}}
 
                                         <input type="text"
                                                class="form-control"

From b00d57cdb78c8dc1ea67c6fdc92a4c5e97080123 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Tue, 14 Dec 2021 13:58:28 -0600
Subject: [PATCH 088/118] setup page

---
 src/Views/binshopsblog_admin/setup/setup.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/binshopsblog_admin/setup/setup.blade.php b/src/Views/binshopsblog_admin/setup/setup.blade.php
index 6bf8823..37f8e63 100644
--- a/src/Views/binshopsblog_admin/setup/setup.blade.php
+++ b/src/Views/binshopsblog_admin/setup/setup.blade.php
@@ -5,7 +5,7 @@
     <link rel="apple-touch-icon" sizes="76x76" href="assets/img/apple-icon.png">
     <link rel="icon" type="image/png" href="assets/img/favicon.png">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>Binshops Blog pacakge setup</title>
+    <title>Binshops Blog package setup</title>
 
     <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
     <meta name="viewport" content="width=device-width" />

From eb31e81f3f37093f75d6985b2a731f22ad3179ac Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Tue, 14 Dec 2021 18:33:01 -0600
Subject: [PATCH 089/118] readme

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd85d18..70b9a81 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 # Laravel Blog
 Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 
-## Give it a Star to support us :star: :heart_eyes:
+## Give our package a Star to support us :star: :heart_eyes:
+## Installation Video - Less than 5 Minutes
+[![Laravel Blog Package](http://img.youtube.com/vi/N9NpFUqbftA/0.jpg)](https://youtu.be/N9NpFUqbftA)
 
 ### Lightweight and Comprehensive
 

From ba85bef85c83f789dd0d25bdbfd4b4eda038eae0 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Tue, 14 Dec 2021 18:35:07 -0600
Subject: [PATCH 090/118] readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 70b9a81..ded5fd1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 
 ## Give our package a Star to support us :star: :heart_eyes:
-## Installation Video - Less than 5 Minutes
+## [Installation Video - Less than 5 Minutes](https://youtu.be/N9NpFUqbftA)
 [![Laravel Blog Package](http://img.youtube.com/vi/N9NpFUqbftA/0.jpg)](https://youtu.be/N9NpFUqbftA)
 
 ### Lightweight and Comprehensive

From 906eb71f6b6d34a53089ac079b972dd1554d33fa Mon Sep 17 00:00:00 2001
From: BR <breese@scsgrandrapids.com>
Date: Thu, 23 Dec 2021 14:13:21 -0500
Subject: [PATCH 091/118] Resolve error on editing root level category

---
 src/Controllers/BinshopsCategoryAdminController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Controllers/BinshopsCategoryAdminController.php b/src/Controllers/BinshopsCategoryAdminController.php
index e041e9b..6fb33c0 100755
--- a/src/Controllers/BinshopsCategoryAdminController.php
+++ b/src/Controllers/BinshopsCategoryAdminController.php
@@ -167,6 +167,12 @@ public function update_category(UpdateBinshopsBlogCategoryRequest $request, $cat
         )->first();
         $category->fill($request->all());
         $translation->fill($request->all());
+        
+        // if the parent_id is passed in as 0 it will create an error
+        if ($category->parent_id <= 0) {
+            $category->parent_id = null;
+        }
+        
         $category->save();
         $translation->save();
 

From 08f2ef3c6978765c506bd2569c578432b3677fd1 Mon Sep 17 00:00:00 2001
From: BR <breese@scsgrandrapids.com>
Date: Thu, 23 Dec 2021 15:25:30 -0500
Subject: [PATCH 092/118] Fix paginator reference to use $posts->links()

Allows for using default laravel paginator links on category page.
---
 src/Controllers/BinshopsReaderController.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Controllers/BinshopsReaderController.php b/src/Controllers/BinshopsReaderController.php
index ca1e96e..868eb6d 100755
--- a/src/Controllers/BinshopsReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -47,16 +47,18 @@ public function index($locale, Request $request, $category_slug = null)
         if ($category_slug) {
             $category = BinshopsCategoryTranslation::where("slug", $category_slug)->with('category')->firstOrFail()->category;
             $categoryChain = $category->getAncestorsAndSelf();
-            $posts_1 = $category->posts()->where("binshops_post_categories.category_id", $category->id)->with([ 'postTranslations' => function($query) use ($request){
+            $posts = $category->posts()->where("binshops_post_categories.category_id", $category->id)->with([ 'postTranslations' => function($query) use ($request){
                 $query->where("lang_id" , '=' , $request->get("lang_id"));
             }
-            ])->paginate(config("binshopsblog.per_page", 10));
+            ])->get();
 
-            foreach ($posts_1 as $post) {
-                $trans = $post->postTranslations[0];
-                $trans->post = $post;
-                array_push($posts, $trans);
-            }
+            $posts = BinshopsPostTranslation::join('binshops_posts', 'binshops_post_translations.post_id', '=', 'binshops_posts.id')
+                ->where('lang_id', $request->get("lang_id"))
+                ->where("is_published" , '=' , true)
+                ->where('posted_at', '<', Carbon::now()->format('Y-m-d H:i:s'))
+                ->orderBy("posted_at", "desc")
+                ->whereIn('binshops_posts.id', $posts->pluck('id'))
+                ->paginate(config("binshopsblog.per_page", 10));
 
             // at the moment we handle this special case (viewing a category) by hard coding in the following two lines.
             // You can easily override this in the view files.

From 29fd5347fdb1f82421ac771882e2cde406ee312b Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Fri, 24 Dec 2021 14:52:08 -0600
Subject: [PATCH 093/118] blog post categories

---
 src/Controllers/BinshopsReaderController.php         |  6 ++++++
 src/Views/binshopsblog/partials/categories.blade.php | 12 ++++++------
 .../partials/full_post_details.blade.php             |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Controllers/BinshopsReaderController.php b/src/Controllers/BinshopsReaderController.php
index 868eb6d..d660840 100755
--- a/src/Controllers/BinshopsReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -151,6 +151,10 @@ public function viewSinglePost(Request $request, $locale, $blogPostSlug)
             $captcha->runCaptchaBeforeShowingPosts($request, $blog_post);
         }
 
+        $categories = $blog_post->post->categories()->with([ 'categoryTranslations' => function($query) use ($request){
+            $query->where("lang_id" , '=' , $request->get("lang_id"));
+        }
+        ])->get();
         return view("binshopsblog::single_post", [
             'post' => $blog_post,
             // the default scope only selects approved comments, ordered by id
@@ -158,6 +162,8 @@ public function viewSinglePost(Request $request, $locale, $blogPostSlug)
                 ->with("user")
                 ->get(),
             'captcha' => $captcha,
+            'categories' => $categories,
+            'locale' => $request->get("locale")
         ]);
     }
 
diff --git a/src/Views/binshopsblog/partials/categories.blade.php b/src/Views/binshopsblog/partials/categories.blade.php
index c001136..1a4ba43 100644
--- a/src/Views/binshopsblog/partials/categories.blade.php
+++ b/src/Views/binshopsblog/partials/categories.blade.php
@@ -1,7 +1,7 @@
 <div class=''>
-    @foreach($post->categories as $category)
-        <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->url()}}'>
-            {{$category->category_name}}
-        </a>
-    @endforeach
-</div>
\ No newline at end of file
+        @foreach($categories as $category)
+                <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->categoryTranslations[0]->url($locale)}}'>
+                        {{$category->categoryTranslations[0]->category_name}}
+                </a>
+        @endforeach
+</div>
diff --git a/src/Views/binshopsblog/partials/full_post_details.blade.php b/src/Views/binshopsblog/partials/full_post_details.blade.php
index 4deb8da..e9b1485 100644
--- a/src/Views/binshopsblog/partials/full_post_details.blade.php
+++ b/src/Views/binshopsblog/partials/full_post_details.blade.php
@@ -26,4 +26,4 @@
 Posted <strong>{{$post->post->posted_at->diffForHumans()}}</strong>
 
 @includeWhen($post->author,"binshopsblog::partials.author",['post'=>$post])
-@includeWhen($post->categories,"binshopsblog::partials.categories",['post'=>$post])
+@includeWhen($categories,"binshopsblog::partials.categories",['categories'=>$categories])

From 3984200acdb53c27dd7d648bc6b617df4ad2cab4 Mon Sep 17 00:00:00 2001
From: Praveen K <github@praveen.bulc.club>
Date: Fri, 31 Dec 2021 02:01:21 +0530
Subject: [PATCH 094/118] Update BinshopsCommentWriterController.php

Corrected the check for email instead of website in email field.
---
 src/Controllers/BinshopsCommentWriterController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controllers/BinshopsCommentWriterController.php b/src/Controllers/BinshopsCommentWriterController.php
index 4e2e6ff..5cf3fad 100755
--- a/src/Controllers/BinshopsCommentWriterController.php
+++ b/src/Controllers/BinshopsCommentWriterController.php
@@ -81,7 +81,7 @@ protected function createNewComment(AddNewCommentRequest $request, $blog_post)
         if (config("binshopsblog.comments.ask_for_author_website")) {
             $new_comment->author_website = $request->get('author_website');
         }
-        if (config("binshopsblog.comments.ask_for_author_website")) {
+        if (config("binshopsblog.comments.ask_for_author_email")) {
             $new_comment->author_email = $request->get('author_email');
         }
         if (config("binshopsblog.comments.save_user_id_if_logged_in", true) && Auth::check()) {

From 65837c5176e4c56f624fc08c1ceaac6964d99171 Mon Sep 17 00:00:00 2001
From: usman <usman@xs4arabia.com>
Date: Thu, 13 Jan 2022 10:55:34 +0300
Subject: [PATCH 095/118] url length exceeded fixed

---
 src/Views/binshopsblog_admin/posts/edit_post.blade.php | 3 +--
 src/routes.php                                         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Views/binshopsblog_admin/posts/edit_post.blade.php b/src/Views/binshopsblog_admin/posts/edit_post.blade.php
index 1af6265..f9a4572 100755
--- a/src/Views/binshopsblog_admin/posts/edit_post.blade.php
+++ b/src/Views/binshopsblog_admin/posts/edit_post.blade.php
@@ -15,7 +15,6 @@
         </p>
 
         @csrf
-        @method("patch")
         @include("binshopsblog_admin::posts.form", [
           'post' => $post,
           'post_translation' => $post_translation
@@ -30,7 +29,7 @@
         var edit_toggle_url = '{{route("binshopsblog.admin.edit_post_toggle",$post->id)}}';
         var preLang = $('#language_list').val();
         $('#language_list').change(function (){
-            $("#edit-post-form").attr("method", "get");
+            $("#edit-post-form").attr("method", "post");
             $('#edit-post-form').attr('action', edit_toggle_url);
 
             $('#selected_lang').val($('#language_list').val());
diff --git a/src/routes.php b/src/routes.php
index 406b2a9..7ba1ce2 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -67,11 +67,11 @@
             'BinshopsAdminController@edit_post')
             ->name('binshopsblog.admin.edit_post');
 
-        Route::get('/edit_post_toggle/{blogPostId}',
+        Route::post('/edit_post_toggle/{blogPostId}',
             'BinshopsAdminController@edit_post_toggle')
             ->name('binshopsblog.admin.edit_post_toggle');
 
-        Route::patch('/edit_post/{blogPostId}',
+        Route::post('/edit_post/{blogPostId}',
             'BinshopsAdminController@update_post')
             ->name('binshopsblog.admin.update_post');
 

From 2caaf2661da593ec7bd9b6663d3bb883dbeef8a4 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Sat, 12 Mar 2022 07:39:16 -0500
Subject: [PATCH 096/118] readme update

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index ded5fd1..e7f186e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # Laravel Blog
 Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 
-## Give our package a Star to support us :star: :heart_eyes:
 ## [Installation Video - Less than 5 Minutes](https://youtu.be/N9NpFUqbftA)
 [![Laravel Blog Package](http://img.youtube.com/vi/N9NpFUqbftA/0.jpg)](https://youtu.be/N9NpFUqbftA)
 

From 81d51b975a649cfb980bf3532a62ac81d1aff13a Mon Sep 17 00:00:00 2001
From: JustAnotherFalseProphet <justanotherfalseprophet@gmail.com>
Date: Wed, 30 Mar 2022 10:16:10 +0200
Subject: [PATCH 097/118] Add files via upload

---
 composer.json | 123 +++++++++++++++++++++++++-------------------------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/composer.json b/composer.json
index aec4477..6df4772 100755
--- a/composer.json
+++ b/composer.json
@@ -1,62 +1,61 @@
-{
-    "name": "binshops/laravel-blog",
-    "keywords": [
-        "laravel",
-        "blog",
-        "package",
-        "admin",
-        "panel",
-        "rss",
-        "feed",
-        "write",
-        "posts",
-        "news",
-        "update",
-        "laravel blog",
-        "binshops"
-    ],
-    "description": "Simple blog package (with admin panel) for Laravel (6.x and 7.x). Includes all views, controllers, routes and can add a blog to any existing Laravel app. Fully customisable blog (view, urls, and many other options). Includes image uploads and a pretty admin interface to manage your blog. Defaults to /blog but you can change it to anything.",
-    "license": "MIT",
-    "support": {
-        "docs": "https://github.com/binshops/laravel-blog"
-    },
-    "authors": [
-        {
-            "name": "Binshops",
-            "homepage": "https://github.com/binshops/laravel-blog",
-            "role": "owner",
-            "email": "contact@binshops.com"
-        }
-    ],
-    "require": {
-        "cviebrock/eloquent-sluggable": "~8.0|~7.0|~6.0|~4.8|~4.7|~4.6|~4.5",
-        "laravelium/feed": "~2.12.0|~3.0.0|3.1.*|v6.0.*|v7.0.*|v8.0.*",
-        "intervention/image": "2.*",
-        "laravel/helpers": "^1.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "*",
-        "orchestra/testbench": "4.0.*",
-        "php-coveralls/php-coveralls": "*"
-    },
-    "autoload": {
-        "psr-4": {
-            "BinshopsBlog\\": "src",
-            "BinshopsBlog\\Laravel\\Fulltext\\": "src/FulltextSearch/src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "BinshopsBlog\\Tests\\": "tests"
-        }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "BinshopsBlog\\BinshopsBlogServiceProvider"
-            ],
-            "aliases": {
-            }
-        }
-    }
-}
+{
+    "name": "binshops/laravel-blog",
+    "keywords": [
+        "laravel",
+        "blog",
+        "package",
+        "admin",
+        "panel",
+        "rss",
+        "feed",
+        "write",
+        "posts",
+        "news",
+        "update",
+        "laravel blog",
+        "binshops"
+    ],
+    "description": "Simple blog package (with admin panel) for Laravel (6.x and 7.x). Includes all views, controllers, routes and can add a blog to any existing Laravel app. Fully customisable blog (view, urls, and many other options). Includes image uploads and a pretty admin interface to manage your blog. Defaults to /blog but you can change it to anything.",
+    "license": "MIT",
+    "support": {
+        "docs": "https://github.com/binshops/laravel-blog"
+    },
+    "authors": [
+        {
+            "name": "Dale",
+            "homepage": "https://github.com/binshops/laravel-blog",
+            "role": "Lunatic",
+            "email": "contact@binshops.com"
+        }
+    ],
+    "require": {
+        "cviebrock/eloquent-sluggable": "^9.0|~8.0|~7.0|~6.0|~4.8|~4.7|~4.6|~4.5",
+        "intervention/image": "2.*",
+        "laravel/helpers": "^1.3",
+    },
+    "require-dev": {
+        "phpunit/phpunit": "*",
+        "orchestra/testbench": "4.0.*",
+        "php-coveralls/php-coveralls": "*"
+    },
+    "autoload": {
+        "psr-4": {
+            "BinshopsBlog\\": "src",
+            "BinshopsBlog\\Laravel\\Fulltext\\": "src/FulltextSearch/src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "BinshopsBlog\\Tests\\": "tests"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "BinshopsBlog\\BinshopsBlogServiceProvider"
+            ],
+            "aliases": {
+            }
+        }
+    }
+}

From ed3ca308e3054a4a1bf915ca0fd77089cc85d6ae Mon Sep 17 00:00:00 2001
From: DaleWastell <justanotherfalseprophet@gmail.com>
Date: Wed, 30 Mar 2022 10:56:08 +0200
Subject: [PATCH 098/118] Added the support for laravel 9, removed
 laravelium/feed

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6df4772..962a3db 100755
--- a/composer.json
+++ b/composer.json
@@ -22,9 +22,9 @@
     },
     "authors": [
         {
-            "name": "Dale",
+            "name": "Binshops",
             "homepage": "https://github.com/binshops/laravel-blog",
-            "role": "Lunatic",
+            "role": "owner",
             "email": "contact@binshops.com"
         }
     ],

From 913eb8672e12dbe6ecc6eaff9a1b5c499caa44e4 Mon Sep 17 00:00:00 2001
From: DaleWastell <justanotherfalseprophet@gmail.com>
Date: Wed, 30 Mar 2022 11:02:52 +0200
Subject: [PATCH 099/118] removed a comma :(

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 962a3db..651cb3a 100755
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
     "require": {
         "cviebrock/eloquent-sluggable": "^9.0|~8.0|~7.0|~6.0|~4.8|~4.7|~4.6|~4.5",
         "intervention/image": "2.*",
-        "laravel/helpers": "^1.3",
+        "laravel/helpers": "^1.3"
     },
     "require-dev": {
         "phpunit/phpunit": "*",

From 1a8fdae02f6828fc04934ff969adf39f18ddb8f7 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Sun, 3 Apr 2022 16:23:22 -0400
Subject: [PATCH 100/118] removes laravelium feed package

---
 src/Config/binshopsblog.php                   | 12 ---
 src/Controllers/BinshopsRssFeedController.php | 94 -------------------
 src/Helpers.php                               | 16 ----
 src/Requests/FeedRequest.php                  | 41 --------
 src/routes.php                                |  5 +-
 tests/MainTest.php                            |  7 +-
 6 files changed, 3 insertions(+), 172 deletions(-)
 delete mode 100755 src/Controllers/BinshopsRssFeedController.php
 delete mode 100755 src/Requests/FeedRequest.php

diff --git a/src/Config/binshopsblog.php b/src/Config/binshopsblog.php
index 37aeed2..2e37f70 100755
--- a/src/Config/binshopsblog.php
+++ b/src/Config/binshopsblog.php
@@ -121,18 +121,6 @@
         'basic_answers' => "black,dark", // comma separated list of possible answers. Don't worry about case.
     ],
 
-    ////////// RSS FEED
-
-    'rssfeed' => [
-
-        'should_shorten_text' => true, // boolean. Default: true. Should we shorten the text in rss feed?
-        'text_limit' => 100, // max length of description text in the rss feed
-        'posts_to_show_in_rss_feed' => 10,  // how many posts should we show in the rss feed
-        'cache_in_minutes' => 60, // how long (in minutes) to cache the RSS blog feed for.
-        'description' => "Our blog post RSS feed", //description for the RSS feed
-        'language' => "en", // see https://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-    ],
-
     ////////// comments:
 
     'comments' => [
diff --git a/src/Controllers/BinshopsRssFeedController.php b/src/Controllers/BinshopsRssFeedController.php
deleted file mode 100755
index e9a8f7f..0000000
--- a/src/Controllers/BinshopsRssFeedController.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace BinshopsBlog\Controllers;
-
-use App\Http\Controllers\Controller;
-use Carbon\Carbon;
-use Laravelium\Feed\Feed;
-use BinshopsBlog\Middleware\DetectLanguage;
-use BinshopsBlog\Models\BinshopsPost;
-use BinshopsBlog\Requests\FeedRequest;
-
-/**
- * Class BinshopsRssFeedController.php
- * All RSS feed viewing methods
- * @package BinshopsBlog\Controllers
- */
-class BinshopsRssFeedController extends Controller
-{
-    public function __construct()
-    {
-        $this->middleware(DetectLanguage::class);
-    }
-    
-    /**
-     * @param Feed $feed
-     * @param $posts
-     * @return mixed
-     */
-    protected function setupFeed(Feed $feed, $posts)
-    {
-        $feed->title = config("app.name") . ' Blog';
-        $feed->description = config("binshopsblog.rssfeed.description", "Our blog RSS feed");
-        $feed->link = route('binshopsblog.index');
-        $feed->setDateFormat('carbon');
-        $feed->pubdate = isset($posts[0]) ? $posts[0]->posted_at : Carbon::now()->subYear(10);
-        $feed->lang = config("binshopsblog.rssfeed.language", "en");
-        $feed->setShortening(config("binshopsblog.rssfeed.should_shorten_text", true)); // true or false
-        $feed->setTextLimit(config("binshopsblog.rssfeed.text_limit", 100));
-    }
-
-
-    /**
-     * @param $feed
-     */
-    protected function makeFreshFeed(Feed $feed)
-    {
-        $posts = BinshopsPost::orderBy("posted_at", "desc")
-            ->limit(config("binshopsblog.rssfeed.posts_to_show_in_rss_feed", 10))
-            ->with("author")
-            ->get();
-
-        $this->setupFeed($feed, $posts);
-
-        /** @var BinshopsPost $post */
-        foreach ($posts as $post) {
-            $feed->add($post->title,
-                $post->author_string(),
-                $post->url(),
-                $post->posted_at,
-                $post->short_description,
-                $post->generate_introduction()
-            );
-        }
-    }
-
-    /**
-     * RSS Feed
-     * This is a long (but quite simple) method to show an RSS feed
-     * It makes use of Laravelium\Feed\Feed.
-     *
-     * @param FeedRequest $request
-     * @param Feed $feed
-     * @return mixed
-     */
-    public function feed(FeedRequest $request, Feed $feed)
-    {
-
-        // if a logged in user views the RSS feed it will get cached, and if they are an admin user then it'll show all posts (even if it is not set as published)
-        $user_or_guest = \Auth::check() ? \Auth::user()->id : 'guest';
-
-        $feed->setCache(
-            config("binshopsblog.rssfeed.cache_in_minutes", 60),
-            "binshopsblog-" . $request->getFeedType() . $user_or_guest
-        );
-
-        if (!$feed->isCached()) {
-            $this->makeFreshFeed($feed);
-        }
-
-        return $feed->render($request->getFeedType());
-    }
-
-
-}
diff --git a/src/Helpers.php b/src/Helpers.php
index 733c6c9..6ff1435 100755
--- a/src/Helpers.php
+++ b/src/Helpers.php
@@ -43,22 +43,6 @@ public static function pull_flashed_message()
         return Session::pull(self::FLASH_MESSAGE_SESSION_KEY);
     }
 
-    /**
-     * Use this (Helpers::rss_html_tag()) in your blade/template files, within <head>
-     * to auto insert the links to rss feed
-     * @return string
-     */
-    public static function rss_html_tag()
-    {
-
-
-        return '<link rel="alternate" type="application/atom+xml" title="Atom RSS Feed" href="' . e(route("binshopsblog.feed")) . '?type=atom" />
-  <link rel="alternate" type="application/rss+xml" title="XML RSS Feed" href="' . e(route("binshopsblog.feed")) . '?type=rss" />
-  ';
-
-
-    }
-
     /**
      * This method is depreciated. Just use the config() directly.
      * @return array
diff --git a/src/Requests/FeedRequest.php b/src/Requests/FeedRequest.php
deleted file mode 100755
index 410a970..0000000
--- a/src/Requests/FeedRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace BinshopsBlog\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class FeedRequest extends FormRequest
-{
-
-    /**
-     * Always return true, as this is just to view the rss feed
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     *
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'type' => [Rule::in(['rss','atom'])],
-        ];
-    }
-
-    /**
-     * Is this request for an RSS feed or Atom feed? defaults to atom.
-     * @return string
-     */
-    public function getFeedType()
-    {
-        return $this->get("type") === 'rss' ? 'rss' : 'atom';
-    }
-}
diff --git a/src/routes.php b/src/routes.php
index 7ba1ce2..21b45d4 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -2,7 +2,7 @@
 
 Route::group(['middleware' => ['web'], 'namespace' => '\BinshopsBlog\Controllers'], function () {
 
-    /** The main public facing blog routes - show all posts, view a category, rss feed, view a single post, also the add comment route */
+    /** The main public facing blog routes - show all posts, view a category, view a single post, also the add comment route */
     Route::group(['prefix' => "/{locale}/".config('binshopsblog.blog_prefix', 'blog')], function () {
 
         Route::get('/', 'BinshopsReaderController@index')
@@ -11,9 +11,6 @@
         Route::get('/search', 'BinshopsReaderController@search')
             ->name('binshopsblog.search');
 
-        Route::get('/feed', 'BinshopsRssFeedController@feed')
-            ->name('binshopsblog.feed'); //RSS feed
-
         Route::get('/category{subcategories}', 'BinshopsReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('binshopsblog.view_category');
 
 //        Route::get('/category/{categorySlug}',
diff --git a/tests/MainTest.php b/tests/MainTest.php
index 5f7ea7f..9d08a2f 100644
--- a/tests/MainTest.php
+++ b/tests/MainTest.php
@@ -21,7 +21,6 @@ class MainTest extends \Tests\TestCase
 
     /blog/...
         binshopsblog.index                       YES
-        binshopsblog.feed                        YES
         binshopsblog.view_category               no - but this is basically binshopsblog.index
         binshopsblog.single                      YES
         binshopsblog.comments.add_new_comment    YES - tested multiple times with/without basic captcha on/off/correct/incorrect.
@@ -270,10 +269,9 @@ public function testCreatePostThenCheckIsViewableToPublic()
         $response = $this->get(config("binshopsblog.blog_prefix", "blog"));
         $response->assertDontSee($new_object_vals['slug']);
 
-        // must clear the cache, as the /feed is cached
+        // must clear the cache
         \Artisan::call('cache:clear');
 
-        $response = $this->get(config("binshopsblog.blog_prefix", "blog") . "/feed");
         $response->assertDontSee($new_object_vals['slug']);
 
         $response = $this->post($admin_panel_url . "/add_post", $new_object_vals);
@@ -290,10 +288,9 @@ public function testCreatePostThenCheckIsViewableToPublic()
         $response->assertSee($new_object_vals['slug']);
 
 
-        // must clear the cache, as the /feed is cached
+        // must clear the cache
         \Artisan::call('cache:clear');
 
-        $response = $this->get(config("binshopsblog.blog_prefix", "blog") . "/feed");
         $response->assertSee($new_object_vals['slug']);
         $response->assertSee($new_object_vals['title']);
 

From c786c6c019da71e0a089f5c8927d37da1c3c1cca Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Wed, 6 Apr 2022 05:38:46 -0400
Subject: [PATCH 101/118] feat: adds new routes to routes, and adapts
 DetectLanguage logic

---
 src/Middleware/DetectLanguage.php | 16 ++++++++++++++--
 src/routes.php                    | 23 ++++++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/Middleware/DetectLanguage.php b/src/Middleware/DetectLanguage.php
index a2bf3cb..7ef50c4 100644
--- a/src/Middleware/DetectLanguage.php
+++ b/src/Middleware/DetectLanguage.php
@@ -3,6 +3,7 @@
 
 namespace BinshopsBlog\Middleware;
 
+use BinshopsBlog\Models\BinshopsConfiguration;
 use Closure;
 use BinshopsBlog\Models\BinshopsLanguage;
 
@@ -10,14 +11,25 @@ class DetectLanguage
 {
     public function handle($request, Closure $next)
     {
-        $lang = BinshopsLanguage::where('locale', $request->route('locale'))
+        $locale = $request->route('locale');
+        $noLocaleRoute = false;
+
+        if (!$request->route('locale')){
+            $noLocaleRoute = true;
+            $locale = BinshopsConfiguration::get('DEFAULT_LANGUAGE_LOCALE');
+        }
+        $lang = BinshopsLanguage::where('locale', $locale)
             ->where('active', true)
             ->first();
 
         if (!$lang){
             return abort(404);
         }
-        $request->attributes->add(['lang_id' => $lang->id, 'locale' => $lang->locale]);
+        $request->attributes->add([
+            'lang_id' => $lang->id,
+            'locale' => $lang->locale,
+            'noLocaleRoute' => $noLocaleRoute
+        ]);
 
         return $next($request);
     }
diff --git a/src/routes.php b/src/routes.php
index 21b45d4..a1368fe 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -24,16 +24,33 @@
 
         // throttle to a max of 10 attempts in 3 minutes:
         Route::group(['middleware' => 'throttle:10,3'], function () {
-
             Route::post('save_comment/{blogPostSlug}',
                 'BinshopsCommentWriterController@addNewComment')
                 ->name('binshopsblog.comments.add_new_comment');
+        });
+    });
 
+    Route::group(['prefix' => config('binshopsblog.blog_prefix', 'blog')], function () {
 
-        });
+        Route::get('/', 'BinshopsReaderController@index')
+            ->name('binshopsblognolocale.index');
 
-    });
+        Route::get('/search', 'BinshopsReaderController@search')
+            ->name('binshopsblognolocale.search');
 
+        Route::get('/category{subcategories}', 'BinshopsReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('binshopsblognolocale.view_category');
+
+        Route::get('/{blogPostSlug}',
+            'BinshopsReaderController@viewSinglePost')
+            ->name('binshopsblognolocale.single');
+
+        // throttle to a max of 10 attempts in 3 minutes:
+        Route::group(['middleware' => 'throttle:10,3'], function () {
+            Route::post('save_comment/{blogPostSlug}',
+                'BinshopsCommentWriterController@addNewComment')
+                ->name('binshopsblognolocale.comments.add_new_comment');
+        });
+    });
 
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
     Route::group(['prefix' => config('binshopsblog.admin_prefix', 'blog_admin')], function () {

From a46c7d811ae5fe7d784092770a452f6d799ce03c Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Wed, 6 Apr 2022 06:32:08 -0400
Subject: [PATCH 102/118] refactor in getting route segments

---
 src/Controllers/BinshopsReaderController.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Controllers/BinshopsReaderController.php b/src/Controllers/BinshopsReaderController.php
index d660840..3a85a5d 100755
--- a/src/Controllers/BinshopsReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -35,7 +35,7 @@ public function __construct()
      * @param null $category_slug
      * @return mixed
      */
-    public function index($locale, Request $request, $category_slug = null)
+    public function index($locale = null, Request $request, $category_slug = null)
     {
         // the published_at + is_published are handled by BinshopsBlogPublishedScope, and don't take effect if the logged in user can manageb log posts
 
@@ -126,10 +126,12 @@ public function search(Request $request)
      * @param $category_slug
      * @return mixed
      */
-    public function view_category($locale, $hierarchy, Request $request)
+    public function view_category(Request $request)
     {
+        $hierarchy = $request->route('subcategories');
+
         $categories = explode('/', $hierarchy);
-        return $this->index($locale, $request, end($categories));
+        return $this->index($request->get('locale'), $request, end($categories));
     }
 
     /**
@@ -139,8 +141,10 @@ public function view_category($locale, $hierarchy, Request $request)
      * @param $blogPostSlug
      * @return mixed
      */
-    public function viewSinglePost(Request $request, $locale, $blogPostSlug)
+    public function viewSinglePost(Request $request)
     {
+        $blogPostSlug = $request->route('blogPostSlug');
+
         // the published_at + is_published are handled by BinshopsBlogPublishedScope, and don't take effect if the logged in user can manage log posts
         $blog_post = BinshopsPostTranslation::where([
             ["slug", "=", $blogPostSlug],

From a14f1dcf7cae960b2f957e10fd84dd3b34b1008f Mon Sep 17 00:00:00 2001
From: = <nebucaz@pageagent.com>
Date: Tue, 30 Aug 2022 11:05:12 +0200
Subject: [PATCH 103/118] Additional instructions

---
 README.md | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index e7f186e..bf1fa3e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Incredible features with a lightweight laravel blog package. I highly recommend
 ## Outstanding Features
 - Fulltext Search - search throughout all blog posts
 - Multi Level Category - nested sets using Baum
-- Multi Language Support 
+- Multi Language Support
 
 ### Quick and easy installation (Multi-lang version)
 1- Install via composer
@@ -31,15 +31,21 @@ composer require laravel/ui
 php artisan ui vue --auth
 ```
 
-2- Run the following two commands to copy config file, migration files, and view files
+2- Scaffold
+
+```
+npm install && npm run build
+```
+
+3- Run the following two commands to copy config file, migration files, and view files
 
 `php artisan vendor:publish --provider="BinshopsBlog\BinshopsBlogServiceProvider"`
 
-3- Execute migrations to create tables
+4- Execute migrations to create tables
 
 `php artisan migrate;`
 
-4- You must add one method to your \App\User (in laravel 8 \App\Models\User) model. As the name of this method shows it determines which user can manage posts. Place your logic there
+5- You must add one method to your \App\User (in laravel 8 \App\Models\User) model. As the name of this method shows it determines which user can manage posts. Place your logic there
 
 ```
  /**
@@ -72,12 +78,18 @@ php artisan ui vue --auth
     }
 ```
 
-5- Create a directory in `public/` named `blog_images`
+6- Create a directory in `public/` named `blog_images`
+
+7- Start the server
 
-6- Login as admin and setup your package: `/blog_admin/setup`
+```
+php artisan serve
+```
+
+8- Login as admin and setup your package: `/blog_admin/setup`
 
 Congrats! Your blog is ready to use. (URLs are customizable in the config file)
-  
+
   Admin panel URI: `/blog_admin`
   Front URI: `/en/blog`
 
@@ -113,10 +125,10 @@ You can see the single version in "single-lang" branch.
 - Managing comments and comment approval
 - Other options include using Disqus comments or disabling comments
 
-## Recent Changes  
+## Recent Changes
 - **9.1.x** Multi language support
 - 8.0.x Compatibility with Laravel 8.x
-  
+
 ## What/who this package is for:
 
  - For websites running Laravel
@@ -189,7 +201,7 @@ Try adding this to config/app.php:
 - Ensure that /public/blog_images (or whatever directory you set it to in the config) is writable by the server
 - You might need to set a higher memory limit, or upload smaller image files. This will depend on your server. I've used it to upload huge (10mb+) jpg images without problem, once the server was set up correctly to handle larger file uploads.
 
-## Version History    
+## Version History
 - **9.2.x** Stable version of package
 - 9.0.x Multi-language support beta release
 - 8.0.x Compatibility with Laravel 8

From 8a90ae414dc8382f0d5dac9586a2d199d4320575 Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Wed, 28 Dec 2022 07:35:08 -0500
Subject: [PATCH 104/118] feat: added support for routes without locale

---
 src/Models/BinshopsCategoryTranslation.php             |  7 +++----
 src/Models/BinshopsPostTranslation.php                 |  8 +++-----
 src/Views/binshopsblog/index.blade.php                 |  3 ++-
 .../binshopsblog/partials/_category_partial.blade.php  |  5 +++--
 src/Views/binshopsblog/partials/categories.blade.php   | 10 +++++-----
 .../binshopsblog/partials/disqus_comments.blade.php    |  2 +-
 src/Views/binshopsblog/partials/index_loop.blade.php   |  7 +++----
 .../binshopsblog/partials/use_view_file.blade.php      |  2 +-
 src/Views/binshopsblog/single_post.blade.php           |  4 ++--
 src/routes.php                                         | 10 ----------
 10 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/Models/BinshopsCategoryTranslation.php b/src/Models/BinshopsCategoryTranslation.php
index 955fcd3..24fb932 100644
--- a/src/Models/BinshopsCategoryTranslation.php
+++ b/src/Models/BinshopsCategoryTranslation.php
@@ -1,13 +1,11 @@
 <?php
 
-
 namespace BinshopsBlog\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class BinshopsCategoryTranslation extends Model
 {
-
     public $fillable = [
         'category_id',
         'category_name',
@@ -37,7 +35,7 @@ public function language()
      * Returns the public facing URL of showing blog posts in this category
      * @return string
      */
-    public function url($loacle)
+    public function url($locale, $noLocaleRoute = false)
     {
         $theChainString = "";
         $cat = $this->category()->get();
@@ -45,7 +43,8 @@ public function url($loacle)
         foreach ($chain as $category){
             $theChainString .=  "/" . $category->categoryTranslations()->where('lang_id' , $this->lang_id)->first()->slug;
         }
-        return route("binshopsblog.view_category",[$loacle, $theChainString]);
+
+        return $noLocaleRoute ? route("binshopsblog.view_category",["", $theChainString]) : route("binshopsblog.view_category",[$locale, $theChainString]);
     }
 
     /**
diff --git a/src/Models/BinshopsPostTranslation.php b/src/Models/BinshopsPostTranslation.php
index e05c7c1..928a2fa 100644
--- a/src/Models/BinshopsPostTranslation.php
+++ b/src/Models/BinshopsPostTranslation.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace BinshopsBlog\Models;
 
 use Cviebrock\EloquentSluggable\Sluggable;
@@ -199,11 +198,9 @@ protected function check_valid_image_size(string $size = 'medium')
             throw new \InvalidArgumentException("Invalid image size ($size). BinshopsPost image size should not begin with 'image_'. Remove this from the start of $size. It *should* be in the binshopsblog.image_sizes config though!");
         }
 
-
         throw new \InvalidArgumentException("BinshopsPost image size should be 'large','medium','thumbnail' or another field as defined in config/binshopsblog.php. Provided size ($size) is not valid");
     }
 
-
     /**
      *
      * If $this->seo_title was set, return that.
@@ -219,14 +216,15 @@ public function gen_seo_title()
         }
         return $this->title;
     }
+
     /**
      * Returns the public facing URL to view this blog post
      *
      * @return string
      */
-    public function url($loacle)
+    public function url($loacle, $noLocaleRoute = false)
     {
-        return route("binshopsblog.single", [$loacle, $this->slug]);
+        return $noLocaleRoute ? route("binshopsblog.single", ["", $this->slug]) : route("binshopsblog.single", [$loacle, $this->slug]);
     }
 
     /**
diff --git a/src/Views/binshopsblog/index.blade.php b/src/Views/binshopsblog/index.blade.php
index f0f0832..e7dadbe 100755
--- a/src/Views/binshopsblog/index.blade.php
+++ b/src/Views/binshopsblog/index.blade.php
@@ -63,7 +63,8 @@ class='btn border  btn-outline-primary btn-sm '>
                     @if($categories)
                         @include("binshopsblog::partials._category_partial", [
     'category_tree' => $categories,
-    'name_chain' => $nameChain = ""
+    'name_chain' => $nameChain = "",
+    'noLocaleRoute' => $noLocaleRoute
     ])
                     @else
                         <span>No Categories</span>
diff --git a/src/Views/binshopsblog/partials/_category_partial.blade.php b/src/Views/binshopsblog/partials/_category_partial.blade.php
index 6464935..e2ada1f 100644
--- a/src/Views/binshopsblog/partials/_category_partial.blade.php
+++ b/src/Views/binshopsblog/partials/_category_partial.blade.php
@@ -4,7 +4,7 @@
         <li class="category-item-wrapper">
             @php $nameChain = $nameChain .'/'. $trans->slug @endphp
 
-            <a href="{{route("binshopsblog.view_category",[$locale, $nameChain ])}}">
+            <a href="{{ $noLocaleRoute ? route("binshopsblog.view_category",["", $nameChain]) : route("binshopsblog.view_category",[$locale, $nameChain])}}">
                  <span class="category-item" value='{{$category->category_id}}'>
         {{$trans->category_name}}
 
@@ -12,7 +12,8 @@
                          <ul>
                  @include("binshopsblog::partials._category_partial", [
     'category_tree' => $category->siblings,
-    'name_chain' => $nameChain
+    'name_chain' => $nameChain,
+    'noLocaleRoute' => $noLocaleRoute
     ])
                  </ul>
                      @endif
diff --git a/src/Views/binshopsblog/partials/categories.blade.php b/src/Views/binshopsblog/partials/categories.blade.php
index 1a4ba43..1f6c6be 100644
--- a/src/Views/binshopsblog/partials/categories.blade.php
+++ b/src/Views/binshopsblog/partials/categories.blade.php
@@ -1,7 +1,7 @@
 <div class=''>
-        @foreach($categories as $category)
-                <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->categoryTranslations[0]->url($locale)}}'>
-                        {{$category->categoryTranslations[0]->category_name}}
-                </a>
-        @endforeach
+    @foreach($categories as $category)
+        <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->categoryTranslations[0]->url($locale, $noLocaleRoute)}}'>
+            {{$category->categoryTranslations[0]->category_name}}
+        </a>
+    @endforeach
 </div>
diff --git a/src/Views/binshopsblog/partials/disqus_comments.blade.php b/src/Views/binshopsblog/partials/disqus_comments.blade.php
index 1ff5dfd..f8332ec 100644
--- a/src/Views/binshopsblog/partials/disqus_comments.blade.php
+++ b/src/Views/binshopsblog/partials/disqus_comments.blade.php
@@ -15,4 +15,4 @@
         (d.head || d.body).appendChild(s);
     })();
 </script>
-<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus</a>, and run by <a href='https://binshops.binshops.com/'>BinshopsBlog Laravel Blog package</a></noscript>
\ No newline at end of file
+<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus</a>, and run by <a href='https://binshops.com/'>BinshopsBlog Laravel Blog package</a></noscript>
diff --git a/src/Views/binshopsblog/partials/index_loop.blade.php b/src/Views/binshopsblog/partials/index_loop.blade.php
index 391712e..8fa3c0f 100644
--- a/src/Views/binshopsblog/partials/index_loop.blade.php
+++ b/src/Views/binshopsblog/partials/index_loop.blade.php
@@ -1,6 +1,5 @@
 {{--Used on the index page (so shows a small summary--}}
-{{--See the guide on binshops.binshops.com for how to copy these files to your /resources/views/ directory--}}
-{{--https://binshops.binshops.com/laravel-blog-package--}}
+{{--See the guide on binshops.com for how to copy these files to your /resources/views/ directory--}}
 
 <div class="col-md-6">
     <div class="blog-item">
@@ -9,7 +8,7 @@
             <?=$post->image_tag("medium", true, ''); ?>
         </div>
         <div class="blog-inner-item">
-            <h3 class=''><a href='{{$post->url($locale)}}'>{{$post->title}}</a></h3>
+            <h3 class=''><a href='{{$post->url($locale, $noLocaleRoute)}}'>{{$post->title}}</a></h3>
             <h5 class=''>{{$post->subtitle}}</h5>
 
             @if (config('binshopsblog.show_full_text_at_list'))
@@ -22,7 +21,7 @@
                 <span class="light-text">Authored by: </span> {{$post->post->author->name}} <span class="light-text">Posted at: </span> {{date('d M Y ', strtotime($post->post->posted_at))}}
             </div>
             <div class='text-center'>
-                <a href="{{$post->url($locale)}}" class="btn btn-primary">View Post</a>
+                <a href="{{$post->url($locale, $noLocaleRoute)}}" class="btn btn-primary">View Post</a>
             </div>
         </div>
     </div>
diff --git a/src/Views/binshopsblog/partials/use_view_file.blade.php b/src/Views/binshopsblog/partials/use_view_file.blade.php
index 1a67edd..6f89734 100644
--- a/src/Views/binshopsblog/partials/use_view_file.blade.php
+++ b/src/Views/binshopsblog/partials/use_view_file.blade.php
@@ -12,7 +12,7 @@
          {{--is logged in + canManageBinshopsBlogPosts() == true, so show a detailed error--}}
         <div class='alert alert-danger'>Custom blog post blade view file
                         (<code>{{$post->full_view_file_path()}}</code>) not found. <a
-                    href='https://binshops.binshops.com/laravel/packages/help-documentation/laravel-blog-package-binshopsblog'
+                    href='https://github.com/binshops/laravel-blog'
                     target='_blank'>See Laravel Blog Package help here</a>.
                     </div>
 
diff --git a/src/Views/binshopsblog/single_post.blade.php b/src/Views/binshopsblog/single_post.blade.php
index e32fbc5..2e3f5a1 100755
--- a/src/Views/binshopsblog/single_post.blade.php
+++ b/src/Views/binshopsblog/single_post.blade.php
@@ -12,7 +12,7 @@
         </div>
     @endif
 
-    {{--https://binshops.binshops.com/laravel/packages/binshopsblog-blog-system-for-your-laravel-app/help-documentation/laravel-blog-package-binshopsblog#guide_to_views--}}
+    {{--https://github.com/binshops/laravel-blog--}}
 
     <div class='container'>
     <div class='row'>
@@ -40,4 +40,4 @@
 
 @section('blog-custom-js')
     <script src="{{asset('binshops-blog.js')}}"></script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/src/routes.php b/src/routes.php
index a1368fe..1128de5 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -13,15 +13,10 @@
 
         Route::get('/category{subcategories}', 'BinshopsReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('binshopsblog.view_category');
 
-//        Route::get('/category/{categorySlug}',
-//            'BinshopsReaderController@view_category')
-//            ->name('binshopsblog.view_category');
-
         Route::get('/{blogPostSlug}',
             'BinshopsReaderController@viewSinglePost')
             ->name('binshopsblog.single');
 
-
         // throttle to a max of 10 attempts in 3 minutes:
         Route::group(['middleware' => 'throttle:10,3'], function () {
             Route::post('save_comment/{blogPostSlug}',
@@ -100,10 +95,8 @@
 
             Route::get("/upload", "BinshopsImageUploadController@create")->name("binshopsblog.admin.images.upload");
             Route::post("/upload", "BinshopsImageUploadController@store")->name("binshopsblog.admin.images.store");
-
         });
 
-
         Route::delete('/delete_post/{blogPostId}',
             'BinshopsAdminController@destroy_post')
             ->name('binshopsblog.admin.destroy_post');
@@ -146,10 +139,8 @@
             Route::delete('/delete_category/{categoryId}',
                 'BinshopsCategoryAdminController@destroy_category')
                 ->name('binshopsblog.admin.categories.destroy_category');
-
         });
 
-
         Route::group(['prefix' => 'languages'], function () {
 
             Route::get('/',
@@ -170,7 +161,6 @@
             Route::post('/toggle_language/{languageId}',
                 'BinshopsLanguageAdminController@toggle_language')
                 ->name('binshopsblog.admin.languages.toggle_language');
-
         });
     });
 });

From 30ce041edf8b00aa8021538cdcd489115ba7700e Mon Sep 17 00:00:00 2001
From: Sam <sam@binshops.com>
Date: Wed, 28 Dec 2022 09:27:24 -0500
Subject: [PATCH 105/118] readme update

---
 README.md | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index e7f186e..77dc396 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,11 @@
 # Laravel Blog
-Have you worked with Wordpress? Developers call this package wordpress-like laravel blog.
 
 ## [Installation Video - Less than 5 Minutes](https://youtu.be/N9NpFUqbftA)
 [![Laravel Blog Package](http://img.youtube.com/vi/N9NpFUqbftA/0.jpg)](https://youtu.be/N9NpFUqbftA)
 
 ### Lightweight and Comprehensive
 
-Incredible features with a lightweight laravel blog package. I highly recommend it because:
+Incredible features with a lightweight laravel blog package.
 - Quick installation (<3 minutes)
 - It's very easy to extend
 - Included great features out-of-box
@@ -120,7 +119,7 @@ You can see the single version in "single-lang" branch.
 ## What/who this package is for:
 
  - For websites running Laravel
- - Who wants to have a site blog. This laravel blog gives an easy to use interface to write blog posts/assign categories/manage existing posts
+ - Anyone, who wants to have a site blog. This laravel blog gives an easy to use interface to write blog posts/assign categories/manage existing posts
  - Where only admin users can edit/manage the blog (this is not suitable for every user on your site to be able to manage posts)
  - For anyone who likes to add a wordpress-like laravel blog to laravel website
 
@@ -190,7 +189,7 @@ Try adding this to config/app.php:
 - You might need to set a higher memory limit, or upload smaller image files. This will depend on your server. I've used it to upload huge (10mb+) jpg images without problem, once the server was set up correctly to handle larger file uploads.
 
 ## Version History    
-- **9.2.x** Stable version of package
+- **9.3.x** Stable version of package
 - 9.0.x Multi-language support beta release
 - 8.0.x Compatibility with Laravel 8
 - 7.3.0 New Admin UI
@@ -200,12 +199,3 @@ Try adding this to config/app.php:
 - 1.0.5                 - composer.json changes.
 - 1.0                   - First release
 - 0.1                   - Initial release
-
-## Contributors ✨
-<table>
-  <tr>
-    <td align="center"><a href="https://github.com/samberrry"><img src="https://avatars.githubusercontent.com/u/20775532?v=4" width="80px;" alt=""/><br /><sub><b>Sam Berry</b></sub></a><br /></td>
-<td align="center"><a href="https://github.com/dasscheman"><img src="https://avatars.githubusercontent.com/u/6064248?v=4" width="80px;" alt=""/><br /><sub><b>Alef Barbeli</b></sub></a><br /> </td>
-
-  </tr>
-</table>

From 35c963df58ffdbe9cbb263dbe8f1dc049ffa41ae Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Sun, 29 Jan 2023 18:45:16 -0500
Subject: [PATCH 106/118] readme update

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 93e18c5..44f59e5 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
-# Laravel Blog
+ <h1 align="center">Laravel Blog Package</h1>
 
-## [Installation Video - Less than 5 Minutes](https://youtu.be/N9NpFUqbftA)
-[![Laravel Blog Package](http://img.youtube.com/vi/N9NpFUqbftA/0.jpg)](https://youtu.be/N9NpFUqbftA)
+<p align="center">
+    <img src="https://user-images.githubusercontent.com/20775532/215362765-c2a3360e-c165-4cba-809b-4f04316c8d5e.png" width="80%" />
+</p>
 
-### Lightweight and Comprehensive
+### Lightweight and Easy to Install
 
 Incredible features with a lightweight laravel blog package.
 - Quick installation (<3 minutes)

From d6b923dfa24117174fec72cca56f889a6f4009a4 Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Tue, 31 Jan 2023 10:33:53 -0500
Subject: [PATCH 107/118] chore: some text change

---
 src/Views/binshopsblog_admin/setup/setup.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Views/binshopsblog_admin/setup/setup.blade.php b/src/Views/binshopsblog_admin/setup/setup.blade.php
index 37f8e63..ab0bd55 100644
--- a/src/Views/binshopsblog_admin/setup/setup.blade.php
+++ b/src/Views/binshopsblog_admin/setup/setup.blade.php
@@ -43,10 +43,10 @@
                                 <div class="tab-pane" id="language">
                                     <div class="row">
                                         <div class="col-sm-12">
-                                            <h4 class="info-text">Your default language is set to English. You can add more language from admin panel.</h4>
+                                            <h4 class="info-text">Your default language will be set to English. You can add more language through the admin panel.</h4>
 
                                             <h6 class="info-text">
-                                                Version v9.2.x
+                                                Version v9.3.x
                                             </h6>
                                         </div>
 
@@ -108,7 +108,7 @@ class="form-control"
 
     <div class="footer">
         <div class="container">
-            Created by Binshops Blog
+            Created by BINSHOPS
         </div>
     </div>
 </div>

From aa746c0b7a6eba71ac89a8217e942469d2b85e1d Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Tue, 31 Jan 2023 10:55:45 -0500
Subject: [PATCH 108/118] fix: fix fore noLocaleRoute

---
 src/Controllers/BinshopsReaderController.php   | 18 ++++++++++--------
 .../layouts/admin_layout.blade.php             |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Controllers/BinshopsReaderController.php b/src/Controllers/BinshopsReaderController.php
index 3a85a5d..84a665f 100755
--- a/src/Controllers/BinshopsReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -85,6 +85,7 @@ public function index($locale = null, Request $request, $category_slug = null)
             'categories' => $rootList,
             'posts' => $posts,
             'title' => $title,
+            'noLocaleRoute' => $request->get("noLocaleRoute")
         ]);
     }
 
@@ -110,13 +111,14 @@ public function search(Request $request)
         BinshopsCategory::loadSiblingsWithList($rootList);
 
         return view("binshopsblog::search", [
-                'lang_id' => $request->get('lang_id'),
-                'locale' => $request->get("locale"),
-                'categories' => $rootList,
-                'query' => $query,
-                'search_results' => $search_results]
+            'lang_id' => $request->get('lang_id'),
+            'locale' => $request->get("locale"),
+            'categories' => $rootList,
+            'query' => $query,
+            'search_results' => $search_results,
+            'noLocaleRoute' => $request->get("noLocaleRoute")
+        ]
         );
-
     }
 
     /**
@@ -167,8 +169,8 @@ public function viewSinglePost(Request $request)
                 ->get(),
             'captcha' => $captcha,
             'categories' => $categories,
-            'locale' => $request->get("locale")
+            'locale' => $request->get("locale"),
+            'noLocaleRoute' => $request->get("noLocaleRoute")
         ]);
     }
-
 }
diff --git a/src/Views/binshopsblog_admin/layouts/admin_layout.blade.php b/src/Views/binshopsblog_admin/layouts/admin_layout.blade.php
index 593a427..49e275c 100755
--- a/src/Views/binshopsblog_admin/layouts/admin_layout.blade.php
+++ b/src/Views/binshopsblog_admin/layouts/admin_layout.blade.php
@@ -60,7 +60,7 @@
                 <ul class="navbar-nav ml-auto">
                     <!-- Authentication Links -->
 
-                    <li class='nav-item px-2'><a class='nav-link' href='{{route("binshopsblog.index" , app('request')->get('locale'))}}'>Blog home</a></li>
+                    <li class='nav-item px-2'><a class='nav-link' href='{{route("binshopsblog.index" , app('request')->get('locale'))}}' target="_blank">Blog home</a></li>
 
                     <li class="nav-item ">
                         <a id="" class="nav-link " href="#" role="button"

From 5caff6a988758a261b0692e57f30496e92f11957 Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Tue, 31 Jan 2023 11:04:40 -0500
Subject: [PATCH 109/118] refactor: rename noLocaleRoute to routeWithoutLocale

---
 src/Controllers/BinshopsReaderController.php             | 6 +++---
 src/Middleware/DetectLanguage.php                        | 9 +++++----
 src/Models/BinshopsCategoryTranslation.php               | 4 ++--
 src/Models/BinshopsPostTranslation.php                   | 4 ++--
 src/Views/binshopsblog/index.blade.php                   | 2 +-
 .../binshopsblog/partials/_category_partial.blade.php    | 4 ++--
 src/Views/binshopsblog/partials/categories.blade.php     | 2 +-
 src/Views/binshopsblog/partials/index_loop.blade.php     | 4 ++--
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Controllers/BinshopsReaderController.php b/src/Controllers/BinshopsReaderController.php
index 84a665f..3386ca2 100755
--- a/src/Controllers/BinshopsReaderController.php
+++ b/src/Controllers/BinshopsReaderController.php
@@ -85,7 +85,7 @@ public function index($locale = null, Request $request, $category_slug = null)
             'categories' => $rootList,
             'posts' => $posts,
             'title' => $title,
-            'noLocaleRoute' => $request->get("noLocaleRoute")
+            'routeWithoutLocale' => $request->get("routeWithoutLocale")
         ]);
     }
 
@@ -116,7 +116,7 @@ public function search(Request $request)
             'categories' => $rootList,
             'query' => $query,
             'search_results' => $search_results,
-            'noLocaleRoute' => $request->get("noLocaleRoute")
+            'routeWithoutLocale' => $request->get("routeWithoutLocale")
         ]
         );
     }
@@ -170,7 +170,7 @@ public function viewSinglePost(Request $request)
             'captcha' => $captcha,
             'categories' => $categories,
             'locale' => $request->get("locale"),
-            'noLocaleRoute' => $request->get("noLocaleRoute")
+            'routeWithoutLocale' => $request->get("routeWithoutLocale")
         ]);
     }
 }
diff --git a/src/Middleware/DetectLanguage.php b/src/Middleware/DetectLanguage.php
index 7ef50c4..f25d1a8 100644
--- a/src/Middleware/DetectLanguage.php
+++ b/src/Middleware/DetectLanguage.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace BinshopsBlog\Middleware;
 
 use BinshopsBlog\Models\BinshopsConfiguration;
@@ -12,12 +11,13 @@ class DetectLanguage
     public function handle($request, Closure $next)
     {
         $locale = $request->route('locale');
-        $noLocaleRoute = false;
+        $routeWithoutLocale = false;
 
         if (!$request->route('locale')){
-            $noLocaleRoute = true;
+            $routeWithoutLocale = true;
             $locale = BinshopsConfiguration::get('DEFAULT_LANGUAGE_LOCALE');
         }
+
         $lang = BinshopsLanguage::where('locale', $locale)
             ->where('active', true)
             ->first();
@@ -25,10 +25,11 @@ public function handle($request, Closure $next)
         if (!$lang){
             return abort(404);
         }
+
         $request->attributes->add([
             'lang_id' => $lang->id,
             'locale' => $lang->locale,
-            'noLocaleRoute' => $noLocaleRoute
+            'routeWithoutLocale' => $routeWithoutLocale
         ]);
 
         return $next($request);
diff --git a/src/Models/BinshopsCategoryTranslation.php b/src/Models/BinshopsCategoryTranslation.php
index 24fb932..f4450d5 100644
--- a/src/Models/BinshopsCategoryTranslation.php
+++ b/src/Models/BinshopsCategoryTranslation.php
@@ -35,7 +35,7 @@ public function language()
      * Returns the public facing URL of showing blog posts in this category
      * @return string
      */
-    public function url($locale, $noLocaleRoute = false)
+    public function url($locale, $routeWithoutLocale = false)
     {
         $theChainString = "";
         $cat = $this->category()->get();
@@ -44,7 +44,7 @@ public function url($locale, $noLocaleRoute = false)
             $theChainString .=  "/" . $category->categoryTranslations()->where('lang_id' , $this->lang_id)->first()->slug;
         }
 
-        return $noLocaleRoute ? route("binshopsblog.view_category",["", $theChainString]) : route("binshopsblog.view_category",[$locale, $theChainString]);
+        return $routeWithoutLocale ? route("binshopsblog.view_category",["", $theChainString]) : route("binshopsblog.view_category",[$locale, $theChainString]);
     }
 
     /**
diff --git a/src/Models/BinshopsPostTranslation.php b/src/Models/BinshopsPostTranslation.php
index 928a2fa..856de2f 100644
--- a/src/Models/BinshopsPostTranslation.php
+++ b/src/Models/BinshopsPostTranslation.php
@@ -222,9 +222,9 @@ public function gen_seo_title()
      *
      * @return string
      */
-    public function url($loacle, $noLocaleRoute = false)
+    public function url($loacle, $routeWithoutLocale = false)
     {
-        return $noLocaleRoute ? route("binshopsblog.single", ["", $this->slug]) : route("binshopsblog.single", [$loacle, $this->slug]);
+        return $routeWithoutLocale ? route("binshopsblog.single", ["", $this->slug]) : route("binshopsblog.single", [$loacle, $this->slug]);
     }
 
     /**
diff --git a/src/Views/binshopsblog/index.blade.php b/src/Views/binshopsblog/index.blade.php
index e7dadbe..0483be3 100755
--- a/src/Views/binshopsblog/index.blade.php
+++ b/src/Views/binshopsblog/index.blade.php
@@ -64,7 +64,7 @@ class='btn border  btn-outline-primary btn-sm '>
                         @include("binshopsblog::partials._category_partial", [
     'category_tree' => $categories,
     'name_chain' => $nameChain = "",
-    'noLocaleRoute' => $noLocaleRoute
+    'routeWithoutLocale' => $routeWithoutLocale
     ])
                     @else
                         <span>No Categories</span>
diff --git a/src/Views/binshopsblog/partials/_category_partial.blade.php b/src/Views/binshopsblog/partials/_category_partial.blade.php
index e2ada1f..7cb577f 100644
--- a/src/Views/binshopsblog/partials/_category_partial.blade.php
+++ b/src/Views/binshopsblog/partials/_category_partial.blade.php
@@ -4,7 +4,7 @@
         <li class="category-item-wrapper">
             @php $nameChain = $nameChain .'/'. $trans->slug @endphp
 
-            <a href="{{ $noLocaleRoute ? route("binshopsblog.view_category",["", $nameChain]) : route("binshopsblog.view_category",[$locale, $nameChain])}}">
+            <a href="{{ $routeWithoutLocale ? route("binshopsblog.view_category",["", $nameChain]) : route("binshopsblog.view_category",[$locale, $nameChain])}}">
                  <span class="category-item" value='{{$category->category_id}}'>
         {{$trans->category_name}}
 
@@ -13,7 +13,7 @@
                  @include("binshopsblog::partials._category_partial", [
     'category_tree' => $category->siblings,
     'name_chain' => $nameChain,
-    'noLocaleRoute' => $noLocaleRoute
+    'routeWithoutLocale' => $routeWithoutLocale
     ])
                  </ul>
                      @endif
diff --git a/src/Views/binshopsblog/partials/categories.blade.php b/src/Views/binshopsblog/partials/categories.blade.php
index 1f6c6be..285bcf6 100644
--- a/src/Views/binshopsblog/partials/categories.blade.php
+++ b/src/Views/binshopsblog/partials/categories.blade.php
@@ -1,6 +1,6 @@
 <div class=''>
     @foreach($categories as $category)
-        <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->categoryTranslations[0]->url($locale, $noLocaleRoute)}}'>
+        <a class='btn btn-outline-secondary btn-sm m-1' href='{{$category->categoryTranslations[0]->url($locale, $routeWithoutLocale)}}'>
             {{$category->categoryTranslations[0]->category_name}}
         </a>
     @endforeach
diff --git a/src/Views/binshopsblog/partials/index_loop.blade.php b/src/Views/binshopsblog/partials/index_loop.blade.php
index 8fa3c0f..4e4c44b 100644
--- a/src/Views/binshopsblog/partials/index_loop.blade.php
+++ b/src/Views/binshopsblog/partials/index_loop.blade.php
@@ -8,7 +8,7 @@
             <?=$post->image_tag("medium", true, ''); ?>
         </div>
         <div class="blog-inner-item">
-            <h3 class=''><a href='{{$post->url($locale, $noLocaleRoute)}}'>{{$post->title}}</a></h3>
+            <h3 class=''><a href='{{$post->url($locale, $routeWithoutLocale)}}'>{{$post->title}}</a></h3>
             <h5 class=''>{{$post->subtitle}}</h5>
 
             @if (config('binshopsblog.show_full_text_at_list'))
@@ -21,7 +21,7 @@
                 <span class="light-text">Authored by: </span> {{$post->post->author->name}} <span class="light-text">Posted at: </span> {{date('d M Y ', strtotime($post->post->posted_at))}}
             </div>
             <div class='text-center'>
-                <a href="{{$post->url($locale, $noLocaleRoute)}}" class="btn btn-primary">View Post</a>
+                <a href="{{$post->url($locale, $routeWithoutLocale)}}" class="btn btn-primary">View Post</a>
             </div>
         </div>
     </div>

From 7f51af805dd4b5381db0250964563ae4f34d53df Mon Sep 17 00:00:00 2001
From: Usman Ikram <usman172@gmail.com>
Date: Wed, 19 Apr 2023 17:59:41 +0200
Subject: [PATCH 110/118] Add Laravel 10 support

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 651cb3a..661a430 100755
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         }
     ],
     "require": {
-        "cviebrock/eloquent-sluggable": "^9.0|~8.0|~7.0|~6.0|~4.8|~4.7|~4.6|~4.5",
+        "cviebrock/eloquent-sluggable": "^10.0|^9.0|~8.0|~7.0|~6.0|~4.8|~4.7|~4.6|~4.5",
         "intervention/image": "2.*",
         "laravel/helpers": "^1.3"
     },

From 91e77da6372b4c061ba3e91217d5abc4b859fa05 Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Sat, 22 Apr 2023 17:30:56 -0400
Subject: [PATCH 111/118] readme update

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 44f59e5..c07333b 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ To see package on Packagist click this [Link](https://packagist.org/packages/bin
 ### Single Language Version
 To install the single language version of the package use version v8.1x:
 
-1- `composer require binshops/laravel-blog:v8.1.2`
+1- `composer require binshops/laravel-blog:v8.1.4`
 
 2- `php artisan vendor:publish --provider="BinshopsBlog\BinshopsBlogServiceProvider"`
 
@@ -106,7 +106,7 @@ To install the single language version of the package use version v8.1x:
 
 4- `php artisan migrate;`
 
-You can see the single version in "single-lang" branch.
+You can see the single version in "single-lang" branch. The major difference with multi-language version is the database structure. 
 
 ## Important Notes
 - For laravel 8.x's default auth User model, change user model in `binshopsblog.php` to: `\App\Models\User::class`

From bfdd413df0117fc7723c56135090a7b1beb27fa1 Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Sat, 29 Apr 2023 04:19:38 -0400
Subject: [PATCH 112/118] fix: removed default_lang from binshopsblog config
 file

---
 src/Config/binshopsblog.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Config/binshopsblog.php b/src/Config/binshopsblog.php
index 2e37f70..50a0757 100755
--- a/src/Config/binshopsblog.php
+++ b/src/Config/binshopsblog.php
@@ -3,8 +3,6 @@
 //config for binshops/laravel-blogger
 
 return [
-    'default_language' => 'en',
-
     //Your custom User model
     //Change it to \App\User::class for previous laravel versions
     'user_model'=>\App\Models\User::class,

From fcb92c5f4b3f64662d72095b638a27c1cdfe808e Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Tue, 16 May 2023 19:21:05 -0400
Subject: [PATCH 113/118] feat: admin post search

---
 src/Controllers/BinshopsAdminController.php  | 33 +++++++++++++++++++-
 src/Views/binshopsblog_admin/index.blade.php | 27 +++++++++++-----
 src/routes.php                               |  4 +++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/Controllers/BinshopsAdminController.php b/src/Controllers/BinshopsAdminController.php
index fa2c5b9..34c3ef1 100755
--- a/src/Controllers/BinshopsAdminController.php
+++ b/src/Controllers/BinshopsAdminController.php
@@ -3,6 +3,8 @@
 namespace BinshopsBlog\Controllers;
 
 use App\Http\Controllers\Controller;
+use BinshopsBlog\Laravel\Fulltext\Search;
+use BinshopsBlog\Models\BinshopsCategory;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use BinshopsBlog\Interfaces\BaseRequestInterface;
@@ -46,7 +48,6 @@ public function __construct()
         }
     }
 
-
     /**
      * View all posts
      *
@@ -469,4 +470,34 @@ protected function check_if_same_post_exists($slug, $lang_id, $post_id){
             return false;
         }
     }
+
+    /**
+     * Show the search results for $_GET['s']
+     *
+     * @param Request $request
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @throws \Exception
+     */
+    public function searchBlog(Request $request)
+    {
+        if (!config("binshopsblog.search.search_enabled")) {
+            throw new \Exception("Search is disabled");
+        }
+        $query = $request->get("s");
+        $search = new Search();
+        $search_results = $search->run($query);
+
+        \View::share("title", "Search results for " . e($query));
+
+        $rootList = BinshopsCategory::roots()->get();
+        BinshopsCategory::loadSiblingsWithList($rootList);
+
+        $language_id = $request->get('language_id');
+
+        return view("binshopsblog_admin::index", [
+            'search' => true,
+            'post_translations'=>$search_results,
+            'language_id' => $language_id
+        ]);
+    }
 }
diff --git a/src/Views/binshopsblog_admin/index.blade.php b/src/Views/binshopsblog_admin/index.blade.php
index 524ad2e..3ac0b45 100755
--- a/src/Views/binshopsblog_admin/index.blade.php
+++ b/src/Views/binshopsblog_admin/index.blade.php
@@ -1,10 +1,22 @@
 @extends("binshopsblog_admin::layouts.admin_layout")
 @section("content")
 
+    @if($post_translations)
+        <div class='search-form-outer mb-3'>
+            <form method='get' action='{{route("binshopsblog.admin.searchblog", app('request')->get('locale'))}}' class='text-center'>
+                <input style="display: inline-block; width: 50%" type='text' name='s' placeholder='Search...' class='form-control' value='{{\Request::get("s")}}'>
+                <input style="display: inline-block" type='submit' value='Search' class='btn btn-primary m-2'>
+            </form>
+        </div>
 
-    <h5>Admin - Manage Blog Posts</h5>
+        <h5>Manage Blog Posts</h5>
+    @endif
 
     @forelse($post_translations as $post)
+        @if(isset($post->indexable))
+            <?php $post = $post->indexable; ?>
+        @endif
+
         <div class="card m-4" style="">
             <div class="card-body">
                 <h5 class='card-title'><a class="a-link-cart-color" href='{{$post->url(app('request')->get('locale'))}}'>{{$post->title}}</a></h5>
@@ -91,11 +103,12 @@
             </div>
         </div>
     @empty
-        <div class='alert alert-warning'>No posts to show you. Why don't you add one?</div>
-    @endforelse
-
-    {{--    <div class='text-center'>--}}
-    {{--        {{$posts->appends( [] )->links()}}--}}
-    {{--    </div>--}}
+        @if(empty($search))
+            <h5>Manage Blog Posts</h5>
 
+            <div class='alert alert-warning'>No posts to show you. Why don't you add one?</div>
+        @else
+            <div class='alert alert-warning'>There were no results for this search!</div>
+        @endif
+    @endforelse
 @endsection
diff --git a/src/routes.php b/src/routes.php
index 1128de5..3d78ad5 100755
--- a/src/routes.php
+++ b/src/routes.php
@@ -50,6 +50,10 @@
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
     Route::group(['prefix' => config('binshopsblog.admin_prefix', 'blog_admin')], function () {
 
+        Route::get('/search',
+            'BinshopsAdminController@searchBlog')
+            ->name('binshopsblog.admin.searchblog');
+
         Route::get('/setup', 'BinshopsAdminSetupController@setup')
             ->name('binshopsblog.admin.setup');
 

From e4d9b532a42dadda6ce32699b98937aca72a05b1 Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Thu, 18 May 2023 04:36:41 -0400
Subject: [PATCH 114/118] readme update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c07333b..009eaf6 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ To see package on Packagist click this [Link](https://packagist.org/packages/bin
 ### Single Language Version
 To install the single language version of the package use version v8.1x:
 
-1- `composer require binshops/laravel-blog:v8.1.4`
+1- `composer require binshops/laravel-blog:v8.2.0`
 
 2- `php artisan vendor:publish --provider="BinshopsBlog\BinshopsBlogServiceProvider"`
 

From 5159f8a1ed0a51222fa562b19c706595ea24d23a Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Sun, 21 May 2023 03:01:15 -0400
Subject: [PATCH 115/118] fix: set posted_at field as date

---
 src/Models/BinshopsPost.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Models/BinshopsPost.php b/src/Models/BinshopsPost.php
index d2cd89d..ebebb77 100755
--- a/src/Models/BinshopsPost.php
+++ b/src/Models/BinshopsPost.php
@@ -16,6 +16,7 @@ class BinshopsPost extends Model
      */
     public $casts = [
         'is_published' => 'boolean',
+        'posted_at' => 'date'
     ];
 
     /**

From d2851b13144470c3585345443b45578220e56b12 Mon Sep 17 00:00:00 2001
From: Harm Jan <22013950+HarmJan1990@users.noreply.github.com>
Date: Tue, 30 May 2023 12:38:35 +0200
Subject: [PATCH 116/118] Update index.blade.php

Adding pagination to admin page.
---
 src/Views/binshopsblog_admin/index.blade.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Views/binshopsblog_admin/index.blade.php b/src/Views/binshopsblog_admin/index.blade.php
index 3ac0b45..6b8485c 100755
--- a/src/Views/binshopsblog_admin/index.blade.php
+++ b/src/Views/binshopsblog_admin/index.blade.php
@@ -111,4 +111,8 @@
             <div class='alert alert-warning'>There were no results for this search!</div>
         @endif
     @endforelse
+    
+    <div class='text-center'>
+        {{$posts->appends( [] )->links()}}
+    </div>
 @endsection

From e51ee691b7234b2927d4f28301207e70934a415f Mon Sep 17 00:00:00 2001
From: Sam Berry <sam@binshops.com>
Date: Wed, 31 May 2023 11:55:19 +0330
Subject: [PATCH 117/118] Revert "Merge pull request #103 from
 HarmJan1990/patch-1"

This reverts commit 0fe838e15f981015f425243aa368d2e32c352dd3.
---
 src/Views/binshopsblog_admin/index.blade.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Views/binshopsblog_admin/index.blade.php b/src/Views/binshopsblog_admin/index.blade.php
index 6b8485c..3ac0b45 100755
--- a/src/Views/binshopsblog_admin/index.blade.php
+++ b/src/Views/binshopsblog_admin/index.blade.php
@@ -111,8 +111,4 @@
             <div class='alert alert-warning'>There were no results for this search!</div>
         @endif
     @endforelse
-    
-    <div class='text-center'>
-        {{$posts->appends( [] )->links()}}
-    </div>
 @endsection

From 11c417d7bc6dcf6d319075699cf2bf6bc21ddc32 Mon Sep 17 00:00:00 2001
From: innhousepl <114243157+innhousepl@users.noreply.github.com>
Date: Tue, 4 Jul 2023 15:55:16 +0200
Subject: [PATCH 118/118] fix mistake: author not rendered in single post view

---
 src/Views/binshopsblog/partials/full_post_details.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/binshopsblog/partials/full_post_details.blade.php b/src/Views/binshopsblog/partials/full_post_details.blade.php
index e9b1485..cada8aa 100644
--- a/src/Views/binshopsblog/partials/full_post_details.blade.php
+++ b/src/Views/binshopsblog/partials/full_post_details.blade.php
@@ -25,5 +25,5 @@
 
 Posted <strong>{{$post->post->posted_at->diffForHumans()}}</strong>
 
-@includeWhen($post->author,"binshopsblog::partials.author",['post'=>$post])
+@includeWhen($post->post->author,"binshopsblog::partials.author",['post'=>$post->post])
 @includeWhen($categories,"binshopsblog::partials.categories",['categories'=>$categories])