cgould/lingo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebranding

Browse Source
This commit is contained in:
Charles Gould 2021-01-09 23:17:05 -05:00
parent 745baf798f
commit 5a9b20dd0e
41 changed files with 83 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -6,8 +6,8 @@ A word guessing game based on the [game show](https://en.wikipedia.org/wiki/Ling
#### Browser client
- Practice: https://lingo.charego.com/practice.html
- Competitive: https://lingo.charego.com
- Practice: https://lingo.gould.dev/practice.html
- Competitive: https://lingo.gould.dev
#### JavaFX client

2
api/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.charego</groupId>
<groupId>dev.gould</groupId>
<artifactId>lingo-parent</artifactId>
<version>1.0</version>
</parent>

2
api/src/main/java/com/charego/lingo/api/Destinations.java → api/src/main/java/dev/gould/lingo/api/Destinations.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.api;
package dev.gould.lingo.api;
public class Destinations {

4
api/src/main/java/module-info.java
View File

@ -1,3 +1,3 @@
module com.charego.lingo.api {
exports com.charego.lingo.api;
module dev.gould.lingo.api {
exports dev.gould.lingo.api;
}

8
client/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.charego</groupId>
<groupId>dev.gould</groupId>
<artifactId>lingo-parent</artifactId>
<version>1.0</version>
</parent>
@ -13,7 +13,7 @@
<properties>
<javafx.version>15.0.1</javafx.version>
<lingo.url>https://lingo.charego.com</lingo.url>
<lingo.url>https://lingo.gould.dev</lingo.url>
</properties>
<dependencies>
@ -54,7 +54,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.5</version>
<configuration>
<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
<mainClass>dev.gould.lingo.client.bootstrap.LingoClient</mainClass>
<options>
<option>-Dlingo.url=${lingo.url}</option>
</options>
@ -65,7 +65,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
<mainClass>dev.gould.lingo.client.bootstrap.LingoClient</mainClass>
<addResourcesToClasspath>true</addResourcesToClasspath>
</configuration>
</plugin>

2
client/src/main/java/com/charego/lingo/client/bootstrap/LingoClient.java → client/src/main/java/dev/gould/lingo/client/bootstrap/LingoClient.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.bootstrap;
package dev.gould.lingo.client.bootstrap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

10
client/src/main/java/com/charego/lingo/client/bootstrap/LingoPresenter.java → client/src/main/java/dev/gould/lingo/client/bootstrap/LingoPresenter.java
View File

@ -1,12 +1,12 @@
package com.charego.lingo.client.bootstrap;
package dev.gould.lingo.client.bootstrap;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import com.charego.lingo.client.multiplayer.MultiplayerConfig;
import com.charego.lingo.client.multiplayer.MultiplayerPresenter;
import com.charego.lingo.client.singleplayer.SinglePlayerPresenter;
import com.charego.lingo.client.util.FxmlController;
import dev.gould.lingo.client.multiplayer.MultiplayerConfig;
import dev.gould.lingo.client.multiplayer.MultiplayerPresenter;
import dev.gould.lingo.client.singleplayer.SinglePlayerPresenter;
import dev.gould.lingo.client.util.FxmlController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

4
client/src/main/java/com/charego/lingo/client/bootstrap/WordRepository.java → client/src/main/java/dev/gould/lingo/client/bootstrap/WordRepository.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.bootstrap;
package dev.gould.lingo.client.bootstrap;
import java.io.IOException;
import java.util.ArrayList;
@ -10,7 +10,7 @@ import java.util.Set;
import org.springframework.stereotype.Component;
import com.charego.lingo.common.WordReader;
import dev.gould.lingo.common.WordReader;
import javax.annotation.PostConstruct;

2
client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerConfig.java → client/src/main/java/dev/gould/lingo/client/multiplayer/MultiplayerConfig.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.multiplayer;
package dev.gould.lingo.client.multiplayer;
import java.util.ArrayList;
import java.util.List;

20
client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerPresenter.java → client/src/main/java/dev/gould/lingo/client/multiplayer/MultiplayerPresenter.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.multiplayer;
package dev.gould.lingo.client.multiplayer;
import java.lang.reflect.Type;
import java.util.Arrays;
@ -8,7 +8,7 @@ import java.util.function.Consumer;
import javax.annotation.PostConstruct;
import com.charego.lingo.common.LobbyData;
import dev.gould.lingo.common.LobbyData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -34,14 +34,14 @@ import javafx.scene.paint.Color;
import javafx.scene.text.Font;
import javafx.scene.text.TextAlignment;
import javafx.scene.web.WebView;
import com.charego.lingo.api.Destinations;
import com.charego.lingo.client.util.FxmlController;
import com.charego.lingo.client.view.Board;
import com.charego.lingo.client.view.OpponentBoard;
import com.charego.lingo.client.view.PlayerBoard;
import com.charego.lingo.common.Game;
import com.charego.lingo.common.GameLeftMessage;
import com.charego.lingo.common.Report;
import dev.gould.lingo.api.Destinations;
import dev.gould.lingo.client.util.FxmlController;
import dev.gould.lingo.client.view.Board;
import dev.gould.lingo.client.view.OpponentBoard;
import dev.gould.lingo.client.view.PlayerBoard;
import dev.gould.lingo.common.Game;
import dev.gould.lingo.common.GameLeftMessage;
import dev.gould.lingo.common.Report;
@Component
public class MultiplayerPresenter implements FxmlController {

2
client/src/main/java/com/charego/lingo/client/multiplayer/StompTemplate.java → client/src/main/java/dev/gould/lingo/client/multiplayer/StompTemplate.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.multiplayer;
package dev.gould.lingo.client.multiplayer;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;

12
client/src/main/java/com/charego/lingo/client/singleplayer/SinglePlayerPresenter.java → client/src/main/java/dev/gould/lingo/client/singleplayer/SinglePlayerPresenter.java
View File

@ -1,8 +1,8 @@
package com.charego.lingo.client.singleplayer;
package dev.gould.lingo.client.singleplayer;
import java.util.Arrays;
import com.charego.lingo.client.bootstrap.WordRepository;
import dev.gould.lingo.client.bootstrap.WordRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -21,10 +21,10 @@ import javafx.scene.input.KeyEvent;
import javafx.scene.layout.StackPane;
import javafx.scene.text.Font;
import javafx.scene.text.TextAlignment;
import com.charego.lingo.client.view.PlayerBoard;
import com.charego.lingo.common.Game;
import com.charego.lingo.common.Player;
import com.charego.lingo.common.Report;
import dev.gould.lingo.client.view.PlayerBoard;
import dev.gould.lingo.common.Game;
import dev.gould.lingo.common.Player;
import dev.gould.lingo.common.Report;
public class SinglePlayerPresenter {

2
client/src/main/java/com/charego/lingo/client/util/FxmlController.java → client/src/main/java/dev/gould/lingo/client/util/FxmlController.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.util;
package dev.gould.lingo.client.util;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;

2
client/src/main/java/com/charego/lingo/client/view/Board.java → client/src/main/java/dev/gould/lingo/client/view/Board.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.view;
package dev.gould.lingo.client.view;
import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext;

2
client/src/main/java/com/charego/lingo/client/view/GameBoard.java → client/src/main/java/dev/gould/lingo/client/view/GameBoard.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.view;
package dev.gould.lingo.client.view;
import java.util.ArrayList;
import java.util.List;

2
client/src/main/java/com/charego/lingo/client/view/OpponentBoard.java → client/src/main/java/dev/gould/lingo/client/view/OpponentBoard.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.view;
package dev.gould.lingo.client.view;
import javafx.scene.canvas.Canvas;

2
client/src/main/java/com/charego/lingo/client/view/PlayerBoard.java → client/src/main/java/dev/gould/lingo/client/view/PlayerBoard.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.client.view;
package dev.gould.lingo.client.view;
import java.util.ArrayList;
import java.util.HashMap;

14
client/src/main/java/module-info.java
View File

@ -1,6 +1,6 @@
module com.charego.lingo.client {
requires com.charego.lingo.common;
requires com.charego.lingo.api;
module dev.gould.lingo.client {
requires dev.gould.lingo.common;
requires dev.gould.lingo.api;
requires java.annotation;
requires javafx.controls;
requires javafx.fxml;
@ -15,8 +15,8 @@ module com.charego.lingo.client {
requires spring.messaging;
requires spring.web;
requires spring.websocket;
exports com.charego.lingo.client.bootstrap;
exports com.charego.lingo.client.multiplayer;
opens com.charego.lingo.client.bootstrap to javafx.fxml, spring.core;
opens com.charego.lingo.client.multiplayer to javafx.fxml, spring.core;
exports dev.gould.lingo.client.bootstrap;
exports dev.gould.lingo.client.multiplayer;
opens dev.gould.lingo.client.bootstrap to javafx.fxml, spring.core;
opens dev.gould.lingo.client.multiplayer to javafx.fxml, spring.core;
}

2
client/src/main/resources/application.properties
View File

@ -1,2 +1,2 @@
# https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-application-properties.html
logging.level.com.charego.lingo = DEBUG
logging.level.dev.gould.lingo = DEBUG

2
client/src/main/resources/fxml/Lingo.fxml
View File

@ -8,7 +8,7 @@
<?import javafx.scene.layout.VBox?>
<BorderPane xmlns:fx="http://javafx.com/fxml"
fx:controller="com.charego.lingo.client.bootstrap.LingoPresenter"
fx:controller="dev.gould.lingo.client.bootstrap.LingoPresenter"
fx:id="content"
prefWidth="650"
prefHeight="420">

2
client/src/main/resources/fxml/LingoMultiplayer.fxml
View File

@ -8,7 +8,7 @@
<?import javafx.scene.web.WebView?>
<StackPane xmlns:fx="http://javafx.com/fxml"
fx:controller="com.charego.lingo.client.multiplayer.MultiplayerPresenter"
fx:controller="dev.gould.lingo.client.multiplayer.MultiplayerPresenter"
fx:id="contentPane">
<children>

2
common/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.charego</groupId>
<groupId>dev.gould</groupId>
<artifactId>lingo-parent</artifactId>
<version>1.0</version>
</parent>

2
common/src/main/java/com/charego/lingo/common/ChatMessage.java → common/src/main/java/dev/gould/lingo/common/ChatMessage.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
public class ChatMessage {

2
common/src/main/java/com/charego/lingo/common/Game.java → common/src/main/java/dev/gould/lingo/common/Game.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
import java.util.Arrays;
import java.util.Collections;

2
common/src/main/java/com/charego/lingo/common/GameLeftMessage.java → common/src/main/java/dev/gould/lingo/common/GameLeftMessage.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
public class GameLeftMessage {

2
common/src/main/java/com/charego/lingo/common/LobbyData.java → common/src/main/java/dev/gould/lingo/common/LobbyData.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
import java.util.Collection;

2
common/src/main/java/com/charego/lingo/common/Player.java → common/src/main/java/dev/gould/lingo/common/Player.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
import com.fasterxml.jackson.annotation.JsonIgnore;

2
common/src/main/java/com/charego/lingo/common/Report.java → common/src/main/java/dev/gould/lingo/common/Report.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
public class Report {

2
common/src/main/java/com/charego/lingo/common/SetUsernameMessage.java → common/src/main/java/dev/gould/lingo/common/SetUsernameMessage.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
public class SetUsernameMessage {

2
common/src/main/java/com/charego/lingo/common/WordReader.java → common/src/main/java/dev/gould/lingo/common/WordReader.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.common;
package dev.gould.lingo.common;
import java.io.BufferedReader;
import java.io.IOException;

4
common/src/main/java/module-info.java
View File

@ -1,4 +1,4 @@
module com.charego.lingo.common {
module dev.gould.lingo.common {
requires com.fasterxml.jackson.annotation;
exports com.charego.lingo.common;
exports dev.gould.lingo.common;
}

2
pom.xml
View File

@ -8,7 +8,7 @@
<version>2.4.1</version>
</parent>
<groupId>com.charego</groupId>
<groupId>dev.gould</groupId>
<artifactId>lingo-parent</artifactId>
<version>1.0</version>
<packaging>pom</packaging>

2
server/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.charego</groupId>
<groupId>dev.gould</groupId>
<artifactId>lingo-parent</artifactId>
<version>1.0</version>
</parent>

7
server/src/main/java/com/charego/lingo/server/LingoController.java → server/src/main/java/dev/gould/lingo/server/LingoController.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.server;
package dev.gould.lingo.server;
import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER;
@ -10,8 +10,9 @@ import java.util.TreeMap;
import javax.annotation.PostConstruct;
import com.charego.lingo.api.Destinations;
import com.charego.lingo.common.*;
import dev.gould.lingo.api.Destinations;
import dev.gould.lingo.common.*;
import dev.gould.lingo.common.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

2
server/src/main/java/com/charego/lingo/server/LingoServer.java → server/src/main/java/dev/gould/lingo/server/LingoServer.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.server;
package dev.gould.lingo.server;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

10
server/src/main/java/com/charego/lingo/server/PracticeController.java → server/src/main/java/dev/gould/lingo/server/PracticeController.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.server;
package dev.gould.lingo.server;
import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER;
@ -16,10 +16,10 @@ import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.web.bind.annotation.RestController;
import com.charego.lingo.api.Destinations;
import com.charego.lingo.common.Game;
import com.charego.lingo.common.Player;
import com.charego.lingo.common.Report;
import dev.gould.lingo.api.Destinations;
import dev.gould.lingo.common.Game;
import dev.gould.lingo.common.Player;
import dev.gould.lingo.common.Report;
@RestController
public class PracticeController {

4
server/src/main/java/com/charego/lingo/server/SessionManager.java → server/src/main/java/dev/gould/lingo/server/SessionManager.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.server;
package dev.gould.lingo.server;
import java.util.Collection;
import java.util.HashMap;
@ -15,7 +15,7 @@ import org.springframework.web.socket.messaging.AbstractSubProtocolEvent;
import org.springframework.web.socket.messaging.SessionConnectedEvent;
import org.springframework.web.socket.messaging.SessionDisconnectEvent;
import com.charego.lingo.common.Player;
import dev.gould.lingo.common.Player;
@Component
public class SessionManager implements ApplicationListener<AbstractSubProtocolEvent> {

2
server/src/main/java/com/charego/lingo/server/WebSocketConfig.java → server/src/main/java/dev/gould/lingo/server/WebSocketConfig.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.server;
package dev.gould.lingo.server;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.config.ChannelRegistration;

4
server/src/main/java/com/charego/lingo/server/WordRepository.java → server/src/main/java/dev/gould/lingo/server/WordRepository.java
View File

@ -1,4 +1,4 @@
package com.charego.lingo.server;
package dev.gould.lingo.server;
import java.io.IOException;
import java.util.ArrayList;
@ -10,7 +10,7 @@ import java.util.Set;
import org.springframework.stereotype.Component;
import com.charego.lingo.common.WordReader;
import dev.gould.lingo.common.WordReader;
import javax.annotation.PostConstruct;

6
server/src/main/java/module-info.java
View File

@ -1,6 +1,6 @@
module com.charego.lingo.server {
requires com.charego.lingo.common;
requires com.charego.lingo.api;
module dev.gould.lingo.server {
requires dev.gould.lingo.common;
requires dev.gould.lingo.api;
requires java.annotation;
requires org.slf4j;
requires spring.beans;

2
server/src/main/resources/application.properties
View File

@ -1,2 +1,2 @@
# https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-application-properties.html
logging.level.com.charego.lingo = DEBUG
logging.level.dev.gould.lingo = DEBUG