Skip to content
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

fix(added-vertical-spacing): Implemented changed to code to add more vertical spacing to the notebook #372

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions zt_frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1082,14 +1082,14 @@ export default {
<style lang="scss" scoped>
@import "@/styles/mixins.scss";
.zt-app-bar {
padding-top: 6px;
padding-bottom: 6px;
padding-top: 3px;
padding-bottom: 3px;
}

.logo-btn {
& :deep(.v-icon) {
width: 1.5em;
height: 1.5em;
width: 1.2em;
height: 1.2em;
}
}

Expand Down
53 changes: 38 additions & 15 deletions zt_frontend/src/components/AddCell.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<template>
Carson-Shaar marked this conversation as resolved.
Show resolved Hide resolved
<v-menu transition="scale-transition" minWidth="0" target="cursor">
<template v-slot:activator="{ props }">
<div v-bind="cellId ? { ...props, id: 'addCell' + cellId } : props" class="activator-area">
<div class="divider">
<v-divider class="divider__divider-line" color="bluegrey-darken-2"></v-divider>
<v-btn :prepend-icon="`ztIcon:${ztAliases.circleAdd}`" variant="plain" density="compact" :ripple="false"
class="divider__btn bg-background">Add cell</v-btn>
<div v-bind="cellId ? { ...props, id: 'addCell' + cellId } : props" class="activator-area-push">
<div class="divider-container">
<div class="divider">
<v-divider class="divider__divider-line" color="bluegrey-darken-2"></v-divider>
<v-btn :prepend-icon="`ztIcon:${ztAliases.circleAdd}`" variant="plain" density="compact" :ripple="false"
class="divider__btn bg-background">Add cell</v-btn>
</div>
</div>
</div>
</template>
Expand All @@ -20,6 +22,7 @@
</v-list>
</v-menu>
</template>

<script setup lang="ts">
import { ref } from 'vue'
import { ztAliases } from '@/iconsets/ztIcon'
Expand All @@ -45,10 +48,32 @@ const addCellItems = ref<{
{ title: 'Text', cellType: 'text', icon: `ztIcon:${ztAliases.text}` },
])
</script>

<style lang="scss" scoped>
.activator-area-push {
margin: 0;
padding: 0;
height: 2px; // Small detection area
transition: height 0.2s ease;

&:hover {
height: 24px; // Expand to full height on hover
}
}

.divider-container {
height: 100%;
opacity: 0;
transition: opacity 0.2s ease;

.activator-area-push:hover & {
opacity: 1;
}
}

