From 595cca4a7bf4f9aea4f0250f742843dbe3dd30ac Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Fri, 28 Apr 2023 09:18:40 +0200 Subject: [PATCH 1/6] [TESTING] Lenra Routes --- lenra.yml | 3 +++ src/index.gen.js | 3 ++- src/manifest.js | 18 +++++++++++++++++- src/views/home.js | 12 ++++++++++++ src/views/newPage.js | 13 +++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/views/newPage.js diff --git a/lenra.yml b/lenra.yml index d05cb46..44d1dbd 100644 --- a/lenra.yml +++ b/lenra.yml @@ -28,3 +28,6 @@ generator: - "**" - "!/*.json" - "!/src/" +dev: + devtool: + tag: local diff --git a/src/index.gen.js b/src/index.gen.js index 2564577..f3444a8 100644 --- a/src/index.gen.js +++ b/src/index.gen.js @@ -2,7 +2,8 @@ export const views = { "counter": "counter", "home": "home", "main": "main", - "menu": "menu" + "menu": "menu", + "newPage": "newPage" }; export const listeners = { "increment": "increment", diff --git a/src/manifest.js b/src/manifest.js index 2e20575..3962551 100644 --- a/src/manifest.js +++ b/src/manifest.js @@ -1,3 +1,19 @@ import { views } from "./index.gen.js"; -export const rootView = views.main; \ No newline at end of file +// export const rootView = views.main; +export const lenraRoutes = [ + { + path: "/:id", + view: { + type: "view", + name: "main" + } + }, + { + path: "/newPage/:id", + view: { + type: "view", + name: "newPage" + } + } +] \ No newline at end of file diff --git a/src/views/home.js b/src/views/home.js index 68c967e..f228bf5 100644 --- a/src/views/home.js +++ b/src/views/home.js @@ -15,6 +15,18 @@ export default function (_data, _props) { "user": "global" }) .props({ text: "The common counter" }), + { + type: "button", + text: "@lenra", + onPressed: { + action: "@lenra:navTo", + props: { path: "/newPage/1" } + } + }, + { + type: "text", + value: "@me" + } ]) .direction("vertical") .spacing(16) diff --git a/src/views/newPage.js b/src/views/newPage.js new file mode 100644 index 0000000..f7f204c --- /dev/null +++ b/src/views/newPage.js @@ -0,0 +1,13 @@ +export default function (_data, _props) { + return { + type: "button", + text: "NEW PAGE", + onPressed: { + action: "@lenra:navTo", + props: { + path: "/", + test: "@id" + } + } + } +} \ No newline at end of file From 1e3923c4f27ee9ccb39fb1de3072e94e941dc602 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Fri, 28 Apr 2023 09:21:21 +0200 Subject: [PATCH 2/6] fix for check template --- src/manifest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifest.js b/src/manifest.js index 3962551..a2f59ad 100644 --- a/src/manifest.js +++ b/src/manifest.js @@ -3,7 +3,7 @@ import { views } from "./index.gen.js"; // export const rootView = views.main; export const lenraRoutes = [ { - path: "/:id", + path: "/", view: { type: "view", name: "main" From 4a8a32b9c28e1b7002f7b7da2c7f6f07759daac8 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Fri, 28 Apr 2023 09:54:02 +0200 Subject: [PATCH 3/6] Some testing --- src/manifest.js | 12 +++++++++++- src/views/newPage.js | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/manifest.js b/src/manifest.js index a2f59ad..a2f445c 100644 --- a/src/manifest.js +++ b/src/manifest.js @@ -13,7 +13,17 @@ export const lenraRoutes = [ path: "/newPage/:id", view: { type: "view", - name: "newPage" + name: "newPage", + props: { + id: "@route.id", + route: "@route", + me: "@me" + }, + query: { + id: "@me", + route: "@route", + routeId: "@route.id" + } } } ] \ No newline at end of file diff --git a/src/views/newPage.js b/src/views/newPage.js index f7f204c..596df07 100644 --- a/src/views/newPage.js +++ b/src/views/newPage.js @@ -1,4 +1,6 @@ export default function (_data, _props) { + console.log(_props); + console.log(_data); return { type: "button", text: "NEW PAGE", From 0a062bba63d51d9231eb0c320430a3f57b2370ea Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Mon, 15 May 2023 15:57:22 +0200 Subject: [PATCH 4/6] Update deps --- package-lock.json | 68 ++++++++++++++++++++++++++++------------------- package.json | 4 +-- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea3b37c..4f920c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,17 +9,17 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@lenra/app-server": "^1.0.0-beta.1", - "@lenra/components": "^1.0.0-beta.5" + "@lenra/app-server": "^1.0.0-beta.2", + "@lenra/components": "^1.0.0-beta.7" } }, "node_modules/@lenra/app-server": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@lenra/app-server/-/app-server-1.0.0-beta.1.tgz", - "integrity": "sha512-V+lk+OKHL/AWc9QWNdFqmb/ijbyglXypn8iXOkY+/Ye5RnQYe7hULEc21eJX8fpV/D8xT22p79IPMUEmiis6kw==", + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@lenra/app-server/-/app-server-1.0.0-beta.2.tgz", + "integrity": "sha512-nuklj1UI9+6G8M1W99cgZX9pVkXCtu3Kzlvo7ny8uk7wOOwBeQNB3XW02w36u+DbaO0IO2mHISKXchJWC7HQBQ==", "dependencies": { - "@lenra/components": "~1.0.0-beta.5", - "axios": "^0.27.1", + "@lenra/components": "~1.0.0-beta.7", + "axios": "^1.3.6", "express": "^4.18.1" }, "bin": { @@ -27,9 +27,9 @@ } }, "node_modules/@lenra/components": { - "version": "1.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@lenra/components/-/components-1.0.0-beta.5.tgz", - "integrity": "sha512-IpQZ2F3xwfyXMCt78QgIPcG7bpOuNt+rWWL9v0QsLJ9PUIPOOCPJLrIaPOhc8iwdPBBqJ50Nz6GPIOe6pHdLsA==" + "version": "1.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@lenra/components/-/components-1.0.0-beta.7.tgz", + "integrity": "sha512-63CLKaqy/OQ78IysOAHaoWYAuLuV9ezaJneW11UdvpZDtkLEkU0u0ct3JdFzBJyh9kQ/LTtcAvruXVtQm88YCg==" }, "node_modules/accepts": { "version": "1.3.8", @@ -54,12 +54,13 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/body-parser": { @@ -500,6 +501,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -675,19 +681,19 @@ }, "dependencies": { "@lenra/app-server": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@lenra/app-server/-/app-server-1.0.0-beta.1.tgz", - "integrity": "sha512-V+lk+OKHL/AWc9QWNdFqmb/ijbyglXypn8iXOkY+/Ye5RnQYe7hULEc21eJX8fpV/D8xT22p79IPMUEmiis6kw==", + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@lenra/app-server/-/app-server-1.0.0-beta.2.tgz", + "integrity": "sha512-nuklj1UI9+6G8M1W99cgZX9pVkXCtu3Kzlvo7ny8uk7wOOwBeQNB3XW02w36u+DbaO0IO2mHISKXchJWC7HQBQ==", "requires": { - "@lenra/components": "~1.0.0-beta.5", - "axios": "^0.27.1", + "@lenra/components": "~1.0.0-beta.7", + "axios": "^1.3.6", "express": "^4.18.1" } }, "@lenra/components": { - "version": "1.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@lenra/components/-/components-1.0.0-beta.5.tgz", - "integrity": "sha512-IpQZ2F3xwfyXMCt78QgIPcG7bpOuNt+rWWL9v0QsLJ9PUIPOOCPJLrIaPOhc8iwdPBBqJ50Nz6GPIOe6pHdLsA==" + "version": "1.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@lenra/components/-/components-1.0.0-beta.7.tgz", + "integrity": "sha512-63CLKaqy/OQ78IysOAHaoWYAuLuV9ezaJneW11UdvpZDtkLEkU0u0ct3JdFzBJyh9kQ/LTtcAvruXVtQm88YCg==" }, "accepts": { "version": "1.3.8", @@ -709,12 +715,13 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "body-parser": { @@ -1034,6 +1041,11 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", diff --git a/package.json b/package.json index 7207978..2419a60 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "author": "Lenra", "license": "MIT", "dependencies": { - "@lenra/app-server": "^1.0.0-beta.1", - "@lenra/components": "^1.0.0-beta.5" + "@lenra/app-server": "^1.0.0-beta.2", + "@lenra/components": "^1.0.0-beta.7" } } From 6749cefb6c22b5b895eeb5a810557a88c05f59c6 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Tue, 16 May 2023 12:03:59 +0200 Subject: [PATCH 5/6] Add context projection example --- src/index.gen.js | 3 ++- src/views/home.js | 7 +++++++ src/views/test.js | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/views/test.js diff --git a/src/index.gen.js b/src/index.gen.js index f3444a8..00864a3 100644 --- a/src/index.gen.js +++ b/src/index.gen.js @@ -3,7 +3,8 @@ export const views = { "home": "home", "main": "main", "menu": "menu", - "newPage": "newPage" + "newPage": "newPage", + "test": "test" }; export const listeners = { "increment": "increment", diff --git a/src/views/home.js b/src/views/home.js index f228bf5..9b5a466 100644 --- a/src/views/home.js +++ b/src/views/home.js @@ -26,6 +26,13 @@ export default function (_data, _props) { { type: "text", value: "@me" + }, + { + type: "view", + name: "test", + context: { + me: true + } } ]) .direction("vertical") diff --git a/src/views/test.js b/src/views/test.js new file mode 100644 index 0000000..5c117ed --- /dev/null +++ b/src/views/test.js @@ -0,0 +1,7 @@ +export default function (_data, _props, context) { + return { + type: "text", + value: `context: ${JSON.stringify(context)}` + } +} + From c8041182d07da66a1bd232e28bb3600413e0dc88 Mon Sep 17 00:00:00 2001 From: jonas-martinez Date: Wed, 24 May 2023 14:18:34 +0200 Subject: [PATCH 6/6] Remove useless code parts --- lenra.yml | 2 +- src/manifest.js | 14 ++++---------- src/views/home.js | 7 ++----- src/views/newPage.js | 6 +++--- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/lenra.yml b/lenra.yml index d93877b..03560fd 100644 --- a/lenra.yml +++ b/lenra.yml @@ -27,4 +27,4 @@ generator: - "!/src/" dev: devtool: - tag: local + tag: alpha diff --git a/src/manifest.js b/src/manifest.js index a2f445c..5348f60 100644 --- a/src/manifest.js +++ b/src/manifest.js @@ -14,16 +14,10 @@ export const lenraRoutes = [ view: { type: "view", name: "newPage", - props: { - id: "@route.id", - route: "@route", - me: "@me" - }, - query: { - id: "@me", - route: "@route", - routeId: "@route.id" + context: { + me: true, + pathParams: true, } - } + }, } ] \ No newline at end of file diff --git a/src/views/home.js b/src/views/home.js index 9b5a466..c89bfee 100644 --- a/src/views/home.js +++ b/src/views/home.js @@ -23,15 +23,12 @@ export default function (_data, _props) { props: { path: "/newPage/1" } } }, - { - type: "text", - value: "@me" - }, { type: "view", name: "test", context: { - me: true + me: true, + pathParams: true, } } ]) diff --git a/src/views/newPage.js b/src/views/newPage.js index 596df07..3259b28 100644 --- a/src/views/newPage.js +++ b/src/views/newPage.js @@ -1,14 +1,14 @@ -export default function (_data, _props) { +export default function (_data, _props, context) { console.log(_props); console.log(_data); + console.log(JSON.stringify(context)); return { type: "button", - text: "NEW PAGE", + text: `NEW PAGE ${JSON.stringify(context)}`, onPressed: { action: "@lenra:navTo", props: { path: "/", - test: "@id" } } }