Skip to content

Commit 1c82c9f

Browse files
authored
Merge pull request MetaCell#180 from MetaCell/feature/vite_refactoring
Refactored old webpack application in favour of a vite template
2 parents b841d08 + 1bd5453 commit 1c82c9f

200 files changed

Lines changed: 7847 additions & 16360 deletions

File tree

Some content is hidden

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

.github/workflows/run-eslint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
- name: Set up Node.js
2424
uses: actions/setup-node@v3
2525
with:
26-
node-version: '18' # Adjust the Node.js version as needed
26+
node-version: '20' # Adjust the Node.js version as needed
2727

2828
# Step 3: Install dependencies using Yarn
2929
- name: Install dependencies
30-
working-directory: applications/virtual-fly-brain/client
30+
working-directory: applications/virtual-fly-brain/frontend
3131
run: yarn install
3232

3333
# Step 4: Run ESLint
3434
- name: Run ESLint
35-
working-directory: applications/virtual-fly-brain/client
36-
run: yarn prebuild
35+
working-directory: applications/virtual-fly-brain/frontend
36+
run: yarn build

.github/workflows/run-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
run: |
3232
python -m pip install --upgrade pip
3333
pip install -r requirements.txt
34+
pip install -r test-requirements.txt
3435
pip install -e .
3536
cd virtual_fly_brain && mkdir www && cd www && touch index.html
3637

applications/virtual-fly-brain/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ RUN apt-get update && apt-get install -y \
2121
git \
2222
&& rm -rf /var/lib/apt/lists/*
2323

24+
RUN apt-get remove -y nodejs npm || true
25+
26+
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
27+
apt-get install -y nodejs && \
28+
node --version
29+
2430
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
2531
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
2632
apt-get update && \
@@ -30,9 +36,9 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
3036
# Set up virtual display for OpenGL
3137
ENV DISPLAY=:99
3238

33-
COPY client ${BUILDDIR}
39+
COPY frontend ${BUILDDIR}
3440
WORKDIR ${BUILDDIR}
35-
RUN export VFB_DOMAIN="https://"${DOMAIN}
41+
ENV VFB_DOMAIN=https://${DOMAIN}
3642
RUN yarn install
3743
RUN yarn run build
3844

applications/virtual-fly-brain/backend/requirements.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ Flask == 2.2.2
1212
psycopg2-binary
1313
gunicorn==20.1.0
1414
flask_cors==3.0.10
15-
vfbquery==0.2.12
15+
dataclasses_json >= 0.5.7
16+
dacite >= 1.6.0
17+
pandas >= 1.0.0
18+
numpy >= 1.19.0
19+
git+https://github.com/VirtualFlyBrain/VFBquery.git

applications/virtual-fly-brain/client/.babelrc

Lines changed: 0 additions & 28 deletions
This file was deleted.

applications/virtual-fly-brain/client/.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

applications/virtual-fly-brain/client/.eslintrc.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

applications/virtual-fly-brain/client/.eslintrc.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

applications/virtual-fly-brain/client/README.md

Lines changed: 0 additions & 70 deletions
This file was deleted.

applications/virtual-fly-brain/client/public/manifest.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)