Skip to content
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
12 changes: 10 additions & 2 deletions .github/workflows/_e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,16 @@ jobs:

- name: Set image names
run: |
echo "API_IMAGE=${{ secrets.NEXUS_DOCKER_URL }}/api:${{ inputs.image-tag }}" >> $GITHUB_ENV
echo "FRONTEND_IMAGE=${{ secrets.NEXUS_DOCKER_URL }}/frontend:${{ inputs.image-tag }}" >> $GITHUB_ENV
if [ "${{ inputs.api-changed }}" == "true" ]; then
echo "API_IMAGE=${{ secrets.NEXUS_DOCKER_URL }}/api:${{ inputs.image-tag }}" >> $GITHUB_ENV
else
echo "API_IMAGE=${{ secrets.NEXUS_DOCKER_URL }}/api:latest" >> $GITHUB_ENV
fi
if [ "${{ inputs.web-changed }}" == "true" ]; then
echo "FRONTEND_IMAGE=${{ secrets.NEXUS_DOCKER_URL }}/frontend:${{ inputs.image-tag }}" >> $GITHUB_ENV
else
echo "FRONTEND_IMAGE=${{ secrets.NEXUS_DOCKER_URL }}/frontend:latest" >> $GITHUB_ENV
fi

- name: Start production environment
run: ./devcli start prod
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/_push-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,13 @@ jobs:
run: |
docker load < api-image.tar.gz
docker push ${API_IMAGE}
docker tag ${API_IMAGE} ${{ secrets.NEXUS_DOCKER_URL }}/api:latest
docker push ${{ secrets.NEXUS_DOCKER_URL }}/api:latest

- name: Load and push Web image
if: inputs.web-changed == 'true'
run: |
docker load < web-image.tar.gz
docker push ${FRONTEND_IMAGE}
docker tag ${FRONTEND_IMAGE} ${{ secrets.NEXUS_DOCKER_URL }}/frontend:latest
docker push ${{ secrets.NEXUS_DOCKER_URL }}/frontend:latest
24 changes: 12 additions & 12 deletions apps/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.17.0",
"@eslint/eslintrc": "^3.3.4",
"@eslint/js": "^9.39.3",
"@playwright/test": "^1.58.2",
"@types/node": "^20.17.10",
"@typescript-eslint/eslint-plugin": "^8.18.2",
"@typescript-eslint/parser": "^8.18.2",
"@types/node": "^20.19.34",
"@typescript-eslint/eslint-plugin": "^8.56.1",
"@typescript-eslint/parser": "^8.56.1",
"eslint": "~9.4.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-prettier": "^9.1.2",
"eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^15.14.0",
"lint-staged": "^15.2.11",
"prettier": "^3.4.2",
"typescript": "^5.7.2",
"typescript-eslint": "^8.18.2"
"globals": "^15.15.0",
"lint-staged": "^15.5.2",
"prettier": "^3.8.1",
"typescript": "^5.9.3",
"typescript-eslint": "^8.56.1"
},
"pnpm": {
"peerDependencyRules": {
Expand All @@ -39,6 +39,6 @@
},
"dependencies": {
"ci": "^2.3.0",
"dotenv": "^16.4.7"
"dotenv": "^16.6.1"
}
}
58 changes: 29 additions & 29 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,50 +24,50 @@
"dependencies": {
"@base-ui/react": "^1.2.0",
"@emotion/react": "^11.14.0",
"@tanstack/react-query": "^5.62.2",
"commander": "^14.0.0",
"dotenv": "^16.4.7",
"embla-carousel-react": "^8.5.1",
"@tanstack/react-query": "^5.90.21",
"commander": "^14.0.3",
"dotenv": "^16.6.1",
"embla-carousel-react": "^8.6.0",
"knip": "^5.85.0",
"lucide-react": "^0.456.0",
"node-fetch": "^3.3.2",
"posthog-js": "^1.194.3",
"posthog-js": "^1.354.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-helmet-async": "^2.0.5",
"react-intl": "^6.8.9",
"react-markdown": "^10.1.0",
"react-router": "^7.0.2",
"react-router": "^7.13.1",
"react-toastify": "^9.1.3",
"tss-react": "^4.9.20",
"vite-plugin-env-compatible": "^2.0.1",
"zustand": "^4.5.5"
"zustand": "^4.5.7"
},
"devDependencies": {
"@eslint/compat": "^1.2.4",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.16.0",
"@openapitools/openapi-generator-cli": "^2.22.0",
"@tanstack/eslint-plugin-query": "^5.62.1",
"@types/node": "^20.17.9",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
"@vitejs/plugin-react-swc": "^3.7.2",
"@eslint/compat": "^1.4.1",
"@eslint/eslintrc": "^3.3.4",
"@eslint/js": "^9.39.3",
"@openapitools/openapi-generator-cli": "^2.30.0",
"@tanstack/eslint-plugin-query": "^5.91.4",
"@types/node": "^20.19.34",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.7",
"@typescript-eslint/eslint-plugin": "^8.56.1",
"@typescript-eslint/parser": "^8.56.1",
"@vitejs/plugin-react-swc": "^3.11.0",
"eslint": "9.16.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.16",
"eslint-config-prettier": "^9.1.2",
"eslint-plugin-prettier": "^5.5.5",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.26",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unused-imports": "^4.1.4",
"globals": "^15.13.0",
"openapi-typescript": "^7.9.1",
"eslint-plugin-unused-imports": "^4.4.1",
"globals": "^15.15.0",
"openapi-typescript": "^7.13.0",
"prettier": "3.2.5",
"typescript": "^5.7.2",
"typescript-eslint": "^8.17.0",
"vite": "^5.4.11"
"typescript": "^5.9.3",
"typescript-eslint": "^8.56.1",
"vite": "^5.4.21"
}
}
22 changes: 13 additions & 9 deletions apps/web/src/components/ui/button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { makeStyles } from '@/theme/makeStyles'
import { Button as BaseUiButton } from '@base-ui/react/button'
import { FC } from 'react'
import { forwardRef } from 'react'

