diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d90a097..4e78d5f 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,11 @@ + + - - - + + @@ -15,9 +16,8 @@ - - - + + + + true + + true + true + @@ -79,10 +103,10 @@ - + - + diff --git a/client/src/App.vue b/client/src/App.vue index e6d4d44..cf8f426 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -1,68 +1,67 @@ - - - - - + + + + + diff --git a/client/src/assets/bg.png b/client/src/assets/bg.png new file mode 100644 index 0000000..0fc36fb Binary files /dev/null and b/client/src/assets/bg.png differ diff --git a/client/src/assets/poke-icon.png b/client/src/assets/poke-icon.png new file mode 100644 index 0000000..88be395 Binary files /dev/null and b/client/src/assets/poke-icon.png differ diff --git a/client/src/assets/poke.png b/client/src/assets/poke.png new file mode 100644 index 0000000..e08eaec Binary files /dev/null and b/client/src/assets/poke.png differ diff --git a/client/src/components/CommonCard.vue b/client/src/components/CommonCard.vue new file mode 100644 index 0000000..bd5d2f6 --- /dev/null +++ b/client/src/components/CommonCard.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/client/src/components/HelloWorld.vue b/client/src/components/HelloWorld.vue deleted file mode 100644 index 6b68edf..0000000 --- a/client/src/components/HelloWorld.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - diff --git a/client/src/components/SitList.vue b/client/src/components/SitList.vue new file mode 100644 index 0000000..bd49426 --- /dev/null +++ b/client/src/components/SitList.vue @@ -0,0 +1,204 @@ + + + + + + diff --git a/client/src/interface/user.ts b/client/src/interface/user.ts new file mode 100644 index 0000000..e740085 --- /dev/null +++ b/client/src/interface/user.ts @@ -0,0 +1,10 @@ +export interface IUser { + counter: number; + nick_name: string; + actionSize: number; + actionCommand: string; + type: string; + userId?: number; + handCard?: string[]; + buyIn: number; +} diff --git a/client/src/views/game.vue b/client/src/views/game.vue index ae4846f..020a1e7 100644 --- a/client/src/views/game.vue +++ b/client/src/views/game.vue @@ -1,5 +1,7 @@