Skip to content

Commit

Permalink
applied npm run format *
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonHoku committed May 24, 2020
1 parent 14a9893 commit e815f00
Show file tree
Hide file tree
Showing 10 changed files with 81,191 additions and 44,975 deletions.
20 changes: 13 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ This website was written by Godmode from the Eden Server with inspiration from F
## Running

### Production

1. Build the project by performing `npm run build` in the root directory.
2. Then run `npm start` from the root directory.

### Development

1. Run `npm run dev` in the root directory.

### Linting & Code Formatting
Expand All @@ -37,32 +39,35 @@ Ideally the 'client' React app should be able to function on its own without at

(UPDATE: ESLint config has since been added to the Client app directly, so need to set this up just to handle the API and check that this is not conflicting with the Client linting.)


## Local database setup

Software:
* [MariaDB](https://mariadb.org/): The database itself, take note of the password you set as it will be used to access it later!
* [HeidiSQL](https://www.heidisql.com/): A good GUI to manage the database.

- [MariaDB](https://mariadb.org/): The database itself, take note of the password you set as it will be used to access it later!
- [HeidiSQL](https://www.heidisql.com/): A good GUI to manage the database.

### Create the database

1. Open HeidiSQL and click on "New" (bottom left) to create a new session.
* Use the password you set during the MariaDB installation.
- Use the password you set during the MariaDB installation.
2. Once connected to the session, right click on your session to the left, click "Create new > Database" and name it `eden_web`.

### Setup the necessary tables and data

1. Select the newly created `eden_web` database on the left (it will get a green tick mark).
2. Navigate to "File > Run SQL file...", and then select every `.sql` file from the `sql\tables` of this project, and click Open.
3. Once it's done running the SQL files, your tables will be setup, and you can see the result by hitting the Refresh button (or F5) in HeidiSQL.


### Adding character and misc. other data
In `sql\queries\samples` you can find example SQL scripts for adding content to the website. Copy the ones you need to use from the `sql\queries` folder, and modify them as you see fit.

In `sql\queries\samples` you can find example SQL scripts for adding content to the website. Copy the ones you need to use from the `sql\queries` folder, and modify them as you see fit.
Any new files within the `sql\queries` folder are ignored by git, so you can make as many changes as you want to the scripts you have there.

The SQL scripts can be run in the same way as when you were setting up the tables and data:

1. Select the `eden_web` database on the left (it will get a green tick mark).
1. Navigate to "File > Run SQL file...", and then select the `.sql` file(s) you want to run from the `sql\queries` folder, and click Open.
2. Once it's done running the SQL file(s), you can see the result by hitting the Refresh button (or F5) in HeidiSQL.
1. Once it's done running the SQL file(s), you can see the result by hitting the Refresh button (or F5) in HeidiSQL.

### ENV variables for your local MariaDB

Expand All @@ -75,6 +80,7 @@ MYSQLPORT=3306
```

## License

Copyright (c) 2020 Eden Server

Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
Expand Down
321 changes: 169 additions & 152 deletions api/v1/config.js

Large diffs are not rendered by default.

43,666 changes: 21,833 additions & 21,833 deletions api/v1/lists/itemDescriptions.json

Large diffs are not rendered by default.

79,528 changes: 57,612 additions & 21,916 deletions api/v1/lists/itemNames.json

Large diffs are not rendered by default.

100 changes: 50 additions & 50 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"name": "client",
"proxy": "http://localhost:8081",
"homepage": "/",
"version": "0.1.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.28",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/react-fontawesome": "^0.1.9",
"@reach/router": "^1.3.3",
"axios": "^0.19.2",
"bootstrap": "^4.5.0",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-bootstrap": "^1.0.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.1",
"reaptcha": "1.6.0",
"semantic-ui-react": "0.88.2",
"typescript": "^3.9.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-flowtype": "^4.7.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^2.5.1",
"prettier": "^2.0.5"
}
"name": "client",
"proxy": "http://localhost:8081",
"homepage": "/",
"version": "0.1.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.28",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"@fortawesome/react-fontawesome": "^0.1.9",
"@reach/router": "^1.3.3",
"axios": "^0.19.2",
"bootstrap": "^4.5.0",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-bootstrap": "^1.0.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.1",
"reaptcha": "1.6.0",
"semantic-ui-react": "0.88.2",
"typescript": "^3.9.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-flowtype": "^4.7.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^2.5.1",
"prettier": "^2.0.5"
}
}
Loading

0 comments on commit e815f00

Please sign in to comment.