diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000..66e2335 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,8 @@ +{ + "$schema": "https://json.schemastore.org/prettierrc", + "semi": false, + "tabWidth": 2, + "singleQuote": true, + "printWidth": 100, + "trailingComma": "none" +} \ No newline at end of file diff --git a/index.html b/index.html index 9ac852d..5b96f24 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,13 @@ - - - + + + Stardew Community Checklist
- + diff --git a/package.json b/package.json index 0606f90..b636316 100644 --- a/package.json +++ b/package.json @@ -10,18 +10,18 @@ "lint": "eslint . --ext .js,.vue" }, "dependencies": { - "@fortawesome/fontawesome": "^1.1.4", - "@fortawesome/fontawesome-free-brands": "^5.0.7", - "@fortawesome/fontawesome-free-regular": "^5.0.7", - "@fortawesome/fontawesome-free-solid": "^5.0.7", - "@fortawesome/vue-fontawesome": "^0.0.22", - "bulma": "^0.6.2", + "@fortawesome/fontawesome-free-brands": "^5.0.13", + "@fortawesome/fontawesome-free-regular": "^5.0.13", + "@fortawesome/fontawesome-free-solid": "^5.0.13", + "@fortawesome/fontawesome-svg-core": "^6.4.0", + "@fortawesome/vue-fontawesome": "^3.0.3", + "bulma": "^0.9.4", "lodash": "^4.17.19", "mdi-vue": "^0.2.11", "sass": "^1.62.1", - "vue": "^2.5.2", + "vue": "^3.3.4", "vue-clipboard2": "^0.3.0", - "vue-router": "^3.0.1", + "vue-router": "^4.2.2", "vuex": "^3.0.1", "vuex-persistedstate": "^2.5.4" }, @@ -29,7 +29,6 @@ "@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue-jsx": "^3.0.1", "autoprefixer": "^7.1.2", - "chalk": "^2.0.1", "eslint": "^4.18.2", "eslint-config-standard": "^10.2.1", "eslint-friendly-formatter": "^3.0.0", @@ -44,8 +43,7 @@ "rimraf": "^2.6.0", "semver": "^5.3.0", "shelljs": "^0.7.6", - "vite": "^4.3.5", - "vue-template-compiler": "^2.5.2" + "vite": "^4.3.5" }, "engines": { "node": ">= 6.0.0", diff --git a/src/App.vue b/src/App.vue index 4a00e4e..700199c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,24 +1,14 @@ - - - diff --git a/src/assets/main.css b/src/assets/main.css new file mode 100644 index 0000000..b9f08eb --- /dev/null +++ b/src/assets/main.css @@ -0,0 +1 @@ +@import "~bulma/bulma"; diff --git a/src/assets/sass/main.scss b/src/assets/sass/main.scss deleted file mode 100644 index f110444..0000000 --- a/src/assets/sass/main.scss +++ /dev/null @@ -1 +0,0 @@ -@import '~bulma/bulma'; diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue index 7946439..caed706 100644 --- a/src/components/AppFooter.vue +++ b/src/components/AppFooter.vue @@ -1,33 +1,37 @@ - + diff --git a/src/components/ButtonCheckbox.vue b/src/components/ButtonCheckbox.vue index 5d36241..e00d160 100644 --- a/src/components/ButtonCheckbox.vue +++ b/src/components/ButtonCheckbox.vue @@ -1,9 +1,10 @@ @@ -33,7 +34,7 @@ export default { } }, computed: { - shouldBeChecked () { + shouldBeChecked() { if (this.checked instanceof Array) { return this.checked.includes(this.value) } @@ -42,7 +43,7 @@ export default { } }, methods: { - updateInput () { + updateInput() { if (this.checked instanceof Array) { let newValue = [...this.checked] @@ -61,6 +62,4 @@ export default { } - + diff --git a/src/components/HeaderBar.vue b/src/components/HeaderBar.vue index e8b9871..1bc71e7 100644 --- a/src/components/HeaderBar.vue +++ b/src/components/HeaderBar.vue @@ -1,36 +1,39 @@ @@ -44,11 +47,10 @@ export default { }, computed: { named_routes: function () { - return this.$router.options.routes.filter(route => route.hasOwnProperty('name')) + return this.$router.options.routes.filter((route) => route.hasOwnProperty('name')) } } } - + diff --git a/src/components/New.vue b/src/components/New.vue index 845caeb..d21d6c6 100644 --- a/src/components/New.vue +++ b/src/components/New.vue @@ -1,56 +1,64 @@ diff --git a/src/components/Settings.vue b/src/components/Settings.vue index 0af4f28..484768f 100644 --- a/src/components/Settings.vue +++ b/src/components/Settings.vue @@ -2,53 +2,43 @@
-

- Settings -

+

Settings

-

- Spoilers and Displayed Items -

+

Spoilers and Displayed Items

- - Hide Completed - + Hide Completed

Hides items that have been turned in to the community center.

- - Hide Spoilers - + Hide Spoilers

Hides things that are considered spoilers, as defined below.

- +
@@ -57,36 +47,29 @@
-

- Compact View -

+

Compact View

- Enable a more compact table view instead of the card view. - Note that this may result in horizontal scrolling on smaller (phone-sized) devices. - The card view is recommended for those. + Enable a more compact table view instead of the card view. Note that this may result in + horizontal scrolling on smaller (phone-sized) devices. The card view is recommended for + those.

- - Use Compact View - + Use Compact View

Enables a compact tabular view for item information.

-

- Import and Export Saved Data -

+

Import and Export Saved Data

- Use these controls to port data to another device. - Copy the data string from the Export field on the source device and paste it into the Import field - on the target device. + Use these controls to port data to another device. Copy the data string from the Export + field on the source device and paste it into the Import field on the target device.

- +
@@ -136,7 +124,7 @@ - + diff --git a/src/components/SkillIcon.vue b/src/components/SkillIcon.vue index 6e82329..76fd3ca 100644 --- a/src/components/SkillIcon.vue +++ b/src/components/SkillIcon.vue @@ -1,10 +1,10 @@ @@ -39,22 +39,22 @@ export default { diff --git a/src/components/Welcome.vue b/src/components/Welcome.vue index c9d3dcd..632301d 100644 --- a/src/components/Welcome.vue +++ b/src/components/Welcome.vue @@ -2,12 +2,8 @@
-

- Stardew Community Checklist -

-

- Track Your Progress on the Community Center! -

+

Stardew Community Checklist

+

Track Your Progress on the Community Center!

@@ -15,17 +11,17 @@ - + diff --git a/src/components/bundles/BundleItems.vue b/src/components/bundles/BundleItems.vue index a3a7e7a..171a421 100644 --- a/src/components/bundles/BundleItems.vue +++ b/src/components/bundles/BundleItems.vue @@ -1,40 +1,57 @@ diff --git a/src/components/bundles/Bundles.vue b/src/components/bundles/Bundles.vue index 85703f3..0bcd857 100644 --- a/src/components/bundles/Bundles.vue +++ b/src/components/bundles/Bundles.vue @@ -2,10 +2,7 @@
- +
@@ -15,7 +12,7 @@ diff --git a/src/components/changelog/ChangeLog.vue b/src/components/changelog/ChangeLog.vue index da905e6..d4fc2e2 100644 --- a/src/components/changelog/ChangeLog.vue +++ b/src/components/changelog/ChangeLog.vue @@ -1,10 +1,8 @@ @@ -17,7 +15,7 @@ export default { components: { Version }, - data () { + data() { return { changelog: ChangeLogJson } @@ -25,6 +23,4 @@ export default { } - + diff --git a/src/components/changelog/Version.vue b/src/components/changelog/Version.vue index 1008c0d..eb83f67 100644 --- a/src/components/changelog/Version.vue +++ b/src/components/changelog/Version.vue @@ -2,26 +2,24 @@

- {{version.id}} + {{ version.id }}

  • - {{change}} + {{ change }}