Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleysyg committed Sep 6, 2023
2 parents 8f79bf9 + d404d4f commit 7d0a4ac
Show file tree
Hide file tree
Showing 14 changed files with 551 additions and 18 deletions.
71 changes: 71 additions & 0 deletions components/base/AuthorCard.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<template>
<main class="card-container-wrapper is-flex is-justify-content-center">
<div class="mt-5">
<DCard class="mx-3 my-3 px-3" variant="light" accent="light" width="full">
<template #header>
<div class="is-flex is-justify-content-center">
<figure class="image is-128x128">
<img
class="is-rounded"
:src="'/content/images/people/' + person.image"
/>
</figure>
</div>
<div class="media-content">
<h2 class="title has-text-black pt-3">{{ person.name }}</h2>
<h2 class="subtitle has-text-black pt-3">{{ person.title }}</h2>
<a
v-if="person.github_username"
:href="'https://github.com/' + person.github_username"
aria-label="information icon"
><span class="icon"><i class="mdi mdi-github" /></span>
</a>
<a
v-if="person.brown_directory_uuid"
:href="
'https://directory.brown.edu/uuid/' +
person.brown_directory_uuid
"
aria-label="information icon"
><span class="icon"><i class="mdi mdi-information" /></span>
</a>
</div>
</template>
<template #footer>
<div class="content">{{ person.bio }}</div>
</template>
</DCard>
</div>
</main>
</template>

