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

MSA viz using Nightingale #32

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
10 changes: 5 additions & 5 deletions frontend/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VITE_TITLE=MolEvolvR
VITE_DESCRIPTION=A web app characterizing proteins using molecular evolution and phylogeny
VITE_URL=https://molevolvr.org
VITE_API=https://api.molevolvr.org

VITE_TITLE=MolEvolvR
VITE_DESCRIPTION=A web app characterizing proteins using molecular evolution and phylogeny
VITE_URL=https://molevolvr.org
VITE_API=https://api.molevolvr.org
62 changes: 31 additions & 31 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
!.vscode/settings.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
tsconfig.tsbuildinfo
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
!.vscode/settings.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
tsconfig.tsbuildinfo
4 changes: 2 additions & 2 deletions frontend/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dist
mockServiceWorker.js
dist
mockServiceWorker.js
40 changes: 20 additions & 20 deletions frontend/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"plugins": [
"@ianvs/prettier-plugin-sort-imports",
"./node_modules/prettier-plugin-jsdoc/dist/index.js",
"prettier-plugin-css-order"
],
"importOrder": [
"^react",
"^[a-zA-Z]",
"^@[a-zA-Z]",
"^@/",
"^/",
"^./",
"^../"
],
"importOrderParserPlugins": ["typescript", "jsx", "importAssertions"],
"cssDeclarationSorterOrder": "smacss",
"jsdocCapitalizeDescription": false,
"htmlWhitespaceSensitivity": "strict"
}
{
"plugins": [
"@ianvs/prettier-plugin-sort-imports",
"./node_modules/prettier-plugin-jsdoc/dist/index.js",
"prettier-plugin-css-order"
],
"importOrder": [
"^react",
"^[a-zA-Z]",
"^@[a-zA-Z]",
"^@/",
"^/",
"^./",
"^../"
],
"importOrderParserPlugins": ["typescript", "jsx", "importAssertions"],
"cssDeclarationSorterOrder": "smacss",
"jsdocCapitalizeDescription": false,
"htmlWhitespaceSensitivity": "strict"
}
98 changes: 49 additions & 49 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
# from https://bun.sh/guides/ecosystem/docker, with modifications
# to run a hot-reloading development server

# use the official Bun image
# see all versions at https://hub.docker.com/r/oven/bun/tags
FROM oven/bun:1 AS base
WORKDIR /app


# -----------------------------------------------------------
# install dependencies for dev and prod into temp directories
FROM base AS install

COPY package.json bun.lockb /temp/dev/
RUN cd /temp/dev/ && \
bun install --frozen-lockfile

# FA: the production-only install is currently commented out since we always
# require the dev dependencies, specifically vite, to run *or* build the app.
# i'm leaving it here because perhaps someday we'll think of a reason why we
# want just the production dependencies.

# # install with --production (exclude devDependencies)
# COPY package.json bun.lockb /temp/prod/
# RUN cd /temp/prod && \
# bun install --frozen-lockfile --production

# -----------------------------------------------------------
# copy node_modules from dev stage, copy entire app
# source into the image
FROM base AS dev
COPY --from=install /temp/dev/node_modules node_modules
COPY . .
# run the app in hot-reloading development mode
# set up vite to accept connections on any interface, e.g. from outside the
# container, and to always run on port 5173)
CMD [ "vite", "--host", "--port", "5173" ]


# -----------------------------------------------------------
# copy production dependencies and source code into final image
FROM base AS release
COPY --from=install /temp/dev/node_modules node_modules
COPY . .

# produce a bundle that'll then be served via a reverse http proxy, e.g. nginx
# (you'll want /app/dist to be mapped to a volume that's served by the reverse
# http proxy)
CMD [ "vite", "build" ]
# from https://bun.sh/guides/ecosystem/docker, with modifications
# to run a hot-reloading development server
# use the official Bun image
# see all versions at https://hub.docker.com/r/oven/bun/tags
FROM oven/bun:1 AS base
WORKDIR /app
# -----------------------------------------------------------
# install dependencies for dev and prod into temp directories
FROM base AS install
COPY package.json bun.lockb /temp/dev/
RUN cd /temp/dev/ && \
bun install --frozen-lockfile
# FA: the production-only install is currently commented out since we always
# require the dev dependencies, specifically vite, to run *or* build the app.
# i'm leaving it here because perhaps someday we'll think of a reason why we
# want just the production dependencies.
# # install with --production (exclude devDependencies)
# COPY package.json bun.lockb /temp/prod/
# RUN cd /temp/prod && \
# bun install --frozen-lockfile --production
# -----------------------------------------------------------
# copy node_modules from dev stage, copy entire app
# source into the image
FROM base AS dev
COPY --from=install /temp/dev/node_modules node_modules
COPY . .
# run the app in hot-reloading development mode
# set up vite to accept connections on any interface, e.g. from outside the
# container, and to always run on port 5173)
CMD [ "vite", "--host", "--port", "5173" ]
# -----------------------------------------------------------
# copy production dependencies and source code into final image
FROM base AS release
COPY --from=install /temp/dev/node_modules node_modules
COPY . .
# produce a bundle that'll then be served via a reverse http proxy, e.g. nginx
# (you'll want /app/dist to be mapped to a volume that's served by the reverse
# http proxy)
CMD [ "vite", "build" ]

Binary file modified frontend/bun.lockb
Binary file not shown.
Loading