Skip to content
This repository was archived by the owner on Oct 30, 2022. It is now read-only.

Commit 483c2b6

Browse files
authored
Team member & Google (#93)
* Drawing board bug fix * Team details Signed-off-by: codewithvk <[email protected]>
1 parent bbd2b77 commit 483c2b6

File tree

11 files changed

+148
-8
lines changed

11 files changed

+148
-8
lines changed

Diff for: client/package-lock.json

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: client/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"react-avatar": "^3.10.0",
2929
"react-dom": "^17.0.2",
3030
"react-draft-wysiwyg": "^1.14.7",
31+
"react-ga": "^3.3.0",
3132
"react-google-login": "^5.2.2",
3233
"react-icons": "^4.3.1",
3334
"react-loader-advanced": "^1.7.1",

Diff for: client/public/image/Team/1637646334769.png

537 KB
Loading

Diff for: client/public/image/Team/harsh.JPG

4.72 MB
Loading

Diff for: client/public/image/Team/jayraj.jpg

87.5 KB
Loading

Diff for: client/public/image/Team/vivek.JPG

5.93 MB
Loading

Diff for: client/src/App.js

+9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import Register from './Components/Auth/Register/Register';
1313
import Cookies from 'universal-cookie';
1414
import ProtectedRoute from './Protected'
1515
import Trial from './trial';
16+
import ReactGA from 'react-ga';
17+
import TeamPage from './Components/Team Page/TeamPage'
1618
import NotFound from './Components/NotFound/NotFound';
1719
const cookies = new Cookies();
1820
const history = createBrowserHistory();
@@ -22,6 +24,11 @@ function App() {
2224
// useEffect(() => {
2325
// console.log({ authroot: isAuthenticated });
2426
// }, [isAuthenticated])
27+
useEffect(() => {
28+
ReactGA.initialize('UA-213485416-1');
29+
ReactGA.pageview(window.location.pathname + window.location.search);
30+
},[])
31+
2532
const [loginUser, setLoginUser] = useState(null)
2633

2734

@@ -40,6 +47,8 @@ function App() {
4047
<Route path='/newRoom' render={(props) => isAuthenticated ? <CreateRoom {...props} /> : <Redirect to="/login" />} exact />
4148
<Route path='/editor' render={Editor} exact />
4249
<Route path='/trial' render={(props) => <Trial {...props} />} exact />
50+
<Route path="/team" component={TeamPage} exact />
51+
4352
</Router>
4453
);
4554
}

Diff for: client/src/Components/FrontPage/FrontPage.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ function FrontPage(props) {
5252
Room
5353
</a>
5454
<a
55-
href="/trial"
55+
href="/team"
5656
className="hover:no-underline hover:text-gray-200 hover:bg-indigo-500 text-black px-3 py-2 rounded-md text-base font-semibold "
5757
>
58-
Trial
58+
Our Team
5959
</a>
6060

6161
</div>
@@ -147,25 +147,25 @@ function FrontPage(props) {
147147
Room
148148
</a>
149149
<a
150-
href="/trial"
150+
href="/team"
151151
className="hover:no-underline hover:text-gray-200 hover:bg-indigo-500 text-black block px-3 py-2 rounded-md text-base font-medium"
152152
>
153-
Trial
153+
Our Team
154154
</a>
155155

156156

157157
</div>
158158
<div>
159159
<a
160-
href="/login"
160+
href="/register"
161161
type='submit'
162162
className="w-full flex items-center justify-center px-4 py-2 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-indigo-600 hover:bg-indigo-700"
163163
>
164164
Sign up
165165
</a>
166166
<p className="mt-6 text-center text-base font-medium text-gray-500">
167167
Existing customer?{' '}
168-
<a href="/register"
168+
<a href="/login"
169169
type="submit"
170170
className="text-indigo-600 hover:text-indigo-500">
171171
Sign in

Diff for: client/src/Components/Header/Header.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,12 @@ function Header(props) {
117117
>
118118
Join Room
119119
</a>
120-
120+
<a
121+
href="/team"
122+
className="hover:no-underline hover:text-gray-200 hover:bg-indigo-500 text-black px-3 py-2 rounded-md text-base font-semibold "
123+
>
124+
Our Team
125+
</a>
121126
</div>
122127
</div>
123128
</div>
@@ -212,6 +217,12 @@ function Header(props) {
212217
>
213218
Join Room
214219
</a>
220+
<a
221+
href="/team"
222+
className="hover:no-underline hover:text-gray-200 hover:bg-indigo-500 text-black block px-3 py-2 rounded-md text-base font-medium"
223+
>
224+
Our Team
225+
</a>
215226
</div>
216227
<div>
217228
<button

0 commit comments

Comments
 (0)