Skip to content

Commit

Permalink
Merge pull request #15 from ortwic/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ortwic authored Jul 11, 2023
2 parents 589190d + e70787b commit 8eb93b6
Show file tree
Hide file tree
Showing 52 changed files with 1,913 additions and 894 deletions.
13 changes: 13 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": "standard-with-typescript",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
}
}
1 change: 1 addition & 0 deletions .github/workflows/check-built-on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ jobs:
run: |
npm i -g pnpm
pnpm install
pnpm test:unit
pnpm build
14 changes: 10 additions & 4 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: npm i -g pnpm
- run: pnpm install
- run: pnpm build
- uses: FirebaseExtended/action-hosting-deploy@v0

- name: Install and Build
run: |
npm i -g pnpm
pnpm install
pnpm test:unit
pnpm build
- name: Deploy on firebase
uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_SONG_REPO }}'
Expand Down
Binary file added .prettierignore
Binary file not shown.
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"tabWidth": 4,
"semi": true,
"singleQuote": true,
"trailingComma": "es5",
"plugins": ["prettier-plugin-svelte"]
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="icon" type="image/png" href="/logo-192.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="Your tool to keep an overview of your song repertoire.">
<meta name="theme-color" content="#109392">
<meta name="theme-color" content="#A71908">
<!-- Material Icons -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<!-- Roboto -->
Expand Down
14 changes: 12 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"scripts": {
"preinstall": "npx only-allow pnpm",
"dev": "vite",
"fix": "pnpm exec eslint --fix \"{,!(node_modules|public)/**/}*.{ts,svelte}\"",
"format": "pnpm exec prettier --write \"{,!(node_modules|public)/**/}*.{ts,svelte}\"",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-check --tsconfig ./tsconfig.json",
Expand All @@ -21,20 +23,28 @@
"@types/lodash": "^4.14.192",
"@types/marked": "^5.0.0",
"@types/tabulator-tables": "^5.4.6",
"@typescript-eslint/eslint-plugin": "^5.50.0",
"@vitest/coverage-v8": "^0.32.2",
"color": "^4.2.3",
"eslint": "^8.44.0",
"eslint-config-standard-with-typescript": "^36.0.0",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-svelte3": "^4.0.0",
"firebase": "^9.18.0",
"jsdom": "^22.1.0",
"lodash": "^4.17.21",
"marked": "^5.1.1",
"nanoid": "^4.0.2",
"prettier": "^3.0.0",
"prettier-plugin-svelte": "^2.10.1",
"rxfire": "^6.0.3",
"rxjs": "^7.8.0",
"svelte": "^3.57.0",
"svelte-check": "^2.10.3",
"tabulator-tables": "^5.5.0",
"tslib": "^2.5.0",
"typescript": "^4.9.3",
"typescript": "^4.9.5",
"vite": "^4.2.0",
"vite-plugin-pwa": "^0.15.1",
"vitest": "^0.32.2"
Expand Down
Loading

0 comments on commit 8eb93b6

Please sign in to comment.