landingpage work in progress (idaholab#252)

cisagov · Jan 2, 2024 · fde3112 · fde3112
1 parent dfaf9a4
commit fde3112
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 182 deletions.
diff --git a/Dockerfiles/nginx.Dockerfile b/Dockerfiles/nginx.Dockerfile
@@ -91,10 +91,21 @@ ENV NGINX_VERSION=1.22.1
 ENV NGINX_AUTH_LDAP_BRANCH=master
 ENV NGINX_HTTP_SUB_FILTER_BRANCH=master
 
+# NGINX source
 ADD https://codeload.github.com/mmguero-dev/nginx-auth-ldap/tar.gz/$NGINX_AUTH_LDAP_BRANCH /nginx-auth-ldap.tar.gz
 ADD https://codeload.github.com/yaoweibin/ngx_http_substitutions_filter_module/tar.gz/$NGINX_HTTP_SUB_FILTER_BRANCH /ngx_http_substitutions_filter_module-master.tar.gz
 ADD http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz /nginx.tar.gz
 
+# component icons from original sources
+ADD https://opensearch.org/assets/brand/SVG/Logo/opensearch_logo_default.svg /usr/share/nginx/html/landingpage/assets/imgs/
+ADD https://opensearch.org/assets/brand/SVG/Logo/opensearch_logo_darkmode.svg /usr/share/nginx/html/landingpage/assets/imgs/
+ADD https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_default.svg /usr/share/nginx/html/landingpage/assets/imgs/
+ADD https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_darkmode.svg /usr/share/nginx/html/landingpage/assets/imgs/
+ADD https://raw.githubusercontent.com/arkime/arkime/main/assets/Arkime_Logo_FullGradientWhite_Square.png /usr/share/nginx/html/landingpage/assets/imgs/
+ADD https://raw.githubusercontent.com/gchq/CyberChef/master/src/web/static/images/logo/cyberchef.svg /usr/share/nginx/html/landingpage/assets/imgs/
+ADD https://raw.githubusercontent.com/netbox-community/netbox/develop/netbox/project-static/img/netbox_icon.svg /usr/share/nginx/html/landingpage/assets/imgs/
+ADD https://github-media-downloads.s3.amazonaws.com/GitHub-Mark.zip /tmp/
+
 RUN set -x ; \
     CONFIG="\
     --prefix=/etc/nginx \
@@ -214,15 +225,23 @@ RUN set -x ; \
   apk del .gettext ; \
   mv /tmp/envsubst /usr/local/bin/ ; \
   rm -rf /usr/src/* /var/tmp/* /var/cache/apk/* /nginx.tar.gz /nginx-auth-ldap.tar.gz /ngx_http_substitutions_filter_module-master.tar.gz; \
-  touch /etc/nginx/nginx_ldap.conf /etc/nginx/nginx_blank.conf;
+  touch /etc/nginx/nginx_ldap.conf /etc/nginx/nginx_blank.conf; \
+  cd /tmp; \
+    unzip ./GitHub-Mark.zip; \
+    mv ./GitHub-Mark/PNG/GitHub-Mark-Light-120px-plus.png /usr/share/nginx/html/landingpage/assets/imgs/; \
+    rm -rf ./GitHub-Mark.zip ./GitHub-Mark; \
+  chmod 644 /usr/share/nginx/html/landingpage/assets/imgs/*.*;
 
 COPY --from=jwilder/nginx-proxy:alpine /app/nginx.tmpl /etc/nginx/
 COPY --from=jwilder/nginx-proxy:alpine /etc/nginx/network_internal.conf /etc/nginx/
 COPY --from=jwilder/nginx-proxy:alpine /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/
 COPY --from=docbuild /site/_site /usr/share/nginx/html/readme
 
-RUN mkdir -p /usr/share/nginx/html/landingpage
 COPY nginx/landingpage /usr/share/nginx/html/landingpage
+COPY --chmod=644 docs/images/logo/Malcolm_banner.png /usr/share/nginx/html/landingpage/assets/imgs/
+COPY --chmod=644 docs/images/logo/Malcolm_outline_banner_dark.png /usr/share/nginx/html/landingpage/assets/imgs/
+COPY --chmod=644 docs/images/icon/icon.png /usr/share/nginx/html/landingpage/assets/imgs/
+COPY --chmod=644 docs/images/icon/icon_dark.png /usr/share/nginx/html/landingpage/assets/imgs/
 COPY --chmod=755 shared/bin/docker-uid-gid-setup.sh /usr/local/bin/
 ADD nginx/scripts /usr/local/bin/
 ADD nginx/*.conf /etc/nginx/

diff --git a/file-upload/site/index.html b/file-upload/site/index.html
@@ -58,7 +58,7 @@
     </style>
 </head>
 <body>
-    <img class="center imgcenter" src="upload/Malcolm_banner.png" alt="%SITE_NAME%">
+    <img class="center imgcenter" src="upload/Malcolm_banner.png">
     <h1 class="panel-title">Network Traffic Artifact Upload</h1>
 
     <form id="commit_files" action="server/php/submit.php" method="post" enctype="multipart/form-data">

diff --git a/nginx/landingpage/assets/imgs/Arkime_Logo_FullGradientWhite_Square.png b/nginx/landingpage/assets/imgs/Arkime_Logo_FullGradientWhite_Square.png
diff --git a/nginx/landingpage/assets/imgs/Malcolm_banner.png b/nginx/landingpage/assets/imgs/Malcolm_banner.png
diff --git a/nginx/landingpage/assets/imgs/Malcolm_banner_white.png b/nginx/landingpage/assets/imgs/Malcolm_banner_white.png
diff --git a/nginx/landingpage/assets/imgs/cyberchef.svg b/nginx/landingpage/assets/imgs/cyberchef.svg
diff --git a/nginx/landingpage/assets/imgs/github-mark-white.svg b/nginx/landingpage/assets/imgs/github-mark-white.svg
diff --git a/nginx/landingpage/assets/imgs/icon.png b/nginx/landingpage/assets/imgs/icon.png
diff --git a/nginx/landingpage/assets/imgs/netbox_icon.svg b/nginx/landingpage/assets/imgs/netbox_icon.svg
diff --git a/nginx/landingpage/assets/imgs/opensearch.png b/nginx/landingpage/assets/imgs/opensearch.png
diff --git a/nginx/landingpage/index.html b/nginx/landingpage/index.html
@@ -52,7 +52,7 @@
     <body class="bg-dark">
         <br />
         <div>
-            <img class="imgcenter center" src="assets/imgs/Malcolm_banner_white.png" alt="%SITE_NAME%"> 
+            <img class="imgcenter center" src="assets/imgs/Malcolm_outline_banner_dark.png">
         </div>
 
         <br />
@@ -64,51 +64,51 @@ <h3 style="color:white">Internal Links</h3>
                 <div class="card bg-dark">
                     <img src="assets/imgs/Arkime_Logo_FullGradientWhite_Square.png" alt="Arkime" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/sessions/" class="btn btn-primary" target="_blank">Arkime</a>
+                        <a href="/sessions/" class="btn btn-primary" target="_blank">Arkime</a>
                     </div>
                 </div>
                 <div class="card bg-dark">
                     <img src="assets/imgs/icon.png" alt="Upload" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/upload/" class="btn btn-primary" target="_blank">Upload</a>
+                        <a href="/upload/" class="btn btn-primary" target="_blank">Upload</a>
                     </div>
                 </div>
                 <div class="card bg-dark">
                     <img src="assets/imgs/markdown.png" alt="ReadMe" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/readme/" class="btn btn-primary" target="_blank">ReadMe</a>
+                        <a href="/readme/" class="btn btn-primary" target="_blank">ReadMe</a>
                     </div>
                 </div>
                 <div class="card bg-dark">
-                    <img src="assets/imgs/opensearch.png" alt="Opensearch" class="image" style="width:100%">
+                    <img src="assets/imgs/opensearch_mark_darkmode.svg" alt="Opensearch" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/dashboards/" class="btn btn-primary" target="_blank">Opensearch</a>
+                        <a href="/dashboards/" class="btn btn-primary" target="_blank">Opensearch</a>
                     </div>
                 </div>
             </div>
             <div class="card-group">
                 <div class="card bg-dark">
                     <img src="assets/imgs/netbox_icon.svg" alt="NetBox" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/netbox/" class="btn btn-primary" target="_blank">Netbox</a>
+                        <a href="/netbox/" class="btn btn-primary" target="_blank">Netbox</a>
                     </div>
                 </div>
                 <div class="card bg-dark">
                     <img src="assets/imgs/lock.png" alt="Auth" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/auth/" class="btn btn-primary" target="_blank">Admin Access</a>
+                        <a href="/auth/" class="btn btn-primary" target="_blank">Admin Access</a>
                     </div>                
                 </div>
                 <div class="card bg-dark">
-                    <img src="assets/imgs/cyberchef.svg" alt="Auth" class="image" style="width:100%">
+                    <img src="assets/imgs/cyberchef_hat_text_512.png" alt="Auth" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/cyberchef/" class="btn btn-primary" target="_blank">CyberChef</a>
+                        <a href="/cyberchef/" class="btn btn-primary" target="_blank">CyberChef</a>
                     </div>                
                 </div>
                 <div class="card bg-dark">    
                     <img src="assets/imgs/api.png" alt="API" class="image" style="width:100%">
                     <div class="middle">
-                        <a href="https://localhost/mapi/" class="btn btn-primary" target="_blank">API</a>
+                        <a href="/mapi/" class="btn btn-primary" target="_blank">API</a>
                     </div>             
                 </div>
             </div>
@@ -119,7 +119,7 @@ <h3 style="color:white">Internal Links</h3>
             <h3 style="color:white">External Links</h3>
             <div class="card-group">
                 <div class="card bg-dark">
-                    <img src="assets/imgs/github-mark-white.svg" alt="Auth" class="image" style="width:100%">
+                    <img src="assets/imgs/GitHub-Mark-Light-120px-plus.png" alt="Auth" class="image" style="width:100%">
                     <div class="middle">
                         <a href="https://github.com/cisagov/Malcolm" class="btn btn-primary" target="_blank">GitHub</a>
                     </div>