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

Rename client/ to frontend/ #129

Merged
merged 4 commits into from
Jul 2, 2021
Merged
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
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# Workflow for running several tests for PRs and pushes to the main branch for
# napari hub client code.
# napari hub frontend code.

name: Client Tests
name: Frontend Tests

on:
push:
branches:
- main
paths:
- 'client/**'
- 'frontend/**'
pull_request:
branches:
- '**'
paths:
- 'client/**'
- 'frontend/**'

defaults:
run:
working-directory: client/
working-directory: frontend/

jobs:
# Runs several tests on the client codebase to check for code style,
# Runs several tests on the frontend codebase to check for code style,
# formatting, best practices, and run unit/integration tests.
tests:
name: ${{ matrix.name }}
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

cd client
cd frontend
node_modules/.bin/lint-staged
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"--watchAll=false",
"--config=jest/test.config.js"
],
"cwd": "${workspaceFolder}/client",
"cwd": "${workspaceFolder}/frontend",
"disableOptimisticBPs": true,
"windows": {
"program": "node_modules/jest/bin/jest"
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"typescript.tsdk": "client/node_modules/typescript/lib",
"typescript.tsdk": "frontend/node_modules/typescript/lib",
"tailwindCSS.experimental.classRegex": [
["clsx\\(([^)]*)\\)", "'([^']*)'", "\"([^\"]*)\""],
["classes={([^)]*)}", ":\\s*?'([^']*)'", ":\\s*?\"([^\"]*)\""]
],
"jest.jestCommandLine": "node_modules/.bin/jest -c jest/test.config.js",
"jest.rootPath": "client"
"jest.rootPath": "frontend"
}
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,9 @@ CZI is proud to collaborate with the science community to accelerate research an

## Source Code

We're building the napari hub out in the open, so if you want to contribute
or get a sneak, please take a look at:
We're building the napari hub out in the open, so if you want to contribute, please take a look at:

- [napari hub client](client/README.md)
- [napari hub frontend](frontend/README.md)

## Code of Conduct

Expand Down
20 changes: 10 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
version: "3.8"
version: '3.8'

services:
localstack:
image: localstack/localstack@sha256:7c6635493185d25165979995fb073fd789c72b6d8b17ef3a70b798d55576732f
ports:
- "4566:4566"
- '4566:4566'
environment:
- HOSTNAME_EXTERNAL=localstack
- SERVICES=s3,secretsmanager
Expand All @@ -20,11 +20,11 @@ services:
aliases:
- localstack.naparinet.local
frontend:
image: "${DOCKER_REPO}napari-hub-dev-frontend"
image: '${DOCKER_REPO}napari-hub-dev-frontend'
build:
context: client
context: frontend
cache_from:
- "${DOCKER_REPO}napari-hub-dev-frontend:branch-main"
- '${DOCKER_REPO}napari-hub-dev-frontend:branch-main'
args:
- BUILDKIT_INLINE_CACHE=1
- HAPPY_COMMIT
Expand All @@ -35,27 +35,27 @@ services:
depends_on:
- backend
ports:
- "8080:8080"
- '8080:8080'
environment:
- AWS_DEFAULT_REGION=us-west-2
- AWS_ACCESS_KEY_ID=test
- AWS_SECRET_ACCESS_KEY=test
- BOTO_ENDPOINT_URL=http://localstack:4566
- API_URL=http://backend.naparinet.local:5000/
volumes:
- ./client:/app
- ./frontend:/app
- /app/node_modules/
- /app/.next/
networks:
naparinet:
aliases:
- frontend.naparinet.local
backend:
image: "${DOCKER_REPO}napari-hub-dev-backend"
image: '${DOCKER_REPO}napari-hub-dev-backend'
build:
context: backend
cache_from:
- "${DOCKER_REPO}napari-hub-dev-backend:branch-main"
- '${DOCKER_REPO}napari-hub-dev-backend:branch-main'
args:
- BUILDKIT_INLINE_CACHE=1
- HAPPY_COMMIT
Expand All @@ -65,7 +65,7 @@ services:
depends_on:
- localstack
ports:
- "5000:5000"
- '5000:5000'
environment:
- PYTHONUNBUFFERED=1
- AWS_DEFAULT_REGION=us-west-2
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion client/eslint/jest.js → frontend/eslint/jest.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
/*
Jest version has to be passed explicitly because ESlint throws an error
about not being able to find the Jest version. This is likely due to
the frontend being stored in `client/`.
the frontend being stored in `frontend/`.
https://git.io/JYhAJ
*/
jest: {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.