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.

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

feat: implemented MyKiva TY flow #5726

Merged
merged 35 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
afaab6c
fix: removed unneeded prop from opt in module
dyersituations Nov 13, 2024
51ec31c
fix: add MyKiva TY view and correct props, but not currently shown
dyersituations Nov 13, 2024
aaafa25
fix: resolve warning about stat prop
dyersituations Nov 13, 2024
c24beb9
fix: support case where user has not opted in and didn't achieve a badge
dyersituations Nov 13, 2024
1a2db15
feat: logic for displaying MyKiva minus checking achieved badge and o…
dyersituations Nov 14, 2024
974e30b
Merge branch 'main' into MP-946-fe-update-ty-page-badges-experiment-f…
dyersituations Nov 14, 2024
03981d8
feat: implement logic for when to show MyKiva view of thanks page
dyersituations Nov 15, 2024
0a07c42
Merge branch 'main' into MP-946-fe-update-ty-page-badges-experiment-f…
dyersituations Nov 15, 2024
9caa36c
fix: removed unused import
dyersituations Nov 15, 2024
e1f89bc
Merge branch 'my-kiva-ty-integration' into MP-946-fe-update-ty-page-b…
dyersituations Nov 20, 2024
0ba06af
Merge pull request #5684 from kiva/MP-946-fe-update-ty-page-badges-ex…
dyersituations Nov 20, 2024
8beb763
Merge branch 'main' into my-kiva-ty-integration
dyersituations Nov 22, 2024
e3235a2
Merge branch 'main' into my-kiva-ty-integration
dyersituations Nov 22, 2024
f6b6c19
Merge branch 'main' into my-kiva-ty-integration
dyersituations Nov 25, 2024
2a09064
feat: connect MyKiva TY page to real achievement service data
dyersituations Nov 25, 2024
5541a5b
Merge branch 'main' into my-kiva-ty-integration
dyersituations Nov 25, 2024
c76779b
Merge branch 'my-kiva-ty-integration' into MP-1067-fe-connect-my-kiva…
dyersituations Nov 25, 2024
242867b
Merge pull request #5713 from kiva/MP-1067-fe-connect-my-kiva-ty-to-b…
dyersituations Nov 27, 2024
5df36ae
Merge branch 'main' into my-kiva-ty-integration
dyersituations Nov 27, 2024
611c298
feat: ty page badge animations (#5719)
roger-in-kiva Dec 2, 2024
6bd6734
Merge branch 'main' into my-kiva-ty-integration
dyersituations Dec 3, 2024
ea4ae6c
fix: adjustments for guest user in MyKiva TY flow
dyersituations Dec 3, 2024
2f91c61
Merge pull request #5721 from kiva/guest-flow-fixes
dyersituations Dec 3, 2024
32c8b3c
fix: don't how badges without new tier achieved, only show MyKiva TY …
dyersituations Dec 4, 2024
4fb6ae9
fix: only show badges module when badges achieved or guest, don't sho…
dyersituations Dec 4, 2024
7d05a89
fix: get the correct completed tier, handle when tiers completed at t…
dyersituations Dec 4, 2024
d4e9dad
fix: add clarifying comment
dyersituations Dec 4, 2024
c795c3e
fix: enhance image quality
dyersituations Dec 4, 2024
ebf28a0
Merge pull request #5722 from kiva/fix-more-ty-stuff
dyersituations Dec 5, 2024
56590d4
fix: resolve issue with guest use case
dyersituations Dec 5, 2024
33924c2
Merge pull request #5723 from kiva/one-more-guest-ty-issue
dyersituations Dec 5, 2024
1c4e19f
fix: improve print view of MyKiva TY page
dyersituations Dec 5, 2024
0b50dfb
Merge pull request #5724 from kiva/MP-1151-fe-print-view-for-my-kiva-…
dyersituations Dec 5, 2024
aab297a
fix: resolve issue where equality badge wasn't being shown
dyersituations Dec 5, 2024
9fe7f85
Merge pull request #5725 from kiva/fix-equality-my-kiva-ty
dyersituations Dec 5, 2024
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
1,317 changes: 1,156 additions & 161 deletions .storybook/mock-data/thanks-badges-mock-data.js

Large diffs are not rendered by default.

51 changes: 34 additions & 17 deletions .storybook/stories/ThanksBadges.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,46 @@ import {
mockedReceiptData,
mockLender,
mockLoans,
mockOldBadge,
mockTieredBadge,
mockUserAchievementProgress,
mockContentful,
MOCK_OLD_BADGE_ID,
MOCK_TIERED_BADGE_ID,
} from '../mock-data/thanks-badges-mock-data';

export default {
title: 'MyKiva/Thanks',
component: ThanksBadges,
};

const story = (args = {}) => {
const queryResult = {
data: {
userAchievementProgress: mockUserAchievementProgress,
contentful: mockContentful,
}
};

const mockOldBadge = { achievementId: MOCK_OLD_BADGE_ID };

const mockTieredBadge = { achievementId: MOCK_TIERED_BADGE_ID };

const story = (args = {}, result = queryResult) => {
const template = (_args, { argTypes }) => ({
props: Object.keys(argTypes),
components: { ThanksBadges },
mixins: [apolloStoryMixin(), cookieStoreStoryMixin()],
mixins: [apolloStoryMixin({ queryResult: result }), cookieStoreStoryMixin()],
setup() { return { args }; },
template: '<ThanksBadges v-bind="args" />',
});
template.args = args;
return template;
};

export const UserGuest = story({
export const Loading = story({
isOptedIn: true,
lender: mockLender,
loans: mockLoans,
receipt: mockedReceiptData,
badgesAchieved: [mockTieredBadge],
});
}, {});

export const UserLoggedIn = story({
isGuest: false,
Expand All @@ -43,13 +56,19 @@ export const UserLoggedIn = story({

export const UserLoggedInNotOptedIn = story({
isGuest: false,
isOptedIn: true,
lender: mockLender,
loans: mockLoans.slice(0, 1),
receipt: mockedReceiptData,
badgesAchieved: [mockTieredBadge],
});

export const UserLoggedInNotOptedInNoBadge = story({
isGuest: false,
lender: mockLender,
loans: mockLoans.slice(0, 1),
receipt: mockedReceiptData,
});

export const UserLoggedInOptedInSingleLoan = story({
isGuest: false,
isOptedIn: true,
Expand Down Expand Up @@ -100,29 +119,27 @@ export const BadgeMultiple = story({

export const UserGuestOptedOutWithOneLoan = story({
lender: mockLender,
isGuest: false,
optedIn: false,
receipt: mockedReceiptData,
loans: mockLoans.slice(0, 1),
selectedLoan: mockLoans[0],
badgesAchieved: [mockTieredBadge],
});

export const UserGuestOptedOutWithTwoLoans = story({
lender: mockLender,
isGuest: false,
optedIn: false,
receipt: mockedReceiptData,
loans: mockLoans.slice(0, 2),
badgesAchieved: [mockTieredBadge],
});

export const UserGuestOptedOutWithThreeOrMoreLoans = story({
lender: mockLender,
isGuest: false,
optedIn: false,
receipt: mockedReceiptData,
loans: mockLoans.slice(0, 3),
badgesAchieved: [mockTieredBadge],
});

export const UserGuestOptedIn = story({
lender: mockLender,
isOptedIn: true,
receipt: mockedReceiptData,
loans: mockLoans.slice(0, 1),
selectedLoan: mockLoans[0],
});
64 changes: 0 additions & 64 deletions src/assets/images/my-kiva/rays/first.svg

This file was deleted.

64 changes: 0 additions & 64 deletions src/assets/images/my-kiva/rays/second.svg

This file was deleted.

64 changes: 0 additions & 64 deletions src/assets/images/my-kiva/rays/third.svg

This file was deleted.

Loading
Loading