Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
theosanderson committed May 25, 2023
1 parent 724ba02 commit 89c1b05
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cd taxonium_web_client
cd taxonium_website
yarn install &
6 changes: 3 additions & 3 deletions .github/workflows/frontend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
node-version: 17.5
- name: NPM build
run: |
cd taxonium_web_client
cd taxonium_website
npm install -g yarn
yarn install
yarn build
cd build
- name: "Upload Artifact"
uses: actions/upload-artifact@v3
with:
name: taxonium_web_client_build
path: taxonium_web_client/build
name: taxonium_website
path: taxonium_website/build
retention-days: 5
2 changes: 1 addition & 1 deletion .github/workflows/selenium-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
path: ./data/
- uses: actions/download-artifact@v3
with:
name: taxonium_web_client_build
name: taxonium_website_build
path: ./web/
- uses: actions/setup-python@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ pre-commit install
## For front-end development

```
cd taxonium_web_client
cd taxonium_component
yarn install
yarn start
yarn storybook
```

This should bring up a development server showing Taxonium.
Expand All @@ -26,7 +26,7 @@ A small amount of front-end code comes from the `taxonium_data_handling` repo. I
cd taxonium_data_handling
yarn install
yarn link
cd ../taxonium_web_client
cd ../taxonium_component
yarn link taxonium_data_handling
```

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.frontend
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKDIR /app
COPY taxonium_website ./taxonium_website
COPY taxonium_data_handling ./taxonium_data_handling
COPY taxonium_component ./taxonium_component
WORKDIR /app/taxonium_web_client
WORKDIR /app/taxonium_website

# Install dependencies for node-gyp from lzma-native
RUN apk add --no-cache python3 make g++ jpeg-dev cairo-dev giflib-dev pango-dev
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Taxonium is structured as a 'monorepo' containing a number of components:
- [taxoniumtools](./taxoniumtools/) - a Python package that lets you easily generate Taxonium files from Usher protobuf files
- [taxonium_component](./taxonium_component/) - a React component that implements the Taxonium tree explorer
- [taxonium_website](./taxonium_website/) - The Taxonium website found at [Taxonium.org](https://taxonium.org), a wrapper around taxonium_component
- [taxonium_backend](./taxonium_backend/) - a server-based backend that allows Taxonium trees to be explored without the user downloading the full tree (N.B. Taxonium can also be used without this backend, with static files acccessed in taxonium_web_client)
- [taxonium_backend](./taxonium_backend/) - a server-based backend that allows Taxonium trees to be explored without the user downloading the full tree (N.B. Taxonium can also be used without this backend, with static files acccessed in taxonium_website)
- [taxonium_data_handling](./taxonium_data_handling/) - this is a node package upon which both the web client and the backend depend (it handles core logic common to both)

## Contributors
Expand Down
2 changes: 1 addition & 1 deletion taxonium_website/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "taxonium_web_client",
"name": "taxonium_website",
"private": true,
"version": "0.0.0",
"type": "module",
Expand Down

0 comments on commit 89c1b05

Please sign in to comment.