Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
kavienanj authored Nov 14, 2020
2 parents dad063e + 83e7a16 commit 9901f02
Show file tree
Hide file tree
Showing 8 changed files with 336 additions and 62 deletions.
15 changes: 0 additions & 15 deletions .firebase/hosting.YnVpbGQ.cache

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ yarn-error.log*

debug.log
.firebase/hosting.*
.firebase/hosting.YnVpbGQ.cache
.firebase/hosting.YnVpbGQ.cache
.firebase/hosting.YnVpbGQ.cache
45 changes: 45 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

91 changes: 46 additions & 45 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
{
"name": "btui-2020",
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.11.5",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"bootstrap": "^4.5.3",
"firebase": "8.0.1",
"jquery": "^3.5.1",
"popper.js": "^1.16.1",
"react": "^17.0.1",
"react-bootstrap": "^1.4.0",
"react-dom": "^17.0.1",
"react-hook-form": "^6.10.1",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.0",
"web-vitals": "^0.2.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"keywords": [],
"description": "Official BTUI'20 site"
"name": "btui-2020",
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.11.5",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"bootstrap": "^4.5.3",
"firebase": "8.0.1",
"jquery": "^3.5.1",
"popper.js": "^1.16.1",
"react": "^17.0.1",
"react-bootstrap": "^1.4.0",
"react-dom": "^17.0.1",
"react-hook-form": "^6.10.1",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.0",
"react-youtube": "^7.13.0",
"web-vitals": "^0.2.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"keywords": [],
"description": "Official BTUI'20 site"
}
5 changes: 5 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import ValorantRegProcess from "./views/valorantRegProcess";
import MinecraftRegProcess from "./views/minecraftRegProcess";
import DotaRegProcess from "./views/dotaRegProcess";
import RocketLeagueRegProcess from "./views/rocketLeagueRegProcess";
import LiveView from "./widgets/livePage";

function App() {
return (
Expand Down Expand Up @@ -95,6 +96,10 @@ function App() {
<Dashbash />
</Route>
<Route exact path="/frostbyte"><Frostbyte /></Route>

<Route exact path="/live">
<LiveView liveLocation="mainLive" />
</Route>
</Switch>
</Router>
);
Expand Down
3 changes: 3 additions & 0 deletions src/views/frostbyte.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import React from "react";
import Carousel from 'react-bootstrap/Carousel';
import * as consts from '../utils/consts.js';

import {analytics} from '../utils/firebase';

import Countdown from '../widgets/countdown';
import FRB_TIMELINE from '../widgets/frbTimeLine';

Expand All @@ -24,6 +26,7 @@ const rulesInEvent = [
];

function Frostbyte() {
analytics.logEvent("frb_page_visit")
let elem = (
<div>
<div className="fb_main_div">
Expand Down
Loading

0 comments on commit 9901f02

Please sign in to comment.