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

feat(web): put input fasta list on the left side #1324

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
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
Next Next commit
feat(web): put input fasta list on the left side
ivan-aksamentov committed Nov 28, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit a2d962565daf230d0fb65e017870e7e56b45ebc5
29 changes: 13 additions & 16 deletions packages_rs/nextclade-web/src/components/Main/MainInputForm.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { useCallback, useMemo } from 'react'
import { isNil } from 'lodash'
import { useRouter } from 'next/router'
import { Col, Row } from 'reactstrap'
import { useRecoilState, useRecoilValue } from 'recoil'
import { SuggestionAlertMainPage } from 'src/components/Main/SuggestionAlertMainPage'
import styled from 'styled-components'
import { SuggestionAlertMainPage } from 'src/components/Main/SuggestionAlertMainPage'
import { datasetCurrentAtom } from 'src/state/dataset.state'
import { hasRequiredInputsAtom } from 'src/state/inputs.state'
import { shouldSuggestDatasetsOnDatasetPageAtom } from 'src/state/settings.state'
@@ -62,10 +63,6 @@ const Footer = styled.div`
flex: 1;
`

const FooterWithoutOverflow = styled(Footer)`
overflow: hidden;
`

export function Landing() {
// This periodically fetches dataset index and updates the list of datasets.
useUpdatedDatasetIndex()
@@ -88,20 +85,20 @@ export function Landing() {
<MainSectionTitle />
</Header>

<Main className="mt-4">
<Main className="mt-4 mb-2">
<ContainerColumns>
<QuerySequenceFilePicker />
<DatasetCurrentOrSelectButton toDatasetSelection={toDatasetSelection} />
<Row>
<Col className="d-flex flex-column h-100">
<QuerySequenceFilePicker />
<QuerySequenceList />
</Col>

<Col>
<DatasetCurrentOrSelectButton toDatasetSelection={toDatasetSelection} />
</Col>
</Row>
</ContainerColumns>
</Main>

<FooterWithoutOverflow>
<Container>
<Main>
<QuerySequenceList />
</Main>
</Container>
</FooterWithoutOverflow>
</ContainerFixed>
)
}
Original file line number Diff line number Diff line change
@@ -65,10 +65,6 @@ export function QuerySequenceFilePicker() {

const Container = styled.div`
display: flex;
flex: 1;
flex-direction: column;
height: 100%;
overflow: hidden;
margin-left: 10px;
margin-right: 12px;
`
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import { useTranslationSafe } from 'src/helpers/useTranslationSafe'
import { ButtonTransparent } from 'src/components/Common/ButtonTransparent'
import { UlGeneric } from 'src/components/Common/List'

export function QuerySequenceList({ toMainPage }: { toMainPage?: () => void }) {
export function QuerySequenceList({ toMainPage, ...restProps }: { toMainPage?: () => void }) {
const { t } = useTranslationSafe()
const { qryInputs, clearQryInputs } = useQuerySeqInputs()

@@ -25,7 +25,7 @@ export function QuerySequenceList({ toMainPage }: { toMainPage?: () => void }) {
return null
}
return (
<div className="d-flex">
<div className="d-flex mt-3">
<h4>{t("Sequence data you've added")}</h4>

<div className="d-flex ml-auto">