Skip to content

Commit

Permalink
Merge branch 'main' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
alireza-dhp authored Aug 9, 2024
2 parents f706838 + 8e04fdf commit 16d9bc8
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,28 @@ updates:
# Enable updates for github-actions
- package-ecosystem: github-actions
directory: /
target-branch: 'develop'
schedule:
interval: weekly
groups:
github-action:
patterns:
- "actions/*"
docker:
patterns:
- "docker/*"

# Enable version updates for npm
- package-ecosystem: npm
directory: /
target-branch: 'develop'
schedule:
interval: daily
open-pull-requests-limit: 5

# Enable version updates for Docker
- package-ecosystem: docker
directory: /
target-branch: 'develop'
schedule:
interval: weekly
35 changes: 35 additions & 0 deletions .github/workflows/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Dependabot Automation
on: pull_request

permissions:
contents: write
pull-requests: write
issues: write
repository-projects: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot Metadata
id: metadata
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Label Major Updates
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-major'}}
run: |
gh label create "major-update" --color "B60205" --description "Major Dependency Update" --repo "$REPO" || true
gh pr edit "$PR_URL" --add-label "major-update"
env:
REPO: ${{github.repository}}
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Enable Auto-Merge for Patch Updates
if: ${{ false }} #Disabled for now
#if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ ConfiguratorAPI.yaml
openapitools.json
src/generated-sources
tests/coverage
.env
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,18 @@ Mainly, Vue 3, vite, TS, tailwindCSS and PrimeVue are used.
```
npm i
npm run dev
npm run generate:api
```
go to http://localhost:3000

To have a consistent code style and quality, we use Eslint in combination with prettier.

### Selecting backend

You can modify which backend you want to connect to by modifying the `package.json` file. E.g. to point to a remote backend:
- Look for the following parameter `scripts->dev:local`
- Change `VITE_LOCAL_BACKEND=true` to `VITE_LOCAL_BACKEND=false`
- Change the backend in the vite.config.ts file by replacing `https://studymanager.platform-test.more.redlink.io/api` with your URL path.

### Intellij, Webstorm ESLint configuration
Set the EsLint settings for Webstorm in Preferences --> Languages & Frameworks --> Javascript --> Code Quality Tools --> ESLint
Expand Down

0 comments on commit 16d9bc8

Please sign in to comment.