Skip to content

Commit

Permalink
Merge pull request #4 from persistenceOne/website-v2
Browse files Browse the repository at this point in the history
Website v2
  • Loading branch information
Deepanshu Tripathi authored Aug 20, 2020
2 parents 61e0160 + 542c731 commit 0637462
Show file tree
Hide file tree
Showing 29 changed files with 5,723 additions and 3,880 deletions.
6,987 changes: 3,759 additions & 3,228 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"name": "Persistence",
"version": "0.1.0",
"homepage": "https://persistence.one/",
"private": true,
"dependencies": {
"@mdi/font": "^5.4.55",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"bootstrap": "^4.5.0",
"material-design-icons": "^3.0.1",
"node-sass": "^4.14.1",
"react": "^16.13.1",
"react-bootstrap": "^1.3.0",
Expand Down Expand Up @@ -43,6 +42,7 @@
},
"devDependencies": {
"babel-eslint": "10.0.3",
"eslint": "6.6.0"
"eslint": "6.6.0",
"grunt-webfont": "^1.7.2"
}
}
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta content="Protocol Powering Institutional Decentralized Finance" property="og:title">
<meta content="Persistence bridges DeFi and Traditional Finance by facilitating borrowing of Cryptoassets using Real-world assets as collateral"
name="description" property="og:description"/>
<title>Protocol Powering Institutional Decentralized Finance</title>
<title>Persistence: Protocol Powering Institutional Decentralized Finance</title>
<meta property="og:image" content="https://miro.medium.com/max/2400/2*XZtcdQitQNP5cAdZNAytVQ.jpeg"/>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.materialdesignicons.com/5.4.55/css/materialdesignicons.min.css" crossorigin="anonymous">
Expand Down
10 changes: 6 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React, { Component } from 'react';
import { Route, Switch, BrowserRouter as Router, HashRouter } from 'react-router-dom';
import { Route, Switch, BrowserRouter as Router } from 'react-router-dom';
import './css/style.css';
import './App.css';
const Team = React.lazy(() => import('./webpages/components/team'));
const Roadmap = React.lazy(() => import('./webpages/components/roadmap'));
const AppContainer = React.lazy(() => import('./webpages/components/appContainer'));
const homepage = React.lazy(() => import('./webpages/homepage'));

Expand All @@ -11,15 +12,16 @@ class App extends Component {
render() {

return (
<HashRouter>
<Router>
<React.Suspense fallback={<div>&nbsp;</div>}>
<Switch>
<Route exact path="/" component={homepage} />
<Route path="/team" component={Team} />
<Route path="/roadmap" component={Roadmap} />
<Route path="/content" component={AppContainer} />
</Switch>
</Switch>
</React.Suspense>
</HashRouter>
</Router>
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/assets/Layer.svg
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 src/assets/link.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 modified src/assets/map.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 src/assets/map01.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 removed src/assets/map1.png
Binary file not shown.
Binary file added src/assets/map_full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/assets/sample1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/assets/sample2.svg
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 src/assets/social-icons/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0637462

Please sign in to comment.