up

.gitignore

@@ -2,10 +2,7 @@
 /includes/lib
 /.fleet
 /.idea
-<<<<<<< HEAD
 /.vscode
-=======
->>>>>>> ea8ce5d (Cleanups)
 /storage/logs/*.log
 /app/.DS_Store
 /composer.lock

README.md

@@ -1,61 +1,37 @@
-
-<<<<<<< HEAD
-# FestingerVault - WordPress Plugin
-=======
-# FestingerVault 
->>>>>>> ea8ce5d (Cleanups)
+# Festinger Vault - Access to 25K+ Themes and Plugins directly from your dashboard
 
 [![GitHub license](https://img.shields.io/github/license/FestingerVault/festingervault)](https://github.com/FestingerVault/festingervault/blob/main/LICENSE)
 [![GitHub issues](https://img.shields.io/github/issues/FestingerVault/festingervault)](https://github.com/FestingerVault/festingervault/issues)
 [![GitHub stars](https://img.shields.io/github/stars/FestingerVault/festingervault)](https://github.com/FestingerVault/festingervault/stargazers)
 [![Crowdin](https://badges.crowdin.net/festinger-vault/localized.svg)](https://crowdin.com)
 
-<<<<<<< HEAD
-Imagine going to Themeforest, buying a theme, and logging out. Now, you come to Festinger's, where we offer you 25K+ premium themes and plugins directly available from your WordPress dashboard.
-=======
-Imagine going to Theme Forest, buying a theme, and logging out. Now, you come to Festinger's, where we offer you 25K+ premium themes and plugins directly available from your dashboard.
->>>>>>> ea8ce5d (Cleanups)
-
+Imagine going to the forest of themes, buying a theme, and logging out. Now, you come to Festinger's, where we offer 25K+ premium themes and plugins directly from your dashboard.
 
 ## Installation
 
-<<<<<<< HEAD
-### From WordPress Dashboard
-
-1. Download the plugin zip file from the [Release Branch](https://github.com/FestingerVault/festingervault/tree/beta-release) page.
-2. Go to your WordPress Dashboard > Plugins > Add New.
-=======
-### From Dashboard
+### From your Dashboard
 
 1. Download the plugin zip file from the [Release Branch](https://github.com/FestingerVault/festingervault/tree/beta-release) page.
 2. Go to your Dashboard > Plugins > Add New.
->>>>>>> ea8ce5d (Cleanups)
 3. Click on "Upload Plugin" and select the downloaded zip file.
 4. Install and activate the plugin.
 
 ### From GitHub
 
-1. Clone the repository to your WordPress plugins directory:
+1. Clone the repository to your plugins directory:
     ```bash
     git clone https://github.com/FestingerVault/festingervault.git wp-content/plugins/festingervault
     ```
 2. Run `npm install` to install node packages
 3. Run `composer install` to install composer packages
 4. Run `npm run build` or `npm start`
-5. Go to your WordPress Dashboard > Plugins.
+5. Go to your Dashboard > Plugins.
 6. Find "FestingerVault" in the list and click "Activate."
 
 ## Contributing
 
 We welcome contributions! Please read our [Contributing Guidelines](CONTRIBUTING.md) to get started.
 
-<<<<<<< HEAD
-<a href="https://github.com/FestingerVault/festingervault/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=FestingerVault/festingervault" />
-</a>
-
-=======
->>>>>>> ea8ce5d (Cleanups)
 ## Support
 
 If you encounter any issues or have any questions, feel free to open an issue in this repository.

festingervault.php

@@ -2,13 +2,8 @@
 /*
  * Plugin Name: FestingerVault
  * Plugin URI: https://festingervault.com
-<<<<<<< HEAD
- * Description: Imagine going to Themeforest, buying a theme, and logging out. Now, you come to Festinger's, where we offer you 25K+ premium themes and plugins directly available from your WordPress dashboard.
- * Version: 1727158719178
-=======
  * Description: Imagine going to the forest of themes, buying a theme, and logging out. Now, you come to Festinger's, where we offer 25K+ premium themes and plugins directly from your dashboard.
- * Version: 1727704586345
->>>>>>> ea8ce5d (Cleanups)
+ * Version: 1727158719178
  * Requires at Least: 6.0
  * Requires PHP: 7.4
  * Author: FestingerVault

includes/src/Admin.php

@@ -3,7 +3,6 @@
 
 class Admin
 {
-<<<<<<< HEAD
 	/**
 	 * @var mixed
 	 */
