Compare commits

...

8 Commits

Author SHA1 Message Date
Kayne Ruse 8076b0cc40 Pointed to new dev-services 2021-07-22 21:48:42 +01:00
Kayne Ruse e216474196 Bumped version number 2021-07-15 08:53:57 +10:00
Kayne Ruse 2532bf1867 Updated packages to fix vulnerabilities 2021-07-15 08:52:54 +10:00
Kayne Ruse 93a3c30e81 Fixed the database hostname
It's supposed to point to localhost when developing locally.
2021-04-08 04:21:31 +10:00
Kayne Ruse ae8c82e83a Fixed embedded source-map error 2021-04-07 05:00:16 +10:00
Kayne Ruse bc6a795750 WHOOPS THAT WAS A MISTAKE 2021-04-07 03:18:48 +10:00
Kayne Ruse 9947ef13c1 Added a workaround for a mysql bug 2021-04-07 02:21:44 +10:00
Kayne Ruse d3f0b1ac7d Fixed WEB_PORT setting 2021-04-03 03:59:08 +11:00
6 changed files with 3697 additions and 3135 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
WEB_PORT=3000 WEB_PORT=3000
DB_HOSTNAME=database DB_HOSTNAME=localhost
DB_DATABASE=template DB_DATABASE=template
DB_USERNAME=template DB_USERNAME=template
DB_PASSWORD=pikachu DB_PASSWORD=pikachu
+3 -2
View File
@@ -1,5 +1,6 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import ReactMarkdown from 'react-markdown/with-html'; import ReactMarkdown from 'react-markdown';
import rehypeRaw from 'rehype-raw';
const Markdown = props => { const Markdown = props => {
//content? //content?
@@ -27,7 +28,7 @@ const Markdown = props => {
} }
return ( return (
<ReactMarkdown escapeHtml={false} props={{...props}}>{contentHook}</ReactMarkdown> <ReactMarkdown rehypePlugins={[rehypeRaw]} escapeHtml={false} props={{...props}}>{contentHook}</ReactMarkdown>
); );
}; };
+1 -1
View File
@@ -123,7 +123,7 @@ services:
- traefik.http.routers.${projectName}router.service=${projectName}service@docker - traefik.http.routers.${projectName}router.service=${projectName}service@docker
- traefik.http.services.${projectName}service.loadbalancer.server.port=${projectPort} - traefik.http.services.${projectName}service.loadbalancer.server.port=${projectPort}
environment: environment:
- WEB_PORT=3000 - WEB_PORT=${projectPort}
- DB_HOSTNAME=database - DB_HOSTNAME=database
- DB_DATABASE=${projectName} - DB_DATABASE=${projectName}
- DB_USERNAME=${projectDBUser} - DB_USERNAME=${projectDBUser}
+3533 -2973
View File
File diff suppressed because it is too large Load Diff
+33 -32
View File
@@ -1,6 +1,6 @@
{ {
"name": "mern-template", "name": "mern-template",
"version": "1.0.0", "version": "1.0.1",
"description": "A website template using the MERN stack.", "description": "A website template using the MERN stack.",
"main": "server/server.js", "main": "server/server.js",
"scripts": { "scripts": {
@@ -9,7 +9,7 @@
"build:server": "exit 0", "build:server": "exit 0",
"build:client": "webpack --env=production --config webpack.config.js", "build:client": "webpack --env=production --config webpack.config.js",
"dev": "concurrently npm:watch:server npm:watch:client", "dev": "concurrently npm:watch:server npm:watch:client",
"watch:server": "nodemon . --ext js,jsx,json --ignore 'node_modules/*'", "watch:server": "nodemon ./* --ext js,jsx,json --ignore 'node_modules/*'",
"watch:client": "webpack serve --env=development --config webpack.config.js", "watch:client": "webpack serve --env=development --config webpack.config.js",
"analyzer": "webpack --env=production --analyzer --config webpack.config.js" "analyzer": "webpack --env=production --analyzer --config webpack.config.js"
}, },
@@ -24,37 +24,38 @@
}, },
"homepage": "https://github.com/KRGameStudios/MERN-template#readme", "homepage": "https://github.com/KRGameStudios/MERN-template#readme",
"dependencies": { "dependencies": {
"@babel/core": "^7.12.10", "@babel/core": ">=7.12.10",
"@babel/preset-env": "^7.12.11", "@babel/preset-env": ">=7.12.11",
"@babel/preset-react": "^7.12.10", "@babel/preset-react": ">=7.12.10",
"@loadable/component": "^5.14.1", "@loadable/component": ">=5.14.1",
"babel-loader": "^8.2.2", "babel-loader": ">=8.2.2",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": ">=3.0.0",
"concurrently": "^5.3.0", "concurrently": ">=5.3.0",
"css-loader": "^5.1.3", "css-loader": ">=5.1.3",
"dateformat": "^4.5.1", "dateformat": ">=4.5.1",
"dotenv": "^8.2.0", "dotenv": ">=8.2.0",
"express": "^4.17.1", "express": ">=4.17.1",
"html-webpack-plugin": "^5.0.0-alpha.14", "html-webpack-plugin": ">=5.0.0-alpha.14",
"jwt-decode": "^3.1.2", "jwt-decode": ">=3.1.2",
"mariadb": "^2.5.2", "mariadb": ">=2.5.2",
"raw-loader": "^4.0.2", "raw-loader": ">=4.0.2",
"react": "^17.0.1", "react": ">=17.0.1",
"react-dom": "^17.0.1", "react-dom": ">=17.0.1",
"react-dropdown-select": "^4.7.4", "react-dropdown-select": ">=4.7.4",
"react-markdown": "^5.0.3", "react-markdown": ">=5.0.3",
"react-router": "^5.2.0", "react-router": ">=5.2.0",
"react-router-dom": "^5.2.0", "react-router-dom": ">=5.2.0",
"sequelize": "^6.4.0", "rehype-raw": "^5.1.0",
"socket.io-client": "^4.0.0", "sequelize": ">=6.4.0",
"style-loader": "^2.0.0", "socket.io-client": ">=4.0.0",
"universal-cookie": "^4.0.4", "style-loader": ">=2.0.0",
"webpack": "^5.15.0", "universal-cookie": ">=4.0.4",
"webpack-cli": "^4.3.1" "webpack": ">=5.15.0",
"webpack-cli": ">=4.3.1"
}, },
"devDependencies": { "devDependencies": {
"nodemon": "^2.0.7", "nodemon": ">=2.0.7",
"webpack-bundle-analyzer": "^4.3.0", "webpack-bundle-analyzer": ">=4.3.0",
"webpack-dev-server": "^3.11.2" "webpack-dev-server": ">=1.16.5"
} }
} }
+4 -4
View File
@@ -18,7 +18,7 @@ module.exports = ({ production, analyzer }) => {
filename: '[name].[chunkhash].js', filename: '[name].[chunkhash].js',
sourceMapFilename: '[name].[chunkhash].js.map' sourceMapFilename: '[name].[chunkhash].js.map'
}, },
devtool: 'eval-source-map', devtool: production ? 'source-map' : 'eval-source-map',
resolve: { resolve: {
extensions: ['.js', '.jsx'] extensions: ['.js', '.jsx']
}, },
@@ -55,9 +55,9 @@ module.exports = ({ production, analyzer }) => {
new DefinePlugin({ new DefinePlugin({
'process.env': { 'process.env': {
'PRODUCTION': production, 'PRODUCTION': production,
'NEWS_URI': production ? `"${process.env.NEWS_URI}"` : '"https://dev-news.eggtrainer.com"', 'NEWS_URI': production ? `"${process.env.NEWS_URI}"` : '"https://dev-news.krgamestudios.com"',
'AUTH_URI': production ? `"${process.env.AUTH_URI}"` : '"https://dev-auth.eggtrainer.com"', 'AUTH_URI': production ? `"${process.env.AUTH_URI}"` : '"https://dev-auth.krgamestudios.com"',
'CHAT_URI': production ? `"${process.env.CHAT_URI}"` : '"https://dev-chat.eggtrainer.com"', 'CHAT_URI': production ? `"${process.env.CHAT_URI}"` : '"https://dev-chat.krgamestudios.com"',
} }
}), }),
new CleanWebpackPlugin({ new CleanWebpackPlugin({