From d2c2cc62a4c2e1ac10f8434bea7bb834da820869 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sat, 16 Jan 2021 11:40:36 +0100 Subject: semi working next project --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 19859f6..440db5a 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@types/uuid": "^8.3.0", "axios": "^0.21.1", "email-validator": "^2.0.4", + "next": "^10.0.5", "react": "^17.0.1", "react-dom": "^17.0.1", "react-router-dom": "^5.2.0", @@ -22,10 +23,9 @@ "web-vitals": "^0.2.4" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject" + "dev": "next dev", + "build": "next build", + "start": "next start" }, "eslintConfig": { "extends": [ -- cgit v1.2.3 From 664ce3e6369b3ae306735f55aa2ac66a8d8654d9 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sat, 16 Jan 2021 12:31:56 +0100 Subject: backend proxy werkt :tada: --- .gitignore | 1 + api/main.py | 10 +++++----- next.config.js | 10 ++++++++++ package.json | 1 - 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 next.config.js (limited to 'package.json') diff --git a/.gitignore b/.gitignore index abb0c59..3bb937a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ database/*.db-journal # node / ts *.js +!next.config.js *.d.ts node_modules/ diff --git a/api/main.py b/api/main.py index f5907cc..0d16cbc 100644 --- a/api/main.py +++ b/api/main.py @@ -15,9 +15,9 @@ from auth.signup import signup from auth.login import login from auth.login_token import token -app.register_blueprint(status, url_prefix='/api') -app.register_blueprint(info, url_prefix='/api/user') -app.register_blueprint(signup, url_prefix='/api/auth') -app.register_blueprint(login, url_prefix='/api/auth') -app.register_blueprint(token, url_prefix='/api/auth') +app.register_blueprint(status, url_prefix='/') +app.register_blueprint(info, url_prefix='/user') +app.register_blueprint(signup, url_prefix='/auth') +app.register_blueprint(login, url_prefix='/auth') +app.register_blueprint(token, url_prefix='/auth') diff --git a/next.config.js b/next.config.js new file mode 100644 index 0000000..e70331f --- /dev/null +++ b/next.config.js @@ -0,0 +1,10 @@ +module.exports = { + async rewrites() { + return [ + { + source: '/api/:path*', + destination: 'http://localhost:5000/:path*' + }, + ] + }, +} diff --git a/package.json b/package.json index 440db5a..e97d3c1 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "last 1 safari version" ] }, - "proxy": "http://localhost:5000", "devDependencies": { "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", -- cgit v1.2.3 From 3fc06ea736283ad38bb51b932ab0e91dae081159 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sat, 16 Jan 2021 14:51:20 +0100 Subject: home pagina "gefixt" --- package.json | 1 + pages/index.tsx | 13 ++++++------- yarn.lock | 12 ++++++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index e97d3c1..be14a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "react-dom": "^17.0.1", "react-router-dom": "^5.2.0", "react-scripts": "^4.0.1", + "swr": "^0.4.0", "typescript": "^4.1.3", "uuid": "^8.3.2", "web-vitals": "^0.2.4" diff --git a/pages/index.tsx b/pages/index.tsx index b3e0e1f..9c56f52 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -63,20 +63,19 @@ export default class HomePage extends Component { getUserInfo () { axios.request({ method: "get", - url: `${window.location.origin}/api/user/info`, + url: `/api/user/info`, headers: {"content-type": "application/json"} }) - .then(request => this.setState({ info: request.data })) + .then(request => this.setState({ + info: request.data, + loggedIn: request.data == {} + })) .catch(console.log); } constructor(props: {}) { super(props); - - useEffect(() => { - this.setState({ loggedIn: document.cookie.includes("token") }) - if(this.state.loggedIn) this.getUserInfo() - }) + this.getUserInfo(); } render () { diff --git a/yarn.lock b/yarn.lock index edd629e..0c61eda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4437,6 +4437,11 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= +dequal@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d" + integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug== + des.js@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" @@ -11438,6 +11443,13 @@ svgo@^1.0.0, svgo@^1.2.2: unquote "~1.1.1" util.promisify "~1.0.0" +swr@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/swr/-/swr-0.4.0.tgz#e76da9f981fe6dee0e133289e9b582fc80d9c41d" + integrity sha512-70qd1FHYHwIdYXW0jTpm5ktitzvPBCtyKz8ZzynWlY/rMqe4drYPgcl/H9Ipuh+Xv6ZW5viNx13ro8EKIWZcoQ== + dependencies: + dequal "2.0.2" + symbol-observable@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" -- cgit v1.2.3