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

feat(notes+follow) - Share Grant card #3519

Merged
merged 17 commits into from
Sep 18, 2024
Merged

feat(notes+follow) - Share Grant card #3519

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c0dbf7f
add grant activity card
greg-adams Sep 4, 2024
bdef14e
add tests
greg-adams Sep 4, 2024
c78abd9
adjust styling
greg-adams Sep 5, 2024
2c592b9
Merge remote-tracking branch 'origin/main' into feat/grant-activity-card
greg-adams Sep 5, 2024
20f5dca
Merge branch 'main' into feat/grant-activity-card
greg-adams Sep 5, 2024
4a7a648
Merge remote-tracking branch 'origin/main' into feat/grant-activity-card
greg-adams Sep 5, 2024
b625756
Merge remote-tracking branch 'origin/feat/grant-activity-card' into f…
greg-adams Sep 5, 2024
852a3c4
resolve pr comments
greg-adams Sep 6, 2024
aecdc3c
adjust loading flow
greg-adams Sep 6, 2024
6c84320
Merge branch 'main' into feat/grant-activity-card
greg-adams Sep 6, 2024
2609f54
error handling
greg-adams Sep 9, 2024
195293c
Merge remote-tracking branch 'origin/main' into feat/grant-activity-card
greg-adams Sep 9, 2024
4ce27de
Merge remote-tracking branch 'origin/feat/grant-activity-card' into f…
greg-adams Sep 9, 2024
3f2e2df
Merge remote-tracking branch 'origin/main' into feat/grant-activity-card
greg-adams Sep 11, 2024
422df11
replace share grant card
greg-adams Sep 17, 2024
8a597f9
Merge remote-tracking branch 'origin/main' into feat/grant-activity-card
greg-adams Sep 17, 2024
7abfd8d
Merge branch 'main' into feat/grant-activity-card
greg-adams Sep 18, 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
16 changes: 9 additions & 7 deletions packages/client/src/views/GrantDetailsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,15 @@

<!-- Right page column: secondary assign grant section -->
<div class="grant-details-secondary-actions">
<div class="mb-3">
<ShareGrant v-if="!followNotesEnabled" />
<GrantActivity v-if="followNotesEnabled" />
</div>

<GrantActivity
v-if="followNotesEnabled"
class="mb-3"
/>
<!-- Team status section -->
<b-card>
<b-card
v-if="!followNotesEnabled"
class="mb-3"
>
<div class="mb-5">
<h3 class="mb-3">
{{ newTerminologyEnabled ? 'Team': 'Agency' }} Status
Expand Down Expand Up @@ -193,6 +195,7 @@
</div>
</div>
</b-card>
<ShareGrant class="mb-3" />
</div>
</div>
</b-container>
Expand Down Expand Up @@ -506,7 +509,6 @@ export default {

.grant-details-secondary-actions {
grid-area: secondary-actions;
margin-top: 1.5rem;
margin-bottom: 1.5rem;
margin-left: 1rem;
margin-right: 1rem;
Expand Down
Loading