From ffc8cb9accddc188323d00d25dd67f7120878d59 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Thu, 26 Sep 2019 19:42:12 +0300 Subject: [PATCH 01/15] Removed unused constants --- app/init.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/init.php b/app/init.php index ab53340976..fb23c9bdf1 100644 --- a/app/init.php +++ b/app/init.php @@ -22,15 +22,7 @@ const APP_NAME = 'Appwrite'; const APP_DOMAIN = 'appwrite.io'; const APP_EMAIL_TEAM = 'team@' . APP_DOMAIN; const APP_EMAIL_SECURITY = 'security@' . APP_DOMAIN; -const APP_EMAIL_NEWSLETTER = 'newsletter@' . APP_DOMAIN; const APP_USERAGENT = APP_NAME . '-Server/%s Please report abuse at ' . APP_EMAIL_SECURITY; -const APP_SOCIAL_TWITTER = 'https://twitter.com/appwrite_io'; -const APP_SOCIAL_TWITTER_HANDLE = 'appwrite_io'; -const APP_SOCIAL_FACEBOOK = 'https://www.facebook.com/appwrite.io'; -const APP_SOCIAL_LINKEDIN = 'https://www.linkedin.com/company/appwrite'; -const APP_SOCIAL_INSTAGRAM = 'https://www.instagram.com/appwrite.io'; -const APP_SOCIAL_GITHUB = 'https://github.com/appwrite'; -const APP_SOCIAL_DISCORD = 'https://discord.gg/GSeTUeA'; const APP_MODE_ADMIN = 'admin'; const APP_LOCALES = ['en', 'he']; const APP_PAGING_LIMIT = 15; From ee62af9b1f49288b0d476e66574152eac9d5806f Mon Sep 17 00:00:00 2001 From: eldadfux Date: Thu, 26 Sep 2019 21:47:48 +0300 Subject: [PATCH 02/15] Deprecated UI translations --- app/config/locale/en.php | 233 ----------------------- app/config/locale/he.php | 4 + app/controllers/console.php | 22 +-- app/controllers/home.php | 14 +- app/controllers/shared/web.php | 7 +- app/views/console/account/index.phtml | 80 ++++---- app/views/console/database/index.phtml | 2 +- app/views/console/keys/index.phtml | 2 +- app/views/console/settings/index.phtml | 38 ++-- app/views/console/storage/index.phtml | 2 +- app/views/console/tasks/index.phtml | 2 +- app/views/console/users/view.phtml | 20 +- app/views/console/webhooks/index.phtml | 2 +- app/views/home/auth/confirm.phtml | 8 +- app/views/home/auth/join.phtml | 19 +- app/views/home/auth/recovery.phtml | 14 +- app/views/home/auth/recovery/reset.phtml | 18 +- app/views/home/auth/signin.phtml | 16 +- app/views/home/auth/signup.phtml | 20 +- app/views/layouts/default.phtml | 4 +- 20 files changed, 148 insertions(+), 379 deletions(-) diff --git a/app/config/locale/en.php b/app/config/locale/en.php index 6500cf225d..6cca5b0f49 100644 --- a/app/config/locale/en.php +++ b/app/config/locale/en.php @@ -6,240 +6,7 @@ return [ 'settings.direction' => 'ltr', // General - 'general.description' => 'Appwrite cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you grow your business in a fast and secure way.', 'general.loading' => 'Loading...', - 'general.next' => 'Next', - 'general.back' => 'Back', - 'general.optional' => 'optional', - 'general.learn-more-about' => 'Learn more about your', - 'general.confirm.alert' => 'Please confirm your account by clicking the verification link sent to your email', - 'general.confirm.resend' => 'send again', - 'general.confirm.resend.success' => 'Confirmation mail sent successfully', - 'general.confirm.resend.failure' => 'Confirmation mail failed to send. Please try again later', - - 'general.roles.owner' => 'Owner', - 'general.roles.developer' => 'Developer', - 'general.roles.admin' => 'Admin', - - 'general.alerts.cookie' => 'We are using cookies to make this website easier to use.', - 'general.alerts.learn' => 'Learn More', - - 'navigation.home' => 'Home', - 'navigation.features' => 'Features', - 'navigation.pricing' => 'Pricing', - 'navigation.signup' => 'Sign Up', - 'navigation.signin' => 'Sign In', - 'navigation.console' => 'Console', - - 'footer.blog' => 'Blog', - 'footer.about' => 'About', - 'footer.security' => 'Security', - 'footer.status' => 'Status', - 'footer.support' => 'Support', - 'footer.contact' => 'Contact', - 'footer.twitter' => 'on Twitter', - 'footer.facebook' => 'on Facebook', - 'footer.instagram' => 'on Instagram', - 'footer.linkedin' => 'on LinkedIn', - 'footer.copyright' => 'Copyright', - 'footer.terms' => 'Terms', - 'footer.privacy' => 'Privacy', - 'footer.cookies' => 'Cookies', - - 'home.press.title' => 'Press Kit', - 'home.press.subtitle' => 'For media inquires and more information, email us at team@appwrite.io', - 'home.press.title.logos' => 'Logos', - 'home.press.title.colors' => 'Brand Colors', - 'home.press.title.photos' => 'Product Photos', - - 'home.cookies.title' => 'Cookies', - 'home.cookies.paragraph-1' => 'When someone visits '.APP_NAME.', we collect standard internet log information and details of visitor behaviour patterns. We do this to find out things such as the number of visitors to the various parts of the site. We collect this information in a way which does not personally identify anyone.', - 'home.cookies.paragraph-2' => 'Most web browsers allow some control of most cookies through the browser settings. To find out more about cookies, including how to see what cookies have been set and how to manage and delete them, visit', - 'home.cookies.set' => 'Cookies set by '.APP_NAME, - 'home.cookies.cell.name' => 'Name', - 'home.cookies.cell.description' => 'Description', - 'home.cookies.cell.duration' => 'Duration', - 'home.cookies.more' => 'Read More', - 'home.cookies.months' => 'months', - 'home.cookies.days' => 'days', - 'home.cookies.hours' => 'hours', - 'home.cookies.minutes' => 'minutes', - 'home.cookies.description1' => 'Keeps your website session alive.', - 'home.cookies.description2' => 'Google Analytics cookie, used to distinguish users.', - 'home.cookies.description3' => 'Google Analytics cookie, used to distinguish users.', - 'home.cookies.description4' => 'Google Analytics cookie, Used to throttle request rate.', - 'home.cookies.description5' => 'Google Analytics cookie, Contains campaign related information for the user.', - 'home.cookies.description6' => 'Google cookie, Contains information that changes the way the site behaves or looks, such as your preferred language or the region you are in.', - 'home.cookies.description7' => 'System user interface preferred language.', - - 'home.contact.title' => 'Contact Us', - 'home.contact.subtitle' => 'We’d love your input: questions, feature requests, bugs or compliments', - 'home.contact.form.name' => 'Name', - 'home.contact.form.email' => 'Email', - 'home.contact.form.subject' => 'Subject', - 'home.contact.form.message' => 'Message', - 'home.contact.form.submit' => 'Submit', - 'home.contact.form.social' => 'Social Networks', - 'home.contact.form.company' => 'Company Name', - 'home.contact.form.size' => 'Company Size', - 'home.contact.thanks.title' => 'Thank You!', - 'home.contact.thanks.subtitle' => 'Your message has been sent successfully. We appreciate your feedback, our team will try to get back to you as soon as possible!', - 'home.contact.thanks.back' => 'Back to Homepage', - - 'home.support.title' => 'Support', - 'home.support.healthy' => 'Service is healthy.', - 'home.support.unhealthy' => 'We are experiencing some service disruption.', - 'home.support.view' => 'View Status', - 'home.support.uptime' => 'uptime in last 24h', - 'home.support.updated' => 'Last updated at', - 'home.support.powered' => 'Powered by', - - // Auth - Signin - 'home.auth.signin.title' => 'Sign In', - 'home.auth.signin.regular.title' => 'Login using email and password', - 'home.auth.signin.oauth.title' => 'Login using your favorite OAuth provider', - 'home.auth.signin.oauth.facebook' => 'Sign in with Facebook', - 'home.auth.signin.oauth.linkedin' => 'Sign in with LinkedIn', - 'home.auth.signin.oauth.github' => 'Sign in with GitHub', - 'home.auth.signin.labels.email' => 'Email', - 'home.auth.signin.labels.password' => 'Password', - 'home.auth.signin.labels.password.validation' => 'Six or more characters', - 'home.auth.signin.labels.action1' => 'Sign In', - 'home.auth.signin.labels.action2' => 'Forgot password?', - 'home.auth.signin.labels.action3' => 'Sign up now', - 'home.auth.signin.labels.or' => 'or don\'t have an account?', - 'home.auth.signin.failure' => 'Login failed. Please check your credentials.', - - // Auth - Signup - 'home.auth.signup.title' => 'Sign Up', - 'home.auth.signup.required' => 'All fields are required', - 'home.auth.signup.labels.name' => 'Name', - 'home.auth.signup.labels.email' => 'Email', - 'home.auth.signup.labels.password' => 'Password', - 'home.auth.signup.labels.password.validation' => 'Six or more characters', - 'home.auth.signup.labels.agree' => 'By signing up, you agree to the', - 'home.auth.signup.labels.and' => ' and ', - 'home.auth.signup.labels.terms' => 'Terms and Conditions', - 'home.auth.signup.labels.privacy' => 'Privacy Policy', - 'home.auth.signup.labels.action' => 'Sign Up', - 'home.auth.signup.failure' => 'Registration Failed. Please try again later', - - // Auth - Recovery - 'home.auth.recovery.title' => 'Password Recovery', - 'home.auth.recovery.required' => 'All fields are required', - 'home.auth.recovery.labels.email' => 'Email', - 'home.auth.recovery.action' => 'Recover', - 'home.auth.recovery.back' => 'Back to sign in', - 'home.auth.recovery.success' => 'We have sent you a mail with a password reset link', - 'home.auth.recovery.failure' => 'Password recovery failed', - - // Auth - Reset - 'home.auth.reset.title' => 'Password Reset', - 'home.auth.reset.required' => 'All fields are required', - 'home.auth.reset.labels.passwordA' => 'Password', - 'home.auth.reset.labels.passwordB' => 'Password Again', - 'home.auth.reset.labels.password.validation' => 'Six or more characters', - 'home.auth.reset.action' => 'Apply', - 'home.auth.reset.success' => 'Password Reset Completed', - 'home.auth.reset.failure' => 'Password Reset Failed', - - // Auth - Confirm - 'home.auth.confirm.title' => 'Account Confirmation in Progress', - 'home.auth.confirm.subtitle' => 'Please wait a few seconds while your account is verified.', - 'home.auth.confirm.success' => 'Confirmation Completed Successfully', - 'home.auth.confirm.failure' => 'Confirmation Failed', - - // Auth - Join - 'home.auth.join.title' => 'Invitation', - 'home.auth.join.subtitle' => 'You have been invited to join %s team on '.APP_NAME, - 'home.auth.join.success' => 'Joined Team Successfully', - 'home.auth.join.failure' => 'Failed to join team. Please try again later', - 'home.auth.join.agree' => 'By accepting the invitation, you agree to the %s and %s.', - 'home.auth.join.terms' => 'Terms and Conditions', - 'home.auth.join.privacy' => 'Privacy Policy', - 'home.auth.join.accept' => 'Accept', - 'home.auth.join.cancel' => 'Cancel', - - 'console.title' => 'Console', - - // Console - Account - 'console.account.title' => 'Account', - 'console.account.section.overview.title' => 'Overview', - 'console.account.section.overview.labels.name' => 'Name', - 'console.account.section.overview.labels.email' => 'Email', - 'console.account.section.overview.labels.password' => 'Password', - 'console.account.section.overview.labels.password1' => 'Current Password', - 'console.account.section.overview.labels.password2' => 'New Password', - 'console.account.section.overview.labels.localization' => 'Localization', - 'console.account.section.overview.labels.language' => 'Language', - 'console.account.section.overview.labels.timezone' => 'Timezone', - 'console.account.section.overview.actions.update-name' => 'Update Name', - 'console.account.section.overview.actions.update-email' => 'Update Email', - 'console.account.section.overview.actions.update-password' => 'Update Password', - 'console.account.section.overview.actions.update-avatar' => 'Upload', - 'console.account.section.overview.actions.update-avatar-via' => 'via', - 'console.account.section.overview.actions.update' => 'Update', - 'console.account.section.overview.actions.cancel' => 'Cancel', - 'console.account.section.overview.actions.logout' => 'Logout', - 'console.account.section.overview.danger.title' => 'Danger Zone', - 'console.account.section.overview.danger.subtitle' => 'This is the area where you can delete your account.', - 'console.account.section.overview.danger.disclaimer' => 'By deleting your account you will lose access to any of your teams and shared data.', - 'console.account.section.overview.danger.note' => 'PLEASE NOTICE: Account deletion is irreversible.', - 'console.account.section.overview.danger.action' => 'Delete Account', - - 'console.account.section.security.title' => 'Security', - 'console.account.section.security.devices.title' => 'Devices and Sessions', - 'console.account.section.security.devices.logout' => 'Logout', - 'console.account.section.security.devices.logout.failure' => 'Logout from Session Failed', - 'console.account.section.security.devices.logout-all' => 'Logout from all devices', - 'console.account.section.security.devices.logout-all.failure' => 'Logout from All Sessions Failed', - 'console.account.section.security.devices.current' => 'Current Session', - 'console.account.section.security.devices.unknown' => 'Unknown Location', - - 'console.account.section.security.recent-activity.title' => 'Recent Activity', - 'console.account.section.security.recent-activity.date' => 'Date', - 'console.account.section.security.recent-activity.event' => 'Event', - 'console.account.section.security.recent-activity.client' => 'Client', - 'console.account.section.security.recent-activity.location' => 'Location', - 'console.account.section.security.recent-activity.ip' => 'IP', - - 'console.notifications.title' => 'Notifications', - - 'console.settings.title' => 'Settings', - 'console.settings.section.overview.title' => 'Overview', - 'console.settings.section.keys.title' => 'API Keys', - 'console.settings.section.webhooks.title' => 'Webhooks', - 'console.settings.section.tasks.title' => 'Tasks', - 'console.settings.section.members.title' => 'Members', - 'console.settings.section.members.labels.leave' => 'Leave', - 'console.settings.section.members.labels.resend' => 'Resend', - 'console.settings.section.members.labels.pending' => 'Pending Approval', - 'console.settings.section.members.labels.invite' => 'Invite Member', - 'console.settings.section.members.labels.send' => 'Send Invite', - 'console.settings.section.members.labels.cancel' => 'Cancel', - 'console.settings.section.members.labels.name' => 'Name', - 'console.settings.section.members.labels.email' => 'Email', - 'console.settings.section.members.labels.role' => 'Role', - 'console.settings.section.members.invite.success' => 'Invitation Sent Successfully', - 'console.settings.section.members.invite.failure' => 'Failed to Send Invite', - 'console.settings.section.members.leave.success' => 'Member Removed Successfully', - 'console.settings.section.members.leave.failure' => 'Failed to Remove Member', - - 'console.home.title' => 'Console', - - 'console.database.title' => 'Database', - - 'console.storage.title' => 'Storage', - - 'console.users.title' => 'Users', - 'console.users.section.users.title' => 'Users', - 'console.users.section.teams.title' => 'Teams', - 'console.users.section.providers.title' => 'Providers', - 'console.users.section.templates.title' => 'Templates', - - 'console.webhooks.title' => 'Webhooks', - 'console.keys.title' => 'API Keys', - 'console.tasks.title' => 'Tasks', // Service - Users 'auth.emails.team' => '%s Team', diff --git a/app/config/locale/he.php b/app/config/locale/he.php index d5ef84991a..33ac3beaa7 100644 --- a/app/config/locale/he.php +++ b/app/config/locale/he.php @@ -1,9 +1,13 @@ '"The art of being wise is the art of knowing what to overlook."', 'settings.locale' => 'he', 'settings.direction' => 'rtl', + // General + 'general.loading' => 'Loading...', + // Service - Users 'auth.emails.team' => 'צוות %s', 'auth.emails.confirm.title' => 'אימות חשבון', diff --git a/app/controllers/console.php b/app/controllers/console.php index 4c7f6f4fc2..222ec917c6 100644 --- a/app/controllers/console.php +++ b/app/controllers/console.php @@ -66,7 +66,7 @@ $utopia->get('/console') ; $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.title')) + ->setParam('title', APP_NAME.' - Console') ->setParam('body', $page); }); @@ -83,7 +83,7 @@ $utopia->get('/console/account') ; $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.account.title')) + ->setParam('title', 'Account - ' . APP_NAME) ->setParam('body', $page); }); @@ -95,7 +95,7 @@ $utopia->get('/console/notifications') $page = new View(__DIR__.'/../views/v1/console/notifications/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.notifications.title')) + ->setParam('title', APP_NAME.' - Notifications') ->setParam('body', $page); }); @@ -107,7 +107,7 @@ $utopia->get('/console/home') $page = new View(__DIR__.'/../views/console/home/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.home.title')) + ->setParam('title', APP_NAME.' - Console') ->setParam('body', $page); }); @@ -119,7 +119,7 @@ $utopia->get('/console/settings') $page = new View(__DIR__.'/../views/console/settings/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.settings.title')) + ->setParam('title', APP_NAME.' - Settings') ->setParam('body', $page); }); @@ -131,7 +131,7 @@ $utopia->get('/console/webhooks') $page = new View(__DIR__.'/../views/console/webhooks/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.webhooks.title')) + ->setParam('title', APP_NAME.' - Webhooks') ->setParam('body', $page); }); @@ -143,7 +143,7 @@ $utopia->get('/console/keys') $page = new View(__DIR__.'/../views/console/keys/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.keys.title')) + ->setParam('title', APP_NAME.' - API Keys') ->setParam('body', $page); }); @@ -155,7 +155,7 @@ $utopia->get('/console/tasks') $page = new View(__DIR__.'/../views/console/tasks/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.tasks.title')) + ->setParam('title', APP_NAME.' - Tasks') ->setParam('body', $page); }); @@ -167,7 +167,7 @@ $utopia->get('/console/database') $page = new View(__DIR__.'/../views/console/database/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.database.title')) + ->setParam('title', APP_NAME.' - Database') ->setParam('body', $page); }); @@ -190,7 +190,7 @@ $utopia->get('/console/database/collection') ; $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.database.title')) + ->setParam('title', APP_NAME.' - Database') ->setParam('body', $page); }); @@ -202,7 +202,7 @@ $utopia->get('/console/storage') $page = new View(__DIR__.'/../views/console/storage/index.phtml'); $layout - ->setParam('title', APP_NAME.' - '.Locale::getText('console.storage.title')) + ->setParam('title', APP_NAME.' - Storage') ->setParam('body', $page); }); diff --git a/app/controllers/home.php b/app/controllers/home.php index 03e00120c0..58f5b7e1d4 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -9,7 +9,7 @@ use Utopia\Locale\Locale; $layout ->setParam('title', APP_NAME) - ->setParam('description', Locale::getText('general.description')) + ->setParam('description', '') ->setParam('class', 'home') ->setParam('header', [new View(__DIR__.'/../views/home/comps/header.phtml')]) ; @@ -35,7 +35,7 @@ $utopia->get('/auth/signin') $page = new View(__DIR__.'/../views/home/auth/signin.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.signin.title').' - '.APP_NAME) + ->setParam('title', 'Sign In - '.APP_NAME) ->setParam('body', $page); }); @@ -47,7 +47,7 @@ $utopia->get('/auth/signup') $page = new View(__DIR__.'/../views/home/auth/signup.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.signup.title').' - '.APP_NAME) + ->setParam('title', 'Sign Up - '.APP_NAME) ->setParam('body', $page); }); @@ -59,7 +59,7 @@ $utopia->get('/auth/recovery') $page = new View(__DIR__.'/../views/home/auth/recovery.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.recovery.title').' - '.APP_NAME) + ->setParam('title', 'Password Recovery - '.APP_NAME) ->setParam('body', $page); }); @@ -71,7 +71,7 @@ $utopia->get('/auth/confirm') $page = new View(__DIR__.'/../views/home/auth/confirm.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.confirm.title').' - '.APP_NAME) + ->setParam('title', 'Account Confirmation - '.APP_NAME) ->setParam('body', $page); }); @@ -83,7 +83,7 @@ $utopia->get('/auth/join') $page = new View(__DIR__.'/../views/home/auth/join.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.join.title').' - '.APP_NAME) + ->setParam('title', 'Invitation - '.APP_NAME) ->setParam('body', $page); }); @@ -95,7 +95,7 @@ $utopia->get('/auth/recovery/reset') $page = new View(__DIR__.'/../views/home/auth/recovery/reset.phtml'); $layout - ->setParam('title', Locale::getText('home.auth.reset.title').' - '.APP_NAME) + ->setParam('title', 'Password Reset - '.APP_NAME) ->setParam('body', $page); }); diff --git a/app/controllers/shared/web.php b/app/controllers/shared/web.php index 6a2a354b38..ffaa6a5b87 100644 --- a/app/controllers/shared/web.php +++ b/app/controllers/shared/web.php @@ -6,9 +6,9 @@ use Utopia\Locale\Locale; Locale::$exceptions = false; $roles = [ - ['type' => 'owner', 'label' => Locale::getText('general.roles.owner')], - ['type' => 'developer', 'label' => Locale::getText('general.roles.developer')], - ['type' => 'admin', 'label' => Locale::getText('general.roles.admin')], + ['type' => 'owner', 'label' => 'Owner'], + ['type' => 'developer', 'label' => 'Developer'], + ['type' => 'admin', 'label' => 'Admin'], ]; $layout = new View(__DIR__.'/../../views/layouts/default.phtml'); @@ -20,7 +20,6 @@ if (!empty($request->getQuery('version', ''))) { $layout ->setParam('title', APP_NAME) - ->setParam('description', Locale::getText('general.description')) ->setParam('protocol', $request->getServer('REQUEST_SCHEME', 'https')) ->setParam('domain', $domain) ->setParam('home', $request->getServer('_APP_HOME')) diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml index 5d9b9b1d9d..92c635e3ce 100644 --- a/app/views/console/account/index.phtml +++ b/app/views/console/account/index.phtml @@ -4,7 +4,7 @@ use Utopia\Locale\Locale; ?>

- + Account

@@ -19,7 +19,7 @@ use Utopia\Locale\Locale; data-failure="trigger" data-failure-param-trigger-events="logout"> -

+

Overview

@@ -35,14 +35,14 @@ use Utopia\Locale\Locale; data-failure-param-alert-text="Failed to update your name" data-failure-param-alert-classname="error"> - +
- +
@@ -64,18 +64,18 @@ use Utopia\Locale\Locale; data-failure-param-alert-text="Failed updating email address" data-failure-param-alert-classname="error"> - +
-
- +
+
-   +  
@@ -84,8 +84,8 @@ use Utopia\Locale\Locale;
-
-

+
+

Update Password

- + - +
-   +  
@@ -122,7 +122,7 @@ use Utopia\Locale\Locale; data-failure-param-alert-text="Logout failed" data-failure-param-alert-classname="error"> - +
@@ -133,25 +133,25 @@ use Utopia\Locale\Locale;
- + Upload
- ( gravatar.com ) + (via gravatar.com )
-

+

Danger Zone

-

+

This is the area where you can delete your account.

-

+

By deleting your account you will lose access to any of your teams and shared data.

-

+

PLEASE NOTICE: Account deletion is irreversible.

- +
@@ -172,9 +172,9 @@ use Utopia\Locale\Locale;
  • -

    +

    Security

    -

    +

    Devices and Sessions

    - + @@ -213,10 +213,10 @@ use Utopia\Locale\Locale; data-success-param-trigger-events="logout" data-success-param-redirect-url="/" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('console.account.section.security.devices.logout.failure')); ?>" + data-failure-param-alert-text="Logout from Session Failed" data-failure-param-alert-classname="error"> - + @@ -225,7 +225,7 @@ use Utopia\Locale\Locale; on   - + Current Session
    @@ -244,10 +244,10 @@ use Utopia\Locale\Locale; data-success-param-trigger-events="session-delete" data-success-redirect-url="/" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('console.account.section.security.devices.logout-all')); ?>" + data-failure-param-alert-text="Logout from All Sessions Failed" data-failure-param-alert-classname="error"> - +
  • @@ -263,26 +263,26 @@ use Utopia\Locale\Locale; - - - - - + + + + + - - - + + - - +
    DateEventClientLocationIP
    + +
    diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml index 45fde94c95..db8e4c6acb 100644 --- a/app/views/console/database/index.phtml +++ b/app/views/console/database/index.phtml @@ -4,7 +4,7 @@ use Utopia\Locale\Locale; ?>

    - + Database

    diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml index a8f511cf41..d9db97fc3b 100644 --- a/app/views/console/keys/index.phtml +++ b/app/views/console/keys/index.phtml @@ -17,7 +17,7 @@ $scopes = [ // TODO sync with project list ?>

    - + API Keys

    - + Settings

    @@ -22,7 +22,7 @@ use Utopia\Locale\Locale;
    • -

      +

      Overview

    • -

      +

      Members

      - + User Avatar
      -       +      
    -
    +
    -

    +

    Invite Member

    - + - + - +
    - -   + +  
    diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml index a3a964ea8c..bb32b037e1 100644 --- a/app/views/console/storage/index.phtml +++ b/app/views/console/storage/index.phtml @@ -4,7 +4,7 @@ use Utopia\Locale\Locale;

    - + Storage

    diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml index 0915f8a142..cd5c000322 100644 --- a/app/views/console/tasks/index.phtml +++ b/app/views/console/tasks/index.phtml @@ -5,7 +5,7 @@ use Utopia\Locale\Locale; ?>

    - + Tasks

    - - - - - + Date + Event + Client + Location + IP - - - + + + - + - + diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml index 15c9a02ebc..e6fed97aee 100644 --- a/app/views/console/webhooks/index.phtml +++ b/app/views/console/webhooks/index.phtml @@ -18,7 +18,7 @@ $events = [ ?>

    - + Webhooks

    diff --git a/app/views/home/auth/confirm.phtml b/app/views/home/auth/confirm.phtml index a2373ff919..955a2d0737 100644 --- a/app/views/home/auth/confirm.phtml +++ b/app/views/home/auth/confirm.phtml @@ -10,13 +10,13 @@ use Utopia\Locale\Locale; data-param-user-id="{{router.params.userId}}" data-success="redirect,alert,trigger" data-success-redirect-url="/console" - data-success-alert="escape(Locale::getText('home.auth.confirm.success')); ?>" + data-success-alert="Confirmation Completed Successfully" data-success-triggers="account.update" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('home.auth.confirm.failure')); ?>" + data-failure-param-alert-text="Confirmation Failed" data-failure-param-alert-classname="error"> -

    escape(Locale::getText('home.auth.confirm.title')); ?>

    -

    escape(Locale::getText('home.auth.confirm.subtitle')); ?>

    +

    Account Confirmation in Progress

    +

    Please wait a few seconds while your account is verified.

    diff --git a/app/views/home/auth/join.phtml b/app/views/home/auth/join.phtml index 9b6bc01c96..a70508dd67 100644 --- a/app/views/home/auth/join.phtml +++ b/app/views/home/auth/join.phtml @@ -11,13 +11,13 @@ use Utopia\Locale\Locale; data-param-secret="{{router.params.secret}}" data-success="redirect,alert,trigger" data-success-redirect-url="/console?project={{router.params.project}}" - data-success-alert="escape(Locale::getText('home.auth.join.success')); ?>" + data-success-alert="Joined Team Successfully" data-success-triggers="account.update" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('home.auth.join.failure')); ?>" + data-failure-param-alert-text="Failed to join team. Please try again later" data-failure-param-alert-classname="error"> - + @@ -31,9 +31,9 @@ use Utopia\Locale\Locale; data-success="trigger" data-success-triggers="api-company.load"> -

    escape(Locale::getText('home.auth.join.title')); ?>

    +

    Invitation

    -

    escape(Locale::getText('home.auth.join.subtitle')), ''); ?>

    +

    You have been invited to join team on

    @@ -46,14 +46,13 @@ use Utopia\Locale\Locale;
    - escape(Locale::getText('home.auth.join.agree')), - '' . $this->escape(Locale::getText('home.auth.join.terms')) . '', - '' . $this->escape(Locale::getText('home.auth.join.privacy')) . ''); ?> + + By accepting the invitation, you agree to the Terms and Conditions and Privacy Policy.
    - - escape(Locale::getText('home.auth.join.cancel')); ?> + + Cancel
    \ No newline at end of file diff --git a/app/views/home/auth/recovery.phtml b/app/views/home/auth/recovery.phtml index 8985347bca..4a82c54f83 100644 --- a/app/views/home/auth/recovery.phtml +++ b/app/views/home/auth/recovery.phtml @@ -3,30 +3,30 @@ use Utopia\Locale\Locale; ?>

    - escape(Locale::getText('home.auth.recovery.title')); ?> + Password Recovery

    - * escape(Locale::getText('home.auth.recovery.required')); ?> + * All fields are required
    - + - +
    - escape(Locale::getText('home.auth.recovery.back')); ?> + Back to sign in
    diff --git a/app/views/home/auth/recovery/reset.phtml b/app/views/home/auth/recovery/reset.phtml index 14d42e0e2b..313d543150 100644 --- a/app/views/home/auth/recovery/reset.phtml +++ b/app/views/home/auth/recovery/reset.phtml @@ -3,10 +3,10 @@ use Utopia\Locale\Locale; ?>

    - escape(Locale::getText('home.auth.reset.title')); ?> + Password Reset

    - * escape(Locale::getText('home.auth.reset.required')); ?> + * All fields are required

    @@ -16,21 +16,21 @@ use Utopia\Locale\Locale; data-scope="console" data-event="submit" data-success="alert,redirect" - data-success-alert="escape(Locale::getText('home.auth.reset.success')); ?>" + data-success-alert="Password Reset Completed" data-success-redirect-url="/auth/signin" data-failure="alert" - data-failure-param-alert-text="escape(Locale::getText('home.auth.reset.failure')); ?>" + data-failure-param-alert-text="Password Reset Failed" data-failure-param-alert-classname="error"> - - + + - - + + - +
    \ No newline at end of file diff --git a/app/views/home/auth/signin.phtml b/app/views/home/auth/signin.phtml index 2baf2bf119..d6a2799268 100644 --- a/app/views/home/auth/signin.phtml +++ b/app/views/home/auth/signin.phtml @@ -3,12 +3,12 @@ use Utopia\Locale\Locale; ?>

    - escape(Locale::getText('home.auth.signin.title')); ?> + Sign In

    - + -

    escape(Locale::getText('home.auth.signin.regular.title')); ?>

    +

    Login using email and password

    - + - + - +


    - escape(Locale::getText('home.auth.signin.labels.action2')); ?> escape(Locale::getText('home.auth.signin.labels.or')); ?> escape(Locale::getText('home.auth.signin.labels.action3')); ?> + Forgot password? or don't have an account? Sign up now
    \ No newline at end of file diff --git a/app/views/home/auth/signup.phtml b/app/views/home/auth/signup.phtml index 4f4d31dfa2..f62b9945b1 100644 --- a/app/views/home/auth/signup.phtml +++ b/app/views/home/auth/signup.phtml @@ -4,12 +4,12 @@ use Utopia\Locale\Locale; ?> \ No newline at end of file diff --git a/app/views/layouts/default.phtml b/app/views/layouts/default.phtml index 15b3c3d28b..2d0b97eea0 100644 --- a/app/views/layouts/default.phtml +++ b/app/views/layouts/default.phtml @@ -91,7 +91,7 @@ $canonical = $this->getParam('canonical', '');
    -
    +
      @@ -101,7 +101,7 @@ $canonical = $this->getParam('canonical', ''); - + Learn More
    • From 6a2786c2c317111a266a8e91a404985e48ef9802 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Thu, 26 Sep 2019 21:52:57 +0300 Subject: [PATCH 03/15] Deprecated UI translations --- app/config/locale/en.php | 3 --- app/config/locale/he.php | 3 --- app/views/console/account/index.phtml | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/config/locale/en.php b/app/config/locale/en.php index 6cca5b0f49..4a589289a4 100644 --- a/app/config/locale/en.php +++ b/app/config/locale/en.php @@ -5,9 +5,6 @@ return [ 'settings.locale' => 'en', 'settings.direction' => 'ltr', - // General - 'general.loading' => 'Loading...', - // Service - Users 'auth.emails.team' => '%s Team', 'auth.emails.confirm.title' => 'Account Confirmation', diff --git a/app/config/locale/he.php b/app/config/locale/he.php index 33ac3beaa7..17ed41baee 100644 --- a/app/config/locale/he.php +++ b/app/config/locale/he.php @@ -5,9 +5,6 @@ return [ 'settings.locale' => 'he', 'settings.direction' => 'rtl', - // General - 'general.loading' => 'Loading...', - // Service - Users 'auth.emails.team' => 'צוות %s', 'auth.emails.confirm.title' => 'אימות חשבון', diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml index 92c635e3ce..be0e3f9b24 100644 --- a/app/views/console/account/index.phtml +++ b/app/views/console/account/index.phtml @@ -190,7 +190,7 @@ use Utopia\Locale\Locale; data-service="auth.logoutBySession" data-scope="console" data-event="submit" - data-loading="escape(Locale::getText('general.loading')); ?>" + data-loading="Loading..." data-success="trigger" data-success-param-trigger-events="session-delete" data-failure="alert" @@ -208,7 +208,7 @@ use Utopia\Locale\Locale; data-service="auth.logoutBySession" data-scope="console" data-event="submit" - data-loading="escape(Locale::getText('general.loading')); ?>" + data-loading="Loading..." data-success="trigger,redirect" data-success-param-trigger-events="logout" data-success-param-redirect-url="/" From 4d4b2d1447b38cab211302ddf39b5313baaad83e Mon Sep 17 00:00:00 2001 From: eldadfux Date: Thu, 26 Sep 2019 22:54:42 +0300 Subject: [PATCH 04/15] Updated locales --- app/config/locale/en.php | 2 +- app/config/locale/he.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/locale/en.php b/app/config/locale/en.php index 4a589289a4..cbd1dd2f51 100644 --- a/app/config/locale/en.php +++ b/app/config/locale/en.php @@ -1,7 +1,7 @@ '"The art of being wise is the art of knowing what to overlook."', + 'settings.inspire' => '"The art of being wise is the art of knowing what to overlook."', // This is the line printed in the homepage and console 'view-source' 'settings.locale' => 'en', 'settings.direction' => 'ltr', diff --git a/app/config/locale/he.php b/app/config/locale/he.php index 17ed41baee..41ce63ea79 100644 --- a/app/config/locale/he.php +++ b/app/config/locale/he.php @@ -1,7 +1,7 @@ '"The art of being wise is the art of knowing what to overlook."', + 'settings.inspire' => '"The art of being wise is the art of knowing what to overlook."', // This is the line printed in the homepage and console 'view-source' 'settings.locale' => 'he', 'settings.direction' => 'rtl', From ddf4945232086d62f81df09bd175c21f0a9fbcd3 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Fri, 27 Sep 2019 00:34:32 +0300 Subject: [PATCH 05/15] Fixed signup bug --- app/views/home/auth/signup.phtml | 1 + docker-compose.yml | 9 ++++++--- package-lock.json | 12 ++++++------ package.json | 2 +- public/dist/scripts/app-all.js | 26 +++++++++++++++----------- public/dist/scripts/app-dep.js | 26 +++++++++++++++----------- storage/db2/.gitignore | 4 ++++ 7 files changed, 48 insertions(+), 32 deletions(-) create mode 100644 storage/db2/.gitignore diff --git a/app/views/home/auth/signup.phtml b/app/views/home/auth/signup.phtml index f62b9945b1..90b7f25101 100644 --- a/app/views/home/auth/signup.phtml +++ b/app/views/home/auth/signup.phtml @@ -22,6 +22,7 @@ use Utopia\Locale\Locale; data-failure-param-alert-text="Registration Failed. Please try again later" data-failure-param-alert-classname="error"> + diff --git a/docker-compose.yml b/docker-compose.yml index 02ca1956be..d0f86ac6e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,8 +26,8 @@ services: - _APP_DB_HOST=mariadb - _APP_DB_PORT=3306 - _APP_DB_SCHEMA=appwrite - - _APP_DB_USER=root - - _APP_DB_PASS=password + - _APP_DB_USER=user1 + - _APP_DB_PASS=pass1 - _APP_INFLUXDB_HOST=influxdb - _APP_INFLUXDB_PORT=8086 - _APP_STATSD_HOST=telegraf @@ -38,8 +38,11 @@ services: restart: unless-stopped environment: - MYSQL_ROOT_PASSWORD=password + - MYSQL_DATABASE=appwrite + - MYSQL_USER=user1 + - MYSQL_PASSWORD=pass1 volumes: - - ./storage/db:/var/lib/mysql:rw + - ./storage/db2:/var/lib/mysql:rw ports: - 3306:3306/tcp diff --git a/package-lock.json b/package-lock.json index 0485732f57..1e3a04feb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -834,9 +834,9 @@ } }, "appwrite": { - "version": "1.0.19", - "resolved": "https://registry.npmjs.org/appwrite/-/appwrite-1.0.19.tgz", - "integrity": "sha512-SP9VNSrrVZi0B9kkdQLpoEy6hAoAanXtc9pk5TwBqEZf6OIs0BRRTK64eethyvzSrklceeBxY8FwEb+lYBNhuw==", + "version": "1.0.21", + "resolved": "https://registry.npmjs.org/appwrite/-/appwrite-1.0.21.tgz", + "integrity": "sha512-NfNG9JQkOQypanMKOGzPzHVTZP1MTDipbTkRveIfmNd0W25OAqpE1up9f7KHaAi8yha1uyqkYW6l9QgjECZMEw==", "dev": true }, "archy": { @@ -3688,9 +3688,9 @@ } }, "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.3.1.tgz", + "integrity": "sha512-c0HoNHzDiHpBt4Kqe99N8tdLPKAnGCQ73gYMPWtAYM4PwGnf7xl8PBUHJqh9ijlzt2uQKaSRxbXRt+rZ7M2/kA==", "dev": true, "requires": { "neo-async": "^2.6.0", diff --git a/package.json b/package.json index ad71cfe40c..1a46663e6e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "BSD-3-Clause", "repository": "public", "devDependencies": { - "appwrite": "^1.0.19", + "appwrite": "^1.0.21", "gulp": "^4.0.0", "gulp-clean-css": "^4.0.0", "gulp-concat": "2.5.2", diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js index 3011ab288c..6bedf84d45 100644 --- a/public/dist/scripts/app-all.js +++ b/public/dist/scripts/app-all.js @@ -5,7 +5,7 @@ {http.addGlobalHeader('X-Appwrite-Locale',value);config.locale=value;return this;};let setMode=function(value) {http.addGlobalHeader('X-Appwrite-Mode',value);config.mode=value;return this;};let http=function(document){let globalParams=[],globalHeaders=[];let addParam=function(url,param,value){let a=document.createElement('a'),regex=/(?:\?|&|&)+([^=]+)(?:=([^&]*))*/g;let match,str=[];a.href=url;param=encodeURIComponent(param);while(match=regex.exec(a.search))if(param!==match[1])str.push(match[1]+(match[2]?"="+match[2]:""));str.push(param+(value?"="+encodeURIComponent(value):""));a.search=str.join("&");return a.href;};let buildQuery=function(params){let str=[];for(let p in params){if(Array.isArray(params[p])){for(let index=0;index Date: Fri, 27 Sep 2019 00:38:37 +0300 Subject: [PATCH 06/15] Updated breaking changes --- app/views/home/auth/recovery.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/auth/recovery.phtml b/app/views/home/auth/recovery.phtml index 4a82c54f83..24b0c5530f 100644 --- a/app/views/home/auth/recovery.phtml +++ b/app/views/home/auth/recovery.phtml @@ -21,7 +21,7 @@ use Utopia\Locale\Locale; - + From f63ca9c6e418460c23d1ba468fde2f131eb68934 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Fri, 27 Sep 2019 00:42:38 +0300 Subject: [PATCH 07/15] Updated templates --- app/views/console/account/index.phtml | 4 ---- app/views/console/database/index.phtml | 4 ---- app/views/console/keys/index.phtml | 2 -- app/views/console/settings/index.phtml | 6 ------ app/views/console/storage/index.phtml | 4 ---- app/views/console/tasks/index.phtml | 5 ----- app/views/console/users/view.phtml | 7 +------ app/views/console/webhooks/index.phtml | 2 -- app/views/home/auth/confirm.phtml | 3 --- app/views/home/auth/join.phtml | 3 --- app/views/home/auth/recovery.phtml | 3 --- app/views/home/auth/recovery/reset.phtml | 3 --- app/views/home/auth/signin.phtml | 3 --- app/views/home/auth/signup.phtml | 4 ---- 14 files changed, 1 insertion(+), 52 deletions(-) diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml index be0e3f9b24..6686cf5e52 100644 --- a/app/views/console/account/index.phtml +++ b/app/views/console/account/index.phtml @@ -1,7 +1,3 @@ -

    Account diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml index db8e4c6acb..0230e0faf4 100644 --- a/app/views/console/database/index.phtml +++ b/app/views/console/database/index.phtml @@ -1,7 +1,3 @@ -

    Database diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml index d9db97fc3b..45f9b1a5f2 100644 --- a/app/views/console/keys/index.phtml +++ b/app/views/console/keys/index.phtml @@ -1,7 +1,5 @@ -

    Settings diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml index bb32b037e1..b0eb656e5c 100644 --- a/app/views/console/storage/index.phtml +++ b/app/views/console/storage/index.phtml @@ -1,7 +1,3 @@ - -

    Storage diff --git a/app/views/console/tasks/index.phtml b/app/views/console/tasks/index.phtml index cd5c000322..c796042304 100644 --- a/app/views/console/tasks/index.phtml +++ b/app/views/console/tasks/index.phtml @@ -1,8 +1,3 @@ -

    Tasks diff --git a/app/views/console/users/view.phtml b/app/views/console/users/view.phtml index 766b0c1a0b..7a484a97c9 100644 --- a/app/views/console/users/view.phtml +++ b/app/views/console/users/view.phtml @@ -1,8 +1,3 @@ -

    - escape(Locale::getText('console.users.title')); ?> + Users
      diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml index e6fed97aee..15443e90d2 100644 --- a/app/views/console/webhooks/index.phtml +++ b/app/views/console/webhooks/index.phtml @@ -1,7 +1,5 @@

    Password Recovery diff --git a/app/views/home/auth/recovery/reset.phtml b/app/views/home/auth/recovery/reset.phtml index 313d543150..6aa1897c9e 100644 --- a/app/views/home/auth/recovery/reset.phtml +++ b/app/views/home/auth/recovery/reset.phtml @@ -1,6 +1,3 @@ -

    Password Reset diff --git a/app/views/home/auth/signin.phtml b/app/views/home/auth/signin.phtml index d6a2799268..370d50b5e9 100644 --- a/app/views/home/auth/signin.phtml +++ b/app/views/home/auth/signin.phtml @@ -1,6 +1,3 @@ -

    Sign In diff --git a/app/views/home/auth/signup.phtml b/app/views/home/auth/signup.phtml index 90b7f25101..0399bcc2e0 100644 --- a/app/views/home/auth/signup.phtml +++ b/app/views/home/auth/signup.phtml @@ -1,7 +1,3 @@ -