diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 0413d29de..3d5a748b7 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -70,7 +70,7 @@ jobs: push: true build-args: | GH_GA_ID=G-TP1XEFNHQD - GH_APP_KIND=polkaverse + GH_APP_KIND=grill GH_HCAPTCHA_SITE_KEY=${{ secrets.PROD_HCAPTCHA_SITE_KEY }} GH_AMP_ID=2eeca0e8a0163c89e3f023c971e426a6 GH_OFFCHAIN_SIGNER_URL=https://signer.subsocial.network diff --git a/.github/workflows/feature-based.yaml b/.github/workflows/feature-based.yaml index d95e95cbe..00f94c6f4 100644 --- a/.github/workflows/feature-based.yaml +++ b/.github/workflows/feature-based.yaml @@ -60,7 +60,7 @@ jobs: push: true build-args: | GH_GA_ID=fake - GH_APP_KIND=polkaverse + GH_APP_KIND=grill GH_HCAPTCHA_SITE_KEY=3beeddac-2dce-41cc-8e18-338118426c38 GH_AMP_ID=71bf5a46800fedba5e9a01243b988164 GH_OFFCHAIN_SIGNER_URL=https://signer.subsocial.network diff --git a/dev.env b/dev.env index 7ef697a12..f4a823c7e 100644 --- a/dev.env +++ b/dev.env @@ -1,42 +1,18 @@ # Logger level NEXT_PUBLIC_LOG_LEVEL=debug -# App kind: 'polkaverse' | 'staging' -NEXT_PUBLIC_APP_KIND=polkaverse +# App kind: 'grill' | 'polkaverse' | 'staging' +NEXT_PUBLIC_APP_KIND=grill # Connection kind: # 'local' - For development in localhost infrastructure (local Substrate, IPFS, etc.) # 'dev' - For development in betanet/mainnet infrastructure. # 'staging' - For development in staging infrastructure. # 'main' - If running this web app on a production server. -NEXT_PUBLIC_CONNECTION_KIND=staging - -SELLER_CLIENT_ID='' -SELLER_CLIENT_TOKEN_SIGNER='' - -# Id for Google Analytics -# NEXT_PUBLIC_GA_ID= - -# NEXT_PUBLIC_ENABLE_MAINTENANCE_PAGE=true -# NEXT_PUBLIC_MAINTENANCE_TEXT='' - -# NEXT_PUBLIC_SUBSTRATE_URL= -# NEXT_PUBLIC_SUBSTRATE_RPC_URL= -# NEXT_PUBLIC_OFFCHAIN_URL= -# NEXT_PUBLIC_OFFCHAIN_WS= -# NEXT_PUBLIC_GRAPHQL_URL= -# NEXT_PUBLIC_IPFS_NODE_URL= - -# UI settings overwrite -# NEXT_PUBLIC_ENABLE_SEARCH=true -# NEXT_PUBLIC_ENABLE_FEED=true -# NEXT_PUBLIC_ENABLE_NOTIFICATIONS=true -# NEXT_PUBLIC_ENABLE_ACTIVITY=true -# NEXT_PUBLIC_ENABLE_SESSION_KEY=true -# NEXT_PUBLIC_ENABLE_EMAIL_SETTINGS=true -# NEXT_PUBLIC_ENABLE_FAUCET=true -# NEXT_PUBLIC_ENABLE_DOWNVOTES=true -# NEXT_PUBLIC_ENABLE_GRAPHQL=true -# NEXT_PUBLIC_ENABLE_CONTRIBUTION_PAGE=true -# NEXT_PUBLIC_ENABLE_ONCHAIN_ACTIVITIES=true -# NEXT_PUBLIC_ENABLE_SQUID_DATA_SOURCE=true +NEXT_PUBLIC_CONNECTION_KIND=main +NEXT_PUBLIC_GA_ID= +SERVER_MNEMONIC= +NEXT_PUBLIC_DATAHUB_QUERY_URL= +NEXT_PUBLIC_DATAHUB_SUBSCRIPTION_URL= +DATAHUB_QUEUE_URL +DATAHUB_QUEUE_TOKEN= diff --git a/localhost.env b/localhost.env index 97707ed31..2ebfb413c 100644 --- a/localhost.env +++ b/localhost.env @@ -1,8 +1,8 @@ # Logger level LOG_LEVEL=debug -# App kind: 'polkaverse' | 'subsocial' -APP_KIND=subsocial +# App kind: 'grill' | 'polkaverse' +APP_KIND=grill # Connection kind: # 'local' - For development in localhost infrastructure (local Substrate, IPFS, etc.) diff --git a/next.config.js b/next.config.js index 36e7bd556..203ecbbe3 100644 --- a/next.config.js +++ b/next.config.js @@ -11,7 +11,7 @@ require('dotenv').config() const nextConfig = { target: 'server', images: { - domains: ['app.subsocial.network', 'polkaverse.com', 'localhost', 'ipfs.io'], + domains: ['app.subsocial.network', 'polkaverse.com', 'localhost', 'ipfs.io', 'grillapp.net'], }, webpack: (config, { isServer }) => { // This code for webpack 4 diff --git a/public/images/grill-default-cover.png b/public/images/grill-default-cover.png new file mode 100644 index 000000000..db2344acb Binary files /dev/null and b/public/images/grill-default-cover.png differ diff --git a/src/components/auth/signIn/SignInModal.tsx b/src/components/auth/signIn/SignInModal.tsx index a6706cb3e..55a0c199f 100644 --- a/src/components/auth/signIn/SignInModal.tsx +++ b/src/components/auth/signIn/SignInModal.tsx @@ -306,7 +306,7 @@ function SignInDesc() { const isMobile = useIsMobileWidthOrDevice() if (isMobile) { if (hasInjectedWallet()) { - return <>To use Polkaverse, you need to connect your wallet + return <>To use {config.appName}, you need to connect your wallet } return ( <>To use PolkaVerse, you need a wallet to manage your account. We recommend Nova Wallet. diff --git a/src/components/leaderboard/ProgressModal.tsx b/src/components/leaderboard/ProgressModal.tsx index 8c7d7218c..e013b8edc 100644 --- a/src/components/leaderboard/ProgressModal.tsx +++ b/src/components/leaderboard/ProgressModal.tsx @@ -5,6 +5,7 @@ import html2canvas from 'html2canvas' import { useEffect, useState } from 'react' import { ReactNode } from 'react-markdown' import CustomModal from 'src/components/utils/CustomModal' +import config from 'src/config' import { resolveIpfsUrl } from 'src/ipfs' import { useFetchProfileSpace, useSelectProfile } from 'src/rtk/app/hooks' import { useFetchUserPrevReward } from 'src/rtk/features/activeStaking/hooks' @@ -273,7 +274,7 @@ function ProgressPanel({ }) } - const shareOnPolkaverse = () => { + const shareOnPlatform = () => { const total = parseToBigInt(data?.earned.staker) + parseToBigInt(data?.earned.creator) const { isZero, value } = formatSUB(total.toString()) const title = `I earned ${isZero ? '' : `${value} `}SUB ${ @@ -387,10 +388,10 @@ function ProgressPanel({ type='default' ghost size='large' - onClick={() => shareOnPolkaverse()} + onClick={() => shareOnPlatform()} loading={loading} > - Share on Polkaverse + Share on {config.appName} )} diff --git a/src/components/leaderboard/common/LeaderboardTabs.tsx b/src/components/leaderboard/common/LeaderboardTabs.tsx index 5a719f41c..48a044396 100644 --- a/src/components/leaderboard/common/LeaderboardTabs.tsx +++ b/src/components/leaderboard/common/LeaderboardTabs.tsx @@ -2,6 +2,7 @@ import { Tabs } from 'antd' import router from 'next/router' import { useMyAddress } from 'src/components/auth/MyAccountsContext' import CustomLink from 'src/components/referral/CustomLink' +import config from 'src/config' import { useSendEvent } from 'src/providers/AnalyticContext' import { useFetchTotalStake } from 'src/rtk/features/creators/totalStakeHooks' import { getAmountRange } from 'src/utils/analytics' @@ -65,7 +66,7 @@ export default function LeaderboardTabs({ - Polkaverse Stats + {config.appName} Stats } key='stats' diff --git a/src/components/posts/view-post/PostPage.tsx b/src/components/posts/view-post/PostPage.tsx index fe9f12b69..75db10923 100644 --- a/src/components/posts/view-post/PostPage.tsx +++ b/src/components/posts/view-post/PostPage.tsx @@ -115,18 +115,19 @@ const InnerPostPage: NextPage = props => { let metaTitle = title const defaultMetaTitle = config.metaTags.title - // should forceTitle only when its using the space/owner name, to not include double Polkaverse name + // should forceTitle only when its using the space/owner name, to not include double app name let forceTitle = false if (!metaTitle) { const owner = initialPostData.owner const ownerName = owner?.content?.name.trim() const ownerHandle = owner?.struct.handle?.trim() const spaceName = initialPostData.space?.content?.name?.trim() + const onApp = `on ${config.appName}` if (ownerName) { - metaTitle = `${ownerName} ` + (ownerHandle ? `@${ownerHandle} ` : '') + 'on Polkaverse' + metaTitle = `${ownerName} ` + (ownerHandle ? `@${ownerHandle} ` : '') + onApp forceTitle = true } else if (spaceName) { - metaTitle = `${spaceName} on Polkaverse` + metaTitle = `${spaceName} ${onApp}` forceTitle = true } } diff --git a/src/components/spaces/ViewSpacePage.tsx b/src/components/spaces/ViewSpacePage.tsx index 3d9fe3974..2aa3f8b10 100644 --- a/src/components/spaces/ViewSpacePage.tsx +++ b/src/components/spaces/ViewSpacePage.tsx @@ -1,4 +1,5 @@ import { FC } from 'react' +import config from 'src/config' import { DEFAULT_PAGE_SIZE } from 'src/config/ListData.config' import { getActivityCounts, getPostActivities } from 'src/graphql/apis' import { initializeApollo } from 'src/graphql/client' @@ -51,7 +52,7 @@ const InnerViewSpacePage: FC = props => {