Skip to content

Commit

Permalink
Merge pull request #586 from rharkor/rec
Browse files Browse the repository at this point in the history
Rec
  • Loading branch information
rharkor authored Feb 17, 2024
2 parents 5f05e9c + 8083d38 commit f2c69af
Show file tree
Hide file tree
Showing 56 changed files with 1,406 additions and 745 deletions.
3 changes: 1 addition & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@
"adamhartford.vscode-base64",
"ChakrounAnas.turbo-console-log",
"yoavbls.pretty-ts-errors",
"humao.rest-client",
"ambar.bundle-size"
"humao.rest-client"
]
}
},
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"tailwindCSS.experimental.classRegex": [
["cva(?:<[^>]*>)?(([^)]*))", "[\"'`]([^\"'`]*).*?[\"'`]", "(?:twMerge|twJoin)\\(([^\\);]*)[\\);]"]
]
],
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/rharkor/next-boilerplate/blob/main/LICENSE)

Welcome to the _Next.js Boilerplate_, an open-source template for all your nextjs projects! It's loaded with features that'll help you build a high-performance, maintainable, and enjoyable app. We've done all the heavy lifting for you, so sit back, relax, and get ready to conquer the world with your incredible app! 🌍
_Inspired by [Next enterprise](https://github.com/Blazity/next-enterprise/)_
<br />
<br />
You can test the demo [here](https://next-boilerplate-rharkor.vercel.app/).
Expand Down Expand Up @@ -99,6 +98,7 @@ This boilerplate uses [npm workspaces](https://docs.npmjs.com/cli/v7/using-npm/w
The following packages are available:

- `packages/app`: The main application
- `packages/cron`: The cron jobs
- `packages/docs`: The documentation website
- `packages/landing`: The landing page
- `packages/scripts`: Scripts to help you manage your project
Expand Down
18 changes: 9 additions & 9 deletions docker/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
services:
app:
build:
context: .
context: ..
dockerfile: packages/app/Dockerfile
container_name: #{PROJECT_NAME}#_app
restart: unless-stopped
Expand All @@ -14,22 +14,22 @@ services:
ports:
- "3000:3000"

crons:
cron:
build:
context: .
dockerfile: packages/app/crons/Dockerfile
container_name: #{PROJECT_NAME}#_crons
context: ..
dockerfile: packages/cron/Dockerfile
container_name: #{PROJECT_NAME}#_cron
restart: unless-stopped
logging:
driver: "json-file"
options:
max-size: "50m"

docs:
doc:
build:
context: .
context: ..
dockerfile: packages/docs/Dockerfile
container_name: #{PROJECT_NAME}#_docs
container_name: #{PROJECT_NAME}#_doc
restart: unless-stopped
logging:
driver: "json-file"
Expand All @@ -43,7 +43,7 @@ services:

landing:
build:
context: .
context: ..
dockerfile: packages/landing/Dockerfile
container_name: #{PROJECT_NAME}#_landing
restart: unless-stopped
Expand Down
13 changes: 13 additions & 0 deletions docker/docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: "3.8"

services:
cron:
build:
context: ..
dockerfile: packages/cron/Dockerfile
container_name: cron
restart: unless-stopped
logging:
driver: "json-file"
options:
max-size: "50m"
6 changes: 3 additions & 3 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
ports:
- "3000:3000"

crons:
cron:
image: DOCKER_DEPLOY_CRONS_IMAGE
container_name: #{PROJECT_NAME}#_crons
restart: unless-stopped
Expand All @@ -21,9 +21,9 @@ services:
options:
max-size: "50m"

docs:
doc:
image: DOCKER_DEPLOY_DOCS_IMAGE
container_name: #{PROJECT_NAME}#_docs
container_name: #{PROJECT_NAME}#_doc
restart: unless-stopped
logging:
driver: "json-file"
Expand Down
Loading

0 comments on commit f2c69af

Please sign in to comment.