Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4cad3b4
Merge pull request #724 from WatchItDev/next
geolffreym May 20, 2025
1ab2096
ui(access): free as text for free button:
geolffreym May 20, 2025
8afc3db
Merge pull request #726 from WatchItDev/next
geolffreym May 21, 2025
fdb139b
feat: add ale to ownership
Jadapema May 22, 2025
f840aa9
Merge pull request #727 from WatchItDev/feat/add/ale
geolffreym May 22, 2025
c23879b
Merge pull request #730 from WatchItDev/next
geolffreym May 26, 2025
7cf7ae0
chore: bumpo version
geolffreym May 26, 2025
5780743
fix: delay on publication
Jadapema May 26, 2025
a4c3529
Merge branch 'main' into app/fix/redux
Jadapema May 26, 2025
1386e03
Merge pull request #731 from WatchItDev/app/fix/redux
geolffreym May 26, 2025
1672652
fix: follow button click
Jadapema May 26, 2025
d37ea64
Merge pull request #732 from WatchItDev/app/fix/redux
geolffreym May 26, 2025
c6503ab
fix: header skeleton, flashing on publication details view, padding o…
Jadapema May 28, 2025
01258f9
Merge pull request #733 from WatchItDev/app/fix/redux
geolffreym May 28, 2025
77c4c7f
fix: explore publications carousel
Jadapema Jun 5, 2025
53489fd
Merge pull request #768 from WatchItDev/fix/explore/publications
geolffreym Jun 5, 2025
cfdd342
fix: tune player for unstable networks
geolffreym Jun 9, 2025
e402f28
feat: adapted the api hooks to use the new data structure
Jadapema Jun 11, 2025
30d2dc0
Merge pull request #775 from WatchItDev/app/new/data/structure
geolffreym Jun 11, 2025
2cea3ef
feat: order main slide to show recent first
Jadapema Jun 11, 2025
7b34c94
Merge pull request #776 from WatchItDev/app/new/data/structure
geolffreym Jun 11, 2025
81ef486
chore: added kana as viewer
geolffreym Jun 16, 2025
b86ff11
fix: tune quality switch
geolffreym Jun 20, 2025
9a0f78f
fix: tune quality switch
geolffreym Jun 20, 2025
1ef79a2
fix: tune quality switch
geolffreym Jun 20, 2025
83187f1
fix: tune quality switch
geolffreym Jun 21, 2025
a787e62
fix: tune quality switch
geolffreym Jun 21, 2025
d7349a9
fix: tune quality switch
geolffreym Jun 21, 2025
aa483e1
feat: open ownership section to verified accounts
Jadapema Jun 24, 2025
039824b
Merge pull request #780 from WatchItDev/app/open/ownership/verified
geolffreym Jun 24, 2025
f4532fb
fix: nonce when sending operation
Jadapema Jun 25, 2025
163cef7
Merge pull request #781 from WatchItDev/app/fix/nonce
geolffreym Jun 25, 2025
67245d9
fix: viem client
Jadapema Jun 26, 2025
0f6b56d
Merge pull request #782 from WatchItDev/fix/client
geolffreym Jun 26, 2025
f6f772b
feat: added achievements ui
Jadapema Jul 9, 2025
4503f59
feat: added achievements section
Jadapema Jul 14, 2025
dcde22f
bump version
geolffreym Jul 14, 2025
b259033
Merge branch 'next' into app/achievements
geolffreym Jul 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
576 changes: 239 additions & 337 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "watchit",
"author": "Watchit",
"type": "module",
"version": "2.3.0-beta.2",
"version": "2.4.0-beta.1",
"description": "Open videos everywhere",
"email": "[email protected]",
"private": true,
Expand Down Expand Up @@ -99,6 +99,7 @@
"nprogress": "^0.2.0",
"numeral": "^2.0.6",
"pbkdf2": "^3.1.2",
"permissionless": "^0.2.47",
"react": "^18.2.0",
"react-apexcharts": "^1.7.0",
"react-dom": "^18.2.0",
Expand All @@ -124,7 +125,7 @@
"stylis-plugin-rtl": "^2.0.2",
"swr": "^2.2.0",
"uuid": "^10.0.0",
"viem": "^2.21.53",
"viem": "^2.31.4",
"worker-loader": "^3.0.8",
"yet-another-react-lightbox": "^3.11.4",
"yup": "^1.4.0"
Expand Down
Binary file added src/assets/illustrations/check_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/check_green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/engager.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/fan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/guardian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/guess.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/hi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/question.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/scout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/scout_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/splotligther.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/storykeeper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/supporter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/watcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/illustrations/wheel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/clients/viem/publicClient.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { createPublicClient, http, webSocket } from 'viem';
import { polygonAmoy } from 'viem/chains';
import { GLOBAL_CONSTANTS } from '@src/config-global.ts';

