Skip to content

Commit

Permalink
style: 🚨 fixed automatic fixable lint warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
miggi92 authored Feb 24, 2024
1 parent 0ea0519 commit e3eeefd
Show file tree
Hide file tree
Showing 48 changed files with 673 additions and 682 deletions.
12 changes: 6 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: npm
directory: /
schedule:
interval: "weekly"
interval: weekly
open-pull-requests-limit: 10
target-branch: "master"
target-branch: master
commit-message:
prefix: "chore(deps):"
prefix: 'chore(deps):'
labels:
- "dependencies"
- dependencies
2 changes: 1 addition & 1 deletion .github/workflows/dependabot_automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
id: metadata
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
github-token: '${{ secrets.GITHUB_TOKEN }}'
skip-commit-verification: true

- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy2pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: "20"
node-version: '20'
# Pick your own package manager and build script
- run: pnpm install
- run: pnpm run build --preset=github_pages
Expand Down
18 changes: 9 additions & 9 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"recommendations": [
"antfu.iconify",
"nuxt.mdc",
"bradlc.vscode-tailwindcss",
"vue.volar",
"vue.vscode-typescript-vue-plugin",
"lukas-tr.materialdesignicons-intellisense"
]
}
"recommendations": [
"antfu.iconify",
"nuxt.mdc",
"bradlc.vscode-tailwindcss",
"vue.volar",
"vue.vscode-typescript-vue-plugin",
"lukas-tr.materialdesignicons-intellisense"
]
}
103 changes: 51 additions & 52 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,55 +1,54 @@
{
"files.associations": {
"*.css": "tailwindcss"
},
"editor.quickSuggestions": {
"strings": true
},
"files.associations": {
"*.css": "tailwindcss"
},
"editor.quickSuggestions": {
"strings": true
},
"tailwindCSS.experimental.configFile": "tailwind.config.ts",
"tailwindCSS.experimental.classRegex": [
["ui:\\s*{([^)]*)\\s*}", "[\"'`]([^\"'`]*).*?[\"'`]"],
["/\\*ui\\*/\\s*{([^;]*)}", ":\\s*[\"'`]([^\"'`]*).*?[\"'`]"]
],
// Enable the ESlint flat config support
"eslint.experimental.useFlatConfig": true,
// Disable the default formatter, use eslint instead
"prettier.enable": false,
"editor.formatOnSave": false,
// Auto fix
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
},
// Silent the stylistic rules in you IDE, but still auto fix them
"eslint.rules.customizations": [
{ "rule": "style/*", "severity": "off" },
{ "rule": "format/*", "severity": "off" },
{ "rule": "*-indent", "severity": "off" },
{ "rule": "*-spacing", "severity": "off" },
{ "rule": "*-spaces", "severity": "off" },
{ "rule": "*-order", "severity": "off" },
{ "rule": "*-dangle", "severity": "off" },
{ "rule": "*-newline", "severity": "off" },
{ "rule": "*quotes", "severity": "off" },
{ "rule": "*semi", "severity": "off" }
],
// Enable eslint for all supported languages
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"vue",
"html",
"markdown",
"json",
"jsonc",
"yaml",
"toml"
]
"tailwindCSS.experimental.classRegex": [
["ui:\\s*{([^)]*)\\s*}", "[\"'`]([^\"'`]*).*?[\"'`]"],
["/\\*ui\\*/\\s*{([^;]*)}", ":\\s*[\"'`]([^\"'`]*).*?[\"'`]"]
],
// Enable the ESlint flat config support
"eslint.experimental.useFlatConfig": true,

// Disable the default formatter, use eslint instead
"prettier.enable": false,
"editor.formatOnSave": false,

// Auto fix
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
},

// Silent the stylistic rules in you IDE, but still auto fix them
"eslint.rules.customizations": [
{ "rule": "style/*", "severity": "off" },
{ "rule": "format/*", "severity": "off" },
{ "rule": "*-indent", "severity": "off" },
{ "rule": "*-spacing", "severity": "off" },
{ "rule": "*-spaces", "severity": "off" },
{ "rule": "*-order", "severity": "off" },
{ "rule": "*-dangle", "severity": "off" },
{ "rule": "*-newline", "severity": "off" },
{ "rule": "*quotes", "severity": "off" },
{ "rule": "*semi", "severity": "off" }
],

// Enable eslint for all supported languages
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"vue",
"html",
"markdown",
"json",
"jsonc",
"yaml",
"toml"
]
}

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@

## License
The whole license can be seen in the [LICENSE](./LICENSE) file.

