Merge pull request #12 from moevm/minor_fixes_november

Minor fixes

Author: ImSOLty

backend/src/main.py

@@ -3,7 +3,7 @@
 import routes
 
 app = Flask(__name__)
-CORS(app)
+CORS(app, support_credentials=True)
 
 app.add_url_rule('/', methods=['POST'], view_func=routes.clear_tmp)
 app.add_url_rule('/add_art', methods=['POST'], view_func=routes.add_art)
@@ -13,6 +13,8 @@
 app.add_url_rule('/get_materials', methods=['GET'], view_func=routes.get_materials)
 app.add_url_rule('/get_genres', methods=['GET'], view_func=routes.get_genres)
 app.add_url_rule('/get_museums', methods=['GET'], view_func=routes.get_museums)
+app.add_url_rule('/get_types', methods=['GET'], view_func=routes.get_types)
+app.add_url_rule('/recreate_table', methods=['GET'], view_func=routes.recreate_table)
 
 if __name__ == '__main__':
     app.run(debug=True, host="0.0.0.0")

backend/src/routes.py

@@ -1,6 +1,5 @@
-from flask import request
 from cachelib import MemcachedCache
-
+from flask import request
 from sqlalchemy import create_engine
 
 db_name = 'testdb'
@@ -34,21 +33,20 @@
     materials varchar(200),
     type varchar(100),
     museum_name varchar(200),
-    museum_address varchar(200),
     genre varchar(100),
     url varchar(10000)
 );
 """
 
 ADD_PICTURE = """
-    INSERT INTO ArtWorks (name, author, 
-                          description, start_year, 
-                          end_year, materials, 
+    INSERT INTO ArtWorks (name, author,
+                          description, start_year,
+                          end_year, materials,
                           type,  museum_name, 
-                          museum_address, genre, url)
-    VALUES (%s, %s, %s, %s, 
-            %s, %s, %s, %s, 
-            %s, %s, %s)
+                          genre, url)
+    VALUES (%s, %s, %s, %s,
+            %s, %s, %s, %s,
+            %s, %s)
     RETURNING artworkid;
 """
 
@@ -83,6 +81,14 @@ def get_museums():
     return museums_list
 
 
+def get_types():
+    res = db.execute("""SELECT DISTINCT(type) FROM ArtWorks""")
+    museums_list = []
+    for i in res:
+        museums_list.append(dict(i)['type'])
+    return museums_list
+
+
 def add_art():
     data = request.get_json()
     # adding into postgres
@@ -91,8 +97,7 @@ def add_art():
                                    data['description'], data['start_year'],
                                    data['end_year'], data['materials'],
                                    data['type'], data['museum_name'],
-                                   data['museum_address'], data['genre'],
-                                   data['url']))
+                                   data['genre'], data['url']))
 
     res = db.execute("""SELECT * FROM ArtWorks""")
     for i in res:
@@ -117,8 +122,7 @@ def reimport_arts():
                                        data['description'], data['start_year'],
                                        data['end_year'], data['materials'],
                                        data['type'], data['museum_name'],
-                                       data['museum_address'], data['genre'],
-                                       data['url']))
+                                       data['genre'], data['url']))
         key = str(key.all()[0][0])
         cache.set(key, data)
         print("Value is written into memcached by key: {}".format(key))
@@ -134,37 +138,49 @@ def get_arts():
     return json
 
 
+def is_number_correct(requested_number):
+    if not requested_number:
+        return False
+    try:
+        return int(requested_number) > 0
+    except ValueError:
+        return False
+
+
+def string_or_any(requested_string):
+    if not requested_string:
+        return "%%"
+    return requested_string
+
+
 def get_arts_by_filter():
     requestJson = request.get_json()
-
-    titleFilter = requestJson['title']
-    authorFilter = requestJson['author']
-    startYearFilter = requestJson['start_year']
-    endYearFilter = requestJson['end_year']
-    museumFilter = requestJson['museum_name']
-    genreFilter = requestJson['genre']
-    materialFilter = requestJson['material']
-    res = []
+    print("by filter: ", requestJson)
+    titleFilter = string_or_any(requestJson['title'])
+    authorFilter = string_or_any(requestJson['author'])
+    museumFilter = string_or_any(requestJson['museum_name'])
+    genreFilter = string_or_any(requestJson['genre'])
+    materialFilter = string_or_any(requestJson['material'])
+    typeFilter = string_or_any(requestJson['type'])
 
     titleFilter = '%' + titleFilter + '%'
-
     authorFilter = '%' + authorFilter + '%'
 
-    startYearFilter = '0001' if startYearFilter == '' else startYearFilter
-    endYearFilter = '9999' if endYearFilter == '' else endYearFilter
+    startYearFilter = requestJson['start_year'] if is_number_correct(requestJson['start_year']) else -1
+    endYearFilter = requestJson['end_year'] if is_number_correct(requestJson['end_year']) else 3000
 
     res = db.execute(
-
         """
             SELECT * FROM ArtWorks
             WHERE
                 name LIKE %s
                 AND author LIKE %s
