Skip to content

Commit

Permalink
Merge branch 'deploy/epic' into epic-base
Browse files Browse the repository at this point in the history
  • Loading branch information
samchuk-vlad committed Jul 25, 2024
2 parents 98c265e + 8b9f84f commit 97ed9c7
Show file tree
Hide file tree
Showing 21 changed files with 1,243 additions and 151 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
GH_NEXT_PUBLIC_CONTEST_NAME=MEMECOIN CONTEST
GH_NEXT_PUBLIC_CONTEST_END_TIME=1720796400739
GH_NEXT_PUBLIC_TIME_CONSTRAINT=300000
GH_NEXT_PUBLIC_CONTEST_RANGE_KEY=ReferrersRankedListByReferralsCountCp_20240722_20240728
GH_NEXT_PUBLIC_AMP_ID=40d4174295c7edf657fc3bedf2748549
GH_NEXT_PUBLIC_COMMUNITY_HUB_ID=12455
GH_NEXT_PUBLIC_GA_ID=G-TP1XEFNHQD
Expand Down Expand Up @@ -115,6 +116,7 @@ jobs:
GH_NEXT_PUBLIC_CONTEST_NAME=MEMECOIN CONTEST
GH_NEXT_PUBLIC_CONTEST_END_TIME=1720796400739
GH_NEXT_PUBLIC_TIME_CONSTRAINT=5000
GH_NEXT_PUBLIC_CONTEST_RANGE_KEY=ReferrersRankedListByReferralsCountCp_20240722_20240728
GH_NEXT_PUBLIC_TELEGRAM_NOTIFICATION_BOT=https://t.me/g_notif_staging_bot/
GH_TELEGRAM_BOT_TOKEN="7038999347:AAGBgXTWcXpR4vZPW9A8_ia9PkWOpeyDeWA"
# without base path
Expand Down
1 change: 1 addition & 0 deletions ci.env
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ NEXT_PUBLIC_CONTEST_CHAT_ID='$GH_NEXT_PUBLIC_CONTEST_CHAT_ID'
NEXT_PUBLIC_CONTEST_NAME='$GH_NEXT_PUBLIC_CONTEST_NAME'
NEXT_PUBLIC_CONTEST_END_TIME='$GH_NEXT_PUBLIC_CONTEST_END_TIME'
NEXT_PUBLIC_TIME_CONSTRAINT='$GH_NEXT_PUBLIC_TIME_CONSTRAINT'
NEXT_PUBLIC_CONTEST_RANGE_KEY='$GH_NEXT_PUBLIC_CONTEST_RANGE_KEY'
NEXT_PUBLIC_BASE_PATH='$GH_NEXT_PUBLIC_BASE_PATH'
NEXT_PUBLIC_NEYNAR_CLIENT_ID='$GH_NEXT_PUBLIC_NEYNAR_CLIENT_ID'
NEXT_PUBLIC_TELEGRAM_BOT_ID='$GH_NEXT_PUBLIC_TELEGRAM_BOT_ID'
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ARG GH_NEXT_PUBLIC_CONTEST_CHAT_ID
ARG GH_NEXT_PUBLIC_CONTEST_NAME
ARG GH_NEXT_PUBLIC_CONTEST_END_TIME
ARG GH_NEXT_PUBLIC_TIME_CONSTRAINT
ARG GH_NEXT_PUBLIC_CONTEST_RANGE_KEY
ARG GH_NEXT_PUBLIC_BASE_PATH
ARG GH_NEXT_PUBLIC_NEYNAR_CLIENT_ID
ARG GH_NEXT_PUBLIC_TELEGRAM_BOT_ID
Expand Down Expand Up @@ -44,6 +45,7 @@ ENV NEXTAUTH_URL=${GH_NEXTAUTH_URL} \
NEXT_PUBLIC_CONTEST_NAME=${GH_NEXT_PUBLIC_CONTEST_NAME} \
NEXT_PUBLIC_CONTEST_END_TIME=${GH_NEXT_PUBLIC_CONTEST_END_TIME} \
NEXT_PUBLIC_TIME_CONSTRAINT=${GH_NEXT_PUBLIC_TIME_CONSTRAINT} \
NEXT_PUBLIC_CONTEST_RANGE_KEY=${GH_NEXT_PUBLIC_CONTEST_RANGE_KEY} \
NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
NEXT_PUBLIC_NEYNAR_CLIENT_ID=${GH_NEXT_PUBLIC_NEYNAR_CLIENT_ID} \
NEXT_PUBLIC_TELEGRAM_BOT_ID=${GH_NEXT_PUBLIC_TELEGRAM_BOT_ID} \
Expand Down Expand Up @@ -103,6 +105,7 @@ ARG GH_NEXT_PUBLIC_CONTEST_CHAT_ID
ARG GH_NEXT_PUBLIC_CONTEST_NAME
ARG GH_NEXT_PUBLIC_CONTEST_END_TIME
ARG GH_NEXT_PUBLIC_TIME_CONSTRAINT
ARG GH_NEXT_PUBLIC_CONTEST_RANGE_KEY
ARG GH_NEXT_PUBLIC_BASE_PATH
ARG GH_NEXT_PUBLIC_NEYNAR_CLIENT_ID
ARG GH_NEXT_PUBLIC_TELEGRAM_BOT_ID
Expand Down Expand Up @@ -132,6 +135,7 @@ ENV NEXTAUTH_URL=${GH_NEXTAUTH_URL} \
NEXT_PUBLIC_CONTEST_NAME=${GH_NEXT_PUBLIC_CONTEST_NAME} \
NEXT_PUBLIC_CONTEST_END_TIME=${GH_NEXT_PUBLIC_CONTEST_END_TIME} \
NEXT_PUBLIC_TIME_CONSTRAINT=${GH_NEXT_PUBLIC_TIME_CONSTRAINT} \
NEXT_PUBLIC_CONTEST_RANGE_KEY=${GH_NEXT_PUBLIC_CONTEST_RANGE_KEY} \
NEXT_PUBLIC_BASE_PATH=${GH_NEXT_PUBLIC_BASE_PATH} \
NEXT_PUBLIC_NEYNAR_CLIENT_ID=${GH_NEXT_PUBLIC_NEYNAR_CLIENT_ID} \
NEXT_PUBLIC_TELEGRAM_BOT_ID=${GH_NEXT_PUBLIC_TELEGRAM_BOT_ID} \
Expand Down
Binary file added src/assets/graphics/friends/friends-animals.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/graphics/tasks/referral-task.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: 5 additions & 1 deletion src/components/Tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export type TabsProps = ComponentProps<'div'> & {
tabClassName?: ((selected: boolean) => string) | string
defaultTab?: number
withHashIntegration?: boolean
containerClassName?: string
hideBeforeHashLoaded?: boolean
manualTabControl?: {
selectedTab: number
Expand All @@ -33,6 +34,7 @@ export default function Tabs({
panelClassName,
tabsRightElement,
tabClassName,
containerClassName,
defaultTab = 0,
hideBeforeHashLoaded,
withHashIntegration = true,
Expand Down Expand Up @@ -140,7 +142,9 @@ export default function Tabs({
</Tab.List>
<Tab.Panels as={component} className={cx('mt-2', panelClassName)}>
{tabs.map(({ id, content }) => (
<Tab.Panel key={id}>{content(changeTab)}</Tab.Panel>
<Tab.Panel className={containerClassName} key={id}>
{content(changeTab)}
</Tab.Panel>
))}
{usedSelectedTab === -1 && <Tab.Panel key='empty' />}
</Tab.Panels>
Expand Down
2 changes: 2 additions & 0 deletions src/env.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const env = createEnv({
NEXT_PUBLIC_CONTEST_NAME: z.string().default(''),
NEXT_PUBLIC_CONTEST_END_TIME: z.string().default('').transform(Number),
NEXT_PUBLIC_TIME_CONSTRAINT: z.string().default('').transform(Number),
NEXT_PUBLIC_CONTEST_RANGE_KEY: z.string().default(''),
NEXT_PUBLIC_BASE_PATH: z.string().default(''),
NEXT_PUBLIC_TELEGRAM_BOT_ID: z.string().default(''),
NEXT_PUBLIC_TELEGRAM_BOT_USERNAME: z.string().default(''),
Expand Down Expand Up @@ -87,6 +88,7 @@ export const env = createEnv({
NEXT_PUBLIC_CONTEST_NAME: process.env.NEXT_PUBLIC_CONTEST_NAME,
NEXT_PUBLIC_CONTEST_END_TIME: process.env.NEXT_PUBLIC_CONTEST_END_TIME,
NEXT_PUBLIC_TIME_CONSTRAINT: process.env.NEXT_PUBLIC_TIME_CONSTRAINT,
NEXT_PUBLIC_CONTEST_RANGE_KEY: process.env.NEXT_PUBLIC_CONTEST_RANGE_KEY,
NEXT_PUBLIC_TELEGRAM_BOT_ID: process.env.NEXT_PUBLIC_TELEGRAM_BOT_ID,
NEXT_PUBLIC_TELEGRAM_BOT_USERNAME:
process.env.NEXT_PUBLIC_TELEGRAM_BOT_USERNAME,
Expand Down
16 changes: 3 additions & 13 deletions src/modules/points/PointsWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -297,20 +297,10 @@ const UserStatsSection = ({
</Button>
</div>
</div>
{/* <LinkText
variant='primary'
className='mr-1'
onClick={() => {
sendEvent('edit_evm_address_click')
setOpenEvmLinkModal(true)
}}
>
Edit
</LinkText> */}
</Card>
)}
<div className='flex w-full items-center gap-4 p-4'>
<div className='flex w-full flex-col gap-1'>
<div className='flex w-full items-center gap-4 px-4'>
<div className='flex w-full flex-col gap-1 border-r border-slate-700 py-4'>
<span className='text-text-muted'>LIKES LEFT TODAY:</span>
<div className='flex items-center gap-3'>
<Image src={Thumbsup} alt='' className='h-8 w-8' />
Expand All @@ -325,7 +315,7 @@ const UserStatsSection = ({
</LinkText>
</div>
</div>
<div className='flex w-full flex-col gap-1'>
<div className='flex w-full flex-col gap-1 py-4'>
<span className='text-text-muted'>POINTS EARNED:</span>
<div
className='mr-1 flex items-center gap-3'
Expand Down
91 changes: 0 additions & 91 deletions src/modules/telegram/FriendsPage.tsx

This file was deleted.

Loading

0 comments on commit 97ed9c7

Please sign in to comment.