appwrite · eldadfux · Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,8 @@
 - Added option to delete team from the console
 - Added option to view team members from the console
 - Added option to join a user to any team from the console
+- Added support for Brotli compression
+- UI performance & accessibility improvments
 
 ## Bug Fixes
 

diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ ENV TZ=Asia/Tel_Aviv \
 
 RUN \
   apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests ca-certificates software-properties-common wget curl git openssl && \
+  apt-get install -y --no-install-recommends --no-install-suggests ca-certificates software-properties-common wget git openssl && \
   LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php && \
   apt-get update && \
   apt-get install -y --no-install-recommends --no-install-suggests make php$PHP_VERSION php$PHP_VERSION-dev zip unzip php$PHP_VERSION-zip && \
@@ -23,7 +23,13 @@ RUN \
   ./configure && \
   make && \
   # Composer
-  curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer
+  wget https://getcomposer.org/composer.phar && \
+  chmod +x ./composer.phar && \
+  mv ./composer.phar /usr/bin/composer && \
+  #Brotli
+  cd / && \
+  git clone https://github.com/eustas/ngx_brotli.git && \
+  cd ngx_brotli && git submodule update --init && cd ..
 
 WORKDIR /usr/local/src/
 
@@ -75,31 +81,50 @@ ENV TZ=Asia/Tel_Aviv \
 #ENV _APP_SMTP_PASSWORD ''
 
 COPY --from=builder /phpredis-5.2.1/modules/redis.so /usr/lib/php/20190902/
+COPY --from=builder /phpredis-5.2.1/modules/redis.so /usr/lib/php/20190902/
+COPY --from=builder /ngx_brotli /ngx_brotli
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN \
   apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests wget curl ca-certificates software-properties-common openssl gnupg && \
+  apt-get install -y --no-install-recommends --no-install-suggests wget ca-certificates software-properties-common build-essential libpcre3-dev zlib1g-dev libssl-dev openssl gnupg htop supervisor && \
   LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php && \
   add-apt-repository universe && \
   add-apt-repository ppa:certbot/certbot && \
   apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests htop supervisor php$PHP_VERSION php$PHP_VERSION-fpm \
+  apt-get install -y --no-install-recommends --no-install-suggests php$PHP_VERSION php$PHP_VERSION-fpm \
   php$PHP_VERSION-mysqlnd php$PHP_VERSION-curl php$PHP_VERSION-imagick php$PHP_VERSION-mbstring php$PHP_VERSION-dom webp certbot && \
   # Nginx
-  echo "deb http://nginx.org/packages/mainline/ubuntu/ bionic nginx" >> /etc/apt/sources.list.d/nginx.list && \
-  wget -q http://nginx.org/keys/nginx_signing.key && \
-  apt-key add nginx_signing.key && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests nginx && \
+  wget http://nginx.org/download/nginx-1.19.0.tar.gz && \
+  tar -xzvf nginx-1.19.0.tar.gz && rm nginx-1.19.0.tar.gz && \
+  cd nginx-1.19.0 && \
+  ./configure --prefix=/usr/share/nginx \
+    --sbin-path=/usr/sbin/nginx \
+    --modules-path=/usr/lib/nginx/modules \
+    --conf-path=/etc/nginx/nginx.conf \
+    --error-log-path=/var/log/nginx/error.log \
+    --http-log-path=/var/log/nginx/access.log \
+    --pid-path=/run/nginx.pid \
+    --lock-path=/var/lock/nginx.lock \
+    --user=www-data \
+    --group=www-data \
+    --build=Ubuntu \
+    --with-http_gzip_static_module \
+    --with-http_ssl_module \
+    --with-http_v2_module \
+    --add-module=/ngx_brotli && \
+  make && \
+  make install && \
+  rm -rf ../nginx-1.19.0 && \
   # Redis Extension
   echo extension=redis.so >> /etc/php/$PHP_VERSION/fpm/conf.d/redis.ini && \
   echo extension=redis.so >> /etc/php/$PHP_VERSION/cli/conf.d/redis.ini && \
   # Cleanup
   cd ../ && \
-  apt-get purge -y --auto-remove software-properties-common gnupg curl && \
+  apt-get purge -y --auto-remove wget software-properties-common build-essential libpcre3-dev zlib1g-dev libssl-dev gnupg && \
   apt-get clean && \