const WS_URL = 'wss://polygon-amoy-bor-rpc.publicnode.com';

Expand All @@ -8,6 +9,11 @@ export const publicClient = createPublicClient({
transport: http(polygonAmoy.rpcUrls.default.http[0]),
});

export const alchemyClient = createPublicClient({
chain: polygonAmoy,
transport: http(GLOBAL_CONSTANTS.RPC_URL),
});

export const publicClientWebSocket = createPublicClient({
chain: polygonAmoy,
transport: webSocket(WS_URL),
Expand Down
2 changes: 1 addition & 1 deletion src/components/carousel/variants/carousel-top-titles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function CarouselTopTitles({ posts, category }: Readonly<Carousel
>
<Carousel ref={carousel.carouselRef} {...carousel.carouselSettings}>
{posts.map((post: Post) => (
<Box key={`${category}-${post.id}`} sx={{ px: 0.75, height: '100%' }}>
<Box key={`${category}-${post.id}`} sx={{ height: '100%' }}>
<PosterTopTitles post={post} />
</Box>
))}
Expand Down
8 changes: 4 additions & 4 deletions src/components/follow-unfollow-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
profileId,
size = 'medium',
followButtonMinWidth = 120,
onActionFinish = () => {},

Check failure on line 44 in src/components/follow-unfollow-button.tsx

View workflow job for this annotation

GitHub Actions / Static Analysis and Test | Node 20

Unexpected empty arrow function
}: PropsWithChildren<FollowUnfollowButtonProps>) => {
const dispatch = useDispatch();
const [loadProfile, { data: profileData, loading: profileLoading }] = useGetUserLazyQuery();
Expand All @@ -53,14 +53,14 @@
const { sendNotification } = useNotifications();
const { generatePayload } = useNotificationPayload(session);
const profile: User | null = profileData?.getUser;
const isLoading = isProcessing || profileLoading || profileFollowLoading || isFollowingLoading;
const isLoading = isProcessing || profileLoading || profileFollowLoading || isFollowingLoading || !profile;
const RainbowEffect = isLoading ? NeonPaper : Box;

useEffect(() => {
if (profileId && profileId !== session?.address) loadProfile({variables: { input: { address: profileId } }});

if (!profileId) return;
loadProfile({variables: { input: { address: profileId } }});
getIsFollowing({variables: { targetAddress: profileId }});
}, []);
}, [profileId]);

