Skip to content

Commit

Permalink
Merge branch 'dev' into feature/notes-with-mentions
Browse files Browse the repository at this point in the history
  • Loading branch information
SpacialCircumstances committed Mar 24, 2024
2 parents af9eb8b + 48bbfbe commit cc2f1a0
Show file tree
Hide file tree
Showing 128 changed files with 14,440 additions and 27,955 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
node_modules
dist
build

# global env files
.env
Expand All @@ -17,6 +18,7 @@ yarn-error.log*
# Editor directories and files
.idea
.vscode/**
.vs/**
!.vscode/launch.json
*.suo
*.ntvs*
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ The client uses the following tech:

## Development Environment Setup
1. Install the prerequisites.
- [Node.js](https://nodejs.org/en/) v14
- [MongoDB](https://www.mongodb.com/) v4.4
- [Node.js](https://nodejs.org/en/) v20
- [MongoDB](https://www.mongodb.com/) v5.0
2. Clone the repository.
3. Checkout `master`.
4. `npm install` in both `client/` and `server/` directories.
Expand Down
1 change: 0 additions & 1 deletion client/.env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
VUE_APP_API_HOST=http://localhost:3000
VUE_APP_SOCKETS_HOST=localhost:3000
VUE_APP_GOOGLE_ANALYTICS_TRACKING_CODE=ABC-123-1
VUE_APP_DOCUMENTATION_URL=https://solaris-games.github.io/solaris-docs
VUE_APP_GOOGLE_RECAPTCHA_ENABLED=false
VUE_APP_GOOGLE_RECAPTCHA_SITE_KEY=ABC_123
Expand Down
35 changes: 0 additions & 35 deletions client/.eslintrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion client/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
'@vue/app'
'@vue/cli-plugin-babel/preset'
]
}
Loading

0 comments on commit cc2f1a0

Please sign in to comment.