Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 33157d48d3 | |||
| e0b3193607 | |||
| 655c81174e |
@@ -26,7 +26,7 @@ jobs:
|
|||||||
docker_image: krgamestudios/chat-server
|
docker_image: krgamestudios/chat-server
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v1
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ services:
|
|||||||
MYSQL_USER: ${appDBUser}
|
MYSQL_USER: ${appDBUser}
|
||||||
MYSQL_PASSWORD: ${appDBPass}
|
MYSQL_PASSWORD: ${appDBPass}
|
||||||
MYSQL_ROOT_PASSWORD: ${dbRootPass}
|
MYSQL_ROOT_PASSWORD: ${dbRootPass}
|
||||||
networks:
|
networks:
|
||||||
- app-network
|
- app-network
|
||||||
volumes:
|
volumes:
|
||||||
- ./mysql:/var/lib/mysql
|
- ./mysql:/var/lib/mysql
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "chat-server",
|
"name": "chat-server",
|
||||||
"version": "1.2.1",
|
"version": "1.2.4",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "chat-server",
|
"name": "chat-server",
|
||||||
"version": "1.2.1",
|
"version": "1.2.4",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "chat-server",
|
"name": "chat-server",
|
||||||
"version": "1.2.2",
|
"version": "1.2.4",
|
||||||
"description": "An API centric chat server. Uses Sequelize and mariaDB by default.",
|
"description": "An API centric chat server. Uses Sequelize and mariaDB by default.",
|
||||||
"main": "server/server.js",
|
"main": "server/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
|
const chatlog = require('./chatlog');
|
||||||
|
const mute = require('./mute');
|
||||||
|
const reports = require('./reports');
|
||||||
|
|
||||||
|
//relationships
|
||||||
|
reports.belongsTo(chatlog);
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
chatlog: require('./chatlog'),
|
chatlog,
|
||||||
mute: require('./mute'),
|
mute,
|
||||||
reports: require('./reports')
|
reports,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
const Sequelize = require('sequelize');
|
const Sequelize = require('sequelize');
|
||||||
const sequelize = require('..');
|
const sequelize = require('..');
|
||||||
|
|
||||||
const chatlog = require('./chatlog');
|
module.exports = sequelize.define('reports', {
|
||||||
|
|
||||||
const reports = sequelize.define('reports', {
|
|
||||||
index: {
|
index: {
|
||||||
type: Sequelize.INTEGER(11),
|
type: Sequelize.INTEGER(11),
|
||||||
allowNull: false,
|
allowNull: false,
|
||||||
@@ -17,10 +15,3 @@ const reports = sequelize.define('reports', {
|
|||||||
allowNull: false
|
allowNull: false
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
chatlog.hasMany(reports, { foreignKey: 'chatlogIndex', foreignKeyConstraint: true });
|
|
||||||
reports.belongsTo(chatlog, { foreignKey: 'chatlogIndex' });
|
|
||||||
|
|
||||||
sequelize.sync();
|
|
||||||
|
|
||||||
module.exports = reports;
|
|
||||||
Reference in New Issue
Block a user