Merge branch 'release/1.0.0'

weDevsOfficial · Dec 21, 2020 · 0c7eaec · 0c7eaec
2 parents b72d7f0 + 6171462
commit 0c7eaec
Show file tree

Hide file tree

Showing 170 changed files with 28,431 additions and 8,856 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 node_modules
 config.codekit
 build
+/.idea/
diff --git a/404.php b/404.php
@@ -2,7 +2,7 @@
 /**
  * The template for displaying 404 pages (Not Found).
  *
- * @package Dokanee
+ * @package dokani
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -11,83 +11,79 @@
 
 get_header(); ?>
 
-	<div id="primary" <?php dokanee_content_class(); ?>>
-		<main id="main" <?php dokanee_main_class(); ?>>
+	<div id="primary" class="content-area grid-parent grid-100">
+		<main id="main" <?php dokani_main_class(); ?>>
 			<?php
 			/**
-			 * dokanee_before_main_content hook.
+			 * dokani_before_main_content hook.
 			 *
-			 * @since 0.1
+			 * @since 1.0.0
 			 */
-			do_action( 'dokanee_before_main_content' );
+			do_action( 'dokani_before_main_content' );
 			?>
 
 			<div class="inside-article">
 
 				<?php
 				/**
-				 * dokanee_before_content hook.
+				 * dokani_before_content hook.
 				 *
-				 * @since 0.1
+				 * @since 1.0.0
 				 *
-				 * @hooked dokanee_featured_page_header_inside_single - 10
+				 * @hooked dokani_featured_page_header_inside_single - 10
 				 */
-				do_action( 'dokanee_before_content' );
+				do_action( 'dokani_before_content' );
 				?>
 
-				<header class="entry-header">
-					<h1 class="entry-title" itemprop="headline"><?php echo apply_filters( 'dokanee_404_title', __( 'Oops! That page can&rsquo;t be found.', 'dokanee' ) ); // WPCS: XSS OK. ?></h1>
-				</header><!-- .entry-header -->
-
 				<?php
 				/**
-				 * dokanee_after_entry_header hook.
+				 * dokani_after_entry_header hook.
 				 *
-				 * @since 0.1
+				 * @since 1.0.0
 				 *
-				 * @hooked dokanee_post_image - 10
+				 * @hooked dokani_post_image - 10
 				 */
-				do_action( 'dokanee_after_entry_header' );
+				do_action( 'dokani_after_entry_header' );
 				?>
 
-				<div class="entry-content" itemprop="text">
-					<?php
-					echo '<p>' . apply_filters( 'dokanee_404_text', __( 'It looks like nothing was found at this location. Maybe try searching?', 'dokanee' ) ) . '</p>'; // WPCS: XSS OK.
-
-					get_search_form();
-					?>
-				</div><!-- .entry-content -->
+                <div class="entry-content" itemprop="text">
+                    <img src="<?php echo esc_url( get_template_directory_uri() . '/assets/images/[email protected]' ); ?>" alt="<?php esc_attr_e( 'Not Found', 'dokani' ); ?>" class="not-found-thumb">
+                    <h2><?php esc_html_e( 'Page Not Found', 'dokani' ); ?></h2>
+                    <?php
+                    $text_404 = apply_filters( 'dokani_404_text', __( 'For Some Reason The Page You Requested Could Not Be Found On Our Server', 'dokani' ) );
+                    echo esc_html( $text_404 );
+                    get_search_form();
+                    ?>
+                </div><!-- .entry-content -->
 
 				<?php
 				/**
-				 * dokanee_after_content hook.
+				 * dokani_after_content hook.
 				 *
-				 * @since 0.1
+				 * @since 1.0.0
 				 */
-				do_action( 'dokanee_after_content' );
+				do_action( 'dokani_after_content' );
 				?>
 
 			</div><!-- .inside-article -->
 
 			<?php
 			/**
-			 * dokanee_after_main_content hook.
+			 * dokani_after_main_content hook.
 			 *
-			 * @since 0.1
+			 * @since 1.0.0
 			 */
-			do_action( 'dokanee_after_main_content' );
+			do_action( 'dokani_after_main_content' );
 			?>
 		</main><!-- #main -->
 	</div><!-- #primary -->
 
 	<?php
 	/**
-	 * dokanee_after_primary_content_area hook.
+	 * dokani_after_primary_content_area hook.
 	 *
-	 * @since 2.0
+	 * @since 1.0.0
 	 */