+  rm -rf /ngx_brotli && \
   rm -rf /var/lib/apt/lists/*
 
 # Set Upload Limit (default to 100MB)

diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
@@ -14,6 +14,7 @@
 
 $utopia->init(function () use ($layout) {
     $layout
+        ->setParam('description', 'Appwrite Console allows you to easily manage, monitor, and control your entire backend API and tools.')
         ->setParam('analytics', 'UA-26264668-5')
     ;
 });

diff --git a/app/views/console/comps/footer.phtml b/app/views/console/comps/footer.phtml
@@ -9,21 +9,21 @@ $version = $this->getParam('version', '').'.'.APP_CACHE_BUSTER;
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="GitHub Link"
-                href="https://github.com/appwrite/appwrite" target="_blank"><i class="icon-github-circled"></i> GitHub</a>
+                href="https://github.com/appwrite/appwrite" target="_blank" rel="noopener"><i class="icon-github-circled"></i> GitHub</a>
         </li>
         <li>
             <a
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="New GitHub Issue"
-                href="https://github.com/appwrite/appwrite/issues/new?body=%0A%0A%0A---%0AAppwrite Version:%20<?php echo $version; ?>" target="_blank">Open an Issue</a>
+                href="https://github.com/appwrite/appwrite/issues/new?body=%0A%0A%0A---%0AAppwrite Version:%20<?php echo $version; ?>" target="_blank" rel="noopener">Open an Issue</a>
         </li>
         <li>
             <a
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="Docs Link"
-                href="<?php echo $home; ?>/docs" target="_blank">Docs</a>
+                href="<?php echo $home; ?>/docs" target="_blank" rel="noopener">Docs</a>
         </li>
         <li>
             v:<?php echo $version; ?>

diff --git a/app/views/console/comps/header.phtml b/app/views/console/comps/header.phtml
@@ -42,7 +42,7 @@
             <span class="name pull-end desktops-only" data-ls-bind="{{account.name}}"></span>
         </div>
 
-        <div class="console-index drop-list bottom end" data-ls-ui-open="" data-button-text="" data-button-icon="" data-button-selector="[data-toggler]" data-button-class="account-button" data-blur="1" tabindex="1">
+        <div class="console-index drop-list bottom end" data-ls-ui-open="" data-button-text="" data-button-aria="Account Options" data-button-icon="" data-button-selector="[data-toggler]" data-button-class="account-button" data-blur="1">
             <ul class="margin-top-large arrow-end">
                 <li>
                     <a href="/console/account" class="link-animation-disabled"><i class="icon-user"></i> &nbsp; Your Account</a>
@@ -65,15 +65,15 @@
 
     </div>
 
-    <nav class="project-only" data-ls-ui-open="" data-button-class="round icon-btn phones-only tablets-only" data-button-icon="icon-dot-3">
+    <nav class="project-only" data-ls-ui-open="" data-button-class="round icon-btn phones-only tablets-only" data-button-aria="Navigation" data-button-icon="icon-dot-3">
         <a class="logo link-animation-disabled" href="/console"
             data-analytics-event="click"
             data-analytics-category="console/navigation"
             data-analytics-label="Logo Link">
-            <img src="/images/appwrite-nav.svg" alt="Appwrite Logo" class="nav" />
+            <img src="/images/appwrite-nav.svg" loading="lazy" alt="Appwrite Logo" class="nav" />
 
-            <img src="/images/appwrite.svg" alt="Appwrite Light Logo" class="top force-light" />
-            <img src="/images/appwrite-footer-dark.svg" alt="Appwrite Dark Logo" class="top force-dark" />
+            <img src="/images/appwrite.svg" loading="lazy" alt="Appwrite Light Logo" class="top force-light" />
+            <img src="/images/appwrite-footer-dark.svg" loading="lazy" alt="Appwrite Dark Logo" class="top force-dark" />
         </a>
 
         <div data-ui-highlight class="container">

diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
@@ -301,17 +301,17 @@ $rules = $collection->getAttribute('rules', []);
 
                                 <button type="button" data-ls-ui-trigger="add-rule" class="reverse margin-top"><i class="icon-plus"></i>Add</button>
 
-                                <div class="toggle margin-bottom margin-top" data-ls-ui-open>
+                                <div class="toggle margin-bottom margin-top" data-ls-ui-open data-button-aria="Open Permissions">
                                     <i class="icon-plus pull-end margin-top-tiny"></i>
                                     <i class="icon-minus pull-end margin-top-tiny"></i>
 
                                     <h3 class="margin-bottom-large">Permissions</h3>
 
-                                    <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank">Learn more</a>)</span></label>
+                                    <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</span></label>
                                     <input type="hidden" id="collection-read" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{project-collection.$permissions.read}}" placeholder="User ID, Team ID or Role" />
                                     <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
 
-                                    <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank">Learn more</a>)</label>
+                                    <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
                                     <input type="hidden" id="collection-write" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{project-collection.$permissions.write}}" placeholder="User ID, Team ID or Role" />
                                     <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
                                 </div>

diff --git a/app/views/console/database/document.phtml b/app/views/console/database/document.phtml
@@ -246,17 +246,17 @@ $collections = [];
                                     echo $comp->render();
                                     ?>
 
-                                    <div class="toggle margin-bottom" data-ls-ui-open>
+                                    <div class="toggle margin-bottom" data-ls-ui-open data-button-aria="Open Permissions">
                                         <i class="icon-plus pull-end margin-top-tiny"></i>
                                         <i class="icon-minus pull-end margin-top-tiny"></i>
 
                                         <h3 class="margin-bottom-large">Permissions</h3>
 
-                                        <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank">Learn more</a>)</span></label>
+                                        <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</span></label>
                                         <input type="hidden" id="collection-read" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{project-document.$permissions.read}}" placeholder="User ID, Team ID or Role" />
                                         <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
 
-                                        <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank">Learn more</a>)</label>
+                                        <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
                                         <input type="hidden" id="collection-write" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{project-document.$permissions.write}}" placeholder="User ID, Team ID or Role" />
                                         <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
                                     </div>

diff --git a/app/views/console/database/rules/array.phtml b/app/views/console/database/rules/array.phtml
@@ -20,7 +20,7 @@ if($type === 'document') {
 
 <ul data-ls-loop="<?php echo $this->escape($namespace); ?>" data-ls-as="node" class="sortable numbers">
     <li data-forms-move-up  data-forms-move-down>
-        <div class="drop-list bottom end settings" data-ls-ui-open="" data-button-text="" data-button-icon="icon-cog" data-button-selector="[data-toggler]" data-button-class="round dark small margin-bottom-small margin-top-tiny pull-end" data-blur="1" tabindex="1">
+        <div class="drop-list bottom end settings" data-ls-ui-open="" data-button-text="" data-button-icon="icon-cog" data-button-aria="Options" data-button-selector="[data-toggler]" data-button-class="round dark small margin-bottom-small margin-top-tiny pull-end" data-blur="1">
             <ul class="arrow-end margin-top margin-end-negative-small">
                 <li data-move-up>
                     <button type="button" class="link"><i class="icon-up-dir"></i> Move Up</button>
@@ -41,7 +41,7 @@ if($type === 'document') {
 </ul>
 
 <?php if(!empty($list) && $type === 'document'): ?>
-    <div class="drop-list" data-ls-ui-open="" data-button-text="Add" data-button-icon="" data-button-selector="[data-toggler]" data-button-class="reverse margin-bottom-small" data-blur="1" tabindex="1">
+    <div class="drop-list" data-ls-ui-open="" data-button-text="Add" data-button-aria="Add" data-button-icon="" data-button-selector="[data-toggler]" data-button-class="reverse margin-bottom-small" data-blur="1">
         <ul>
             <?php foreach($list as $item):
                 $name = (isset($collections[$item])) ? $collections[$item]->getAttribute('name', '') : '';

diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
@@ -157,22 +157,22 @@ $graph = $this->getParam('graph', false);
         <a data-ls-attrs="href=/console/keys?project={{router.params.project}}">Manage Your Server API Keys</a>
     </div>
 
-    <div class="drop-list pull-start" data-ls-ui-open="" data-button-text="Add Platform" data-button-class="button" data-blur="1" tabindex="1">
+    <div class="drop-list pull-start" data-ls-ui-open="" data-button-aria="Choose Platform" data-button-text="Add Platform" data-button-class="button" data-blur="1">
         <ul>
             <li>
-                <div class="link web-new"><img src="/images/clients/web.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Web Platform Logo" class="avatar xxs margin-end-small" /> New Web App</div>
+                <div class="link web-new"><img src="/images/clients/web.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Web Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Web App</div>
             </li>
             <li>
-                <div class="link flutter-new"><img src="/images/clients/flutter.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Flutter Platform Logo" class="avatar xxs margin-end-small" /> New Flutter App &nbsp;<span class="text-size-tiny">(beta)</span></div>
+                <div class="link flutter-new"><img src="/images/clients/flutter.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Flutter Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Flutter App &nbsp;<span class="text-size-tiny">(beta)</span></div>
             </li>
             <li class="disabled">
-                <div class="link ios-new"><img src="/images/clients/ios.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="iOS Platform Logo" class="avatar xxs margin-end-small" /> New iOS App</div>
+                <div class="link ios-new"><img src="/images/clients/ios.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="iOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New iOS App</div>
             </li>
             <li class="disabled">
-                <div class="link android-new"><img src="/images/clients/android.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Android Platform Logo" class="avatar xxs margin-end-small" /> New Android App</div>
+                <div class="link android-new"><img src="/images/clients/android.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Android Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Android App</div>
             </li>
             <li class="disabled">
-                <div class="link unity-new"><img src="/images/clients/unity.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Unity Platform Logo" class="avatar xxs margin-end-small" /> New Unity Game</div>
+                <div class="link unity-new"><img src="/images/clients/unity.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Unity Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Unity Game</div>
             </li>
         </ul>
     </div>
@@ -209,7 +209,7 @@ $graph = $this->getParam('graph', false);
         <div class="info margin-top margin-bottom">
             <div class="text-bold margin-bottom-small">Next Steps</div>
 
-            <p>After adding your new website, install our JS SDK to integrate with your code and read our <a data-ls-attrs="href={{env.HOME}}/docs/getting-started-for-web" target="_blank">getting started</a> tutorial.</p>
+            <p>After adding your new website, install our JS SDK to integrate with your code and read our <a data-ls-attrs="href={{env.HOME}}/docs/getting-started-for-web" target="_blank" rel="noopener">getting started</a> tutorial.</p>
 
             <div class="margin-bottom-no ide" data-lang="bash" data-lang-label="bash">
                 <pre class="line-numbers"><code class="prism language-bash" data-prism>npm install appwrite</code></pre>

diff --git a/app/views/console/index.phtml b/app/views/console/index.phtml
@@ -9,9 +9,8 @@ $home = $this->getParam('home', '');
         <p class="margin-bottom margin-top-negative-small">Take advantage of the Appwrite APIs and tools.</p>
 
         <ul class="margin-bottom-xl clear">
-            <li class="pull-start margin-end margin-bottom-small"><a href="<?php echo $home; ?>/" target="_blank"><i class="icon-lamp"></i> &nbsp;Learn more</a></li>
-            <li class="pull-start margin-end margin-bottom-small"><a href="<?php echo $home; ?>/docs" target="_blank"><i class="icon-book-open"></i> &nbsp;Docs</a></li>
-            <li class="pull-start margin-end margin-bottom-small"><a href="<?php echo $home; ?>/support" target="_blank"><i class="icon-lifebuoy"></i> &nbsp;Support</a></li>
+            <li class="pull-start margin-end margin-bottom-small"><a href="<?php echo $home; ?>/docs" target="_blank" rel="noopener"><i class="icon-book-open"></i> &nbsp;Docs</a></li>
+            <li class="pull-start margin-end margin-bottom-small"><a href="<?php echo $home; ?>/support" target="_blank" rel="noopener"><i class="icon-lifebuoy"></i> &nbsp;Support</a></li>
         </ul>
     </div>
 </div>
@@ -65,7 +64,7 @@ $home = $this->getParam('home', '');
 
     <div class="row responsive">
         <div class="col span-6 margin-bottom">
-            <div class="box line">
+            <div class="box line community">
                 <h3 class="margin-bottom-small text-size-normal">Join The Community</h3>
 
                 <p class="text-fade">Join Appwrite growing developers community channels.</p>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     $utopia->init(function () use ($layout) {
         $layout
+            ->setParam('description', 'Appwrite Console allows you to easily manage, monitor, and control your entire backend API and tools.')
             ->setParam('analytics', 'UA-26264668-5')
         ;
     });
@@ Expand Down @@