Amplication merge conflicts auto-resolution

.devcontainer/devcontainer.json

@@ -0,0 +1,67 @@
+{
+  "name": "Amplication workspace",
+
+  "image": "mcr.microsoft.com/devcontainers/typescript-node:0-18",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+  },
+
+  "portsAttributes": {
+    "8080": {
+      "label": "kafka ui"
+    },
+    "9092": {
+      "label": "kafka"
+    },
+    "5432": {
+      "label": "postgres"
+    },
+    "4400": {
+      "label": "storybook"
+    },
+    "7010": {
+      "label": "amplication-build-manager"
+    },
+    "7005": {
+      "label": "amplication-plugin-api"
+    },
+    "3001": {
+      "label": "amplication-client"
+    },
+    "7000": {
+      "label": "amplication-server"
+    },
+    "7020": {
+      "label": "amplication-git-pull-service"
+    },
+    "7015": {
+      "label": "amplication-git-push-webhook-service"
+    }
+  },
+
+  "postCreateCommand": "npm install && npm run setup:dev",
+
+  "customizations": {
+    "vscode": {
+      // vscode extensions recommended in extensions.json file
+      "extensions": [
+        "codezombiech.gitignore",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "mikestead.dotenv",
+        "ms-azuretools.vscode-docker",
+        "prisma.prisma",
+        "graphql.vscode-graphql",
+        "redhat.vscode-yaml",
+        "streetsidesoftware.code-spell-checker",
+        "hashicorp.terraform",
+        "sleistner.vscode-fileutils",
+        "eamodio.gitlens",
+        "nrwl.angular-console",
+        "firsttris.vscode-jest-runner",
+        "znck.grammarly",
+        "PKief.material-icon-theme"
+      ]
+    }
+  }
+}

.dockerignore

@@ -0,0 +1,25 @@
+.git
+.github
+.vscode
+.idea
+docs
+.env
+.gitignore
+docker-compose.yml
+
+**/coverage
+**/node_modules
+!**/node_modules/@amplication/prisma-clients
+*.md
+**/*.md
+*.yaml
+**/*.yaml
+
+**/*.spec.ts
+**/*.mock.ts
+
+.amplication
+
+libs/
+
+!**/data-service-generator/src/**/static/**/*.*

.env.docker-compose

@@ -0,0 +1,7 @@
+POSTGRESQL_USER=admin
+POSTGRESQL_PASSWORD=admin
+POSTGRESQL_DB_NAME=amplication
+JWT_SECRET=jwt-secret
+SERVICE_JWT_SECRET=service-jwt-secret
+BCRYPT_SALT_OR_ROUNDS=10
+CONTAINER_BUILDER_DEFAULT=docker

.eslintignore

