themekit-js 1.1.15 → 1.1.17

package/dist/client/theme-default/components/TKBlock.vue

@@ -3,6 +3,7 @@
 import { useData } from '../composables/data' 
 import Hero from './blocks/Hero.vue';
 import Doc from './blocks/Doc.vue';  
+import Notion from './blocks/Notion.vue';  
 import Features from './blocks/Features.vue';
 const { frontmatter } = useData()
 </script>
@@ -14,6 +15,8 @@ const { frontmatter } = useData()
           <Hero :block="item" v-if="item.block_type =='Hero'"></Hero> 
           <Features :block="item" v-else-if="item.block_type =='Features'"></Features> 
           <Doc :block="item" v-else-if="item.block_type =='Doc'" ></Doc>   
+          <Notion :block="item" v-else-if="item.block_type =='Notion'" ></Notion>  
+            
     </div>   
     <VPHomeContent v-if="frontmatter.markdownStyles !== false">
       <Content />

package/dist/client/theme-default/components/blocks/Doc.vue

@@ -1,45 +1,36 @@
-<script setup lang="ts">
-import { useWindowSize } from '@vueuse/core'
-import { computed } from 'vue' 
-const { width: vw } = useWindowSize({ includeScrollbar: false }) 
+<script setup lang="ts"> 
+import { computed } from 'vue'  
 const { block} =defineProps<{
   block?: any
 }>()
 
