Merge branch 'next' into task/OV-6-add-loader

BinaryStudioAcademy · Aug 19, 2024 · 6d42a55 · 6d42a55
2 parents 9c55dfd + 2f36f54
commit 6d42a55
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 52 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -2,7 +2,7 @@ name: Bug Report
 description: Report a bug
 title: 'BUG:'
 labels: ['BUG']
-projects: "BinaryStudioAcademy/30"
+projects: 'BinaryStudioAcademy/30'
 body:
     - type: markdown
       attributes:

diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,22 +1,22 @@
 name: Feature
 description: Abstract feature description
-title: "FEAT:"
-projects: "BinaryStudioAcademy/30"
+title: 'FEAT:'
+projects: 'BinaryStudioAcademy/30'
 body:
-  - type: textarea
-    id: what-feature
-    attributes:
-      label: What feature?
-      placeholder: Add descriptions
-    validations:
-      required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Add screenshots
-      placeholder: Add screenshots, mockups, etc.
-  - type: textarea
-    id: acceptance-criteria
-    attributes:
-      label: Acceptance criteria
-      placeholder: Add acceptance criteria.
+    - type: textarea
+      id: what-feature
+      attributes:
+          label: What feature?
+          placeholder: Add descriptions
+      validations:
+          required: true
+    - type: textarea
+      id: screenshots
+      attributes:
+          label: Add screenshots
+          placeholder: Add screenshots, mockups, etc.
+    - type: textarea
+      id: acceptance-criteria
+      attributes:
+          label: Acceptance criteria
+          placeholder: Add acceptance criteria.
diff --git a/.github/labeler.yml b/.github/labeler.yml
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -52,14 +52,3 @@ jobs:
 
               run: |
                   npx danger ci --failOnErrors --text-only
-
-            - name: Add Folder Labels
-              uses: actions/labeler@v4
-              with:
-                  repo-token: '${{ secrets.GITHUB_TOKEN }}'
-                  sync-labels: true
-
-            - name: Add Environment Labels
-              uses: ffittschen/pr-branch-labeler@v1
-              with:
-                  repo-token: '${{ secrets.GITHUB_TOKEN }}'
diff --git a/.ls-lint.yml b/.ls-lint.yml
@@ -16,7 +16,7 @@ ls:
         .ts: snake_case
 
 ignore:
-    - .git
+    - .github
     - node_modules
     - build
     - shared/build

diff --git a/frontend/package.json b/frontend/package.json
@@ -7,7 +7,7 @@
         "npm": "10.x.x"
     },
     "scripts": {
-        "lint:css": "npx stylelint \"src/**/*.scss\"",
+        "lint:css": "npx stylelint \"src/**/*.scss\" --aei",
         "lint:js": "npx eslint \"src/**/*.{ts,tsx}\"",
         "lint:type": "npx tsc --noEmit",
         "lint": "npm run lint:type && npm run lint:js",

diff --git a/frontend/src/framework/config/base-config.package.ts b/frontend/src/framework/config/base-config.package.ts
@@ -10,9 +10,7 @@ class BaseConfig implements Config {
     private get envSchema(): EnvironmentSchema {
         return {
             APP: {
-                ENVIRONMENT: import.meta.env[
-                    'VITE_APP_NODE_ENV'
-                ],
+                ENVIRONMENT: import.meta.env['VITE_APP_NODE_ENV'],
             },
             API: {
                 ORIGIN_URL: import.meta.env[

diff --git a/frontend/src/framework/config/types/environment-schema.type.ts b/frontend/src/framework/config/types/environment-schema.type.ts
@@ -1,5 +1,5 @@
 import { type AppEnvironment } from '~/bundles/common/enums/enums.js';
-import  { type ValueOf } from '~/bundles/common/types/types.js';
+import { type ValueOf } from '~/bundles/common/types/types.js';
 
 type EnvironmentSchema = {
     APP: {

diff --git a/frontend/src/framework/http-api/types/http-api-options.type.ts b/frontend/src/framework/http-api/types/http-api-options.type.ts
@@ -1,5 +1,5 @@
 import { type ContentType } from '~/bundles/common/enums/enums.js';
-import  { type ValueOf } from '~/bundles/common/types/types.js';
+import { type ValueOf } from '~/bundles/common/types/types.js';
 import { type HttpOptions } from '~/framework/http/http.js';
 
 type HttpApiOptions = Omit<HttpOptions, 'headers' | 'payload'> & {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ ls: @@
             .ts: snake_case
     ignore:
-        - .git
+        - .github
         - node_modules
         - build
         - shared/build
@@ Expand Down @@