@@ -0,0 +1,7 @@
+node_modules
+**/node_modules
+dist
+**/src/models.ts
+**/*.stories.tsx
+coverage
+generated-prisma-client

.eslintrc.json

@@ -0,0 +1,53 @@
+{
+  "root": true,
+  "ignorePatterns": ["**/*"],
+  "plugins": ["perfectionist", "@nx"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "no-console": "warn",
+        "@nx/enforce-module-boundaries": [
+          "error",
+          {
+            "enforceBuildableLibDependency": true,
+            "allow": ["@amplication/ui/design-system"], //exclude @amplication/ui/design-system because we use a mix of Static imports and lazy loading
+            "depConstraints": [
+              {
+                "sourceTag": "*",
+                "onlyDependOnLibsWithTags": ["*"]
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "extends": ["plugin:@nx/typescript"],
+      "rules": {
+        "no-prototype-builtins": "off"
+      }
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "extends": ["plugin:@nx/javascript"],
+      "rules": {}
+    },
+    {
+      "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
+      "env": {
+        "jest": true
+      },
+      "rules": {}
+    },
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
+    }
+  ],
+  "extends": ["plugin:storybook/recommended"]
+}

.github/ISSUE_TEMPLATE/bug.yaml

@@ -0,0 +1,85 @@
+name: Bug Report
+description: Problems and issues with code of Amplication
+title: "🐛 Bug Report: "
+labels: ["type: bug"]
+body:
+  - type: markdown
+    attributes:
+      value: "
+        <img src='https://avatars.githubusercontent.com/u/65107786?s=200&v=4' align='left' width='80' height='80'>
+        Thank you for finding the time to report the problem!
+
+        We appreciate the community's efforts to improve Amplication.
+
+        Note, that after you create an issue, if you have a change ready to submit!
+
+        You can open a [Pull Request](https://github.com/amplication/amplication/pulls)  immediately after.
+        <br clear='left'/>"
+  - type: textarea
+    attributes:
+      label: What happened?
+      description: Please provide as much info as possible. If this matter is security related, please disclose it privately via [Amplication Security]
+      placeholder: >
+        Please provide the context in which the problem occurred and explain what happened
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What you expected to happen
+      description: What do you think went wrong?
+      placeholder: >
+        Please explain why you think the behaviour is erroneous. It is extremely helpful if you copy&paste
+        the fragment of logs showing the exact error messages or wrong behaviour and screenshots for
+        UI problems or a video of you demonstrating the problem. You can include files by
+        dragging and dropping them here.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: How to reproduce
+      description: >
+        What should we do to reproduce the problem? If you are not able to provide a reproducible case,
+        please open a [Discussion](https://github.com/amplication/amplication/discussions) instead.
+      placeholder: >
+        Please make sure you provide a reproducible step-by-step case of how to reproduce the problem
+        as minimally and precisely as possible. Keep in mind we do not have access to your local environment.
+        Remember that non-reproducible issues will be closed! Opening a discussion is recommended as a
+        first step.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Amplication version
+      description: >
+        What Amplication version are you using?
+
+  - type: textarea
+    attributes:
+      label: Environment
+      description: In which environment does the problem occur?
+      placeholder: "
+        Node version: [node -v] \n
+        NPM version: [npm -v] \n
+        Docker version: [docker -v] \n
+        Cloud Provider: [AWS, GCP, Azure, Heroku, ...] \n
+        OS Details (Linux): [cat /etc/os-release && uname -a]\n
+        OS Details (Windows): [wmic os get Caption, Version, BuildNumber, OSArchitecture]
+        "
+
+  - type: dropdown
+    attributes:
+      label: Are you willing to submit PR?
+      description: >
+        This is absolutely not required, but we are happy to guide you in the contribution process
+        especially if you already have a good understanding of how to implement the fix.
+        Amplication is a community-managed project and we love to bring new contributors in.
+        Find us in #support on [Discord](https://amplication.com/discord)!
+      multiple: true
+      options:
+        - "Yes I am willing to submit a PR!"
+  - type: markdown
+    attributes:
+      value: <br>
+  - type: markdown
+    attributes:
+      value: By submitting this issue I agree to follow this project`s [Code of Conduct](https://github.com/amplication/amplication/blob/master/CODE_OF_CONDUCT.md)

.github/ISSUE_TEMPLATE/documentation-request.yaml

@@ -0,0 +1,93 @@
+name: Documentation Request
+description: Provide information for a new or updated documentation
+title: "📖 Documentation: "
+labels: ["type: docs"]
+body:
+  - type: markdown
+    attributes:
+      value: "
+        <img src='https://avatars.githubusercontent.com/u/65107786?s=200&v=4' align='left' width='80' height='80'>
+
+
+        Each new or updated feature must be accompanied by a Document Feature Request.
+
+        The information will be used by the technical writer to edit and curate the information for inclusion in the docs.
+        <br/>
+        <br/>
+        <b>
+        Important: Please provide raw data. You are not expected to provide a polished text. The tech writer will write and edit the content as required.
+        </b>
+        <br clear='left'/>"
+  - type: textarea
+    attributes:
+      label: Description (What is it?)
+      description: "
+        Use this section to provide an overview of the feature or process being described.
+        If it is an update to an existing feature, describe what has changed.
+        [Example:] (https://docs.amplication.com/how-to/create-message-broker/#overview)"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Use Case (Why does the user need it?)
+      description: "
+        Describe the feature or process from the users' point of view. How does the feature meet the user's requirements?
+        [Example:](https://docs.amplication.com/how-to/custom-code/#the-vision)"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Issue URL
+      description: Link to the related issue.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Pull Request URL
+      description: Link to the related PR.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: How it works (How does the user use it?)
+      description: "
+        Our users are developers, so the emphasis should be on giving information that is required for understanding the feature,
+        rather than step-by-step instructions of how to use the UI. However, there should be a mention of where the feature is located.
+        [Example:](https://docs.amplication.com/how-to/custom-code/#how-it-works)."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: Add screenshots to show where this feature is displayed in the UI. If not relevant, write N/A.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Code Samples
+      description: Add any code samples that are relevant to the user. If not relevant, write N/A.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Figma URL
+      description: Add a link to any Figma diagrams that relate to the feature. If not relevant, write N/A.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reference (What data does the user need to use this feature?)
+      description: "
+        Sometimes, some reference info is required. Include the information here, or link to a source of the information.
+        Example:[Plugin Events](https://docs.amplication.com/plugins/plugin-events/CreateEntityServiceBase/)"
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional Information
+      description: Include any information or links that might help with writing the Docs article.
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: By submitting this issue I agree to follow this project`s [Code of Conduct](https://github.com/amplication/amplication/blob/master/CODE_OF_CONDUCT.md)

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,43 @@
+name: Feature Request
+description: Submit a proposal for a new feature
+labels: ["type: feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: "
+        <img src='https://avatars.githubusercontent.com/u/65107786?s=200&v=4' align='left' width='80' height='80'>
+        Thank you for finding the time to propose a new feature!
+
+        We appreciate the community's efforts to improve Amplication.
+
+        Note, that after you create an issue, if you have a change ready to submit!
+
+        You can open [Pull Request](https://github.com/amplication/amplication/pulls) immediately after.
+        <br clear='left'/>"
+  - type: textarea
+    attributes:
+      label: Feature description
+      description: Describe your feature proposal
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Use case
+      description: Describe what you are trying to achive
+  - type: dropdown
+    attributes:
+      label: Are you willing to submit PR?
+      description: >
+        This is absolutely not required, but we are happy to guide you in the contribution process
+        especially if you already have a good understanding of how to implement the fix.
+        Amplication is a community-managed project and we love to bring new contributors in.
+        Find us in #support on [Discord](https://amplication.com/discord)!
+      multiple: true
+      options:
+        - "Yes I am willing to submit a PR!"
+  - type: markdown
+    attributes:
+      value: <br>
+  - type: markdown
+    attributes:
+      value: By submitting this issue I agree to follow this project`s [Code of Conduct](https://github.com/amplication/amplication/blob/master/CODE_OF_CONDUCT.md)