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

trasaction table ui #12

Open
wants to merge 9 commits into
base: development
Choose a base branch
from
Open

trasaction table ui #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fdd47e6
added transaction table
safinghoghabori Jun 5, 2021
708ce6e
transation table file changed
safinghoghabori Jun 5, 2021
dabe11f
Merge branch 'development' of https://github.com/DoorstepDelhi/Seller…
safinghoghabori Jun 5, 2021
ef51d6d
transaaction table css file added
safinghoghabori Jun 6, 2021
afeb8e5
transaction table ui completed
safinghoghabori Jun 7, 2021
7d9b3a3
transaction table customiser changed
safinghoghabori Jun 7, 2021
7c4d4d8
order returns table completed
safinghoghabori Jun 8, 2021
5448cc0
order details page completed
safinghoghabori Jun 13, 2021
2919940
prop-types added
safinghoghabori Jun 15, 2021
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
40 changes: 0 additions & 40 deletions .eslintrc
View file
Open in desktop

This file was deleted.

157 changes: 150 additions & 7 deletions package-lock.json
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-highlight-words": "^0.17.0",
"react-redux": "^7.2.4",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.1",
"react-smooth-scrollbar": "^8.0.6",
"react-table": "^7.7.0",
"reactstrap": "^8.7.1",
"redux": "^4.1.0",
"redux-actions": "^2.6.5",
"redux-form": "^8.3.7",
"redux-thunk": "^2.3.0",
"smooth-scrollbar": "^8.5.3"
},
"devDependencies": {
Expand Down
32 changes: 18 additions & 14 deletions src/containers/App/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import 'bootstrap/dist/css/bootstrap.css';
import '../../scss/app.scss';
import Router from './Router';
import ScrollToTop from './ScrollToTop';
import store from './store';
import { connect, Provider } from 'react-redux';

const App = () => {
const [isLoading, setIsLoading] = useState(true);
Expand All @@ -17,22 +19,24 @@ const App = () => {
}, []);

return (
<BrowserRouter>
<ScrollToTop>
{!isLoaded && (
<div className={`load${isLoading ? '' : ' loaded'}`}>
<div className="load__icon-wrap">
<svg className="load__icon">
<path fill="#4ce1b6" d="M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z" />
</svg>
<Provider store={store}>
<BrowserRouter>
<ScrollToTop>
{!isLoaded && (
<div className={`load${isLoading ? '' : ' loaded'}`}>
<div className="load__icon-wrap">
<svg className="load__icon">
<path fill="#4ce1b6" d="M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z" />
</svg>
</div>
</div>
)}
<div>
<Router />
</div>
)}
<div>
<Router />
</div>
</ScrollToTop>
</BrowserRouter>
</ScrollToTop>
</BrowserRouter>
</Provider>
);
};

Expand Down
Loading