Skip to content

Commit 44e88f6

Browse files
authored
Merge pull request #926 from SlideRuleEarth/ProvSysWork
Prov sys work
2 parents 5e72cc8 + fa8b0cd commit 44e88f6

17 files changed

+3210
-425
lines changed

web-client/src/components/SrAppBar.vue

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ const ttl = ref(720)
4141
const isGitHubAuthenticated = computed(() => {
4242
return githubAuthStore.authStatus === 'authenticated' && githubAuthStore.hasValidAuth
4343
})
44-
//const isGitHubAuthenticating = computed(() => githubAuthStore.authStatus === 'authenticating') // temporarily unused to hide login button
44+
const isGitHubAuthenticating = computed(() => githubAuthStore.authStatus === 'authenticating')
4545
const githubUsername = computed(() => githubAuthStore.username)
4646
const githubIsMember = computed(() => githubAuthStore.isMember)
4747
const githubIsOwner = computed(() => githubAuthStore.isOwner)
48-
// function handleGitHubLogin() { // temporarily disabled to hide login button
49-
// githubAuthStore.initiateLogin()
50-
// }
48+
function handleGitHubLogin() {
49+
githubAuthStore.initiateLogin()
50+
}
5151
5252
const displayTour = computed(() => {
5353
return route.name === 'home' || route.name === 'request'
@@ -597,15 +597,13 @@ const mobileMenuItems = computed(() => {
597597
icon: 'pi pi-user',
598598
items: userMenuItems.value
599599
})
600+
} else {
601+
items.push({
602+
label: 'Login',
603+
icon: 'pi pi-github',
604+
command: handleGitHubLogin
605+
})
600606
}
601-
// GitHub login temporarily disabled
602-
// else {
603-
// items.push({
604-
// label: 'Login',
605-
// icon: 'pi pi-github',
606-
// command: handleGitHubLogin
607-
// })
608-
// }
609607
610608
return items
611609
})
@@ -847,7 +845,6 @@ function hideTooltip() {
847845
>
848846
</Button>
849847
<Menu :model="aboutMenuItems" popup ref="aboutMenu" />
850-
<!-- GitHub login button temporarily disabled
851848
<Button
852849
v-if="!isGitHubAuthenticated"
853850
icon="pi pi-github"
@@ -860,7 +857,6 @@ function hideTooltip() {
860857
@click="handleGitHubLogin"
861858
>
862859
</Button>
863-
-->
864860
<Button
865861
v-if="isGitHubAuthenticated"
866862
id="sr-user-button"

0 commit comments

Comments
 (0)