Skip to content

Commit 55ec7d6

Browse files
authored
Merge branch 'main' into feature/AdminForth/1669/update-upload-plugin-ai-carous
2 parents a311042 + 648d9f8 commit 55ec7d6

5 files changed

Lines changed: 17 additions & 10 deletions

File tree

custom/imageGenerator.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ import { useI18n } from 'vue-i18n';
207207
import adminforth from '@/adminforth';
208208
import { ProgressBar, Button } from '@/afcl';
209209
import * as Handlebars from 'handlebars';
210+
import { ProgressBar } from '@/afcl';
210211
import { IconCloseOutline } from '@iconify-prerendered/vue-flowbite';
211212
import { Tooltip, Skeleton, Spinner } from '@/afcl'
212213
import { useRoute } from 'vue-router';
@@ -241,6 +242,7 @@ onMounted(async () => {
241242
}
242243
// iterate over all variables in template and replace them with their values from props.record[field].
243244
// if field is not present in props.record[field] then replace it with empty string and drop warning
245+
const { default: Handlebars } = await import('handlebars');
244246
const tpl = Handlebars.compile(template);
245247
const compiledTemplate = tpl(props.record);
246248
prompt.value = compiledTemplate;

custom/uploader.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77

88
<button v-if="meta.generateImages"
99
type="button" @click="showImageGen = true"
10-
class="text-white bg-gradient-to-r from-purple-500 via-purple-600 to-purple-700 hover:bg-gradient-to-br focus:ring-4 focus:outline-none focus:ring-purple-300 dark:focus:ring-purple-800
11-
font-medium rounded-lg text-sm px-2.5 py-2.5 text-center me-2 mb-2 absolute right-0 top-2">
10+
class="
11+
text-white bg-lightPrimary font-medium text-center rounded-default text-sm px-2.5 py-2.5 me-2
12+
absolute right-0 top-2
13+
focus:ring-4 focus:outline-none focus:ring-purple-300
14+
hover:bg-lightPrimary/80
15+
dark:focus:ring-purple-800 dark:bg-darkPrimary dark:hover:bg-darkPrimary/80 dark:focus:ring-purple-800
16+
">
1217
<IconMagic class="w-5 h-5"/>
1318
</button>
1419

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@aws-sdk/s3-request-presigner": "^3.629.0"
2424
},
2525
"peerDependencies": {
26-
"adminforth": "^2.70.0"
26+
"adminforth": "2.71.1"
2727
},
2828
"keywords": [
2929
"adminforth",
@@ -60,7 +60,7 @@
6060
},
6161
"devDependencies": {
6262
"@types/node": "^22.10.7",
63-
"adminforth": "2.70.0",
63+
"adminforth": "2.71.1",
6464
"semantic-release": "^24.2.1",
6565
"semantic-release-slack-bot": "^4.0.2",
6666
"typescript": "^5.7.3"

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
5252

5353
/* Emit */
54-
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
54+
"declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
5555
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
5656
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
5757
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */

0 commit comments

Comments
 (0)