Compare commits

..

No commits in common. "ef3e10a6c443566a50d3082222cd1be0b53b2cee" and "69f9cb6843605f271f94a2d76626158ebc052f72" have entirely different histories.

4 changed files with 16 additions and 43 deletions

View file

@ -1,11 +1,12 @@
import DeckBuilder from "@/views/DeckBuilder.vue";
import DraftView from "@/views/Draft.vue";
import GameView from "@/views/Game.vue";
import Home from "@/views/Home.vue";
import Lobby from "@/views/Lobby.vue";
import SettingsView from "@/views/Settings.vue";
import Vue from "vue"; import Vue from "vue";
import Router from "vue-router"; import Router from "vue-router";
import Home from "@/views/Home.vue";
import DeckBuilder from "@/views/DeckBuilder.vue";
import GameView from "@/views/Game.vue";
import DraftView from "@/views/Draft.vue";
import Lobby from "@/views/Lobby.vue";
import RoomView from "@/views/Room.vue";
import SettingsView from "@/views/Settings.vue";
Vue.use(Router); Vue.use(Router);
@ -44,14 +45,6 @@ export default new Router({
topnav: "Lobby" topnav: "Lobby"
} }
}, },
{
path: "/join/:id",
name: "lobby-join",
component: Lobby,
meta: {
topnav: "Lobby"
}
},
{ {
path: "/settings", path: "/settings",
name: "settings", name: "settings",

View file

@ -1,12 +1,15 @@
import { ChatMessage, LocalClient, PeerClient, PeerServer } from "@/network";
import { MutationTree } from "vuex"; import { MutationTree } from "vuex";
import {
import { ClientNetworkState, ConnectionStatus, NetworkState, ServerNetworkState } from "./types"; NetworkState,
ServerNetworkState,
ClientNetworkState,
ConnectionStatus
} from "./types";
import { LocalClient, PeerServer, PeerClient, ChatMessage } from "@/network";
const mutations: MutationTree<NetworkState> = { const mutations: MutationTree<NetworkState> = {
becomeServer(state, payload: { local: LocalClient; server: PeerServer }) { becomeServer(state, payload: { local: LocalClient; server: PeerServer }) {
state.peerType = "server"; state.peerType = "server";
state.players = [payload.local.name];
(state as ServerNetworkState).local = payload.local; (state as ServerNetworkState).local = payload.local;
(state as ServerNetworkState).server = payload.server; (state as ServerNetworkState).server = payload.server;
}, },

View file

@ -80,10 +80,7 @@
</section> </section>
<section class="room" v-else> <section class="room" v-else>
<section class="info"> <section class="info">
Invite your friends: Session ID: <span class="selectable">{{ sessionID }}</span>
<span class="selectable"
><a :href="inviteLink">{{ inviteLink }}</a></span
>
</section> </section>
<section class="players"> <section class="players">
Players: Players:
@ -254,13 +251,6 @@ export default class Lobby extends Vue {
}; };
} }
private mounted() {
if ("id" in this.$route.params) {
this.joinSessionID = this.$route.params.id;
this.join();
}
}
private async create() { private async create() {
this.busy = true; this.busy = true;
this.startServer({ this.startServer({
@ -287,18 +277,5 @@ export default class Lobby extends Vue {
private get canJoin(): boolean { private get canJoin(): boolean {
return this.joinSessionID != ""; return this.joinSessionID != "";
} }
private get inviteLink(): string {
let subpath = "";
const joinIndex = location.pathname.indexOf("/join");
if (joinIndex > 0) {
subpath = location.pathname.substring(0, joinIndex);
}
const lobbyIndex = location.pathname.indexOf("/lobby");
if (lobbyIndex > 0) {
subpath = location.pathname.substring(0, lobbyIndex);
}
return `${location.origin}${subpath}/join/${this.sessionID}`;
}
} }
</script> </script>

View file

@ -6,7 +6,7 @@ module.exports = {
} }
}, },
publicPath: process.env.SUBPATH ? process.env.SUBPATH : "/", publicPath: process.env.SUBPATH ? process.env.SUBPATH : "",
pluginOptions: { pluginOptions: {
gitDescribe: { gitDescribe: {