Merge pull request #338 from FAIMS/fieldmark-rebrand-alt

Fieldmark Rebrand (mk 2)

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

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."});
     }`,
   };
 

views/auth.handlebars

@@ -14,7 +14,7 @@
 
     {{#each providers}}
     <a href="/auth/{{ this.label }}/" class="w-100 btn btn-lg btn-primary"
-            style="background-color:#1B3E93;">{{ this.name }}</a>
+            style="background-color:#669911;">{{ this.name }}</a>
     {{/each}}
 
     <div class=" w-100 m-auto text-center">

views/home.handlebars

@@ -68,7 +68,7 @@
       {{#if cluster_admin}}
       <div class="card">
         <div class="card-header">
-          <h2>Cluster Administration</h2>
+          Cluster Administration
         </div>
         <div class="card-body">
           <a href="/users/">User Management</a>

views/layouts/main.handlebars

@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
-    <title>FAIMS-3 Conductor</title>
-    <link rel="icon" type="image/x-icon" href="/images/favicon.ico">
+    <title>Fieldmark Conductor</title>
+    <link rel="icon" type="image/png" href="/images/favicon.png">
+    <link rel="icon" type="image/svg+xml" href="/images/favicon.svg">
    <!-- CSS only -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
 
@@ -21,43 +22,54 @@
       align-items: center;
       padding-top: 40px;
       padding-bottom: 40px;
-      background-color: #f5f5f5;
+      background-color: #edeeeb;
     }
 
     .form-signin {
       max-width: 400px;
       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;
     }
   </style>
 </head>
 <body class="d-flex flex-column h-100" >
   <main class="w-100 m-auto">
   <div class="form-signin w-100 m-auto text-center">
-    <a href="/"><img src="/images/Faims-medium.png" style='max-width:150px;' /></a>
+    <a href="/"><img src="/images/Fieldmark-Portrait-Margin@4x.png" style='max-width:150px;' /></a>
   </div>
   {{{body}}}
   <div class="form-signin w-100 m-auto">

views/register.handlebars

@@ -8,7 +8,7 @@
 
   {{#each providers}}
   <p><a href="/register/{{../invite}}/{{ this.label }}/" class="w-100 btn btn-lg btn-primary"
-          style="background-color:#1B3E93;">{{ this.name }}</a></p>
+          style="background-color:#669911;">{{ this.name }}</a></p>
   {{/each}}
 
   {{#if localAuth}}

views/send-token.handlebars

@@ -46,9 +46,9 @@ fetch(
 </script>
 <div class="form-signin w-100 m-auto">
 <h3 class="h3 mb-3 fw-normal text-center" style="margin-top:50px">Logging you into the app</h3>
-<p>Welcome to FAIMS3</p>
+<p>Welcome to Fieldmark</p>
 <ul>
-<li>If you have loaded this page in the app, please choose "Done" to return to FAIMS3.</li>
+<li>If you have loaded this page in the app, please choose "Done" to return to Fieldmark.</li>
 <li>If you are using a web browser, close this tab, and reopen this page via the web
 app. The web app is running at <a href="{{ web_url }}">{{ web_url }}</a>.</li>
 </ul>