diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2afed48 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "web/src/cascade"] + path = web/src/cascade + url = https://github.com/zalo/CascadeStudio.git diff --git a/.vscode/settings.json b/.vscode/settings.json index bb0578d..a95220c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,13 @@ }, "[prisma]": { "editor.formatOnSave": true - } + }, + "eslint.workingDirectories": [ + "./api", + "./web/src/components", + "./web/src/layouts", + "./web/src/pages", + "./web/src/index.js", + "./web/src/Routes.js", + ] } diff --git a/package.json b/package.json index ca2982c..df618e1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,15 @@ "@redwoodjs/core": "^0.19.2" }, "eslintConfig": { - "extends": "@redwoodjs/eslint-config" + "extends": "@redwoodjs/eslint-config", + "workingDirectories": [ + "./api", + "./web/src/components", + "./web/src/layouts", + "./web/src/pages", + "./web/src/index.js", + "./web/src/Routes.js" + ] }, "engines": { "node": ">=12", diff --git a/web/src/cascade b/web/src/cascade new file mode 160000 index 0000000..755670b --- /dev/null +++ b/web/src/cascade @@ -0,0 +1 @@ +Subproject commit 755670b8ebd57a491b7e2bf919af99f5dbfe5d1a diff --git a/web/src/pages/HomePage/HomePage.js b/web/src/pages/HomePage/HomePage.js index 7d32e12..749ab04 100644 --- a/web/src/pages/HomePage/HomePage.js +++ b/web/src/pages/HomePage/HomePage.js @@ -1,11 +1,15 @@ import BlogLayout from 'src/layouts/BlogLayout' import BlogPostsCell from 'src/components/BlogPostsCell' +import { initialize} from 'src/cascade/js/MainPage/CascadeMain' const HomePage = () => { return ( +
+ +
) }