Can't quite tell what's changed
This commit is contained in:
@@ -6,8 +6,9 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"author": "Daniel Ledda",
|
"author": "Daniel Ledda",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "webpack --mode development",
|
"build-dev": "webpack --mode development && postbuild",
|
||||||
"postbuild": "rsync -avu --delete dist/ ../kadi_backend/dist/game/static",
|
"build": "webpack --mode production",
|
||||||
|
"postbuild": "rsync -avu --delete dist/ ../kadi_backend/static/game",
|
||||||
"start": "webpack-dev-server --mode development",
|
"start": "webpack-dev-server --mode development",
|
||||||
"test": "echo \"Error: no test specified\" && exit 1"
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<link rel="icon" href="favicon.ico" />
|
<link rel="icon" href="static/favicon.ico" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
<meta name="theme-color" content="#000000" />
|
<meta name="theme-color" content="#000000" />
|
||||||
<meta
|
<meta
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
@@ -1,25 +0,0 @@
|
|||||||
{
|
|
||||||
"short_name": "React App",
|
|
||||||
"name": "Create React App Sample",
|
|
||||||
"icons": [
|
|
||||||
{
|
|
||||||
"src": "favicon.ico",
|
|
||||||
"sizes": "64x64 32x32 24x24 16x16",
|
|
||||||
"type": "image/x-icon"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "logo192.png",
|
|
||||||
"type": "image/png",
|
|
||||||
"sizes": "192x192"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"src": "logo512.png",
|
|
||||||
"type": "image/png",
|
|
||||||
"sizes": "512x512"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"start_url": ".",
|
|
||||||
"display": "standalone",
|
|
||||||
"theme_color": "#000000",
|
|
||||||
"background_color": "#ffffff"
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# https://www.robotstxt.org/robotstxt.html
|
|
||||||
User-agent: *
|
|
||||||
Disallow:
|
|
||||||
57
src/App.tsx
57
src/App.tsx
@@ -1,25 +1,74 @@
|
|||||||
import React, {ReactNode} from "react";
|
import React, {ReactNode} from "react";
|
||||||
import Game from "./Components/Game";
|
import Game from "./Components/Game";
|
||||||
import {LocaleContext, localeDefaultVal} from "./static/strings";
|
|
||||||
import "semantic-ui-css/semantic.min.css";
|
import "semantic-ui-css/semantic.min.css";
|
||||||
|
import {SupportedLang} from "./static/enums";
|
||||||
|
import {IntlStrings} from "./static/strings";
|
||||||
|
import UserContext, {IUserContext} from "./UserContext";
|
||||||
|
import LocaleContext, {ILocaleContext} from "./LocaleContext";
|
||||||
|
import axios from "axios";
|
||||||
|
import {SERVER_BASE_NAME} from "./index";
|
||||||
|
|
||||||
interface AppState {
|
interface AppState {
|
||||||
|
userContext: IUserContext;
|
||||||
|
localeContext: ILocaleContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface AppProps {}
|
interface AppProps {}
|
||||||
|
|
||||||
class App extends React.Component<AppProps, AppState> {
|
class App extends React.Component<AppProps, AppState> {
|
||||||
|
private readonly updateUserContext: (username: string, loggedIn: boolean) => void;
|
||||||
|
private readonly changeLang: (lang: SupportedLang) => void;
|
||||||
constructor(props: AppProps) {
|
constructor(props: AppProps) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
this.state = {
|
this.updateUserContext = (username, loggedIn) => {
|
||||||
|
this.setState({userContext: {
|
||||||
|
username: username,
|
||||||
|
loggedIn: loggedIn,
|
||||||
|
updateUserContext: this.updateUserContext
|
||||||
|
}});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.changeLang = (lang: SupportedLang) => {
|
||||||
|
if (lang in SupportedLang) {
|
||||||
|
this.setState({localeContext: {
|
||||||
|
strings: IntlStrings[lang],
|
||||||
|
currentLang: lang,
|
||||||
|
changeLang: this.changeLang
|
||||||
|
}});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.state = {
|
||||||
|
userContext: {
|
||||||
|
username: "",
|
||||||
|
loggedIn: false,
|
||||||
|
updateUserContext: this.updateUserContext,
|
||||||
|
},
|
||||||
|
localeContext: {
|
||||||
|
currentLang: SupportedLang.gb,
|
||||||
|
strings: IntlStrings[SupportedLang.gb],
|
||||||
|
changeLang: this.changeLang,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount(): void {
|
||||||
|
axios.get("/api/user", {baseURL: SERVER_BASE_NAME})
|
||||||
|
.then((res) => {
|
||||||
|
const data = res.data as any;
|
||||||
|
this.updateUserContext(data.username, true);
|
||||||
|
this.changeLang(data.lang);
|
||||||
|
})
|
||||||
|
.catch(err => console.log(err));
|
||||||
}
|
}
|
||||||
|
|
||||||
render(): ReactNode {
|
render(): ReactNode {
|
||||||
return (
|
return (
|
||||||
<LocaleContext.Provider value={localeDefaultVal}>
|
<LocaleContext.Provider value={this.state.localeContext}>
|
||||||
<Game/>
|
<UserContext.Provider value={this.state.userContext}>
|
||||||
|
<Game/>
|
||||||
|
</UserContext.Provider>
|
||||||
</LocaleContext.Provider>
|
</LocaleContext.Provider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ class Game extends React.Component<GameProps, GameState> {
|
|||||||
const startupSettings: GameSettings = {
|
const startupSettings: GameSettings = {
|
||||||
playerIds: Settings.players,
|
playerIds: Settings.players,
|
||||||
ruleset: Settings.ruleset,
|
ruleset: Settings.ruleset,
|
||||||
lang: Settings.lang as SupportedLang
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
|
|||||||
@@ -1,7 +1,25 @@
|
|||||||
import React, {ChangeEvent, FocusEvent, KeyboardEvent, ReactNode} from "react";
|
import React, {ChangeEvent, FocusEvent, KeyboardEvent, ReactNode} from "react";
|
||||||
import {getSchemaListings, SchemaListing} from "../static/rulesets";
|
import {getSchemaListings, SchemaListing} from "../static/rulesets";
|
||||||
import {LocaleContext, LanguageNames} from "../static/strings";
|
import {LanguageNames} from "../static/strings";
|
||||||
|
import LocaleContext from "../LocaleContext";
|
||||||
import {SupportedLang} from "../static/enums";
|
import {SupportedLang} from "../static/enums";
|
||||||
|
import {Button} from "semantic-ui-react";
|
||||||
|
|
||||||
|
interface GameSetupProps {
|
||||||
|
onSetupComplete: (settings: GameSettings) => void;
|
||||||
|
settings: GameSettings;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface GameSetupState {
|
||||||
|
selectedRuleset: string;
|
||||||
|
enteredPlayerIds: string[];
|
||||||
|
editingPlayerName: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GameSettings {
|
||||||
|
ruleset: string;
|
||||||
|
playerIds: string[];
|
||||||
|
}
|
||||||
|
|
||||||
class GameSetup extends React.Component<GameSetupProps, GameSetupState> {
|
class GameSetup extends React.Component<GameSetupProps, GameSetupState> {
|
||||||
private readonly availableRulesets: SchemaListing[];
|
private readonly availableRulesets: SchemaListing[];
|
||||||
@@ -14,22 +32,12 @@ class GameSetup extends React.Component<GameSetupProps, GameSetupState> {
|
|||||||
this.availableRulesets = getSchemaListings();
|
this.availableRulesets = getSchemaListings();
|
||||||
this.changeLang = () => {};
|
this.changeLang = () => {};
|
||||||
this.state = {
|
this.state = {
|
||||||
selectedLang: this.props.settings.lang,
|
|
||||||
selectedRuleset: this.props.settings.ruleset,
|
selectedRuleset: this.props.settings.ruleset,
|
||||||
enteredPlayerIds: this.props.settings.playerIds,
|
enteredPlayerIds: this.props.settings.playerIds,
|
||||||
editingPlayerName: false,
|
editingPlayerName: false,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount(): void {
|
|
||||||
this.changeLang = this.context.changeLang;
|
|
||||||
}
|
|
||||||
|
|
||||||
onLanguageChange: (lang: SupportedLang) => void = (lang) => {
|
|
||||||
this.setState({ selectedLang: lang });
|
|
||||||
this.changeLang(lang);
|
|
||||||
};
|
|
||||||
|
|
||||||
onRulesetChange: (ruleset: string) => void = (ruleset) => {
|
onRulesetChange: (ruleset: string) => void = (ruleset) => {
|
||||||
this.setState({ selectedRuleset: ruleset });
|
this.setState({ selectedRuleset: ruleset });
|
||||||
};
|
};
|
||||||
@@ -52,31 +60,12 @@ class GameSetup extends React.Component<GameSetupProps, GameSetupState> {
|
|||||||
this.props.onSetupComplete({
|
this.props.onSetupComplete({
|
||||||
ruleset: this.state.selectedRuleset,
|
ruleset: this.state.selectedRuleset,
|
||||||
playerIds: this.state.enteredPlayerIds,
|
playerIds: this.state.enteredPlayerIds,
|
||||||
lang: this.state.selectedLang,
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
render(): ReactNode {
|
render(): ReactNode {
|
||||||
const Locale = this.context.strings;
|
const Locale = this.context.strings;
|
||||||
|
|
||||||
const langOptions: ReactNode[] = [];
|
|
||||||
for (const lang in SupportedLang) {
|
|
||||||
let className = "option";
|
|
||||||
if (this.state.selectedLang === lang) {
|
|
||||||
className += " selected";
|
|
||||||
}
|
|
||||||
langOptions.push((
|
|
||||||
<div
|
|
||||||
key={lang + "lang_option"}
|
|
||||||
className={className}
|
|
||||||
onClick={() => this.onLanguageChange(lang as SupportedLang)}
|
|
||||||
>
|
|
||||||
{LanguageNames[lang as SupportedLang]}
|
|
||||||
<span className={"selectorBox"}/>
|
|
||||||
</div>
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
const rulesetOptions: ReactNode[] = [];
|
const rulesetOptions: ReactNode[] = [];
|
||||||
for (const rulesetListing of this.availableRulesets) {
|
for (const rulesetListing of this.availableRulesets) {
|
||||||
let className = "option";
|
let className = "option";
|
||||||
@@ -143,24 +132,15 @@ class GameSetup extends React.Component<GameSetupProps, GameSetupState> {
|
|||||||
{rulesetOptions}
|
{rulesetOptions}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className={"optionGroup"}>
|
|
||||||
<div className={"optionGroupTitleContainer"}>
|
|
||||||
<span className={"optionGroupTitle"}>
|
|
||||||
{Locale.setupScreen.selectLanguage}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className={"languageOptions optionList"}>
|
|
||||||
{langOptions}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className={"playButtonContainer"}>
|
<div className={"playButtonContainer"}>
|
||||||
<button
|
<Button
|
||||||
className={"playButton"}
|
size={"huge"}
|
||||||
|
color={"blue"}
|
||||||
onClick={this.submitSettings}
|
onClick={this.submitSettings}
|
||||||
disabled={this.state.enteredPlayerIds.length < 1}
|
disabled={this.state.enteredPlayerIds.length < 1}
|
||||||
>
|
>
|
||||||
{Locale.setupScreen.startGame}
|
{Locale.setupScreen.startGame}
|
||||||
</button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -170,24 +150,6 @@ class GameSetup extends React.Component<GameSetupProps, GameSetupState> {
|
|||||||
}
|
}
|
||||||
GameSetup.contextType = LocaleContext;
|
GameSetup.contextType = LocaleContext;
|
||||||
|
|
||||||
interface GameSetupProps {
|
|
||||||
onSetupComplete: (settings: GameSettings) => void;
|
|
||||||
settings: GameSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface GameSetupState {
|
|
||||||
selectedLang: SupportedLang;
|
|
||||||
selectedRuleset: string;
|
|
||||||
enteredPlayerIds: string[];
|
|
||||||
editingPlayerName: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface GameSettings {
|
|
||||||
ruleset: string;
|
|
||||||
playerIds: string[];
|
|
||||||
lang: SupportedLang;
|
|
||||||
}
|
|
||||||
|
|
||||||
const AddPlayerField: React.FunctionComponent<AddPlayerFieldProps> = ({playersListEmpty, submitNewPlayer, userEditing}) => {
|
const AddPlayerField: React.FunctionComponent<AddPlayerFieldProps> = ({playersListEmpty, submitNewPlayer, userEditing}) => {
|
||||||
const Locale = React.useContext(LocaleContext).strings;
|
const Locale = React.useContext(LocaleContext).strings;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import {BlockDef} from "../static/rulesets";
|
import {BlockDef} from "../static/rulesets";
|
||||||
import {CellLocation} from "../Classes/PlayerScoreCard";
|
import {CellLocation} from "../Classes/PlayerScoreCard";
|
||||||
import React, {ReactElement} from "react";
|
import React, {ReactElement} from "react";
|
||||||
import {formatUnicorn, LocaleContext} from "../static/strings";
|
import {formatUnicorn} from "../static/strings";
|
||||||
import {FieldType} from "../static/enums";
|
import {FieldType} from "../static/enums";
|
||||||
import {BlockScores, CellEventResponse} from "./KadiBoard";
|
import {BlockScores, CellEventResponse} from "./KadiBoard";
|
||||||
import GenericKadiRowContainer from "./GenericKadiRowContainer";
|
import GenericKadiRowContainer from "./GenericKadiRowContainer";
|
||||||
@@ -9,6 +9,7 @@ import KadiEditableRowCells from "./KadiEditableRowCells";
|
|||||||
import KadiBlockTotalRow from "./KadiBlockTotalRow";
|
import KadiBlockTotalRow from "./KadiBlockTotalRow";
|
||||||
import KadiBlockSubtotalRow from "./KadiBlockSubtotalRow";
|
import KadiBlockSubtotalRow from "./KadiBlockSubtotalRow";
|
||||||
import KadiBlockBonusRow from "./KadiBlockBonusRow";
|
import KadiBlockBonusRow from "./KadiBlockBonusRow";
|
||||||
|
import LocaleContext from "../LocaleContext";
|
||||||
|
|
||||||
interface BlockRendererProps {
|
interface BlockRendererProps {
|
||||||
blockSchema: BlockDef;
|
blockSchema: BlockDef;
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import React, {ReactElement, ReactNode, useContext} from "react";
|
import React, {ReactElement, ReactNode, useContext} from "react";
|
||||||
import PlayerScoreCard, {CellLocation, PlayerScoreCardJSONRepresentation} from "../Classes/PlayerScoreCard";
|
import PlayerScoreCard, {CellLocation, PlayerScoreCardJSONRepresentation} from "../Classes/PlayerScoreCard";
|
||||||
import {BlockDef, GameSchema, getGameSchemaById} from "../static/rulesets";
|
import {BlockDef, GameSchema, getGameSchemaById} from "../static/rulesets";
|
||||||
import {formatUnicorn, LocaleContext} from "../static/strings";
|
import {formatUnicorn} from "../static/strings";
|
||||||
|
import LocaleContext from "../LocaleContext";
|
||||||
import {CellFlag} from "../static/enums";
|
import {CellFlag} from "../static/enums";
|
||||||
import {ScoreCellValue} from "../Classes/ScoreCell";
|
import {ScoreCellValue} from "../Classes/ScoreCell";
|
||||||
import {CaretakerSet} from "../Classes/Caretaker";
|
import {CaretakerSet} from "../Classes/Caretaker";
|
||||||
@@ -131,11 +132,14 @@ class KadiBoard extends React.Component<KadiBoardProps, KadiBoardState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private getJSONRepresentationForBoard(): string {
|
private getJSONRepresentationForBoard(): string {
|
||||||
const JSONRepresentation: PlayerScoreCardJSONRepresentation[] = [];
|
const JSONScoreCards: PlayerScoreCardJSONRepresentation[] = [];
|
||||||
for (const playerId in this.state.scoreSheet) {
|
for (const playerId in this.state.scoreSheet) {
|
||||||
JSONRepresentation.push(this.state.scoreSheet[playerId].getJSONRepresentation());
|
JSONScoreCards.push(this.state.scoreSheet[playerId].getJSONRepresentation());
|
||||||
}
|
}
|
||||||
return JSON.stringify(JSONRepresentation);
|
return JSON.stringify({
|
||||||
|
gameType: this.gameSchema.id,
|
||||||
|
results: JSONScoreCards
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private canSave(): boolean {
|
private canSave(): boolean {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React, {ReactNode} from "react";
|
import React, {ReactNode} from "react";
|
||||||
import {LocaleContext} from "../static/strings";
|
import LocaleContext from "../LocaleContext";
|
||||||
import KadiCell from "./KadiCell";
|
import KadiCell from "./KadiCell";
|
||||||
import {FieldType} from "../static/enums";
|
import {FieldType} from "../static/enums";
|
||||||
import {Icon} from "semantic-ui-react";
|
import {Icon} from "semantic-ui-react";
|
||||||
|
|||||||
19
src/LocaleContext.ts
Executable file
19
src/LocaleContext.ts
Executable file
@@ -0,0 +1,19 @@
|
|||||||
|
import {SupportedLang} from "./static/enums";
|
||||||
|
import React from "react";
|
||||||
|
import {IntlStrings} from "./static/strings";
|
||||||
|
|
||||||
|
export interface ILocaleContext {
|
||||||
|
currentLang: SupportedLang;
|
||||||
|
strings: any;
|
||||||
|
changeLang: (lang: SupportedLang) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const localeDefaultVal: ILocaleContext = {
|
||||||
|
currentLang: SupportedLang.gb,
|
||||||
|
strings: IntlStrings[SupportedLang.gb as SupportedLang],
|
||||||
|
changeLang: () => {},
|
||||||
|
};
|
||||||
|
|
||||||
|
const LocaleContext = React.createContext(localeDefaultVal);
|
||||||
|
|
||||||
|
export default LocaleContext;
|
||||||
17
src/UserContext.ts
Executable file
17
src/UserContext.ts
Executable file
@@ -0,0 +1,17 @@
|
|||||||
|
import React from "react";
|
||||||
|
|
||||||
|
export interface IUserContext {
|
||||||
|
username: string;
|
||||||
|
loggedIn: boolean;
|
||||||
|
updateUserContext: (username: string, loggedIn: boolean) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const userDefaultVal = {
|
||||||
|
loggedIn: false,
|
||||||
|
username: "",
|
||||||
|
updateUserContext: () => {},
|
||||||
|
} as IUserContext;
|
||||||
|
|
||||||
|
const UserContext = React.createContext(userDefaultVal);
|
||||||
|
|
||||||
|
export default UserContext;
|
||||||
@@ -4,6 +4,8 @@ import App from "./App";
|
|||||||
import * as serviceWorker from "./serviceWorker";
|
import * as serviceWorker from "./serviceWorker";
|
||||||
import "./filetypes.d";
|
import "./filetypes.d";
|
||||||
|
|
||||||
|
export const SERVER_BASE_NAME = "/kadi";
|
||||||
|
|
||||||
ReactDOM.render((
|
ReactDOM.render((
|
||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
<App />
|
<App />
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
|
|
||||||
<g fill="#61DAFB">
|
|
||||||
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
|
|
||||||
<circle cx="420.9" cy="296.5" r="45.7"/>
|
|
||||||
<path d="M520.5 78.1z"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
@@ -74,7 +74,7 @@ input[type="number"] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.kniffelTable {
|
.kadiTable {
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
border: var(--thick-border);
|
border: var(--thick-border);
|
||||||
@@ -82,27 +82,27 @@ input[type="number"] {
|
|||||||
border-radius: var(--outer-radius);
|
border-radius: var(--outer-radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
.kniffelCell,
|
.kadiCell,
|
||||||
.rowLabelCell,
|
.rowLabelCell,
|
||||||
.playerNameCell,
|
.playerNameCell,
|
||||||
.topLeftBlankCell {
|
.topLeftBlankCell {
|
||||||
background-color: var(--bg-cells);
|
background-color: var(--bg-cells);
|
||||||
}
|
}
|
||||||
|
|
||||||
.kniffelCell.editable {
|
.kadiCell.editable {
|
||||||
background-color: var(--bg-cells);
|
background-color: var(--bg-cells);
|
||||||
transition: background-color 100ms;
|
transition: background-color 100ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
.kniffelCell.editable:hover {
|
.kadiCell.editable:hover {
|
||||||
background-color: var(--bg-cell-hover);
|
background-color: var(--bg-cell-hover);
|
||||||
}
|
}
|
||||||
|
|
||||||
tr.subtotalField > .kniffelCell {
|
tr.subtotalField > .kadiCell {
|
||||||
border-top: var(--thick-border);
|
border-top: var(--thick-border);
|
||||||
}
|
}
|
||||||
|
|
||||||
tr.totalField > .kniffelCell,
|
tr.totalField > .kadiCell,
|
||||||
.playerNameCell,
|
.playerNameCell,
|
||||||
.topLeftBlankCell {
|
.topLeftBlankCell {
|
||||||
border-top: var(--thick-border);
|
border-top: var(--thick-border);
|
||||||
@@ -114,7 +114,7 @@ tr.totalField > .kniffelCell,
|
|||||||
border-right: var(--thick-border);
|
border-right: var(--thick-border);
|
||||||
}
|
}
|
||||||
|
|
||||||
.kniffelTable > thead {
|
.kadiTable > thead {
|
||||||
font-size: xx-large;
|
font-size: xx-large;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background-color: var(--bg-border);
|
background-color: var(--bg-border);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export enum CellFlag {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export enum SupportedLang {
|
export enum SupportedLang {
|
||||||
en = "en",
|
gb = "gb",
|
||||||
de = "de",
|
de = "de",
|
||||||
it = "it",
|
it = "it",
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
"lang": "en",
|
|
||||||
"players": [],
|
"players": [],
|
||||||
"ruleset": "default_en",
|
"ruleset": "default_en",
|
||||||
"maxHistoryLength": 256,
|
"maxHistoryLength": 256,
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ export function formatUnicorn(fmt: string, ...args: string[]): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const LanguageNames: Record<SupportedLang, string> = {
|
export const LanguageNames: Record<SupportedLang, string> = {
|
||||||
en: "English",
|
gb: "English",
|
||||||
de: "Deutsch",
|
de: "Deutsch",
|
||||||
it: "Italiano",
|
it: "Italiano",
|
||||||
};
|
};
|
||||||
|
|
||||||
const IntlStrings = {
|
export const IntlStrings = {
|
||||||
en: {
|
gb: {
|
||||||
rowLabels: {
|
rowLabels: {
|
||||||
subtotal: "Subtotal",
|
subtotal: "Subtotal",
|
||||||
bonus: "Bonus",
|
bonus: "Bonus",
|
||||||
@@ -123,15 +123,4 @@ const IntlStrings = {
|
|||||||
players: "Giocatori:",
|
players: "Giocatori:",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export const localeDefaultVal = {
|
|
||||||
strings: IntlStrings[Settings.lang as SupportedLang],
|
|
||||||
changeLang: changeLang,
|
|
||||||
};
|
|
||||||
|
|
||||||
export const LocaleContext = React.createContext(localeDefaultVal);
|
|
||||||
|
|
||||||
export function changeLang(newLang: SupportedLang): void {
|
|
||||||
localeDefaultVal.strings = IntlStrings[newLang];
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,7 @@ const webpack = require("webpack");
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: "./src/index.tsx",
|
entry: "./src/index.tsx",
|
||||||
mode: "development",
|
mode: "production",
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
@@ -38,13 +38,13 @@ module.exports = {
|
|||||||
resolve: { extensions: [".tsx", ".ts", ".js", "*"] },
|
resolve: { extensions: [".tsx", ".ts", ".js", "*"] },
|
||||||
output: {
|
output: {
|
||||||
path: path.resolve(__dirname, "dist/"),
|
path: path.resolve(__dirname, "dist/"),
|
||||||
publicPath: "/kadi/game/static/",
|
publicPath: "/kadi/static/game/",
|
||||||
filename: "bundle.js"
|
filename: "bundle.js"
|
||||||
},
|
},
|
||||||
devServer: {
|
devServer: {
|
||||||
contentBase: path.join(__dirname, "public/"),
|
contentBase: path.join(__dirname, "public/"),
|
||||||
port: 3000,
|
port: 3000,
|
||||||
publicPath: "http://localhost:3000/dist/",
|
publicPath: "http://localhost:3000/",
|
||||||
hotOnly: true
|
hotOnly: true
|
||||||
},
|
},
|
||||||
plugins: [new webpack.HotModuleReplacementPlugin()]
|
plugins: [new webpack.HotModuleReplacementPlugin()]
|
||||||
|
|||||||
Reference in New Issue
Block a user