Merge pull request #1541 from SynBioHub/althome

adding althome to sbh1 and backend
SynBioHub · May 13, 2024 · d02b376 · d02b376
2 parents 94a4e18 + 13a115c
commit d02b376
Show file tree

Hide file tree

Showing 14 changed files with 556 additions and 557 deletions.
diff --git a/lib/views/admin/theme.js b/lib/views/admin/theme.js
@@ -41,6 +41,7 @@ function form (req, res) {
     uriPrefix: config.get('databasePrefix'),
     frontPageText: config.get('frontPageText'),
     firstLaunch: config.get('firstLaunch'),
+    altHome: config.get('altHome'),
     currentTheme: currentTheme,
     themeParameters: themeParameters
   }
@@ -112,6 +113,13 @@ function post (req, res) {
     publishUpdate = true
   }
 
+  console.log(typeof (req.body))
+
+  if (typeof req.body === 'object' && 'altHome' in req.body && req.body.altHome !== config.get('altHome')) {
+    config.set('altHome', req.body.altHome)
+    publishUpdate = true
+  }
+
   if (publishUpdate) {
     updateWor()
   }

diff --git a/lib/views/setup.js b/lib/views/setup.js
@@ -19,9 +19,10 @@ const settingsSchema = Joi.object({
   userName: requiredString('Please enter a username for the initial user account'),
   userFullName: requiredString('Please enter a full name for the initial user account'),
   userEmail: requiredString('Please enter a valid e-mail address for the initial user account').email(),
-  frontendURL: requiredString('Please enter the frontend URL of your instance'),
+  frontendURL: Joi.string().allow(''),
   instanceUrl: requiredString('Please enter the backend URL of your instance'),
   uriPrefix: requiredString('Please enter the URI prefix of your instance'),
+  altHome: Joi.string().allow(''),
   frontPageText: requiredString('Please enter some welcome text for your homepage'),
   userPassword: requiredString('Please enter a password for the initial user account', { trim: false }),
   userPasswordConfirm: requiredString("Passwords didn't match", { trim: false }).valid(Joi.ref('userPassword')),
@@ -55,9 +56,10 @@ module.exports = function (req, res) {
 
   const settings = {
     instanceName: 'My SynBioHub',
-    frontendURL: req.protocol + '://' + req.get('Host') + '/',
+    frontendURL: '',
     instanceUrl: req.protocol + '://' + req.get('Host') + '/',
     uriPrefix: req.protocol + '://' + req.get('Host') + '/',
+    altHome: '',
     userName: '',
     affiliation: '',
     userFullName: '',
@@ -93,9 +95,10 @@ async function setupPost (req, res, settings) {
     {
       ...settings,
       instanceName: req.body.instanceName,
-      frontendURL: req.body.frontendURL,
+      frontendURL: req.body.frontendURL || '',
       instanceUrl: req.body.instanceUrl,
       uriPrefix: req.body.uriPrefix,
+      altHome: req.body.altHome || '',
       userName: req.body.userName,
       affiliation: req.body.affiliation,
       userFullName: req.body.userFullName,
@@ -129,6 +132,10 @@ async function setupPost (req, res, settings) {
     updatedSettings.uriPrefix += '/'
   }
 
+  if (updatedSettings.altHome && updatedSettings.altHome[updatedSettings.altHome.length - 1] !== '/') {
+    updatedSettings.altHome += '/'
+  }
+
   if (error) {
     if (req.accepts('text/html')) {
       return setupForm(req, res, updatedSettings, {
@@ -156,6 +163,7 @@ async function setupPost (req, res, settings) {
   config.set('frontPageText', updatedSettings.frontPageText)
   config.set('allowPublicSignup', updatedSettings.allowPublicSignup)
   config.set('databasePrefix', updatedSettings.uriPrefix)
+  config.set('altHome', updatedSettings.altHome)
 
   config.set('triplestore', {
     ...config.get('triplestore'),

diff --git a/templates/views/setup.jade b/templates/views/setup.jade
@@ -50,18 +50,12 @@ block body
             br
             h2 2. Some technical details
             div.form-group
-                p
-                    | Frontend Url: We need to know where this SynBioHub instance is is displayed. If the URL below is incorrect, please change it
-                    b  #{settings.frontendURL}
-                    |, but if this is incorrect, please change it here.
-                label Frontend URL
-                    input.form-control(name='frontendURL',value=settings.frontendURL)
                 p
                     | Backend Url: We need to know where this SynBioHub instance is hosted so we can assign URLs to your submissions.  The instance URL has been automatically guessed as
                     b  #{settings.instanceUrl}
                     |, but if this is incorrect, please change it here.
                 label Instance URL
-                    input.form-control(name='instanceURL',value=settings.instanceUrl)
+                    input.form-control(name='instanceUrl',value=settings.instanceUrl)
                 p
                     | We need to know how to prefix URIs of objects stored in this SynBioHub. Its default is the same as the URL, and should only be changed if you are shadowing another instance.
                 label URI Prefix   

diff --git a/tests/first_time_setup.py b/tests/first_time_setup.py
@@ -25,7 +25,7 @@ def test_post(self):
             'userEmail': '[email protected]',
             'userPassword': 'test',
             'userPasswordConfirm': 'test',
-            'instanceName': 'Test Synbiohub', 'frontendURL': 'http://localhost:7777',
+            'instanceName': 'Test Synbiohub',
             'instanceUrl': 'http://localhost:7777/',
             'uriPrefix': 'http://localhost:7777/',
             'color': '#D25627',