Merge pull request #4 from DefangLabs/setup-samples

Reorg samples
DefangLabs · May 16, 2024 · f6f7b8b · f6f7b8b
2 parents d607b7d + 45974bd
commit f6f7b8b
Show file tree

Hide file tree

Showing 582 changed files with 1,278 additions and 57 deletions.
diff --git a/.github/workflows/check-sample.yml b/.github/workflows/check-sample.yml
@@ -8,50 +8,56 @@ on:
 jobs:
   check_samples:
     runs-on: ubuntu-latest
+    permissions: 
+      contents: write
+      pull-requests: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Check for required files
+      - name: Run Checks
+        id: checks
         run: |
-          for changed_file in $(git diff --name-only HEAD^); do
-            if [[ $changed_file == samples/* ]]; then
-              sample_dir=$(dirname $changed_file)
-              if [[ ! -f $sample_dir/README.md || ! -f $sample_dir/compose.yml ]]; then
-                echo "Missing README.md or compose.yml in $sample_dir"
-                exit 1
-              fi
-            fi
-          done
+          ./scripts/check-sample-files.sh > checklist.txt
 
       - name: Add checklist to PR description
         uses: actions/github-script@v5
         with:
           script: |
+            const fs = require('fs');
             const pr_number = context.issue.number;
-            const checklist = `
-            - [ ] I have tested that the sample runs locally
-            - [ ] I have tested that the sample runs in Defang Playground
-            - [ ] I have tested that the sample runs in BYOC
-            - [ ] I have documented any required config in the readme
-            - [ ] I have documented how to provision any third-party services in the readme
-            - [ ] I have documented how to run the sample in the readme (locally and with Defang)
-            `;
-    
+            const marker = '## Samples Checklist';
+            
+            // Read the checklist from the file
+            let checklist = fs.readFileSync('checklist.txt', 'utf8').trim();
+
+            if(!checklist) {
+              checklist = "✅"
+            }
+
             // Get the current PR
             const { data: pullRequest } = await github.rest.pulls.get({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 pull_number: pr_number
             });
-
-            // Check if the checklist already exists in the PR description
-            if (!pullRequest.body.includes(checklist)) {
-            // Update the PR description with the checklist
+
+            let newBody;
+            const body = pullRequest.body || "";
+            const markerIndex = body.indexOf(marker);
+
+            if (markerIndex !== -1) {
+                // Replace the content below the marker
+                newBody = body.substring(0, markerIndex + marker.length) + "\n" + checklist;
+            } else {
+                // Append the checklist if the marker doesn't exist
+                newBody = body + "\n" + marker + "\n" + checklist;
+            }
+
+            // Update the PR description
             await github.rest.pulls.update({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 pull_number: pr_number,
-                body: pullRequest.body + "\n" + checklist
-            });
-            }
+                body: newBody
+            });
diff --git a/...es/python/django-postgresql/.dockerignore → samples/django-postgres/.dockerignore b/...es/python/django-postgresql/.dockerignore → samples/django-postgres/.dockerignore
diff --git a/samples/python/django-postgresql/.gitignore → samples/django-postgres/.gitignore b/samples/python/django-postgresql/.gitignore → samples/django-postgres/.gitignore
diff --git a/samples/python/django-postgresql/Dockerfile → samples/django-postgres/Dockerfile b/samples/python/django-postgresql/Dockerfile → samples/django-postgres/Dockerfile
diff --git a/samples/python/django-postgresql/README.md → samples/django-postgres/README.md b/samples/python/django-postgresql/README.md → samples/django-postgres/README.md
@@ -19,3 +19,13 @@ Plus, make sure that you have properly set your environment variables like `AWS_
 1. Open the terminal and type `defang login`
 2. Type `defang compose up` in the CLI
 3. Now your application will be launched
+
+---
+
+Title: Django + Postgres
+
+Short Description: A customer relationship management list project developed using Python Django framework, offering a starting point to help you quickly build your customer management system
+
+Tags: django, postgres
+
+Languages: python, sql
diff --git a/samples/python/django-postgresql/compose.yml → samples/django-postgres/compose.yaml b/samples/python/django-postgresql/compose.yml → samples/django-postgres/compose.yaml
diff --git a/...jango-postgresql/crm_platform/__init__.py → .../django-postgres/crm_platform/__init__.py b/...jango-postgresql/crm_platform/__init__.py → .../django-postgres/crm_platform/__init__.py
diff --git a/...on/django-postgresql/crm_platform/asgi.py → samples/django-postgres/crm_platform/asgi.py b/...on/django-postgresql/crm_platform/asgi.py → samples/django-postgres/crm_platform/asgi.py
diff --git a/...jango-postgresql/crm_platform/settings.py → .../django-postgres/crm_platform/settings.py b/...jango-postgresql/crm_platform/settings.py → .../django-postgres/crm_platform/settings.py
diff --git a/...on/django-postgresql/crm_platform/urls.py → samples/django-postgres/crm_platform/urls.py b/...on/django-postgresql/crm_platform/urls.py → samples/django-postgres/crm_platform/urls.py
diff --git a/...on/django-postgresql/crm_platform/wsgi.py → samples/django-postgres/crm_platform/wsgi.py b/...on/django-postgresql/crm_platform/wsgi.py → samples/django-postgres/crm_platform/wsgi.py
diff --git a/samples/python/django-postgresql/manage.py → samples/django-postgres/manage.py b/samples/python/django-postgresql/manage.py → samples/django-postgres/manage.py
diff --git a/...python/django-postgresql/requirements.txt → samples/django-postgres/requirements.txt b/...python/django-postgresql/requirements.txt → samples/django-postgres/requirements.txt
diff --git a/...hon/django-postgresql/website/__init__.py → samples/django-postgres/website/__init__.py b/...hon/django-postgresql/website/__init__.py → samples/django-postgres/website/__init__.py
diff --git a/...python/django-postgresql/website/admin.py → samples/django-postgres/website/admin.py b/...python/django-postgresql/website/admin.py → samples/django-postgres/website/admin.py
diff --git a/.../python/django-postgresql/website/apps.py → samples/django-postgres/website/apps.py b/.../python/django-postgresql/website/apps.py → samples/django-postgres/website/apps.py
diff --git a/...python/django-postgresql/website/forms.py → samples/django-postgres/website/forms.py b/...python/django-postgresql/website/forms.py → samples/django-postgres/website/forms.py
diff --git a/...gresql/website/migrations/0001_initial.py → ...stgres/website/migrations/0001_initial.py b/...gresql/website/migrations/0001_initial.py → ...stgres/website/migrations/0001_initial.py
diff --git a/...postgresql/website/migrations/__init__.py → ...o-postgres/website/migrations/__init__.py b/...postgresql/website/migrations/__init__.py → ...o-postgres/website/migrations/__init__.py
diff --git a/...ython/django-postgresql/website/models.py → samples/django-postgres/website/models.py b/...ython/django-postgresql/website/models.py → samples/django-postgres/website/models.py
diff --git a/...tgresql/website/templates/add_record.html → ...ostgres/website/templates/add_record.html b/...tgresql/website/templates/add_record.html → ...ostgres/website/templates/add_record.html
diff --git a/...go-postgresql/website/templates/base.html → ...ango-postgres/website/templates/base.html b/...go-postgresql/website/templates/base.html → ...ango-postgres/website/templates/base.html
diff --git a/...go-postgresql/website/templates/home.html → ...ango-postgres/website/templates/home.html b/...go-postgresql/website/templates/home.html → ...ango-postgres/website/templates/home.html
diff --git a/...-postgresql/website/templates/navbar.html → ...go-postgres/website/templates/navbar.html b/...-postgresql/website/templates/navbar.html → ...go-postgres/website/templates/navbar.html
diff --git a/...-postgresql/website/templates/record.html → ...go-postgres/website/templates/record.html b/...-postgresql/website/templates/record.html → ...go-postgres/website/templates/record.html
diff --git a/...ostgresql/website/templates/register.html → ...-postgres/website/templates/register.html b/...ostgresql/website/templates/register.html → ...-postgres/website/templates/register.html
diff --git a/...esql/website/templates/update_record.html → ...gres/website/templates/update_record.html b/...esql/website/templates/update_record.html → ...gres/website/templates/update_record.html
diff --git a/...python/django-postgresql/website/tests.py → samples/django-postgres/website/tests.py b/...python/django-postgresql/website/tests.py → samples/django-postgres/website/tests.py
diff --git a/.../python/django-postgresql/website/urls.py → samples/django-postgres/website/urls.py b/.../python/django-postgresql/website/urls.py → samples/django-postgres/website/urls.py
diff --git a/...python/django-postgresql/website/views.py → samples/django-postgres/website/views.py b/...python/django-postgresql/website/views.py → samples/django-postgres/website/views.py
diff --git a/samples/python/django/.dockerignore → samples/django/.dockerignore b/samples/python/django/.dockerignore → samples/django/.dockerignore
diff --git a/samples/python/django/.gitignore → samples/django/.gitignore b/samples/python/django/.gitignore → samples/django/.gitignore
diff --git a/samples/python/django/Dockerfile → samples/django/Dockerfile b/samples/python/django/Dockerfile → samples/django/Dockerfile
diff --git a/samples/python/django/README.md → samples/django/README.md b/samples/python/django/README.md → samples/django/README.md
@@ -1,4 +1,10 @@
-This is a simple example of how to run Django on Defang. It is a simple Todo app that uses SQLite as the database (so data is *not* persisted between deployments). We will be putting together an example with a managed database soon.
+# Django
+
+This is a simple example of how to run Django on Defang. It is a simple Todo app that uses SQLite as the database.
+
+### NOTE
+
+This sample is a simple Django app that uses SQLite as the database, which will be reset every time you deploy. **It is not production-ready**. For production use cases, you should check out the Django + Postgres sample.
 
 The app includes a management command which is run on startup to create a superuser with the username `admin` and password `admin`. This means you can login to the admin interface at `/admin/` and see the Django admin interface without any additional steps. The `example_app` is already registered and the `Todo` model is already set up to be managed in the admin interface.
 
@@ -19,3 +25,13 @@ Plus, make sure that you have properly set your environment variables like `AWS_
 2. Open the terminal and type `defang login`
 3. Type `defang compose up` in the CLI
 4. Now your application will be launched
+
+---
+
+Title: Django
+
+Short Description: A simple Django app that uses SQLite as the database 
+
+Tags: django, sqlite
+
+Languages: python
diff --git a/samples/python/django/compose.yaml → samples/django/compose.yaml b/samples/python/django/compose.yaml → samples/django/compose.yaml
diff --git a/...s/python/django/defang_sample/__init__.py → samples/django/defang_sample/__init__.py b/...s/python/django/defang_sample/__init__.py → samples/django/defang_sample/__init__.py
diff --git a/samples/python/django/defang_sample/asgi.py → samples/django/defang_sample/asgi.py b/samples/python/django/defang_sample/asgi.py → samples/django/defang_sample/asgi.py
diff --git a/...s/python/django/defang_sample/settings.py → samples/django/defang_sample/settings.py b/...s/python/django/defang_sample/settings.py → samples/django/defang_sample/settings.py
diff --git a/samples/python/django/defang_sample/urls.py → samples/django/defang_sample/urls.py b/samples/python/django/defang_sample/urls.py → samples/django/defang_sample/urls.py
diff --git a/samples/python/django/defang_sample/wsgi.py → samples/django/defang_sample/wsgi.py b/samples/python/django/defang_sample/wsgi.py → samples/django/defang_sample/wsgi.py
diff --git a/...les/python/django/example_app/__init__.py → samples/django/example_app/__init__.py b/...les/python/django/example_app/__init__.py → samples/django/example_app/__init__.py
diff --git a/samples/python/django/example_app/admin.py → samples/django/example_app/admin.py b/samples/python/django/example_app/admin.py → samples/django/example_app/admin.py
diff --git a/samples/python/django/example_app/apps.py → samples/django/example_app/apps.py b/samples/python/django/example_app/apps.py → samples/django/example_app/apps.py
diff --git a/samples/python/django/example_app/forms.py → samples/django/example_app/forms.py b/samples/python/django/example_app/forms.py → samples/django/example_app/forms.py
diff --git a/...pp/management/commands/createsuperauto.py → ...pp/management/commands/createsuperauto.py b/...pp/management/commands/createsuperauto.py → ...pp/management/commands/createsuperauto.py
diff --git a/...go/example_app/migrations/0001_initial.py → ...go/example_app/migrations/0001_initial.py b/...go/example_app/migrations/0001_initial.py → ...go/example_app/migrations/0001_initial.py
diff --git a/...django/example_app/migrations/__init__.py → ...django/example_app/migrations/__init__.py b/...django/example_app/migrations/__init__.py → ...django/example_app/migrations/__init__.py
diff --git a/samples/python/django/example_app/models.py → samples/django/example_app/models.py b/samples/python/django/example_app/models.py → samples/django/example_app/models.py
diff --git a/...on/django/example_app/templates/base.html → ...es/django/example_app/templates/base.html b/...on/django/example_app/templates/base.html → ...es/django/example_app/templates/base.html
diff --git a/...ango/example_app/templates/todo_form.html → ...ango/example_app/templates/todo_form.html b/...ango/example_app/templates/todo_form.html → ...ango/example_app/templates/todo_form.html
diff --git a/samples/python/django/example_app/tests.py → samples/django/example_app/tests.py b/samples/python/django/example_app/tests.py → samples/django/example_app/tests.py
diff --git a/samples/python/django/example_app/urls.py → samples/django/example_app/urls.py b/samples/python/django/example_app/urls.py → samples/django/example_app/urls.py
diff --git a/samples/python/django/example_app/views.py → samples/django/example_app/views.py b/samples/python/django/example_app/views.py → samples/django/example_app/views.py
diff --git a/samples/python/django/manage.py → samples/django/manage.py b/samples/python/django/manage.py → samples/django/manage.py
diff --git a/samples/python/django/requirements.txt → samples/django/requirements.txt b/samples/python/django/requirements.txt → samples/django/requirements.txt
diff --git a/samples/python/flask/Dockerfile → samples/flask/Dockerfile b/samples/python/flask/Dockerfile → samples/flask/Dockerfile
diff --git a/samples/python/flask/README → samples/flask/README b/samples/python/flask/README → samples/flask/README
diff --git a/samples/python/flask/README.md → samples/flask/README.md b/samples/python/flask/README.md → samples/flask/README.md
@@ -2,6 +2,9 @@
 
 This is a sample of a basic Flask TODO app. The items are stored in memory and are lost when the server is restarted, but it should give you a basic idea of how to get started with Flask on Defang. Note that alognside your .py file, include a requirements.txt so that the Dockerfile can install the necessary packages with pip. 
 
+### NOTE:
+This sample is a simple Flask app that demonstrates how to create a TODO app using Flask. The items are stored in memory and are lost when the server is restarted. This sample is intended to provide a basic understanding of how to get started with Flask on Defang. **it is not intended for production use**. If you need something production ready, you should use a managed database like Postgres or MySQL.
+
 ## Essential Setup Files
 1. A <a href="https://docs.docker.com/develop/develop-images/dockerfile_best-practices/">Dockerfile</a>.
 2. A <a href="https://docs.defang.io/docs/concepts/compose">compose file</a> to define and run multi-container Docker applications (this is how Defang identifies services to be deployed).
@@ -15,3 +18,13 @@ This is a sample of a basic Flask TODO app. The items are stored in memory and a
 1. Open the terminal and type `defang login`
 2. Type `defang compose up` in the CLI
 3. Your app should be up and running with Defang in minutes!
+
+---
+
+Title: Simple Flask App
+
+Short Description: A sample of a basic Flask TODO app
+
+Tags: flask, python
+
+Languages: python
diff --git a/samples/python/flask/app.py → samples/flask/app.py b/samples/python/flask/app.py → samples/flask/app.py
diff --git a/samples/python/flask/compose.yaml → samples/flask/compose.yaml b/samples/python/flask/compose.yaml → samples/flask/compose.yaml
diff --git a/samples/python/flask/requirements.txt → samples/flask/requirements.txt b/samples/python/flask/requirements.txt → samples/flask/requirements.txt
diff --git a/samples/golang/AWS S3/Dockerfile → samples/golang-http-form/Dockerfile b/samples/golang/AWS S3/Dockerfile → samples/golang-http-form/Dockerfile
diff --git a/...s/golang/Web Page and Form Post/README.md → samples/golang-http-form/README.md b/...s/golang/Web Page and Form Post/README.md → samples/golang-http-form/README.md
@@ -18,3 +18,14 @@ This Go application demonstrates a simple form submission using the standard net
 1. Open the terminal and type `defang login`
 2. Type `defang compose up` in the CLI
 3. Your app should be up and running with Defang in minutes!
+
+---
+
+Title: Go HTTP Form
+
+Short Description: A simple Go application that demonstrates form submission using the net/http library
+
+Tags: go, http, form
+
+Languages: go
+
diff --git a/samples/golang/Basic Service/compose.yaml → samples/golang-http-form/compose.yaml b/samples/golang/Basic Service/compose.yaml → samples/golang-http-form/compose.yaml
diff --git a/samples/golang/Basic Service/go.mod → samples/golang-http-form/go.mod b/samples/golang/Basic Service/go.mod → samples/golang-http-form/go.mod
diff --git a/samples/golang/Basic Service/go.sum → samples/golang-http-form/go.sum b/samples/golang/Basic Service/go.sum → samples/golang-http-form/go.sum
diff --git a/...les/golang/Web Page and Form Post/main.go → samples/golang-http-form/main.go b/...les/golang/Web Page and Form Post/main.go → samples/golang-http-form/main.go
diff --git a/samples/golang/Basic Service/Dockerfile → samples/golang-http/Dockerfile b/samples/golang/Basic Service/Dockerfile → samples/golang-http/Dockerfile
diff --git a/samples/golang-http/README.md b/samples/golang-http/README.md
@@ -0,0 +1,13 @@
+# HTTP Echo Server
+
+A very simple example of a Go service that listens on a port and returns information about the request.
+
+---
+
+Title: Go HTTP Server
+
+Short Description: A simple Go application that echoes back the request
+
+Tags: go, http
+
+Languages: go
diff --git a/...golang/Fetch and Return JSON/compose.yaml → samples/golang-http/compose.yaml b/...golang/Fetch and Return JSON/compose.yaml → samples/golang-http/compose.yaml
diff --git a/samples/golang/ChatGPT API/go.mod → samples/golang-http/go.mod b/samples/golang/ChatGPT API/go.mod → samples/golang-http/go.mod
diff --git a/samples/golang/ChatGPT API/go.sum → samples/golang-http/go.sum b/samples/golang/ChatGPT API/go.sum → samples/golang-http/go.sum
diff --git a/samples/golang/Basic Service/main.go → samples/golang-http/main.go b/samples/golang/Basic Service/main.go → samples/golang-http/main.go
diff --git a/samples/golang/go-mongodb-atlas/Dockerfile → samples/golang-mongodb-atlas/Dockerfile b/samples/golang/go-mongodb-atlas/Dockerfile → samples/golang-mongodb-atlas/Dockerfile
diff --git a/samples/golang/go-mongodb-atlas/README.md → samples/golang-mongodb-atlas/README.md b/samples/golang/go-mongodb-atlas/README.md → samples/golang-mongodb-atlas/README.md
@@ -23,3 +23,13 @@ mongodb+srv://<username>:<pwd>@host
 1. Open the terminal and type `defang login`
 2. Type `defang compose up` in the CLI
 3. Your app should be up and running with Defang in minutes!
+
+---
+
+Title: Go MongoDB Atlas
+
+Short Description: A simple Go application that manages tasks with MongoDB Atlas
+
+Tags: go, mongodb, atlas, task manager
+
+Languages: go
diff --git a/samples/golang/go-mongodb-atlas/compose.yaml → samples/golang-mongodb-atlas/compose.yaml b/samples/golang/go-mongodb-atlas/compose.yaml → samples/golang-mongodb-atlas/compose.yaml
diff --git a/samples/golang/go-mongodb-atlas/go.mod → samples/golang-mongodb-atlas/go.mod b/samples/golang/go-mongodb-atlas/go.mod → samples/golang-mongodb-atlas/go.mod
diff --git a/samples/golang/go-mongodb-atlas/go.sum → samples/golang-mongodb-atlas/go.sum b/samples/golang/go-mongodb-atlas/go.sum → samples/golang-mongodb-atlas/go.sum
diff --git a/samples/golang/go-mongodb-atlas/main.go → samples/golang-mongodb-atlas/main.go b/samples/golang/go-mongodb-atlas/main.go → samples/golang-mongodb-atlas/main.go
diff --git a/...golang/go-mongodb-atlas/static/index.html → ...es/golang-mongodb-atlas/static/index.html b/...golang/go-mongodb-atlas/static/index.html → ...es/golang-mongodb-atlas/static/index.html
diff --git a/samples/golang/ChatGPT API/Dockerfile → samples/golang-openai/Dockerfile b/samples/golang/ChatGPT API/Dockerfile → samples/golang-openai/Dockerfile
diff --git a/samples/golang/ChatGPT API/README.md → samples/golang-openai/README.md b/samples/golang/ChatGPT API/README.md → samples/golang-openai/README.md
@@ -17,4 +17,14 @@ echo "Hello" | curl -H "Content-Type: application/text" -d @- https://xxxxxxxx/p
 or
 ```
 cat prompt.txt | curl -H "Content-Type: application/text" -d @- https://xxxxxxxx/prompt
-```
+```
+
+---
+
+Title: Go OpenAI
+
+Short Description: A simple Go application that interacts with the OpenAI API
+
+Tags: go, openai, chatgpt
+
+Languages: go
diff --git a/samples/golang/ChatGPT API/compose.yaml → samples/golang-openai/compose.yaml b/samples/golang/ChatGPT API/compose.yaml → samples/golang-openai/compose.yaml
diff --git a/samples/golang/Fetch and Return JSON/go.mod → samples/golang-openai/go.mod b/samples/golang/Fetch and Return JSON/go.mod → samples/golang-openai/go.mod
diff --git a/samples/golang/Fetch and Return JSON/go.sum → samples/golang-openai/go.sum b/samples/golang/Fetch and Return JSON/go.sum → samples/golang-openai/go.sum
diff --git a/samples/golang/ChatGPT API/main.go → samples/golang-openai/main.go b/samples/golang/ChatGPT API/main.go → samples/golang-openai/main.go
diff --git a/...s/golang/Fetch and Return JSON/Dockerfile → samples/golang-rest-api/Dockerfile b/...s/golang/Fetch and Return JSON/Dockerfile → samples/golang-rest-api/Dockerfile
diff --git a/...es/golang/Fetch and Return JSON/README.md → samples/golang-rest-api/README.md b/...es/golang/Fetch and Return JSON/README.md → samples/golang-rest-api/README.md
@@ -1,3 +1,13 @@
 # Go HTTP Server with Fiscal Data API
 
-This is a simple HTTP server written in Go that serves two endpoints: / and /rates. The / endpoint responds with a JSON object containing the status, while the /rates endpoint fetches data from the Fiscal Data Treasury API and returns the response to the client.
+This is a simple HTTP server written in Go that serves two endpoints: / and /rates. The / endpoint responds with a JSON object containing the status, while the /rates endpoint fetches data from the Fiscal Data Treasury API and returns the response to the client.
+
+---
+
+Title: Go + REST API
+
+Short Description: A simple Go application that fetches fiscal data from an API
+
+Tags: go, http, fiscal data, api, rest
+
+Languages: go
diff --git a/...olang/Web Page and Form Post/compose.yaml → samples/golang-rest-api/compose.yaml b/...olang/Web Page and Form Post/compose.yaml → samples/golang-rest-api/compose.yaml
diff --git a/samples/golang/Web Page and Form Post/go.mod → samples/golang-rest-api/go.mod b/samples/golang/Web Page and Form Post/go.mod → samples/golang-rest-api/go.mod
diff --git a/samples/golang/Web Page and Form Post/go.sum → samples/golang-rest-api/go.sum b/samples/golang/Web Page and Form Post/go.sum → samples/golang-rest-api/go.sum
diff --git a/samples/golang/Fetch and Return JSON/main.go → samples/golang-rest-api/main.go b/samples/golang/Fetch and Return JSON/main.go → samples/golang-rest-api/main.go
diff --git a/.../golang/Web Page and Form Post/Dockerfile → samples/golang-s3/Dockerfile b/.../golang/Web Page and Form Post/Dockerfile → samples/golang-s3/Dockerfile
diff --git a/samples/golang/AWS S3/README.md → samples/golang-s3/README.md b/samples/golang/AWS S3/README.md → samples/golang-s3/README.md
@@ -13,3 +13,13 @@ and then enter the value when prompted.
 ## Testing
 curl -X POST -H 'Content-Type: application/json' -d '{ "first_name" : "jane", "last_name" : "doe" }' https://xxxxxx/upload
 curl https://xxxxxx/download
+
+---
+
+Title: Go S3
+
+Short Description: A simple Go application that uploads and downloads files from AWS S3
+
+Tags: go, s3, aws
+
+Languages: go
diff --git a/samples/golang/AWS S3/compose.yaml → samples/golang-s3/compose.yaml b/samples/golang/AWS S3/compose.yaml → samples/golang-s3/compose.yaml
diff --git a/samples/golang/AWS S3/go.mod → samples/golang-s3/go.mod b/samples/golang/AWS S3/go.mod → samples/golang-s3/go.mod
diff --git a/samples/golang/AWS S3/go.sum → samples/golang-s3/go.sum b/samples/golang/AWS S3/go.sum → samples/golang-s3/go.sum
diff --git a/samples/golang/AWS S3/main.go → samples/golang-s3/main.go b/samples/golang/AWS S3/main.go → samples/golang-s3/main.go
diff --git a/samples/golang/slackbot/Dockerfile → samples/golang-slackbot/Dockerfile b/samples/golang/slackbot/Dockerfile → samples/golang-slackbot/Dockerfile
diff --git a/samples/golang/slackbot/README.md → samples/golang-slackbot/README.md b/samples/golang/slackbot/README.md → samples/golang-slackbot/README.md
@@ -46,4 +46,14 @@ Once the Slackbot is deployed, you can send a POST request to the `/` endpoint w
 curl 'https://raphaeltm-bot--8080.prod1.defang.dev/' \
   -H 'content-type: application/json' \
   --data-raw $'{"message":"This is your bot speaking. We\'ll be landing in 10 minutes. Please fasten your seatbelts."}'
-```
+```
+
+---
+
+Title: Go Slackbot
+
+Short Description: A simple Slackbot that posts messages to a Slack channel
+
+Tags: go, slack, bot
+
+Languages: go
diff --git a/samples/golang/slackbot/compose.yaml → samples/golang-slackbot/compose.yaml b/samples/golang/slackbot/compose.yaml → samples/golang-slackbot/compose.yaml
diff --git a/samples/golang/slackbot/go.mod → samples/golang-slackbot/go.mod b/samples/golang/slackbot/go.mod → samples/golang-slackbot/go.mod
diff --git a/samples/golang/slackbot/go.sum → samples/golang-slackbot/go.sum b/samples/golang/slackbot/go.sum → samples/golang-slackbot/go.sum
diff --git a/samples/golang/slackbot/main.go → samples/golang-slackbot/main.go b/samples/golang/slackbot/main.go → samples/golang-slackbot/main.go
diff --git a/samples/golang/Basic Service/README.md b/samples/golang/Basic Service/README.md
diff --git a/samples/other/hasura/README.md → samples/hasura/README.md b/samples/other/hasura/README.md → samples/hasura/README.md
@@ -25,3 +25,13 @@ If you want to edit the database, permissions, or any other Hasura settings such
 3. Setup a password for hasura by typing `defang config set HASURA_GRAPHQL_ADMIN_SECRET` and adding a password you would like to login with.
 2. Type `defang compose up` in the CLI.
 3. Your app will be running within a few minutes.
+
+---
+
+Title: GraphQL API with Hasura + Postgres
+
+Short Description: A sample project demonstrating how to deploy Hasura with Defang and connect it to a Postgres database
+
+Tags: hasura, graphql, postgres, database
+
+Languages: sql, graphql
diff --git a/samples/other/hasura/compose.dev.yml → samples/hasura/compose.dev.yml b/samples/other/hasura/compose.dev.yml → samples/hasura/compose.dev.yml
diff --git a/samples/other/hasura/compose.yml → samples/hasura/compose.yaml b/samples/other/hasura/compose.yml → samples/hasura/compose.yaml
diff --git a/samples/other/hasura/hasura/Dockerfile → samples/hasura/hasura/Dockerfile b/samples/other/hasura/hasura/Dockerfile → samples/hasura/hasura/Dockerfile
diff --git a/samples/other/hasura/hasura/config.yaml → samples/hasura/hasura/config.yaml b/samples/other/hasura/hasura/config.yaml → samples/hasura/hasura/config.yaml
diff --git a/...er/hasura/hasura/metadata/actions.graphql → ...es/hasura/hasura/metadata/actions.graphql b/...er/hasura/hasura/metadata/actions.graphql → ...es/hasura/hasura/metadata/actions.graphql
diff --git a/...other/hasura/hasura/metadata/actions.yaml → samples/hasura/hasura/metadata/actions.yaml b/...other/hasura/hasura/metadata/actions.yaml → samples/hasura/hasura/metadata/actions.yaml
diff --git a/...er/hasura/hasura/metadata/allow_list.yaml → ...es/hasura/hasura/metadata/allow_list.yaml b/...er/hasura/hasura/metadata/allow_list.yaml → ...es/hasura/hasura/metadata/allow_list.yaml
diff --git a/...er/hasura/hasura/metadata/api_limits.yaml → ...es/hasura/hasura/metadata/api_limits.yaml b/...er/hasura/hasura/metadata/api_limits.yaml → ...es/hasura/hasura/metadata/api_limits.yaml
diff --git a/...sura/hasura/metadata/backend_configs.yaml → ...sura/hasura/metadata/backend_configs.yaml b/...sura/hasura/metadata/backend_configs.yaml → ...sura/hasura/metadata/backend_configs.yaml
diff --git a/...hasura/hasura/metadata/cron_triggers.yaml → ...hasura/hasura/metadata/cron_triggers.yaml b/...hasura/hasura/metadata/cron_triggers.yaml → ...hasura/hasura/metadata/cron_triggers.yaml
diff --git a/.../hasura/metadata/databases/databases.yaml → .../hasura/metadata/databases/databases.yaml b/.../hasura/metadata/databases/databases.yaml → .../hasura/metadata/databases/databases.yaml
diff --git a/...s/default/tables/public_taskStatuses.yaml → ...s/default/tables/public_taskStatuses.yaml b/...s/default/tables/public_taskStatuses.yaml → ...s/default/tables/public_taskStatuses.yaml
diff --git a/...atabases/default/tables/public_tasks.yaml → ...atabases/default/tables/public_tasks.yaml b/...atabases/default/tables/public_tasks.yaml → ...atabases/default/tables/public_tasks.yaml
diff --git a/...atabases/default/tables/public_users.yaml → ...atabases/default/tables/public_users.yaml b/...atabases/default/tables/public_users.yaml → ...atabases/default/tables/public_users.yaml
diff --git a/...data/databases/default/tables/tables.yaml → ...data/databases/default/tables/tables.yaml b/...data/databases/default/tables/tables.yaml → ...data/databases/default/tables/tables.yaml
diff --git a/...etadata/graphql_schema_introspection.yaml → ...etadata/graphql_schema_introspection.yaml b/...etadata/graphql_schema_introspection.yaml → ...etadata/graphql_schema_introspection.yaml
diff --git a/...sura/hasura/metadata/inherited_roles.yaml → ...sura/hasura/metadata/inherited_roles.yaml b/...sura/hasura/metadata/inherited_roles.yaml → ...sura/hasura/metadata/inherited_roles.yaml
diff --git a/...asura/hasura/metadata/metrics_config.yaml → ...asura/hasura/metadata/metrics_config.yaml b/...asura/hasura/metadata/metrics_config.yaml → ...asura/hasura/metadata/metrics_config.yaml
diff --git a/...other/hasura/hasura/metadata/network.yaml → samples/hasura/hasura/metadata/network.yaml b/...other/hasura/hasura/metadata/network.yaml → samples/hasura/hasura/metadata/network.yaml
diff --git a/...hasura/hasura/metadata/opentelemetry.yaml → ...hasura/hasura/metadata/opentelemetry.yaml b/...hasura/hasura/metadata/opentelemetry.yaml → ...hasura/hasura/metadata/opentelemetry.yaml
diff --git a/...ra/hasura/metadata/query_collections.yaml → ...ra/hasura/metadata/query_collections.yaml b/...ra/hasura/metadata/query_collections.yaml → ...ra/hasura/metadata/query_collections.yaml
diff --git a/...asura/hasura/metadata/remote_schemas.yaml → ...asura/hasura/metadata/remote_schemas.yaml b/...asura/hasura/metadata/remote_schemas.yaml → ...asura/hasura/metadata/remote_schemas.yaml
diff --git a/...asura/hasura/metadata/rest_endpoints.yaml → ...asura/hasura/metadata/rest_endpoints.yaml b/...asura/hasura/metadata/rest_endpoints.yaml → ...asura/hasura/metadata/rest_endpoints.yaml
diff --git a/...other/hasura/hasura/metadata/version.yaml → samples/hasura/hasura/metadata/version.yaml b/...other/hasura/hasura/metadata/version.yaml → samples/hasura/hasura/metadata/version.yaml
diff --git a/...845073_create_table_public_users/down.sql → ...845073_create_table_public_users/down.sql b/...845073_create_table_public_users/down.sql → ...845073_create_table_public_users/down.sql
diff --git a/...89845073_create_table_public_users/up.sql → ...89845073_create_table_public_users/up.sql b/...89845073_create_table_public_users/up.sql → ...89845073_create_table_public_users/up.sql
diff --git a/...create_table_public_taskStatuses/down.sql → ...create_table_public_taskStatuses/down.sql b/...create_table_public_taskStatuses/down.sql → ...create_table_public_taskStatuses/down.sql
diff --git a/...1_create_table_public_taskStatuses/up.sql → ...1_create_table_public_taskStatuses/up.sql b/...1_create_table_public_taskStatuses/up.sql → ...1_create_table_public_taskStatuses/up.sql
diff --git a/..._insert_into_public_taskStatuses/down.sql → ..._insert_into_public_taskStatuses/down.sql b/..._insert_into_public_taskStatuses/down.sql → ..._insert_into_public_taskStatuses/down.sql
diff --git a/...38_insert_into_public_taskStatuses/up.sql → ...38_insert_into_public_taskStatuses/up.sql b/...38_insert_into_public_taskStatuses/up.sql → ...38_insert_into_public_taskStatuses/up.sql
diff --git a/..._insert_into_public_taskStatuses/down.sql → ..._insert_into_public_taskStatuses/down.sql b/..._insert_into_public_taskStatuses/down.sql → ..._insert_into_public_taskStatuses/down.sql
diff --git a/...57_insert_into_public_taskStatuses/up.sql → ...57_insert_into_public_taskStatuses/up.sql b/...57_insert_into_public_taskStatuses/up.sql → ...57_insert_into_public_taskStatuses/up.sql
diff --git a/..._insert_into_public_taskStatuses/down.sql → ..._insert_into_public_taskStatuses/down.sql b/..._insert_into_public_taskStatuses/down.sql → ..._insert_into_public_taskStatuses/down.sql
diff --git a/...13_insert_into_public_taskStatuses/up.sql → ...13_insert_into_public_taskStatuses/up.sql b/...13_insert_into_public_taskStatuses/up.sql → ...13_insert_into_public_taskStatuses/up.sql
diff --git a/...205738_create_table_public_tasks/down.sql → ...205738_create_table_public_tasks/down.sql b/...205738_create_table_public_tasks/down.sql → ...205738_create_table_public_tasks/down.sql
diff --git a/...90205738_create_table_public_tasks/up.sql → ...90205738_create_table_public_tasks/up.sql b/...90205738_create_table_public_tasks/up.sql → ...90205738_create_table_public_tasks/up.sql
diff --git a/...94116843_insert_random_seed_data/down.sql → ...94116843_insert_random_seed_data/down.sql b/...94116843_insert_random_seed_data/down.sql → ...94116843_insert_random_seed_data/down.sql
diff --git a/...5294116843_insert_random_seed_data/up.sql → ...5294116843_insert_random_seed_data/up.sql b/...5294116843_insert_random_seed_data/up.sql → ...5294116843_insert_random_seed_data/up.sql
diff --git a/samples/other/imgproxy/README.md → samples/imgproxy/README.md b/samples/other/imgproxy/README.md → samples/imgproxy/README.md
@@ -13,3 +13,13 @@ If you have environment variables configured for your [own cloud account](https:
 ```sh
 defang compose up
 ```
+
+---
+
+Title: ImgProxy
+
+Short Description: A fast and secure standalone server for resizing and converting remote images
+
+Tags: imgproxy, images, server
+
+Languages: 
diff --git a/samples/other/imgproxy/compose.yaml → samples/imgproxy/compose.yaml b/samples/other/imgproxy/compose.yaml → samples/imgproxy/compose.yaml
diff --git a/samples/metabase/README.md b/samples/metabase/README.md
@@ -0,0 +1,34 @@
+# Metabase + Postgres
+
+Metabase is a simple and powerful analytics tool which lets anyone learn and make decisions from their company’s data. This sample demonstrates how to deploy Metabase with Defang. In development, we run a postgres container and in production, we use a managed postgres service. To build the sample, we used Neon, because of their simplicity and generous free tier.
+
+
+## Prerequisites
+1. Download <a href="https://github.com/defang-io/defang">Defang CLI</a>
+2. Have a managed database service configured and have the connection details ready.
+3. (optional) If you are using <a href="https://docs.defang.io/docs/concepts/defang-byoc">Defang BYOC</a>, make sure you have properly <a href="https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html">authenticated your AWS account</a>.
+
+## Local
+
+For development, we use a Postgres container. The Postgres container is defined in the `compose.dev.yml` file. The Metabase container is defined in the `compose.yml` file, with some overrides in the `compose.dev.yml` file so it can correctly connect to the development database container. 
+
+To start the development environment, run `docker compose -f ./compose.yml -f ./compose.dev.yml up`. This will start the Postgres container and the Metabase container. Metabase will be available at `http://localhost:3000`.
+
+Since Metabase is a self contained application, there isn't an actual development process, but you can use the development environment to see how Metabase works.
+
+## Deploying
+
+1. Open the terminal and type `defang login`
+2. Add your database connection details using `defang config` by typing `defang config set <CONFIG_VAL>` where `<CONFIG_VAL>` is the each of the following `MB_DB_DBNAME`, `MB_DB_HOST`, `MB_DB_PORT`, `MB_DB_USER`, `MB_DB_PASS` (to set the database name, host, port, user, and password respectively). For example `defang config set MB_DB_DBNAME` and pasting your database name. 
+3. Type `defang compose up` in the CLI.
+4. Your app will be running within a few minutes.
+
+---
+
+Title: Metabase + Postgres
+
+Short Description: A simple metabase configuration with a Postgres database
+
+Tags: metabase, postgres, analytics, database
+
+Languages: sql
diff --git a/samples/metabase/compose.dev.yml b/samples/metabase/compose.dev.yml
@@ -0,0 +1,35 @@
+version: '3.9'
+services:
+  metabase:
+    environment:
+      - MB_DB_TYPE=postgres
+      - MB_DB_DBNAME=metabase
+      - MB_DB_PORT=5432
+      - MB_DB_USER=metabase
+      - MB_DB_PASS=metabase
+      - MB_DB_HOST=postgres
+    depends_on:
+      postgres: 
+        condition: service_healthy
+
+  postgres:
+    image: "postgres:latest"
+    environment:
+      POSTGRES_DB: metabase
+      POSTGRES_USER: metabase
+      POSTGRES_PASSWORD: metabase
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "metabase"]
+      interval: 10s
+      timeout: 10s
+      retries: 10
+    deploy:
+      resources:
+        reservations:
+          cpus: "0.5"
+          memory: 1024M
+
+volumes:
+  postgres_data:
diff --git a/samples/metabase/compose.yaml b/samples/metabase/compose.yaml
@@ -0,0 +1,26 @@
+version: '3.9'
+name: metabase
+services:
+  metabase:
+    image: "metabase/metabase:latest"
+    ports:
+      - mode: ingress
+        target: 3000
+        published: 3000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health" ]
+      interval: 1m30s
+      timeout: 30s
+      retries: 5
+    environment:
+      - MB_DB_TYPE=postgres
+      - MB_DB_DBNAME
+      - MB_DB_PORT
+      - MB_DB_USER
+      - MB_DB_PASS
+      - MB_DB_HOST
+    deploy:
+      resources:
+        reservations:
+          cpus: "0.5"
+          memory: 1024M
diff --git a/samples/nodejs/blogstarter/.dockerignore → samples/nextjs-blog/.dockerignore b/samples/nodejs/blogstarter/.dockerignore → samples/nextjs-blog/.dockerignore
diff --git a/samples/nodejs/blogstarter/.gitignore → samples/nextjs-blog/.gitignore b/samples/nodejs/blogstarter/.gitignore → samples/nextjs-blog/.gitignore
diff --git a/samples/nodejs/blogstarter/Dockerfile → samples/nextjs-blog/Dockerfile b/samples/nodejs/blogstarter/Dockerfile → samples/nextjs-blog/Dockerfile