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

Chore/mobile #102

Merged
merged 7 commits into from
Oct 28, 2024
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
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
vingo/target

vinvoor/bin
vinvoor/dist
vinvoor/node_modules
4 changes: 2 additions & 2 deletions .githooks/vinvoor_format_lint
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

cd vinvoor/

yarn run format
pnpm run format

if [ $? -ne 0 ]; then
echo "Error: code improperly formatted!"
exit 1
fi

yarn run lint
pnpm run lint

if [ $? -ne 0 ]; then
echo "Error: code improperly linted!"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/vinvoor_format_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
with:
node-version: 20.15.1

- name: Install yarn
run: npm install -g yarn
- name: Install pnpm
run: npm install -g pnpm

- name: Install dependencies
run: yarn install
run: pnpm install
working-directory: vinvoor/

- name: Run formatter
run: yarn prettier --check .
run: pnpm prettier --check .
working-directory: vinvoor/

- name: Run Linter
run: yarn eslint . --max-warnings=0
run: pnpm eslint . --max-warnings=0
working-directory: vinvoor/
16 changes: 9 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ RUN apk add upx musl-dev

WORKDIR /

COPY vingo/Cargo.* .
COPY vingo/Cargo.* ./

COPY vingo/migration migration
COPY vingo/migration migration/

COPY vingo/src src
COPY vingo/src src/

RUN cargo build --release

Expand All @@ -20,17 +20,19 @@ FROM node:20.15.1-alpine3.20 as build_frontend

WORKDIR /

RUN npm install -g pnpm

COPY vinvoor/package.json package.json

COPY vinvoor/yarn.lock yarn.lock
COPY vinvoor/pnpm-lock.yaml pnpm-lock.yaml

RUN yarn install
RUN pnpm install

COPY vinvoor/ .
COPY vinvoor/ ./

COPY vinvoor/production.env .env

RUN yarn run build
RUN pnpm run build

# End container
FROM alpine:3.20
Expand Down
6 changes: 4 additions & 2 deletions vinvoor/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ FROM node:20.15.1-alpine3.20

WORKDIR /frontend

COPY package.json yarn.lock ./
RUN npm install -g pnpm

CMD yarn install && yarn run host
COPY package.json pnpm-lock.yaml ./

CMD pnpm install && pnpm run host
69 changes: 39 additions & 30 deletions vinvoor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,59 @@
"build": "tsc && vite build",
"format": "prettier . --write",
"lint": "eslint . --fix",
"preview": "vite preview"
"preview": "vite preview",
"postinstall": "if [ \"$CI\" != \"true\" ]; then pnpx simple-git-hooks; else echo 'Skipping Git hooks in CI'; fi"
},
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@fontsource/roboto": "^5.0.13",
"@mui/icons-material": "^5.15.19",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^7.11.0",
"@tanstack/react-query": "^5.54.1",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fontsource/roboto": "^5.1.0",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/x-date-pickers": "^7.22.0",
"@tanstack/react-query": "^5.59.16",
"@types/js-cookie": "^3.0.6",
"@types/react-router-dom": "^5.3.3",
"@types/react-router-hash-link": "^2.4.9",
"apexcharts": "^3.50.0",
"dayjs": "^1.11.12",
"apexcharts": "^3.54.1",
"dayjs": "^1.11.13",
"js-cookie": "^3.0.5",
"material-ui-confirm": "^3.0.16",
"mdi-material-ui": "^7.9.1",
"mdi-material-ui": "^7.9.2",
"notistack": "^3.0.1",
"react": "^18.2.0",
"react-apexcharts": "^1.4.1",
"react-dom": "^18.2.0",
"react-router-dom": "^6.23.1",
"react": "^18.3.1",
"react-apexcharts": "^1.4.4",
"react-dom": "^18.3.1",
"react-router-dom": "^6.27.0",
"react-router-hash-link": "^2.4.3",
"react-tooltip": "^5.27.0"
"react-tooltip": "^5.28.0"
},
"devDependencies": {
"@eslint/compat": "^1.1.1",
"@eslint/js": "^9.9.0",
"@eslint/compat": "^1.2.1",
"@eslint/js": "^9.13.0",
"@types/eslint__js": "^8.42.3",
"@types/node": "^22.5.0",
"@types/react": "^18.2.66",
"@types/react-dom": "^18.2.22",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vitejs/plugin-react-swc": "^3.5.0",
"eslint": "^9.9.0",
"@types/node": "^22.8.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-react-swc": "^3.7.1",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.6",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.14",
"prettier": "3.3.3",
"typescript": "^5.5.4",
"typescript-eslint": "^8.2.0",
"vite": "^5.2.0",
"simple-git-hooks": "^2.11.1",
"typescript": "^5.6.3",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10",
"vite-plugin-svgr": "^4.2.0"
},
"simple-git-hooks": {
"pre-commit": "cd ui && pnpm lint-staged"
},
"lint-staged": {
"*": "eslint . && prettier .",
"src/*": "bash -c tsc --noEmit"
}
}
Loading
Loading