Skip to content

Commit

Permalink
Clanup: bubble class
Browse files Browse the repository at this point in the history 
Added: experimental components to vuetify 3.3.1 (labs)
  • Loading branch information
@MarcelGeo
MarcelGeo committed May 29, 2023
1 parent 525e4ca commit 5da5097
Show file tree
Hide file tree
Showing 11 changed files with 218 additions and 222 deletions.
2 changes: 1 addition & 1 deletion web-app/packages/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
"vue-router": "^4.1.6",
"vue-tabler-icons": "~2.20.0",
"vue-tel-input": "~4.4.2",
"vuetify": "^3.3.0"
"vuetify": "^3.3.1"
}
}
8 changes: 8 additions & 0 deletions web-app/packages/app/src/plugins/vuetify/vuetify.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
import { useI18n } from 'vue-i18n'
import { createVuetify } from 'vuetify'
import { createVueI18nAdapter } from 'vuetify/locale/adapters/vue-i18n'
import * as components from 'vuetify/components'
import * as directives from 'vuetify/directives'
import * as labsComponents from 'vuetify/labs/components'

import i18n from '@/plugins/i18n/i18n'
// TODO: saas overrides should be integrated differently,
Expand All @@ -21,6 +24,11 @@ const colors = {
}

export default createVuetify({
components: {
...components,
...labsComponents
},
directives,
locale: {
adapter: createVueI18nAdapter({ i18n, useI18n })
},
Expand Down
12 changes: 6 additions & 6 deletions web-app/packages/lib/src/common/components/FullStorageWarningTemplate.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial

<template>
<v-card
class="bubble mt-3"
class="mt-3"
style="background-color: #fce8e6; color: rgba(0, 0, 0, 0.87)"
variant="outlined"
>
<span>
<b>Your storage is almost full ({{ usage }}%).</b> Soon you will not be
able to sync your projects.
<slot name="buttons"></slot>
</span>
<v-card-text
><span>
<b>Your storage is almost full ({{ usage }}%).</b> Soon you will not be
able to sync your projects. <slot name="buttons"></slot> </span
></v-card-text>
</v-card>
</template>

Expand Down
4 changes: 2 additions & 2 deletions web-app/packages/lib/src/common/components/WarningMessageTemplate.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial

<template>
<v-card
class="bubble mt-3"
class="mt-3"
style="background-color: #ffc863; color: rgba(0, 0, 0, 0.87); padding: 10px"
variant="outlined"
>
<slot name="message"></slot>
<v-card-tex><slot name="message"></slot></v-card-tex>
</v-card>
</template>

Expand Down
5 changes: 2 additions & 3 deletions web-app/packages/lib/src/modules/dashboard/components/DashboardAccessRequestsRow.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
namespaceAccessRequests.length > 0
"
>
<v-card class="bubble mt-3">
<h3>Project access requests</h3>
<v-card variant="tonal" class="mt-3">
<v-card-title><h3>Project access requests</h3></v-card-title>
<v-card-text>
<slot name="table" :namespace="currentNamespace"></slot>
</v-card-text>
Expand Down Expand Up @@ -54,5 +54,4 @@ export default defineComponent({
</script>

<style scoped lang="scss">
@import 'src/sass/dashboard';
</style>
5 changes: 2 additions & 3 deletions web-app/packages/lib/src/modules/dashboard/components/DashboardProjectsRow.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
<template>
<v-row>
<v-col class="pa-0">
<v-card class="bubble mt-3" variant="outlined" color="white">
<h3>Recent active projects</h3>
<v-card class="mt-3" variant="outlined" color="white">
<v-card-title><h3>Recent active projects</h3></v-card-title>
<v-card-text style="padding-left: 0">
<slot name="projects"></slot>
</v-card-text>
Expand All @@ -26,5 +26,4 @@ export default defineComponent({
</script>

<style scoped lang="scss">
@import 'src/sass/dashboard';
</style>
112 changes: 57 additions & 55 deletions web-app/packages/lib/src/modules/dashboard/views/DashboardViewTemplate.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
<v-container>
<slot name="usageInfo" />
<v-row v-if="projectsCount === 0 && canCreateProject">
<v-card variant="outlined" class="bubble mt-3">
<v-card variant="outlined" class="mt-3">
<h3>Welcome {{ loggedUser.username }}, are you ready to start?</h3>
<p>
First create new project, add people to it or explore public
Expand All @@ -27,57 +27,60 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
</v-row>
<v-row>
<v-col class="pa-0">
<v-card class="bubble mt-3" variant="outlined">
<h3>Download Mergin Maps Input app</h3>
<p>
Capture geo-info easily through your mobile/tablet with the
Mergin Maps Input app. Designed to be compatible with all mobile
devices - even those with small screens.
</p>
<v-row>
<v-col cols="7" md="3" sm="3">
<div class="store-button">
<a
href="https://play.google.com/store/apps/details?id=uk.co.lutraconsulting&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
target="_blank"
>
<img
alt="Get it on Google Play"
src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
height="70px"
/>
</a>
</div>
</v-col>
<v-col cols="7" md="3" sm="3">
<div class="store-button app-store-button">
<a
href="https://apps.apple.com/us/app/input/id1478603559?ls=1&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
target="_blank"
>
<img
alt="Get it on Apple store"
src="@/assets/App_Store.svg"
height="48px"
/>
</a>
</div>
</v-col>
<v-col cols="7" md="3" sm="3">
<div class="store-button huawei-store-button">
<a
href="https://appgallery.huawei.com/app/C104422773"
target="_blank"
>
<img
alt="Explore it on AppGallery"
src="@/assets/huawei.svg"
height="48px"
/>
</a>
</div>
</v-col>
</v-row>
<v-card class="mt-3" variant="tonal">
<v-card-title
><h3>Download Mergin Maps Input app</h3></v-card-title
>
<v-card-text
><p>
Capture geo-info easily through your mobile/tablet with the
Mergin Maps Input app. Designed to be compatible with all
mobile devices - even those with small screens.
</p>
<v-row>
<v-col cols="7" md="3" sm="3">
<div class="store-button">
<a
href="https://play.google.com/store/apps/details?id=uk.co.lutraconsulting&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
target="_blank"
>
<img
alt="Get it on Google Play"
src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
height="70"
/>
</a>
</div>
</v-col>
<v-col cols="7" md="3" sm="3">
<div class="store-button app-store-button">
<a
href="https://apps.apple.com/us/app/input/id1478603559?ls=1&utm_source=mergin-website&utm_medium=banner&utm_campaign=input"
target="_blank"
>
<img
alt="Get it on Apple store"
src="@/assets/App_Store.svg"
height="48"
/>
</a>
</div>
</v-col>
<v-col cols="7" md="3" sm="3">
<div class="store-button huawei-store-button">
<a
href="https://appgallery.huawei.com/app/C104422773"
target="_blank"
>
<img
alt="Explore it on AppGallery"
src="@/assets/huawei.svg"
height="48"
/>
</a>
</div>
</v-col> </v-row
></v-card-text>
</v-card>
</v-col>
</v-row>
Expand Down Expand Up @@ -137,8 +140,6 @@ export default defineComponent({
</script>

<style scoped lang="scss">
@import 'src/sass/dashboard';

.v-navigation-drawer {
-webkit-overflow-scrolling: touch;
display: -webkit-box;
Expand Down Expand Up @@ -178,7 +179,8 @@ export default defineComponent({

@media only screen and (max-width: 599px) {
.store-button {
text-align: left;
text-align: right;

}

.app-store-button {
Expand Down
Loading

0 comments on commit 5da5097

Please sign in to comment.