-
Notifications
You must be signed in to change notification settings - Fork 2
Fix/btn placement #305
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SpliiT
wants to merge
7
commits into
next
Choose a base branch
from
fix/btn-placement
base: next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix/btn placement #305
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ca231f3
stable version
SpliiT cc47600
Changes UI
SpliiT 4fb033f
fix(UI): Refacto and new style
SpliiT 43fc933
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWe…
SpliiT a356080
Apply prepare changes
SpliiT c2c942d
import
SpliiT c9f122e
remove clickable card
SpliiT File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <script setup> | ||
| import { useAttrs, computed } from "vue" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nécessaire ? |
||
|
|
||
| defineProps({ | ||
| variant: { | ||
| type: String, | ||
| default: "panel", | ||
| validator: (v) => ["panel", "ui"].includes(v), | ||
| }, | ||
| rounded: { type: String, default: "xl" }, | ||
| padding: { type: String, default: "pa-6" }, | ||
| theme: { type: String, default: null }, | ||
| }) | ||
|
|
||
| const attrs = useAttrs() | ||
| const isInteractive = computed(() => !!attrs.onClick) | ||
| </script> | ||
|
|
||
| <template> | ||
| <v-card | ||
| v-bind="$attrs" | ||
| @mousedown.stop | ||
| @click.stop | ||
| @dblclick.stop | ||
| @wheel.stop | ||
| @contextmenu.stop | ||
| flat | ||
| :ripple="isInteractive" | ||
| :theme="theme || (variant === 'panel' ? 'dark' : undefined)" | ||
| :class="[ | ||
| variant === 'panel' ? 'glass-panel' : 'glass-ui', | ||
| 'border-thin', | ||
| `rounded-${rounded}`, | ||
| padding, | ||
| { 'cursor-default': !isInteractive }, | ||
| ]" | ||
| > | ||
| <template v-for="(_, name) in $slots" #[name]="slotProps"> | ||
| <slot :name="name" v-bind="slotProps || {}" /> | ||
| </template> | ||
| </v-card> | ||
| </template> | ||
|
|
||
| <style scoped> | ||
| .border-thin { | ||
| border-style: solid !important; | ||
| } | ||
|
|
||
| .cursor-default { | ||
| cursor: default !important; | ||
| } | ||
| </style> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,6 @@ | ||||||
| <script setup> | ||||||
| import fileDownload from "js-file-download" | ||||||
| import GlassCard from "~/components/GlassCard.vue" | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json" | ||||||
|
|
||||||
| import { useViewerStore } from "@ogw_front/stores/viewer" | ||||||
|
|
@@ -46,49 +47,59 @@ | |||||
| }) | ||||||
| </script> | ||||||
| <template> | ||||||
| <OptionCard | ||||||
| <GlassCard | ||||||
| v-if="props.show_dialog" | ||||||
| @click.stop | ||||||
| title="Take a screenshot" | ||||||
| :width="props.width" | ||||||
| class="position-absolute" | ||||||
| :ripple="false" | ||||||
| variant="panel" | ||||||
| padding="pa-0" | ||||||
| class="position-absolute elevation-24" | ||||||
| style="z-index: 2; top: 90px; right: 55px" | ||||||
| > | ||||||
| <v-container> | ||||||
| <v-row> | ||||||
| <v-col cols="8" class="py-0"> | ||||||
| <v-text-field v-model="filename" label="File name"></v-text-field> | ||||||
| </v-col> | ||||||
| <v-col cols="4" class="py-0"> | ||||||
| <v-select | ||||||
| v-model="output_extension" | ||||||
| :items="output_extensions" | ||||||
| label="Extension" | ||||||
| required | ||||||
| /> | ||||||
| </v-col> | ||||||
| </v-row> | ||||||
| <v-card-text class="pa-5"> | ||||||
| <v-container> | ||||||
| <v-row> | ||||||
| <v-col cols="8" class="py-0"> | ||||||
| <v-text-field v-model="filename" label="File name"></v-text-field> | ||||||
| </v-col> | ||||||
| <v-col cols="4" class="py-0"> | ||||||
| <v-select | ||||||
| v-model="output_extension" | ||||||
| :items="output_extensions" | ||||||
| label="Extension" | ||||||
| required | ||||||
| /> | ||||||
| </v-col> | ||||||
| </v-row> | ||||||
|
|
||||||
| <v-row> | ||||||
| <v-col cols="12" class="py-0"> | ||||||
| <v-switch | ||||||
| v-model="include_background" | ||||||
| :disabled="output_extension !== 'png'" | ||||||
| label="Include background" | ||||||
| inset | ||||||
| ></v-switch> | ||||||
| </v-col> | ||||||
| </v-row> | ||||||
| </v-container> | ||||||
| <v-row> | ||||||
| <v-col cols="12" class="py-0"> | ||||||
| <v-switch | ||||||
| v-model="include_background" | ||||||
| :disabled="output_extension !== 'png'" | ||||||
| label="Include background" | ||||||
| inset | ||||||
| ></v-switch> | ||||||
| </v-col> | ||||||
| </v-row> | ||||||
| </v-container> | ||||||
| </v-card-text> | ||||||
|
|
||||||
| <template #actions> | ||||||
| <v-btn variant="text" color="white" @click="emit('close')">Close</v-btn> | ||||||
| <v-btn | ||||||
| variant="outlined" | ||||||
| :disabled="!filename || !output_extension" | ||||||
| color="white" | ||||||
| @click="takeScreenshot()" | ||||||
| >Screenshot</v-btn | ||||||
| > | ||||||
| <v-card-actions class="justify-center pb-4"> | ||||||
| <v-btn variant="text" color="primary" @click="emit('close')" | ||||||
| >Close</v-btn | ||||||
| > | ||||||
| <v-btn | ||||||
| variant="outlined" | ||||||
| :disabled="!filename || !output_extension" | ||||||
| color="primary" | ||||||
| @click="takeScreenshot()" | ||||||
| >Screenshot</v-btn | ||||||
| > | ||||||
| </v-card-actions> | ||||||
| </template> | ||||||
| </OptionCard> | ||||||
| </GlassCard> | ||||||
| </template> | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.