Merged electron into main code. One unified codebase for both web and native version of client.

This commit is contained in:
Håvar Aambø Fosstveit
2019-11-10 23:57:28 +01:00
parent aea08b4cbe
commit 99dd6433a6
12 changed files with 230 additions and 45 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
import React, { useEffect, Suspense } from 'react';
import { useParams} from 'react-router';
import { useParams } from 'react-router';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import JoinDialog from './JoinDialog';
@@ -14,7 +14,7 @@ const App = (props) =>
room
} = props;
let { id } = useParams();
const { id } = useParams();
useEffect(() =>
{