Merge branch 'master' into dependabot/npm_and_yarn/webpack-5.107.2

Author: shiroinekotfs

.docker/docker-compose.yml

@@ -5,4 +5,4 @@ services:
     ports:
       - 127.0.0.1:8080:3000
     restart: always
-    image: anhvlttfs/tnw-web:latest
+    image: theflightsims/tnw-web:latest

.github/workflows/docker.yml

@@ -37,6 +37,7 @@ jobs:
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
+              if: github.ref == 'refs/heads/master'
 
             - name: Build and push multi-arch image (On-push to Docker)
               uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
@@ -46,5 +47,5 @@ jobs:
                   platforms: linux/amd64
                   push: true
                   tags: |
-                      anhvlttfs/tnw-web:latest
+                      theflightsims/tnw-web:latest
               if: github.ref == 'refs/heads/master'

src/app/components/Header/index.js

@@ -14,7 +14,7 @@ export function Header(props) {
         <>
             <CarbonHeader aria-label="Website Header">
                 <SkipToContent />
-                <HeaderName href="#" prefix={brandName}>| {productUsage}</HeaderName>
+                <HeaderName href="/" prefix={brandName}>| {productUsage}</HeaderName>
                 <HeaderGlobalBar>
                     {headerCTAcontents}
                 </HeaderGlobalBar>

src/app/components/LoginDetail/index.js

@@ -5,7 +5,7 @@ import { Modal, TextInput, Button } from "@carbon/react";
 import { useState } from "react";
 import { useMsal } from '@azure/msal-react';
 
-import { loginRequest } from '@/authConfig';
+import { loginRequest, externalDomain } from '@/config/authConfig';
 
 export function LoginDetail(props) {
     // Properties declaration
@@ -26,6 +26,7 @@ export function LoginDetail(props) {
     }
 
     const { instance, accounts } = useMsal();
+
     const activeAccount = instance.getActiveAccount() || ((accounts.length > 0 && accounts[0] != null) ? accounts[0] : null);
 
     const NotLoggedIn = () => {
@@ -72,8 +73,8 @@ export function LoginDetail(props) {
                     onRequestClose={closeModal}
                     onRequestSubmit={handleLogoutRedirect}>
                     <TextInput labelText="Name" defaultValue={activeAccount?.name} readOnly={true} />
-                    <TextInput labelText="User Principal Name" defaultValue={activeAccount?.username} readOnly={true} />
-                    <TextInput labelText="Tenant ID" defaultValue={activeAccount?.tenantId} readOnly={true} />
+                    <TextInput labelText="User Principal Name" defaultValue={activeAccount?.localAccountId + "@" + externalDomain} readOnly={true} />
+                    <TextInput labelText="Tenant Domain" defaultValue={activeAccount?.environment} readOnly={true} />
                     <TextInput labelText="IdP" defaultValue={idpFriendlyName} readOnly={true} />
                 </Modal>
             </>

src/app/MsalProviderWrapper.js …/components/MsalProviderWrapper/index.jssrc/app/MsalProviderWrapper.js renamed to src/app/components/MsalProviderWrapper/index.js src/app/MsalProviderWrapper.js renamed to src/app/components/MsalProviderWrapper/index.js

@@ -3,7 +3,7 @@
 import React from 'react';
 import { MsalProvider } from '@azure/msal-react';
 import { PublicClientApplication, EventType } from '@azure/msal-browser';
-import { msalConfig } from '@/authConfig';
+import { msalConfig } from '@/config/authConfig';
 
 // MSAL should be instantiated once to avoid re-instantiation on re-renders
 const msalInstance = new PublicClientApplication(msalConfig);
@@ -16,7 +16,7 @@ msalInstance.addEventCallback((event) => {
     }
 });
 
-export default function MsalProviderWrapper({ children }) {
+export function MsalProviderWrapper({ children }) {
     return (
         <MsalProvider instance={msalInstance}>
             {children}

src/app/components/SingleCardWithBg/index.scss

@@ -1,5 +1,6 @@
 .singlenewcomer-style {
-    
+    backdrop-filter: blur(100px);
+    -webkit-backdrop-filter: blur(100px);
     background-position: center;
     background-size: cover;
     background-repeat: no-repeat;

…/components/SingleCardWithImage/index.js …onents/SingleCardWithLargeImage/index.jssrc/app/components/SingleCardWithImage/index.js renamed to src/app/components/SingleCardWithLargeImage/index.js src/app/components/SingleCardWithImage/index.js renamed to src/app/components/SingleCardWithLargeImage/index.js

@@ -2,7 +2,7 @@ import { FlexGrid, Row, Column } from '@carbon/react';
 
 import "./index.scss";
 
-export function SingleCardWithImage(props) {
+export function SingleCardWithLargeImage(props) {
     // Properties declaration
     let rootClassName = props.rootClassName || "";
     let singleCardContent = props.children || (<></>);

…omponents/SingleCardWithImage/index.scss …ents/SingleCardWithLargeImage/index.scsssrc/app/components/SingleCardWithImage/index.scss renamed to src/app/components/SingleCardWithLargeImage/index.scss src/app/components/SingleCardWithImage/index.scss renamed to src/app/components/SingleCardWithLargeImage/index.scss

@@ -3,6 +3,7 @@ export * from "./CardGroup";
 export * from "./Footer";
 export * from "./Header";
 export * from "./LoginDetail";
+export * from "./MsalProviderWrapper";
 export * from "./SingleCardNoImage";
 export * from "./SingleCardWithBg";
-export * from "./SingleCardWithImage";
+export * from "./SingleCardWithLargeImage";

src/app/components/index.js

@@ -1,3 +1,6 @@
+
+export const externalDomain = "tnwb2c.onmicrosoft.com"
+
 /**
  * Configuration object to be passed to MSAL instance on creation. 
  * For a full list of MSAL.js configuration parameters, visit: