Skip to content
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

Jump to bottom

Translation2 #54

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

Translation2 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3449494
Feat: combine all Home page
WatheqAlshowaiter Nov 11, 2020
d594907
Merge branch 'develop' into developBackup
WatheqAlshowaiter Nov 11, 2020
8f87326
Feat: complete the combining the routing
WatheqAlshowaiter Nov 11, 2020
ad888a8
Fix: fix routing problems
WatheqAlshowaiter Nov 12, 2020
f7b4282
Feat: Building the firebase setup
SondosAhmed Nov 14, 2020
40f7d8c
Feat: Connecting Post Form To Firebase
SondosAhmed Nov 14, 2020
1688d77
Feat: Connecting firebase to missing people cards
SondosAhmed Nov 14, 2020
4ef413e
Feat: Connecting firebase to missing people cards
SondosAhmed Nov 14, 2020
96e2e63
Feat: Connecting Successful stories to firebase
SondosAhmed Nov 14, 2020
db6d18e
Feat: Adding 4 tailwind styles to config file
SondosAhmed Nov 14, 2020
736b367
Feat: Adding some styles to ContactUs Page
SondosAhmed Nov 14, 2020
e83417d
feat: add translation
AhmedAl-Majidi Nov 14, 2020
ef1ca5a
fix: edit some translation issues
AhmedAl-Majidi Nov 16, 2020
2cccc94
Merge branch 'master' into translation2
maqalaqil Nov 16, 2020
b1967fa
Revert "Merge branch 'master' into translation2"
maqalaqil Nov 16, 2020
177739e
Revert "fix: edit some translation issues"
maqalaqil Nov 16, 2020
4677454
revert
maqalaqil Nov 16, 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
2 changes: 1 addition & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"destructuring": "all"
}
],
"arrow-body-style": [2, "as-needed"],
// "arrow-body-style": [2, "as-needed"],
"no-unused-expressions": [
2,
{
Expand Down
7 changes: 6 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,24 @@
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.56",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/user-event": "^7.1.2",
"autoprefixer": "^9.8.6",
"firebase": "^8.0.1",
"i18next": "^19.8.3",
"i18next-browser-languagedetector": "^6.0.1",
"material-ui-icons": "^1.0.0-beta.36",
"node-sass": "4.14.1",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-elastic-carousel": "^0.9.1",
"react-i18next": "^9.0.10",
"react-i18next": "^11.7.3",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3",
"react-scroll-up-button": "^1.6.4",
"react-spring": "^8.0.27",
"styled-components": "^5.2.0",
"tailwindcss": "^1.9.5"
},
Expand Down
39 changes: 22 additions & 17 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
import React from 'react';
import React, { Suspense } from 'react';
import './styles/main.css';
import ContacUs from './containers/ContactUs/ContactUsContainer';
import RouterPage from './router/RouterPages';

// import ContacUs from './containers/ContactUs/ContactUsContainer';
import Footer from './containers/Home/FooterSection';
import Navbar from './components/navbar/NavBar';
import SliderCards from './containers/Home/SliderCards';
import WebsiteDescription from './containers/WebsiteDescription/WebsiteDescription';
import MissingPeople from './containers/HomePage/MissingPeople';
import Statistics from './components/Statistics/Statistics.js';
import info from './components/Statistics/data';
// import SliderCards from './containers/Home/SliderCards';
// import WebsiteDescription from './containers/WebsiteDescription/WebsiteDescription';
// import MissingPeople from './containers/HomePage/MissingPeople';
// import Statistics from './components/Statistics/Statistics.js';
// import info from './components/Statistics/data';

function App() {
return (
<div className="App bg-findMe">
<Navbar />
<hr />
<SliderCards />
// test pages
// import C from './pages/Contactus';

<Statistics info={info} />
<WebsiteDescription />
<MissingPeople />
/* <Navbar />
<Router />
<Footer />
</div>
*/

function App() {
return (
<Suspense fallback="loading">
<div className="App bg-findMe">
<RouterPage />
</div>
</Suspense>
);
}

Expand Down
Loading