From 21f9e31e75f0644172c718cd86bd75361c7ee284 Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 18 May 2017 15:56:35 +0200 Subject: [PATCH] Add a placeholder for the user app --- customize.dist/src/build.js | 5 +- customize.dist/translations/messages.fr.js | 2 + customize.dist/translations/messages.js | 2 + www/user/index.html | 112 +++++++++++++++++++++ www/user/main.css | 14 +++ www/user/main.js | 63 ++++++++++++ 6 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 www/user/index.html create mode 100644 www/user/main.css create mode 100644 www/user/main.js diff --git a/customize.dist/src/build.js b/customize.dist/src/build.js index c5c5c8d77..fbcc34942 100644 --- a/customize.dist/src/build.js +++ b/customize.dist/src/build.js @@ -60,7 +60,10 @@ var fragments = {}; }); // build static pages -['../www/settings/index'].forEach(function (page) { +[ + '../www/settings/index', + '../www/user/index' +].forEach(function (page) { var source = swap(template, { topbar: fragments.topbar, fork: fragments.fork, diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 1c204e38c..26cfc3129 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -52,6 +52,8 @@ define(function () { out.language = "Langue"; + out.comingSoon = "Bientôt disponible..."; + out.upgrade = "Améliorer"; out.upgradeTitle = "Améliorer votre compte pour augmenter la limite de stockage"; out.MB = "Mo"; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 4b2c9f78e..dcafe6283 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -54,6 +54,8 @@ define(function () { out.language = "Language"; + out.comingSoon = "Coming soon..."; + out.upgrade = "Upgrade"; out.upgradeTitle = "Upgrade your account to increase the storage limit"; out.MB = "MB"; diff --git a/www/user/index.html b/www/user/index.html new file mode 100644 index 000000000..f6ab459c9 --- /dev/null +++ b/www/user/index.html @@ -0,0 +1,112 @@ + + + + + Cryptpad: Zero Knowledge, Collaborative Real Time Editing + + + + + + + + + + + +
+ + + CryptPad + + + + + + + + + About + + + Privacy + + + ToS + + + Contact + + + Blog + +
+ + + + + + + + + + + diff --git a/www/user/main.css b/www/user/main.css new file mode 100644 index 000000000..5cfc2ce85 --- /dev/null +++ b/www/user/main.css @@ -0,0 +1,14 @@ +.cp #mainBlock { + z-index: 1; + width: 1000px; + max-width: 90%; + margin: auto; + display: flex; + align-items: center; + justify-content: center; +} +.cp #mainBlock #container { + text-align: center; + font-size: 25px; +} + diff --git a/www/user/main.js b/www/user/main.js new file mode 100644 index 000000000..82f16682b --- /dev/null +++ b/www/user/main.js @@ -0,0 +1,63 @@ +define([ + 'jquery', + '/common/cryptpad-common.js', +], function ($, Cryptpad) { + + var APP = window.APP = { + Cryptpad: Cryptpad, + _onRefresh: [] + }; + + var Messages = Cryptpad.Messages; + + var comingSoon = function () { + var $div = $('
', { 'class': 'coming-soon' }) + .text(Messages.comingSoon) + .append('
'); + console.log($div); + return $div; + }; + + var andThen = function () { + console.log(APP.$container); + APP.$container.append(comingSoon()); + }; + + $(function () { + var $main = $('#mainBlock'); + // Language selector + var $sel = $('#language-selector'); + Cryptpad.createLanguageSelector(undefined, $sel); + $sel.find('button').addClass('btn').addClass('btn-secondary'); + $sel.show(); + + // User admin menu + var $userMenu = $('#user-menu'); + var userMenuCfg = { + $initBlock: $userMenu + }; + var $userAdmin = Cryptpad.createUserAdminMenu(userMenuCfg); + $userAdmin.find('button').addClass('btn').addClass('btn-secondary'); + + $(window).click(function () { + $('.cryptpad-dropdown').hide(); + }); + + // main block is hidden in case javascript is disabled + $main.removeClass('hidden'); + + APP.$container = $('#container'); + + Cryptpad.ready(function () { + //if (!Cryptpad.getUserHash()) { return redirectToMain(); } + + //var storeObj = Cryptpad.getStore().getProxy && Cryptpad.getStore().getProxy().proxy + // ? Cryptpad.getStore().getProxy() : undefined; + + //andThen(storeObj); + andThen(); + Cryptpad.reportAppUsage(); + }); + }); + +});