From 89bb4450f39d1985f586d381964f28ddd0dfe13e Mon Sep 17 00:00:00 2001 From: Mickael KERJEAN Date: Fri, 16 Mar 2018 09:56:25 +1100 Subject: [PATCH] improvement (UI): fixes + cleanup interface - #11 --- .gitignore | 3 +- .travis.yml | 8 +- client/assets/css/reset.scss | 31 +- client/assets/img/folder.svg | 71 +- client/assets/img/link.svg | 71 +- client/components/breadcrumb.js | 57 +- client/components/breadcrumb.scss | 73 + client/components/card.js | 3 +- client/components/error.js | 14 +- client/components/error.scss | 13 + client/components/modal.js | 4 +- client/components/modal.scss | 2 + client/components/ngif.js | 7 +- client/helpers/ajax.js | 98 +- client/helpers/cache.js | 184 ++ client/helpers/events.js | 19 + client/helpers/index.js | 4 +- client/index.js | 2 + client/model/files.js | 375 ++- client/pages/connectpage.js | 6 +- client/pages/connectpage.scss | 1 + client/pages/filespage.js | 28 +- client/pages/filespage/existingthing.scss | 3 - client/pages/filespage/filesystem.js | 55 +- client/pages/filespage/filesystem.scss | 2 +- client/pages/filespage/filezone.js | 20 +- client/pages/filespage/filezone.scss | 11 + client/pages/filespage/newthing.js | 84 - .../{existingthing.js => thing-existing.js} | 163 +- client/pages/filespage/thing-new.js | 85 + client/pages/filespage/thing.scss | 82 + client/pages/logout.js | 4 +- client/pages/viewerpage.js | 2 +- client/pages/viewerpage/editor.js | 1 + client/pages/viewerpage/editor.scss | 6 + client/router.js | 26 +- config_client.js | 3 + config.js => config_server.js | 4 +- package-lock.json | 2687 ++++++++++++++++- package.json | 83 +- server/bootstrap.js | 4 +- server/ctrl/files.js | 4 +- server/model/backend/dropbox.js | 2 +- server/model/backend/gdrive.js | 2 +- server/public/cache.js | 12 +- server/utils/crypto.js | 2 +- test/client/test.js | 5 + test/helper_crypto.js | 20 + test/helper_event.js | 44 + test/index.html | 24 + test/karma-init.js | 29 + 51 files changed, 3937 insertions(+), 606 deletions(-) create mode 100644 client/components/error.scss create mode 100644 client/helpers/cache.js create mode 100644 client/helpers/events.js delete mode 100644 client/pages/filespage/existingthing.scss create mode 100644 client/pages/filespage/filezone.scss delete mode 100644 client/pages/filespage/newthing.js rename client/pages/filespage/{existingthing.js => thing-existing.js} (52%) create mode 100644 client/pages/filespage/thing-new.js create mode 100644 client/pages/filespage/thing.scss create mode 100644 config_client.js rename config.js => config_server.js (90%) create mode 100644 test/client/test.js create mode 100644 test/helper_crypto.js create mode 100644 test/helper_event.js create mode 100644 test/index.html create mode 100644 test/karma-init.js diff --git a/.gitignore b/.gitignore index c32ac8f1..14cd44ed 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ babel_cache/ *~ *.swp *.swo -.tern-port \ No newline at end of file +.tern-port +.tern-project.js \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index a0f8b8a9..8376ee95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ before_install: - echo $DOCKER_PASSWORD | docker login -u=$DOCKER_USERNAME --password-stdin script: - - sed -i "s/application_url/$APPLICATION_URL/g" config.js - - sed -i "s/gdrive_client_id/$GOOGLE_CLIENTID/" config.js - - sed -i "s/gdrive_client_secret/$GOOGLE_CLIENTSECRET/" config.js - - sed -i "s/dropbox_client_id/$DROPBOX_CLIENTID/" config.js + - sed -i "s/application_url/$APPLICATION_URL/g" config_server.js + - sed -i "s/gdrive_client_id/$GOOGLE_CLIENTID/" config_server.js + - sed -i "s/gdrive_client_secret/$GOOGLE_CLIENTSECRET/" config_server.js + - sed -i "s/dropbox_client_id/$DROPBOX_CLIENTID/" config_server.js - npm run image - npm run publish \ No newline at end of file diff --git a/client/assets/css/reset.scss b/client/assets/css/reset.scss index 7d1b21da..5fbcb601 100644 --- a/client/assets/css/reset.scss +++ b/client/assets/css/reset.scss @@ -4,16 +4,18 @@ --emphasis: #375160; --primary: #9AD1ED; - --emphasis-primary: #2b71bc; + --emphasis-primary: #c5e2f1; --secondary: #466372; --emphasis-secondary: #466372; - --super-light: #ecf1f6; + --light: #909090; + --super-light: #f4f4f4; --error: #f26d6d; --success: #63d9b1; } +// --super-light: #ecf1f6; html { font-family:"San Francisco","Roboto","Arial",sans-serif; @@ -68,8 +70,6 @@ input[type="checkbox"]{position: relative; top: 1px; margin: 0; padding: 0;} border-color: rgb(154, 209, 237)!important; } - - .drag-drop{ z-index: 2; } @@ -97,26 +97,3 @@ body, body > div, body > div > div, body > div > div > div{ height: 100%;} .login-form button.active{ box-shadow: 0px 1px 5px rgba(0,0,0,0.20); } - - - - - -/* ANIMATION */ -.example-enter { - opacity: 0.01; -} - -.example-enter.example-enter-active { - opacity: 1; - transition: opacity 500ms ease-in; -} - -.example-leave { - opacity: 1; -} - -.example-leave.example-leave-active { - opacity: 0.01; - transition: opacity 300ms ease-in; -} diff --git a/client/assets/img/folder.svg b/client/assets/img/folder.svg index f1b08731..06d8befa 100644 --- a/client/assets/img/folder.svg +++ b/client/assets/img/folder.svg @@ -1,6 +1,69 @@ - - - - + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/client/assets/img/link.svg b/client/assets/img/link.svg index f1b08731..c956fa66 100644 --- a/client/assets/img/link.svg +++ b/client/assets/img/link.svg @@ -1,6 +1,69 @@ - - - - + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/client/components/breadcrumb.js b/client/components/breadcrumb.js index ca176b53..df8f6d0a 100644 --- a/client/components/breadcrumb.js +++ b/client/components/breadcrumb.js @@ -66,41 +66,28 @@ BreadCrumb.propTypes = { const BreadCrumbContainer = (props) => { - let style1 = {background: 'white', margin: '0 0 0px 0', padding: '6px 0', boxShadow: '0 4px 5px 0 rgba(0,0,0,0.14), 0 1px 10px 0 rgba(0,0,0,0.12), 0 2px 4px -1px rgba(0,0,0,0.2)', zIndex: '1000', position: 'relative'}; - let style2 = {margin: '0 auto', width: '95%', maxWidth: '800px', padding: '0', color: 'rgba(#6f6f6f, 0.8)'}; return ( -
-