const useStyles = makeStyles()((theme) => ({
root: {
Expand Down Expand Up @@ -40,15 +40,19 @@ const useStyles = makeStyles()((theme) => ({

type ButtonProps = React.ComponentPropsWithoutRef<typeof BaseUiButton>

const Button: FC<ButtonProps> = ({ className, ...props }) => {
const { cx, classes } = useStyles()
const Button = forwardRef<HTMLButtonElement, ButtonProps>(
({ className, ...props }, ref) => {
const { cx, classes } = useStyles()

const mergedClassName: ButtonProps['className'] =
typeof className === 'function'
? (state) => cx(classes.root, className(state))
: cx(classes.root, className)
const mergedClassName: ButtonProps['className'] =
typeof className === 'function'
? (state) => cx(classes.root, className(state))
: cx(classes.root, className)

return <BaseUiButton className={mergedClassName} {...props} />
}
return <BaseUiButton ref={ref} className={mergedClassName} {...props} />
},
)

Button.displayName = 'Button'

export default Button
4 changes: 2 additions & 2 deletions apps/web/src/containers/Theme/components/ColorModeToggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const ColorModeToggle: FC = () => {

return (
<DropdownMenu>
<DropdownMenuTrigger>
<Button>{isDark ? <Moon /> : <Sun />}</Button>
<DropdownMenuTrigger render={<Button />}>
{isDark ? <Moon /> : <Sun />}
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onClick={() => setTheme('light')}>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"api:test:rerun": "cd apps/api && ./gradlew test --no-daemon --quiet --rerun-tasks"
},
"devDependencies": {
"turbo": "^2.3.0"
"turbo": "^2.8.11"
},
"engines": {
"node": ">=20",
Expand Down
Loading
Loading