Skip to content

Commit

Permalink
Merge pull request #29 from k2tzumi/bump-up-slidev
Browse files Browse the repository at this point in the history
Bump up slidev
  • Loading branch information
k2tzumi committed Mar 23, 2024
2 parents cd0f2cc + 0aaa364 commit 02869fa
Show file tree
Hide file tree
Showing 8 changed files with 3,612 additions and 2,650 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/setup-node@v3
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
registry-url: 'https://registry.npmjs.org'
always-auth: true
Expand All @@ -34,7 +34,7 @@ jobs:
assets=$(npm pack --json | jq -r '.[0].filename' | sed 's/^$//')
echo "packFile=${assets}" >> $GITHUB_OUTPUT
- name: Upload Release Asset
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand All @@ -59,7 +59,7 @@ jobs:
});
- name: npm publish
uses: JS-DevTools/npm-publish@v2
uses: JS-DevTools/npm-publish@v3
with:
token: ${{ secrets.NPM_TOKEN }}
access: 'public'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tagpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Check out source code
uses: actions/checkout@v3
uses: actions/checkout@v4

- id: tagpr
name: Run tagpr
Expand All @@ -22,7 +22,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Trigger release Workflow
uses: actions/github-script@v6
uses: actions/github-script@v7
continue-on-error: true
if: steps.tagpr.outputs.tag != ''
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
cancel-in-progress: true

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: make dist/index.html
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ components.d.ts
slides-export.pdf
slides-export-notes.pdf
*.tgz
example-export.pdf
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## Dependencies

- [qrcode-vue3](https://github.com/scholtz/qrcode-vue3)
- [styled-qr-code](https://www.npmjs.com/package/styled-qr-code)

## Installation

Expand Down
103 changes: 71 additions & 32 deletions components/QRCode.vue
Original file line number Diff line number Diff line change
@@ -1,39 +1,19 @@
<template>
<QRCodeVue3
:width="width"
:height="height"
:value="value"
:qr-options="{ errorCorrectionLevel: 'H' }"
:image-options="{ hideBackgroundDots: true, margin: 5 }"
:cornersSquareOptions="{ type: 'extra-rounded', color: '#' + color }"
:cornersDotOptions="{ type: 'square', color: '#' + color }"
:dots-options="{ type: 'square', color: '#' + color , gradient: { type: 'linear', rotation: 0, colorStops: [ { offset: 0, color: '#' + color }, { offset: 1, color: '#' + offsetColor } ] } }"
:image="image"
/>
<div class="qrcode_container" ref="qrCodeRef"></div>
</template>

<script setup lang="ts">
import { defineComponent, computed } from 'vue'
import QRCodeVue3 from 'qrcode-vue3'
export interface Props {
value: string,
color: string,
width: number,
height: number,
image: string,
}
const props = withDefaults(defineProps<Props>(), {
width: 200,
height: 200,
color: "000000",
});
<script lang="ts" setup>
import QRCodeStyling, { Options } from 'styled-qr-code';
import { watch, computed, onMounted, ref } from 'vue';
const qrCodeRef: any = ref(null);
defineComponent({
components: {
QRCodeVue3
}
const props = defineProps({
value: String,
color: String,
width: String,
height: String,
image: String,
});
const offsetColor = computed<string>(() => {
Expand All @@ -50,4 +30,63 @@ const offsetColor = computed<string>(() => {
('0' + (g || 0).toString(16)).slice(-2) +
('0' + (b || 0).toString(16)).slice(-2);
});
const options: Options = {
width: props.width,
height: props.height,
type: 'svg',
data: props.value,
image: props.image,
margin: 10,
qrOptions: {
typeNumber: 0,
mode: 'Byte',
errorCorrectionLevel: 'H',
},
imageOptions: {
hideBackgroundDots: true,
margin: 5,
crossOrigin: 'anonymous',
},
cornersSquareOptions: {
type: 'extra-rounded',
color: '#' + props.color
},
cornersDotOptions: {
type: 'square',
color: '#' + props.color
},
dotsOptions: {
type: 'square',
color: '#' + props.color,
gradient: {
type: 'linear',
rotation: 0,
colorStops: [
{
offset: 0,
color: '#' + props.color
},
{
offset: 1,
color: '#' + offsetColor
}
]
}
},
};
const qrCode = new QRCodeStyling(options);
onMounted(async () => {
qrCode.append(qrCodeRef.value);
});
watch(
() => props.data,
(newValue) => {
qrCode.update({ ...options, value: newValue });
},
);
</script>
Loading

0 comments on commit 02869fa

Please sign in to comment.