.divider {
position: relative;
height: 24px;
height: 100%;

&__divider-line {
position: absolute;
Expand All @@ -62,19 +87,17 @@ const addCellItems = ref<{
top: 0;
left: 50%;
transform: translateX(-50%);
opacity: 1;
}
}

// Hover effects
.divider:hover {
cursor: pointer;
}

.divider:hover .divider__divider-line {
background-color: white;
}
.divider__divider-line {
background-color: white;
}

.divider:hover .divider__btn {
color: white !important;
.divider__btn {
color: white !important;
}
}
</style>
19 changes: 12 additions & 7 deletions zt_frontend/src/components/Cell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
</div>
<div
:class="['outcome', { 'outcome--dev': isDevMode }]"
v-if="!(isDevMode && !isAppRoute && cellType === 'text')"
v-if="!(isDevMode && !isAppRoute && cellType === 'text') && cellHasOutput"
Carson-Shaar marked this conversation as resolved.
Show resolved Hide resolved
>
<slot name="outcome"></slot>
</div>
Expand All @@ -264,6 +264,7 @@
v-if="isDevMode"
:cell-id="cellId"
@createCodeCell="(e) => $emit('addCell', e)"

/>
</template>
<script setup lang="ts">
Expand Down Expand Up @@ -331,6 +332,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
cellHasOutput:{
Carson-Shaar marked this conversation as resolved.
Show resolved Hide resolved
type: Boolean,
default:false
}
});
const emits = defineEmits<{
(e: "delete"): void;
Expand Down Expand Up @@ -453,11 +458,11 @@ const saveCellName = async () => {

<style lang="scss" scoped>
.cell {
padding: 18px;
padding: 5px;
display: flex;
margin-bottom: 2px;
&--dev {
margin-bottom: 16px;
margin-bottom: 6px;
}
}
.message-btn {
Expand Down Expand Up @@ -489,21 +494,21 @@ const saveCellName = async () => {
.header {
display: flex;
justify-content: space-between;
margin-bottom: 16px;
margin-bottom: 2px;
}

.code,
.outcome {
padding: 0px;
&--dev {
border: 1px solid rgba(var(--v-theme-bluegrey));
border-radius: 4px;
padding: 12px;
border-radius: 3px;
padding: 6px;
}
}

.code {
margin-bottom: 16px;
margin-bottom: 10px;
}

.click-edit {
Expand Down
20 changes: 8 additions & 12 deletions zt_frontend/src/components/CodeComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
:expand-code="(cellData.expandCode as boolean)"
:non-reactive="(cellData.nonReactive as boolean)"
:cell-name="(cellData.cellName as string)"
:cell-has-output="hasCellContent"
:currentlyExecutingCell="currentlyExecutingCell"
:isCodeRunning="isCodeRunning"
:is-dev-mode="$devMode && !isAppRoute && !isMobile"
Expand Down Expand Up @@ -71,11 +72,6 @@
:code="cellData.code"
:id="'codeMirrorDev' + cellData.id"
/>
<div v-if="$devMode && !isAppRoute && !isMobile">
<p class="text-caption text-disabled text-right">
{{ shortcutText }} to run
</p>
</div>
</template>
<template v-slot:outcome>
Carson-Shaar marked this conversation as resolved.
Show resolved Hide resolved
<div :id="'outputContainer_' + cellData.id">
Expand Down Expand Up @@ -235,9 +231,14 @@ export default {
return route.path === "/app";
},
isMobile() {
return this.$vuetify.display.mobile;
return this.$vuetify.display.mobile
},
extensions() {
hasCellContent() {
const hasOutput = Boolean(this.cellData.output?.trim());
const hasComponents = Boolean(this.cellData.components?.length > 0);
return hasOutput || hasComponents;
},
extensions(){
const handleCtrlEnter = () => {
this.runCode(false, "", "");
};
Expand Down Expand Up @@ -444,11 +445,6 @@ export default {
(comp) => !placedComponentIds.includes(comp.id)
);
},
shortcutText() {
return navigator.userAgent.indexOf("Mac") !== -1
? "CTRL+Return"
: "CTRL+Enter";
},
},

mounted() {
Expand Down
5 changes: 5 additions & 0 deletions zt_frontend/src/components/MarkdownComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:is-dev-mode="$devMode && !isAppRoute && !isMobile"
:hide-cell="(cellData.hideCell as boolean)"
:cell-name="(cellData.cellName as string)"
:cell-has-output=hasCellContent
@delete="deleteCell"
@save="saveCell"
@addCell="e => createCell(e)"
Expand Down Expand Up @@ -47,6 +48,10 @@ export default {
"codemirror": Codemirror,
},
computed: {
hasCellContent() {
const hasOutput = Boolean(this.cellData.code?.trim());
return hasOutput
},
extensions() {return [markdown(), oneDark, autocompletion({ override: [] })]},

compiledMarkdown() {
Expand Down
15 changes: 6 additions & 9 deletions zt_frontend/src/components/SQLComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:non-reactive="(cellData.nonReactive as boolean)"
:showTable="(cellData.showTable as boolean)"
:cell-name="(cellData.cellName as string)"
:cell-has-output="hasCellContent"
:currentlyExecutingCell="currentlyExecutingCell"
:isCodeRunning="isCodeRunning"
:is-dev-mode="$devMode && !isAppRoute && !isMobile"
Expand Down Expand Up @@ -62,10 +63,6 @@
:extensions="extensions"
@keyup="saveCell"
/>

<div v-if="$devMode && !isAppRoute && !isMobile">
<p class="text-caption text-disabled text-right">{{ shortcutText }} to run</p>
</div>
</template>
<template v-slot:outcome>
<v-container
Expand Down Expand Up @@ -118,6 +115,11 @@ export default {
isMobile() {
return this.$vuetify.display.mobile
},
hasCellContent() {
const hasOutput = Boolean(this.cellData.output?.trim());
const hasComponents = Boolean(this.cellData.components?.length > 0);
return hasOutput || hasComponents;
},
extensions() {
const handleCtrlEnter = () => {
this.runCode();
Expand Down Expand Up @@ -149,11 +151,6 @@ export default {
autocompletion({ override: [] }),
];
},
shortcutText() {
return navigator.userAgent.indexOf("Mac") !== -1
? 'CTRL+Return'
: 'CTRL+Enter';
},
},
inheritAttrs: false,
emits: ['runCode', 'deleteCell', 'createCell', 'saveCell'],
Expand Down
Loading