From 0e47d93b3c546ab51cf5a9b3b512beb9404b409c Mon Sep 17 00:00:00 2001 From: pearmini Date: Fri, 25 Nov 2022 13:01:32 +0800 Subject: [PATCH] fix(base): use colorfu as base --- package.json | 4 +++- src/data/gallery/all/angry/index.json | 2 +- src/data/gallery/all/beer/index.json | 2 +- src/data/gallery/all/big-world/index.json | 2 +- src/data/gallery/all/cassidy/index.json | 2 +- src/data/gallery/all/challenge/index.json | 2 +- src/data/gallery/all/dva/index.json | 2 +- src/data/gallery/all/edg-nb/index.json | 2 +- src/data/gallery/all/eye/index.json | 2 +- src/data/gallery/all/falling/index.json | 2 +- src/data/gallery/all/good-night/index.json | 2 +- src/data/gallery/all/hulk/index.json | 2 +- src/data/gallery/all/iron-man/index.json | 2 +- src/data/gallery/all/jordan/index.json | 2 +- src/data/gallery/all/kobe/index.json | 2 +- src/data/gallery/all/mountain/index.json | 2 +- src/data/gallery/all/show-off/index.json | 2 +- src/data/gallery/all/spring/index.json | 2 +- src/data/gallery/all/thor/index.json | 2 +- src/data/gallery/all/tracer/index.json | 2 +- src/data/gallery/all/tree/index.json | 2 +- src/data/gallery/all/weak/index.json | 2 +- src/pages/Story.vue | 14 +++++++------- src/router.js | 3 ++- vue.config.js | 3 +++ 25 files changed, 36 insertions(+), 30 deletions(-) create mode 100644 vue.config.js diff --git a/package.json b/package.json index e5b4d8d..b8b321b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "serve": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint", - "prepare": "husky install" + "prepare": "husky install", + "deploy:gh-pages": "gh-pages -d dist" }, "dependencies": { "colorthief": "^2.3.2", @@ -27,6 +28,7 @@ "babel-plugin-component": "^1.1.1", "eslint": "^6.7.2", "eslint-plugin-vue": "^6.2.2", + "gh-pages": "^4.0.0", "husky": "^7.0.0", "vue-template-compiler": "^2.6.11" }, diff --git a/src/data/gallery/all/angry/index.json b/src/data/gallery/all/angry/index.json index 27a0573..774cdb8 100644 --- a/src/data/gallery/all/angry/index.json +++ b/src/data/gallery/all/angry/index.json @@ -3,7 +3,7 @@ "content": "w(๑•̀ㅂ•́)و✧", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "line", "rotation": 45, "width": 25, diff --git a/src/data/gallery/all/beer/index.json b/src/data/gallery/all/beer/index.json index b0a1dfe..06dc306 100644 --- a/src/data/gallery/all/beer/index.json +++ b/src/data/gallery/all/beer/index.json @@ -1 +1 @@ -{"text":{"content":"🍺 + 🍺 = 🍻","fontSize":197,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#1977F3","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"🍺 + 🍺 = 🍻","fontSize":197,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#1977F3","mode":"pattern"}} \ No newline at end of file diff --git a/src/data/gallery/all/big-world/index.json b/src/data/gallery/all/big-world/index.json index ea73bb2..2a1fa44 100644 --- a/src/data/gallery/all/big-world/index.json +++ b/src/data/gallery/all/big-world/index.json @@ -3,7 +3,7 @@ "content": "Big world", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#fff", "mode": "autoFit", diff --git a/src/data/gallery/all/cassidy/index.json b/src/data/gallery/all/cassidy/index.json index 25cc0d5..7acb328 100644 --- a/src/data/gallery/all/cassidy/index.json +++ b/src/data/gallery/all/cassidy/index.json @@ -3,7 +3,7 @@ "content": "It's high noon", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#583d33", "mode": "autoFit", diff --git a/src/data/gallery/all/challenge/index.json b/src/data/gallery/all/challenge/index.json index 5d3d9ea..5362e14 100644 --- a/src/data/gallery/all/challenge/index.json +++ b/src/data/gallery/all/challenge/index.json @@ -3,7 +3,7 @@ "content": "Face challenge", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#fff", "mode": "autoFit", diff --git a/src/data/gallery/all/dva/index.json b/src/data/gallery/all/dva/index.json index a79a0bc..b7cbb69 100644 --- a/src/data/gallery/all/dva/index.json +++ b/src/data/gallery/all/dva/index.json @@ -1 +1 @@ -{"text":{"content":"Dva Love you ❤️","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#645a8d","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#ed9ec3","mode":"pattern","foregroundColor":"#6566b9","lineWidth":9,"width":85,"rotation":0}} \ No newline at end of file +{"text":{"content":"Dva Love you ❤️","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#645a8d","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#ed9ec3","mode":"pattern","foregroundColor":"#6566b9","lineWidth":9,"width":85,"rotation":0}} \ No newline at end of file diff --git a/src/data/gallery/all/edg-nb/index.json b/src/data/gallery/all/edg-nb/index.json index e7dc439..86d50b0 100644 --- a/src/data/gallery/all/edg-nb/index.json +++ b/src/data/gallery/all/edg-nb/index.json @@ -3,7 +3,7 @@ "content": "EDG NB!", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#000000", "mode": "autoFit", diff --git a/src/data/gallery/all/eye/index.json b/src/data/gallery/all/eye/index.json index 4541d34..07a8479 100644 --- a/src/data/gallery/all/eye/index.json +++ b/src/data/gallery/all/eye/index.json @@ -1 +1 @@ -{"text":{"content":"👁️","fontSize":100,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#4DD599","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"👁️","fontSize":100,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#4DD599","mode":"pattern"}} \ No newline at end of file diff --git a/src/data/gallery/all/falling/index.json b/src/data/gallery/all/falling/index.json index 1719786..5e8d762 100644 --- a/src/data/gallery/all/falling/index.json +++ b/src/data/gallery/all/falling/index.json @@ -3,7 +3,7 @@ "content": "falling down", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#fff", "mode": "autoFit", diff --git a/src/data/gallery/all/good-night/index.json b/src/data/gallery/all/good-night/index.json index ffb7249..2a484b0 100644 --- a/src/data/gallery/all/good-night/index.json +++ b/src/data/gallery/all/good-night/index.json @@ -3,7 +3,7 @@ "content": "Good Night", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#fff", "mode": "autoFit", diff --git a/src/data/gallery/all/hulk/index.json b/src/data/gallery/all/hulk/index.json index 5ca8195..fcbfb2e 100644 --- a/src/data/gallery/all/hulk/index.json +++ b/src/data/gallery/all/hulk/index.json @@ -1 +1 @@ -{"text":{"content":"Always Angry","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#836cc1","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#7bbc5c","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"Always Angry","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#836cc1","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#7bbc5c","mode":"pattern"}} \ No newline at end of file diff --git a/src/data/gallery/all/iron-man/index.json b/src/data/gallery/all/iron-man/index.json index 76efa27..76bbc08 100644 --- a/src/data/gallery/all/iron-man/index.json +++ b/src/data/gallery/all/iron-man/index.json @@ -1 +1 @@ -{"text":{"content":"A warm heart","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#eabe4f","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#b93233","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"A warm heart","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#eabe4f","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#b93233","mode":"pattern"}} \ No newline at end of file diff --git a/src/data/gallery/all/jordan/index.json b/src/data/gallery/all/jordan/index.json index 16ecf95..7a20724 100644 --- a/src/data/gallery/all/jordan/index.json +++ b/src/data/gallery/all/jordan/index.json @@ -1 +1 @@ -{"text":{"content":"Air Jordan","fontSize":687,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#10090a","mode":"constrain","padding":76,"dy":74},"background":{"type":"none","color":"#c40827","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"Air Jordan","fontSize":687,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#10090a","mode":"constrain","padding":76,"dy":74},"background":{"type":"none","color":"#c40827","mode":"pattern"}} \ No newline at end of file diff --git a/src/data/gallery/all/kobe/index.json b/src/data/gallery/all/kobe/index.json index e034b22..7639d5a 100644 --- a/src/data/gallery/all/kobe/index.json +++ b/src/data/gallery/all/kobe/index.json @@ -1 +1 @@ -{"text":{"content":"Mamba forever","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"line","rotation":45,"width":25,"height":25,"foregroundColor":"#EEEEEE","color":"#FFD369","mode":"autoFit","lineWidth":1.5,"padding":0,"dy":30},"background":{"mode":"pattern","color":"#222831","foregroundColor":"#393E46","type":"line","width":50,"lineWidth":1.5,"rotation":0}} \ No newline at end of file +{"text":{"content":"Mamba forever","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"line","rotation":45,"width":25,"height":25,"foregroundColor":"#EEEEEE","color":"#FFD369","mode":"autoFit","lineWidth":1.5,"padding":0,"dy":30},"background":{"mode":"pattern","color":"#222831","foregroundColor":"#393E46","type":"line","width":50,"lineWidth":1.5,"rotation":0}} \ No newline at end of file diff --git a/src/data/gallery/all/mountain/index.json b/src/data/gallery/all/mountain/index.json index edd5cce..849b5df 100644 --- a/src/data/gallery/all/mountain/index.json +++ b/src/data/gallery/all/mountain/index.json @@ -3,7 +3,7 @@ "content": "o(￣▽￣)ｄ", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#fff", "mode": "autoFit", diff --git a/src/data/gallery/all/show-off/index.json b/src/data/gallery/all/show-off/index.json index ca3d01f..46d73d8 100644 --- a/src/data/gallery/all/show-off/index.json +++ b/src/data/gallery/all/show-off/index.json @@ -3,7 +3,7 @@ "content": "别\n装\n逼", "fontSize": 200, "fontFamily": "Luckiest Guy", - "fontURL": "/fonts/luckiest_guy.ea045d18.woff2", + "fontURL": "./fonts/luckiest_guy.ea045d18.woff2", "type": "none", "color": "#ffffff", "mode": "none", diff --git a/src/data/gallery/all/spring/index.json b/src/data/gallery/all/spring/index.json index 4083894..617ec95 100644 --- a/src/data/gallery/all/spring/index.json +++ b/src/data/gallery/all/spring/index.json @@ -1 +1 @@ -{"text":{"content":"Spring","fontSize":279,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#FFDC34","mode":"autoFit","padding":0,"dy":60},"background":{"type":"line","color":"#4DD599","mode":"pattern","foregroundColor":"#00918E","lineWidth":189,"width":204,"rotation":-22}} \ No newline at end of file +{"text":{"content":"Spring","fontSize":279,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#FFDC34","mode":"autoFit","padding":0,"dy":60},"background":{"type":"line","color":"#4DD599","mode":"pattern","foregroundColor":"#00918E","lineWidth":189,"width":204,"rotation":-22}} \ No newline at end of file diff --git a/src/data/gallery/all/thor/index.json b/src/data/gallery/all/thor/index.json index 7bbb116..643f689 100644 --- a/src/data/gallery/all/thor/index.json +++ b/src/data/gallery/all/thor/index.json @@ -1 +1 @@ -{"text":{"content":"Not from hammer","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#ecdc75","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#8c9ed9","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"Not from hammer","fontSize":200,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#ecdc75","mode":"autoFit","padding":0,"dy":30},"background":{"type":"none","color":"#8c9ed9","mode":"pattern"}} \ No newline at end of file diff --git a/src/data/gallery/all/tracer/index.json b/src/data/gallery/all/tracer/index.json index 8486144..daefc37 100644 --- a/src/data/gallery/all/tracer/index.json +++ b/src/data/gallery/all/tracer/index.json @@ -1 +1 @@ -{"text":{"content":"Déjà Vu","fontSize":629,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#372923","mode":"constrain","padding":139,"dy":123},"background":{"type":"wave","color":"#e97e18","mode":"pattern","foregroundColor":"#efd496","lineWidth":30,"width":130,"height":130,"arcRadius":30,"rotation":29}} \ No newline at end of file +{"text":{"content":"Déjà Vu","fontSize":629,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#372923","mode":"constrain","padding":139,"dy":123},"background":{"type":"wave","color":"#e97e18","mode":"pattern","foregroundColor":"#efd496","lineWidth":30,"width":130,"height":130,"arcRadius":30,"rotation":29}} \ No newline at end of file diff --git a/src/data/gallery/all/tree/index.json b/src/data/gallery/all/tree/index.json index af8ab3a..d073c75 100644 --- a/src/data/gallery/all/tree/index.json +++ b/src/data/gallery/all/tree/index.json @@ -1 +1 @@ -{"text":{"content":"🍋🌳👇🐷🙋‍♀️","fontSize":121,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#ed6828","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"🍋🌳👇🐷🙋‍♀️","fontSize":121,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#ed6828","mode":"pattern"}} \ No newline at end of file diff --git a/src/data/gallery/all/weak/index.json b/src/data/gallery/all/weak/index.json index b3e9591..992d275 100644 --- a/src/data/gallery/all/weak/index.json +++ b/src/data/gallery/all/weak/index.json @@ -1 +1 @@ -{"text":{"content":"🌶️🐔","fontSize":197,"fontFamily":"Luckiest Guy","fontURL":"/fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#F8BA03","mode":"pattern"}} \ No newline at end of file +{"text":{"content":"🌶️🐔","fontSize":197,"fontFamily":"Luckiest Guy","fontURL":"./fonts/luckiest_guy.ea045d18.woff2","type":"none","color":"#000","mode":"none","padding":0,"dy":0},"background":{"type":"none","color":"#F8BA03","mode":"pattern"}} \ No newline at end of file diff --git a/src/pages/Story.vue b/src/pages/Story.vue index 5e579c4..1623669 100644 --- a/src/pages/Story.vue +++ b/src/pages/Story.vue @@ -185,7 +185,7 @@ export default { content: emoticon, fontSize: 200, fontFamily: "Luckiest Guy", - fontURL: "/fonts/luckiest_guy.ea045d18.woff2", + fontURL: "./fonts/luckiest_guy.ea045d18.woff2", type: "none", color: "#000000", mode: "autoFit", @@ -202,7 +202,7 @@ export default { content: emoji, fontSize: 100, fontFamily: "Luckiest Guy", - fontURL: "/fonts/luckiest_guy.ea045d18.woff2", + fontURL: "./fonts/luckiest_guy.ea045d18.woff2", type: "none", color: "#000", mode: "none", @@ -221,7 +221,7 @@ export default { content: name, fontSize: 200, fontFamily: "Luckiest Guy", - fontURL: "/fonts/luckiest_guy.ea045d18.woff2", + fontURL: "./fonts/luckiest_guy.ea045d18.woff2", type: "none", color: "#ffffff", mode: "autoFit", @@ -236,7 +236,7 @@ export default { content: name, fontSize: 200, fontFamily: "Luckiest Guy", - fontURL: "/fonts/luckiest_guy.ea045d18.woff2", + fontURL: "./fonts/luckiest_guy.ea045d18.woff2", type: "none", color: values[1], mode: "autoFit", @@ -252,7 +252,7 @@ export default { content: name, fontSize: 200, fontFamily: "Luckiest Guy", - fontURL: "/fonts/luckiest_guy.ea045d18.woff2", + fontURL: "./fonts/luckiest_guy.ea045d18.woff2", type: "none", color: c1, mode: "autoFit", @@ -279,7 +279,7 @@ export default { content: name, fontSize: 200, fontFamily: "Luckiest Guy", - fontURL: "/fonts/luckiest_guy.ea045d18.woff2", + fontURL: "./fonts/luckiest_guy.ea045d18.woff2", type: "line", rotation: 45, width: 25, @@ -310,7 +310,7 @@ export default { content: name, fontSize: 200, fontFamily: "Luckiest Guy", - fontURL: "/fonts/luckiest_guy.ea045d18.woff2", + fontURL: "./fonts/luckiest_guy.ea045d18.woff2", type: "none", color, mode: "autoFit", diff --git a/src/router.js b/src/router.js index a9aff74..7e14081 100644 --- a/src/router.js +++ b/src/router.js @@ -22,7 +22,8 @@ const routes = [ const router = new VueRouter({ routes, - mode: "history", + mode: "hash", + base: "/colorfu", }); export default router; diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..a8e3dc5 --- /dev/null +++ b/vue.config.js @@ -0,0 +1,3 @@ +module.exports = { + publicPath: "/colorfu", +};