Merge branch 'development' of https://github.com/NFDI4Chem/nmrxiv int…

…o development
NFDI4Chem · Dec 8, 2023 · e82cc08 · e82cc08
2 parents f61f25c + c519798
commit e82cc08
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/app/Http/Controllers/API/DatasetController.php b/app/Http/Controllers/API/DatasetController.php
@@ -42,15 +42,15 @@ public function all(Request $request)
 
     /**
      * @OA\Get(
-     * path="/api/v1/dataset/?id={id}",
+     * path="/api/v1/dataset/{id}",
      * summary="Fetch nmrXiv public datasets based on identifier",
      * description="Fetch details of nmrXiv public dataset based on identifier.",
      * operationId="publicDataset",
      * tags={"public"},
      *
      * @OA\Parameter(
      *  name="id",
-     *  in="query",
+     *  in="path",
      *  description="Public dataset identifier e.g. D12",
      *  required=true,
      *

diff --git a/app/Http/Controllers/API/ProjectController.php b/app/Http/Controllers/API/ProjectController.php
@@ -42,15 +42,15 @@ public function all(Request $request)
 
     /**
      * @OA\Get(
-     * path="/api/v1/project/?id={id}",
+     * path="/api/v1/project/{id}",
      * summary="Fetch nmrXiv public project based on identifier",
      * description="Fetch details of nmrXiv public project based on identifier.",
      * operationId="publicProject",
      * tags={"public"},
      *
      * @OA\Parameter(
      *  name="id",
-     *  in="query",
+     *  in="path",
      *  description="Public project identifier e.g. P12",
      *  required=true,
      *

diff --git a/app/Http/Controllers/API/StudyController.php b/app/Http/Controllers/API/StudyController.php
@@ -42,15 +42,15 @@ public function all(Request $request)
 
     /**
      * @OA\Get(
-     * path="/api/v1/sample/?id={id}",
+     * path="/api/v1/sample/{id}",
      * summary="Fetch nmrXiv public samples based on identifier",
      * description="Fetch details of nmrXiv public sample based on identifier.",
      * operationId="publicSample",
      * tags={"public"},
      *
      * @OA\Parameter(
      *  name="id",
-     *  in="query",
+     *  in="path",
      *  description="Public sample identifier e.g. S12",
      *  required=true,
      *

diff --git a/resources/js/Shared/Search.vue b/resources/js/Shared/Search.vue
@@ -157,7 +157,7 @@
                                                     <div
                                                         v-if="currentRefinement"
                                                         class="border rounded-md"
-                                                    >
+                                                    > 
                                                         <span
                                                             v-if="
                                                                 index.hits
@@ -366,7 +366,9 @@ export default {
         return {
             open,
             onSelect(item) {
-                window.location = item.url;
+                if(item.url && item.url !== undefined){
+                    window.location = item.url;
+                }
             },
         };
     },
@@ -375,20 +377,20 @@ export default {
             projects: [],
             recent: [],
             quickActions: [
-                {
-                    name: "Ask a question...",
-                    icon: DocumentPlusIcon,
-                    shortcut: "N",
-                    url: this.mailTo,
-                },
-                {
+            {
                     name: "Learn Spectral analysis...",
                     icon: TagIcon,
                     shortcut: "F",
                     url: "https://docs.nmrxiv.org",
                 },
                 //   { name: "Add hashtag...", icon: HashtagIcon, shortcut: "H", url: "#" },
                 //   { name: "Add label...", icon: TagIcon, shortcut: "L", url: "#" },
+                {
+                    name: "For queries/feedback write to us at [email protected]",
+                    icon: DocumentPlusIcon,
+                    shortcut: "N",
+                    url: "https://docs.nmrxiv.org/FAQs.html#how-to-reach-to-you",
+                },
             ],
             selected: null,
             department: "all",
@@ -400,11 +402,7 @@ export default {
 
     computed: {
         index() {
-            return this.$page.props.SCOUT_PREFIX + "projects";
-        },
-
-        mailTo() {
-            return "mailto:" + String(this.$page.props.mailFromAddress);
+            return this.$page.props.SCOUT_PREFIX + "projects" ;
         },
     },
 

diff --git a/storage/api-docs/api-docs.json b/storage/api-docs/api-docs.json
@@ -215,7 +215,7 @@
                 }
             }
         },
-        "/api/v1/dataset/?id={id}": {
+        "/api/v1/dataset/{id}": {
             "get": {
                 "tags": [
                     "public"
@@ -226,7 +226,7 @@
                 "parameters": [
                     {
                         "name": "id",
-                        "in": "query",
+                        "in": "path",
                         "description": "Public dataset identifier e.g. D12",
                         "required": true,
                         "schema": {
@@ -265,7 +265,7 @@
                 }
             }
         },
-        "/api/v1/project/?id={id}": {
+        "/api/v1/project/{id}": {
             "get": {
                 "tags": [
                     "public"
@@ -276,7 +276,7 @@
                 "parameters": [
                     {
                         "name": "id",
-                        "in": "query",
+                        "in": "path",
                         "description": "Public project identifier e.g. P12",
                         "required": true,
                         "schema": {
@@ -511,7 +511,7 @@
                 }
             }
         },
-        "/api/v1/sample/?id={id}": {
+        "/api/v1/sample/{id}": {
             "get": {
                 "tags": [
                     "public"
@@ -522,7 +522,7 @@
                 "parameters": [
                     {
                         "name": "id",
-                        "in": "query",
+                        "in": "path",
                         "description": "Public sample identifier e.g. S12",
                         "required": true,
                         "schema": {