Skip to content

Commit

Permalink
Merge pull request #27 from Lenni009/dev
Browse files Browse the repository at this point in the history
add dependabot; format files
  • Loading branch information
Lenni009 authored Jan 22, 2024
2 parents 20ee1cb + 9184c9a commit 1996aaf
Show file tree
Hide file tree
Showing 20 changed files with 793 additions and 807 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
18 changes: 18 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: 'npm' # See documentation for possible values
directory: '/' # Location of package manifests
target-branch: 'dev'
schedule:
interval: 'weekly'

- package-ecosystem: 'github-actions'
directory: '/'
target-branch: 'dev'
schedule:
interval: 'weekly'
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout 🛎️
- name: Checkout Repo
uses: actions/checkout@v4

- name: Build
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Test Build
run-name: Test Build

on:
pull_request:
types: [opened, synchronize]

concurrency:
group: "testbuild"
cancel-in-progress: true

jobs:
Build:
runs-on: ubuntu-latest

permissions:
pull-requests: write
contents: write

steps:
- name: Checkout Repo
uses: actions/checkout@v4

- name: Test Build
uses: Lenni009/test-build-vite-action@main
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@ pnpm-debug.log*
lerna-debug.log*

node_modules
.DS_Store
dist
dist-ssr
coverage
*.local

/cypress/videos/
/cypress/screenshots/

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dist
14 changes: 14 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"singleQuote": true,
"semi": true,
"trailingComma": "es5",
"tabWidth": 2,
"printWidth": 120,
"arrowParens": "always",
"bracketSpacing": true,
"endOfLine": "lf",
"htmlWhitespaceSensitivity": "css",
"useTabs": false,
"vueIndentScriptAndStyle": false,
"singleAttributePerLine": true
}
119 changes: 70 additions & 49 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,52 +1,73 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>BaseReorder</title>
<script
src="./src/main.ts"
type="module"
></script>
</head>

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>BaseReorder</title>
<script src="./src/main.ts" type="module"></script>
</head>

<body>
<div class="container">
<nav>
<a href=".." title="Other pages">&larr; View other pages</a>
</nav>
<main>
<h1 class="title is-3">BaseReorder</h1>
<section id="input">
<div class="columns">
<div class="column is-four-fifths ">
<label for="JSONinput">Copy your PersistentPlayerBases JSON section here:</label>
<textarea id="JSONinput"></textarea>
</div>
<div id="checkboxes" class="column">
<label>
<input type="checkbox" name="Settlement" id="settlementCheckbox" value="Settlement">
Settlement?
</label>
</div>
</div>
<p id="warn"></p>
</section>
<hr>
<section id="output">
<div>
<div class="columns">
<div class="column is-3">
<button class="button is-primary is-outlined" id="copy">Copy modified JSON</button>
</div>
</div>
</div>
<div class="columns is-desktop">
<div class="column is-full-mobile">
<div id="bases"></div>
</div>
</div>
</section>
</main>
</div>
</body>

</html>
<body>
<div class="container">
<nav>
<a
href=".."
title="Other pages"
>&larr; View other pages</a
>
</nav>
<main>
<h1 class="title is-3">BaseReorder</h1>
<section id="input">
<div class="columns">
<div class="column is-four-fifths">
<label for="JSONinput">Copy your PersistentPlayerBases JSON section here:</label>
<textarea id="JSONinput"></textarea>
</div>
<div
id="checkboxes"
class="column"
>
<label>
<input
type="checkbox"
name="Settlement"
id="settlementCheckbox"
value="Settlement"
/>
Settlement?
</label>
</div>
</div>
<p id="warn"></p>
</section>
<hr />
<section id="output">
<div>
<div class="columns">
<div class="column is-3">
<button
class="button is-primary is-outlined"
id="copy"
>
Copy modified JSON
</button>
</div>
</div>
</div>
<div class="columns is-desktop">
<div class="column is-full-mobile">
<div id="bases"></div>
</div>
</div>
</section>
</main>
</div>
</body>
</html>
Loading

0 comments on commit 1996aaf

Please sign in to comment.