Added new page

alexandrdrvn · alexandrdrvn · commit 98fd082bd5d0 · 2019-08-08T14:00:23.000+03:00
diff --git a/controllers/front/graphql.php b/controllers/front/graphql.php
@@ -10,9 +10,6 @@
  * @version   0.1.0
  */
 
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-
 require_once dirname(__FILE__) . '/../../system/startup.php';
 
 /**
@@ -24,9 +21,31 @@ class VuefrontGraphqlModuleFrontController extends ModuleFrontController
     private $codename = "vuefront";
     private $route = "vuefront";
 
+    public function setMedia()
+    {
+        parent::setMedia();
+        $this->context->controller->registerStylesheet(
+            'modules-vuefront-front-css',
+            'modules/vuefront/views/css/front.css',
+            array('media' => 'all', 'priority' => 200)
+        );
+    }
+
     public function initContent()
     {
         parent::initContent();
+        if ($_SERVER['HTTP_ACCEPT']) {
+            $accepts = explode(',', $_SERVER['HTTP_ACCEPT']);
+            if (in_array('text/html', $accepts)) {
+                $this->context->smarty->assign(array(
+                    'hello' => 'Hello World!!!'
+                ));
+
+                $this->setTemplate('module:vuefront/views/templates/front/d_vuefront.tpl');
+                return;
+            }
+        }
+
         start($this->context);
     }
 }
diff --git a/resolver/startup/startup.php b/resolver/startup/startup.php
@@ -17,27 +17,32 @@ class ResolverStartupStartup extends Resolver
 {
     public function index()
     {
+
         if (Tools::getValue('cors')) {
-            if (! empty($_SERVER['HTTP_ORIGIN'])) {
+            if (!empty($_SERVER['HTTP_ORIGIN'])) {
                 header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
             } else {
                 header('Access-Control-Allow-Origin: *');
             }
             header('Access-Control-Allow-Methods: POST, OPTIONS');
             header('Access-Control-Allow-Credentials: true');
-            header('Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With, '.
-            'If-Modified-Since,Cache-Control,Content-Type,Range,Token,token,Cookie,cookie,content-type');
+            header('Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With, ' .
+                'If-Modified-Since,Cache-Control,Content-Type,Range,Token,token,Cookie,cookie,content-type');
         }
 
         $this->load->model('startup/startup');
-        
+
         try {
             $resolvers = $this->model_startup_startup->getResolvers();
-            $schema = BuildSchema::build(Tools::file_get_contents(DIR_PLUGIN.'schema.graphql'));
+            $schema = BuildSchema::build(Tools::file_get_contents(DIR_PLUGIN . 'schema.graphql'));
             $rawInput = Tools::file_get_contents('php://input');
             $input = json_decode($rawInput, true);
             $query = $input['query'];
 
+            if(empty($query)) {
+                die('Query missing.');
+            }
+
             $variableValues = isset($input['variables']) ? $input['variables'] : null;
             $result = GraphQL::executeQuery($schema, $query, $resolvers, null, $variableValues);
         } catch (\Exception $e) {
@@ -47,7 +52,7 @@ public function index()
                 ]
             ];
         }
-    
+
         die(json_encode($result));
     }
 }
diff --git a/views/css/front.css b/views/css/front.css
@@ -0,0 +1,32 @@
+.module-content {
+    padding: 60px 0;
+    text-align: center;
+    margin: auto 0;
+}
+.module-container {
+    height: 100%;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+}
+
+.mb-1 {
+    margin-bottom: 15px;
+}
+
+.mb-2 {
+    margin-bottom: 25px;
+}
+
+.module-content__title {
+}
+
+.module-content__image img {
+    width: 300px;
+}
diff --git a/views/templates/front/d_vuefront.tpl b/views/templates/front/d_vuefront.tpl
@@ -8,5 +8,23 @@
  * @license   MIT
  * @version   0.1.0
  *}
+<!doctype html>
+<html lang="{$language.iso_code}">
+<head>
+    {block name='head'}
+        {include file='_partials/head.tpl'}
+    {/block}
+</head>
+<body id="{$page.page_name}" class="{$page.body_classes|classnames}">
+<div class="container module-container">
+    <div class="module-content">
+        <div class="text-center module-content__image">
+            <img src="modules/vuefront/views/img/logo.png"/>
+        </div>
+        <div class="module-content__title mb-2">{l s='You have Succefully installed Vuefront on Prestashop ' mod='vuefront'}</div>
 
-{$vuefront|escape:'htmlall':'UTF-8'}
+        <a href="https://vuefront.com/guide/setup.html" target="blank" class="btn btn-primary">Continue</a>
+    </div>
+</div>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -17,27 +17,32 @@ class ResolverStartupStartup extends Resolver`
`17`	`17`	`{`
`18`	`18`	`public function index()`
`19`	`19`	`{`
	`20`	`+`
`20`	`21`	`if (Tools::getValue('cors')) {`
`21`		`- if (! empty($_SERVER['HTTP_ORIGIN'])) {`
	`22`	`+ if (!empty($_SERVER['HTTP_ORIGIN'])) {`
`22`	`23`	`header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);`
`23`	`24`	`} else {`
`24`	`25`	`header('Access-Control-Allow-Origin: *');`
`25`	`26`	`}`
`26`	`27`	`header('Access-Control-Allow-Methods: POST, OPTIONS');`
`27`	`28`	`header('Access-Control-Allow-Credentials: true');`
`28`		`- header('Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With, '.`
`29`		`- 'If-Modified-Since,Cache-Control,Content-Type,Range,Token,token,Cookie,cookie,content-type');`
	`29`	`+ header('Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With, ' .`
	`30`	`+ 'If-Modified-Since,Cache-Control,Content-Type,Range,Token,token,Cookie,cookie,content-type');`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`$this->load->model('startup/startup');`
`33`		`-`
	`34`	`+`
`34`	`35`	`try {`
`35`	`36`	`$resolvers = $this->model_startup_startup->getResolvers();`
`36`		`- $schema = BuildSchema::build(Tools::file_get_contents(DIR_PLUGIN.'schema.graphql'));`
	`37`	`+ $schema = BuildSchema::build(Tools::file_get_contents(DIR_PLUGIN . 'schema.graphql'));`
`37`	`38`	`$rawInput = Tools::file_get_contents('php://input');`
`38`	`39`	`$input = json_decode($rawInput, true);`
`39`	`40`	`$query = $input['query'];`
`40`	`41`
	`42`	`+ if(empty($query)) {`
	`43`	`+ die('Query missing.');`
	`44`	`+ }`
	`45`	`+`
`41`	`46`	`$variableValues = isset($input['variables']) ? $input['variables'] : null;`
`42`	`47`	`$result = GraphQL::executeQuery($schema, $query, $resolvers, null, $variableValues);`
`43`	`48`	`} catch (\Exception $e) {`
`@@ -47,7 +52,7 @@ public function index()`
`47`	`52`	`]`
`48`	`53`	`];`
`49`	`54`	`}`
`50`		`-`
	`55`	`+`
`51`	`56`	`die(json_encode($result));`
`52`	`57`	`}`
`53`	`58`	`}`