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

Little bit of maintenance and cleanup #163

Merged
merged 9 commits into from
Sep 10, 2023
Merged
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
10 changes: 7 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name" : "haariga/craft-gonzo",
"description": "Component Library from your templates Folder",
"type" : "craft-plugin",
"version" : "2.0.0-alpha-2",
"version" : "2.0.0-alpha-3",
"keywords" : [
"craft",
"cms",
Expand All @@ -28,6 +28,7 @@
}
],
"require" : {
"roave/security-advisories": "dev-latest",
"craftcms/cms" : "^4.2.0",
"nystudio107/craft-plugin-vite": "^4.0.6"
},
Expand All @@ -39,11 +40,14 @@
"extra" : {
"name" : "Craft Gonzo",
"handle" : "craft-gonzo",
"schemaVersion": "2.0.0-alpha.1",
"schemaVersion": "2.0.0-alpha.3",
"hasCpSettings": false,
"hasCpSection" : false,
"changelogUrl" : "https://raw.githubusercontent.com/haariga/craft-gonzo/master/CHANGELOG.md",
"class" : "haariga\\craftgonzo\\CraftGonzo"
"class" : "haariga\\craftgonzo\\CraftGonzo",
"branch-alias": {
"develop": "2.0.x-dev"
}
},
"config": {
"allow-plugins": {
Expand Down
15 changes: 15 additions & 0 deletions src/web/assets/dist/assets/app.1f65f1cc.js

Large diffs are not rendered by default.

Binary file added src/web/assets/dist/assets/app.1f65f1cc.js.gz
Binary file not shown.
1 change: 1 addition & 0 deletions src/web/assets/dist/assets/app.1f65f1cc.js.map

Large diffs are not rendered by default.

Binary file not shown.
1 change: 0 additions & 1 deletion src/web/assets/dist/assets/app.48b006d2.css

This file was deleted.

Binary file removed src/web/assets/dist/assets/app.48b006d2.css.gz
Binary file not shown.
10 changes: 0 additions & 10 deletions src/web/assets/dist/assets/app.8023e6df.js

This file was deleted.

Binary file removed src/web/assets/dist/assets/app.8023e6df.js.gz
Binary file not shown.
1 change: 0 additions & 1 deletion src/web/assets/dist/assets/app.8023e6df.js.map

This file was deleted.

Binary file removed src/web/assets/dist/assets/app.8023e6df.js.map.gz
Binary file not shown.
1 change: 1 addition & 0 deletions src/web/assets/dist/assets/app.f9ac4e1e.css

Large diffs are not rendered by default.

Binary file added src/web/assets/dist/assets/app.f9ac4e1e.css.gz
Binary file not shown.
20 changes: 0 additions & 20 deletions src/web/assets/src/css/components/global.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,4 @@ body {
grid-area: footer;
}

.gonzo-componentView {
display: grid;
grid-template-rows: max-content 1fr max(450px);
overflow: hidden;
grid-template-areas: "componentHeader"
"componentRender"
"componentFiles";
}

.gonzo-componentHeader {
grid-area: componentHeader;
}

.gonzo-componentRender {
grid-area: componentRender;
}

.gonzo-componentFiles {
grid-area: componentFiles;
max-width: calc(100vw - 340px);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<div class="h-full">
<div class="p-4 border-b border-0 border-solid border-b-slate-800">
<button
v-for="tab in tabNames"
Expand All @@ -11,7 +11,7 @@
{{ tab }}
</button>
</div>
<div>
<div class="overflow-scroll h-full">
<FilePreviewWrapper
:file-type="activeTab"
:slug="files[activeTab].path ?? ''"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<template>
<iframe
v-if="url"
contenteditable="true"
:src="url"
frameborder="0"
class="max-w-full w-full"
:height="iFrameSize.height"
ref="iframe"
></iframe>
<div v-else>No component found.</div>
</template>

<script setup lang="ts">
Expand All @@ -21,7 +23,9 @@ interface IProps {
const props = defineProps<IProps>();

const url = computed(() => {
return '/patternlib/component/render' + props.url + '/' + props.variant.name;
return (
'/patternlib/component/render' + props.url + '/' + props.variant?.name ?? ''
);
});

const iframe = ref<HTMLIFrameElement | null>(null);
Expand Down
28 changes: 27 additions & 1 deletion src/web/assets/src/vue/views/ComponentView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,32 @@ const variant = computed(() => {
});

const activeVariant = computed(() => {
return variant.value.name ?? 'Default';
return variant.value?.name ?? 'Default';
});
</script>

<style>
.gonzo-componentView {
display: grid;
grid-template-rows: max-content minmax(50vh, 80vh) max(450px);
overflow: hidden;
grid-template-areas:
'componentHeader'
'componentRender'
'componentFiles';
}

.gonzo-componentHeader {
grid-area: componentHeader;
}

.gonzo-componentRender {
grid-area: componentRender;
overflow-y: scroll;
}

.gonzo-componentFiles {
grid-area: componentFiles;
max-width: calc(100vw - 340px);
}
</style>