-	 do_action( 'dokanee_after_primary_content_area' );
-
-	 dokanee_construct_sidebars();
+	 do_action( 'dokani_after_primary_content_area' );
 
 get_footer();
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -36,13 +36,91 @@ module.exports = function(grunt) {
                 }
             }
         },
+
+        // Generate POT files.
+        makepot: {
+            target: {
+                options: {
+                    domainPath: '/languages/', // Where to save the POT file.
+                    potFilename: 'dokani.pot', // Name of the POT file.
+                    type: 'wp-theme', // Type of project (wp-plugin or wp-theme).
+                    potHeaders: {
+                        'report-msgid-bugs-to': 'https://wedevs.com/support/forum/theme-support',
+                        'language-team': 'LANGUAGE <EMAIL@ADDRESS>'
+                    }
+                }
+            }
+        },
+
+        // Clean up build directory
+        clean: {
+            main: ['build/']
+        },
+
+        // Copy the theme into the build directory
+        copy: {
+            main: {
+                src: [
+                    '**',
+                    '!node_modules/**',
+                    '!build/**',
+                    '!bin/**',
+                    '!.git/**',
+                    '!Gruntfile.js',
+                    '!package.json',
+                    '!debug.log',
+                    '!phpunit.xml',
+                    '!.gitignore',
+                    '!.gitmodules',
+                    '!npm-debug.log',
+                    '!assets/less/**',
+                    '!tests/**',
+                    '!**/Gruntfile.js',
+                    '!**/package.json',
+                    '!**/README.md',
+                    '!**/export.sh',
+                    '!**/*~'
+                ],
+                dest: 'build/'
+            }
+        },
+
+        //Compress build directory into <name>.zip and <name>-<version>.zip
+        compress: {
+            main: {
+                options: {
+                    mode: 'zip',
+                    archive: './build/_release/dokani-theme-v'+ pkg.version + '.zip'
+                },
+                expand: true,
+                cwd: 'build/',
+                src: ['**/*'],
+                dest: 'dokani'
+            }
+        },
     });
 
     // Load NPM tasks to be used here
+    grunt.loadNpmTasks( 'grunt-wp-i18n' );
+    grunt.loadNpmTasks( 'grunt-contrib-clean' );
+    grunt.loadNpmTasks( 'grunt-contrib-copy' );
+    grunt.loadNpmTasks( 'grunt-contrib-compress' );
     grunt.loadNpmTasks( 'grunt-contrib-less' );
     grunt.loadNpmTasks( 'grunt-contrib-watch' );
 
     grunt.registerTask( 'default', [
         'watch',
     ]);
+
+
+    grunt.registerTask('release', [
+        'makepot',
+        'less'
+    ]);
+
+    grunt.registerTask( 'zip', [
+        'clean',
+        'copy',
+        'compress'
+    ]);
 };
