Skip to content

Added Contact component for the website. #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rohitk2001 wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Added Contact component for the website. #31

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0432ff0
Added contact.js
rohitk2001 Nov 15, 2020
552d8f7
Create images
rohitk2001 Nov 15, 2020
46649ca
Delete images
rohitk2001 Nov 15, 2020
2db2b67
Create delete
rohitk2001 Nov 15, 2020
22a0121
Added social media images.
rohitk2001 Nov 15, 2020
f60aef3
Delete delete
rohitk2001 Nov 15, 2020
27747d2
Updated App.js with Contact component.
rohitk2001 Nov 15, 2020
f31d31c
Merge branch 'dev' into dev
rohitk2001 Nov 15, 2020
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
Prev Previous commit
Merge branch 'dev' into dev
  • Loading branch information
@rohitk2001
rohitk2001 authored Nov 15, 2020
commit f31d31cf3cb4b7cbaec71a086f8012792201cd98
14 changes: 7 additions & 7 deletions src/views/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import { Router, Route, Redirect, Switch } from "react-router-dom";
import { ThemeProvider } from "@material-ui/core/styles";
import { CssBaseline } from "@material-ui/core";

import createBrowserHistory from "../history";
import Hello from "./Hello";
import Navbar from "./Navbar";

import createBrowserHistory from '../config/history';
import Home from './Home';
import Navbar from '../components/Navbar';
import ImageAvatars from "./Contact/Contact";
import theme from '../config/theme';

import theme from "../theme";

const App = () => {
return (
Expand All @@ -19,9 +20,8 @@ const App = () => {
<Router history={createBrowserHistory}>
<Navbar />
<Switch>
<Navbar />
<Route path="/" exact>
<Hello />
<Route path='/' exact>
<Home />
</Route>
<Redirect to="/" />
</Switch>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.