diff --git a/CHANGELOG.md b/CHANGELOG.md index d4032e332..474587dbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Implement Admin Domain Blocks API (Mastodon API Compatible) [ThisIsMissEm](https://github.com/ThisIsMissEm) ([#5021](https://github.com/pixelfed/pixelfed/pull/5021)) - Authorize Interaction support (for handling remote interactions) ([4ca7c6c3](https://github.com/pixelfed/pixelfed/commit/4ca7c6c3)) - Contact Form Admin Responses ([52cc6090](https://github.com/pixelfed/pixelfed/commit/52cc6090)) +- Profile Carousels ([8af77a3f](https://github.com/pixelfed/pixelfed/commit/8af77a3f)) ### Federation - Add ActiveSharedInboxService, for efficient sharedInbox caching ([1a6a3397](https://github.com/pixelfed/pixelfed/commit/1a6a3397)) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index fba1e40b3..5c6e4b082 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -33,7 +33,7 @@ class ProfileController extends Controller } // redirect authed users to Metro 2.0 - if ($request->user()) { + if ($request->user() && !$request->filled('carousel')) { // unless they force static view if (! $request->has('fs') || $request->input('fs') != '1') { $pid = AccountService::usernameToId($username); @@ -64,6 +64,7 @@ class ProfileController extends Controller protected function buildProfile(Request $request, $user) { + $carousel = (bool) $request->filled('carousel'); $username = $user->username; $loggedIn = Auth::check(); $isPrivate = false; @@ -97,6 +98,9 @@ class ProfileController extends Controller ], ]; + if($carousel) { + return view('profile.show_carousel', compact('profile', 'settings')); + } return view('profile.show', compact('profile', 'settings')); } else { $key = 'profile:settings:'.$user->id; @@ -135,7 +139,9 @@ class ProfileController extends Controller 'list' => $settings->show_profile_followers, ], ]; - + if($carousel) { + return view('profile.show_carousel', compact('profile', 'settings')); + } return view('profile.show', compact('profile', 'settings')); } } diff --git a/package-lock.json b/package-lock.json index 0856697af..971e78307 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "name": "pixelfed", "dependencies": { "@fancyapps/fancybox": "^3.5.7", + "@glidejs/glide": "^3.6.2", "@hcaptcha/vue-hcaptcha": "^1.3.0", "@peertube/p2p-media-loader-core": "^1.0.14", "@peertube/p2p-media-loader-hlsjs": "^1.0.14", @@ -2140,6 +2141,11 @@ "jquery": ">=1.9.0" } }, + "node_modules/@glidejs/glide": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/@glidejs/glide/-/glide-3.6.2.tgz", + "integrity": "sha512-oXw7In0IZV69PC0PChQakY+yh+UnqIb5+zfVuEIzub6Kkfl1foo7TAhr2PZXPzihOG9YS57t8wvdzBFEZ0aPVA==" + }, "node_modules/@hcaptcha/vue-hcaptcha": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@hcaptcha/vue-hcaptcha/-/vue-hcaptcha-1.3.0.tgz", diff --git a/package.json b/package.json index 0fced8c08..7724f040c 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ }, "dependencies": { "@fancyapps/fancybox": "^3.5.7", + "@glidejs/glide": "^3.6.2", "@hcaptcha/vue-hcaptcha": "^1.3.0", "@peertube/p2p-media-loader-core": "^1.0.14", "@peertube/p2p-media-loader-hlsjs": "^1.0.14", diff --git a/public/css/profile.css b/public/css/profile.css new file mode 100644 index 000000000..4f5b6ef16 Binary files /dev/null and b/public/css/profile.css differ diff --git a/public/js/account-import.js b/public/js/account-import.js index ee9502155..bf2e40b37 100644 Binary files a/public/js/account-import.js and b/public/js/account-import.js differ diff --git a/public/js/admin.js b/public/js/admin.js index 22764ad87..8b9abbf2b 100644 Binary files a/public/js/admin.js and b/public/js/admin.js differ diff --git a/public/js/admin_invite.js b/public/js/admin_invite.js index f406ad0b5..2f232337f 100644 Binary files a/public/js/admin_invite.js and b/public/js/admin_invite.js differ diff --git a/public/js/app.js b/public/js/app.js index 2e9fb9439..c01f7a131 100644 Binary files a/public/js/app.js and b/public/js/app.js differ diff --git a/public/js/changelog.bundle.f4870a4224d34715.js b/public/js/changelog.bundle.da47c74f7034447a.js similarity index 97% rename from public/js/changelog.bundle.f4870a4224d34715.js rename to public/js/changelog.bundle.da47c74f7034447a.js index a3bf40e14..822d2599b 100644 Binary files a/public/js/changelog.bundle.f4870a4224d34715.js and b/public/js/changelog.bundle.da47c74f7034447a.js differ diff --git a/public/js/collections.js b/public/js/collections.js index 34f1f296d..45efad196 100644 Binary files a/public/js/collections.js and b/public/js/collections.js differ diff --git a/public/js/components.js b/public/js/components.js index 46655778a..b5eec688d 100644 Binary files a/public/js/components.js and b/public/js/components.js differ diff --git a/public/js/compose-classic.js b/public/js/compose-classic.js index a17cba80c..dc2236620 100644 Binary files a/public/js/compose-classic.js and b/public/js/compose-classic.js differ diff --git a/public/js/compose.chunk.52e7225ee6c74bad.js b/public/js/compose.chunk.34ebded0861594ef.js similarity index 98% rename from public/js/compose.chunk.52e7225ee6c74bad.js rename to public/js/compose.chunk.34ebded0861594ef.js index a04412726..41c3722b8 100644 Binary files a/public/js/compose.chunk.52e7225ee6c74bad.js and b/public/js/compose.chunk.34ebded0861594ef.js differ diff --git a/public/js/compose.js b/public/js/compose.js index 7fd58a157..2c8cde6bc 100644 Binary files a/public/js/compose.js and b/public/js/compose.js differ diff --git a/public/js/daci.chunk.5bb69fda8fdedc47.js b/public/js/daci.chunk.5bb69fda8fdedc47.js new file mode 100644 index 000000000..37276e482 Binary files /dev/null and b/public/js/daci.chunk.5bb69fda8fdedc47.js differ diff --git a/public/js/daci.chunk.5dbd1faea828ed0b.js b/public/js/daci.chunk.5dbd1faea828ed0b.js deleted file mode 100644 index 499dbe7bd..000000000 Binary files a/public/js/daci.chunk.5dbd1faea828ed0b.js and /dev/null differ diff --git a/public/js/developers.js b/public/js/developers.js index eb6231ca5..d4f9859b0 100644 Binary files a/public/js/developers.js and b/public/js/developers.js differ diff --git a/public/js/direct.js b/public/js/direct.js index 6f7d6394b..a9fd7e0ac 100644 Binary files a/public/js/direct.js and b/public/js/direct.js differ diff --git a/public/js/discover.chunk.4b677d22775c2e13.js b/public/js/discover.chunk.b5e4952e4d62342b.js similarity index 96% rename from public/js/discover.chunk.4b677d22775c2e13.js rename to public/js/discover.chunk.b5e4952e4d62342b.js index 6748f4566..998af561b 100644 Binary files a/public/js/discover.chunk.4b677d22775c2e13.js and b/public/js/discover.chunk.b5e4952e4d62342b.js differ diff --git a/public/js/discover~findfriends.chunk.2392a288a9031530.js b/public/js/discover~findfriends.chunk.2392a288a9031530.js new file mode 100644 index 000000000..c80c12145 Binary files /dev/null and b/public/js/discover~findfriends.chunk.2392a288a9031530.js differ diff --git a/public/js/discover~findfriends.chunk.f3e42b724965b63c.js b/public/js/discover~findfriends.chunk.f3e42b724965b63c.js deleted file mode 100644 index 87d7159d0..000000000 Binary files a/public/js/discover~findfriends.chunk.f3e42b724965b63c.js and /dev/null differ diff --git a/public/js/discover~hashtag.bundle.2ab0025b9827bd11.js b/public/js/discover~hashtag.bundle.94de7a1013d118bf.js similarity index 90% rename from public/js/discover~hashtag.bundle.2ab0025b9827bd11.js rename to public/js/discover~hashtag.bundle.94de7a1013d118bf.js index d3f77607a..b6c51b20b 100644 Binary files a/public/js/discover~hashtag.bundle.2ab0025b9827bd11.js and b/public/js/discover~hashtag.bundle.94de7a1013d118bf.js differ diff --git a/public/js/discover~memories.chunk.398b63b5473c6be6.js b/public/js/discover~memories.chunk.398b63b5473c6be6.js new file mode 100644 index 000000000..d6b9221e1 Binary files /dev/null and b/public/js/discover~memories.chunk.398b63b5473c6be6.js differ diff --git a/public/js/discover~memories.chunk.c59b92ebe85d45cf.js b/public/js/discover~memories.chunk.c59b92ebe85d45cf.js deleted file mode 100644 index c35a2adad..000000000 Binary files a/public/js/discover~memories.chunk.c59b92ebe85d45cf.js and /dev/null differ diff --git a/public/js/discover~myhashtags.chunk.29b97f80a1338877.js b/public/js/discover~myhashtags.chunk.29b97f80a1338877.js new file mode 100644 index 000000000..96d2f5868 Binary files /dev/null and b/public/js/discover~myhashtags.chunk.29b97f80a1338877.js differ diff --git a/public/js/discover~myhashtags.chunk.f068eadda9058061.js b/public/js/discover~myhashtags.chunk.f068eadda9058061.js deleted file mode 100644 index dd0aee39b..000000000 Binary files a/public/js/discover~myhashtags.chunk.f068eadda9058061.js and /dev/null differ diff --git a/public/js/discover~serverfeed.chunk.9d3ce36a12533da5.js b/public/js/discover~serverfeed.chunk.9d3ce36a12533da5.js deleted file mode 100644 index 5af96e534..000000000 Binary files a/public/js/discover~serverfeed.chunk.9d3ce36a12533da5.js and /dev/null differ diff --git a/public/js/discover~serverfeed.chunk.d729660f46f7f530.js b/public/js/discover~serverfeed.chunk.d729660f46f7f530.js new file mode 100644 index 000000000..10aab70b7 Binary files /dev/null and b/public/js/discover~serverfeed.chunk.d729660f46f7f530.js differ diff --git a/public/js/discover~settings.chunk.61e5007e3e383807.js b/public/js/discover~settings.chunk.61e5007e3e383807.js deleted file mode 100644 index 8ef018ab5..000000000 Binary files a/public/js/discover~settings.chunk.61e5007e3e383807.js and /dev/null differ diff --git a/public/js/discover~settings.chunk.6f4b9b6a6ef5131a.js b/public/js/discover~settings.chunk.6f4b9b6a6ef5131a.js new file mode 100644 index 000000000..2e8d0e34e Binary files /dev/null and b/public/js/discover~settings.chunk.6f4b9b6a6ef5131a.js differ diff --git a/public/js/dms.chunk.1768ba82cee30612.js b/public/js/dms.chunk.49ae3599d4dba309.js similarity index 89% rename from public/js/dms.chunk.1768ba82cee30612.js rename to public/js/dms.chunk.49ae3599d4dba309.js index 4fa698421..4845baf6d 100644 Binary files a/public/js/dms.chunk.1768ba82cee30612.js and b/public/js/dms.chunk.49ae3599d4dba309.js differ diff --git a/public/js/dms~message.chunk.5f4e1fc636c70a14.js b/public/js/dms~message.chunk.61293d7251878a18.js similarity index 97% rename from public/js/dms~message.chunk.5f4e1fc636c70a14.js rename to public/js/dms~message.chunk.61293d7251878a18.js index 5d80335cb..86f49696e 100644 Binary files a/public/js/dms~message.chunk.5f4e1fc636c70a14.js and b/public/js/dms~message.chunk.61293d7251878a18.js differ diff --git a/public/js/error404.bundle.62723d31c3df8cfa.js b/public/js/error404.bundle.9200c0b8734654fb.js similarity index 92% rename from public/js/error404.bundle.62723d31c3df8cfa.js rename to public/js/error404.bundle.9200c0b8734654fb.js index ce8e9932c..904132756 100644 Binary files a/public/js/error404.bundle.62723d31c3df8cfa.js and b/public/js/error404.bundle.9200c0b8734654fb.js differ diff --git a/public/js/group-status.js b/public/js/group-status.js index 5861f3305..106c271ed 100644 Binary files a/public/js/group-status.js and b/public/js/group-status.js differ diff --git a/public/js/group-topic-feed.js b/public/js/group-topic-feed.js index 6dec81898..e7ca72a39 100644 Binary files a/public/js/group-topic-feed.js and b/public/js/group-topic-feed.js differ diff --git a/public/js/group.create.2fb3882ca480a0a2.js b/public/js/group.create.e6f580f22769b687.js similarity index 78% rename from public/js/group.create.2fb3882ca480a0a2.js rename to public/js/group.create.e6f580f22769b687.js index 00d3dba84..0c2274c61 100644 Binary files a/public/js/group.create.2fb3882ca480a0a2.js and b/public/js/group.create.e6f580f22769b687.js differ diff --git a/public/js/groups-page-about.717e51a079fedb67.js b/public/js/groups-page-about.f104deafd36d2813.js similarity index 86% rename from public/js/groups-page-about.717e51a079fedb67.js rename to public/js/groups-page-about.f104deafd36d2813.js index 1c4a82adf..551db02c7 100644 Binary files a/public/js/groups-page-about.717e51a079fedb67.js and b/public/js/groups-page-about.f104deafd36d2813.js differ diff --git a/public/js/groups-page-media.60587cd38c4cd089.js b/public/js/groups-page-media.660d310e20bb9451.js similarity index 86% rename from public/js/groups-page-media.60587cd38c4cd089.js rename to public/js/groups-page-media.660d310e20bb9451.js index 22dae3c4e..81cc2098d 100644 Binary files a/public/js/groups-page-media.60587cd38c4cd089.js and b/public/js/groups-page-media.660d310e20bb9451.js differ diff --git a/public/js/groups-page-members.e7866ecfe1fad40e.js b/public/js/groups-page-members.9e6e807b47585ba8.js similarity index 86% rename from public/js/groups-page-members.e7866ecfe1fad40e.js rename to public/js/groups-page-members.9e6e807b47585ba8.js index ca9008e6e..f862c4c0e 100644 Binary files a/public/js/groups-page-members.e7866ecfe1fad40e.js and b/public/js/groups-page-members.9e6e807b47585ba8.js differ diff --git a/public/js/groups-page-topics.b78ab423f7174566.js b/public/js/groups-page-topics.d51e24af2273e3c4.js similarity index 86% rename from public/js/groups-page-topics.b78ab423f7174566.js rename to public/js/groups-page-topics.d51e24af2273e3c4.js index 753fbecb8..40f026580 100644 Binary files a/public/js/groups-page-topics.b78ab423f7174566.js and b/public/js/groups-page-topics.d51e24af2273e3c4.js differ diff --git a/public/js/groups-page.86e723ad211c456d.js b/public/js/groups-page.acb1312c8fa28603.js similarity index 90% rename from public/js/groups-page.86e723ad211c456d.js rename to public/js/groups-page.acb1312c8fa28603.js index f6d5a3aa9..5ed4c8dbd 100644 Binary files a/public/js/groups-page.86e723ad211c456d.js and b/public/js/groups-page.acb1312c8fa28603.js differ diff --git a/public/js/groups-profile.425f35dbfc98bccc.js b/public/js/groups-profile.2d5b53d784146dd1.js similarity index 82% rename from public/js/groups-profile.425f35dbfc98bccc.js rename to public/js/groups-profile.2d5b53d784146dd1.js index d8e8563e7..4d2dda3fc 100644 Binary files a/public/js/groups-profile.425f35dbfc98bccc.js and b/public/js/groups-profile.2d5b53d784146dd1.js differ diff --git a/public/js/groups.js b/public/js/groups.js index a88f7f4bc..0c589194e 100644 Binary files a/public/js/groups.js and b/public/js/groups.js differ diff --git a/public/js/hashtag.js b/public/js/hashtag.js index 07057472c..e543b0162 100644 Binary files a/public/js/hashtag.js and b/public/js/hashtag.js differ diff --git a/public/js/home.chunk.1d1e6fe050aaaf98.js b/public/js/home.chunk.1d1e6fe050aaaf98.js deleted file mode 100644 index 5f08fd8e1..000000000 Binary files a/public/js/home.chunk.1d1e6fe050aaaf98.js and /dev/null differ diff --git a/public/js/home.chunk.491ce6f986e08bb3.js b/public/js/home.chunk.491ce6f986e08bb3.js new file mode 100644 index 000000000..bdac615df Binary files /dev/null and b/public/js/home.chunk.491ce6f986e08bb3.js differ diff --git a/public/js/home.chunk.1d1e6fe050aaaf98.js.LICENSE.txt b/public/js/home.chunk.491ce6f986e08bb3.js.LICENSE.txt similarity index 100% rename from public/js/home.chunk.1d1e6fe050aaaf98.js.LICENSE.txt rename to public/js/home.chunk.491ce6f986e08bb3.js.LICENSE.txt diff --git a/public/js/i18n.bundle.967974248a457514.js b/public/js/i18n.bundle.873216ad86c80486.js similarity index 97% rename from public/js/i18n.bundle.967974248a457514.js rename to public/js/i18n.bundle.873216ad86c80486.js index 2b67b91fd..4f85b6937 100644 Binary files a/public/js/i18n.bundle.967974248a457514.js and b/public/js/i18n.bundle.873216ad86c80486.js differ diff --git a/public/js/landing.js b/public/js/landing.js index 817a6b942..a461a1c48 100644 Binary files a/public/js/landing.js and b/public/js/landing.js differ diff --git a/public/js/manifest.js b/public/js/manifest.js index 4482868e0..0572adef1 100644 Binary files a/public/js/manifest.js and b/public/js/manifest.js differ diff --git a/public/js/notifications.chunk.64d01f70d8fd0ff4.js b/public/js/notifications.chunk.f04bf557f846d93a.js similarity index 83% rename from public/js/notifications.chunk.64d01f70d8fd0ff4.js rename to public/js/notifications.chunk.f04bf557f846d93a.js index 5c653be5d..dc1c1ffb4 100644 Binary files a/public/js/notifications.chunk.64d01f70d8fd0ff4.js and b/public/js/notifications.chunk.f04bf557f846d93a.js differ diff --git a/public/js/portfolio.js b/public/js/portfolio.js index 660533b6e..d4b0f18f2 100644 Binary files a/public/js/portfolio.js and b/public/js/portfolio.js differ diff --git a/public/js/post.chunk.13919bcfbfc2d438.js b/public/js/post.chunk.13919bcfbfc2d438.js new file mode 100644 index 000000000..4ad4a2949 Binary files /dev/null and b/public/js/post.chunk.13919bcfbfc2d438.js differ diff --git a/public/js/post.chunk.af21320999ba64af.js.LICENSE.txt b/public/js/post.chunk.13919bcfbfc2d438.js.LICENSE.txt similarity index 100% rename from public/js/post.chunk.af21320999ba64af.js.LICENSE.txt rename to public/js/post.chunk.13919bcfbfc2d438.js.LICENSE.txt diff --git a/public/js/post.chunk.af21320999ba64af.js b/public/js/post.chunk.af21320999ba64af.js deleted file mode 100644 index 10063df30..000000000 Binary files a/public/js/post.chunk.af21320999ba64af.js and /dev/null differ diff --git a/public/js/profile.chunk.164b255884ed6d1c.js b/public/js/profile.chunk.164b255884ed6d1c.js new file mode 100644 index 000000000..24e85ba50 Binary files /dev/null and b/public/js/profile.chunk.164b255884ed6d1c.js differ diff --git a/public/js/profile.chunk.75eb020992ddb4dd.js b/public/js/profile.chunk.75eb020992ddb4dd.js deleted file mode 100644 index dcee7e963..000000000 Binary files a/public/js/profile.chunk.75eb020992ddb4dd.js and /dev/null differ diff --git a/public/js/profile.js b/public/js/profile.js index 06df18993..7a210d81d 100644 Binary files a/public/js/profile.js and b/public/js/profile.js differ diff --git a/public/js/profile.js.LICENSE.txt b/public/js/profile.js.LICENSE.txt new file mode 100644 index 000000000..ae386fb79 --- /dev/null +++ b/public/js/profile.js.LICENSE.txt @@ -0,0 +1 @@ +/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ diff --git a/public/js/profile~followers.bundle.3f7b29165d67f18c.js b/public/js/profile~followers.bundle.fa171ea239061d55.js similarity index 95% rename from public/js/profile~followers.bundle.3f7b29165d67f18c.js rename to public/js/profile~followers.bundle.fa171ea239061d55.js index d5759bc49..141b5ea05 100644 Binary files a/public/js/profile~followers.bundle.3f7b29165d67f18c.js and b/public/js/profile~followers.bundle.fa171ea239061d55.js differ diff --git a/public/js/profile~following.bundle.46e6ecfbbf28d2c7.js b/public/js/profile~following.bundle.7a592645bb9eb11f.js similarity index 95% rename from public/js/profile~following.bundle.46e6ecfbbf28d2c7.js rename to public/js/profile~following.bundle.7a592645bb9eb11f.js index 0724a57c3..b435bf157 100644 Binary files a/public/js/profile~following.bundle.46e6ecfbbf28d2c7.js and b/public/js/profile~following.bundle.7a592645bb9eb11f.js differ diff --git a/public/js/remote_auth.js b/public/js/remote_auth.js index 01840d815..390b4c9a5 100644 Binary files a/public/js/remote_auth.js and b/public/js/remote_auth.js differ diff --git a/public/js/search.js b/public/js/search.js index ad0aacbff..448799422 100644 Binary files a/public/js/search.js and b/public/js/search.js differ diff --git a/public/js/spa.js b/public/js/spa.js index babb052d7..5c1950c77 100644 Binary files a/public/js/spa.js and b/public/js/spa.js differ diff --git a/public/js/status.js b/public/js/status.js index f70610c6c..e90c8a402 100644 Binary files a/public/js/status.js and b/public/js/status.js differ diff --git a/public/js/stories.js b/public/js/stories.js index 5e6803f87..8992e412c 100644 Binary files a/public/js/stories.js and b/public/js/stories.js differ diff --git a/public/js/story-compose.js b/public/js/story-compose.js index 776653dd0..6f208b266 100644 Binary files a/public/js/story-compose.js and b/public/js/story-compose.js differ diff --git a/public/js/timeline.js b/public/js/timeline.js index 914899717..73ff3311e 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/js/vendor.js b/public/js/vendor.js index 19750f1a1..1df2b4557 100644 Binary files a/public/js/vendor.js and b/public/js/vendor.js differ diff --git a/public/js/vendor.js.LICENSE.txt b/public/js/vendor.js.LICENSE.txt index 53afcb032..83e24868a 100644 --- a/public/js/vendor.js.LICENSE.txt +++ b/public/js/vendor.js.LICENSE.txt @@ -40,6 +40,12 @@ * Date: 2024-04-21T07:43:05.335Z */ +/*! + * Glide.js v3.6.2 + * (c) 2013-2024 Jędrzej Chałubek (https://github.com/jedrzejchalubek/) + * Released under the MIT License. + */ + /*! * JavaScript Cookie v2.2.1 * https://github.com/js-cookie/js-cookie diff --git a/public/mix-manifest.json b/public/mix-manifest.json index b5efde50d..86204d8f1 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/components/FullscreenCarousel.vue b/resources/assets/components/FullscreenCarousel.vue new file mode 100644 index 000000000..1aac449f9 --- /dev/null +++ b/resources/assets/components/FullscreenCarousel.vue @@ -0,0 +1,336 @@ + + + + + diff --git a/resources/assets/components/ProfileCarousel.vue b/resources/assets/components/ProfileCarousel.vue new file mode 100644 index 000000000..fa27f174e --- /dev/null +++ b/resources/assets/components/ProfileCarousel.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/resources/assets/components/SplashScreen.vue b/resources/assets/components/SplashScreen.vue new file mode 100644 index 000000000..3088949b2 --- /dev/null +++ b/resources/assets/components/SplashScreen.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/resources/assets/js/profile.js b/resources/assets/js/profile.js index ab72c974e..783626116 100644 --- a/resources/assets/js/profile.js +++ b/resources/assets/js/profile.js @@ -28,6 +28,11 @@ Vue.component( require('./components/PostMenu.vue').default ); +Vue.component( + 'profile-carousel', + require('./../components/ProfileCarousel.vue').default +); + Vue.component( 'profile', require('./components/Profile.vue').default diff --git a/resources/assets/sass/profile.scss b/resources/assets/sass/profile.scss new file mode 100644 index 000000000..0d1f2533f --- /dev/null +++ b/resources/assets/sass/profile.scss @@ -0,0 +1,2 @@ +@import "node_modules/@glidejs/glide/src/assets/sass/glide.core.scss"; +@import "node_modules/@glidejs/glide/src/assets/sass/glide.theme.scss"; diff --git a/resources/views/profile/show_carousel.blade.php b/resources/views/profile/show_carousel.blade.php new file mode 100644 index 000000000..a5be918d0 --- /dev/null +++ b/resources/views/profile/show_carousel.blade.php @@ -0,0 +1,42 @@ +@extends('layouts.blank', [ + 'title' => $profile->name . ' (@' . $acct . ') - Pixelfed', + 'ogTitle' => $profile->name . ' (@' . $acct . ')', + 'ogType' => 'profile' +]) + +@php +$acct = $profile->username . '@' . config('pixelfed.domain.app'); +$metaDescription = \App\Services\AccountService::getMetaDescription($profile->id); +@endphp + +@section('content') +@if (session('error')) +
+ {{ session('error') }} +
+@endif + + + +@endsection + +@push('meta') + + + + + + + + + + + + @if($profile->website) +@endif + @if(false == $settings['crawlable'] || $profile->remote_url)@endif +@endpush + +@push('scripts') + +@endpush diff --git a/webpack.mix.js b/webpack.mix.js index 1c52b178b..af23a60c0 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -13,6 +13,7 @@ mix.sass('resources/assets/sass/app.scss', 'public/css') .sass('resources/assets/sass/admin.scss', 'public/css') .sass('resources/assets/sass/portfolio.scss', 'public/css') .sass('resources/assets/sass/spa.scss', 'public/css') +.sass('resources/assets/sass/profile.scss', 'public/css') .sass('resources/assets/sass/landing.scss', 'public/css').version(); mix.js('resources/assets/js/app.js', 'public/js')