diff --git a/app/Livewire/Search.php b/app/Livewire/Search.php index acce2ba9..745da0d5 100644 --- a/app/Livewire/Search.php +++ b/app/Livewire/Search.php @@ -65,16 +65,6 @@ public function placeholder() HTML; } - protected $listeners = ['updateSmiles' => 'setSmiles']; - - public function setSmiles($smiles, $searchType) - { - $this->query = $smiles; - $this->type = $searchType; - $this->page = null; - $this->tagType = null; - } - public function updatedQuery() { $this->page = 1; @@ -82,6 +72,11 @@ public function updatedQuery() $this->tagType = null; } + public function search(SearchMolecule $search) + { + $this->render($search); + } + public function render(SearchMolecule $search) { try { diff --git a/app/Livewire/StructureEditor.php b/app/Livewire/StructureEditor.php index e46e6c30..65c1fb40 100644 --- a/app/Livewire/StructureEditor.php +++ b/app/Livewire/StructureEditor.php @@ -10,6 +10,8 @@ class StructureEditor extends Component public $smiles; + public $type = 'substructure'; + public function mount($smiles) { $this->smiles = $smiles; diff --git a/app/Livewire/Welcome.php b/app/Livewire/Welcome.php index c1c06178..6c9c850a 100644 --- a/app/Livewire/Welcome.php +++ b/app/Livewire/Welcome.php @@ -18,13 +18,6 @@ class Welcome extends Component public $citationsMapped; - protected $listeners = ['updateSmiles' => 'setSmiles']; - - public function setSmiles($smiles, $searchType) - { - return redirect()->to('/search?q='.urlencode($smiles).'&type='.urlencode($searchType)); - } - public function placeholder() { return <<<'HTML' diff --git a/resources/views/livewire/header.blade.php b/resources/views/livewire/header.blade.php index c1595c9a..d0891758 100644 --- a/resources/views/livewire/header.blade.php +++ b/resources/views/livewire/header.blade.php @@ -1,4 +1,4 @@ -
+