Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ccbikai committed Aug 20, 2024
2 parents ef3e704 + 05eb3bf commit 233d366
Show file tree
Hide file tree
Showing 7 changed files with 1,365 additions and 1,165 deletions.
9 changes: 7 additions & 2 deletions components/dashboard/links/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,13 @@ async function onSubmit(formData) {
body: link,
})
dialogOpen.value = false
emit('update:link', newLink, isEdit ? 'edit' : 'create')
isEdit ? toast('Link updated successfully') : toast('Link created successfully')
emit('update:link', newLink)
if (isEdit) {
toast('Link updated successfully')
}
else {
toast('Link created successfully')
}
}
const { previewMode } = useRuntimeConfig().public
Expand Down
17 changes: 11 additions & 6 deletions components/dashboard/metrics/name/Icon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@ import {
DebianIcon,
FacebookIcon,
FirefoxBrowserIcon,
GnuIcon,
GoogleChromeIcon,
GoogleIcon,
HuaweiIcon,
IOsIcon,
InternetExplorerIcon,
// InternetExplorerIcon,
LinuxIcon,
MacOsIcon,
MicrosoftEdgeIcon,
// MicrosoftEdgeIcon,
OperaIcon,
SafariIcon,
SamsungIcon,
UbuntuIcon,
VivoIcon,
WeChatIcon,
WindowsIcon,
WearOsIcon,
// WindowsIcon,
XIcon,
XiaomiIcon,
YandexCloudIcon,
} from 'vue3-simple-icons'
Expand All @@ -47,6 +50,7 @@ defineProps({
const iconMaps = {
'android': AndroidIcon,
'android browser': AndroidIcon,
'browser': Globe,
'chrome': GoogleChromeIcon,
'chrome headless': GoogleChromeIcon,
Expand All @@ -55,15 +59,15 @@ const iconMaps = {
'curl': Terminal,
'debian': DebianIcon,
'desktop': MonitorCheck,
'edge': MicrosoftEdgeIcon,
'facebook': FacebookIcon,
'facebookexternalhit': FacebookIcon,
'firefox': FirefoxBrowserIcon,
'googlebot': GoogleIcon,
'googlebot-image': GoogleIcon,
'gnu': GnuIcon,
'harmonyos': HuaweiIcon,
'huawei browser': HuaweiIcon,
'ie': InternetExplorerIcon,
// 'ie': InternetExplorerIcon,
'ios': IOsIcon,
'ipad': AppleIcon,
'iphone': AppleIcon,
Expand All @@ -82,10 +86,11 @@ const iconMaps = {
'safari': SafariIcon,
'samsung internet': SamsungIcon,
'tablet': Tablet,
'twitterbot': XIcon,
'ubuntu': UbuntuIcon,
'vivo browser': VivoIcon,
'wechat': WeChatIcon,
'windows': WindowsIcon,
'wearable': WearOsIcon,
'yandex': YandexCloudIcon,
}
</script>
Expand Down
4 changes: 2 additions & 2 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default defineNuxtConfig({
},

hub: {
// ai: true,
ai: true,
analytics: true,
blob: false,
cache: false,
Expand Down Expand Up @@ -58,7 +58,7 @@ export default defineNuxtConfig({
cfAccountId: '',
cfApiToken: '',
dataset: 'sink',
aiModel: '@cf/meta/llama-3-8b-instruct',
aiModel: '@cf/meta/llama-3.1-8b-instruct',
aiPrompt: `You are a URL shortening assistant, please shorten the URL provided by the user into a SLUG. The SLUG information must come from the URL itself, do not make any assumptions. A SLUG is human-readable and should not exceed three words and can be validated using regular expressions {slugRegex} . Only the best one is returned, the format must be JSON reference {"slug": "example-slug"}`,
public: {
previewMode: '',
Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "module",
"version": "0.1.3",
"private": true,
"packageManager": "pnpm@9.5.0",
"packageManager": "pnpm@9.7.1",
"engines": {
"node": ">=20.11"
},
Expand All @@ -21,42 +21,42 @@
"lint-staged": "lint-staged"
},
"dependencies": {
"@unovis/ts": "^1.4.2",
"@unovis/vue": "^1.4.2",
"@unovis/ts": "^1.4.4",
"@unovis/vue": "^1.4.4",
"@vee-validate/zod": "^4.13.2",
"@vueuse/core": "^10.11.0",
"@vueuse/core": "^11.0.0",
"intl-parse-accept-language": "^1.0.0",
"lucide-vue-next": "^0.401.0",
"lucide-vue-next": "^0.428.0",
"mysql-bricks": "^1.1.2",
"nanoid": "^5.0.7",
"pluralize": "^8.0.0",
"qr-code-styling": "1.6.0-rc.1",
"radix-vue": "^1.9.0",
"radix-vue": "^1.9.4",
"ua-parser-js": "next",
"vee-validate": "^4.13.2",
"virtua": "^0.33.2",
"vue-sonner": "^1.1.3",
"vue3-simple-icons": "^12.0.0",
"virtua": "^0.33.7",
"vue-sonner": "^1.1.4",
"vue3-simple-icons": "^13.2.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@antfu/eslint-config": "^2.21.3",
"@nuxt/eslint": "^0.3.13",
"@nuxt/eslint-config": "^0.3.13",
"@nuxthub/core": "^0.7.0",
"@nuxtjs/color-mode": "^3.4.2",
"@nuxtjs/tailwindcss": "^6.12.0",
"@antfu/eslint-config": "^2.26.0",
"@nuxt/eslint": "^0.5.0",
"@nuxt/eslint-config": "^0.5.0",
"@nuxthub/core": "^0.7.3",
"@nuxtjs/color-mode": "^3.4.4",
"@nuxtjs/tailwindcss": "^6.12.1",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"eslint": "^8.57.0",
"lint-staged": "^15.2.7",
"nuxt": "^3.12.3",
"eslint": "^9.9.0",
"lint-staged": "^15.2.9",
"nuxt": "^3.12.4",
"shadcn-nuxt": "^0.10.4",
"simple-git-hooks": "^2.11.1",
"tailwind-merge": "^2.4.0",
"tailwind-merge": "^2.5.2",
"tailwindcss-animate": "^1.0.7",
"vue-tsc": "^2.0.26",
"wrangler": "^3.63.1"
"vue-tsc": "^2.0.29",
"wrangler": "^3.72.0"
},
"simple-git-hooks": {
"pre-commit": "npm run lint-staged"
Expand Down
Loading

0 comments on commit 233d366

Please sign in to comment.