diff --git a/README.txt b/README.txt
@@ -0,0 +1,45 @@
+=== dokani ===
+Contributors: tareq1988, wedevs, nizamuddinbabu, sk.shaikat, mehidi258
+Tags: blog, e-commerce, grid-layout, three-columns, custom-colors, custom-menu, editor-style, featured-images, post-formats, theme-options, translation-ready
+Requires at least: 4.4
+Tested up to: 5.6
+WC requires at least: 3.0
+WC tested up to: 4.8
+Requires PHP: 5.6
+Stable tag: 1.0.0
+License: GPL-2.0-or-later
+License URI: https://www.gnu.org/licenses/license-list.html#GPLv2
+
+Our dokani theme is designed to show off the power of WooCommerce and Dokan.
+
+== Description ==
+
+Dokani is a lightweight, well-crafted, and modern-looking free WordPress theme. It’s a starter theme so that you can build any type of website like personal portfolio, blog, online shop or eCommerce Marketplace. Dokani works seamlessly with all popular drag and drop page builders like Elementor, Gutenberg, Beaver Builder, Visual Composer, SiteOrigin, Divi and others. Features include structured UI design, pre-made & fully customizable layouts, responsive, super-fast, SEO-friendly and has no dependency. You can extend the features installing other plugins as it works perfectly with almost all the WordPress plugins. The theme is WooCommerce and Dokan compatible. So, you can showcase your products more attractively with Dokani. Also, It’s compatible with all the multivendor marketplace builder plugins out there for WooCommerce. Searching for an interactive smart looking theme design? Go grab Dokani now. Our dedicated team is always here with 24/7 free support, well-documentation and video tutorials.
+
+== Installation ==
+
+1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button.
+2. Type 'dokani' in the search form and press the 'Enter' key on your keyboard.
+3. Click on the 'Activate' button to use your new theme right away.
+4. Navigate to Appearance > Customize in your admin panel and customize to taste.
+
+== Copyright ==
+
+This theme, like WordPress, is licensed under the GPL.
+Use it to make something cool, have fun, and share what you've learned with others.
+
+Dokani is based on Underscores https://underscores.me/, (C) 2012-2020 Automattic, Inc.
+
+FontAwesome License: SIL OFL 1.1 - http://scripts.sil.org/OFL
+Images License: GNU General Public License v2 or later
+FlexSlider License: GNU General Public License v2 or later
+
+Dokani serves fonts via the hosted Google Fonts service. Dokani does not share any data with Google directly.
+To the best of our knowledge, Google doesn’t track nor share end user data.
+Privacy Policy for the Google Fonts API: https://developers.google.com/fonts/faq#what_does_using_the_google_fonts_api_mean_for_the_privacy_of_my_users
+
+== Changelog ==
+
+= 1.0.0 - 21 December 2020 =
+* Initial release
+
diff --git a/archive.php b/archive.php
@@ -2,7 +2,7 @@
 /**
  * The template for displaying Archive pages.
  *
- * @package Dokanee
+ * @package dokani
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -11,26 +11,26 @@
 
 get_header(); ?>
 
-	<div id="primary" <?php dokanee_content_class(); ?>>
-		<main id="main" <?php dokanee_main_class(); ?>>
+	<div id="primary" <?php dokani_content_class(); ?>>
+		<main id="main" <?php dokani_main_class(); ?>>
 			<?php
 			/**
-			 * dokanee_before_main_content hook.
+			 * dokani_before_main_content hook.
 			 *
-			 * @since 0.1
+			 * @since 1.0.0
 			 */
-			do_action( 'dokanee_before_main_content' );
+			do_action( 'dokani_before_main_content' );
 
 			if ( have_posts() ) :
 
 				/**
-				 * dokanee_archive_title hook.
+				 * dokani_archive_title hook.
 				 *
-				 * @since 0.1
+				 * @since 1.0.0
 				 *
-				 * @hooked dokanee_archive_title - 10
+				 * @hooked dokani_archive_title - 10
 				 */
-				do_action( 'dokanee_archive_title' );
+				do_action( 'dokani_archive_title' );
 
 				while ( have_posts() ) : the_post();
 
@@ -43,7 +43,7 @@
 
 				endwhile;
 
-				dokanee_content_nav( 'nav-below' );
+				dokani_content_nav( 'nav-below' );
 
 			else :
 
@@ -52,23 +52,23 @@
 			endif;
 
 			/**
-			 * dokanee_after_main_content hook.
+			 * dokani_after_main_content hook.
 			 *
-			 * @since 0.1
+			 * @since 1.0.0
 			 */
-			do_action( 'dokanee_after_main_content' );
+			do_action( 'dokani_after_main_content' );
 			?>
 		</main><!-- #main -->
 	</div><!-- #primary -->
 
 	<?php
 	/**
-	 * dokanee_after_primary_content_area hook.
+	 * dokani_after_primary_content_area hook.
 	 *
-	 * @since 2.0
+	 * @since 1.0.0
 	 */
-	 do_action( 'dokanee_after_primary_content_area' );
+	 do_action( 'dokani_after_primary_content_area' );
 
-	 dokanee_construct_sidebars();
+	 dokani_construct_sidebars();
 
 get_footer();
diff --git a/assets/css/admin/customize-controls.css b/assets/css/admin/customize-controls.css
@@ -0,0 +1,11 @@
+.in-sub-panel #customize-theme-controls .customize-pane-child.current-panel-parent,
+#customize-theme-controls .customize-pane-child.current-section-parent {
+    -webkit-transform: translateX(-100%);
+    -ms-transform: translateX(-100%);
+    transform: translateX(-100%);
+}
+
+#accordion-panel-dokani_footer_panel,
+#accordion-panel-dokani_blog_panel {
+    margin-bottom: 15px;
+}