diff --git a/packages/atlas/atlas.config.yml b/packages/atlas/atlas.config.yml index f3bb88050a..f9cd865fdd 100644 --- a/packages/atlas/atlas.config.yml +++ b/packages/atlas/atlas.config.yml @@ -1,11 +1,11 @@ general: appName: Gleev # Application name - used in the copy throughout the app, in index.html, open graph meta tags, etc. Don't use env variables here appDescription: 'The streaming platform empowering viewers, creators, and builders. Built on and operated by the Joystream blockchain and DAO.' # Application description - used in index.html meta tags - appTagline: 'The streaming platform empowering viewers, creators, and builders. Built on and operated by the Joystream blockchain and DAO.' appId: '$VITE_APP_ID' # App ID for Apps as first-class citizens - appTwitterId: '@JoystreamDAO' # Twitter handle for the app - used in open graph meta tags in HTML - appUrl: 'https://play.joystream.org' # URL at which the app is hosted - used in open graph meta tags in HTML - appGithubUrl: 'https://github.com/Joystream/atlas' # URL for Atlas GitHub repository - used in the footer + appTwitterId: '@Gleevapp' # Twitter handle for the app - used in open graph meta tags in HTML + appTagline: 'Gleev brings together the like-minded creators and viewers around the shared passion of the present and the future of Crypto affairs.' + appUrl: 'https://gleev.xyz' # URL at which the app is hosted - used in open graph meta tags in HTML + appGithubUrl: 'https://github.com/Joystream/gleev' # URL for Atlas GitHub repository - used in the footer appOgImgPath: '/og-image.webp' # Path to the open graph image - used in open graph meta tags in HTML pioneerMemberUrlPrefix: 'https://dao.joystream.org/#/members' # URL prefix for Pioneer member profile page - used to link to member details joystreamLandingPageUrl: 'https://www.joystream.org' # URL for Joystream landing page - used in the footer and in "Learn more" links @@ -37,6 +37,7 @@ joystream: url: 'ws://localhost:9944' features: + recommendations: false ypp: yppDelayThreshold: 300 # When the YPP sync backlog exceeds the threshold, Atlas will consider the YPP sync delayed. landingPageOgTitle: null # Open graph title for YPP landing page - used in open graph meta tags in HTML @@ -58,24 +59,24 @@ features: - Lower effort production. - Growing subscriber base of channel supporters. rewards: - - 0 # Reward for signup in USD + - 2 # Reward for signup in USD - 0 # Reward for synced video - - 0 # Reward for referral + - 1 # Reward for referral - tier: 'silver' reqs: - Original good quality of content. - Sizeable subscriber base with high ratio of views for videos. rewards: - 25 - - 1 - - 10 + - 3 + - 12.5 - tier: 'gold' reqs: - Great quality of content. - Large subscriber base of fans active in the comments section. rewards: - 50 - - 3 + - 5 - 25 - tier: 'diamond' reqs: @@ -83,7 +84,7 @@ features: - Recognized influencer and large follower audience. rewards: - 100 - - 5 + - 16 - 50 rewards: - title: Sign Up to YouTube Partner Program @@ -106,7 +107,7 @@ features: stepsDescription: Earn when another YouTube creator signs up to the program by using your your referral link. steps: - Copy your link with get referral link button. - - Send it to as many Web3 YouTube creators as you want. + - Send it to as many YouTube creators as you want. - Get rewarded for every new successful sign up, that uses your referral link. Referral reward depends on their popularity tier. - If signed up without the link they can simply add your channel name to the referral field in the registration flow. baseAmount: null @@ -298,29 +299,29 @@ content: color: '#D92E61' # Color used in the UI for this category iconUrl: '' # URL for category icon SVG coverImgUrl: '' # URL for category cover image - videoCategories: ['3142434-2'] # List of metaprotocol category IDs that should be included in this display category - defaultVideoCategory: '3142434-2' + videoCategories: ['4209396-2'] # List of metaprotocol category IDs that should be included in this display category + defaultVideoCategory: '4209396-2' - id: '2' name: 'Animation and Film' color: '#E7BE2D' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142437-2'] - defaultVideoCategory: '3142437-2' + videoCategories: ['4209546-2'] + defaultVideoCategory: '4209546-2' - id: '3' name: 'Autos and Vehicles' color: '#BD4BE4' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142440-2'] - defaultVideoCategory: '3142440-2' + videoCategories: ['4209572-2'] + defaultVideoCategory: '4209572-2' - id: '4' name: 'Business and Finance' color: '#BDE933' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142443-2'] - defaultVideoCategory: '3142443-2' + videoCategories: ['4209583-2'] + defaultVideoCategory: '4209583-2' - id: '5' name: 'Crypto' color: '#54A7F0' @@ -328,133 +329,129 @@ content: coverImgUrl: '' videoCategories: [ - '3142446-2', - '57-2', - '59-2', - '61-2', - '63-2', - '848-2', - '852-2', - '856-2', - '860-2', - '864-2', - '868-2', - '873-2', - '878-2', - '883-2', - '888-2', - '893-2', - '898-2', - '905-2', - '910-2', - '915-2', + '4209591-2', + '254423-2', + '254433-2', + '254434-2', + '254435-2', + '254436-2', + '254437-2', + '254438-2', + '254441-2', + '254445-2', + '254446-2', + '254449-2', + '887567-2', + '254450-2', ] - defaultVideoCategory: '3142446-2' + defaultVideoCategory: '4209591-2' - id: '6' name: 'DIY' color: '#DD379D' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142448-2'] - defaultVideoCategory: '3142448-2' + videoCategories: ['4209595-2'] + defaultVideoCategory: '4209595-2' - id: '7' name: 'Education' color: '#5A7AEE' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142451-2'] - defaultVideoCategory: '3142451-2' + videoCategories: ['4209603-2'] + defaultVideoCategory: '4209603-2' - id: '8' name: 'Entertainment' color: '#41EE5A' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142456-2'] - defaultVideoCategory: '3142456-2' + videoCategories: ['4209609-2'] + defaultVideoCategory: '4209609-2' - id: '9' name: 'Lifestyle' color: '#9455E8' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142459-4'] - defaultVideoCategory: '"3142459-4' + videoCategories: ['4209637-2'] + defaultVideoCategory: '4209637-2' - id: '10' name: 'Memes and Humour' color: '#4FE1F2' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142468-2'] - defaultVideoCategory: '3142468-2' + videoCategories: ['4209643-2'] + defaultVideoCategory: '4209643-2' - id: '11' name: 'Music and Music Videos' color: '#6E5FEC' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142471-2'] - defaultVideoCategory: '3142471-2' + videoCategories: ['4209650-2'] + defaultVideoCategory: '4209650-2' - id: '12' name: 'Nature' color: '#E57827' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142475-2'] - defaultVideoCategory: '3142475-2' + videoCategories: ['4209658-2'] + defaultVideoCategory: '4209658-2' - id: '13' name: 'News and Current Affairs' color: '#6EEC3A' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142484-2'] - defaultVideoCategory: '3142484-2' + videoCategories: ['4209664-2'] + defaultVideoCategory: '4209664-2' - id: '14' name: 'People and Blogs' color: '#E141D6' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142490-2'] - defaultVideoCategory: '3142490-2' + videoCategories: ['4209674-2'] + defaultVideoCategory: '4209674-2' - id: '15' name: 'Pets and Animals' color: '#48F0B3' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142493-2'] - defaultVideoCategory: '3142493-2' + videoCategories: ['4209679-2'] + defaultVideoCategory: '4209679-2' - id: '16' name: 'Sports' color: '#B0E839' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142501-3'] - defaultVideoCategory: '3142501-3' + videoCategories: ['4209685-2'] + defaultVideoCategory: '4209685-2' - id: '17' name: 'Technology' color: '#3EE7B4' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142503-2'] - defaultVideoCategory: '3142503-2' + videoCategories: ['4209691-2'] + defaultVideoCategory: '4209691-2' - id: '18' name: 'Travel' color: '#68FA63' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142506-2'] - defaultVideoCategory: '3142506-2' + videoCategories: ['4209700-2'] + defaultVideoCategory: '4209700-2' - id: '19' name: 'Unboxing' color: '#EE4BB7' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142509-2'] - defaultVideoCategory: '3142509-2' + videoCategories: ['4209707-2'] + defaultVideoCategory: '4209707-2' - id: '20' name: 'Video Games' color: '#FCAC4D' iconUrl: '' coverImgUrl: '' - videoCategories: ['3142511-2'] - defaultVideoCategory: '3142511-2' + videoCategories: ['4209721-2'] + defaultVideoCategory: '4209721-2' + + showAllContent: false # With this disabled, Atlas will display only content from display categories defined above. If you want your app to display all Joystream content, set this to true. languages: # List of languages to be used in the app. Those will be used when setting video's language, for adding subtitles, etc. - isoCode: ar @@ -718,7 +715,7 @@ legal: Licenses supported may be updated at any time and full set of licenses that are available for selection in the App upon video upload or uploaded via Command Line interface are contained in [this file](https://github.com/Joystream/atlas/blob/master/packages/atlas/src/data/knownLicenses.json) privacyPolicy: | # 1. Privacy Policy - Last updated on the 9th of June 2023 + Last updated on the 4th of December 2023 ## 1.1 Agreement to the Policy diff --git a/packages/atlas/src/.env b/packages/atlas/src/.env index 7a867697be..f4b47f9e1c 100644 --- a/packages/atlas/src/.env +++ b/packages/atlas/src/.env @@ -1,7 +1,7 @@ # This file is committed. Do not store secrets here # should be set to "production" for production builds -VITE_ENV=development +VITE_ENV=next VITE_ENV_SELECTION_ENABLED=true # default env in environments admin modal. Can be production, development, next or local. If not provided, VITE_ENV will be used VITE_DEFAULT_DATA_ENV= @@ -32,6 +32,7 @@ VITE_USERSNAP_ID= # Production env URLs VITE_PRODUCTION_ORION_AUTH_URL=https://auth.gleev.xyz/api/v1 +VITE_PRODUCTION_ORION_INTERACTIONS_URL= VITE_PRODUCTION_ORION_URL=https://orion.gleev.xyz/graphql VITE_PRODUCTION_QUERY_NODE_SUBSCRIPTION_URL=wss://orion.joystream.org/graphql VITE_PRODUCTION_NODE_URL=wss://rpc.joystream.org:9944 @@ -40,6 +41,7 @@ VITE_PRODUCTION_YPP_FAUCET_URL=https://18.184.136.237.nip.io/membership # Development env URLs - this is the default configuration if VITE_ENV != production VITE_DEVELOPMENT_ORION_AUTH_URL=https://atlas-dev.joystream.org/api/v1 +VITE_DEVELOPMENT_ORION_INTERACTIONS_URL= VITE_DEVELOPMENT_ORION_URL=https://atlas-dev.joystream.org/orion-api/graphql VITE_DEVELOPMENT_QUERY_NODE_SUBSCRIPTION_URL=wss://atlas-dev.joystream.org/orion-v2/graphql VITE_DEVELOPMENT_NODE_URL=wss://atlas-dev.joystream.org/ws-rpc @@ -48,6 +50,7 @@ VITE_DEVELOPMENT_YPP_FAUCET_URL=https://50.19.175.219.nip.io/memberships # Experimental env URLs VITE_NEXT_ORION_AUTH_URL=https://3.73.121.180.nip.io/api/v1 +VITE_NEXT_ORION_INTERACTIONS_URL=https://3.73.121.180.nip.io/interactions/api/v1 VITE_NEXT_ORION_URL=https://3.73.121.180.nip.io/orion/graphql VITE_NEXT_QUERY_NODE_SUBSCRIPTION_URL=wss://3.73.121.180.nip.io/orion/graphql VITE_NEXT_NODE_URL=wss://3.73.121.180.nip.io/ws-rpc @@ -56,6 +59,7 @@ VITE_NEXT_YPP_FAUCET_URL=wss://3.73.121.180.nip.io/ws-rpc # Local development env URLs VITE_LOCAL_ORION_AUTH_URL=http://localhost:4074/api/v1 +VITE_LOCAL_ORION_INTERACTIONS_URL=http://localhost:4075/api/v1 VITE_LOCAL_ORION_URL=http://localhost:4350/graphql VITE_LOCAL_QUERY_NODE_SUBSCRIPTION_URL=ws://localhost:8081/graphql VITE_LOCAL_NODE_URL=ws://localhost:9944/ws-rpc diff --git a/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts b/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts index 84c5d100ad..f5d4ce53ad 100644 --- a/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts +++ b/packages/atlas/src/api/queries/__generated__/baseTypes.generated.ts @@ -8253,6 +8253,7 @@ export type Query = { getCumulativeHistoricalShareAllocation: GetCumulativeHistoricalShareAllocationResult getKillSwitch: KillSwitch getShareDividend: GetShareDividendsResult + homepageVideos: RecommendedVideosQuery licenseById?: Maybe /** @deprecated Use licenseById */ licenseByUniqueInput?: Maybe @@ -8270,6 +8271,7 @@ export type Query = { membershipsConnection: MembershipsConnection mostRecentChannels: Array mostViewedVideosConnection: VideosConnection + nextVideo: RecommendedVideosQuery nftActivities: Array nftActivitiesConnection: NftActivitiesConnection nftActivityById?: Maybe @@ -8335,6 +8337,7 @@ export type Query = { sessionEncryptionArtifactsConnection: SessionEncryptionArtifactsConnection sessions: Array sessionsConnection: SessionsConnection + similarVideos: RecommendedVideosQuery squidStatus?: Maybe storageBagById?: Maybe /** @deprecated Use storageBagById */ @@ -9127,6 +9130,13 @@ export type QueryGetShareDividendArgs = { tokenId: Scalars['String'] } +export type QueryHomepageVideosArgs = { + limit?: InputMaybe + orderBy?: InputMaybe> + recommId?: InputMaybe + where?: InputMaybe +} + export type QueryLicenseByIdArgs = { id: Scalars['String'] } @@ -9209,6 +9219,12 @@ export type QueryMostViewedVideosConnectionArgs = { where?: InputMaybe } +export type QueryNextVideoArgs = { + recommId?: InputMaybe + videoId?: InputMaybe + where?: InputMaybe +} + export type QueryNftActivitiesArgs = { limit?: InputMaybe offset?: InputMaybe @@ -9495,6 +9511,14 @@ export type QuerySessionsConnectionArgs = { where?: InputMaybe } +export type QuerySimilarVideosArgs = { + limit?: InputMaybe + orderBy?: InputMaybe> + recommId?: InputMaybe + videoId?: InputMaybe + where?: InputMaybe +} + export type QueryStorageBagByIdArgs = { id: Scalars['String'] } @@ -10071,6 +10095,20 @@ export type RecipientTypeWhereInput = { membership_isNull?: InputMaybe } +export type RecommendedChannelsQuery = { + __typename?: 'RecommendedChannelsQuery' + numberNextRecommsCalls?: Maybe + recommId: Scalars['String'] + video: Array +} + +export type RecommendedVideosQuery = { + __typename?: 'RecommendedVideosQuery' + numberNextRecommsCalls?: Maybe + recommId: Scalars['String'] + video: Array