@@ -21,12 +20,6 @@ class Admin
 	 * @var mixed
 	 *
 	 */
-=======
-	private static $instance = null;
-
-	private $page = null;
-
->>>>>>> ea8ce5d (Cleanups)
 	function __construct()
 	{
 		add_action('admin_menu', [$this, 'admin_menu'], PHP_INT_MAX);
@@ -52,12 +45,9 @@ function added_dependencies($dependencies = [])
 		]);
 	}
 
-<<<<<<< HEAD
 	/**
 	 * @param $screen
 	 */
-=======
->>>>>>> ea8ce5d (Cleanups)
 	function admin_enqueue_scripts($screen)
 	{
 		if ($screen == $this->page) {

includes/src/AutoUpdate.php

@@ -12,11 +12,7 @@
 class AutoUpdate
 {
 	/**
-<<<<<<< HEAD
 	 * @var	static $instance
-=======
-	 * @var static $instance
->>>>>>> ea8ce5d (Cleanups)
 	 */
 	private static $instance = null;
 
@@ -108,13 +104,9 @@ function cleanup()
 			);
 		}
 	}
-<<<<<<< HEAD
 	/**
 	 * @return self
 	 */
-=======
-
->>>>>>> ea8ce5d (Cleanups)
 	public static function get_instance()
 	{
 		if (is_null(self::$instance)) {

includes/src/Helper.php

@@ -31,12 +31,6 @@ public static function engine_post(string $path, $data = [], $cache = false)
 				'body' => $content_body,
 			]
 		);
-<<<<<<< HEAD
-=======
-		/**
-		 * @var array
-		 */
->>>>>>> ea8ce5d (Cleanups)
 		$body = json_decode(wp_remote_retrieve_body($result), true);
 		if (
 			is_wp_error($result) ||
@@ -45,11 +39,7 @@ public static function engine_post(string $path, $data = [], $cache = false)
 		) {
 			return new WP_Error(
 				400,
-<<<<<<< HEAD
 				$body['message'] ?? __('Something went wrong')
-=======
-				$body['message'] ?? __('Something went wrong', 'festingervault')
->>>>>>> ea8ce5d (Cleanups)
 			);
 		}
 		return $body;

includes/src/Installer.php

@@ -2,17 +2,10 @@
 
 namespace FestingerVault;
 
-<<<<<<< HEAD
 use WP_Error;
 use Theme_Upgrader;
 use Plugin_Upgrader;
 use WP_Ajax_Upgrader_Skin;
-=======
-use Plugin_Upgrader;
-use Theme_Upgrader;
-use WP_Ajax_Upgrader_Skin;
-use WP_Error;
->>>>>>> ea8ce5d (Cleanups)
 
 class Installer
 {

includes/src/api/Announcement.php

@@ -4,10 +4,6 @@
 
 use WP_Error;
 use WP_REST_Request;
-<<<<<<< HEAD
-=======
-use WP_REST_Response;
->>>>>>> ea8ce5d (Cleanups)
 
 class Announcement extends ApiBase
 {
@@ -20,26 +16,14 @@ public function endpoints()
 			],
 		];
 	}
-<<<<<<< HEAD
 
