From 0670730d86faaebee3a6731fd8e9f11c941282da Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Sun, 12 Dec 2021 14:58:09 -0500 Subject: [PATCH 1/9] .gitignore & Website README updated --- .gitignore | 27 ++++++++++++++++++++++----- Website/README.md | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1a0c019..a8cad72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,29 @@ -*.idea -*Backend *cert +*Backend .DS_Store -StaticSite/.editorconfig -StaticSite/package-lock.json +# Website node modules and build output +Website/package-lock.json +Website/.editorconfig Website/node_modules Website/.nuxt -Website/.editorconfig Website/dist/ Website/_nuxt + +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw* \ No newline at end of file diff --git a/Website/README.md b/Website/README.md index 552c817..f03bc2c 100644 --- a/Website/README.md +++ b/Website/README.md @@ -9,6 +9,9 @@ $ npm install # serve with hot reload at localhost:3000 $ npm run dev +# lint your changes +$ npm run lint + # build for production and launch server $ npm run build $ npm run start @@ -19,6 +22,19 @@ $ npm run generate For detailed explanation on how things work, check out the [documentation](https://nuxtjs.org). +## Recommended VSCode Setup + - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) `ext install dbaeumer.vscode-eslint` + - [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) `ext install esbenp.prettier-vscode` + - [Vetur](https://marketplace.visualstudio.com/items?itemName=octref.vetur) + +>`Ctrl(Cmd)` + `Shift` + `P` > Open Settings (JSON) +``` +"[vue]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" +}, +"editor.formatOnSave": true, +``` + ## Special Directories You can create the following extra directories, some of which have special behaviors. Only `pages` is required; you can delete them if you don't want to use their functionality. From 896373d998a771c35987c3c1fdd62545135fead3 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Sun, 12 Dec 2021 16:51:44 -0500 Subject: [PATCH 2/9] ios overscroll fix --- Website/.eslintrc.js | 28 ++++++++++++++++++++++++++++ Website/layouts/default.vue | 1 + 2 files changed, 29 insertions(+) create mode 100644 Website/.eslintrc.js diff --git a/Website/.eslintrc.js b/Website/.eslintrc.js new file mode 100644 index 0000000..628cbea --- /dev/null +++ b/Website/.eslintrc.js @@ -0,0 +1,28 @@ +module.exports = { + root: true, + + env: { + browser: true, + node: true, + }, + + parserOptions: { + parser: '@babel/eslint-parser', + requireConfigFile: false, + ecmaVersion: 2020 + }, + extends: [ + 'plugin:vue/essential', + 'plugin:nuxt/recommended', + 'plugin:prettier/recommended', + 'eslint:recommended', // + '@vue/prettier', + 'prettier', + '@nuxtjs', + ], + rules: { + 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + }, + +} diff --git a/Website/layouts/default.vue b/Website/layouts/default.vue index 04f9086..90436be 100644 --- a/Website/layouts/default.vue +++ b/Website/layouts/default.vue @@ -27,6 +27,7 @@ - - \ No newline at end of file diff --git a/Website/layouts/error.vue b/Website/layouts/error.vue index ae22f7c..d99a426 100644 --- a/Website/layouts/error.vue +++ b/Website/layouts/error.vue @@ -6,35 +6,33 @@

{{ otherError }}

- - Home page - + Home page - - diff --git a/Website/pages/install.vue b/Website/pages/install.vue index 6215111..ba84b06 100644 --- a/Website/pages/install.vue +++ b/Website/pages/install.vue @@ -1,79 +1,102 @@ diff --git a/Website/pages/links.vue b/Website/pages/links.vue index 16c1f34..35df9ed 100644 --- a/Website/pages/links.vue +++ b/Website/pages/links.vue @@ -1,61 +1,67 @@ - - + + diff --git a/Website/pages/pay/crypto.vue b/Website/pages/pay/crypto.vue index c944c11..b450588 100644 --- a/Website/pages/pay/crypto.vue +++ b/Website/pages/pay/crypto.vue @@ -1,27 +1,15 @@