feat: add new API

Author: alexandrdrvn

.DS_Store

@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.editorconfig

@@ -26,13 +26,16 @@ public function setMedia()
         parent::setMedia();
         $this->context->controller->registerStylesheet(
             'modules-vuefront-front-css',
+            'modules/vuefront/views/css/graphiql.css',
             'modules/vuefront/views/css/index.css',
             array('media' => 'all', 'priority' => 200)
         );
 
         $this->context->controller->registerJavascript(
             'modules-vuefront-front-js',
-            'modules/vuefront/views/js/middleware.js',
+            'modules/vuefront/views/js/react.production.min.js',
+            'modules/vuefront/views/js/react-dom.production.min.js',
+            'modules/vuefront/views/js/graphiql.js',
             array('position' => 'head', 'priority' => 0)
         );
     }

controllers/front/graphql.php

@@ -23,6 +23,7 @@
     "home": "common/home/get",
 
     "updateApp": "common/home/updateApp",
+    "updateSite": "common/home/updateSite",
 
     "searchUrl": "common/home/searchUrl",
 
@@ -57,6 +58,7 @@
     "addToCart": "store/cart/add",
     "updateCart": "store/cart/update",
     "removeCart": "store/cart/remove",
+    "clearCart": "store/cart/clear",
 
     "category": "store/category/get",
     "categoriesList": "store/category/getList",
@@ -83,5 +85,7 @@
     "removeWishlist": "store/wishlist/remove",
 
     "contactSend": "common/contact/send",
-    "contact": "common/contact/get"
+    "contact": "common/contact/get",
+
+    "version": "common/home/version"
 }

mapping.json

