Skip to content

Commit

Permalink
Linting in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
arildm committed Jan 24, 2024
1 parent 9548ffe commit 8937032
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: yarn install
- run: yarn lint
- run: yarn test
- run: yarn build
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,22 @@ As this project is a user-facing application, the places in the semantic version

## [Unreleased]

### Changed
### Added

- Converted code to TypeScript [#113](https://github.com/spraakbanken/mink-frontend/issues/113)
- Lint check in CI workflow script

### Changed

- Renamed one-word components, for linting

## [1.2.0] (2024-01-17)

### Added

- Option to enable named entity recognition
- Check if admin mode is enabled on load
- Build check in CI workflow script

### Changed

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"serve": "vite preview",
"typecheck": "vue-tsc --noEmit",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
"format": "prettier . --write '!.yarn' --ignore-path .gitignore",
"format": "prettier . --write --ignore-path .gitignore",
"test": "vitest",
"coverage": "vitest run --coverage"
},
Expand Down
1 change: 1 addition & 0 deletions src/corpus/config/CorpusConfiguration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ async function submit(fields: Form) {
:help="$t('annotations.ner.help')"
/>

<!-- eslint-disable-next-line vue/no-v-html -->
<div class="prose" v-html="$t('annotations.info')" />
</LayoutSection>
</LayoutSection>
Expand Down
1 change: 1 addition & 0 deletions src/home/HomeNews.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function getDate(date: Date) {
class="bg-sky-50 dark:bg-sky-800 shadow shadow-sky-200 dark:shadow-sky-600 text-sky-800 dark:text-sky-200 p-1 px-2 my-2"
>
<strong>{{ getDate(item.date) }}: {{ th(item.title) }}</strong>
<!-- eslint-disable-next-line vue/no-v-html -->
<div v-html="th(item.body)"></div>
</article>
</div>
Expand Down
9 changes: 4 additions & 5 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ select {
@apply text-red-600;
}
[data-type="radio"] .formkit-inner,
[data-type="checkbox"] .formkit-inner
{
[data-type="checkbox"] .formkit-inner {
@apply inline-block mr-2;
}
[data-type="radio"] .formkit-legend {
Expand Down Expand Up @@ -115,7 +114,8 @@ select {
@apply bg-amber-300 shadow-amber-600 text-amber-900;
}

.mink-button[disabled], .mink-button.disabled {
.mink-button[disabled],
.mink-button.disabled {
@apply bg-slate-100 shadow text-slate-400 cursor-not-allowed hover:drop-shadow-none hover:brightness-100 !important;
@apply dark:bg-slate-600 dark:text-gray-400 !important;
}
Expand All @@ -126,9 +126,8 @@ select {
.button-mute:not(:hover) {
@apply !bg-transparent !text-inherit;
}

.button-slim {
@apply p-0 px-1;
}

}

0 comments on commit 8937032

Please sign in to comment.