Skip to content

Commit

Permalink
fix: solve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Bedon committed Feb 9, 2024
2 parents 625e09e + 65a2eb1 commit 65d6f08
Show file tree
Hide file tree
Showing 9 changed files with 180 additions and 173 deletions.
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import NotifyMe from '@/components/Thanks/NotifyMe';
import ChallengeHeader from '@/components/Thanks/ChallengeHeader';
import apolloStoryMixin from "../mixins/apollo-story-mixin";

export default {
title: 'Components/Notify Me',
component: NotifyMe,
title: 'Components/ChallengeHeader',
component: ChallengeHeader,
};

const story = (args = {}) => {
const template = (_args, { argTypes }) => ({
props: Object.keys(argTypes),
components: { NotifyMe },
components: { ChallengeHeader },
mixins: [apolloStoryMixin()],
template:
'<notify-me :goal="goal" email="test@test.com" :teamPublicId="teamPublicId" />',
template: '<challenge-header :goal="goal" :teamPublicId="teamPublicId" />',
});
template.args = args;
return template;
Expand Down
63 changes: 63 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,66 @@
## [2.730.0](https://github.com/kiva/ui/compare/v2.729.0...v2.730.0) (2024-02-09)


### 🎉 New Features

* add progress bar to campaign page ([c1b925b](https://github.com/kiva/ui/commit/c1b925b2029961266b9bb44c4618e87514fecdc0))
* added flag for IWD to thanks page, created working stories ([1205eab](https://github.com/kiva/ui/commit/1205eab895413eec760ec462446e1c43373090ee))
* added progress bar to thanks page variations ([e78f13f](https://github.com/kiva/ui/commit/e78f13fbc828653783a2bc7a13d8a7cd64a70840))
* added some finalized content to IWD header ([fc29232](https://github.com/kiva/ui/commit/fc29232a1df8dfcca2d92702022734e20d3cae1d))
* first IWD thanks page variation ([c5572b6](https://github.com/kiva/ui/commit/c5572b618c493422b547d74cd2b198604cac3c96))
* iwd activity feed added ([#5152](https://github.com/kiva/ui/issues/5152)) ([0a9424f](https://github.com/kiva/ui/commit/0a9424f387434240ff4074ec75dd19788f1a2cd2))
* remaining iwd thanks page variation ([b1a9600](https://github.com/kiva/ui/commit/b1a9600f96d7c142131b0f7cd40e909a60617494))
* update thanks page header for challenges ([7b1147b](https://github.com/kiva/ui/commit/7b1147b706bfab91c4e983109c271b6bf92c6748))


### 🐛 Bugfixes

* added missing data prop ([9c92884](https://github.com/kiva/ui/commit/9c928840181fe9b9c6c6ea459c382e3805f5cc21))
* added missing id in query ([fc7f447](https://github.com/kiva/ui/commit/fc7f44765df5663bc58a328c8d484993f492425a))
* added some missing story mixins ([f853fb5](https://github.com/kiva/ui/commit/f853fb51151895f1a9a7874659cfdd9ca2734b73))
* empty template was also creating a warning ([ffc591d](https://github.com/kiva/ui/commit/ffc591dfc659284444818ccc16db98aa1a13b405))
* ensure we cover errors from new activities query ([e8cf21a](https://github.com/kiva/ui/commit/e8cf21a9671d83d8d31c05403fc233a2c6dd35ba))
* lower activity feed items ([9b8eb53](https://github.com/kiva/ui/commit/9b8eb53cdaf36dc37e7cf7750cf11631bd993f62))
* minor cleanup ([3a97d83](https://github.com/kiva/ui/commit/3a97d83266a841cfb8596145004ff9fbe26a6cd7))
* quick resolution of server error ([85a2811](https://github.com/kiva/ui/commit/85a2811da02bfbd8854d3d7bfbc069c007e81a7d))
* round the borrower image ([68a4d24](https://github.com/kiva/ui/commit/68a4d24f3d338c94f0c86dbad8fd4168ee288c9e))
* show the checkout now button and emit to show basket on corporate landing loan cards ([d4b0819](https://github.com/kiva/ui/commit/d4b0819dbddba46d71f9747f3b594dd0844ec633))
* some missing thanks padding ([be6b8f6](https://github.com/kiva/ui/commit/be6b8f6a330a3bdcda5ef9b3bd2c69e077b41263))


### 🧹 Chores

* **release:** 2.730.0-rc.1 [skip ci] ([75581df](https://github.com/kiva/ui/commit/75581df8bd6ad925db0397fd32c0ef397110b9e9)), closes [#5152](https://github.com/kiva/ui/issues/5152)

## [2.730.0-rc.1](https://github.com/kiva/ui/compare/v2.729.0...v2.730.0-rc.1) (2024-02-09)


### 🎉 New Features

* add progress bar to campaign page ([c1b925b](https://github.com/kiva/ui/commit/c1b925b2029961266b9bb44c4618e87514fecdc0))
* added flag for IWD to thanks page, created working stories ([1205eab](https://github.com/kiva/ui/commit/1205eab895413eec760ec462446e1c43373090ee))
* added progress bar to thanks page variations ([e78f13f](https://github.com/kiva/ui/commit/e78f13fbc828653783a2bc7a13d8a7cd64a70840))
* added some finalized content to IWD header ([fc29232](https://github.com/kiva/ui/commit/fc29232a1df8dfcca2d92702022734e20d3cae1d))
* first IWD thanks page variation ([c5572b6](https://github.com/kiva/ui/commit/c5572b618c493422b547d74cd2b198604cac3c96))
* iwd activity feed added ([#5152](https://github.com/kiva/ui/issues/5152)) ([0a9424f](https://github.com/kiva/ui/commit/0a9424f387434240ff4074ec75dd19788f1a2cd2))
* remaining iwd thanks page variation ([b1a9600](https://github.com/kiva/ui/commit/b1a9600f96d7c142131b0f7cd40e909a60617494))
* update thanks page header for challenges ([7b1147b](https://github.com/kiva/ui/commit/7b1147b706bfab91c4e983109c271b6bf92c6748))


### 🐛 Bugfixes

* added missing data prop ([9c92884](https://github.com/kiva/ui/commit/9c928840181fe9b9c6c6ea459c382e3805f5cc21))
* added missing id in query ([fc7f447](https://github.com/kiva/ui/commit/fc7f44765df5663bc58a328c8d484993f492425a))
* added some missing story mixins ([f853fb5](https://github.com/kiva/ui/commit/f853fb51151895f1a9a7874659cfdd9ca2734b73))
* empty template was also creating a warning ([ffc591d](https://github.com/kiva/ui/commit/ffc591dfc659284444818ccc16db98aa1a13b405))
* ensure we cover errors from new activities query ([e8cf21a](https://github.com/kiva/ui/commit/e8cf21a9671d83d8d31c05403fc233a2c6dd35ba))
* lower activity feed items ([9b8eb53](https://github.com/kiva/ui/commit/9b8eb53cdaf36dc37e7cf7750cf11631bd993f62))
* minor cleanup ([3a97d83](https://github.com/kiva/ui/commit/3a97d83266a841cfb8596145004ff9fbe26a6cd7))
* quick resolution of server error ([85a2811](https://github.com/kiva/ui/commit/85a2811da02bfbd8854d3d7bfbc069c007e81a7d))
* round the borrower image ([68a4d24](https://github.com/kiva/ui/commit/68a4d24f3d338c94f0c86dbad8fd4168ee288c9e))
* show the checkout now button and emit to show basket on corporate landing loan cards ([d4b0819](https://github.com/kiva/ui/commit/d4b0819dbddba46d71f9747f3b594dd0844ec633))
* some missing thanks padding ([be6b8f6](https://github.com/kiva/ui/commit/be6b8f6a330a3bdcda5ef9b3bd2c69e077b41263))

## [2.729.0](https://github.com/kiva/ui/compare/v2.728.0...v2.729.0) (2024-02-01)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kvue",
"version": "2.729.0",
"version": "2.730.0",
"description": "The Kiva ui",
"author": "braincrave",
"private": true,
Expand Down
96 changes: 96 additions & 0 deletions src/components/Thanks/ChallengeHeader.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<template>
<kv-page-container data-testid="challenge-header">
<kv-grid class="tw-grid-cols-12">
<div class="tw-col-span-12 lg:tw-col-span-8 lg:tw-col-start-3 tw-pt-6 tw-mb-4 hide-for-print">
<div
class="
tw-flex
tw-flex-col
tw-items-center
tw-w-full
tw-bg-white
tw-rounded
tw-px-1.5
tw-pt-1.5
tw-pb-2.5
"
>
<div
class="tw-flex tw-justify-between tw-w-full"
>
<p class="tw-text-left tw-font-medium" data-testid="loans-funded">
{{ loansFunded }}/{{ totalLoans }} loans funded
</p>
<div class="tw-flex tw-items-center tw-justify-center tw-relative">
<kv-progress-circle
class="tw-w-10 tw-z-2 tw-h-10"
:stroke-width="20"
:value="percentageFunded"
:arc-scale=".8"
:rotate="36"
:show-number="false"
/>
<div class="tw-absolute">
<rewards-icon class="tw-h-7 tw-w-6" />
</div>
</div>
<p class="tw-text-right tw-font-medium">
{{ daysRemaining }} days remaining
</p>
</div>
<div class="tw-mt-2 tw-mb-6">
<h3>
Challenge
<a :href="teamChallengePath" data-testid="percentage-funded" class="tw-text-eco-green-3">
{{ percentageFunded }}% complete
</a>
</h3>
</div>
<div class="tw-flex tw-flex-col tw-items-center">
<h2 class="tw-text-center tw-mb-2">
<!-- eslint-disable-next-line max-len -->
<span>We’ll announce whether the team has won the challenge before the next challenge on the </span><span class="tw-text-brand">20th of March</span><span>. Until then, we’d love your feedback!</span>
</h2>
<kv-button
href="lp/challengefeedback"
v-kv-track-event="['Thanks', 'click-teams-give-quick-feedback']"
>
Give quick feedback
</kv-button>
</div>
</div>
</div>
</kv-grid>
</kv-page-container>
</template>
<script>
import KvProgressCircle from '@/components/Kv/KvProgressCircle';
import RewardsIcon from '@/assets/icons/inline/rewards.svg';
import teamGoalInfo from '@/plugins/team-goal-mixin';
import KvButton from '~/@kiva/kv-components/vue/KvButton';
import KvPageContainer from '~/@kiva/kv-components/vue/KvPageContainer';
import KvGrid from '~/@kiva/kv-components/vue/KvGrid';
export default {
name: 'ChallengeHeader',
mixins: [teamGoalInfo],
components: {
KvProgressCircle,
RewardsIcon,
KvButton,
KvPageContainer,
KvGrid,
},
props: {
teamPublicId: {
type: String,
default: '',
},
},
computed: {
teamChallengePath() {
return this.teamPublicId ? `/team/challenge/${this.teamPublicId}` : '/teams';
},
},
};
</script>
153 changes: 0 additions & 153 deletions src/components/Thanks/NotifyMe.vue

This file was deleted.

4 changes: 3 additions & 1 deletion src/graphql/query/IwdActions.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ query IwdActions {
lend {
campaignActions(
campaignKey: "iwd2024",
filters: { gender: female }
filters: { gender: female },
limit: 6,
) {
totalCount
values {
lender {
id
name
image {
id
url
}
}
Expand Down
Loading

0 comments on commit 65d6f08

Please sign in to comment.