From 0f4a167de4650d2d74ab66da0dc369a15d7e7d2b Mon Sep 17 00:00:00 2001 From: Simo-C3 Date: Thu, 5 Jan 2023 23:49:59 +0900 Subject: [PATCH 1/9] =?UTF-8?q?[change]=20=E4=BD=9C=E5=93=81=E8=A9=B3?= =?UTF-8?q?=E7=B4=B0=E3=82=AB=E3=83=AB=E3=83=BC=E3=82=BB=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E6=8C=99=E5=8B=95=E5=BE=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/works/WorksCarouselMain.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/works/WorksCarouselMain.vue b/components/works/WorksCarouselMain.vue index 1a7e913..6ce2229 100644 --- a/components/works/WorksCarouselMain.vue +++ b/components/works/WorksCarouselMain.vue @@ -70,7 +70,7 @@ swiper.isBeginning }" @mouseover="showSwiperButtonPrev = true" - > + />
+ />
+ />
+ /> From 6bc2e5165a7651fe1813b487b99d58503b01f3b3 Mon Sep 17 00:00:00 2001 From: Simo-C3 Date: Fri, 6 Jan 2023 14:03:43 +0900 Subject: [PATCH 3/9] =?UTF-8?q?[fix]=20tag=20selector=E3=81=AE=E8=87=AA?= =?UTF-8?q?=E5=8B=95=E8=A3=9C=E5=AE=8C=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/commons/TagSelecter.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/components/commons/TagSelecter.vue b/components/commons/TagSelecter.vue index f9c3360..2887a72 100644 --- a/components/commons/TagSelecter.vue +++ b/components/commons/TagSelecter.vue @@ -27,7 +27,6 @@
- © 2021 - {{ date }} Composite Computer Club + © 2022 - {{ date }} Composite Computer Club
From b62880dbdd0dbd4c33af147275d3c1b025b912a8 Mon Sep 17 00:00:00 2001 From: Simo-C3 Date: Fri, 6 Jan 2023 14:51:56 +0900 Subject: [PATCH 6/9] =?UTF-8?q?[fix]=20URL=E6=8C=87=E5=AE=9A=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/axios.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/axios.ts b/utils/axios.ts index 4d78ea9..a268ae6 100644 --- a/utils/axios.ts +++ b/utils/axios.ts @@ -62,7 +62,7 @@ export class AxiosClient { } } catch (e: unknown) { console.error('再ログインが必要') - window.location.href = `${process.env.BASE_URL}/login` + window.location.href = `${process.env.BASE_URL}login` } } throw e From b3af49b1668886bf6599e47e1cb36c868835e4e8 Mon Sep 17 00:00:00 2001 From: Simo-C3 Date: Fri, 6 Jan 2023 14:59:49 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[add]=20img=E3=82=BF=E3=82=B0=E3=81=ABalt?= =?UTF-8?q?=E3=82=92=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Footer.vue | 1 + components/Header.vue | 8 +++++++- components/commons/UserRoundedIcon.vue | 2 +- components/users/UsersProfile.vue | 2 +- components/works/WorksCard.vue | 2 +- .../works/form/assetPreviewItems/FormImagePreview.vue | 6 +++++- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/components/Footer.vue b/components/Footer.vue index cea2c94..8b2c702 100644 --- a/components/Footer.vue +++ b/components/Footer.vue @@ -5,6 +5,7 @@ C3 logo
- + ToyBox logo
@@ -104,6 +109,7 @@ user icon
diff --git a/components/commons/UserRoundedIcon.vue b/components/commons/UserRoundedIcon.vue index 81c88a5..7b77155 100644 --- a/components/commons/UserRoundedIcon.vue +++ b/components/commons/UserRoundedIcon.vue @@ -9,7 +9,7 @@ > icon
diff --git a/components/users/UsersProfile.vue b/components/users/UsersProfile.vue index 62fa70e..3268894 100644 --- a/components/users/UsersProfile.vue +++ b/components/users/UsersProfile.vue @@ -32,7 +32,7 @@
バーナー画像 diff --git a/components/works/form/assetPreviewItems/FormImagePreview.vue b/components/works/form/assetPreviewItems/FormImagePreview.vue index 8618734..5d9e3f5 100644 --- a/components/works/form/assetPreviewItems/FormImagePreview.vue +++ b/components/works/form/assetPreviewItems/FormImagePreview.vue @@ -1,6 +1,10 @@ From 93353f61ffeff89daa38be8947dfde5471504693 Mon Sep 17 00:00:00 2001 From: Simo-C3 Date: Fri, 6 Jan 2023 15:14:01 +0900 Subject: [PATCH 9/9] [add] sitemap genarate setting --- nuxt.config.js | 24 +++++++++++++++++- package.json | 1 + yarn.lock | 68 +++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 88 insertions(+), 5 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index 50eb4ca..5acfd99 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -104,7 +104,8 @@ export default { }, debug: true } - ] + ], + '@nuxtjs/sitemap' ], // Modules: https://go.nuxtjs.dev/config-modules @@ -164,6 +165,27 @@ export default { } }, + sitemap: { + hostname: process.env.BASE_URL, + defaults: { + lastmod: new Date(), + changefreq: 'always' + }, + cacheTime: 1000 * 60 * 60 * 24, + exclude: ['/tmp', '/login', '/discord', '/works/create', '/works/*/edit'], + async routes() { + return Promise.all([ + await axios.get(process.env.API_URL + '/users?limit=9999'), + await axios.get(process.env.API_URL + '/works?limit=9999') + ]).then(([users, works]) => { + const urls = [] + users.data.map((user) => urls.push({ route: `/users/${user.id}` })) + works.data.map((work) => urls.push({ route: `/works/${work.id}` })) + return urls + }) + } + }, + generate: { fallback: true, async routes() { diff --git a/package.json b/package.json index ef67a31..1b856d4 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "@nuxtjs/composition-api": "^0.33.1", "@nuxtjs/google-gtag": "^1.0.4", "@nuxtjs/markdownit": "^2.0.0", + "@nuxtjs/sitemap": "^2.4.0", "@types/file-saver": "^2.0.5", "@types/three": "^0.146.0", "core-js": "^3.26.1", diff --git a/yarn.lock b/yarn.lock index 819ae33..894a495 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2390,6 +2390,21 @@ dependencies: http-proxy-middleware "^1.0.6" +"@nuxtjs/sitemap@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@nuxtjs/sitemap/-/sitemap-2.4.0.tgz#6a9fa1c35e161f87375d59949d973568cec40614" + integrity sha512-TVgIYOtPp7KAfaUo76WRpGbO20j4D/xi/A7shFIGjARHs+FvfAWXNCtBT87dTwe/RoYzAsEKtijFFUTaSu5bUA== + dependencies: + async-cache "^1.1.0" + consola "^2.13.0" + etag "^1.8.1" + fresh "^0.5.2" + fs-extra "^8.1.0" + is-https "^2.0.2" + lodash.unionby "^4.8.0" + minimatch "^3.0.4" + sitemap "^4.1.1" + "@nuxtjs/storybook@^4.3.2": version "4.3.2" resolved "https://registry.yarnpkg.com/@nuxtjs/storybook/-/storybook-4.3.2.tgz#2584e942b4dc18eb84869dac3266f00516c1b413" @@ -3623,6 +3638,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz#fd9c1c2cfab536a2383ed1ef70f94adea743a226" integrity sha512-KQZ1al2hKOONAs2MFv+yTQP1LkDWMrRJ9YCVRalXltOfXsBmH5IownLxQaiq0lnAHwAViLnh2aTYqrPcRGEbgg== +"@types/node@^12.0.2": + version "12.20.55" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" + integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== + "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0": version "16.18.3" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc" @@ -3706,6 +3726,13 @@ dependencies: "@types/node" "*" +"@types/sax@^1.2.0": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/sax/-/sax-1.2.4.tgz#8221affa7f4f3cb21abd22f244cfabfa63e6a69e" + integrity sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw== + dependencies: + "@types/node" "*" + "@types/semver@^7.3.12": version "7.3.13" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" @@ -4635,7 +4662,7 @@ are-we-there-yet@^2.0.0: delegates "^1.0.0" readable-stream "^3.6.0" -arg@^4.1.0: +arg@^4.1.0, arg@^4.1.1: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== @@ -4829,6 +4856,13 @@ ast-types@0.15.2: dependencies: tslib "^2.0.1" +async-cache@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/async-cache/-/async-cache-1.1.0.tgz#4a9a5a89d065ec5d8e5254bd9ee96ba76c532b5a" + integrity sha512-YDQc4vBn5NFhY6g6HhVshyi3Fy9+SQ5ePnE7JLDJn1DoL+i7ER+vMwtTNOYk9leZkYMnOwpBCWqyLDPw8Aig8g== + dependencies: + lru-cache "^4.0.0" + async-each@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" @@ -6143,7 +6177,7 @@ connect@^3.7.0: parseurl "~1.3.3" utils-merge "1.0.1" -consola@^2.10.0, consola@^2.15.0, consola@^2.15.3, consola@^2.6.0, consola@^2.9.0: +consola@^2.10.0, consola@^2.13.0, consola@^2.15.0, consola@^2.15.3, consola@^2.6.0, consola@^2.9.0: version "2.15.3" resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== @@ -9490,6 +9524,11 @@ is-hexadecimal@^1.0.0: resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== +is-https@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-https/-/is-https-2.0.2.tgz#7009d303c72580f15897d5c063d6b6bc1f838fef" + integrity sha512-UfUCKVQH/6PQRCh5Qk9vNu4feLZiFmV/gr8DjbtJD0IrCRIDTA6E+d/AVFGPulI5tqK5W45fYbn1Nir1O99rFw== + is-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" @@ -10668,6 +10707,11 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" +lodash.unionby@^4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/lodash.unionby/-/lodash.unionby-4.8.0.tgz#883f098ff78f564a727b7508e09cdd539734bb83" + integrity sha512-e60kn4GJIunNkw6v9MxRnUuLYI/Tyuanch7ozoCtk/1irJTYBj+qNTxr5B3qVflmJhwStJBv387Cb+9VOfABMg== + lodash.uniq@4.5.0, lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -10710,7 +10754,7 @@ lower-case@^2.0.2: dependencies: tslib "^2.0.3" -lru-cache@^4.1.2, lru-cache@^4.1.5: +lru-cache@^4.0.0, lru-cache@^4.1.2, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -14184,7 +14228,7 @@ sass@^1.56.1: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" -sax@~1.2.4: +sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -14509,6 +14553,17 @@ sisteransi@^1.0.5: resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +sitemap@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/sitemap/-/sitemap-4.1.1.tgz#c9b459c7d797e629c61f56b86586d4f67dbf250b" + integrity sha512-+8yd66IxyIFEMFkFpVoPuoPwBvdiL7Ap/HS5YD7igqO4phkyTPFIprCAE9NMHehAY5ZGN3MkAze4lDrOAX3sVQ== + dependencies: + "@types/node" "^12.0.2" + "@types/sax" "^1.2.0" + arg "^4.1.1" + sax "^1.2.4" + xmlbuilder "^13.0.0" + slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -17051,6 +17106,11 @@ xml-name-validator@^4.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== +xmlbuilder@^13.0.0: + version "13.0.2" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7" + integrity sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ== + xss@^1.0.6: version "1.0.11" resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.11.tgz#211cb82e95b5071d4c75d597283c021157ebe46a"