Skip to content

Feature implementation from commits 7ce106a..390abb1 #2

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.

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
wants to merge 25 commits into
base: feature-base-2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d0f5c6e
Upgrade to GitHub-native Dependabot
dependabot-preview[bot] Apr 28, 2021
753afe1
Merge pull request #426 from dunky11/dependabot/add-v2-config-file
dunky11 May 1, 2021
17f8717
Fixed back button not going back in history
dunky11 May 3, 2021
92defe7
Remove Dependabot badge
dunky11 May 5, 2021
5f82926
Bump date-fns from 2.21.1 to 2.21.2
dependabot[bot] May 6, 2021
c8c03c1
Merge pull request #431 from dunky11/dependabot/npm_and_yarn/date-fns…
dunky11 May 6, 2021
703c3f4
Bump date-fns from 2.21.2 to 2.21.3
dependabot[bot] May 10, 2021
77ee496
Merge pull request #432 from dunky11/dependabot/npm_and_yarn/date-fns…
dunky11 May 10, 2021
1f3ca4d
Bump @testing-library/user-event from 13.1.8 to 13.1.9
dependabot[bot] May 13, 2021
fc28b3d
Merge pull request #433 from dunky11/dependabot/npm_and_yarn/testing-…
dunky11 May 14, 2021
c557aea
Bump @testing-library/react from 11.2.6 to 11.2.7
dependabot[bot] May 17, 2021
5530dcf
Merge pull request #434 from dunky11/dependabot/npm_and_yarn/testing-…
dunky11 May 17, 2021
cf5b1b3
Bump @stripe/react-stripe-js from 1.4.0 to 1.4.1
dependabot[bot] May 19, 2021
667496d
Merge pull request #436 from dunky11/dependabot/npm_and_yarn/stripe/r…
dunky11 May 20, 2021
bb75d0d
Bump @stripe/stripe-js from 1.14.0 to 1.15.0
dependabot[bot] May 20, 2021
6fdd342
Merge pull request #435 from dunky11/dependabot/npm_and_yarn/stripe/s…
dunky11 May 20, 2021
cfec365
Bump date-fns from 2.21.3 to 2.22.1
dependabot[bot] May 31, 2021
a1cfeb3
Merge pull request #437 from dunky11/dependabot/npm_and_yarn/date-fns…
dunky11 May 31, 2021
260b37e
Update README.md
dunky11 Jun 3, 2021
ab2f20f
Update README.md
dunky11 Jun 3, 2021
9f37cce
Bump @testing-library/jest-dom from 5.12.0 to 5.13.0
dependabot[bot] Jun 4, 2021
7c18bbc
Merge pull request #438 from dunky11/dependabot/npm_and_yarn/testing-…
dunky11 Jun 4, 2021
2bb4f29
Bump @testing-library/jest-dom from 5.13.0 to 5.14.1
dependabot[bot] Jun 14, 2021
1b37682
Merge pull request #439 from dunky11/dependabot/npm_and_yarn/testing-…
dunky11 Jun 14, 2021
390abb1
Bump @testing-library/react from 11.2.7 to 12.0.0
dependabot[bot] Jun 24, 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
37 changes: 37 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
reviewers:
- dunky11
ignore:
- dependency-name: "@date-io/date-fns"
versions:
- ">= 2.3.a, < 2.4"
- dependency-name: "@date-io/date-fns"
versions:
- ">= 2.4.a, < 2.5"
- dependency-name: "@date-io/date-fns"
versions:
- ">= 2.a, < 3"
- dependency-name: workbox-strategies
versions:
- 6.1.5
- dependency-name: "@testing-library/react"
versions:
- 11.2.6
- dependency-name: "@testing-library/user-event"
versions:
- 12.6.3
- 12.7.2
- 13.0.10
- 13.0.13
- 13.0.6
- 13.0.7
- dependency-name: workbox-google-analytics
versions:
- 6.1.1
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Remains of a SaaS business I once tried to build. Now transformed into a templat
[**Check out the demo**](https://reactsaastemplate.com)

![Node.js CI](https://github.com/dunky11/react-saas-template/workflows/Node.js%20CI/badge.svg)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=dunky11/react-saas-template)](https://dependabot.com)
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)

[<img src="/.github/gifs/showcase.gif">](https://reactsaastemplate.com "Go to demo website")
Expand Down Expand Up @@ -51,13 +50,13 @@ Your browser should now open and show the app. Otherwise open http://localhost:3

If you are new to React, you should watch a [basic React tutorial](https://www.youtube.com/results?search_query=react+tutorial) first.

If you already know React, then most of the information you need is in the [Material-UI documentation](https://material-ui.com/getting-started/usage/).
If you know React, then most of the information you need is in the [Material-UI documentation](https://material-ui.com/getting-started/usage/).

You can go into [src/theme.js](/src/theme.js) and change the primary and secondary color codes at the top of the script to the values you like and some magic will happen.

## Deployment

If you are happy with the state of your website you can run:
If you are satisfied with the state of your website you can run:

```
npm run build
Expand Down
126 changes: 75 additions & 51 deletions package-lock.json

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

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"@material-ui/icons": "^4.11.2",
"@material-ui/pickers": "^3.3.10",
"@material-ui/system": "^4.11.3",
"@stripe/react-stripe-js": "^1.4.0",
"@stripe/stripe-js": "^1.14.0",
"@stripe/react-stripe-js": "^1.4.1",
"@stripe/stripe-js": "^1.15.0",
"aos": "^2.3.4",
"classnames": "^2.3.1",
"date-fns": "^2.21.1",
"date-fns": "^2.22.1",
"emoji-mart": "^3.0.1",
"js-cookie": "^2.2.0",
"prop-types": "^15.7.2",
Expand All @@ -40,9 +40,9 @@
"workbox-streams": "^6.1.5"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"@testing-library/user-event": "^13.1.8"
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0",
"@testing-library/user-event": "^13.1.9"
},
"scripts": {
"start": "react-scripts start",
Expand Down
2 changes: 2 additions & 0 deletions src/logged_in/components/Routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Dashboard from "./dashboard/Dashboard";
import Posts from "./posts/Posts";
import Subscription from "./subscription/Subscription";
import PropsRoute from "../../shared/components/PropsRoute";
import useLocationBlocker from "../../shared/functions/useLocationBlocker";

const styles = (theme) => ({
wrapper: {
Expand Down Expand Up @@ -64,6 +65,7 @@ function Routing(props) {
selectSubscription,
openAddBalanceDialog,
} = props;
useLocationBlocker();
return (
<div className={classes.wrapper}>
<Switch>
Expand Down
2 changes: 2 additions & 0 deletions src/logged_out/components/Routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import PropsRoute from "../../shared/components/PropsRoute";
import Home from "./home/Home";
import Blog from "./blog/Blog";
import BlogPost from "./blog/BlogPost";
import useLocationBlocker from "../../shared/functions/useLocationBlocker";

function Routing(props) {
const { blogPosts, selectBlog, selectHome } = props;
useLocationBlocker();
return (
<Switch>
{blogPosts.map((post) => (
Expand Down
Loading