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

Prettier pre commits, and staging env var change for oscar #140

Merged
merged 4 commits into from
May 3, 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
2 changes: 1 addition & 1 deletion .env.development.sample
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NEXT_PUBLIC_STAGE=development
NEXT_PUBLIC_MOCK_API_URL=http://localhost:3001
NEXT_PUBLIC_STAGING_API_URL=http://duval.edpn.io:8080
NEXT_PUBLIC_STAGING_API_URL=https://duval.edpn.io
15 changes: 13 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
},
"parser": "@typescript-eslint/parser",
"plugins": ["jest", "@typescript-eslint", "prettier"],
"extends": ["next/core-web-vitals", "airbnb-base", "airbnb-typescript/base", "next", "prettier"],
"extends": [
"next/core-web-vitals",
"airbnb-base",
"airbnb-typescript/base",
"next",
"prettier"
],
"rules": {
"no-unused-vars": [1, { "args": "after-used", "argsIgnorePattern": "^_" }],
"prettier/prettier": "error",
Expand All @@ -22,7 +28,12 @@
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": ["next.config.js", "jest.setup.js", "**/*.test.tsx", "**/*.test.ts"]
"devDependencies": [
"next.config.js",
"jest.setup.js",
"**/*.test.tsx",
"**/*.test.ts"
]
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: Publish - Nexus Hub
needs: [build]
runs-on: ubuntu-latest
environment:
environment:
name: ${{ github.ref == 'refs/heads/main' && 'production' || 'development' }}
env:
USERNAME: ${{ secrets.NEXUS_USER }}
Expand All @@ -45,20 +45,20 @@ jobs:

- name: Set up Docker
uses: docker/setup-buildx-action@v2

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ env.USERNAME }}
password: ${{ env.PASSWORD }}
registry: ${{ env.REPO_URL }}

- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
file: ./docker/${{ env.STAGE }}/Dockerfile
push: true
tags: |
tags: |
${{ env.REPO_URL }}/edpn/frontend/${{ env.STAGE }}/edpn-frontend:${{ env.PACKAGE_VERSION }}
${{ env.REPO_URL }}/edpn/frontend/${{ env.STAGE }}/edpn-frontend:latest
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
. "$(dirname -- "$0")/_/husky.sh"

yarn lint
yarn prettier
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"semi": true,
"singleQuote": true,
"useTabs": false,
"jsxBracketSameLine": false,
"bracketSameLine": false,
"bracketSpacing": true
}
Loading