@@ -12,6 +12,36 @@
 
 class ModelCommonCustomer extends Model
 {
+    public function updateCustomerData($id, $data)
+    {
+        $sql = new DbQuery();
+        $sql->select('*');
+        $sql->from('vuefront_customer', 'v');
+        $sql->where('id_customer = \''.$id.'\'');
+
+        $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+        if (!$result) {
+            Db::getInstance(_PS_USE_SQL_SLAVE_)->execute('INSERT INTO `' . _DB_PREFIX_ . 'vuefront_customer` SET id_customer = \''.$id.'\', phone = \''.$data['phone'].'\'');
+        } else {
+            DB::getInstance(_PS_USE_SQL_SLAVE_)->execute('UPDATE `'._DB_PREFIX_.'vuefront_customer` SET phone = \''.$data['phone'].'\' WHERE id_customer = \''.$id.'\'');
+        }
+    }
+    public function getCustomerData($id)
+    {
+        $sql = new DbQuery();
+        $sql->select('*');
+        $sql->from('vuefront_customer', 'v');
+        $sql->where('id_customer = \''.$id.'\'');
+        $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
+
+        if (!$result || count($result) === 0) {
+            return [
+                'phone' => ''
+            ];
+        }
+
+        return $result[0];
+    }
     public function getCustomers($data = array())
     {
         $sort = '';

model/common/customer.php

@@ -42,7 +42,6 @@ public function editApp($name, $appSetting)
 
     public function checkAccess()
     {
-
         $option = Configuration::get('vuefront-settings');
 
         $setting = array();

model/common/vuefront.php

@@ -56,11 +56,13 @@ public function getCustomer($args)
     {
         $this->load->model('common/customer');
         $customer_info =  $this->get($args['id']);
+
         return array(
             'id'        => $customer_info['id'],
             'firstName' => $customer_info['firstName'],
             'lastName'  => $customer_info['lastName'],
             'email'     => $customer_info['email'],
+            'phone'     => $customer_info['phone']
         );
     }
 
@@ -135,15 +137,21 @@ public function register($args)
         $customer->firstname = $customerData['firstName'];
         $customer->lastname = $customerData['lastName'];
         $customer->email = $customerData['email'];
-        
+
         if (_PS_VERSION_ > '1.7.0.0') {
             $crypto = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Crypto\\Hashing');
             $customer->passwd = $crypto->hash($customerData['password']);
         } else {
             $customer->passwd = Tools::encrypt($customerData['password']);
         }
-       
+
         $customer->save();
+
+        $this->load->model('common/customer');
+
+        $this->model_common_customer->updateCustomerData($customer->id, [
+            'phone' => $args['phone']
+        ]);
         $this->load->model('common/vuefront');
         $this->model_common_vuefront->pushEvent('create_customer', array(
             'customer_id' => $customer->id,
@@ -162,6 +170,12 @@ public function edit($args)
         $this->context->customer->firstname = $customerData['firstName'];
         $this->context->customer->lastname = $customerData['lastName'];
 
+        $this->load->model('common/customer');
+
+        $this->model_common_customer->updateCustomerData($this->context->cookie->id_customer, [
+            'phone' => $customerData['phone']
+        ]);
+
         if (!$this->context->customer->save()) {
             throw new Exception("Update failed");
         }
@@ -190,18 +204,23 @@ public function get($user_id)
     {
         $customer = new Customer($user_id);
 
+        $this->load->model('common/customer');
+
+        $customerData = $this->model_common_customer->getCustomerData($customer->id);
+
         return array(
             'id' => $customer->id,
             'email' => $customer->email,
             'firstName' => $customer->firstname,
-            'lastName' => $customer->lastname
+            'lastName' => $customer->lastname,
+            'phone'   => $customerData['phone']
         );
     }
 
     public function isLogged()
     {
         $customer = array();
-        
+
         if ($this->context->cookie->isLogged()) {
             $customer = $this->get($this->context->cookie->id_customer);
         }
@@ -241,7 +260,7 @@ public function address($args)
     public function addressList()
     {
         $address = array();
-        
+
         $result = $this->context->customer->getAddresses($this->context->cookie->id_lang);
 
         foreach ($result as $value) {

resolver/common/account.php

@@ -43,6 +43,49 @@ public function updateApp($args)
         return $this->model_common_vuefront->getApp($args['name']);
     }
 
+    public function updateSite($args)
+    {
+        try {
+            $tmpFile = tempnam(sys_get_temp_dir(), 'TMP_');
+            rename($tmpFile, $tmpFile .= '.tar');
+            $ch = curl_init();
+
+            curl_setopt($ch, CURLOPT_HEADER, 0);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_URL, "https://vuefront2019.s3.amazonaws.com/sites/".$args['number']."/vuefront-app.tar");
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 150);
+            curl_setopt($ch, CURLOPT_TIMEOUT, 60);
+
+            $data = curl_exec($ch);
+            curl_close($ch);
+            file_put_contents($tmpFile, $data);
+            $this->removeDir(_PS_ROOT_DIR_ . '/vuefront');
+            $phar = new PharData($tmpFile);
+            $phar->extractTo(_PS_ROOT_DIR_ . '/vuefront');
+            return true;
+        } catch (\Exception $e) {
+            echo $e->getMessage();
+        }
+        return false;
+    }
+
+    private function removeDir($dir)
+    {
+        if (is_dir($dir)) {
+            $objects = scandir($dir);
+            foreach ($objects as $object) {
+                if ($object != "." && $object != "..") {
+                    if (is_dir($dir . "/" . $object) && !is_link($dir . "/" . $object)) {
+                        $this->removeDir($dir . "/" . $object);
+                    } else {
+                        unlink($dir . "/" . $object);
+                    }
+                }
+            }
+            rmdir($dir);
+        }
+    }
+
     public function authProxy($args)
     {
         $this->load->model('common/vuefront');
@@ -63,4 +106,9 @@ public function authProxy($args)
 
         return $result['token'];
     }
+
+    public function version($args)
+    {
+        return '1.0.0';
+    }
 }

resolver/common/home.php

@@ -17,7 +17,6 @@ class ResolverStartupStartup extends Resolver
 {
     public function index()
     {
-
         if (Tools::getValue('cors')) {
             if (!empty($_SERVER['HTTP_ORIGIN'])) {
                 header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
@@ -26,7 +25,7 @@ public function index()
             }
             header('Access-Control-Allow-Methods: POST, OPTIONS');
             header('Access-Control-Allow-Credentials: true');
-            header('Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With, ' .
+            header('Access-Control-Allow-Headers: Authorization, DNT,User-Agent,X-Requested-With, ' .
                 'If-Modified-Since,Cache-Control,Content-Type,Range,Token,token,Cookie,cookie,content-type');
         }
 

resolver/startup/startup.php

@@ -267,4 +267,12 @@ public static function getIdProductAttributeByIdAttributes($idProduct, $idAttrib
 
         return $idProductAttribute;
     }
+    public function clear($args)
+    {
+        $products = $this->context->cart->getProducts();
+        foreach ($products as $product) {
+            $this->context->cart->deleteProduct($product["id_product"]);
+        }
+        return $this->get($args);
+    }
 }

resolver/store/cart.php

@@ -91,12 +91,14 @@ type Customer {
   firstName: String
   lastName: String
   email: String
+  phone: String
 }
 
 input CustomerInput {
   firstName: String
   lastName: String
   email: String
+  phone: String
   password: String
 }
 
@@ -484,6 +486,7 @@ type RootQueryType {
   manufacturerList(page: Int = 1, size: Int = 10, search: String = "", sort: String = "name", order: String = "ASC"): ManufacturerResult
   manufacturer(id: String): Manufacturer
   authProxy(app: String): String
+  version: String
 }
 
 type RootMutationType {
@@ -500,6 +503,7 @@ type RootMutationType {
   addToCart(id: String, quantity: Int = 1, options: [CartOption] = []): Cart
   updateCart(key: String, quantity: Int = 1): Cart
   removeCart(key: String): Cart
+  clearCart: Cart
   addToCompare(id: Int): [Product]
   removeCompare(id: String): [Product]
   editCurrency(code: String): [Currency]

schema.graphql

@@ -48,4 +48,5 @@ type RootQueryType {
 }
 type RootMutationType {
    updateApp(name: String, settings: InputAppSetting): AppSetting
+   updateSite(number: Int): Boolean
 }