Merge everything to main branch #1

Merged
Ta180m merged 4 commits from dev into main 2021-05-06 03:31:09 +00:00
9 changed files with 4691 additions and 41 deletions
Showing only changes of commit 3b743d23e3 - Show all commits

1556
back/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
{ {
"name": "big2-back", "name": "bsx-back",
"version": "1.0.0", "version": "1.0.0",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
@ -13,7 +13,7 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"big2-core": "file:../core", "bsx-core": "file:../core",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"socket.io": "^3.1.1" "socket.io": "^3.1.1"
}, },

View file

@ -1,4 +1,4 @@
import {canPlay, Card, cmpCard, Suit} from 'big2-core'; import {canPlay, Card, cmpCard, Suit} from 'bsx-core';
import Client from './Client'; import Client from './Client';
import logSocket from './logSocket'; import logSocket from './logSocket';

View file

@ -3,6 +3,8 @@ import http from 'http';
import https from 'https'; import https from 'https';
import {Server} from 'socket.io'; import {Server} from 'socket.io';
//export default new Server({cors: {origin: process.env.ORIGIN, methods: ['GET', 'POST']}});
const base = process.env.SSL_KEY && process.env.SSL_CERT && process.env.SSL_CA ? https.createServer({ const base = process.env.SSL_KEY && process.env.SSL_CERT && process.env.SSL_CA ? https.createServer({
"key": fs.readFileSync(process.env.SSL_KEY), "key": fs.readFileSync(process.env.SSL_KEY),
"cert": fs.readFileSync(process.env.SSL_CERT), "cert": fs.readFileSync(process.env.SSL_CERT),

27
core/package-lock.json generated
View file

@ -1,8 +1,31 @@
{ {
"name": "big2-core", "name": "bsx-core",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 1, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": {
"": {
"name": "bsx-core",
"version": "1.0.0",
"license": "ISC",
"devDependencies": {
"typescript": "^4.1.5"
}
},
"node_modules/typescript": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz",
"integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=4.2.0"
}
}
},
"dependencies": { "dependencies": {
"typescript": { "typescript": {
"version": "4.1.5", "version": "4.1.5",

View file

@ -1,5 +1,5 @@
{ {
"name": "big2-core", "name": "bsx-core",
"version": "1.0.0", "version": "1.0.0",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",

3133
front/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
{ {
"name": "big2-front", "name": "bsx-front",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -10,7 +10,7 @@
"preinstall": "cd ../core && npm i && npm run build" "preinstall": "cd ../core && npm i && npm run build"
}, },
"dependencies": { "dependencies": {
"big2-core": "file:../core", "bsx-core": "file:../core",
"next": "10.0.6", "next": "10.0.6",
"react": "17.0.1", "react": "17.0.1",
"react-dom": "17.0.1", "react-dom": "17.0.1",

View file

@ -1,4 +1,4 @@
import {canPlay, Card} from 'big2-core'; import {canPlay, Card} from 'bsx-core';
import {useEffect, useState} from 'react'; import {useEffect, useState} from 'react';
import io from 'socket.io-client'; import io from 'socket.io-client';