Merge branch 'main' into main

noodle-run · Oct 31, 2023 · a7f1181 · a7f1181
2 parents 1824655 + eda57dd
commit a7f1181
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG]"
+title: ""
 labels: bug
 assignees: ""
 ---

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[FEAT]"
+title: ""
 labels: enhancement
 assignees: ""
 ---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,12 @@ on:
   push:
     branches:
       - main
-  pull_request:
+  pull_request_target:
+    branches:
+      - main
+    paths-ignore:
+      - ".vscode/**"
+      - "*.md"
 
 env:
   # Database
@@ -28,6 +33,7 @@ jobs:
   main:
     name: CI
     runs-on: ubuntu-latest
+    environment: CI
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/src/app/(dashboard)/_components/side-menu-modules.tsx b/src/app/(dashboard)/_components/side-menu-modules.tsx
@@ -194,7 +194,7 @@ const CreateModulePopover = () => {
 
   const utils = trpc.useUtils();
 
-  const { mutateAsync } = trpc.module.post.create.useMutation({
+  const { mutateAsync, isLoading } = trpc.module.post.create.useMutation({
     onSuccess: async () => {
       await utils.module.get.all.invalidate();
     },
@@ -362,7 +362,12 @@ const CreateModulePopover = () => {
                   <span className="text-default-500">Color</span>
                 </Button>
 
-                <Button type="submit" color="primary" className="font-semibold">
+                <Button
+                  isLoading={isLoading}
+                  type="submit"
+                  color="primary"
+                  className="font-semibold"
+                >
                   Create module
                 </Button>
               </>

diff --git a/src/app/(dashboard)/_components/side-menu.tsx b/src/app/(dashboard)/_components/side-menu.tsx
@@ -33,7 +33,7 @@ export const DashboardSideMenu = async () => {
           <ul>
             <li>
               <FeedbackModal
-                email={user?.emailAddresses[0]!.emailAddress ?? ""}
+                email={user?.emailAddresses[0]?.emailAddress ?? ""}
               />
             </li>
             <li>