Merge branch 'feature/SHIBUI-1029' into SHIBUI-1029

TIER · Jan 21, 2019 · 7375d79 · 7375d79
2 parents 418e736 + 702181a
commit 7375d79
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 2 deletions.
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
@@ -432,6 +432,9 @@ message.required-for-regex=Required for Regex
 message.file-doesnt-exist=The requested file to be processed does not exist on the server.
 message.database-constraint=There was a database constraint problem processing the request. Check the request to ensure that fields that must be unique are truly unique.
 
+message.user-request-received-title=User request received
+message.user-request-received-body=Your request has been received and is being reviewed. You will be notified with access status.
+
 tooltip.entity-id=Entity ID
 tooltip.service-provider-name=Service Provider Name (Dashboard Display Only)
 tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process

diff --git a/ui/angular.json b/ui/angular.json
@@ -35,7 +35,7 @@
           "configurations": {
             "production": {
               "optimization": true,
-              "outputHashing": "all",
+              "outputHashing": "bundles",
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -9,7 +9,10 @@
     "test": "ng test --code-coverage",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "buildProd": "ng build --prod",
+    "build:static": "node-sass src/static.scss ./dist/static.css",
+    "copy:static": "ncp ./src/static.html ./dist/static.html",
+    "copy": "npm run build:static && npm run copy:static",
+    "buildProd": "ng build --prod && npm run copy",
     "bundle-report": "webpack-bundle-analyzer dist/stats.json"
   },
   "private": true,
@@ -63,6 +66,7 @@
     "karma-jasmine-html-reporter": "^0.2.2",
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-spec-reporter": "0.0.31",
+    "ncp": "^2.0.0",
     "path": "^0.12.7",
     "protractor": "~5.1.2",
     "ts-node": "~3.2.0",

diff --git a/ui/src/static.html b/ui/src/static.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title th:text="#{messages.brand.header.title}">Shibboleth Metadata Management</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" type="image/x-icon" href="favicon.ico">
+    <link rel="icon" type="image/png" sizes="96x96" href="assets/favicon-96x96.png">
+    <link rel="stylesheet" type="text/css" href="static.css">
+    <base href="/">
+</head>
+<body>
+    <nav class="navbar navbar-expand-md fixed-top bg-white">
+        <span class="navbar-text" th:text="#{messages.brand.header.title}">Shibboleth Metadata Management</span>
+    </nav>
+    <main class="container-fluid p-3">
+        <div class="d-flex justify-content-center">
+            <div class="card align-self-center">
+                <div class="card-body d-flex justify-content-between">
+                    <i class="fa fa-fw fa-check-circle-o fa-3x text-success"></i>
+                    <div class="ml-2 px-3">
+                        <h5 class="card-title" th:text="#{messages.message.user-request-received-title}">User request received</h5>
+                        <p class="card-text" th:text="#{messages.message.user-request-received-body}">Your request has been received and is being reviewed. You will be notified with access status.</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </main>
+</body>
+</html>
diff --git a/ui/src/static.scss b/ui/src/static.scss
@@ -0,0 +1,28 @@
+@import '../node_modules/bootstrap/scss/bootstrap';
+
+@import './theme/palette';
+
+$font-size-xs: .75rem !default;
+$fa-font-path: ".";
+
+@import '../node_modules/font-awesome/scss/font-awesome';
+
+body {
+    background-color: map-get($theme-colors, light);
+    padding-top: 56px;
+}
+
+.section {
+    .section-body {
+        background: $white;
+    }
+}
+
+nav.fixed-top {
+    border-bottom: 3px solid map-get($theme-colors, primary);
+}
+
+.card {
+    margin: 100px;
+    max-width: 500px;
+}