Merge branch 'main' into prod-helm-deploy

NFDI4Chem · Aug 2, 2024 · ceafebf · ceafebf
2 parents 52529a7 + f1f1f10
commit ceafebf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.env.example b/.env.example
@@ -14,7 +14,7 @@ EUROPEMC_WS_API=https://www.ebi.ac.uk/europepmc/webservices/rest/search
 ORCID_ID_SEARCH_API=https://pub.orcid.org/v2.1/search
 ORCID_ID_EMPLOYMENT_API=https://pub.orcid.org/v3.0/{orcid_id}/employments
 ORCID_ID_PERSON_API=https://pub.orcid.org/v3.0/{orcid_id}/person
-CM_API=https://api.naturalproducts.net/latest/
+CM_API=https://api.cheminf.studio/latest/
 CROSSREF_API=https://api.crossref.org/works/
 DATACITE_API=https://api.datacite.org/
 

diff --git a/app/Console/Commands/SanitizeMolecules.php b/app/Console/Commands/SanitizeMolecules.php
@@ -111,7 +111,7 @@ protected function fetchCAS($smiles)
     protected function standardizeMolecule($mol)
     {
         try {
-            $response = Http::post('https://api.naturalproducts.net/latest/chem/standardize', $mol);
+            $response = Http::post('https://api.cheminf.studio/latest/chem/standardize', $mol);
 
             return $response->json();
         } catch (\Illuminate\Http\Client\ConnectionException $e) {

diff --git a/app/Jobs/ArchiveStudy.php b/app/Jobs/ArchiveStudy.php
@@ -196,7 +196,7 @@ public function handle(): void
 
     // protected function standardizeMolecule($mol)
     // {
-    //     $response = Http::post('https://dev.api.naturalproducts.net/latest/chem/standardize', $mol);
+    //     $response = Http::post('https://api.cheminf.studio/latest/chem/standardize', $mol);
     //     return $response->json();
     // }
 

diff --git a/resources/js/Pages/Study/About.vue b/resources/js/Pages/Study/About.vue
@@ -735,7 +735,7 @@ export default {
         },
         standardizeMolecules(mol) {
             return axios.post(
-                "https://api.naturalproducts.net/latest/chem/standardize",
+                "https://api.cheminf.studio/latest/chem/standardize",
                 mol
             );
         },

diff --git a/resources/js/Pages/Upload.vue b/resources/js/Pages/Upload.vue
@@ -2519,7 +2519,7 @@ export default {
         },
         standardizeMolecules(mol) {
             return axios.post(
-                "https://api.naturalproducts.net/latest/chem/standardize",
+                "https://api.cheminf.studio/latest/chem/standardize",
                 mol
             );
         },
@@ -2547,7 +2547,7 @@ export default {
                             // convert to smiles
                             axios
                                 .post(
-                                    "https://dev.api.naturalproducts.net/latest/chem/standardize",
+                                    "https://api.cheminf.studio/latest/latest/chem/standardize",
                                     response.data
                                 )
                                 .then((res) => {

diff --git a/resources/js/Shared/Depictor2D.vue b/resources/js/Shared/Depictor2D.vue
@@ -18,7 +18,7 @@
                     width +
                     '&CIP=' +
                     CIP +
-                    '&toolkit=rdkit'
+                    '&toolkit=cdk'
                 "
                 alt=""
             />

diff --git a/resources/js/Shared/SpectraEditor.vue b/resources/js/Shared/SpectraEditor.vue
@@ -385,7 +385,7 @@ export default {
                     mol = this.fixLineError(mol);
                     axios
                         .post(
-                            "https://api.naturalproducts.net/latest/chem/standardize",
+                            "https://api.cheminf.studio/latest/chem/standardize",
                             mol.molfile
                         )
                         .then((res) => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
                         width +
                         '&CIP=' +
                         CIP +
-                        '&toolkit=rdkit'
+                        '&toolkit=cdk'
                     "
                     alt=""
                 />
@@ Expand Down @@