Merged master branch

This commit is contained in:
Liyas Thomas
2020-01-23 17:07:19 +05:30
parent 2efc549aca
commit ab336de732

View File

@@ -665,15 +665,8 @@ import intializePwa from "../assets/js/pwa";
import * as version from "../.postwoman/version.json"; import * as version from "../.postwoman/version.json";
import { hasChromeExtensionInstalled } from "../functions/strategies/ChromeStrategy"; import { hasChromeExtensionInstalled } from "../functions/strategies/ChromeStrategy";
import firebase from 'firebase/app'; import firebase from 'firebase/app';
import 'firebase/auth'; import { fb } from '../functions/fb';
import { store } from '../functions/store';
import Login from '../components/Login';
import InputForm from '../components/InputForm';
import BallsFeed from '../components/BallsFeed';
export default { export default {
components: { components: {
@@ -716,7 +709,8 @@ export default {
showShortcuts: false, showShortcuts: false,
showSupport: false, showSupport: false,
firefoxExtInstalled: window.firefoxExtSendRequest, firefoxExtInstalled: window.firefoxExtSendRequest,
chromeExtInstalled: window.chrome && hasChromeExtensionInstalled() chromeExtInstalled: window.chrome && hasChromeExtensionInstalled(),
fb
}; };
}, },