Fix/e2e

demo/restore-demo.sh

@@ -7,7 +7,7 @@ destinationDataDir="/data/hosted/"
 
 echo "Removing $destinationDataDir"
 
-rm -R ${destinationDataDir}
+rm -R ${destinationDataDir}*
 
 echo "Resetting to initial status from $originDataDir.."
 cp -R ${originDataDir} ${destinationDataDir}

deploy/digitalocean/README.md

@@ -9,15 +9,28 @@ This script is maintained for the community by Proxeus Association
 
 ## Instructions
 
-1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration
-2. You will need to have your API keys for Infura and Sparkpost handy - see the root README for further details.
-3. add executive permission for deploy.sh ( chmod +x deploy.sh )
-4. run $PWD/proxeus-core/deploy/digitalocean/deploy.sh
-5. It takes a few minutes for the server to boot and install, then you should be able to open `http://<your DO's IP address or domain>:1323/init`
-6. A configuration screen will be shown where you can set up an admin account and check settings.
-
-Once your server is running, visit the [User Handbook](https://github.com/ProxeusApp/community/blob/master/handbook/handbook.md) to get started.
+1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration. [Here](https://docs.digitalocean.com/products/droplets/getting-started/recommended-droplet-setup) you can find some help how to set up a production-ready droplet.
+2. Make sure your API keys for Infura and Sparkpost.
+3. Get the deployment script and make it executable:
+```bash
+wget https://raw.githubusercontent.com/ProxeusApp/proxeus-core/main/deploy/digitalocean/deploy.sh && chmod +x deploy.sh
+```
+4. Enter all the necessary variables, where **FQDN** - domain name for the future server, **INFURA** - your Infura API key, **SPARKPOST** - your SparkPost API key, **ADMINEMAIL** - admin email (in format like [email protected]). It can be done by editing the script file directly or by shell "export" command:
+```bash
+export FQDN=[value]
+export INFURA=[value]
+export SPARKPOST=[value]
+export ADMINEMAIL=[value]
+```
+5. Run deployment process (go through it carefully, it may ask you any additional confirmation):
+```bash
+./deploy.sh
+```
+7. It takes a few minutes for the server to boot and install, then you should be able to open `http://<your DO's IP address or domain>:1323/init`
+8. A configuration screen will be shown where you can set up an admin account and check settings.
+
+Once your server is running, visit the [User Handbook](https://doc.proxeus.org/#/handbook) to get started.
 
 To view the logs connect to your droplet using an SSH client program. Then paste this into the console to see the logs being updated in real time:
 
-`cd /srv/proxeus && docker-compose logs -f`
+`cd /srv/proxeus && docker-compose logs -f`

deploy/digitalocean/deploy.sh

@@ -1,12 +1,18 @@
 #!/bin/bash
-#specify values for local variables
 
+# Specify values for local variables
 #FQDN=<value>
 #INFURA=<value>
 #SPARKPOST=<value>
 #ADMINEMAIL=<value>
 
 
+## Performing the installation
+exec 1> >(tee -a "/var/log/stackscript.log") 2>&1
+function log {
+  echo "### $1 -- `date '+%D %T'`"
+}
+
 log "Configuring System Updates"
 apt-get -o Acquire::ForceIPv4=true update -y
 DEBIAN_FRONTEND=noninteractive apt-get -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" install grub-pc
@@ -109,11 +115,11 @@ cd /srv/proxeus
 # make init server-docker
 
 log "Starting cloud deployment via docker-compose"
-docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d &
+docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d >/dev/null 2>&1
 
 # Open http://$FQDN:1323/init to configure your server
 log "After a minute, open: http://$FQDN:1323/init"
 
 ## ----------------------------------------------
 
-echo "Installation complete!"
+echo "Installation complete!"

service/document.go

@@ -87,7 +87,7 @@ func (me *DefaultDocumentService) Edit(auth model.Auth, userId string, formInput
 	if !ok {
 		return ErrUnableToEdit
 	}
-	if len(fName) >= 80 || !filenameRegex.MatchString(fName) {
+	if len(fName) > 80 || !filenameRegex.MatchString(fName) {
 		return ErrUnableToEdit
 	}
 	usrDataItem, err := userDataDB().Get(auth, userId)

test/e2e/cypress/integration/0_powerup.js

@@ -17,6 +17,10 @@ describe(`Power up on ${url}`, () => {
 
   it('should bring to home page after saving with default values', () => {
     cy.get('button.btn-primary').eq(2).click()
+
+    cy.location('pathname', {
+      timeout: 60000
+    }).should('eq', '/');
   })
 
-})
+})

ui/core/src/DocumentApp.vue

@@ -107,13 +107,19 @@ export default {
     color: $primary;
   }
 
+  body {
+    overflow: hidden;
+  }
+
   .navbar h1 {
     margin-bottom: 0;
   }
 
   .app-main {
-    @media (max-width: 767px) {
-      max-width: 100% !important;
+    max-width: calc(100% - 265px);
+
+    @media (max-width: 979px) {
+      max-width: calc(100% - 80px);
     }
   }
 

ui/core/src/baseApp.js

@@ -1,7 +1,7 @@
 import WalletInterface from './libs/WalletAdapter'
 
 export default {
-  data () {
+  data() {
     return {
       me: null,
       meta: null,
@@ -16,7 +16,7 @@ export default {
     }
   },
   methods: {
-    makeURL (uri) {
+    makeURL(uri) {
       let origin = location.origin
       if (/.*\/$/.test(origin)) {
         origin = origin.substring(0, origin.length - 1)
@@ -26,7 +26,7 @@ export default {
       }
       return origin + uri
     },
-    isLangAvailable (lang) {
+    isLangAvailable(lang) {
       if (this.meta && this.meta.activeLangs) {
         for (let i = 0; i < this.meta.activeLangs.length; i++) {
           if (this.meta.activeLangs[i] &&
@@ -37,37 +37,37 @@ export default {
       }
       return false
     },
-    userIsRoot () {
+    userIsRoot() {
       if (this.me) {
         return this.me.role === 100
       }
       return false
     },
-    userIsSuperAdmin () {
+    userIsSuperAdmin() {
       if (this.me) {
         return this.me.role > 10
       }
       return false
     },
-    userIsAdminOrHigher () {
+    userIsAdminOrHigher() {
       if (this.me) {
         return this.me.role >= 10
       }
       return false
     },
-    userIsCreatorOrHigher () {
+    userIsCreatorOrHigher() {
       if (this.me) {
         return this.me.role >= 7
       }
       return false
     },
-    userIsUserOrHigher () {
+    userIsUserOrHigher() {
       if (this.me) {
         return this.me.role >= 5
       }
       return false
     },
-    amIWriteGrantedFor (item) {
+    amIWriteGrantedFor(item) {
       try {
         // check authority
         if (this.me.role >= 100) {
@@ -110,7 +110,7 @@ export default {
       } catch (e) {}
       return false
     },
-    handleError (o) {
+    handleError(o) {
       if (this.isConToServerLostError(o)) {
         // couldn't reach the server
         if (!this.intervalID) {
@@ -119,15 +119,15 @@ export default {
         }
       }
     },
-    isConToServerLostError (o) {
+    isConToServerLostError(o) {
       let txt = ''
       try {
         txt = o.data || o.request.response || o.request.responseText
       } catch (e) {}
       return (o.request && !o.response) ||
         (window.webpackHotUpdate && /^.*\(ECONNREFUSED\)\.$/m.test(txt))
     },
-    pingService () {
+    pingService() {
       console.log('pingService')
       axios.get('/api/config').then((r) => {
         if (r.data) {
@@ -142,10 +142,10 @@ export default {
         this.handleError(err)
       })
     },
-    getSelectedLang () {
+    getSelectedLang() {
       return this.$cookie.get('lang') || this.fallbackLang()
     },
-    setSelectedLang (lang) {
+    setSelectedLang(lang) {
       if (lang) {
         this.$cookie.set('lang', lang, {
           expires: '1Y'
@@ -156,16 +156,16 @@ export default {
         this.$i18n.set(this.fallbackLang())
       }
     },
-    checkUserHasSession () {
+    checkUserHasSession() {
       return !!localStorage.getItem('userhassession')
     },
-    initUserHasSession () {
+    initUserHasSession() {
       localStorage.setItem('userhassession', true)
     },
-    deleteUserHasSession () {
+    deleteUserHasSession() {
       localStorage.removeItem('userhassession')
     },
-    loadMe (clb) {
+    loadMe(clb) {
       if (!this.checkUserHasSession()) {
         return
       }
@@ -185,7 +185,7 @@ export default {
         this.handleError(err)
       })
     },
-    loadLastExportResults (clb, delParams) {
+    loadLastExportResults(clb, delParams) {
       let url = '/api/export/results'
       if (delParams) {
         url += '?' + delParams
@@ -204,7 +204,7 @@ export default {
         this.handleError(err)
       })
     },
-    loadLastImportResults (clb, delParams) {
+    loadLastImportResults(clb, delParams) {
       let url = '/api/import/results'
       if (delParams) {
         url += '?' + delParams
@@ -223,7 +223,7 @@ export default {
         this.handleError(err)
       })
     },
-    exportData (params, cb, url, name) {
+    exportData(params, cb, url, name) {
       if (!url) {
         url = '/api/export?include=' + params
       } else {
@@ -278,7 +278,7 @@ export default {
         })
       })
     },
-    importData (file, skipExisting, cb) {
+    importData(file, skipExisting, cb) {
       if (!file) {
         return
       }
@@ -316,10 +316,10 @@ export default {
         this.handleError(err)
       })
     },
-    async validateSessionCookie () {
+    async validateSessionCookie() {
       return axios.get('/api/session/validate')
     },
-    loadMeta (clb) {
+    loadMeta(clb) {
       axios.get('/api/i18n/meta').then((response) => {
         this.meta = response.data
         if (this.meta && this.meta.langFallback) {
@@ -338,7 +338,7 @@ export default {
         this.handleError(err)
       })
     },
-    updateLangLabel () {
+    updateLangLabel() {
       if (this.meta && this.meta.activeLangs) {
         for (let i = 0; i < this.meta.activeLangs.length; i++) {
           this.meta.activeLangs[i].label = this.$t(
@@ -347,13 +347,13 @@ export default {
         return this.meta.activeLangs
       }
     },
-    fallbackLang () {
+    fallbackLang() {
       if (this.meta) {
         return this.meta.langFallback
       }
       return null
     },
-    getSelectedLangIndex () {
+    getSelectedLangIndex() {
       if (this.meta && this.meta.activeLangs) {
         for (let i = 0; i < this.meta.activeLangs.length; i++) {
           if (this.meta.activeLangs[i].Code === this.getSelectedLang()) {
@@ -363,7 +363,7 @@ export default {
       }
       return null
     },
-    reloadI18n () {
+    reloadI18n() {
       axios.get('/api/i18n/all').then(
         (response) => {
           this.$i18n.add(this.getSelectedLang(), response.data)
@@ -374,7 +374,7 @@ export default {
           this.handleError(err)
         })
     },
-    loadConfig () {
+    loadConfig() {
       axios.get('/api/config').then(r => {
         if (r.data) {
           this.setConfig(r.data)
@@ -383,7 +383,7 @@ export default {
         this.handleError(err)
       })
     },
-    async setConfig (d) {
+    async setConfig(d) {
       if (d.blockchainNet) {
         this.blockchainNet = d.blockchainNet
       }
@@ -399,7 +399,7 @@ export default {
         await this.wallet.validateUserNetwork(() => this.$root.$emit('service-off'), () => this.$root.$emit('service-on'))
       }
     },
-    acknowledgeFirstLogin () {
+    acknowledgeFirstLogin() {
       // Show the following overlays starting now (they can be delayed)
       localStorage.setItem('showFirstLoginMessageOn-documents', new Date())
       if (this.userIsCreatorOrHigher()) {
@@ -409,13 +409,13 @@ export default {
   },
   computed: {
     app: {
-      get () {
+      get() {
         return this.$root.$children[0]
       },
-      set (a) {}
+      set(a) {}
     }
   },
-  created () {
+  created() {
     const tmpLangToPreventFromWarnings = 'en'
     this.$i18n.fallback(tmpLangToPreventFromWarnings)
     this.$i18n.set(tmpLangToPreventFromWarnings)