Compare commits
No commits in common. "4d5bb6cb4b0b1d264b277465b324f30b8147b5b0" and "84ef980c425539b0d7f0dd403288d28150193a0c" have entirely different histories.
4d5bb6cb4b
...
84ef980c42
14
Dockerfile
@ -40,18 +40,8 @@ RUN apt-get -q update \
|
|||||||
tree \
|
tree \
|
||||||
inotify-tools \
|
inotify-tools \
|
||||||
gettext-base \
|
gettext-base \
|
||||||
&& apt-get clean \
|
gh \
|
||||||
&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
|
git \
|
||||||
|
|
||||||
# Build dependencies when running npm install
|
|
||||||
RUN apt-get -q update \
|
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install \
|
|
||||||
--no-install-recommends -y \
|
|
||||||
make \
|
|
||||||
python-is-python3 \
|
|
||||||
gcc \
|
|
||||||
g++ \
|
|
||||||
libc-dev \
|
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
|
&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log}
|
||||||
|
|
||||||
|
3633
client/package-lock.json
generated
@ -5,8 +5,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.10.6",
|
"@emotion/react": "^11.10.6",
|
||||||
"@emotion/styled": "^11.10.6",
|
"@emotion/styled": "^11.10.6",
|
||||||
"@mui/icons-material": "^5.11.11",
|
"@mui/icons-material": "^5.10.16",
|
||||||
"@mui/material": "^5.11.15",
|
"@mui/material": "^5.11.10",
|
||||||
"@types/jest": "^29.2.3",
|
"@types/jest": "^29.2.3",
|
||||||
"@types/node": "^18.11.10",
|
"@types/node": "^18.11.10",
|
||||||
"@types/react": "^18.0.26",
|
"@types/react": "^18.0.26",
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
import { createContext } from "react";
|
|
||||||
|
|
||||||
const global = {
|
|
||||||
chatId: undefined,
|
|
||||||
ws: undefined,
|
|
||||||
name: "",
|
|
||||||
chat: []
|
|
||||||
};
|
|
||||||
|
|
||||||
const GlobalContext = createContext(global);
|
|
||||||
|
|
||||||
export { GlobalContext, global };
|
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import Avatar from '@mui/material/Avatar'
|
import Avatar from '@material-ui/core/Avatar';
|
||||||
|
|
||||||
import { useStyles } from './Styles.js';
|
import { useStyles } from './Styles.js';
|
||||||
|
|
||||||
@ -14,4 +14,4 @@ const PlayerColor = ({ color }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export { PlayerColor };
|
export { PlayerColor };
|
@ -1,5 +1,6 @@
|
|||||||
import React, { useState, useEffect, useContext, useRef } from "react";
|
import React, { useState, useEffect, useContext, useRef } from "react";
|
||||||
import { Paper, List } from '@mui/material';
|
import Paper from '@material-ui/core/Paper';
|
||||||
|
import List from '@material-ui/core/List';
|
||||||
|
|
||||||
import "./PlayerList.css";
|
import "./PlayerList.css";
|
||||||
import { PlayerColor } from './PlayerColor.js';
|
import { PlayerColor } from './PlayerColor.js';
|
||||||
@ -173,4 +174,4 @@ const PlayerList = () => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export { PlayerList };
|
export { PlayerList };
|
@ -1,6 +1,7 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import "./PlayerName.css";
|
import "./PlayerName.css";
|
||||||
import { TextField, Button } from '@material-ui/core';
|
import TextField from '@material-ui/core/TextField';
|
||||||
|
import Button from '@material-ui/core/Button';
|
||||||
|
|
||||||
const PlayerName = ({ name, setName }) => {
|
const PlayerName = ({ name, setName }) => {
|
||||||
const [edit, setEdit] = useState(name);
|
const [edit, setEdit] = useState(name);
|
||||||
@ -33,4 +34,4 @@ const PlayerName = ({ name, setName }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export { PlayerName };
|
export { PlayerName };
|
@ -1,30 +0,0 @@
|
|||||||
import { makeStyles } from '@mui/material/styles';
|
|
||||||
import { orange, lightBlue, red, grey } from '@mui/material/colors';
|
|
||||||
|
|
||||||
const useStyles = makeStyles((theme) => ({
|
|
||||||
root: {
|
|
||||||
display: 'flex',
|
|
||||||
'& > *': {
|
|
||||||
margin: theme.spacing(1),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
R: {
|
|
||||||
color: theme.palette.getContrastText(red[500]),
|
|
||||||
backgroundColor: red[500],
|
|
||||||
},
|
|
||||||
O: {
|
|
||||||
color: theme.palette.getContrastText(orange[500]),
|
|
||||||
backgroundColor: orange[500],
|
|
||||||
},
|
|
||||||
W: {
|
|
||||||
color: theme.palette.getContrastText(grey[50]),
|
|
||||||
backgroundColor: grey[50],
|
|
||||||
},
|
|
||||||
B: {
|
|
||||||
color: theme.palette.getContrastText(lightBlue[500]),
|
|
||||||
backgroundColor: lightBlue[500],
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
|
|
||||||
export { useStyles };
|
|
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 1.4 MiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 18 KiB |
@ -3,6 +3,8 @@ services:
|
|||||||
ketr.chat:
|
ketr.chat:
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
||||||
|
- $HOME/.netrc:/root/.netrc # Use current user .netrc
|
||||||
|
- $HOME/.config/gh:/root/.config/gh # Use current user GH config
|
||||||
- ./logs:/home/user/logs #
|
- ./logs:/home/user/logs #
|
||||||
# Hot mount client and server for dynamic changes in DEVELOPMENT
|
# Hot mount client and server for dynamic changes in DEVELOPMENT
|
||||||
- ./scripts:/opt/scripts # Hot update via bind
|
- ./scripts:/opt/scripts # Hot update via bind
|
||||||
|
@ -13,6 +13,8 @@ services:
|
|||||||
tty: true # Needed for react-scripts
|
tty: true # Needed for react-scripts
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
|
- $HOME/.netrc:/root/.netrc # Use current user .netrc
|
||||||
|
- $HOME/.config/gh:/root/.config/gh # GitHub 'gh' credentials for GitHub actions
|
||||||
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
||||||
- ./logs:/home/user/logs #
|
- ./logs:/home/user/logs #
|
||||||
ports:
|
ports:
|
||||||
@ -31,6 +33,8 @@ services:
|
|||||||
tty: true # Needed for react-scripts
|
tty: true # Needed for react-scripts
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
|
- $HOME/.netrc:/root/.netrc # Use current user .netrc
|
||||||
|
- $HOME/.config/gh:/root/.config/gh # GitHub 'gh' credentials for GitHub actions
|
||||||
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
||||||
- ./scripts:/opt/scripts # Hot update via bind
|
- ./scripts:/opt/scripts # Hot update via bind
|
||||||
ports:
|
ports:
|
||||||
|
@ -4,4 +4,6 @@ services:
|
|||||||
ketr.chat-production:
|
ketr.chat-production:
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
- /etc/nginx/ssl:/etc/nginx/ssl:ro # Use host web keys
|
||||||
|
- $HOME/.netrc:/root/.netrc # Use current user .netrc
|
||||||
|
- $HOME/.config/gh:/root/.config/gh # Use current user GH config
|
||||||
- ./logs:/home/user/logs #
|
- ./logs:/home/user/logs #
|
||||||
|