diff --git a/.eslintrc.json b/.eslintrc.json
index ded4bc92..4a9dfcb4 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,32 +3,21 @@
"browser": true,
"es2021": true
},
- "extends": [
- "eslint:recommended",
- "plugin:@typescript-eslint/recommended",
- "plugin:react/recommended"
- ],
+ "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:react/recommended", "prettier"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
- "plugins": [
- "@typescript-eslint",
- "react"
- ],
+ "plugins": ["@typescript-eslint", "react", "prettier"],
"rules": {
- "quotes": [
- "warn",
- "single"
- ],
- "semi": [
- "error",
- "always"
- ],
- "object-curly-spacing": [
- "error",
- "always"
- ]
+ "quotes": ["error", "single", { "avoidEscape": true }],
+ "semi": ["error", "always"],
+ "object-curly-spacing": ["error", "always"]
+ },
+ "settings": {
+ "react": {
+ "version": "detect"
+ }
}
}
diff --git a/.github/workflows/azure-static-web-apps-brave-flower-021735410.yml b/.github/workflows/azure-static-web-apps-brave-flower-021735410.yml
index fa3057dd..412542ec 100644
--- a/.github/workflows/azure-static-web-apps-brave-flower-021735410.yml
+++ b/.github/workflows/azure-static-web-apps-brave-flower-021735410.yml
@@ -1,47 +1,47 @@
name: Azure Static Web Apps CI/CD
on:
- push:
- branches:
- - master
- pull_request:
- types: [opened, synchronize, reopened, closed]
- branches:
- - master
+ push:
+ branches:
+ - master
+ pull_request:
+ types: [opened, synchronize, reopened, closed]
+ branches:
+ - master
jobs:
- build_and_deploy_job:
- if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
- runs-on: ubuntu-latest
- env:
- CI: false
- name: Build and Deploy Job
- steps:
- - uses: actions/checkout@v3
- with:
- submodules: true
- - name: Build And Deploy
- id: builddeploy
- uses: Azure/static-web-apps-deploy@v1
- with:
- azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_FLOWER_021735410 }}
- repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
- action: "upload"
- ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
- # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
- app_location: "/" # App source code path
- api_location: "" # Api source code path - optional
- output_location: "dist" # Built app content directory - optional
- ###### End of Repository/Build Configurations ######
+ build_and_deploy_job:
+ if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+ runs-on: ubuntu-latest
+ env:
+ CI: false
+ name: Build and Deploy Job
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: true
+ - name: Build And Deploy
+ id: builddeploy
+ uses: Azure/static-web-apps-deploy@v1
+ with:
+ azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_FLOWER_021735410 }}
+ repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+ action: 'upload'
+ ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+ # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+ app_location: '/' # App source code path
+ api_location: '' # Api source code path - optional
+ output_location: 'dist' # Built app content directory - optional
+ ###### End of Repository/Build Configurations ######
- close_pull_request_job:
- if: github.event_name == 'pull_request' && github.event.action == 'closed'
- runs-on: ubuntu-latest
- name: Close Pull Request Job
- steps:
- - name: Close Pull Request
- id: closepullrequest
- uses: Azure/static-web-apps-deploy@v1
- with:
- azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_FLOWER_021735410 }}
- action: "close"
+ close_pull_request_job:
+ if: github.event_name == 'pull_request' && github.event.action == 'closed'
+ runs-on: ubuntu-latest
+ name: Close Pull Request Job
+ steps:
+ - name: Close Pull Request
+ id: closepullrequest
+ uses: Azure/static-web-apps-deploy@v1
+ with:
+ azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BRAVE_FLOWER_021735410 }}
+ action: 'close'
diff --git a/.prettierrc.json b/.prettierrc.json
index 2eb86a0f..38d7c5f2 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,12 +1,12 @@
{
- "tabWidth": 4,
- "useTabs": false,
- "singleQuote": true,
- "semi": true,
- "bracketSpacing": true,
- "arrowParens": "avoid",
- "trailingComma": "es5",
- "bracketSameLine": true,
- "printWidth": 120,
- "endOfLine": "auto"
+ "tabWidth": 4,
+ "useTabs": false,
+ "singleQuote": true,
+ "semi": true,
+ "bracketSpacing": true,
+ "arrowParens": "avoid",
+ "trailingComma": "es5",
+ "bracketSameLine": true,
+ "printWidth": 120,
+ "endOfLine": "auto"
}
diff --git a/index.html b/index.html
index 098922a7..a7134c52 100644
--- a/index.html
+++ b/index.html
@@ -1,30 +1,29 @@
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
- Tacticus Planner
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+