Skip to content

Commit c3b32fa

Browse files
authored
Merge branch 'master' into sig_imaging_update
2 parents 753cd17 + b0de515 commit c3b32fa

File tree

44 files changed

+115
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+115
-101
lines changed

astro/src/components/search/SearchPage.vue

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ watch(activeTab, (tab) => {
4545
<template>
4646
<div class="search-page">
4747
<!-- Shared search input -->
48-
<div class="bg-white rounded-lg shadow-sm border border-gray-200 p-6 mb-6">
48+
<div class="mb-6">
4949
<Input
5050
v-model="searchQuery"
5151
type="text"
@@ -57,21 +57,36 @@ watch(activeTab, (tab) => {
5757

5858
<!-- Tabs -->
5959
<Tabs v-model="activeTab" default-value="hub">
60-
<TabsList class="mb-6">
61-
<TabsTrigger value="hub">Hub Search</TabsTrigger>
62-
<TabsTrigger value="google">Pan-Galactic Search</TabsTrigger>
63-
<TabsTrigger value="publications">Publication Search</TabsTrigger>
60+
<TabsList class="mb-6 bg-galaxy-dark/10 p-1">
61+
<TabsTrigger
62+
value="hub"
63+
class="data-[state=active]:bg-galaxy-primary data-[state=active]:text-white data-[state=active]:shadow-md"
64+
>
65+
Hub Search
66+
</TabsTrigger>
67+
<TabsTrigger
68+
value="google"
69+
class="data-[state=active]:bg-galaxy-primary data-[state=active]:text-white data-[state=active]:shadow-md"
70+
>
71+
Pan-Galactic Search
72+
</TabsTrigger>
73+
<TabsTrigger
74+
value="publications"
75+
class="data-[state=active]:bg-galaxy-primary data-[state=active]:text-white data-[state=active]:shadow-md"
76+
>
77+
Publication Search
78+
</TabsTrigger>
6479
</TabsList>
6580

6681
<TabsContent value="hub">
6782
<HubSearch :query="searchQuery" />
6883
</TabsContent>
6984

70-
<TabsContent value="google">
85+
<TabsContent value="google" force-mount>
7186
<PanGalacticSearch :query="searchQuery" />
7287
</TabsContent>
7388

74-
<TabsContent value="publications">
89+
<TabsContent value="publications" force-mount>
7590
<PublicationSearch :query="searchQuery" />
7691
</TabsContent>
7792
</Tabs>

astro/src/pages/search.astro

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
---
22
import BaseLayout from '../layouts/BaseLayout.astro';
3+
import PageHeader from '../components/layout/PageHeader.astro';
34
import SearchPage from '../components/search/SearchPage.vue';
45
---
56

67
<BaseLayout title="Search" description="Search the Galaxy Community Hub">
7-
<div class="max-w-4xl mx-auto">
8-
<header class="mb-8">
9-
<h1 class="text-3xl font-bold text-gray-900 mb-2">Search</h1>
10-
<p class="text-lg text-gray-600">
11-
Search the Galaxy Community Hub, the broader Galaxy ecosystem, or the Galaxy publication library.
12-
</p>
13-
</header>
8+
<div class="max-w-6xl mx-auto">
9+
<PageHeader
10+
title="Search"
11+
description="Search the Galaxy Community Hub, the broader Galaxy ecosystem, or the Galaxy publication library."
12+
/>
1413

15-
<SearchPage client:load />
14+
<div class="bg-white px-6 sm:px-8 py-6 rounded-b-lg shadow-sm">
15+
<SearchPage client:load />
16+
</div>
1617
</div>
1718
</BaseLayout>

content/news/2015-07-mysql-2-postgresql/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ authors: "Hans-Rudolf Hotz"
66
contributions:
77
authorship:
88
- hrhotz
9+
source_blog: "Galaxy Project Blog"
10+
source_blog_url: "https://galaxyproject.org/blog/2015-07-mysql-2-postgresql/"
911
---
1012
After running our Galaxy servers successfully with MySQL as the backend database server for several years, we decided to switch to the recommended PostgreSQL server.
1113

content/news/2015-12-galaxy-irods-connection/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ contributions:
88
authorship:
99
- mikaelloaec
1010
- olivierinizan
11+
source_blog: "Galaxy Project Blog"
12+
source_blog_url: "https://galaxyproject.org/blog/2015-12-galaxy-irods-connection/"
1113
---

content/news/2017-10-05-elixir-galaxy-community/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ contributions:
99
- frederikcoppens
1010
- lecorguille
1111
- bgruening
12+
source_blog: "Galaxy Project Blog"
13+
source_blog_url: "https://galaxyproject.org/blog/2017-10-05-elixir-galaxy-community/"
1214
---
1315

1416
ELIXIR is an intergovernmental organisation that brings together life science resources from across Europe.

content/news/2017-10-10-scipy-galaxy/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ tags: [tools]
88
contributions:
99
authorship:
1010
- bgruening
11+
source_blog: "Galaxy Project Blog"
12+
source_blog_url: "https://galaxyproject.org/blog/2017-10-10-scipy-galaxy/"
1113
---
1214

1315
[Numpy](http://www.numpy.org), [SciPy](https://www.scipy.org), [scikit-learn](http://scikit-learn.org),

content/news/2017-10-16-unicycler-tutorial/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ image: unicycler.png
77
contributions:
88
authorship:
99
- nekrut
10+
source_blog: "Galaxy Project Blog"
11+
source_blog_url: "https://galaxyproject.org/blog/2017-10-16-unicycler-tutorial/"
1012
---
1113

1214
<div class="alert alert-info trim-p inline-p" role="alert"><i class="fa fa-fighter-jet" aria-hidden="true"></i>

content/news/2017-10-5000-pubs/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ authors: "Dave Clements"
77
contributions:
88
authorship:
99
- tnabtaf
10+
source_blog: "Galaxy Project Blog"
11+
source_blog_url: "https://galaxyproject.org/blog/2017-10-5000-pubs/"
1012
---
1113

1214
We reached 5,000 publications in the [Galaxy Publication Library](https://www.zotero.org/groups/1732893/galaxy) last week. The library tracks publications that use, extend, implement or reference Galaxy or a Galaxy server. It includes journal articles, theses, and a couple of odds and ends. This milestone is a good opportunity to look at what the library tells us about where the Galaxy project has been, and maybe where it's going too.

content/news/2017-10-a-blog-is-born/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ authors: "Dave Clements"
77
contributions:
88
authorship:
99
- tnabtaf
10+
source_blog: "Galaxy Project Blog"
11+
source_blog_url: "https://galaxyproject.org/blog/2017-10-a-blog-is-born/"
1012
---
1113

1214
Today we launch the new *[Galactic Blog](/news/)*.

content/news/2017-10-public-galaxy-dashboard/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ authors: "Helena Rasche"
66
contributions:
77
authorship:
88
- hexylena
9+
source_blog: "Galaxy Project Blog"
10+
source_blog_url: "https://galaxyproject.org/blog/2017-10-public-galaxy-dashboard/"
911
---
1012

1113
[<img class="img-fluid mx-auto" src="/news/2017-10-public-galaxy-dashboard/dashboard-landing.png" alt="Public Galaxy Server Dashboard" />](https://stats.galaxyproject.eu/dashboard/db/public-galaxy-servers)

0 commit comments

Comments
 (0)