diff --git a/lenra.yml b/lenra.yml index 58964c1..03560fd 100644 --- a/lenra.yml +++ b/lenra.yml @@ -25,3 +25,6 @@ generator: - "**" - "!/*.json" - "!/src/" +dev: + devtool: + tag: alpha 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" } } diff --git a/src/index.gen.js b/src/index.gen.js index 2564577..00864a3 100644 --- a/src/index.gen.js +++ b/src/index.gen.js @@ -2,7 +2,9 @@ export const views = { "counter": "counter", "home": "home", "main": "main", - "menu": "menu" + "menu": "menu", + "newPage": "newPage", + "test": "test" }; export const listeners = { "increment": "increment", diff --git a/src/manifest.js b/src/manifest.js index 2e20575..5348f60 100644 --- a/src/manifest.js +++ b/src/manifest.js @@ -1,3 +1,23 @@ 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: "/", + view: { + type: "view", + name: "main" + } + }, + { + path: "/newPage/:id", + view: { + type: "view", + name: "newPage", + context: { + me: true, + pathParams: true, + } + }, + } +] \ No newline at end of file diff --git a/src/views/home.js b/src/views/home.js index 68c967e..c89bfee 100644 --- a/src/views/home.js +++ b/src/views/home.js @@ -15,6 +15,22 @@ 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: "view", + name: "test", + context: { + me: true, + pathParams: true, + } + } ]) .direction("vertical") .spacing(16) diff --git a/src/views/newPage.js b/src/views/newPage.js new file mode 100644 index 0000000..3259b28 --- /dev/null +++ b/src/views/newPage.js @@ -0,0 +1,15 @@ +export default function (_data, _props, context) { + console.log(_props); + console.log(_data); + console.log(JSON.stringify(context)); + return { + type: "button", + text: `NEW PAGE ${JSON.stringify(context)}`, + onPressed: { + action: "@lenra:navTo", + props: { + path: "/", + } + } + } +} \ No newline at end of file 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)}` + } +} +