Skip to content

Commit

Permalink
style changes part 2
Browse files Browse the repository at this point in the history
  • Loading branch information
SamanthaKraft committed Jul 22, 2024
1 parent 9a06efc commit ac10307
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/components/BiolucidaViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<slot :widgetName="widgetName"></slot>

<div class="tw-flex tw-flex-col tw-h-full">
<div v-bind="$attrs" class="tw-flex tw-flex-col tw-h-full">
<div class="bv-metadata tw-text-left tw-p-1 tw-text-sm">
<!-- <p><span>Dataset: </span>
Dataset Name Here </p>
Expand Down
14 changes: 11 additions & 3 deletions src/components/FlatmapViewer.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<template>
<slot :widgetName="widgetName"></slot>

<div class="flatmap-viewer tw-p-0">
<div class="tw-text-left tw-pl-1">
<div v-bind="$attrs" class="flatmap-viewer tw-p-0">
<div class="tw-text-left tw-pl-1" style="height: 50px;font-size:20px;line-height: 20px;margin: 4px 0 5px 0">
<p><b>Current Location: </b>{{ locationLabel }}</p>
</div>

Expand All @@ -17,6 +16,15 @@
import { useOpenerStore } from "../stores/opener";
import { useLocationStore} from "../stores/locationSelect";
FlatmapVuer.props.flatmapAPI.default="https://mapcore-demo.org/devel/flatmap/v4/";
defineOptions({
inheritAttrs: false
})
const props = defineProps({
listening:{
tyep:Boolean
}
})
const disableFlatmapUI = true;
let FlatmapReady = false;
Expand Down
5 changes: 3 additions & 2 deletions src/components/ImageSelector.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<slot :widgetName="widgetName"></slot>
<div v-bind="$attrs">

<div class="fill">
<img :src=imgPath>
Expand All @@ -16,7 +17,7 @@
</template>
</el-table-column>
</el-table>

</div>

</template>
<script setup>
Expand Down Expand Up @@ -78,7 +79,7 @@ function buildDataTable(tbleObj){
imgs.forEach((img)=>{
let column = {
name:img.ImgName,
size: "...",
size: Math.random()*10+"mb",
path: img.Path
}
_tempArr.push(column);
Expand Down
10 changes: 5 additions & 5 deletions src/components/ItemWidget.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div ref="instance" class="grid-stack-item-content widget-body" @click="selectWidget()">
<component v-slot="slotProps" :is="componentTag" :listening="highlight" @appendToHead="appendIconsToHeader()">
<div ref="instance" class="grid-stack-item-content" @click="selectWidget()">
<component class="widget-body" v-slot="slotProps" :is="componentTag" :listening="highlight">

<DashHeader :widgetName="slotProps.widgetName" :staticMode="staticMode">
<component v-for="icon in slotProps.childIcons" :is="icon.comp" @click="icon.event" class="tw-p-1"></component>
<component class="tw-p-1" v-for="icon in slotProps.childIcons" :is="icon.comp" @click="icon.event" ></component>
<DownloadIcon></DownloadIcon>
<close-icon v-if="!staticMode" background="#8300BF" color="white" class="close-button" @click="$emit('removeWidget')"></close-icon>
</DashHeader>
Expand Down Expand Up @@ -64,7 +64,7 @@
:deep(.content-header){
border-bottom: 1px solid $mediumGrey;
overflow: hidden;
h3{
margin:10px;
}
Expand All @@ -76,7 +76,7 @@
padding:8px;
}
}
.widget-body{
:deep(.widget-body){
height: calc( 100% - 40px );
}
.grid-stack-item-content {
Expand Down
2 changes: 1 addition & 1 deletion src/components/QDBGraph.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<slot :widgetName="widgetName" :childIcons="childIcons">
</slot>

<div class="tw-flex tw-flex-col tw-h-full">
<div v-bind="$attrs" class="tw-flex tw-flex-col tw-h-full">
<component
id="my-chart-id"
:is="visualizationComponent"
Expand Down
8 changes: 4 additions & 4 deletions src/components/SparcDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {Dataset} from '../assets/Model';
import "gridstack/dist/gridstack.min.css";
import "gridstack/dist/gridstack-extra.min.css";
const debug = true;
const debug = false;
const _emitter = inject('emitter');
const _globalVars = useGlobalVarsStore();
let _DatasetImgs = ref({});
Expand All @@ -52,9 +52,9 @@ let NewComponent = {};
let NextId = DashboardItems.value.length;
const dBItems = debug ? [{ id: "ODBGraph-1", x: 0, y: 0, h: 4, w:3, componentName:"Flatmap Viewer",component:"QDBGraph" }] :
[{ id: "FlatmapViewer-1", x: 0, y: 0, h: 8, w:2, componentName:"Flatmap Viewer",component:"FlatmapViewer" },
{ id: "ImageSelector-2", x: 2, y: 0, h: 8, w:3, componentName:"Image Selector", component:"ImageSelector"},
{ id: "BiolucidaViewer-3", x: 5, y: 0,h: 10, w:5, componentName:"MBF Viewer", component:"BiolucidaViewer"}]
[{ id: "FlatmapViewer-1", x: 0, y: 0, h: 8, w:2, componentName:"Flatmap Viewer",component:"FlatmapViewer" },]
// { id: "ImageSelector-2", x: 2, y: 0, h: 8, w:3, componentName:"Image Selector", component:"ImageSelector"},
// { id: "BiolucidaViewer-3", x: 5, y: 0,h: 10, w:5, componentName:"MBF Viewer", component:"BiolucidaViewer"}]
onBeforeMount(() => {
Expand Down
6 changes: 3 additions & 3 deletions src/devComponents/ImageSelector/ImageModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class MBFImageObject {
constructor(data){
this.id = data.image_id;
this.name = data.image_id,
this.size = "...",
this.size = (Math.random()*10).toFixed(2)+"mb",
this.path = data.share_link
}
}
Expand All @@ -30,7 +30,7 @@ export class TableObject{
this.MBFImageObject.forEach((img)=>{
let column = {
name:img.id,
size: "...",
size: (Math.random()*10).toFixed(2)+"mb",
path: ""
}
_tempArr.push(column);
Expand All @@ -42,7 +42,7 @@ export class TableObject{
this.SparcImageArray.forEach((img)=>{
let column = {
name:img.id,
size: "...",
size: (Math.random()*10).toFixed(2)+"mb",
path: img.path
}
_tempArr.push(column);
Expand Down

0 comments on commit ac10307

Please sign in to comment.