useEffect(() => {
setIsProcessing(false);
Expand Down
29 changes: 20 additions & 9 deletions src/components/publication-detail-main/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ import { useAuth } from '@src/hooks/use-auth.ts';
import { useToggleBookmark } from '@src/hooks/use-toggle-bookmark';
import {
useHidePostMutation,
useGetIsPostLikedLazyQuery,
useTogglePostLikeMutation,
useGetIsLikedLazyQuery,
useToggleLikeMutation,
} from '@src/graphql/generated/hooks.tsx';
import { resolveSrc } from '@src/utils/image.ts';
import { useBookmarks } from '@src/hooks/use-bookmark.ts';
Expand Down Expand Up @@ -81,8 +81,8 @@ export default function PublicationDetailMain({
const [ hidePost ] = useHidePostMutation();
const { sendNotification } = useNotifications();
const { generatePayload } = useNotificationPayload(sessionData);
const [getIsPostLiked, { loading: postLikedLoading }] = useGetIsPostLikedLazyQuery()
const [ togglePostLike, { loading: togglePostLikeLoading } ] = useTogglePostLikeMutation()
const [getIsLiked, { loading: postLikedLoading }] = useGetIsLikedLazyQuery()
const [ toggleLike, { loading: togglePostLikeLoading } ] = useToggleLikeMutation()
const { has, loading: loadingList } = useBookmarks();
const { toggle, loading: loadingToggle } = useToggleBookmark();

Expand All @@ -95,8 +95,18 @@ export default function PublicationDetailMain({
if (!sessionData?.authenticated) return dispatch(openLoginModal());

try {
const res = await togglePostLike({ variables: { input: { postId: post.id } } });
const isNowLiked = res.data?.togglePostLike ?? false;
const res = await toggleLike({
variables: {
input: {
targetId: post.id,
targetType: 'POST'
}
}
});
const isNowLiked = res.data?.toggleLike ?? false;

console.log('hello test', res.data?.toggleLike)
console.log(isNowLiked)

setHasLiked(isNowLiked);
setLikesCount((prev) => prev + (isNowLiked ? 1 : -1));
Expand Down Expand Up @@ -132,9 +142,10 @@ export default function PublicationDetailMain({
};

useEffect(() => {
getIsPostLiked({ variables: { postId: post.id } }).then((res) =>
setHasLiked(res.data?.getIsPostLiked ?? false),
);
getIsLiked({ variables: { targetId: post.id } }).then((res) => {
console.log('hello test 2', res.data?.getIsLiked)
setHasLiked(res.data?.getIsLiked ?? false)
});
}, [post.id]);

const handleHide = async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const SponsoredAccessTrialButton: FC<ExtendedSponsoredAccessProps> = (pro
display: { xs: size === 'sm' ? 'none' : 'flex', md: 'flex' }
}}
>
Free trial
Free
</Typography>
</StyledBoxGradient>
</RainbowEffect>
Expand Down
12 changes: 7 additions & 5 deletions src/components/video-player/video-player.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ export const VideoPlayer: FC<VideoPlayerProps> = ({ src, cid, titleMovie, onBack
// allows faster adaptation but increases the chance of playback interruptions.
// Finding the right balance ensures smooth playback without unnecessary network congestion.
// (hls_time = 6 + maxBufferLength = 30) = 5 fragments in buffer
// "maxBufferLength": 60, // Max video buffer length in seconds
// "maxMaxBufferLength": 600, // Absolute max buffer length
"maxBufferLength": 60, // Max video buffer length in seconds
"maxMaxBufferLength": 600, // Absolute max buffer length
// maxStarvationDelay defines the maximum acceptable time (in seconds) a fragment can take to download
// while playback is already in progress.
// - If a fragment is estimated to take longer than this value and the buffer is running low,
Expand Down Expand Up @@ -109,19 +109,21 @@ export const VideoPlayer: FC<VideoPlayerProps> = ({ src, cid, titleMovie, onBack
// abrBandWidthFactor: Determines how conservatively HLS estimates available bandwidth.
// A value < 1.0 ensures HLS.js does not use the full estimated bandwidth, preventing aggressive quality changes.
// Recommended range: 0.7 - 0.9 (Lower = More cautious, fewer quality switches)
// "abrBandWidthFactor": 0.9,
// "abrBandWidthFactor": 0.7,
// abrBandWidthUpFactor: Controls how aggressively the player upgrades to a higher bitrate.
// A lower value prevents HLS.js from switching to a higher quality too quickly, reducing unnecessary upscaling.
// Recommended range: 0.5 - 0.8 (Lower = More stable, avoids excessive upscaling)
// "abrBandWidthUpFactor": 0.7,
// "abrBandWidthUpFactor": 0.6,
"enableSoftwareAES": false, // Disable software AES decryption
"enableID3MetadataCues": false, // Disable ID3 metadata cues
"enableWebVTT": true, // Enable WebVTT subtitles
"enableIMSC1": false, // Disable IMSC1 subtitles
"enableCEA708Captions": false, // Disable CEA-708 captions,
// "abrMaxWithRealBitrate": true,
"enableWorker": true,
"backBufferLength": 90,
"lowLatencyMode": false, // Not needed in VOD
// "progressive": true,
// "lowLatencyMode": false, // Not needed in VOD
// "startFragPrefetch": true,
"fLoader": FetchLoader,
"pLoader": XhrLoader
Expand Down
2 changes: 2 additions & 0 deletions src/config-global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export interface GlobalConstants {
PINATA_SECRET_API_KEY: string;
WEB3_CLIENT_ID: string;
PIMLICO: string;
RPC_URL: string;
NEXT_PUBLIC_SUPABASE_URL: string;
NEXT_PUBLIC_SUPABASE_ANON_KEY: string;
ENVIRONMENT: string;
Expand Down Expand Up @@ -105,6 +106,7 @@ export const GLOBAL_CONSTANTS: GlobalConstants = {
GQL_ENDPOINT: process.env.VITE_GQL_ENDPOINT || import.meta.env.VITE_GQL_ENDPOINT || 'http://localhost:4000/graphql',
OPEN_COLLECTIVE: process.env.VITE_URL_OPEN_COLLECTIVE || import.meta.env.VITE_URL_OPEN_COLLECTIVE || '',
TERMS_AND_CONDITIONS: process.env.VITE_URL_TERMS_AND_CONDITIONS || import.meta.env.VITE_URL_TERMS_AND_CONDITIONS || '',
RPC_URL: process.env.VITE_POLYGON_AMOY_RPC || import.meta.env.VITE_POLYGON_AMOY_RPC || 'https://polygon-amoy-bor-rpc.publicnode.com',
};

export const PATH_AFTER_LOGIN = paths.dashboard.root;
Loading
Loading