Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monetization Feature(Payment Section) #2012

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open

Monetization Feature(Payment Section) #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
9c8c41d
add upgrade plan modal
corlard3y Nov 18, 2024
fb2525f
1966 Other push monetization payment UI (Purchase a plan) (#1974)
meKushdeepSingh Dec 5, 2024
d168bdf
update cursor
corlard3y Dec 6, 2024
992687d
Merge pull request #1986 from push-protocol/1971-other-user-settings-…
corlard3y Dec 6, 2024
0a46f2f
DAPP-1967-bonus-activity-container-position-fix (#1968)
rohitmalhotra1420 Nov 12, 2024
3a61c20
Fix Daily Rewards Section (#1970)
corlard3y Nov 14, 2024
a95d6c9
DAPP-1972 price tracker activity + blocks fixes (#1973)
rohitmalhotra1420 Nov 20, 2024
73c7b7e
Fixed the flow for Snaps in user settings page (#1975)
abhishek-01k Nov 22, 2024
0790d86
Fix stake section (#1978)
corlard3y Nov 25, 2024
d56c12e
DAPP-1981-added new rivo channel activity (#1988)
rohitmalhotra1420 Dec 10, 2024
372dca3
User Email/Telegram Integration (#1987)
corlard3y Dec 21, 2024
ea03113
analytics fallback added on dashboard (#1992)
rohitmalhotra1420 Dec 23, 2024
60652fd
trending channels fixed (#1994)
rohitmalhotra1420 Dec 24, 2024
e06d7fd
numbers fixed for analytics
rohitmalhotra1420 Dec 24, 2024
ef7c3ea
Fix Rewards Toast Notif not closing (#1996)
corlard3y Dec 24, 2024
aae9ed5
Fix Email/Telegram Issues (#1997)
corlard3y Jan 7, 2025
2620b7c
add basic alert component
corlard3y Jan 8, 2025
47bc9ed
chore: add pricing endpoint route
corlard3y Jan 21, 2025
16a644b
chore: update plan and billings page
corlard3y Jan 22, 2025
1560490
update channel pages
corlard3y Jan 26, 2025
3c8556d
chore: add navigation item
corlard3y Jan 27, 2025
5518f3f
chore: handle navigation pricing
corlard3y Jan 27, 2025
b66494e
chore: update pricing mobile view
corlard3y Jan 28, 2025
2bc9694
chore: fix payment && initiate flow
corlard3y Feb 6, 2025
2b05426
chore: fix payment flow
corlard3y Feb 6, 2025
42688c9
Merge branch 'main' into 1965-new-feature-monetization-payment
corlard3y Feb 7, 2025
bb0690a
fix: error handling
corlard3y Feb 7, 2025
d33c0ce
chore: add alert component
corlard3y Feb 7, 2025
d7178e8
fix: add mobile fix
corlard3y Feb 7, 2025
9290d7b
fix: plan options
corlard3y Feb 11, 2025
d4984a7
chore: add cancel modal plan
corlard3y Feb 11, 2025
ee64131
chore: update transfer process
corlard3y Feb 12, 2025
59fcf04
add migrate hook
corlard3y Feb 14, 2025
2e939c3
chore: update free plan migrate
corlard3y Feb 14, 2025
b8d3f04
fix: fix pricing numbers
corlard3y Feb 14, 2025
2f1aec3
fix: migrate to free plan
corlard3y Feb 17, 2025
805c059
fix: migrate to free plan
corlard3y Feb 17, 2025
9664e87
Merge branch 'main' into 1965-new-feature-monetization-payment
corlard3y Feb 17, 2025
82670b9
chore: upgrade dash changes
corlard3y Feb 17, 2025
9a24495
chore: addd new pricing plan hook
corlard3y Feb 17, 2025
b12d946
fix: update usegetpricingdetails hook
corlard3y Feb 17, 2025
546a2ca
chore: add payment history
corlard3y Feb 18, 2025
9fb0500
chore: add go pro alert
corlard3y Feb 18, 2025
a53038e
Merge remote-tracking branch 'origin/main' into 1965-new-feature-mone…
corlard3y Feb 19, 2025
3b0b1b6
update yarn.lock
corlard3y Feb 19, 2025
0ef2087
chore: update \ naming in settings
corlard3y Feb 20, 2025
e973a91
update: add types
corlard3y Feb 20, 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
13 changes: 3 additions & 10 deletions .eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react-hooks/recommended',
],
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'plugin:react-hooks/recommended'],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parser: '@typescript-eslint/parser',
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
},
}
};
1 change: 1 addition & 0 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ export default function App() {
const isSidebarHidden =
location?.pathname.includes(APP_PATHS.PointsVault) ||
location?.pathname.includes('/snap') ||
location?.pathname.includes('/pricing') ||
location?.pathname.includes(APP_PATHS.DiscordVerification);

useInAppNotifications();
Expand Down
2 changes: 1 addition & 1 deletion src/blocks/alert/Alert.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export type AlertVariant = 'success' | 'warning' | 'error' | 'info';
export type AlertVariant = 'success' | 'warning' | 'error' | 'info' | 'basic';
7 changes: 7 additions & 0 deletions src/blocks/alert/Alert.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ export const alertVariants: Record<
bgColor: 'components-alert-background-info',
ctaColor: 'components-alert-text-cta-info',
},
basic: {
icon: InfoFilled,
iconColor: 'components-alert-icon-basic',
borderColor: 'components-alert-stroke-basic',
bgColor: 'components-alert-background-basic',
ctaColor: 'components-alert-text-cta-basic',
},
error: {
icon: WarningCircleFilled,
iconColor: 'components-alert-icon-error',
Expand Down
73 changes: 73 additions & 0 deletions src/blocks/icons/components/Meteor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { FC } from 'react';
import { IconWrapper } from '../IconWrapper';
import { IconProps } from '../Icons.types';

const Meteor: FC<IconProps> = (allProps) => {
const { svgProps: props, ...restProps } = allProps;
return (
<IconWrapper
componentName="Meteor"
icon={
<svg
xmlns="http://www.w3.org/2000/svg"
width="inherit"
height="inherit"
viewBox="0 0 16 16"
fill="none"
{...props}
>
<g clip-path="url(#clip0_10640_33711)">
<path
d="M6 12C7.10457 12 8 11.1046 8 10C8 8.89543 7.10457 8 6 8C4.89543 8 4 8.89543 4 10C4 11.1046 4.89543 12 6 12Z"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
d="M10.5 11L13.5 8"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
d="M10 8L11.5 6.5"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
d="M13 5L14 4"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
d="M8 6L12.5 1.5"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
d="M8.82845 12.8281C8.45906 13.2085 8.01773 13.5116 7.53014 13.7199C7.04254 13.9281 6.51841 14.0374 5.98822 14.0412C5.45802 14.0451 4.93235 13.9435 4.44176 13.7424C3.95118 13.5413 3.50547 13.2447 3.13056 12.8698C2.75564 12.4949 2.45901 12.0491 2.2579 11.5586C2.05679 11.068 1.95522 10.5423 1.95909 10.0121C1.96297 9.48191 2.07221 8.95778 2.28047 8.47019C2.48873 7.98259 2.79185 7.54127 3.1722 7.17188L8.34345 2"
stroke="currentColor"
stroke-linecap="round"
stroke-linejoin="round"
/>
</g>
<defs>
<clipPath id="clip0_10640_33711">
<rect
width="16"
height="16"
fill="white"
/>
</clipPath>
</defs>
</svg>
}
{...restProps}
/>
);
};

export default Meteor;
2 changes: 2 additions & 0 deletions src/blocks/icons/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ export { default as MaximizeLeft } from './components/MaximizeLeft';

export { default as MegaPhone } from './components/MegaPhone';

export { default as Meteor } from './components/Meteor';

export { default as Moon } from './components/Moon';
export { default as MoonFilled } from './components/MoonFilled';

Expand Down
212 changes: 169 additions & 43 deletions src/blocks/illustrations/components/PushLogo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const PushLogo: FC<IllustrationProps> = (allProps) => {
const { svgProps: props, ...restProps } = allProps;
return (
<IllustrationWrapper
componentName="PushDev"
componentName="PushLogo"
illustration={
<svg
width={restProps.width ?? '48'}
Expand Down Expand Up @@ -50,13 +50,34 @@ const PushLogo: FC<IllustrationProps> = (allProps) => {
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#FF94A6" />
<stop offset="0.17" stop-color="#EA6AC0" />
<stop offset="0.33" stop-color="#DA4AD5" />
<stop offset="0.42" stop-color="#D53EDD" />
<stop offset="0.53" stop-color="#CB3EDD" />
<stop offset="0.72" stop-color="#B341E0" />
<stop offset="0.95" stop-color="#8B45E4" />
<stop offset="1" stop-color="#8247E5" />
<stop
offset="0.17"
stop-color="#EA6AC0"
/>
<stop
offset="0.33"
stop-color="#DA4AD5"
/>
<stop
offset="0.42"
stop-color="#D53EDD"
/>
<stop
offset="0.53"
stop-color="#CB3EDD"
/>
<stop
offset="0.72"
stop-color="#B341E0"
/>
<stop
offset="0.95"
stop-color="#8B45E4"
/>
<stop
offset="1"
stop-color="#8247E5"
/>
</linearGradient>
<linearGradient
id="paint1_linear_2966_8287"
Expand All @@ -67,13 +88,34 @@ const PushLogo: FC<IllustrationProps> = (allProps) => {
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#FF94A6" />
<stop offset="0.17" stop-color="#EA6AC0" />
<stop offset="0.33" stop-color="#DA4AD5" />
<stop offset="0.42" stop-color="#D53EDD" />
<stop offset="0.53" stop-color="#CB3EDD" />
<stop offset="0.72" stop-color="#B341E0" />
<stop offset="0.95" stop-color="#8B45E4" />
<stop offset="1" stop-color="#8247E5" />
<stop
offset="0.17"
stop-color="#EA6AC0"
/>
<stop
offset="0.33"
stop-color="#DA4AD5"
/>
<stop
offset="0.42"
stop-color="#D53EDD"
/>
<stop
offset="0.53"
stop-color="#CB3EDD"
/>
<stop
offset="0.72"
stop-color="#B341E0"
/>
<stop
offset="0.95"
stop-color="#8B45E4"
/>
<stop
offset="1"
stop-color="#8247E5"
/>
</linearGradient>
<linearGradient
id="paint2_linear_2966_8287"
Expand All @@ -84,13 +126,34 @@ const PushLogo: FC<IllustrationProps> = (allProps) => {
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#FF94A6" />
<stop offset="0.17" stop-color="#EA6AC0" />
<stop offset="0.33" stop-color="#DA4AD5" />
<stop offset="0.42" stop-color="#D53EDD" />
<stop offset="0.53" stop-color="#CB3EDD" />
<stop offset="0.72" stop-color="#B341E0" />
<stop offset="0.95" stop-color="#8B45E4" />
<stop offset="1" stop-color="#8247E5" />
<stop
offset="0.17"
stop-color="#EA6AC0"
/>
<stop
offset="0.33"
stop-color="#DA4AD5"
/>
<stop
offset="0.42"
stop-color="#D53EDD"
/>
<stop
offset="0.53"
stop-color="#CB3EDD"
/>
<stop
offset="0.72"
stop-color="#B341E0"
/>
<stop
offset="0.95"
stop-color="#8B45E4"
/>
<stop
offset="1"
stop-color="#8247E5"
/>
</linearGradient>
<linearGradient
id="paint3_linear_2966_8287"
Expand All @@ -101,13 +164,34 @@ const PushLogo: FC<IllustrationProps> = (allProps) => {
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#FF94A6" />
<stop offset="0.17" stop-color="#EA6AC0" />
<stop offset="0.33" stop-color="#DA4AD5" />
<stop offset="0.42" stop-color="#D53EDD" />
<stop offset="0.53" stop-color="#CB3EDD" />
<stop offset="0.72" stop-color="#B341E0" />
<stop offset="0.95" stop-color="#8B45E4" />
<stop offset="1" stop-color="#8247E5" />
<stop
offset="0.17"
stop-color="#EA6AC0"
/>
<stop
offset="0.33"
stop-color="#DA4AD5"
/>
<stop
offset="0.42"
stop-color="#D53EDD"
/>
<stop
offset="0.53"
stop-color="#CB3EDD"
/>
<stop
offset="0.72"
stop-color="#B341E0"
/>
<stop
offset="0.95"
stop-color="#8B45E4"
/>
<stop
offset="1"
stop-color="#8247E5"
/>
</linearGradient>
<linearGradient
id="paint4_linear_2966_8287"
Expand All @@ -118,13 +202,34 @@ const PushLogo: FC<IllustrationProps> = (allProps) => {
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#FF94A6" />
<stop offset="0.17" stop-color="#EA6AC0" />
<stop offset="0.33" stop-color="#DA4AD5" />
<stop offset="0.42" stop-color="#D53EDD" />
<stop offset="0.53" stop-color="#CB3EDD" />
<stop offset="0.72" stop-color="#B341E0" />
<stop offset="0.95" stop-color="#8B45E4" />
<stop offset="1" stop-color="#8247E5" />
<stop
offset="0.17"
stop-color="#EA6AC0"
/>
<stop
offset="0.33"
stop-color="#DA4AD5"
/>
<stop
offset="0.42"
stop-color="#D53EDD"
/>
<stop
offset="0.53"
stop-color="#CB3EDD"
/>
<stop
offset="0.72"
stop-color="#B341E0"
/>
<stop
offset="0.95"
stop-color="#8B45E4"
/>
<stop
offset="1"
stop-color="#8247E5"
/>
</linearGradient>
<linearGradient
id="paint5_linear_2966_8287"
Expand All @@ -135,13 +240,34 @@ const PushLogo: FC<IllustrationProps> = (allProps) => {
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#FF94A6" />
<stop offset="0.17" stop-color="#EA6AC0" />
<stop offset="0.33" stop-color="#DA4AD5" />
<stop offset="0.42" stop-color="#D53EDD" />
<stop offset="0.53" stop-color="#CB3EDD" />
<stop offset="0.72" stop-color="#B341E0" />
<stop offset="0.95" stop-color="#8B45E4" />
<stop offset="1" stop-color="#8247E5" />
<stop
offset="0.17"
stop-color="#EA6AC0"
/>
<stop
offset="0.33"
stop-color="#DA4AD5"
/>
<stop
offset="0.42"
stop-color="#D53EDD"
/>
<stop
offset="0.53"
stop-color="#CB3EDD"
/>
<stop
offset="0.72"
stop-color="#B341E0"
/>
<stop
offset="0.95"
stop-color="#8B45E4"
/>
<stop
offset="1"
stop-color="#8247E5"
/>
</linearGradient>
</defs>
</svg>
Expand Down
Loading
Loading