Merge branch 'main' into ac11y-2317

microsoftgraph · Jul 12, 2023 · a80a0f1 · a80a0f1
2 parents 2d9f9cb + 362339a
commit a80a0f1
Show file tree

Hide file tree

Showing 5 changed files with 36,647 additions and 82 deletions.
diff --git a/samples/proxy-provider-asp-net-core/Controllers/HomeController.cs b/samples/proxy-provider-asp-net-core/Controllers/HomeController.cs
@@ -75,7 +75,7 @@ public async Task<IActionResult> SendEmail(string recipients)
             }
         }
 
-        [AllowAnonymous]
+        [Authorize]
         public IActionResult Messages()
         {
             return View();

diff --git a/samples/proxy-provider-asp-net-core/Views/Home/Messages.cshtml b/samples/proxy-provider-asp-net-core/Views/Home/Messages.cshtml
@@ -16,9 +16,9 @@
     const messagesGet = document.getElementById('messagesGet');
 
     channelPicker.addEventListener('selectionChanged', e => {
-        if (e.detail.length) {
-            let channelId = e.detail[0].channel.id;
-            let teamId = e.detail[0].team.id;
+        if (e.detail) {
+            let channelId = e.detail.channel.id;
+            let teamId = e.detail.team.id;
             messagesGet.resource = `teams/${teamId}/channels/${channelId}/messages/delta`;
         }
     });

diff --git a/samples/proxy-provider-asp-net-core/Views/Shared/_Layout.cshtml b/samples/proxy-provider-asp-net-core/Views/Shared/_Layout.cshtml
@@ -19,7 +19,7 @@
         <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
     </environment>
 
-    <script src='https://unpkg.com/@Html.Raw("@")microsoft/mgt@3.0.0-rc.3-next.fluentui.d084665/dist/bundle/mgt-loader.js'></script>
+    <script src='https://unpkg.com/@Html.Raw("@")microsoft/mgt@3/dist/bundle/mgt-loader.js'></script>
 
     <script>
         const provider = new mgt.ProxyProvider(window.location.origin + "/api/Proxy");
@@ -47,7 +47,7 @@
                     <li><a asp-area="" asp-controller="Home" asp-action="Messages">Messages</a></li>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
-                    <mgt-login></mgt-login>
+                    <mgt-login class="login"></mgt-login>
                 </ul>
             </div>
         </div>
@@ -85,5 +85,9 @@
     </environment>
 
     @RenderSection("Scripts", required: false)
+    <script>
+        const navBar = document.querySelector('nav');
+        mgt.applyTheme('dark', navBar);
+    </script>
 </body>
 </html>
diff --git a/samples/proxy-provider-asp-net-core/wwwroot/css/site.css b/samples/proxy-provider-asp-net-core/wwwroot/css/site.css
@@ -28,12 +28,23 @@ textarea {
     width: 100%;
 }
 
-mgt-login {
+.login {
     --button-color: #9d9d9d;
     --button-background-color--hover: transparent;
     --button-color--hover: white;
 }
 
+.navbar-collapse.collapse {
+    display: flex!important;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.navbar-collapse.collapse::after,
+.navbar-collapse.collapse::before {
+    display: none;
+}
+
 /* Hide/rearrange for smaller screens */
 @media screen and (max-width: 767px) {
     /* Hide captions */