diff --git a/couchdb/local.ini.bak b/couchdb/local.ini.bak new file mode 100644 index 00000000..2317e1e1 --- /dev/null +++ b/couchdb/local.ini.bak @@ -0,0 +1,31 @@ +; CouchDB Configuration Settings for FAIMS + +[couchdb] +max_document_size = 4294967296 ; bytes +os_process_timeout = 5000 ; 5 sec +uuid = adf990d5dd21b735f65d4140ad1f10c2 + +[chttpd] +port = 5984 +bind_address = 0.0.0.0 +authentication_handlers = {chttpd_auth, cookie_authentication_handler}, {chttpd_auth, jwt_authentication_handler}, {chttpd_auth, default_authentication_handler} + + +[httpd] +enable_cors = true + +[couchdb] +single_node=true + +[log] +writer = syslog +level = info + +[chttpd_auth] +secret = 0d468e9b-9dcc-44bf-9bf3-a75433f6f970 + +[cors] +origins = * +headers = accept, authorization, content-type, origin, referer +credentials = true +methods = GET, PUT, POST, HEAD, DELETE diff --git a/public/images/Faims-medium.png b/public/images/Faims-medium.png deleted file mode 100644 index 82b7f953..00000000 Binary files a/public/images/Faims-medium.png and /dev/null differ diff --git a/public/images/Faims-white-small.png b/public/images/Faims-white-small.png deleted file mode 100644 index 1033d017..00000000 Binary files a/public/images/Faims-white-small.png and /dev/null differ diff --git a/public/images/Fieldmark-Portrait-Margin@4x.png b/public/images/Fieldmark-Portrait-Margin@4x.png new file mode 100644 index 00000000..48042db9 Binary files /dev/null and b/public/images/Fieldmark-Portrait-Margin@4x.png differ diff --git a/public/images/Fieldmark-Short-Green@4x.png b/public/images/Fieldmark-Short-Green@4x.png new file mode 100644 index 00000000..31187741 Binary files /dev/null and b/public/images/Fieldmark-Short-Green@4x.png differ diff --git a/public/images/favicon.ico b/public/images/favicon.ico deleted file mode 100644 index e370150e..00000000 Binary files a/public/images/favicon.ico and /dev/null differ diff --git a/public/images/favicon.png b/public/images/favicon.png new file mode 100644 index 00000000..87f040e3 Binary files /dev/null and b/public/images/favicon.png differ diff --git a/public/images/favicon.svg b/public/images/favicon.svg new file mode 100644 index 00000000..88d55e22 --- /dev/null +++ b/public/images/favicon.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/couchdb/initialise.ts b/src/couchdb/initialise.ts index 80f1277a..2f0563b0 100644 --- a/src/couchdb/initialise.ts +++ b/src/couchdb/initialise.ts @@ -43,7 +43,7 @@ export const initialiseProjectsDB = async ( if (userCtx.roles.indexOf('_admin') < 0) { throw { unauthorized: - \`Access denied for \${userCtx.roles}. Only the FAIMS server may modify projects\`, + \`Access denied for \${userCtx.roles}. Only the Fieldmark server may modify projects\`, }; } }`, @@ -72,7 +72,7 @@ export const initialiseDirectoryDB = async ( const directoryDoc = { _id: 'default', name: CONDUCTOR_INSTANCE_NAME, - description: `FAIMS instance on ${CONDUCTOR_PUBLIC_URL}`, + description: `Fieldmark instance on ${CONDUCTOR_PUBLIC_URL}`, people_db: { db_name: 'people', }, @@ -88,7 +88,7 @@ export const initialiseDirectoryDB = async ( if (userCtx.roles.indexOf('_admin') >= 0) { return; } - throw({forbidden: "Access denied. Only the FAIMS admin can modify the directory."}); + throw({forbidden: "Access denied. Only the Fieldmark admin can modify the directory."}); }`, }; diff --git a/views/auth.handlebars b/views/auth.handlebars index 8493d9a2..dd96a5ac 100644 --- a/views/auth.handlebars +++ b/views/auth.handlebars @@ -14,7 +14,7 @@ {{#each providers}} {{ this.name }} + style="background-color:#669911;">{{ this.name }} {{/each}}
diff --git a/views/home.handlebars b/views/home.handlebars index 132621d0..c37b5989 100644 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -68,7 +68,7 @@ {{#if cluster_admin}}
-

Cluster Administration

+ Cluster Administration
User Management diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index 5ee0d84c..2a986c7d 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -4,8 +4,9 @@ - FAIMS-3 Conductor - + Fieldmark Conductor + + @@ -21,7 +22,7 @@ align-items: center; padding-top: 40px; padding-bottom: 40px; - background-color: #f5f5f5; + background-color: #edeeeb; } .form-signin { @@ -29,35 +30,46 @@ padding: 15px; } - .btn-primary { - background-color: #1B3E93; - border-color: #1B3E93 - } + .btn-outline-primary { - color: #1B3E93; - border-color: #1B3E93 + color: #669911; + border-color: #669911; } .callout{ padding: 1.25rem; margin-top: 1.25rem; margin-bottom: 1.25rem; - background-color: #F8F9FA; - border-left: 0.25rem solid #DFE2E6 + background-color: #edeeeb; + border-left: 0.25rem solid #edeeeb } .form-signin { max-width: 400px; padding: 15px; } .btn-primary { - background-color: #1B3E93; - border-color: #1B3E93 + background-color: #669911; + border-color: #669911; + --bs-btn-color: #fff; + --bs-btn-bg: #FFA000; + --bs-btn-border-color: #FFA000; + --bs-btn-hover-color: #fff; + --bs-btn-hover-bg: #FFA000; + --bs-btn-hover-border-color: #FFA000; + --bs-btn-focus-shadow-rgb: 49,132,253; + --bs-btn-active-color: #fff; + --bs-btn-active-bg: #FFA000; + --bs-btn-active-border-color: #FFA000; + --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); + --bs-btn-disabled-color: #fff; + --bs-btn-disabled-bg: #FFA000; + --bs-btn-disabled-border-color: #FFA000; }
{{{body}}}