Skip to content
Snippets Groups Projects
Commit f41a9914 authored by cns82's avatar cns82
Browse files

connect front end and back end

parent 5c6511b1
Branches
No related tags found
No related merge requests found
package-lock.json package-lock.json
engine engine
venv
__pycache__*
\ No newline at end of file
...@@ -4,89 +4,14 @@ ...@@ -4,89 +4,14 @@
## Getting started ## Getting started
To make it easy for you to get started with GitLab, here's a list of recommended next steps. Insure node is installed and you can use 'npm' - https://nodejs.org/en/download <br>
Make sure python is installed<br>
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! pip install virtualenv<br>
virtualenv venv<br>
## Add your files source venv/bin/activate<br>
pip install -r requirements.txt<br>
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files cd ./search-engine <br>
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: npm i<br>
npm run build<br>
``` cd ..<br>
cd existing_repo python server.py<br>
git remote add origin https://gitlab.cci.drexel.edu/info624-search-engine-project/search-engine-ui.git
git branch -M main
git push -uf origin main
```
## Integrate with your tools
- [ ] [Set up project integrations](https://gitlab.cci.drexel.edu/info624-search-engine-project/search-engine-ui/-/settings/integrations)
## Collaborate with your team
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
## Test and Deploy
Use the built-in continuous integration in GitLab.
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
***
# Editing this README
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
## Name
Choose a self-explaining name for your project.
## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.
## Contributing
State if you are open to contributions and what your requirements are for accepting them.
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.
## License
For open source projects, say how it is licensed.
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
ES_USERNAME = ""
ES_PASSWORD = ""
ES_INDEX = ""
\ No newline at end of file
certifi==2022.12.7
click==8.1.3 click==8.1.3
elastic-transport==8.4.0
elasticsearch==7.13.4
Flask==2.2.3 Flask==2.2.3
importlib-metadata==6.1.0 importlib-metadata==6.1.0
itsdangerous==2.1.2 itsdangerous==2.1.2
Jinja2==3.1.2 Jinja2==3.1.2
MarkupSafe==2.1.2 MarkupSafe==2.1.2
urllib3==1.26.15
Werkzeug==2.2.3 Werkzeug==2.2.3
zipp==3.15.0 zipp==3.15.0
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
"axios": "^1.3.4", "axios": "^1.3.4",
"bootstrap": "^5.2.3", "bootstrap": "^5.2.3",
"devextreme": "^22.2.4", "devextreme": "^22.2.4",
"devextreme-react": "^22.2.4",
"react": "^18.2.0", "react": "^18.2.0",
"react-bootstrap": "^2.7.2", "react-bootstrap": "^2.7.2",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
......
This diff is collapsed.
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
name="description" name="description"
content="Web site created using create-react-app" content="Web site created using create-react-app"
/> />
<link rel="stylesheet" type="text/css" href="./dx.lignt.css" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!-- <!--
manifest.json provides metadata used when your web app is installed on a manifest.json provides metadata used when your web app is installed on a
......
import logo from './logo.svg';
import './App.css';
function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
</div>
);
}
export default App;
import { render, screen } from '@testing-library/react';
import App from './App';
test('renders learn react link', () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});
.dx-fieldset{
margin-left: 10vw;
margin-right: 10vw;
}
.row {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin: 5px 0;
align-items: stretch;
}
.column-left {
display: flex;
flex-direction: column;
width: 50vw;
align-items: stretch;
}
.column-right {
display: flex;
align-items: stretch;
flex-direction: column;
width: 150px;
}
.form-box{
margin-bottom: 50px;
}
\ No newline at end of file
import React, { useState } from 'react';
import DataGrid, { Scrolling, Sorting, LoadPanel } from 'devextreme-react/data-grid';
import TextBox from 'devextreme-react/text-box';
import "./search.css"
import axios from "axios";
function search(query) {
const config = {
method: 'get',
url: '/api/search?q=' + query
};
return axios(config);
}
let SearchEngine = function () { let SearchEngine = function () {
const [queryResult, setQueryResult] = useState([]);
const parseESData = (data) => {
let parsedData = []
for (let row of data) {
let newObj = {}
newObj["id"] = parseInt(row["_id"])
newObj["title"] = row["_source"]["title"]
newObj["authors"] = row["_source"]["authors"]
newObj["score"] = row["_score"]
parsedData.push(newObj)
}
console.log(parsedData)
return parsedData
}
const handleSubmit = (e) => {
e.preventDefault();
search(e.target[0].value).then((res) => {
let parsedRes = parseESData(res.data)
setQueryResult(parsedRes)
}).catch((error) => {
console.log(error)
})
}
return ( return (
<div className="dx-fieldset">
<div> <div>
Hello World <div className='form-box'>
<form onSubmit={handleSubmit}>
<div className="row">
<div className="column"><h3 className='dx-header'>Search Elastic!</h3></div>
</div>
<div className="row">
<div className="column-left">
<TextBox width={"100%"} className="dx-field-value" />
</div>
<div className="column-right">
<input type="submit" value="Search" />
</div>
</div>
</form>
</div>
<div className="dx-field" style={{"height":"100", "whiteSpace": "normal", "overflowWrap":"break-word"}}>
<DataGrid
dataSource={queryResult}
keyExpr="id"
showBorders={false}
allowColumnResizing={true}
>
<Sorting mode="none" />
<Scrolling mode="virtual" />
<LoadPanel enabled={true} />
</DataGrid>
</div>
</div>
</div> </div>
) )
} }
......
...@@ -4,7 +4,7 @@ import ReactDOM from "react-dom/client"; ...@@ -4,7 +4,7 @@ import ReactDOM from "react-dom/client";
import { createBrowserRouter, RouterProvider } from "react-router-dom"; import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { Layout } from "./Layout"; import { Layout } from "./Layout";
import SearchEngine from "./component/search"; import SearchEngine from "./component/Search";
......
from flask import Flask, render_template, request, send_from_directory from flask import Flask, request, send_from_directory
import logging
from logging import Formatter, FileHandler
import os import os
from config import ES_INDEX, ES_PASSWORD, ES_USERNAME
from flask import jsonify
app = Flask(__name__, static_url_path='', static_folder='search-engine/build') app = Flask(__name__, static_url_path='', static_folder='search-engine/build')
import ssl
from elasticsearch import Elasticsearch
from elasticsearch.connection import create_ssl_context
context = create_ssl_context()
context.check_hostname = False
context.verify_mode = ssl.CERT_NONE
es = Elasticsearch(
['tux-es1.cci.drexel.edu','tux-es2.cci.drexel.edu','tux-es3.cci.drexel.edu'],
http_auth=(ES_USERNAME, ES_PASSWORD),
scheme="https",
port=9200,
ssl_context = context,
)
@app.route("/", defaults={'path':''}) @app.route("/", defaults={'path':''})
def serve(path): def serve(path):
return send_from_directory(app.static_folder,'index.html') return send_from_directory(app.static_folder,'index.html')
@app.route('/api/search', methods = ['GET'])
def search():
keywords = request.args.get('q', default = "", type = str)
query = {
"from" : 0, "size" : 25,
"query": {
"multi_match" : {
"query": keywords,
"fields": ["author", "title", "abstract"]
}
}
}
res = es.search(index=ES_INDEX,body=query)
return jsonify(res["hits"]["hits"])
# Or specify port manually: # Or specify port manually:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment