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

Fix reset all bug #801

Merged
merged 2 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions components/FacetMenu/TagsContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
<span class="flex">
Filters applied
<el-popover
title="How do filters work?"
width="165"
trigger="hover"
:append-to-body=false
popper-class="popover"
>
<svg-icon slot="reference" class="purple-fill" icon="icon-help" width="26" height="26" />
<div >
<strong>Within categories:</strong> OR
<br/>
example: 'heart' OR 'colon'
<br/>
<br/>
<strong>Between categories:</strong> AND
<br/>
example: 'rat' AND 'lung'
</div>
</el-popover>
title="How do filters work?"
width="165"
trigger="hover"
:append-to-body=false
popper-class="popover"
>
<svg-icon slot="reference" class="purple-fill" icon="icon-help" width="26" height="26" />
<div >
<strong>Within categories:</strong> OR
<br/>
example: 'heart' OR 'colon'
<br/>
<br/>
<strong>Between categories:</strong> AND
<br/>
example: 'rat' AND 'lung'
</div>
</el-popover>
<el-link @click="deselectAllFacets">Reset all</el-link>
</span>
<hr />
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@aws-amplify/auth": "^4.4.4",
"@aws-amplify/core": "^4.4.2",
"@miyaoka/nuxt-twitter-widgets-module": "^0.0.1",
"@nih-sparc/sparc-design-system-components": "^0.27.5",
"@nih-sparc/sparc-design-system-components": "^0.27.6",
"@nuxtjs/axios": "^5.8.0",
"@nuxtjs/google-analytics": "^2.2.3",
"@nuxtjs/gtm": "^2.4.0",
Expand Down
23 changes: 14 additions & 9 deletions pages/user/profile/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,17 @@
<div class="body4 mb-8">
The Pennsieve Data Management Platform provides a scalable cloud-based solution for managing, analyzing, and sharing scientific datasets.
</div>
<template v-for="organization in organizations">
<repository-card
:key="organization.id"
:thumbnailUrl="organization.logo"
:description="getOrganizationDescription(organization)"
:status="organization.status"
buttonLink="https://pennsieve.io"
/>
</template>
<div class="org-container">
<template v-for="organization in organizations">
<repository-card
:key="organization.id"
:thumbnailUrl="organization.logo"
:description="getOrganizationDescription(organization)"
:status="organization.status"
buttonLink="https://pennsieve.io"
/>
</template>
</div>
</div>
</div>
<div class="section heading2 p-16 mt-16">
Expand Down Expand Up @@ -588,6 +590,9 @@ a {
.confirmation-body {
text-align: center;
}
.org-container {
display: flex;
}
::v-deep .popover {
background-color: #f9f2fc;
word-wrap: normal;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2491,10 +2491,10 @@
resolved "https://registry.yarnpkg.com/@miyaoka/nuxt-twitter-widgets-module/-/nuxt-twitter-widgets-module-0.0.1.tgz#fdca759252e7496c783e69b926623551bf8a4a01"
integrity sha512-vYJkz9EemNS4Ur4uXI8R/tKFyXWrGypQwpFF/PSA/JZaGx19gpAfzTxHg0e7EQ1VIS+GTN2U6AUXz9MD05P+Nw==

"@nih-sparc/sparc-design-system-components@^0.27.5":
version "0.27.5"
resolved "https://registry.yarnpkg.com/@nih-sparc/sparc-design-system-components/-/sparc-design-system-components-0.27.5.tgz#abd9fe159cbb1a304a419b113679a80acd78d9b0"
integrity sha512-UflaFXqjREHdWcVr3UDL5Kd1liqFmr8hiwjsr5awMBgXFmdr1hdL3zoOQm1XTtiqAhX2+1iV3tJFX+qJlYjmRw==
"@nih-sparc/sparc-design-system-components@^0.27.6":
version "0.27.6"
resolved "https://registry.yarnpkg.com/@nih-sparc/sparc-design-system-components/-/sparc-design-system-components-0.27.6.tgz#d77b1a5fdb141d025507f66f8cf11abaf72bdf17"
integrity sha512-g4h4YUBQiJq4VAXvb4ZMbLqCX+P+g1ZE9x39UcJVzxOZlH6Y2Z/sAhB5MllGEJ77VXSo7pHruQ+sYIqYVGULgQ==
dependencies:
"@carbon/grid" "10.17.0"
core-js "^3.6.5"
Expand Down
Loading