-=======
-	/**
-	 * Get latest announcements
-	 * @param WP_REST_Request $request
-	 * @return WP_REST_Response|WP_Error
-	 */
->>>>>>> ea8ce5d (Cleanups)
 	public function latest(WP_REST_Request $request)
 	{
 		$url = 'https://meta.festingervault.com/c/announcements/11.json';
 		$key = 'fv_meta_topics';
 		$cached = get_transient($key);
 		if ($cached) {
-<<<<<<< HEAD
 			return $cached;
-=======
-			return rest_ensure_response($cached);
->>>>>>> ea8ce5d (Cleanups)
 		}
 		$request = wp_remote_get($url);
 		if (!is_wp_error($request)) {

includes/src/api/Collection.php

@@ -8,7 +8,6 @@ class Collection extends ApiBase
 {
 	function list_collection(\WP_REST_Request $request)
 	{
-<<<<<<< HEAD
 		return Helper::engine_post('collection/list', [
 			'page' => $request->get_param('page'),
 		]);
@@ -35,62 +34,18 @@ function collection_delete(\WP_REST_Request $request)
 	function add_collection(\WP_REST_Request $request)
 	{
 		return Helper::engine_post('collection/add', [
-=======
-		$result = Helper::engine_post('collection/list', [
-			'page' => $request->get_param('page'),
-		]);
-		return rest_ensure_response($result);
-	}
-	function list_items(\WP_REST_Request $request)
-	{
-		$result = Helper::engine_post('collection/items', [
-			'id' => $request->get_param('id'),
-			'page' => $request->get_param('page'),
-		]);
-		return rest_ensure_response($result);
-	}
-	function collection_detail(\WP_REST_Request $request)
-	{
-		$result = Helper::engine_post('collection/detail', [
-			'id' => $request->get_param('id'),
-		]);
-		return rest_ensure_response($result);
-	}
-	function collection_delete(\WP_REST_Request $request)
-	{
-		$result = Helper::engine_post('collection/delete', [
-			'id' => $request->get_param('id'),
-		]);
-		return rest_ensure_response($result);
-	}
-	function add_collection(\WP_REST_Request $request)
-	{
-		$result = Helper::engine_post('collection/add', [
->>>>>>> ea8ce5d (Cleanups)
 			'id' => $request->get_param('id'),
 			'public' => $request->get_param('public'),
 			'title' => $request->get_param('title'),
 			'summary' => $request->get_param('summary'),
 		]);
-<<<<<<< HEAD
 	}
 	function add_item(\WP_REST_Request $request)
 	{
 		return Helper::engine_post('collection/item/add', [
 			'group_id' => $request->get_param('cid'),
 			'item_id' => $request->get_param('id'),
 		]);
-=======
-		return rest_ensure_response($result);
-	}
-	function add_item(\WP_REST_Request $request)
-	{
-		$result = Helper::engine_post('collection/item/add', [
-			'group_id' => $request->get_param('cid'),
-			'item_id' => $request->get_param('id'),
-		]);
-		return rest_ensure_response($result);
->>>>>>> ea8ce5d (Cleanups)
 	}
 
 	public function endpoints()

includes/src/api/History.php

@@ -3,39 +3,20 @@
 namespace FestingerVault\api;
 
 use FestingerVault\Helper;
-<<<<<<< HEAD
 use WP_REST_Request;
-=======
-use WP_Error;
-use WP_REST_Request;
-use WP_REST_Response;
->>>>>>> ea8ce5d (Cleanups)
 
 class History extends ApiBase
 {
 	/**
-<<<<<<< HEAD
 	 * @param WP_REST_Request $request
 	 * @return mixed
-=======
-	 * Summary of list
-	 * @param WP_REST_Request $request
-	 * @return WP_Error|WP_REST_Response
->>>>>>> ea8ce5d (Cleanups)
 	 */
 	public function list(WP_REST_Request $request)
 	{
 		$page = $request->get_param('page');
-<<<<<<< HEAD
 		return Helper::engine_post('history/list', [
 			'page' => $page,
 		]);
-=======
-		$result = Helper::engine_post('history/list', [
-			'page' => $page,
-		]);
-		return rest_ensure_response($result);
->>>>>>> ea8ce5d (Cleanups)
 	}
 
 	public function endpoints()