19 changes: 9 additions & 10 deletions app.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
export default defineAppConfig({
ui: {
primary: 'sky',
gray: 'cool',
notifications: {
// Show toasts at the top right of the screen
position: 'top-50 bottom-auto'
},
}
})

ui: {
primary: 'sky',
gray: 'cool',
notifications: {
// Show toasts at the top right of the screen
position: 'top-50 bottom-auto',
},
},
})
29 changes: 14 additions & 15 deletions components/app/Footer.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<script setup>
const links = [{
label: 'About',
icon: 'i-mdi-book-open',
to: '/about'
label: 'About',
icon: 'i-mdi-book-open',
to: '/about',
}, {
label: 'Imprint',
icon: 'i-mdi-information',
to: '/imprint'
label: 'Imprint',
icon: 'i-mdi-information',
to: '/imprint',
}]
</script>

<template>
<UFooter :links="links">
<template #left>
Copyright © 2023 - {{ new Date().getFullYear() }}
</template>
<UFooter :links="links">
<template #left>
Copyright © 2023 - {{ new Date().getFullYear() }}
</template>

<template #right>
<UButton icon="i-mdi-github" color="gray" variant="ghost" to="https://github.com/miggi92" target="_blank" />
</template>
</UFooter>
<template #right>
<UButton icon="i-mdi-github" color="gray" variant="ghost" to="https://github.com/miggi92" target="_blank" />
</template>
</UFooter>
</template>

112 changes: 56 additions & 56 deletions components/app/Header.vue
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
<template>
<UHeader :links="links">
<template #logo>
<appLogo class="w-auto h-12" />
</template>

<template #center>
<div v-if="user">
<UHeaderLinks :links="loggedLinks" />
</div>
<div v-else>
<UHeaderLinks :links="links" />
</div>
</template>

<template #right>
<UColorModeButton />
<UPopover v-if="user">
<userAvatar />
<template #panel>
<UVerticalNavigation :links="userLinks" />
</template>
</UPopover>
</template>

<template #panel>
<UAsideLinks :links="loggedLinks" v-if="user" />
<UAsideLinks :links="links" v-else />
</template>
</UHeader>
</template>

<script setup lang="ts">
const user = useSupabaseUser()
const allLinks = [{
label: 'Home',
icon: 'i-mdi-home',
to: '/'
label: 'Home',
icon: 'i-mdi-home',
to: '/',
}]
const loggedLinks = [...allLinks, {
label: 'Games',
icon: 'i-mdi-gamepad-variant',
to: '/games'
label: 'Games',
icon: 'i-mdi-gamepad-variant',
to: '/games',
}, {
label: 'Teams',
icon: 'i-mdi-account-group',
to: '/teams'
}];
label: 'Teams',
icon: 'i-mdi-account-group',
to: '/teams',
}]
const links = [...allLinks, {
label: 'Prices',
icon: 'i-mdi-currency-eur',
to: '/prices'
label: 'Prices',
icon: 'i-mdi-currency-eur',
to: '/prices',
}, {
label: 'Login',
icon: 'i-mdi-account',
to: '/login'
}];
label: 'Login',
icon: 'i-mdi-account',
to: '/login',
}]
const userLinks = [{
label: 'Profile',
icon: 'i-mdi-account',
to: '/profile'
label: 'Profile',
icon: 'i-mdi-account',
to: '/profile',
}, {
label: 'Logout',
icon: 'i-mdi-logout',
to: '/logout'
label: 'Logout',
icon: 'i-mdi-logout',
to: '/logout',
}]
</script>
</script>

<template>
<UHeader :links="links">
<template #logo>
<appLogo class="w-auto h-12" />
</template>

<template #center>
<div v-if="user">
<UHeaderLinks :links="loggedLinks" />
</div>
<div v-else>
<UHeaderLinks :links="links" />
</div>
</template>

<template #right>
<UColorModeButton />
<UPopover v-if="user">
<userAvatar />
<template #panel>
<UVerticalNavigation :links="userLinks" />
</template>
</UPopover>
</template>

<template #panel>
<UAsideLinks v-if="user" :links="loggedLinks" />
<UAsideLinks v-else :links="links" />
</template>
</UHeader>
</template>
4 changes: 2 additions & 2 deletions components/app/Logo.vue
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<template>
<NuxtImg src="/logo.png" alt="HaStE Logo" />
</template>
<NuxtImg src="/logo.png" alt="HaStE Logo" />
</template>
Loading

0 comments on commit e3eeefd

Please sign in to comment.