From ca52947203b30ba3a67ca37eebec66fe66bde085 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Sun, 10 May 2020 01:12:00 +0300
Subject: [PATCH] Updated config files

---
 app/config/environments.php         | 29 +++++++++++++++++++++++++++++
 app/init.php                        |  1 +
 app/views/console/tasks/index.phtml | 12 ++++++------
 app/workers/functions.php           | 21 +++++++++++----------
 4 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 app/config/environments.php

diff --git a/app/config/environments.php b/app/config/environments.php
new file mode 100644
index 0000000000..fd9f9b77a4
--- /dev/null
+++ b/app/config/environments.php
@@ -0,0 +1,29 @@
+<?php
+
+return [
+    [
+        'name' => 'Node.js 14',
+        'image' => 'node:14',
+        'logo' => 'node.png',
+    ],
+    [
+        'name' => 'PHP 7.4',
+        'image' => 'php:7.4-cli',
+        'logo' => 'php.png',
+    ],
+    [
+        'name' => 'Ruby 2.7',
+        'image' => 'ruby:2.7',
+        'logo' => 'ruby.png',
+    ],
+    [
+        'name' => 'Dart 2.8',
+        'image' => 'google/dart:2.8',
+        'logo' => 'dart.png',
+    ],
+    [
+        'name' => 'Python 3.8',
+        'image' => 'python:3.8',
+        'logo' => 'python.png',
+    ],
+];
\ No newline at end of file
diff --git a/app/init.php b/app/init.php
index 91952cc33e..d5a6247891 100644
--- a/app/init.php
+++ b/app/init.php
@@ -57,6 +57,7 @@ Config::load('providers', __DIR__.'/../app/config/providers.php');
 Config::load('platforms', __DIR__.'/../app/config/platforms.php');
 Config::load('locales', __DIR__.'/../app/config/locales.php');
 Config::load('collections', __DIR__.'/../app/config/collections.php');
+Config::load('environments', __DIR__.'/../app/config/environments.php');
 
 Config::setParam('env', $request->getServer('_APP_ENV', App::ENV_TYPE_PRODUCTION));
 Config::setParam('domain', $request->getServer('HTTP_HOST', ''));
diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml
index b6d267343f..1ca2da718a 100644
--- a/app/views/console/tasks/index.phtml
+++ b/app/views/console/tasks/index.phtml
@@ -45,7 +45,7 @@
                             </span>
                         </div>
 
-                        <a data-ls-attrs="href={{task.httpUrl}}" data-ls-bind="{{task.httpUrl}}" target="_blank" class="text-one-liner"></a>
+                        <a data-ls-attrs="href={{task.httpUrl}}" data-ls-bind="{{task.httpUrl}}" target="_blank" class="text-one-liner text-size-small"></a>
                     </td>
                     <td data-title="" style="vertical-align: middle">
                         <span data-ls-if="'play' === {{task.status}}">
@@ -63,9 +63,9 @@
                         <span data-ls-if="undefined !== {{task.previous}}">
                             <span data-ls-bind="Prev: {{task.previous|date-time}}"></span>
 
-                            <span data-ls-if="undefined !== {{task.delay}} && 59 < {{task.delay}}" class="text-danger margin-top-tiny">
+                            <!-- <span data-ls-if="undefined !== {{task.delay}} && 59 < {{task.delay}}" class="text-danger margin-top-tiny">
                                 <small data-ls-bind="({{task.delay|ms2hum}} Delay)"></small>
-                            </span>
+                            </span> -->
                         </span>
                         <small data-ls-if="undefined === {{task.previous}}" class="text-size-small">
                             None.
@@ -100,7 +100,7 @@
                                 <label data-ls-attrs="for=status-{{task.$id}}" class="margin-bottom">Status
                                     <div class="margin-top-small">
                                         <input name="status" type="radio" checked="checked" required data-ls-bind="{{task.status}}" value="play" /> &nbsp; <span>Play</span> &nbsp;
-                                        <input name="status" type="radio" required data-ls-bind="{{task.status}}" value="pause" /> &nbsp; <span>Pause</span>
+                                        <input name="status" type="radio" required data-ls-bind="{{task.status}}" value="pause" /> &nbsp; <span>Pause</span> &nbsp;
                                     </div>
                                 </label>
 
@@ -258,8 +258,8 @@
 
                 <label data-ls-attrs="for=status" class="margin-bottom">Status
                     <div class="margin-top-small">
-                        <input name="status" type="radio" value="play" checked="checked" required /> &nbsp; <span>Play</span>
-                        <input name="status" type="radio" value="pause" required /> &nbsp; <span>Pause</span>
+                        <input name="status" type="radio" value="play" checked="checked" required /> &nbsp; <span>Play</span> &nbsp;
+                        <input name="status" type="radio" value="pause" required /> &nbsp; <span>Pause</span> &nbsp;
                     </div>
                 </label>
 
diff --git a/app/workers/functions.php b/app/workers/functions.php
index dd0554c49f..cbdefea10b 100644
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@@ -1,9 +1,9 @@
 <?php
 
+use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Appwrite\Database\Database;
 use Appwrite\Database\Validator\Authorization;
-use Utopia\CLI\Console;
 
 require_once __DIR__.'/../init.php';
 
@@ -11,19 +11,20 @@ cli_set_process_title('Functions V1 Worker');
 
 Console::success(APP_NAME.' functions worker v1 has started');
 
-$envs = [
-    'node:14',
-    'php:7.4-cli',
-    'sdaskdjaksdjaksjda',
-];
+$environments = Config::getParam('environments');
 
-foreach($envs as $env) {
+foreach($environments as $environment) {
     $stdout = '';
     $stderr = '';
-    Console::execute('docker pull '.$env, null, $stdout, $stderr);
+    Console::execute('docker pull '.$environment['image'], null, $stdout, $stderr);
 
-    var_dump($stdout);
-    var_dump($stderr);
+    if(!empty($stdout)) {
+        Console::success($stdout);
+    }
+
+    if(!empty($stderr)) {
+        Console::error($stderr);
+    }
 }
 
 class FunctionsV1