<script>
import DCard from '@/components/base/DCard.vue';
export default {
components: {
DCard,
},
props: {
post: {
default() {
return [];
},
type: Array,
},
people: {
default() {
return [];
},
type: Array,
},
},
computed: {
person() {
const person = this.people[0].data.find(
(d) => d.name === this.post.author
);
return person;
},
},
};
</script>
4 changes: 2 additions & 2 deletions components/base/DHero.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ export default {
background-image: url('@/assets/bharath-g-s-aLGiPJ4XRO4-unsplash.jpg');
.hero-text {
color: hsla(0, 0, 20%, 0.9);
background-color: hsla(0, 0, 100%, 0.2);
color: hsla(0, 0%, 20%, 0.9);
background-color: hsla(0, 0%, 100%, 0.2);
padding: 1rem;
margin: 0 -1rem 0.5rem;
}
Expand Down
13 changes: 5 additions & 8 deletions components/base/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@
</div>
</div>
</div>
<div tabindex="0" class="navbar-item pl-0">
<nuxt-link class="navbar-item" to="/blog" @click.native="handleClick">
Blog
</nuxt-link>
</div>
</div>
<div class="navbar-end" data-testid="navbar-end">
<div class="navbar-item">
Expand All @@ -259,14 +264,6 @@
<span class="mx-0 icon"><i class="mdi mdi-file-document" /></span>
</a>
</div>
<div class="navbar-item">
<a
href="https://medium.com/brown-ccv"
class="d-button is-white has-text-link"
aria-label="CCV's Medium Blog"
>Blog <span class="mx-0 icon"><i class="mdi mdi-notebook" /></span
></a>
</div>
</div>
</div>
<div class="navbar-item">
Expand Down
2 changes: 1 addition & 1 deletion components/blocks/FilesToCards.vue
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@

<script>
import Multiselect from 'vue-multiselect';
import { humanizeHero } from '@/utils';
import DCard from '@/components/base/DCard.vue';
import { humanizeHero } from '@/utils';
export default {
components: {
Expand Down
233 changes: 233 additions & 0 deletions components/blocks/MarkdownToCards.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
<template>
<main class="card-container-wrapper is-flex is-justify-content-center">
<div class="container">
<div
class="multiselect-header mt-4 mb-1 is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
>
Filter posts by tags:
</div>
<div
class="dropdown is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
>
<div
class="mb-1 is-flex is-justify-content-space-evenly is-flex-wrap-wrap"
>
<div class="is-flex">
<multiselect
v-model="searchGroup"
:options="tags"
:close-on-select="true"
:clear-on-select="false"
:preserve-search="true"
:multiple="true"
placeholder="Select one or more"
:allow-empty="true"
>
</multiselect>
<button class="ml-1 button is-normal is-warning" @click="clearAll">
Clear Filters
</button>
</div>
</div>
</div>
<div
class="multiselect-header mt-5 mb-1 is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
>
Sort posts by:
</div>
<div
class="dropdown is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
>
<div class="mb-1 is-flex">
<multiselect
v-model="sortBy"
:options="sortByOptions"
:close-on-select="true"
:clear-on-select="false"
:multiple="false"
:preselect-first="true"
placeholder="Sort by"
label="name"
track-by="name"
>\
</multiselect>
<button
class="ml-1 button is-normal is-warning"
@click="ascending = !ascending"
>
<i v-if="ascending" class="mdi mdi-sort-ascending"></i>
<i v-else class="mdi mdi-sort-descending"></i>
</button>
</div>
</div>
<div
class="card-container is-flex mt-6 is-justify-content-space-evenly is-flex-wrap-wrap"
>
<DCard
v-for="(item, i) in sortedArray"
:key="'help-card-' + i"
class="mx-3 my-3 px-3"
variant="light"
accent="warning"
width="medium"
>
<!-- adding comment to test submodule merge conflict resolution -->
<template #header>
<div>
<span
v-for="tag in item.tags"
:key="tag"
class="radius-0 tag m-1 mb-5 is-yellow"
>
{{ tag }}
</span>
</div>
<div class="px-5">
<h2 class="title has-text-black">
{{ item.title }}
</h2>
<h2 class="subtitle has-text-black">Author: {{ item.author }}</h2>
<h2 class="subtitle has-text-black">
{{ new Date(item.date).toDateString() }}
</h2>
<h2 class="has-text-black">
{{ item.description }}
</h2>
</div>
</template>
<template #footer>
<nuxt-link
:to="`/blog/${item.slug}`"
class="m-1 link-item d-button has-background-link has-text-white has-text-weight-semibold is-size-5 link-button"
>
READ MORE
</nuxt-link>
</template>
</DCard>
</div>
</div>
</main>
</template>

<script>
import Multiselect from 'vue-multiselect';
import DCard from '@/components/base/DCard.vue';
import { humanizeHero } from '@/utils';
export default {
components: {
DCard,
Multiselect,
},
props: {
data: {
type: Array,
required: true,
},
},
data: () => ({
ascending: true,
sortBy: [],
searchGroup: [],
}),
computed: {
filteredData() {
const f = this.data.filter((d) => !d.hidden);
return f;
},
tags() {
const tags = Array.from(
new Set(this.filteredData.map(({ tags }) => tags))
);
return [...new Set(tags.flat(1))].sort();
},
sortByOptions() {
const options = [{ name: 'Title' }];
options.push({ name: 'Author' });
options.push({ name: 'Date' });
options.sort().reverse();
return options;
},
sortedArray() {
let filtered = this.filteredData;
// Filter cards by tags in searchGroup
if (this.searchGroup.length > 0) {
filtered = filtered.filter((card) => {
return this.searchGroup.some((tag) => card.tags.includes(tag));
});
}
// Sort by title alphabetical order
if (this.sortBy.name === 'Title') {
filtered.sort((a, b) => {
const fa = a.title.toLowerCase();
const fb = b.title.toLowerCase();
if (fa < fb) {
return -1;
}
if (fa > fb) {
return 1;
}
return 0;
});
} else if (this.sortBy.name === 'Date') {
// Sort by date
filtered.sort((a, b) => {
return new Date(a.date) - new Date(b.date);
});
} else if (this.sortBy.name === 'Author') {
// Sort by author
filtered.sort((a, b) => {
const fa = a.author.toLowerCase();
const fb = b.author.toLowerCase();
if (fa < fb) {
return -1;
}
if (fa > fb) {
return 1;
}
return 0;
});
}
// Show sorted array in descending or ascending order
if (!this.ascending) {
filtered.reverse();
}
return filtered;
},
},
methods: {
humanizeHero,
clearAll() {
this.searchGroup = [];
},
},
};
</script>

<!-- see assets/scss/_layout.scss for relevant styles -->
<style lang="scss" scoped>
.help-card h2 {
font-weight: bold;
}

.dropdown {
margin-top: 30px;
}

.multiselect {
min-width: 225px;
}

.multiselect-header {
font-weight: bold;
}

.link-button {
width: 65%;
}
</style>
1 change: 0 additions & 1 deletion components/calendar/CalMonthlyTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import {
TODAYS_DATE,
weeksInMonth,
} from '../../utils.js';
import MonthlyWeek from '@/components/calendar/CalMonthlyWeek';
export default {
Expand Down
2 changes: 1 addition & 1 deletion content
Submodule content updated 92 files
+26 −10 .github/workflows/preview_on_pr.yml
+6 −2 .github/workflows/prod_deply_on_merge.yml
+2 −1 .gitignore
+7 −6 about/facilities.md
+58 −35 about/people.yml
+2 −2 about/teams.md
+0 −0 banners/.gitkeep
+0 −0 banners/announcements/.gitkeep
+0 −43 banners/covid.yml
+714 −0 blog/nextflow.md
+0 −90 blog/test-1.md
+0 −16 blog/test-2.md
+59 −0 blog/vr-volume-viewer.md
+ images/blog/nextflow/FastQC.png
+ images/blog/nextflow/count words workflow output with custom parameter.png
+ images/blog/nextflow/count words workflow output.png
+ images/blog/nextflow/create github token.png
+ images/blog/nextflow/nextflow generated commands.png
+ images/blog/nextflow/reproduce.png
+ images/blog/nextflow/workflow output 2.png
+ images/blog/nextflow/workflow output with custom parameter.png
+ images/blog/nextflow/workflow output.png
+ images/blog/nextflow/workflow.png
+ images/blog/vr-volume-viewer/image1.png
+ images/blog/vr-volume-viewer/image2.png
+ images/blog/vr-volume-viewer/image3.png
+ images/blog/vr-volume-viewer/image4a.png
+ images/blog/vr-volume-viewer/image4b.png
+ images/blog/vr-volume-viewer/image5.gif
+ images/people/aisulu_hover.jpg
+ images/people/aisulu_main.jpg
+ images/people/anna_hover.jpg
+ images/people/anna_main.jpg
+ images/people/ashley_hover.jpg
+ images/people/ashley_main.jpg
+ images/people/camilo_hover.jpg
+ images/people/eric_hover.jpg
+ images/people/eric_main.jpg
+ images/people/galen_hover.jpg
+ images/people/galen_main.jpg
+ images/people/heather_hover.jpg
+ images/people/heather_main.jpg
+ images/people/mary_hover.jpg
+ images/people/mary_main.jpg
+ images/people/minsik_hover.jpg
+ images/people/minsik_main.jpg
+ images/people/pratibha_hover.jpg
+ images/people/pratibha_main.jpg
+ images/people/rain_hover.jpg
+ images/people/rain_main.jpg
+ images/people/tim_hover.jpg
+22 −0 our-work/collaborations/acadia.yml
+2 −0 our-work/collaborations/aer.yml
+19 −0 our-work/collaborations/biomed.yml
+7 −7 our-work/collaborations/bnc.yml
+21 −0 our-work/collaborations/brainerd.yml
+2 −2 our-work/collaborations/braingate.yml
+4 −0 our-work/collaborations/peac.yml
+4 −2 our-work/collaborations/pphc.yml
+2 −6 our-work/collaborations/riddc.yml
+2 −2 our-work/collaborations/serre.yml
+6 −4 our-work/collaborations/tpl.yml
+2 −0 our-work/software/autora.yml
+2 −2 our-work/software/beehive.yml
+15 −0 our-work/software/chamber.yml
+25 −0 our-work/software/honeycomb.yml
+2 −2 our-work/software/materials-db.yml
+5 −3 our-work/software/nb-data-explorer.yml
+18 −0 our-work/software/nlp-syllabi.yml
+15 −0 our-work/software/nmr-web-app.yml
+17 −0 our-work/software/profound.yml
+4 −2 our-work/software/project-portal.yml
+2 −2 our-work/software/provident.yml
+17 −0 our-work/software/signal.yml
+4 −2 our-work/software/titan.yml
+2 −0 our-work/software/xnat-tools.yml
+17 −0 our-work/software/yajima.yml
+19 −0 our-work/workshops-and-talks/how-to-pr.yml
+16 −0 our-work/workshops-and-talks/introduction-to-python.yml
+18 −0 our-work/workshops-and-talks/remote_renderer.yml
+19 −0 our-work/workshops-and-talks/soma.yml
+1 −1 rates.md
+6 −0 schemas/banners-frontmatter.yml
+0 −13 schemas/banners.yml
+8 −3 schemas/collaborations.yml
+10 −2 schemas/software.yml
+6 −3 schemas/workshops-and-talks.yml
+11 −10 services/computing/oscar.md
+1 −1 services/computing/stronghold.md
+15 −0 services/consulting/hardware-purchasing.md
+4 −4 services/file-storage-and-transfer/hibernate.md
+18 −19 storage-tool.yml
9 changes: 8 additions & 1 deletion layouts/error.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ export default {
DButton,
},
layout: 'error',
props: ['error'],
props: {
error: {
default() {
return {};
},
type: Object,
},
},
};
</script>

Expand Down
2 changes: 2 additions & 0 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ export default {
'remark-slug',
'remark-external-links',
'remark-footnotes',
// 'remark-math'
],
// rehypePlugins: () => ['rehype-katex'],
},
},
buildDir: '.nuxt',
Expand Down
Loading

0 comments on commit 7d0a4ac

Please sign in to comment.