Skip to content

Commit

Permalink
Rename app directory from "portal" to "web"
Browse files Browse the repository at this point in the history
  • Loading branch information
yenbekbay committed Nov 1, 2022
1 parent 960c562 commit 7ef7e6d
Show file tree
Hide file tree
Showing 42 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*.snap

# next.js
/apps/portal/.next/
/apps/portal/out/
/apps/web/.next/
/apps/web/out/

# vim: set filetype=ignore:
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"root": true,
"settings": {
"next": {
"rootDir": "apps/portal/"
"rootDir": "apps/web/"
},
"react": {
"version": "17.0.2"
},
"tailwindcss": {
"callees": ["twMerge"],
"config": "apps/portal/tailwind.config.js"
"config": "apps/web/tailwind.config.js"
}
},
"plugins": [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
run: POSTGRES_OR_WEBHOOK_URL=noop node --loader tsx ./bin/venice health

- name: Generate assets required for lint
run: pnpm --dir ./apps/portal/ run generate:css
run: pnpm --dir ./apps/web/ run generate:css

- name: Run lint
run: pnpm run lint
Expand Down
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
/coverage

# next.js
/apps/portal/.next/
/apps/portal/out/
/apps/web/.next/
/apps/web/out/

# production
/apps/portal/build
/apps/web/build

# misc
.DS_Store
Expand Down Expand Up @@ -42,4 +42,4 @@ yarn-error.log*
.eslintcache

# tailwind
/apps/portal/__generated__/tailwind.css
/apps/web/__generated__/tailwind.css
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*.snap

# next.js
/apps/portal/.next/
/apps/portal/out/
/apps/web/.next/
/apps/web/out/

# pnpm
pnpm-lock.yaml
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"search.exclude": {
"**/*.generated": true
},
"tailwindCSS.experimental.configFile": "apps/portal/tailwind.config.js",
"tailwindCSS.experimental.configFile": "apps/web/tailwind.config.js",
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false,
"typescript.tsdk": "./node_modules/typescript/lib"
}
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The main design goal is to keep the infrastructure lean and use the existing too
- This means that jobs will normally get run once per minute
- If you are using Supabase, then we added an optimization in the form of a [database webhook](https://supabase.com/blog/supabase-functions-updates#database-webhooks-alpha) that will trigger `/api/worker` anytime new job gets added. This means jobs should run with sub-second latency on supabase.
- `graphile-worker` normally deletes jobs, we archive them into `graphile_worker.jobs_completed` table for logging / analytics
- Migrates are required and they are run as part of the `build:worker` command in `apps/portal`. This should be automatic if you use `Vercel`
- Migrates are required and they are run as part of the `build:worker` command in `apps/web`. This should be automatic if you use `Vercel`

[**Architecture diagram**](https://excalidraw.com/#json=ieN-yfQae4hZxIIyD0qrI,tiCIzHkByX9Z6ZszHLDKnw)
![Architecture](./docs/background-sync-architecture.png)
Expand Down
2 changes: 1 addition & 1 deletion apps/app-config/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Deploy

[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?env=POSTGRES_OR_WEBHOOK_URL%2Cint_plaid__clientId%2Cint_plaid__secrets__sandbox%2CJWT_SECRET_OR_PUBLIC_KEY&envDescription=After%20deploy%2C%20you%20can%20add%20other%20optional%20environment%20variables%20to%20configure%20for%20production%20and%20customize%20the%20default%20behavior.%20See%20the%20full%20list%20in%20README&envLink=https%3A%2F%2Fgithub.com%2Fusevenice%2Fvenice%23environment-variables&install-command=npm%20i%20pnpm%407.14.0%20-g%20%26%26%20pnpm%20install&project-name=my-venice&repository-url=https%3A%2F%2Fgithub.com%2FuseVenice%2Fvenice&root-directory=apps%2Fportal)
[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?env=POSTGRES_OR_WEBHOOK_URL%2Cint_plaid__clientId%2Cint_plaid__secrets__sandbox%2CJWT_SECRET_OR_PUBLIC_KEY&envDescription=After%20deploy%2C%20you%20can%20add%20other%20optional%20environment%20variables%20to%20configure%20for%20production%20and%20customize%20the%20default%20behavior.%20See%20the%20full%20list%20in%20README&envLink=https%3A%2F%2Fgithub.com%2Fusevenice%2Fvenice%23environment-variables&install-command=npm%20i%20pnpm%407.14.0%20-g%20%26%26%20pnpm%20install&project-name=my-venice&repository-url=https%3A%2F%2Fgithub.com%2FuseVenice%2Fvenice&root-directory=apps%2Fweb)

## Environment variables

Expand Down
2 changes: 1 addition & 1 deletion apps/app-config/_generateDocs.bin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function makeVercelDeployButton(params: {

const deployButton = makeVercelDeployButton({
'repository-url': 'https://github.com/useVenice/venice',
'root-directory': 'apps/portal',
'root-directory': 'apps/web',
'project-name': 'my-venice',
env: [
'POSTGRES_OR_WEBHOOK_URL',
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/portal/package.json → apps/web/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@usevenice/portal",
"name": "@usevenice/web",
"version": "0.0.0",
"private": true,
"scripts": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import type {GetServerSideProps} from 'next'

const Noop = () => null

// Test for https://stackoverflow.com/questions/64936872/portal-js-is-there-any-way-to-render-an-xml-file
// Test for https://stackoverflow.com/questions/64936872/web-js-is-there-any-way-to-render-an-xml-file
// Can use this to render conditional javascript imports
// Note that this does not work with getStaticProps because
// res is not accessible within getStaticProps.
// Would have to hack into next.js internals to figure out the pipeline
// Or alternatively use external CDN with either this or perhaps even api routes.
// Related note, https://portal-code-elimination.vercel.app/ and https://github.com/vercel/portal.js/issues/16153
// Related note, https://web-code-elimination.vercel.app/ and https://github.com/vercel/web.js/issues/16153
// eslint-disable-next-line @typescript-eslint/require-await
export const getServerSideProps: GetServerSideProps = async ({res}) => {
if (res) {
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module.exports = {
testEnvironment: 'node',
testPathIgnorePatterns: [
'/node_modules/',
'/apps/portal/.next/',
'/apps/portal/out/',
'/apps/web/.next/',
'/apps/web/out/',
],
watchPathIgnorePatterns: [
'\\.gen\\.d\\.ts',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"repository": "[email protected]:usevenice/venice.git",
"license": "UNLICENSED",
"scripts": {
"portal": "pnpm run --filter portal dev",
"web": "pnpm run --filter web dev",
"docs": "pnpm run --filter app-config dev",
"lint": "eslint --ext .js,.ts,.tsx --cache .",
"mitm": "mitmweb --listen-port 3010 --web-port 3011 --mode reverse:http://localhost:3000",
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7ef7e6d

Please sign in to comment.