-                AND start_year > %s
-                AND end_year < %s
-                AND museum_name = %s
-                AND genre = %s
-                AND materials = %s
+                AND start_year >= %s
+                AND end_year <= %s
+                AND museum_name LIKE %s
+                AND genre LIKE %s
+                AND materials LIKE %s
+                AND type LIKE %s
         """,
         (
             titleFilter,
@@ -173,7 +189,8 @@ def get_arts_by_filter():
             endYearFilter,
             museumFilter,
             genreFilter,
-            materialFilter
+            materialFilter,
+            typeFilter
         )
     )
 
@@ -187,3 +204,4 @@ def recreate_table():  # it's not used but it useful when you need to change tab
     db.execute(DROP_TABLE)
     db.execute(CREATE_TABLE)
     cache.clear()
+    return ''

catalog_100.json

@@ -8,7 +8,6 @@ CREATE TABLE IF NOT EXISTS ArtWorks (
     materials varchar(200),
     type varchar(100),
     museum_name varchar(200),
-    museum_address varchar(200),
     genre varchar(100),
     url varchar(10000)
 );

catalog_1000.json

@@ -1,8 +1,8 @@
-FROM node:12-alpine as build
-WORKDIR /frontend
-COPY package.json /app/package.json
-RUN npm install --only=prod
-RUN npm install -g serve
-CMD serve -s build
-COPY . /frontend
+FROM node:13.12.0-alpine
+WORKDIR /app
+ENV PATH /app/node_modules/.bin:$PATH
+COPY package.json ./
+RUN npm install --silent
+RUN npm install react-scripts@3.4.1 -g --silent
+COPY . ./
 EXPOSE 3000

database/create_fixtures.sql

@@ -79,8 +79,8 @@
     width: 80%;
     height: 100%;
     flex-grow: 0;
-    border: 2px solid black;
-    border-radius: 10px;
+    /*border: 2px solid black;*/
+    /*border-radius: 10px;*/
 }
 
 .leftSide {

frontend/Dockerfile

@@ -7,11 +7,20 @@ import UpdaterComp from '../components/UpdaterComp';
 import TableComp from '../components/TableComp';
 import {Box, Button} from '@mui/material';
 import FilterComp from '../components/FilterComp';
-import {API_GET_ARTS, API_GET_MATERIALS, API_GET_GENRES, API_GET_MUSEUMS} from "../constants";
+import {
+    API_GET_ARTS,
+    API_GET_MATERIALS,
+    API_GET_GENRES,
+    API_GET_MUSEUMS,
+    NOT_CHOSEN_LABEL,
+    API_GET_TYPES
+} from "../constants";
 import AddArtworkForm from "../components/AddArtworkForm";
 import Axios from "axios";
 import {saveAs} from 'file-saver'
 
+const defaultFilterValue = {value: "0", label: NOT_CHOSEN_LABEL};
+
 function App() {
 
     const [displayEditor, setDisplay] = React.useState(true);
@@ -22,12 +31,14 @@ function App() {
     const [museums, setMuseums] = React.useState([]);
     const [genres, setGenres] = React.useState([]);
     const [materials, setMaterials] = React.useState([]);
+    const [types, setTypes] = React.useState([]);
 
     useEffect(() => {
         UpdateData()
         getMaterials();
         getGenres();
         getMuseums();
+        getTypes();
     }, [])
 
     function DisplayEditor() {
@@ -58,7 +69,7 @@ function App() {
     function onExport() {
         try {
             Axios.get(API_GET_ARTS).then(r => {
-                let blob = new Blob([JSON.stringify(r.data)], {type: 'application/json'})
+                let blob = new Blob([JSON.stringify(data)], {type: 'application/json'})
                 saveAs(blob, 'exported_data.json')
             });
         } catch (e) {
@@ -83,30 +94,41 @@ function App() {
         }
     }
 
+    const getTypes = async () => {
+        const response = await Axios.get(API_GET_TYPES)
+        console.log('types', response.data);
+        const list = response.data.map((value, index) => ({value: `${index+1}`, label: value}));
+        setTypes([defaultFilterValue].concat(list));
+    };
+
     const getMaterials = async () => {
         const response = await Axios.get(API_GET_MATERIALS)
         console.log('materials', response.data);
-        setMaterials(response.data.map((value, index) => ({value: `${index}`, label: value})));
+        const list = response.data.map((value, index) => ({value: `${index+1}`, label: value}));
+        setMaterials([defaultFilterValue].concat(list));
     };
 
     const getGenres = async () => {
         const response = await Axios.get(API_GET_GENRES)
         console.log('genres', response.data);
-        setGenres(response.data.map((value, index) => ({value: `${index}`, label: value})));
+        const list = response.data.map((value, index) => ({value: `${index+1}`, label: value}));
+        setGenres([defaultFilterValue].concat(list));
     };
 
     const getMuseums = async () => {
         const response = await Axios.get(API_GET_MUSEUMS)
         console.log('museums', response.data);
-        setMuseums(response.data.map((value, index) => ({value: `${index}`, label: value})));
+        const list = response.data.map((value, index) => ({value: `${index+1}`, label: value}));
+        setMuseums([defaultFilterValue].concat(list));
     };
 
     return (
         <div>
             <AppBarComp changeView={EditorDisplayChange} updateData={UpdateData} editor={displayEditor}/>
             <div className='mainContainer'>
                 <div className='leftSide'>
-                    <FilterComp setData={setData} museums={museums} genres={genres} materials={materials}
+                    <FilterComp setData={setData} museums={museums} genres={genres}
+                                types={types} materials={materials}
                                 getAllData={UpdateData}/>
                     <DisplayEditor updateMaterialsSelect={getMaterials} updateGenresSelect={getGenres}
                                    updateMuseumsSelect={getMuseums}/>

frontend/src/App/App.css

@@ -59,12 +59,15 @@ export default class AppBarComp extends PureComponent {
                         </IconButton>
                         <Typography variant='h6' className='title' align='left'>Paintings</Typography>
                         <Box mr={3}>
-                            <Button color='inherit' variant='outlined' align='right' component="label">Import
+                            {this.props.editor
+                                ? <Button color='inherit' variant='outlined' align='right' component="label">Import
                                 <input
-                                    type="file"
-                                    hidden
-                                    onChange={this.onFileChange}
+                                type="file"
+                                hidden
+                                onChange={this.onFileChange}
                                 /></Button>
+                                : <div/>
+                            }
                         </Box>
                         <Box mr={3}>
                             {this.props.editor

frontend/src/App/App.js

@@ -0,0 +1,37 @@
+import {
+    Dialog,
+    DialogContent,
+    DialogActions,
+    Button,
+    TextareaAutosize
+} from '@mui/material';
+import React, {PureComponent} from 'react';
+import '../App/App.css';
+
+export default class DescriptionViewer extends PureComponent {
+    constructor(props) {
+        super(props)
+
+        this.state = {
+            description: ''
+        }
+    }
+
+
+    render() {
+        return (
+            <Dialog open={this.props.is_open} onClose={this.props.func}>
+                <DialogContent sx={{width: '25vw', height: '25vh'}}>
+                    <TextareaAutosize
+                        style={{width:550, height:300}}
+                        autoFocus={true}
+                        defaultValue={this.props.dataToPass}
+                        label={'Description'}
+                        id='Description'
+                        fullWidth={true}
+                        readOnly/>
+                </DialogContent>
+            </Dialog>
+        );
+    }
+}