From ebc4c938ff897d4a9a5e08ed00bd4ded2ab5a74b Mon Sep 17 00:00:00 2001 From: Troplo Date: Wed, 7 Apr 2021 23:08:04 +1000 Subject: [PATCH] commit --- .eslintrc.js | 10 + .gitignore | 7 + assets/css/sidebar.css | 3 - package.json | 2 +- src/App.vue | 4 +- {assets => src/assets}/css/kaverti.css | 11 + src/assets/css/sidebar.css | 3 + {assets => src/assets}/js/errorHandler.js | 0 {assets => src/assets}/js/linkExpander.js | 0 {assets => src/assets}/scss/buefy.scss | 0 src/components/Badges.vue | 2 +- src/components/Footer.vue | 2 +- src/components/Navbar.vue | 4 +- src/router/index.js | 2 +- src/views/AdminCreateItem.vue | 2 +- src/views/Avatar.vue | 2 +- src/views/ForumThread.vue | 2 +- src/views/Forums.vue | 16 +- src/views/Friends.vue | 2 +- src/views/Home.vue | 12 +- src/views/Marketplace.vue | 2 +- src/views/MarketplaceItem.vue | 2 +- src/views/Teams.vue | 213 +- src/views/Transaction.vue | 2 +- src/views/User.vue | 2 +- src/views/UserAwards.vue | 2 +- src/views/UserFriends.vue | 2 +- src/views/UserInventory.vue | 2 +- src/views/UserPosts.vue | 2 +- src/views/Users.vue | 2 +- yarn.lock | 12136 ++++++++++++++++++++ 31 files changed, 12320 insertions(+), 133 deletions(-) create mode 100644 .eslintrc.js delete mode 100644 assets/css/sidebar.css rename {assets => src/assets}/css/kaverti.css (57%) rename {assets => src/assets}/js/errorHandler.js (100%) rename {assets => src/assets}/js/linkExpander.js (100%) rename {assets => src/assets}/scss/buefy.scss (100%) create mode 100644 yarn.lock diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..3620975 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,10 @@ +module.exports = { + "rules": { + "no-mixed-spaces-and-tabs": 0, + }, + "parserOptions": { + "sourceType": "module", + "parser": "babel-eslint", + "ecmaVersion": 6 + }, +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 403adbc..25e65c3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,10 @@ pnpm-debug.log* *.njsproj *.sln *.sw? + +# MetadataService files +*.lmetadata +*.metadata + +# Yarn and NPM +.yarn \ No newline at end of file diff --git a/assets/css/sidebar.css b/assets/css/sidebar.css deleted file mode 100644 index 6a17c9a..0000000 --- a/assets/css/sidebar.css +++ /dev/null @@ -1,3 +0,0 @@ -/* -Soon - */ \ No newline at end of file diff --git a/package.json b/package.json index faca069..6c863c5 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "crypto-random-string": "^3.3.0", "dotenv-webpack": "^6.0.0", "lodash.throttle": "^4.1.1", + "moment": "^2.29.1", "nprogress": "^0.2.0", "socket.io": "^3.1.0", "tiptap": "^1.32.0", @@ -36,7 +37,6 @@ "devDependencies": { "@intlify/vue-i18n-loader": "^1.0.0", "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", diff --git a/src/App.vue b/src/App.vue index 2d08517..8152c64 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,7 +7,9 @@