From 1beb41105090f24370c77f3c88c1471348a2fcea Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 1 Mar 2019 03:41:35 +0900 Subject: [PATCH 01/61] =?UTF-8?q?PlurkResolver=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/MetadataResolver.php | 1 + app/MetadataResolver/PlurkResolver.php | 44 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 app/MetadataResolver/PlurkResolver.php diff --git a/app/MetadataResolver/MetadataResolver.php b/app/MetadataResolver/MetadataResolver.php index ace71c2..dc7fc08 100644 --- a/app/MetadataResolver/MetadataResolver.php +++ b/app/MetadataResolver/MetadataResolver.php @@ -23,6 +23,7 @@ class MetadataResolver implements Resolver '~www\.deviantart\.com/.*/art/.*~' => DeviantArtResolver::class, '~\.syosetu\.com/n\d+[a-z]{2,}~' => NarouResolver::class, '~ci-en\.jp/creator/\d+/article/\d+~' => CienResolver::class, + '~www\.plurk\.com\/p\/.*~' => PlurkResolver::class, ]; public $mimeTypes = [ diff --git a/app/MetadataResolver/PlurkResolver.php b/app/MetadataResolver/PlurkResolver.php new file mode 100644 index 0000000..3301cdd --- /dev/null +++ b/app/MetadataResolver/PlurkResolver.php @@ -0,0 +1,44 @@ +client = $client; + $this->ogpResolver = $ogpResolver; + } + + public function resolve(string $url): Metadata + { + $res = $this->client->get($url); + if ($res->getStatusCode() === 200) { + $metadata = $this->ogpResolver->parse($res->getBody()); + + $dom = new \DOMDocument(); + @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8')); + $xpath = new \DOMXPath($dom); + $imageNode = $xpath->query('//div[@class="text_holder"]/a[1]')->item(0); + + if($imageNode) { + $metadata->image = $imageNode->getAttribute('href'); + } + + return $metadata; + } else { + throw new \RuntimeException("{$res->getStatusCode()}: $url"); + } + } +} From a364de7d038420fb7a084388138e18b51ea26c91 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 8 Mar 2019 03:41:04 +0900 Subject: [PATCH 02/61] =?UTF-8?q?token-time=E3=81=8C=E3=81=82=E3=82=8B?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AE=E3=81=BFexpires=5Fat=E3=82=92?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/PatreonResolver.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/MetadataResolver/PatreonResolver.php b/app/MetadataResolver/PatreonResolver.php index 5ce28e7..82ce6dd 100644 --- a/app/MetadataResolver/PatreonResolver.php +++ b/app/MetadataResolver/PatreonResolver.php @@ -28,11 +28,11 @@ class PatreonResolver implements Resolver if ($res->getStatusCode() === 200) { $metadata = $this->ogpResolver->parse($res->getBody()); - parse_str(parse_url($metadata->image, PHP_URL_QUERY), $temp); - $expires_at_unixtime = $temp['token-time']; - $expires_at = Carbon::createFromTimestamp($expires_at_unixtime); - - $metadata->expires_at = $expires_at; + parse_str(parse_url($metadata->image, PHP_URL_QUERY), $query); + if(isset($query['token-time'])){ + $expires_at_unixtime = $query['token-time']; + $metadata->expires_at = Carbon::createFromTimestamp($expires_at_unixtime); + } return $metadata; } else { From b29bb23b406a7f7957a323f6670dc9bf37f33502 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 8 Mar 2019 03:58:45 +0900 Subject: [PATCH 03/61] =?UTF-8?q?PlurkResolver=E3=81=AE=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MetadataResolver/PlurkResolverTest.php | 35 ++++++++++++++++ tests/fixture/Plurk/test.html | 42 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 tests/Unit/MetadataResolver/PlurkResolverTest.php create mode 100644 tests/fixture/Plurk/test.html diff --git a/tests/Unit/MetadataResolver/PlurkResolverTest.php b/tests/Unit/MetadataResolver/PlurkResolverTest.php new file mode 100644 index 0000000..e2f3abe --- /dev/null +++ b/tests/Unit/MetadataResolver/PlurkResolverTest.php @@ -0,0 +1,35 @@ +shouldUseMock()) { + sleep(1); + } + } + + public function test() + { + $responseText = file_get_contents(__DIR__.'/../../fixture/Plurk/test.html'); + + $this->createResolver(PlurkResolver::class, $responseText); + + $metadata = $this->resolver->resolve('https://www.plurk.com/p/n0awli/'); + $this->assertEquals('[R18]FC2實況中', $metadata->title); + $this->assertEquals('Plurk by 小虫/ムシ@台中種 - 71 response(s)', $metadata->description); + $this->assertEquals('https://images.plurk.com/5cT15Sf9OOFYk9fEQ759bZ.jpg', $metadata->image); + if ($this->shouldUseMock()) { + $this->assertSame('https://www.plurk.com/p/n0awli/', (string) $this->handler->getLastRequest()->getUri()); + } + } +} diff --git a/tests/fixture/Plurk/test.html b/tests/fixture/Plurk/test.html new file mode 100644 index 0000000..be70c95 --- /dev/null +++ b/tests/fixture/Plurk/test.html @@ -0,0 +1,42 @@ + + + + + 小虫/ムシ@台中種 - [R18]FC2實況中 - Plurk + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + https://images.plurk.com/5cT15Sf9OOFYk9fEQ759bZ.jpg + + + https://images.plurk.com/2HdBlulzzXMZB7vITj4uOG.jpg + [R18]FC2實況中 +
+
+ + \ No newline at end of file From 41778844b88d370e30c9b6a30b65ce27422fda9f Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 8 Mar 2019 05:09:26 +0900 Subject: [PATCH 04/61] =?UTF-8?q?dlsite.jp=E3=81=AE=E5=BD=A2=E5=BC=8F?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/MetadataResolver.php | 1 + .../Unit/MetadataResolver/DLsiteResolverTest.php | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/app/MetadataResolver/MetadataResolver.php b/app/MetadataResolver/MetadataResolver.php index 5bf195f..adf3706 100644 --- a/app/MetadataResolver/MetadataResolver.php +++ b/app/MetadataResolver/MetadataResolver.php @@ -16,6 +16,7 @@ class MetadataResolver implements Resolver '~ec\.toranoana\.jp/tora_r/ec/item/.*~' => ToranoanaResolver::class, '~iwara\.tv/videos/.*~' => IwaraResolver::class, '~www\.dlsite\.com/.*/work/=/product_id/..\d+\.html~' => DLsiteResolver::class, + '~dlsite\.jp/mawtw/..\d+~' => DLsiteResolver::class, '~www\.pixiv\.net/member_illust\.php\?illust_id=\d+~' => PixivResolver::class, '~fantia\.jp/posts/\d+~' => FantiaResolver::class, '~dmm\.co\.jp/~' => FanzaResolver::class, diff --git a/tests/Unit/MetadataResolver/DLsiteResolverTest.php b/tests/Unit/MetadataResolver/DLsiteResolverTest.php index 066bfec..49221bd 100644 --- a/tests/Unit/MetadataResolver/DLsiteResolverTest.php +++ b/tests/Unit/MetadataResolver/DLsiteResolverTest.php @@ -47,4 +47,19 @@ class DLsiteResolverTest extends TestCase $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ234446.html', (string) $this->handler->getLastRequest()->getUri()); } } + + public function testProductShortLink() + { + $responseText = file_get_contents(__DIR__.'/../../fixture/DLsite/testProduct.html'); + + $this->createResolver(DLsiteResolver::class, $responseText); + + $metadata = $this->resolver->resolve('https://dlsite.jp/mawtw/RJ171695.html'); + $this->assertEquals('【骨伝導風】道草屋 たびらこ-一緒にはみがき【耳かき&はみがき】 [桃色CODE] | DLsite', $metadata->title); + $this->assertStringStartsWith('少しお母さんっぽい店員さんに、歯磨きからおやすみまでお世話されます。はみがきで興奮しちゃった旦那様のも、しっかりお世話してくれます。歯磨き音は特殊なマイクを使用、骨伝導風ハイレゾバイノーラル音声です。', $metadata->description); + $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ172000/RJ171695_img_main.jpg', $metadata->image); + if ($this->shouldUseMock()) { + $this->assertSame('https://dlsite.jp/mawtw/RJ171695.html', (string) $this->handler->getLastRequest()->getUri()); + } + } } From a2f0beb3cbb7416db76870eb249734f2929dd970 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 8 Mar 2019 05:30:55 +0900 Subject: [PATCH 05/61] =?UTF-8?q?description=E3=81=AB=E3=81=82=E3=82=8B?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA`<>`=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/FanzaResolver.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/MetadataResolver/FanzaResolver.php b/app/MetadataResolver/FanzaResolver.php index cfb73db..0124770 100644 --- a/app/MetadataResolver/FanzaResolver.php +++ b/app/MetadataResolver/FanzaResolver.php @@ -27,6 +27,7 @@ class FanzaResolver implements Resolver if ($res->getStatusCode() === 200) { $metadata = $this->ogpResolver->parse($res->getBody()); $metadata->image = preg_replace("~(pr|ps)\.jpg$~", 'pl.jpg', $metadata->image); + $metadata->description = str_replace('<>', "", $metadata->description); return $metadata; } else { From d571ff1a5bd8af7cb63d2b1928bfe8d8765a1d55 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 8 Mar 2019 06:21:33 +0900 Subject: [PATCH 06/61] =?UTF-8?q?=E4=BD=99=E5=88=86=E3=81=AA=E6=96=87?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=E3=83=BB=E6=95=B4=E5=BD=A2=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/DLsiteResolver.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/MetadataResolver/DLsiteResolver.php b/app/MetadataResolver/DLsiteResolver.php index 99aae49..f50859e 100644 --- a/app/MetadataResolver/DLsiteResolver.php +++ b/app/MetadataResolver/DLsiteResolver.php @@ -26,6 +26,17 @@ class DLsiteResolver implements Resolver $res = $this->client->get($url); if ($res->getStatusCode() === 200) { $metadata = $this->ogpResolver->parse($res->getBody()); + + // 抽出 + preg_match('~\[(.+)\] \| DLsite$~', $metadata->title, $match); + $maker = $match[1]; + + // 余分な文を消す + $metadata->title = preg_replace('~\[.+\] \| DLsite$~', '', $metadata->title); + $metadata->description = preg_replace('~「DLsite.+」は同人誌・同人ゲーム・同人音声のダウンロードショップ。お気に入りの作品をすぐダウンロードできてすぐ楽しめる！毎日更新しているのであなたが探している作品にきっと出会えます。国内最大級の二次元総合ダウンロードショップ「DLsite」！$~', '', $metadata->description); + + // 整形 + $metadata->description = 'サークル: ' . $maker . PHP_EOL . $metadata->description; $metadata->image = str_replace('img_sam.jpg', 'img_main.jpg', $metadata->image); return $metadata; From d561ee66c2c56d3967f29739d98d3348f2e922e5 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 8 Mar 2019 06:29:16 +0900 Subject: [PATCH 07/61] =?UTF-8?q?trim=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/DLsiteResolver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/MetadataResolver/DLsiteResolver.php b/app/MetadataResolver/DLsiteResolver.php index f50859e..9f6d6e7 100644 --- a/app/MetadataResolver/DLsiteResolver.php +++ b/app/MetadataResolver/DLsiteResolver.php @@ -32,8 +32,8 @@ class DLsiteResolver implements Resolver $maker = $match[1]; // 余分な文を消す - $metadata->title = preg_replace('~\[.+\] \| DLsite$~', '', $metadata->title); - $metadata->description = preg_replace('~「DLsite.+」は同人誌・同人ゲーム・同人音声のダウンロードショップ。お気に入りの作品をすぐダウンロードできてすぐ楽しめる！毎日更新しているのであなたが探している作品にきっと出会えます。国内最大級の二次元総合ダウンロードショップ「DLsite」！$~', '', $metadata->description); + $metadata->title = trim(preg_replace('~ \[.+\] \| DLsite$~', '', $metadata->title)); + $metadata->description = trim(preg_replace('~「DLsite.+」は同人誌・同人ゲーム・同人音声のダウンロードショップ。お気に入りの作品をすぐダウンロードできてすぐ楽しめる！毎日更新しているのであなたが探している作品にきっと出会えます。国内最大級の二次元総合ダウンロードショップ「DLsite」！$~', '', $metadata->description)); // 整形 $metadata->description = 'サークル: ' . $maker . PHP_EOL . $metadata->description; From da0fc3f3bf51b795d1e7b09c20b00c598c7f3f5b Mon Sep 17 00:00:00 2001 From: eai04191 Date: Fri, 8 Mar 2019 06:29:33 +0900 Subject: [PATCH 08/61] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Unit/MetadataResolver/DLsiteResolverTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Unit/MetadataResolver/DLsiteResolverTest.php b/tests/Unit/MetadataResolver/DLsiteResolverTest.php index 066bfec..c6209e1 100644 --- a/tests/Unit/MetadataResolver/DLsiteResolverTest.php +++ b/tests/Unit/MetadataResolver/DLsiteResolverTest.php @@ -25,8 +25,8 @@ class DLsiteResolverTest extends TestCase $this->createResolver(DLsiteResolver::class, $responseText); $metadata = $this->resolver->resolve('https://www.dlsite.com/maniax/work/=/product_id/RJ171695.html'); - $this->assertEquals('【骨伝導風】道草屋 たびらこ-一緒にはみがき【耳かき&はみがき】 [桃色CODE] | DLsite', $metadata->title); - $this->assertStringStartsWith('少しお母さんっぽい店員さんに、歯磨きからおやすみまでお世話されます。はみがきで興奮しちゃった旦那様のも、しっかりお世話してくれます。歯磨き音は特殊なマイクを使用、骨伝導風ハイレゾバイノーラル音声です。', $metadata->description); + $this->assertEquals('【骨伝導風】道草屋 たびらこ-一緒にはみがき【耳かき&はみがき】', $metadata->title); + $this->assertStringEndsWith('少しお母さんっぽい店員さんに、歯磨きからおやすみまでお世話されます。はみがきで興奮しちゃった旦那様のも、しっかりお世話してくれます。歯磨き音は特殊なマイクを使用、骨伝導風ハイレゾバイノーラル音声です。', $metadata->description); $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ172000/RJ171695_img_main.jpg', $metadata->image); if ($this->shouldUseMock()) { $this->assertSame('https://www.dlsite.com/maniax/work/=/product_id/RJ171695.html', (string) $this->handler->getLastRequest()->getUri()); @@ -40,8 +40,8 @@ class DLsiteResolverTest extends TestCase $this->createResolver(DLsiteResolver::class, $responseText); $metadata = $this->resolver->resolve('https://www.dlsite.com/home/work/=/product_id/RJ234446.html'); - $this->assertEquals('【大人向け耳かき】道草屋 はこべら5 時計修理のはこべらさん。他【汗の匂い】 [桃色CODE] | DLsite', $metadata->title); - $this->assertStringStartsWith('夏の終わり、二人で遠くの花火を眺めます。耳かきの他、クラシックシェービング、氷を含んだあまがみ、冷紅茶、ジャズ、時計の修理、それから大人向けの汗の匂い。色々な事のある、二泊三日の田舎宿音声です。', $metadata->description); + $this->assertEquals('【大人向け耳かき】道草屋 はこべら5 時計修理のはこべらさん。他【汗の匂い】', $metadata->title); + $this->assertStringEndsWith('夏の終わり、二人で遠くの花火を眺めます。耳かきの他、クラシックシェービング、氷を含んだあまがみ、冷紅茶、ジャズ、時計の修理、それから大人向けの汗の匂い。色々な事のある、二泊三日の田舎宿音声です。', $metadata->description); $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ235000/RJ234446_img_main.jpg', $metadata->image); if ($this->shouldUseMock()) { $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ234446.html', (string) $this->handler->getLastRequest()->getUri()); From e8438a78a1b4684bd386fe08705b262b15f19864 Mon Sep 17 00:00:00 2001 From: hina Date: Fri, 8 Mar 2019 06:52:29 +0900 Subject: [PATCH 09/61] Add bundle analyzer --- package.json | 1 + webpack.mix.js | 11 +++-- yarn.lock | 110 ++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 117 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c43f1b0..4fc0b49 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "jquery": "^3.2.1", "js-cookie": "^2.2.0", "laravel-mix": "^4.0.0", + "laravel-mix-bundle-analyzer": "^1.0.2", "open-iconic": "^1.1.1", "popper.js": "^1.14.7", "resolve-url-loader": "^2.3.1", diff --git a/webpack.mix.js b/webpack.mix.js index c8f632c..47be8d2 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,4 +1,5 @@ -let mix = require('laravel-mix'); +const mix = require('laravel-mix'); +require('laravel-mix-bundle-analyzer') /* |-------------------------------------------------------------------------- @@ -13,10 +14,14 @@ let mix = require('laravel-mix'); mix.js('resources/assets/js/app.js', 'public/js') .js('resources/assets/js/home.js', 'public/js') - .js('resources/assets/js/checkin.js', 'public/js') .js('resources/assets/js/user/stats.js', 'public/js/user') .js('resources/assets/js/setting/privacy.js', 'public/js/setting') + .js('resources/assets/js/checkin.js', 'public/js') .sass('resources/assets/sass/app.scss', 'public/css') .autoload({ 'jquery': ['$', 'jQuery', 'window.jQuery'] - }); \ No newline at end of file + }) + +if (process.argv.includes('-a')) { + mix.bundleAnalyzer({analyzerMode: 'static'}); +} diff --git a/yarn.lock b/yarn.lock index eff7d9e..0f9439d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -808,11 +808,21 @@ acorn-dynamic-import@^4.0.0: resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== +acorn-walk@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" + integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw== + acorn@^6.0.5: version "6.1.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818" integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw== +acorn@^6.0.7: + version "6.1.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f" + integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA== + adjust-sourcemap-loader@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz#e33fde95e50db9f2a802e3647e311d2fc5000c69" @@ -989,6 +999,11 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" integrity sha1-GdOGodntxufByF04iu28xW0zYC0= +async-limiter@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" + integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg== + async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -1074,6 +1089,16 @@ batch@0.6.1: resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= +bfj@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz#05a3b7784fbd72cfa3c22e56002ef99336516c48" + integrity sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ== + dependencies: + bluebird "^3.5.1" + check-types "^7.3.0" + hoopy "^0.1.2" + tryer "^1.0.0" + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -1084,7 +1109,7 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1" integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw== -bluebird@^3.1.1, bluebird@^3.5.3: +bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== @@ -1415,6 +1440,11 @@ chartjs-color@^2.1.0: chartjs-color-string "^0.5.0" color-convert "^0.5.3" +check-types@^7.3.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4" + integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg== + chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3: version "2.1.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.1.tgz#adc39ad55a2adf26548bd2afa048f611091f9184" @@ -1575,6 +1605,11 @@ commander@2.17.x, commander@~2.17.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== +commander@^2.18.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" + integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -2223,6 +2258,11 @@ dotenv@^6.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w== +duplexer@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + duplexify@^3.4.2, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -2238,6 +2278,11 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +ejs@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" + integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== + electron-to-chromium@^1.3.103: version "1.3.113" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9" @@ -2458,7 +2503,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -express@^4.16.2: +express@^4.16.2, express@^4.16.3: version "4.16.4" resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg== @@ -2592,6 +2637,11 @@ file-type@^10.7.0: resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.7.1.tgz#bcfdd618fddfa7f7e5fc504e08b62cfec7bda8f2" integrity sha512-kUc4EE9q3MH6kx70KumPOvXLZLEJZzY9phEVg/bKWyGZ+OA9KoKZzFR4HS0yDmNv31sJkdf4hbTERIfplF9OxQ== +filesize@^3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" + integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -2878,6 +2928,14 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= +gzip-size@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80" + integrity sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA== + dependencies: + duplexer "^0.1.1" + pify "^3.0.0" + handle-thing@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" @@ -2990,6 +3048,11 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" +hoopy@^0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" + integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== + hpack.js@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" @@ -3627,6 +3690,13 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== +laravel-mix-bundle-analyzer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/laravel-mix-bundle-analyzer/-/laravel-mix-bundle-analyzer-1.0.2.tgz#b26fc1a7e99134d0317ddde469ebe2de94c75409" + integrity sha512-+URmDawC3jR9BWtB7mFMeKFV4G28qLl4Xmvt3x9NLKs78kJT5w4YX7EP+xYoaVpymAfPuCAtcvJRE87kkHK4Wg== + dependencies: + webpack-bundle-analyzer "^3.0.3" + laravel-mix@^4.0.0: version "4.0.14" resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-4.0.14.tgz#949374650d39f2c937257ad2749dab039b848f28" @@ -4407,6 +4477,11 @@ open-iconic@^1.1.1: resolved "https://registry.yarnpkg.com/open-iconic/-/open-iconic-1.1.1.tgz#9dcfc8c7cd3c61cdb4a236b1a347894c97adc0c6" integrity sha1-nc/Ix808Yc20ojaxo0eJTJetwMY= +opener@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" + integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== + opn@^5.1.0: version "5.4.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035" @@ -6062,6 +6137,11 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +tryer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" + integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== + tslib@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" @@ -6328,6 +6408,25 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" +webpack-bundle-analyzer@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d" + integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA== + dependencies: + acorn "^6.0.7" + acorn-walk "^6.1.1" + bfj "^6.1.1" + chalk "^2.4.1" + commander "^2.18.0" + ejs "^2.6.1" + express "^4.16.3" + filesize "^3.6.1" + gzip-size "^5.0.0" + lodash "^4.17.10" + mkdirp "^0.5.1" + opener "^1.5.1" + ws "^6.0.0" + webpack-cli@^3.1.2: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.3.tgz#13653549adfd8ccd920ad7be1ef868bacc22e346" @@ -6511,6 +6610,13 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +ws@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526" + integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w== + dependencies: + async-limiter "~1.0.0" + xregexp@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" From 94c19235b607478d1494cd407f40af0a4430227c Mon Sep 17 00:00:00 2001 From: hina Date: Fri, 8 Mar 2019 06:53:13 +0900 Subject: [PATCH 10/61] =?UTF-8?q?=E8=A4=87=E6=95=B0=E3=81=AE=E3=82=A8?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=83=AA=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=85=B1=E9=80=9A=E3=81=97=E3=81=A6=E5=88=A9?= =?UTF-8?q?=E7=94=A8=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E3=83=99?= =?UTF-8?q?=E3=83=B3=E3=83=80=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=82=92=E5=A4=96=E5=87=BA=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/home.blade.php | 3 ++- resources/views/layouts/base.blade.php | 4 +++- resources/views/user/stats.blade.php | 5 +++-- webpack.mix.js | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 9bf2128..ed06b4b 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -104,5 +104,6 @@ @push('script') + -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 3947745..3aabcb2 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -217,7 +217,9 @@ @endguest + + @stack('script') - \ No newline at end of file + diff --git a/resources/views/user/stats.blade.php b/resources/views/user/stats.blade.php index 997a1de..e6e7658 100644 --- a/resources/views/user/stats.blade.php +++ b/resources/views/user/stats.blade.php @@ -30,6 +30,7 @@ @endsection @push('script') - + + -@endpush \ No newline at end of file +@endpush diff --git a/webpack.mix.js b/webpack.mix.js index 47be8d2..6b228e5 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -21,6 +21,8 @@ mix.js('resources/assets/js/app.js', 'public/js') .autoload({ 'jquery': ['$', 'jQuery', 'window.jQuery'] }) + .extract(['jquery', 'bootstrap']) + .extract(['chart.js', 'moment'], 'public/js/vendor/chart') if (process.argv.includes('-a')) { mix.bundleAnalyzer({analyzerMode: 'static'}); From 1ba7df6e82976ca21b2c7aebbbcde239c4c5592a Mon Sep 17 00:00:00 2001 From: hina Date: Fri, 8 Mar 2019 06:54:13 +0900 Subject: [PATCH 11/61] versioning script --- webpack.mix.js | 1 + 1 file changed, 1 insertion(+) diff --git a/webpack.mix.js b/webpack.mix.js index 6b228e5..58f74df 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -23,6 +23,7 @@ mix.js('resources/assets/js/app.js', 'public/js') }) .extract(['jquery', 'bootstrap']) .extract(['chart.js', 'moment'], 'public/js/vendor/chart') + .version(); if (process.argv.includes('-a')) { mix.bundleAnalyzer({analyzerMode: 'static'}); From 5561f0785cb6eeba4d14127bf24a65c3692378e7 Mon Sep 17 00:00:00 2001 From: hina Date: Fri, 8 Mar 2019 08:49:29 +0900 Subject: [PATCH 12/61] =?UTF-8?q?=E4=B8=AD=E9=80=94=E5=8D=8A=E7=AB=AF?= =?UTF-8?q?=E3=81=AB=E9=87=8D=E8=A4=87=E3=81=97=E3=81=A6=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=82=92=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webpack.mix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.mix.js b/webpack.mix.js index 58f74df..703398c 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -22,7 +22,7 @@ mix.js('resources/assets/js/app.js', 'public/js') 'jquery': ['$', 'jQuery', 'window.jQuery'] }) .extract(['jquery', 'bootstrap']) - .extract(['chart.js', 'moment'], 'public/js/vendor/chart') + .extract(['chart.js', 'chartjs-color', 'color-name', 'moment'], 'public/js/vendor/chart') .version(); if (process.argv.includes('-a')) { From 0b87a35fba085c1aab41b91a526387e2159641e1 Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 8 Mar 2019 22:52:42 +0900 Subject: [PATCH 13/61] fix style --- app/MetadataResolver/PatreonResolver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/MetadataResolver/PatreonResolver.php b/app/MetadataResolver/PatreonResolver.php index 82ce6dd..7ba3235 100644 --- a/app/MetadataResolver/PatreonResolver.php +++ b/app/MetadataResolver/PatreonResolver.php @@ -29,7 +29,7 @@ class PatreonResolver implements Resolver $metadata = $this->ogpResolver->parse($res->getBody()); parse_str(parse_url($metadata->image, PHP_URL_QUERY), $query); - if(isset($query['token-time'])){ + if (isset($query['token-time'])) { $expires_at_unixtime = $query['token-time']; $metadata->expires_at = Carbon::createFromTimestamp($expires_at_unixtime); } From 61498133d5ad4a73bb6992c927aff3570753b2ec Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 8 Mar 2019 23:02:24 +0900 Subject: [PATCH 14/61] fix style --- app/MetadataResolver/FanzaResolver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/MetadataResolver/FanzaResolver.php b/app/MetadataResolver/FanzaResolver.php index 0124770..b1e1c66 100644 --- a/app/MetadataResolver/FanzaResolver.php +++ b/app/MetadataResolver/FanzaResolver.php @@ -27,7 +27,7 @@ class FanzaResolver implements Resolver if ($res->getStatusCode() === 200) { $metadata = $this->ogpResolver->parse($res->getBody()); $metadata->image = preg_replace("~(pr|ps)\.jpg$~", 'pl.jpg', $metadata->image); - $metadata->description = str_replace('<>', "", $metadata->description); + $metadata->description = str_replace('<>', '', $metadata->description); return $metadata; } else { From cd56e1bff32804dd0343c99eaaf2c7f35c84f46d Mon Sep 17 00:00:00 2001 From: shibafu Date: Sat, 9 Mar 2019 01:34:58 +0900 Subject: [PATCH 15/61] =?UTF-8?q?=E3=83=A1=E3=82=BF=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=81=AEdescription=E3=81=AB=E5=90=AB=E3=81=BE?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E6=94=B9=E8=A1=8C=E3=82=92=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=AB=E5=8F=8D=E6=98=A0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs #87 --- resources/assets/sass/tissue.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/resources/assets/sass/tissue.css b/resources/assets/sass/tissue.css index f7dfd0c..6f5d485 100644 --- a/resources/assets/sass/tissue.css +++ b/resources/assets/sass/tissue.css @@ -96,4 +96,24 @@ width: 100%; border-top-right-radius: calc(.25rem - 1px); border-bottom-right-radius: calc(.25rem - 1px); +} + +.link-card .row > div:last-child { + max-height: 400px; + overflow: hidden; +} + +/* 省略を表す影を付けるやつ */ +.link-card .row > div:last-child::before { + content: ''; + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + background: linear-gradient(transparent 320px, white); +} + +.link-card .card-text { + white-space: pre-line; } \ No newline at end of file From ed1cfe94f0fb7ed1ad819c01b8a74af959011357 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sat, 9 Mar 2019 03:42:45 +0900 Subject: [PATCH 16/61] =?UTF-8?q?Bootstrap=E3=81=AE=E3=82=AB=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=83=A0=E3=82=92=E5=88=A5=E3=81=AE=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AB=E7=A7=BB=E5=8B=95=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/app.scss | 1 + resources/assets/sass/boostrap-custom.scss | 11 +++++++++++ resources/assets/sass/tissue.css | 12 ------------ 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 resources/assets/sass/boostrap-custom.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 42fa070..1584650 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,5 +1,6 @@ // Bootstrap @import "~bootstrap/scss/bootstrap"; +@import "boostrap-custom.scss"; // Open Iconic @import "~open-iconic/font/css/open-iconic-bootstrap"; diff --git a/resources/assets/sass/boostrap-custom.scss b/resources/assets/sass/boostrap-custom.scss new file mode 100644 index 0000000..cd03a90 --- /dev/null +++ b/resources/assets/sass/boostrap-custom.scss @@ -0,0 +1,11 @@ +.card-img-left { + width: 100%; + border-top-left-radius: calc(.25rem - 1px); + border-bottom-left-radius: calc(.25rem - 1px); +} + +.card-img-right { + width: 100%; + border-top-right-radius: calc(.25rem - 1px); + border-bottom-right-radius: calc(.25rem - 1px); +} \ No newline at end of file diff --git a/resources/assets/sass/tissue.css b/resources/assets/sass/tissue.css index f7dfd0c..fa57ff3 100644 --- a/resources/assets/sass/tissue.css +++ b/resources/assets/sass/tissue.css @@ -84,16 +84,4 @@ #navbarAccountDropdownSp { max-width: calc(100vw - 5em); -} - -.card-img-left { - width: 100%; - border-top-left-radius: calc(.25rem - 1px); - border-bottom-left-radius: calc(.25rem - 1px); -} - -.card-img-right { - width: 100%; - border-top-right-radius: calc(.25rem - 1px); - border-bottom-right-radius: calc(.25rem - 1px); } \ No newline at end of file From e983a3da0b1d48680d52e2823dd9b3452101cf09 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sat, 9 Mar 2019 03:49:47 +0900 Subject: [PATCH 17/61] =?UTF-8?q?border-radius=E3=81=AEmixin=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/boostrap-custom.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/assets/sass/boostrap-custom.scss b/resources/assets/sass/boostrap-custom.scss index cd03a90..a56818a 100644 --- a/resources/assets/sass/boostrap-custom.scss +++ b/resources/assets/sass/boostrap-custom.scss @@ -1,11 +1,9 @@ .card-img-left { width: 100%; - border-top-left-radius: calc(.25rem - 1px); - border-bottom-left-radius: calc(.25rem - 1px); + @include border-left-radius($card-inner-border-radius); } .card-img-right { width: 100%; - border-top-right-radius: calc(.25rem - 1px); - border-bottom-right-radius: calc(.25rem - 1px); + @include border-right-radius($card-inner-border-radius); } \ No newline at end of file From 1a7d958a1ef23eb7e0dfed23204dd429a2dbf506 Mon Sep 17 00:00:00 2001 From: shibafu Date: Sat, 9 Mar 2019 17:07:00 +0900 Subject: [PATCH 18/61] =?UTF-8?q?Sass=E5=85=A5=E3=81=A3=E3=81=A6=E3=82=8B?= =?UTF-8?q?=E3=81=AE=E3=81=AB=E7=94=9FCSS=E3=81=A7=E6=9B=B8=E3=81=93?= =?UTF-8?q?=E3=81=86=E3=81=A8=E3=81=97=E3=81=9F=E3=82=84=E3=81=A4=E3=81=8C?= =?UTF-8?q?=E3=81=84=E3=82=8B=E3=82=89=E3=81=97=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/app.scss | 5 ++++- .../assets/sass/components/_link-card.scss | 21 +++++++++++++++++++ resources/assets/sass/tissue.css | 20 ------------------ 3 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 resources/assets/sass/components/_link-card.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 42fa070..2e8a67c 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -5,4 +5,7 @@ @import "~open-iconic/font/css/open-iconic-bootstrap"; // Legacy app styles -@import "tissue.css"; \ No newline at end of file +@import "tissue.css"; + +// Components +@import "components/link-card"; \ No newline at end of file diff --git a/resources/assets/sass/components/_link-card.scss b/resources/assets/sass/components/_link-card.scss new file mode 100644 index 0000000..db5bf43 --- /dev/null +++ b/resources/assets/sass/components/_link-card.scss @@ -0,0 +1,21 @@ +.link-card { + .row > div:last-child { + max-height: 400px; + overflow: hidden; + + // 省略を表す影を付けるやつ + &::before { + content: ''; + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + background: linear-gradient(transparent 320px, white); + } + } + + .card-text { + white-space: pre-line; + } +} \ No newline at end of file diff --git a/resources/assets/sass/tissue.css b/resources/assets/sass/tissue.css index 6f5d485..f7dfd0c 100644 --- a/resources/assets/sass/tissue.css +++ b/resources/assets/sass/tissue.css @@ -96,24 +96,4 @@ width: 100%; border-top-right-radius: calc(.25rem - 1px); border-bottom-right-radius: calc(.25rem - 1px); -} - -.link-card .row > div:last-child { - max-height: 400px; - overflow: hidden; -} - -/* 省略を表す影を付けるやつ */ -.link-card .row > div:last-child::before { - content: ''; - width: 100%; - height: 100%; - position: absolute; - left: 0; - top: 0; - background: linear-gradient(transparent 320px, white); -} - -.link-card .card-text { - white-space: pre-line; } \ No newline at end of file From b430ba71628a87f46a8bced4549b80fd8f57564e Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sun, 10 Mar 2019 15:36:55 +0900 Subject: [PATCH 19/61] =?UTF-8?q?partial=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/sass/{boostrap-custom.scss => _boostrap-custom.scss} | 0 resources/assets/sass/app.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename resources/assets/sass/{boostrap-custom.scss => _boostrap-custom.scss} (100%) diff --git a/resources/assets/sass/boostrap-custom.scss b/resources/assets/sass/_boostrap-custom.scss similarity index 100% rename from resources/assets/sass/boostrap-custom.scss rename to resources/assets/sass/_boostrap-custom.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 1584650..63484cc 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,6 +1,6 @@ // Bootstrap @import "~bootstrap/scss/bootstrap"; -@import "boostrap-custom.scss"; +@import "boostrap-custom"; // Open Iconic @import "~open-iconic/font/css/open-iconic-bootstrap"; From 7c70e6db7e735648c5633064425953ee3120914c Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sun, 10 Mar 2019 15:41:34 +0900 Subject: [PATCH 20/61] =?UTF-8?q?typo=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sass/{_boostrap-custom.scss => _bootstrap-custom.scss} | 0 resources/assets/sass/app.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename resources/assets/sass/{_boostrap-custom.scss => _bootstrap-custom.scss} (100%) diff --git a/resources/assets/sass/_boostrap-custom.scss b/resources/assets/sass/_bootstrap-custom.scss similarity index 100% rename from resources/assets/sass/_boostrap-custom.scss rename to resources/assets/sass/_bootstrap-custom.scss diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 63484cc..097ddd0 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,6 +1,6 @@ // Bootstrap @import "~bootstrap/scss/bootstrap"; -@import "boostrap-custom"; +@import "bootstrap-custom"; // Open Iconic @import "~open-iconic/font/css/open-iconic-bootstrap"; From 57b10d98ac4b4305be72d688d91f688ecd9aabfa Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sun, 10 Mar 2019 16:16:25 +0900 Subject: [PATCH 21/61] =?UTF-8?q?Bootstrap=204.3.1=E3=81=AB=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 2 +- yarn.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7953628..7fdf3bb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ a.k.a. shikorism.net ## 構成 - Laravel 5.5 -- Bootstrap 4.2.1 +- Bootstrap 4.3.1 ## 実行環境 diff --git a/package.json b/package.json index 4fc0b49..fdf890e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { - "bootstrap": "^4.2.1", + "bootstrap": "^4.3.1", "cal-heatmap": "^3.3.10", "chart.js": "^2.7.1", "cross-env": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index 0f9439d..35f3f22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1152,7 +1152,7 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bootstrap@^4.2.1: +bootstrap@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac" integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag== From e1eb3598877078b0d0919df3a28c4865bf7c4107 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sun, 10 Mar 2019 16:28:38 +0900 Subject: [PATCH 22/61] =?UTF-8?q?.tis-word-wrap=E3=82=92=E5=BB=83=E6=AD=A2?= =?UTF-8?q?=E3=81=97=E3=81=A6.text-break=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/sass/tissue.css | 4 ---- resources/views/ejaculation/show.blade.php | 2 +- resources/views/home.blade.php | 4 ++-- resources/views/search/index.blade.php | 4 ++-- resources/views/timeline/public.blade.php | 4 ++-- resources/views/user/profile.blade.php | 4 ++-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/resources/assets/sass/tissue.css b/resources/assets/sass/tissue.css index f7dfd0c..a6a4d13 100644 --- a/resources/assets/sass/tissue.css +++ b/resources/assets/sass/tissue.css @@ -7,10 +7,6 @@ background: linear-gradient(to bottom, #f8f9fa, #fff) } -.tis-word-wrap { - word-wrap: break-word; -} - .tis-contribution-graph { overflow-x: auto; } diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php index 2be6b4a..2eda57f 100644 --- a/resources/views/ejaculation/show.blade.php +++ b/resources/views/ejaculation/show.blade.php @@ -63,7 +63,7 @@ @endif @if (!empty($ejaculation->note)) -

+

{!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}

@endif diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index ed06b4b..1f5c39a 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -54,7 +54,7 @@

最近の公開チェックインから、オカズリンク付きのものを表示しています。