Skip to content

Commit

Permalink
Merge pull request #6 from altmshfkgudtjr/develop
Browse files Browse the repository at this point in the history
Internet Explorer Redirection & Library modified.
  • Loading branch information
altmshfkgudtjr authored Nov 8, 2020
2 parents ae9744c + 0ff1096 commit 9e4dbaa
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 19 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"prop-types": "^15.7.2",
"react-immutable-proptypes": "^2.2.0",
"redux-mock-store": "^1.5.4"
},
"license": "MIT",
Expand Down
5 changes: 4 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import App from './App'
import * as serviceWorker from './serviceWorker'
import { BrowserRouter } from 'react-router-dom'
import { Provider } from 'react-redux'
import { HelmetProvider } from "react-helmet-async"
// Store
import store from 'store/index'

ReactDOM.render(
<React.StrictMode>
<BrowserRouter>
<Provider store={store}>
<App />
<HelmetProvider>
<App />
</HelmetProvider>
</Provider>
</BrowserRouter>
</React.StrictMode>,
Expand Down
9 changes: 7 additions & 2 deletions src/pages/HomePage.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
import React from 'react'
import { Helmet } from "react-helmet-async"
// components
import Section from 'components/home/Section'
import Title from 'components/home/Title'
import Post from 'components/home/Post'
import Btn from 'components/home/Btn'

const HomePage = () => {
return (
return (<>
<Helmet>
<title>APP-NAME</title>
</Helmet>

<Section>
<Title>Hello React</Title>
<Post>This is simple <strong>React</strong> template!</Post>
<Post>Create new your app using this template.</Post>
<Post>If you want to check the refernece? Click this <a href="https://github.com/altmshfkgudtjr/Simple-React-Template/blob/master/README.md">README.md</a> file.</Post>
<Btn />
</Section>
);
</>);
}

export default HomePage
19 changes: 11 additions & 8 deletions src/pages/NotFound.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import React from 'react';
import { Helmet } from "react-helmet-async"
import { Link } from 'react-router-dom'
import styled from 'styled-components'
// lib
import { transition, noselect } from 'lib/styles/styles'
import palette from 'lib/styles/palette'

function NoPage() {
return (
<>
<Title>404 Not Found.</Title>
<Link to="/">
<Btn>Back</Btn>
</Link>
</>
);
return (<>
<Helmet>
<title>APP-NAME - 404</title>
</Helmet>

<Title>404 Not Found.</Title>
<Link to="/">
<Btn>Back</Btn>
</Link>
</>);
}

const Title = styled.div`
Expand Down
3 changes: 3 additions & 0 deletions src/pages/RedirectPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import styled from 'styled-components'
import { transition, noselect } from 'lib/styles/styles'

const RedirectPage = ()=> {
/* If you want to redirect to Microsoft-Edge, uncomment the code below */
// window.location.href = "microsoft-edge:http:App-Domain.com";

return (
<Container>
<Title>This browser is not supported.</Title>
Expand Down
7 changes: 0 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8792,13 +8792,6 @@ react-helmet-async@^1.0.6:
react-fast-compare "^3.2.0"
shallowequal "^1.1.0"

react-immutable-proptypes@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz#cce96d68cc3c18e89617cbf3092d08e35126af4a"
integrity sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==
dependencies:
invariant "^2.2.2"

react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.9.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
Expand Down

0 comments on commit 9e4dbaa

Please sign in to comment.