Skip to content

Commit

Permalink
feat(style): add spinner on OidcCallback view + rearrange css
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasRichel committed Jan 15, 2021
1 parent 3ed218b commit 0d886a4
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 39 deletions.
10 changes: 1 addition & 9 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,9 @@
<router-view />
</template>

<style lang="scss">
@import '~@bimdata/design-system/dist/scss/utilities/spacing.scss';
@import '~@bimdata/design-system/dist/scss/utilities/text.scss';
<style>
body {
margin: 0;
padding: 0;
min-width: 100vw;
min-height: 100vh;
background-color: $color-tertiary-lightest;
font-family: $primary-font;
font-size: $font-size;
}
</style>
7 changes: 7 additions & 0 deletions src/Layout.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#layout {
min-width: 100vw;
min-height: 100vh;
background-color: $color-tertiary-lightest;
font-family: $primary-font;
font-size: $font-size;
}
2 changes: 2 additions & 0 deletions src/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ export default {
}
}
</script>

<style scoped lang="scss" src="./Layout.scss"></style>
4 changes: 1 addition & 3 deletions src/components/platform-header/PlatformHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,4 @@ export default {
}
</script>

<style lang="scss" scoped>
@import './PlatformHeader.scss';
</style>
<style scoped lang="scss" src="./PlatformHeader.scss"></style>
4 changes: 1 addition & 3 deletions src/components/user-menu/UserMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,4 @@ export default {
}
</script>

<style lang="scss" scoped>
@import './UserMenu.scss';
</style>
<style scoped lang="scss" src="./UserMenu.scss"></style>
3 changes: 0 additions & 3 deletions src/views/home/Home.scss

This file was deleted.

14 changes: 0 additions & 14 deletions src/views/home/Home.vue

This file was deleted.

7 changes: 7 additions & 0 deletions src/views/oidc-callback/OidcCallback.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.oidc-callback-view {
width: 100vw;
height: 100vh;
display: flex;
justify-content: center;
align-items: center;
}
15 changes: 11 additions & 4 deletions src/views/oidc-callback/OidcCallback.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
<template>
<div class="oidc-callback-view">
OIDC Callback view
<BIMDataBigSpinner style="transform: translateX(130px);"></BIMDataBigSpinner>
</div>
</template>

<script>
import { onMounted } from 'vue';
import { useRouter } from 'vue-router';
import { useGlobalState } from '@/state/globalState';
// Components
import BIMDataBigSpinner from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataBigSpinner.js';
export default {
components: {
BIMDataBigSpinner
},
setup() {
const router = useRouter();
const { signInCallback } = useGlobalState();
onMounted(() => {
signInCallback().then(result => {
router.push({ path: result.state ? result.state : '/' });
});
signInCallback().then(
result => router.push({ path: result.state ? result.state : '/' })
);
});
}
}
</script>

<style scoped lang="scss" src="./OidcCallback.scss"></style>
4 changes: 1 addition & 3 deletions src/views/spaces/Spaces.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,4 @@ export default {
}
</script>

<style lang="scss" scoped>
@import './Spaces.scss';
</style>
<style scoped lang="scss" src="./Spaces.scss"></style>

0 comments on commit 0d886a4

Please sign in to comment.