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

Team member & Google #93

Merged
merged 2 commits into from
Nov 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions client/package-lock.json

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

1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"react-avatar": "^3.10.0",
"react-dom": "^17.0.2",
"react-draft-wysiwyg": "^1.14.7",
"react-ga": "^3.3.0",
"react-google-login": "^5.2.2",
"react-icons": "^4.3.1",
"react-loader-advanced": "^1.7.1",
Expand Down
Binary file added client/public/image/Team/1637646334769.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/image/Team/harsh.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/image/Team/jayraj.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/image/Team/vivek.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import Register from './Components/Auth/Register/Register';
import Cookies from 'universal-cookie';
import ProtectedRoute from './Protected'
import Trial from './trial';
import ReactGA from 'react-ga';
import TeamPage from './Components/Team Page/TeamPage'
import NotFound from './Components/NotFound/NotFound';
const cookies = new Cookies();
const history = createBrowserHistory();
Expand All @@ -22,6 +24,11 @@ function App() {
// useEffect(() => {
// console.log({ authroot: isAuthenticated });
// }, [isAuthenticated])
useEffect(() => {
ReactGA.initialize('UA-213485416-1');
ReactGA.pageview(window.location.pathname + window.location.search);
},[])

const [loginUser, setLoginUser] = useState(null)


Expand All @@ -40,6 +47,8 @@ function App() {
<Route path='/newRoom' render={(props) => isAuthenticated ? <CreateRoom {...props} /> : <Redirect to="/login" />} exact />
<Route path='/editor' render={Editor} exact />
<Route path='/trial' render={(props) => <Trial {...props} />} exact />
<Route path="/team" component={TeamPage} exact />

</Router>
);
}
Expand Down
12 changes: 6 additions & 6 deletions client/src/Components/FrontPage/FrontPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ function FrontPage(props) {
Room
</a>
<a
href="/trial"
href="/team"
className="hover:no-underline hover:text-gray-200 hover:bg-indigo-500 text-black px-3 py-2 rounded-md text-base font-semibold "
>
Trial
Our Team
</a>

</div>
Expand Down Expand Up @@ -147,25 +147,25 @@ function FrontPage(props) {
Room
</a>
<a
href="/trial"
href="/team"
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"
>
Trial
Our Team
</a>


</div>
<div>
<a
href="/login"
href="/register"
type='submit'
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"
>
Sign up
</a>
<p className="mt-6 text-center text-base font-medium text-gray-500">
Existing customer?{' '}
<a href="/register"
<a href="/login"
type="submit"
className="text-indigo-600 hover:text-indigo-500">
Sign in
Expand Down
13 changes: 12 additions & 1 deletion client/src/Components/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,12 @@ function Header(props) {
>
Join Room
</a>

<a
href="/team"
className="hover:no-underline hover:text-gray-200 hover:bg-indigo-500 text-black px-3 py-2 rounded-md text-base font-semibold "
>
Our Team
</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -212,6 +217,12 @@ function Header(props) {
>
Join Room
</a>
<a
href="/team"
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"
>
Our Team
</a>
</div>
<div>
<button
Expand Down
Loading