-const docStyles= computed(() => { 
+import   { useData } from 'themekit-js'
+const { base } = useData()
+const styles= computed(() => { 
 
-    let styles:any=[ vw ? { '--vp-offset': "calc(50% - "+vw.value/2+"px)"} : {}];
-    if(block['background-color']){
-       styles.push({ 'background-color':block['background-color']})
-    }
-    if(block['background-image']){
-       styles.push({ 'background-image':"url("+block['background-image']+")"})
-    }   
-    if(block['color']){
-       styles.push({ 'color':block['color']})
-    }  
-    return styles
-})
-const  blockClass= computed(() => { 
- if(block["class"]){
-    return [block["class"]]
- }else 
-    return [] 
+  let styles:any=[ ];
+  if(block['background-color']){
+    styles.push({ 'background-color':block['background-color']})
+  }
+  if(block['background-image']){ 
+    styles.push({ 'background-image':'url('+base.value+block['background-image']+")"})
+
+  }  
+  return styles
 })
+
+    
  
 </script> 
 <template> 
  
-<div class="vp-doc doc" :class="blockClass" :style="docStyles" >
+<div class="vp-doc doc" v-if="block!=null " :style="styles" >
   <div class="container" v-html="block.content"></div>
 </div>
 </template> 
  
 <style>  
-.doc{  
-    background-size: cover;
-    background-position: center; 
-    } 
+.doc{  background-size: cover;background-position: center;} 
 </style>
 <style scoped>  
  

package/dist/client/theme-default/components/blocks/Features.vue

@@ -1,8 +1,10 @@
-<script setup lang="ts"> 
+<script setup lang="ts">
+import type { DefaultTheme } from 'themekit-js/theme'
 import { computed } from 'vue' 
 
 import Feature from './Feature.vue';
-export interface Feature { 
+export interface Feature {
+  icon?: DefaultTheme.FeatureIcon
   title: string
   details: string
   link?: string
@@ -14,32 +16,6 @@ export interface Feature {
 const props = defineProps<{
   block: any
 }>() 
-
-
-const docStyles= computed(() => { 
-
-let styles:any=[];
-if(props.block['background-color']){
-  styles.push({ 'background-color':props.block['background-color']})
-}
-if(props.block['background-image']){
-   styles.push({'background-image':"url("+props.block['background-image']+")"})
-}   
-if(props.block['color']){
-       styles.push({ 'color':props.block['color']})
-    }  
-return styles
-})
-
-
-const  blockClass= computed(() => { 
- if(props.block["class"]){
-    return [props.block["class"]]
- }else 
-    return [] 
-})
-
-
 const grids = computed(() => {
   const uls = props.block.children
    let ret:any=[]
@@ -61,11 +37,29 @@ const grids = computed(() => {
    }
    return ret 
 })
+
+
+import   { useData } from 'themekit-js'
+const { base } = useData()
+const styles= computed(() => { 
+
+  let styles:any=[ ];
+  if(props.block['background-color']){
+    styles.push({ 'background-color':props.block['background-color']})
+  }
+  if(props.block['background-image']){ 
+    styles.push({ 'background-image':'url('+base.value+props.block['background-image']+")"})
+
+  }  
+  return styles
+})
+
 </script>
 
 <template  >
-  <template v-for="(ul,index) in block.children" >
-  <div v-if="ul.block_type=='ul'" class="VPFeatures" :class="blockClass" :style="docStyles">
+  <div :style="styles">
+  <template v-for="(ul,index) in block.children"  >
+  <div v-if="ul.block_type=='ul'" class="VPFeatures" >
     <div class="container"> 
       <div class="items">
         <div
@@ -78,7 +72,7 @@ const grids = computed(() => {
       </div>
     </div>
   </div>
-  </template>
+  </template></div>
 </template>
 
 <style scoped>

package/dist/client/theme-default/components/blocks/{GithubCode._vue → GithubCode_.vue_}

@@ -1,9 +1,7 @@
-<script setup lang="ts">  
-import Button from './Button.vue';    
-interface Props {
-  block?:any 
-}
-const props = withDefaults(defineProps<Props>(), {})
+<script setup lang="ts"> 
+import Button from './Button.vue'; 
+ 
+ 
   
 import { Octokit } from "octokit"
 const octokit  = new Octokit({ 

package/dist/client/theme-default/components/blocks/Hero.vue

@@ -4,6 +4,11 @@ import type { DefaultTheme } from 'themekit-js/theme'
  
 import Button from './Button.vue';
 import Image from './Image.vue';
+
+
+
+
+
 export interface HeroAction {
   theme?: 'brand' | 'alt'
   text: string
@@ -22,7 +27,7 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), {
    
 })
- 
+
  let HeroImg:any=null
  const items=props.block.children 
     for(let i=0;i<items.length;i++){
@@ -54,6 +59,10 @@ const props = withDefaults(defineProps<Props>(), {
 const hasBgImg =computed(()=>{
     return props.block['nav-color']!==null
 })
+
+
+import   { useData } from 'themekit-js'
+const { base } = useData()
 const styles= computed(() => { 
 
   let styles:any=[ ];
@@ -61,11 +70,9 @@ const styles= computed(() => {
     styles.push({ 'background-color':props.block['background-color']})
   }
   if(props.block['background-image']){ 
-     styles.push({'background-image':"url("+props.block['background-image']+")"})
+    styles.push({ 'background-image':'url('+base.value+props.block['background-image']+")"})
+
   }  
-  if(props.block['color']){
-       styles.push({ 'color':props.block['color']})
-    }  
   return styles
 })
 </script>

package/dist/client/theme-default/components/blocks/Image.vue

@@ -44,7 +44,7 @@ const imgParams:any = (() => {
       class="VPImage"
       v-bind="typeof image === 'string' ? $attrs : { ...image, ...$attrs }"
       :src="withBase(typeof image === 'string' ? image : image.src)"
-       alt="Img"
+       
     />
     <template v-else>
       <VPImage

package/dist/client/theme-default/components/blocks/Notion.vue

@@ -0,0 +1,127 @@
+<script setup lang="ts">
+/**import MarkdownIt from 'markdown-it'    
+ * MarkdownIt({
+    html: true,
+    linkify: true 
+    }).render("# 标题")
+*/
+import  axios from 'axios'
+ 
+import { ref } from 'vue' 
+import   NotionListRow   from './NotionListRow.vue'; 
+import   NotionBlockTitle   from './NotionBlockTitle.vue';
+import   NotionBlocks   from './NotionBlocks.vue';
+
+function param(name:string){
+　　return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(window.location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
+}
+
+const objectType= ref(param("object"))
+
+interface Props {
+  block?:any 
+}
+const h1="h1"
+const props = withDefaults(defineProps<Props>(), {})
+  
+
+let Results=ref(null)
+let Page=ref({"properties":{"Page":false}}) 
+let  Blocks=ref(null);
+const API="http://forward.seedunk.com/v1/"
+const Bearer="secret_ppf82nO2iZgQ7IA7btWhxO9ocyC8C2pzG0YsPgCyuuA"
+   
+  const option={  
+    headers:{ 
+      'forward':"https://api.notion.com",
+      'forward-heads':"Notion-Version",
+      'Bearer': Bearer,
+      'Content-Type':	'application/json',
+      'Notion-Version':	'2022-06-28'
+    }  
+  } 
+  
+
+if(objectType.value=="page"){ 
+
+  axios.get(API+"blocks/"+param("target")+"/children?page_size=100",option) 
+   .then(response => { 
+      Blocks.value=response.data["results"]  
+     
+       
+ 
+   })
+   .catch(error => {  console.error(error);  });
+ 
+   axios.get(API+"pages/"+param("target"),option) 
+   .then(response => { 
+      Page.value=response.data
+
+   })
+   .catch(error => {  console.error(error);  });
+
+}else{
+  axios.post( API+"databases/"+props.block["target"]+"/query",{sorts:
+           [{"property":"TAG","direction":"ascending"}]},option) 
+   .then(response => { 
+      Results.value=response.data["results"] 
+   })
+   .catch(error => {  console.error(error);  });
+}
+  
+
+
+   
+</script> 
+<template> 
+ 
+
+  <div  class='container' v-if="objectType=='page'"  > 
+        <NotionBlockTitle  :parent="Page" v-if="Page!=null" :block="Page.properties.Page" :component="h1"></NotionBlockTitle>
+        <NotionBlocks v-if="Blocks!=null"  :blocks="Blocks"></NotionBlocks>
+   </div>
+  <template v-else v-for="(row,index) in Results" >
+      <NotionListRow :row="row" :index="index"></NotionListRow>
+  </template>
+</template>
+
+<style scoped>  
+ 
+.container {
+  margin: auto;
+  width: 100%;
+  max-width: 1280px;
+  padding: 0 24px;
+}
+
+@media (min-width: 640px) {
+  .container {
+    padding: 0 48px;
+  }
+}
+
+@media (min-width: 960px) {
+  .container {
+    width: 100%;
+    padding: 0 64px;
+  }
+}
+
+.vp-doc :deep(.VPHomeSponsors),
+.vp-doc :deep(.VPTeamPage) {
+  margin-left: var(--vp-offset, calc(50% - 50vw));
+  margin-right: var(--vp-offset, calc(50% - 50vw));
+}
+
+.vp-doc :deep(.VPHomeSponsors h2) {
+  border-top: none;
+  letter-spacing: normal;
+}
+
+.vp-doc :deep(.VPHomeSponsors a),
+.vp-doc :deep(.VPTeamPage a){
+  text-decoration: none;
+}
+
+
+</style>

package/dist/client/theme-default/components/blocks/NotionBlockParagraph.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">  
+  
+interface Props { 
+  block?: any   
+} 
+const props = withDefaults(defineProps<Props>(), {
+    
+})   
+console.log(props.block)
+   
+</script>
+
+<template>
+    <p>
+    <template v-for="(item) in block.paragraph.rich_text" >
+        <component :is="item.type"  > 
+           {{item.plain_text}}
+        </component>  
+    </template> </p>
+</template>
+
+<style scoped>
+  
+</style>

package/dist/client/theme-default/components/blocks/NotionBlockTitle.vue

@@ -0,0 +1,48 @@
+<script setup lang="ts">  
+import { computed } from 'vue' 
+ 
+interface Props { 
+  block?: any  
+  parent?: any  
+  component?:string
+} 
+const props = withDefaults(defineProps<Props>(), {
+    component:"a"
+}) 
+defineOptions({ inheritAttrs: false })
+
+const blockHref =computed(() => { 
+ 
+    return   "?object="+props.parent["object"]+"&target="+props.parent["id"]
+})
+
+ 
+  
+   
+</script>
+
+<template>
+    
+   <a v-if="component=='a'" :href="blockHref">  
+        <template v-for="(items) in block.title" >
+            <component
+                :is="items.type"
+                > 
+            {{items.plain_text}}
+            </component>  
+        </template> 
+   </a>  
+   <component v-else :is="component"  >  
+        <template v-for="(items) in block.title" >
+            <component
+                :is="items.type"
+                > 
+            {{items.plain_text}}
+            </component>  
+        </template> 
+   </component>  
+</template>
+
+<style scoped>
+  
+</style>

package/dist/client/theme-default/components/blocks/NotionBlocks.vue

@@ -0,0 +1,25 @@
+<script setup lang="ts"> 
+ 
+import   NotionBlockParagraph   from './NotionBlockParagraph.vue';
+ 
+interface Props { 
+  blocks?: any  
+} 
+const props = withDefaults(defineProps<Props>(), {
+   
+})  
+  console.log(props)
+  
+</script>
+
+<template>  
+    <template v-for="(block) in  blocks" >
+              <NotionBlockParagraph
+                  v-if="block.type=='paragraph'"
+                  :block="block"
+                  >  
+              </NotionBlockParagraph> 
+       
+    </template>
+</template>
+ 

package/dist/client/theme-default/components/blocks/NotionListRow.vue

@@ -0,0 +1,26 @@
+<script setup lang="ts"> 
+ 
+ 
+import   NotionBlockTitle   from './NotionBlockTitle.vue';
+interface Props { 
+  row?: any 
+  index?: number 
+} 
+const props = withDefaults(defineProps<Props>(), {
+   
+}) 
+console.debug(props)
+defineOptions({ inheritAttrs: false })
+
+
+  
+  const a:string="a"
+              
+</script>
+
+<template>
+    <template v-for="(property) in row.properties" >
+        <NotionBlockTitle v-if="property.type=='title'"  :parent="row" :block="property" :component="a"></NotionBlockTitle>
+  </template>
+</template>
+ 

package/dist/node/cli.js

@@ -1,4 +1,4 @@
-import { a as getDefaultExportFromCjs, q as c, t as clearCache, n as init, b as build, o as serve, v as version, p as createServer } from './serve-BI5vlbXe.js';
+import { a as getDefaultExportFromCjs, q as c, t as clearCache, n as init, b as build, o as serve, v as version, p as createServer } from './serve-pVKeYHjI.js';
 import { createLogger } from 'vite';
 import 'path';
 import 'shiki';

package/dist/node/index.js

@@ -1,7 +1,7 @@
 import { normalizePath } from 'vite';
 export { loadEnv } from 'vite';
-import { g as glob, c as createMarkdownRenderer, f as fs, m as matter, a as getDefaultExportFromCjs } from './serve-BI5vlbXe.js';
-export { S as ScaffoldThemeType, b as build, p as createServer, e as defineConfig, h as defineConfigWithTheme, d as defineLoader, n as init, j as mergeConfig, r as resolveConfig, l as resolvePages, k as resolveSiteData, i as resolveUserConfig, s as scaffold, o as serve } from './serve-BI5vlbXe.js';
+import { g as glob, c as createMarkdownRenderer, f as fs, m as matter, a as getDefaultExportFromCjs } from './serve-pVKeYHjI.js';
+export { S as ScaffoldThemeType, b as build, p as createServer, e as defineConfig, h as defineConfigWithTheme, d as defineLoader, n as init, j as mergeConfig, r as resolveConfig, l as resolvePages, k as resolveSiteData, i as resolveUserConfig, s as scaffold, o as serve } from './serve-pVKeYHjI.js';
 import path from 'path';
 import 'crypto';
 import 'module';

package/dist/node/{serve-BI5vlbXe.js → serve-pVKeYHjI.js}

@@ -38269,7 +38269,7 @@ async function createMarkdownToVueRenderFn(srcDir, options = {}, pages, isBuild
     }
     console.log("Layout:" + layoutVal);
     let blocks = [];
-    if (layoutVal == "block") {
+    if (layoutVal == "block" || layoutVal == "home") {
       while ((blockRaw = blocksRegex.exec(src)) !== null) {
         blockRaws.push(blockRaw[0]);
       }
@@ -46725,7 +46725,7 @@ function escapeHtml(string) {
 
 var escape$1 = /*@__PURE__*/getDefaultExportFromCjs(escapeHtml_1);
 
-var version = "1.1.15";
+var version = "1.1.16";
 
 async function renderPage(render, config, page, result, appChunk, cssChunk, assets, pageToHashMap, metadataScript, additionalHeadTags) {
   const routePath = `/${page.replace(/\.md$/, "")}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "themekit-js",
-  "version": "1.1.15", 
-  "description": "基于VitePress开发的Markdown静态网站生成器", 
+  "version": "1.1.17",
+  "description": "基于VitePress开发的Markdown静态网站生成器",
   "type": "module",
   "packageManager": "pnpm@8.15.6",
   "main": "dist/node/index.js",
@@ -104,6 +104,7 @@
     "@vue/devtools-api": "^7.0.25",
     "@vueuse/core": "^10.9.0",
     "@vueuse/integrations": "^10.9.0",
+    "axios": "^1.7.2",
     "focus-trap": "^7.5.4",
     "github-markdown-css": "^5.5.1",
     "mark.js": "8.11.1",