Skip to content

Commit

Permalink
Merge pull request #2 from whilesmart/testing-jobs
Browse files Browse the repository at this point in the history
minor change in the app.vue file this commit is mainly to test jobs f…
  • Loading branch information
Flovet-stack authored Jul 20, 2024
2 parents 81f13b8 + c14ad38 commit 65818c8
Show file tree
Hide file tree
Showing 10 changed files with 204 additions and 94 deletions.
21 changes: 21 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/* eslint-env node */
require('@rushstack/eslint-patch/modern-module-resolution');

module.exports = {
root: true,
extends: [
'plugin:vue/vue3-essential',
'eslint:recommended',
'@vue/eslint-config-prettier/skip-formatting'
],
parserOptions: {
ecmaVersion: 'latest'
},
plugins: ['prettier'],
rules: {
'prettier/prettier': 'error'
},
env: {
node: true
}
};
18 changes: 0 additions & 18 deletions .eslintrc.js

This file was deleted.

52 changes: 52 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Lint

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
lint-and-format:
name: Lint and format
runs-on: ubuntu-latest

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '18'

- name: Install dependencies
run: npm ci

- name: Run linters
run: npm run lint

- name: Run format check
run: npm run format:check

build:
name: Build
runs-on: ubuntu-latest
needs: lint-and-format

steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '18'

- name: Install dependencies
run: npm ci

- name: Build project
run: npm run build
14 changes: 7 additions & 7 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://json.schemastore.org/prettierrc",
"semi": true,
"tabWidth": 2,
"singleQuote": true,
"printWidth": 100,
"trailingComma": "none"
}
"$schema": "https://json.schemastore.org/prettierrc",
"semi": true,
"tabWidth": 2,
"singleQuote": true,
"printWidth": 100,
"trailingComma": "none"
}
2 changes: 1 addition & 1 deletion app.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<h1>Trakli v1.00</h1>
<h1>Trakli v1.0</h1>
</div>
</template>
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
# Maps the port 3000 of the container to the port 3000 of the host machine so that you can access the app from your browser
# Check ./package.json for more information
ports:
- "3000:3000"
- '3000:3000'
# Mounts the current directory (.) on the host machine to /usr/src/app in the container
volumes:
- ./:/usr/src/app
Expand All @@ -17,4 +17,4 @@ services:
tty: true
# Adds an extra host for docker-compose to access the host machine
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
60 changes: 0 additions & 60 deletions github/workflows/checks.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
compatibilityDate: "2024-04-03",
compatibilityDate: '2024-04-03',
devtools: { enabled: true },
modules: ["@nuxtjs/tailwindcss"],
});
modules: ['@nuxtjs/tailwindcss']
});
112 changes: 112 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,24 @@
"postinstall": "nuxt prepare",
"start": "nuxt start",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore",
"format:check": "prettier --check src/",
"format:fix": "prettier --write src/"
"format:check": "prettier --check ./",
"format:fix": "prettier --write ./"
},
"dependencies": {
"@nuxtjs/tailwindcss": "^6.12.1",
"nuxt": "^3.12.4",
"vue": "latest"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.10.3",
"@vue/eslint-config-prettier": "^9.0.0",
"eslint": "^8.57.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.27.0",
"prettier": "^3.3.3",
"sass": "^1.77.8"
}
}
}

0 comments on commit 65818c8

Please sign in to comment.