From a4d044ac4e05cd3458a015680e299dea5bd33174 Mon Sep 17 00:00:00 2001 From: Shane Earley Date: Fri, 9 Sep 2022 11:55:42 -0400 Subject: [PATCH 1/4] Break out web and landing apps --- .github/workflows/pull_request.yml | 17 ++-- .github/workflows/push.yml | 10 +-- .github/workflows/release.yml | 13 ++- README.md | 11 +++ apps/{website => landing}/.gitignore | 0 apps/landing/README.md | 1 + apps/{website => landing}/index.html | 0 apps/landing/package.json | 26 ++++++ apps/{website => landing}/postcss.config.js | 0 .../public/CopyrightIcon.png | Bin .../public/CopyrightIcon.svg | 0 .../{website => landing}/public/Dashboard.png | Bin apps/{website => landing}/public/blob.svg | 0 .../{website => landing}/public/copyright.png | Bin apps/{website => landing}/public/cosmos.svg | 0 .../public/discord-grey.png | Bin apps/{website => landing}/public/discord.svg | 0 apps/{website => landing}/public/earn.png | Bin apps/{website => landing}/public/earn2.png | Bin apps/{website => landing}/public/earn3.png | Bin .../public/email-vector.svg | 0 apps/{website => landing}/public/factom.svg | 0 apps/{website => landing}/public/favicon.ico | Bin .../public/github-grey.png | Bin apps/{website => landing}/public/github.svg | 0 apps/{website => landing}/public/iotex.svg | 0 apps/{website => landing}/public/kava.png | Bin apps/{website => landing}/public/learn.png | Bin apps/{website => landing}/public/livepeer.svg | 0 apps/{website => landing}/public/p.svg | 0 apps/{website => landing}/public/puddles.svg | 0 .../public/twitter-grey.png | Bin apps/{website => landing}/public/twitter.svg | 0 apps/{website => landing}/public/web-demo.svg | 0 .../public/whitepaper-sc.png | Bin apps/landing/src/App.vue | 12 +++ .../src/components/Puddles.vue | 0 .../src/composables/slideshow.ts | 0 .../src/composables/users.ts | 0 apps/{website => landing}/src/env.d.ts | 0 apps/{website => landing}/src/index.css | 0 .../src/layouts/default-layout.vue | 0 apps/{website => landing}/src/main.ts | 0 .../src/pages/index/index.vue | 0 .../src/pages/whitepaper/index.vue | 2 +- apps/{website => landing}/tailwind.config.js | 0 apps/{website => landing}/tsconfig.json | 0 apps/landing/vite.config.ts | 36 +++++++++ apps/web/.gitignore | 24 ++++++ apps/web/README.md | 1 + apps/web/index.html | 16 ++++ apps/{website => web}/package.json | 5 +- apps/web/postcss.config.js | 6 ++ apps/web/public/favicon.ico | Bin 0 -> 15406 bytes apps/web/src/App.vue | 12 +++ .../src/components/Wallet.vue | 0 .../src/composables/ethers.ts | 0 .../{website => web}/src/composables/iopay.ts | 0 .../src/composables/wallet.ts | 0 apps/web/src/env.d.ts | 26 ++++++ apps/web/src/index.css | 3 + .../src/interfaces/BrowserProviders.ts | 0 .../src/interfaces/EthersProvider.ts | 0 apps/web/src/layouts/default-layout.vue | 17 ++++ apps/web/src/main.ts | 18 +++++ .../wallet => web/src/pages/index}/index.vue | 0 .../src/types/ProviderString.ts | 0 apps/web/tailwind.config.js | 16 ++++ apps/web/tsconfig.json | 26 ++++++ apps/{website => web}/vite.config.ts | 6 +- apps/website/README.md | 16 ---- apps/website/src/App.vue | 28 ------- apps/website/src/assets/logo.png | Bin 6849 -> 0 bytes apps/website/src/composables/contracts.ts | 10 --- package-lock.json | 75 +++++++++++++----- package.json | 7 +- scripts/local/dev | 38 ++++++--- scripts/local/mock | 2 +- 78 files changed, 361 insertions(+), 119 deletions(-) rename apps/{website => landing}/.gitignore (100%) create mode 100644 apps/landing/README.md rename apps/{website => landing}/index.html (100%) create mode 100644 apps/landing/package.json rename apps/{website => landing}/postcss.config.js (100%) rename apps/{website => landing}/public/CopyrightIcon.png (100%) rename apps/{website => landing}/public/CopyrightIcon.svg (100%) rename apps/{website => landing}/public/Dashboard.png (100%) rename apps/{website => landing}/public/blob.svg (100%) rename apps/{website => landing}/public/copyright.png (100%) rename apps/{website => landing}/public/cosmos.svg (100%) rename apps/{website => landing}/public/discord-grey.png (100%) rename apps/{website => landing}/public/discord.svg (100%) rename apps/{website => landing}/public/earn.png (100%) rename apps/{website => landing}/public/earn2.png (100%) rename apps/{website => landing}/public/earn3.png (100%) rename apps/{website => landing}/public/email-vector.svg (100%) rename apps/{website => landing}/public/factom.svg (100%) rename apps/{website => landing}/public/favicon.ico (100%) rename apps/{website => landing}/public/github-grey.png (100%) rename apps/{website => landing}/public/github.svg (100%) rename apps/{website => landing}/public/iotex.svg (100%) rename apps/{website => landing}/public/kava.png (100%) rename apps/{website => landing}/public/learn.png (100%) rename apps/{website => landing}/public/livepeer.svg (100%) rename apps/{website => landing}/public/p.svg (100%) rename apps/{website => landing}/public/puddles.svg (100%) rename apps/{website => landing}/public/twitter-grey.png (100%) rename apps/{website => landing}/public/twitter.svg (100%) rename apps/{website => landing}/public/web-demo.svg (100%) rename apps/{website => landing}/public/whitepaper-sc.png (100%) create mode 100644 apps/landing/src/App.vue rename apps/{website => landing}/src/components/Puddles.vue (100%) rename apps/{website => landing}/src/composables/slideshow.ts (100%) rename apps/{website => landing}/src/composables/users.ts (100%) rename apps/{website => landing}/src/env.d.ts (100%) rename apps/{website => landing}/src/index.css (100%) rename apps/{website => landing}/src/layouts/default-layout.vue (100%) rename apps/{website => landing}/src/main.ts (100%) rename apps/{website => landing}/src/pages/index/index.vue (100%) rename apps/{website => landing}/src/pages/whitepaper/index.vue (94%) rename apps/{website => landing}/tailwind.config.js (100%) rename apps/{website => landing}/tsconfig.json (100%) create mode 100644 apps/landing/vite.config.ts create mode 100644 apps/web/.gitignore create mode 100644 apps/web/README.md create mode 100644 apps/web/index.html rename apps/{website => web}/package.json (88%) create mode 100644 apps/web/postcss.config.js create mode 100644 apps/web/public/favicon.ico create mode 100644 apps/web/src/App.vue rename apps/{website => web}/src/components/Wallet.vue (100%) rename apps/{website => web}/src/composables/ethers.ts (100%) rename apps/{website => web}/src/composables/iopay.ts (100%) rename apps/{website => web}/src/composables/wallet.ts (100%) create mode 100644 apps/web/src/env.d.ts create mode 100644 apps/web/src/index.css rename apps/{website => web}/src/interfaces/BrowserProviders.ts (100%) rename apps/{website => web}/src/interfaces/EthersProvider.ts (100%) create mode 100644 apps/web/src/layouts/default-layout.vue create mode 100644 apps/web/src/main.ts rename apps/{website/src/pages/wallet => web/src/pages/index}/index.vue (100%) rename apps/{website => web}/src/types/ProviderString.ts (100%) create mode 100644 apps/web/tailwind.config.js create mode 100644 apps/web/tsconfig.json rename apps/{website => web}/vite.config.ts (91%) delete mode 100644 apps/website/README.md delete mode 100644 apps/website/src/App.vue delete mode 100644 apps/website/src/assets/logo.png delete mode 100644 apps/website/src/composables/contracts.ts diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0fa934d30..65be2eeaa 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -17,21 +17,16 @@ jobs: - name: Install dependencies run: npm ci - - name: Build common helpers - run: npm run build - working-directory: common/helpers + - name: Build helpers + run: npm run build --workspace @casimir/helpers - - name: Build website app - run: npm run build - working-directory: apps/website + - name: Build landing app + run: npm run build --workspace @casimir/landing env: PUBLIC_STAGE: ${{ env.STAGE }} - name: Build users service - run: npm run build - working-directory: services/users + run: npm run build --workspace @casimir/users - name: Test cdk stacks - run: | - npm run test - working-directory: infrastructure/cdk \ No newline at end of file + run: npm run test --workspace @casimir/cdk \ No newline at end of file diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e98c7621e..1f3c1ba6e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -37,19 +37,17 @@ jobs: - name: Install dependencies run: npm ci - - name: Build common helpers + - name: Build helpers run: npm run build working-directory: common/helpers - - name: Build website app - run: npm run build - working-directory: apps/website + - name: Build landing app + run: npm run build --workspace @casimir/landing env: PUBLIC_STAGE: ${{ env.STAGE }} - name: Build users service - run: npm run build - working-directory: services/users + run: npm run build --workspace @casimir/users - name: Deploy cdk infrastructure run: npm run deploy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 288eb209e..c324b89b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,17 +37,14 @@ jobs: - name: Install dependencies run: npm ci - - name: Build common helpers - run: npm run build - working-directory: common/helpers + - name: Build helpers + run: npm run build --workspace @casimir/helpers - - name: Build website app - run: npm run build - working-directory: apps/website + - name: Build landing app + run: npm run build --workspace @casimir/landing - name: Build users service - run: npm run build - working-directory: services/users + run: npm run build --workspace @casimir/users - name: Deploy cdk infrastructure run: npm run deploy diff --git a/README.md b/README.md index 5a139831b..208ee6194 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,17 @@ You can get up and running without configuration. You can also mock local backen > 🚩 You will need the [SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install-mac.html) for local mocking. +3. The commands and flags above apply to any package in the [apps](apps/) directory. While the default app is [@casimir/web](apps/web/), you can specify others by passing a subcommand to `npm run dev`. + + ```zsh + # @casimir/web + npm run dev # or + npm run dev:web + + # @casimir/landing + npm run dev:landing + ``` + ### Hardhat EVM contract development is serviced through [Hardhat](https://hardhat.io/). The Hardhat development environment is configured in the [contracts/evm/hardhat.config.ts](contracts/evm/hardhat.config.ts) file. diff --git a/apps/website/.gitignore b/apps/landing/.gitignore similarity index 100% rename from apps/website/.gitignore rename to apps/landing/.gitignore diff --git a/apps/landing/README.md b/apps/landing/README.md new file mode 100644 index 000000000..a5c94c9c2 --- /dev/null +++ b/apps/landing/README.md @@ -0,0 +1 @@ +# Casimir Landing App diff --git a/apps/website/index.html b/apps/landing/index.html similarity index 100% rename from apps/website/index.html rename to apps/landing/index.html diff --git a/apps/landing/package.json b/apps/landing/package.json new file mode 100644 index 000000000..7b2c583bc --- /dev/null +++ b/apps/landing/package.json @@ -0,0 +1,26 @@ +{ + "name": "@casimir/landing", + "description": "Casimir landing page", + "private": true, + "version": "0.0.1", + "scripts": { + "dev": "vite", + "build": "vue-tsc --noEmit && vite build", + "preview": "vite preview" + }, + "dependencies": { + "@heroicons/vue": "^1.0.6", + "vue": "^3.2.25", + "vue-router": "^4.0.15" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^2.3.3", + "autoprefixer": "^10.4.7", + "postcss": "^8.4.14", + "tailwindcss": "^3.0.24", + "typescript": "^4.5.4", + "vite": "^2.9.9", + "vite-plugin-pages": "^0.23.0", + "vue-tsc": "^0.34.7" + } +} diff --git a/apps/website/postcss.config.js b/apps/landing/postcss.config.js similarity index 100% rename from apps/website/postcss.config.js rename to apps/landing/postcss.config.js diff --git a/apps/website/public/CopyrightIcon.png b/apps/landing/public/CopyrightIcon.png similarity index 100% rename from apps/website/public/CopyrightIcon.png rename to apps/landing/public/CopyrightIcon.png diff --git a/apps/website/public/CopyrightIcon.svg b/apps/landing/public/CopyrightIcon.svg similarity index 100% rename from apps/website/public/CopyrightIcon.svg rename to apps/landing/public/CopyrightIcon.svg diff --git a/apps/website/public/Dashboard.png b/apps/landing/public/Dashboard.png similarity index 100% rename from apps/website/public/Dashboard.png rename to apps/landing/public/Dashboard.png diff --git a/apps/website/public/blob.svg b/apps/landing/public/blob.svg similarity index 100% rename from apps/website/public/blob.svg rename to apps/landing/public/blob.svg diff --git a/apps/website/public/copyright.png b/apps/landing/public/copyright.png similarity index 100% rename from apps/website/public/copyright.png rename to apps/landing/public/copyright.png diff --git a/apps/website/public/cosmos.svg b/apps/landing/public/cosmos.svg similarity index 100% rename from apps/website/public/cosmos.svg rename to apps/landing/public/cosmos.svg diff --git a/apps/website/public/discord-grey.png b/apps/landing/public/discord-grey.png similarity index 100% rename from apps/website/public/discord-grey.png rename to apps/landing/public/discord-grey.png diff --git a/apps/website/public/discord.svg b/apps/landing/public/discord.svg similarity index 100% rename from apps/website/public/discord.svg rename to apps/landing/public/discord.svg diff --git a/apps/website/public/earn.png b/apps/landing/public/earn.png similarity index 100% rename from apps/website/public/earn.png rename to apps/landing/public/earn.png diff --git a/apps/website/public/earn2.png b/apps/landing/public/earn2.png similarity index 100% rename from apps/website/public/earn2.png rename to apps/landing/public/earn2.png diff --git a/apps/website/public/earn3.png b/apps/landing/public/earn3.png similarity index 100% rename from apps/website/public/earn3.png rename to apps/landing/public/earn3.png diff --git a/apps/website/public/email-vector.svg b/apps/landing/public/email-vector.svg similarity index 100% rename from apps/website/public/email-vector.svg rename to apps/landing/public/email-vector.svg diff --git a/apps/website/public/factom.svg b/apps/landing/public/factom.svg similarity index 100% rename from apps/website/public/factom.svg rename to apps/landing/public/factom.svg diff --git a/apps/website/public/favicon.ico b/apps/landing/public/favicon.ico similarity index 100% rename from apps/website/public/favicon.ico rename to apps/landing/public/favicon.ico diff --git a/apps/website/public/github-grey.png b/apps/landing/public/github-grey.png similarity index 100% rename from apps/website/public/github-grey.png rename to apps/landing/public/github-grey.png diff --git a/apps/website/public/github.svg b/apps/landing/public/github.svg similarity index 100% rename from apps/website/public/github.svg rename to apps/landing/public/github.svg diff --git a/apps/website/public/iotex.svg b/apps/landing/public/iotex.svg similarity index 100% rename from apps/website/public/iotex.svg rename to apps/landing/public/iotex.svg diff --git a/apps/website/public/kava.png b/apps/landing/public/kava.png similarity index 100% rename from apps/website/public/kava.png rename to apps/landing/public/kava.png diff --git a/apps/website/public/learn.png b/apps/landing/public/learn.png similarity index 100% rename from apps/website/public/learn.png rename to apps/landing/public/learn.png diff --git a/apps/website/public/livepeer.svg b/apps/landing/public/livepeer.svg similarity index 100% rename from apps/website/public/livepeer.svg rename to apps/landing/public/livepeer.svg diff --git a/apps/website/public/p.svg b/apps/landing/public/p.svg similarity index 100% rename from apps/website/public/p.svg rename to apps/landing/public/p.svg diff --git a/apps/website/public/puddles.svg b/apps/landing/public/puddles.svg similarity index 100% rename from apps/website/public/puddles.svg rename to apps/landing/public/puddles.svg diff --git a/apps/website/public/twitter-grey.png b/apps/landing/public/twitter-grey.png similarity index 100% rename from apps/website/public/twitter-grey.png rename to apps/landing/public/twitter-grey.png diff --git a/apps/website/public/twitter.svg b/apps/landing/public/twitter.svg similarity index 100% rename from apps/website/public/twitter.svg rename to apps/landing/public/twitter.svg diff --git a/apps/website/public/web-demo.svg b/apps/landing/public/web-demo.svg similarity index 100% rename from apps/website/public/web-demo.svg rename to apps/landing/public/web-demo.svg diff --git a/apps/website/public/whitepaper-sc.png b/apps/landing/public/whitepaper-sc.png similarity index 100% rename from apps/website/public/whitepaper-sc.png rename to apps/landing/public/whitepaper-sc.png diff --git a/apps/landing/src/App.vue b/apps/landing/src/App.vue new file mode 100644 index 000000000..6144d26f8 --- /dev/null +++ b/apps/landing/src/App.vue @@ -0,0 +1,12 @@ + + + diff --git a/apps/website/src/components/Puddles.vue b/apps/landing/src/components/Puddles.vue similarity index 100% rename from apps/website/src/components/Puddles.vue rename to apps/landing/src/components/Puddles.vue diff --git a/apps/website/src/composables/slideshow.ts b/apps/landing/src/composables/slideshow.ts similarity index 100% rename from apps/website/src/composables/slideshow.ts rename to apps/landing/src/composables/slideshow.ts diff --git a/apps/website/src/composables/users.ts b/apps/landing/src/composables/users.ts similarity index 100% rename from apps/website/src/composables/users.ts rename to apps/landing/src/composables/users.ts diff --git a/apps/website/src/env.d.ts b/apps/landing/src/env.d.ts similarity index 100% rename from apps/website/src/env.d.ts rename to apps/landing/src/env.d.ts diff --git a/apps/website/src/index.css b/apps/landing/src/index.css similarity index 100% rename from apps/website/src/index.css rename to apps/landing/src/index.css diff --git a/apps/website/src/layouts/default-layout.vue b/apps/landing/src/layouts/default-layout.vue similarity index 100% rename from apps/website/src/layouts/default-layout.vue rename to apps/landing/src/layouts/default-layout.vue diff --git a/apps/website/src/main.ts b/apps/landing/src/main.ts similarity index 100% rename from apps/website/src/main.ts rename to apps/landing/src/main.ts diff --git a/apps/website/src/pages/index/index.vue b/apps/landing/src/pages/index/index.vue similarity index 100% rename from apps/website/src/pages/index/index.vue rename to apps/landing/src/pages/index/index.vue diff --git a/apps/website/src/pages/whitepaper/index.vue b/apps/landing/src/pages/whitepaper/index.vue similarity index 94% rename from apps/website/src/pages/whitepaper/index.vue rename to apps/landing/src/pages/whitepaper/index.vue index cd6e0a235..448fd3ebb 100644 --- a/apps/website/src/pages/whitepaper/index.vue +++ b/apps/landing/src/pages/whitepaper/index.vue @@ -1,6 +1,6 @@