From bfd71a20bfa5d71a2c2fe9bff7433ee01b2642f1 Mon Sep 17 00:00:00 2001 From: Amit Date: Sat, 22 Jun 2019 11:39:29 +0530 Subject: [PATCH 1/9] fetching all the embeddings available in database --- src/main/Homepage/embed/index.js | 36 ++++++++++++++++++++++++------- src/main/Homepage/embed/result.js | 13 +++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 src/main/Homepage/embed/result.js diff --git a/src/main/Homepage/embed/index.js b/src/main/Homepage/embed/index.js index 98221a6..b52136b 100644 --- a/src/main/Homepage/embed/index.js +++ b/src/main/Homepage/embed/index.js @@ -1,14 +1,34 @@ -import React, { Component } from 'react' +import React, { Component } from "react"; import "./index.css"; +import axios from "axios"; +import EmbedService from "./result"; + +const embedservice = new EmbedService(); class EmbedNow extends Component { - render() { - return ( -
- embed -
- ) + + constructor(props) { + super(props) + + this.state = { + response:null + } } + + componentDidMount() { + var self = this; + embedservice.getEmbeddingsList().then(function (result) { + self.setState({ response: result.data}) + }); + } + + render() { + return ( +
+ {JSON.stringify(this.state.response,null,2)} +
+ ); + } } -export default EmbedNow; \ No newline at end of file +export default EmbedNow; diff --git a/src/main/Homepage/embed/result.js b/src/main/Homepage/embed/result.js new file mode 100644 index 0000000..dbd7bbd --- /dev/null +++ b/src/main/Homepage/embed/result.js @@ -0,0 +1,13 @@ +import "./index.css"; +import axios from "axios"; + +const API_URL = "http://localhost:8000"; + +export default class EmbedService { + constructor(){} + + getEmbeddingsList() { + const url = `${API_URL}/api/faceid/`; + return axios.get(url).then(response => response.data); + } +} From 120e6ad34b182b21456c57bf3f9712890d2f7f11 Mon Sep 17 00:00:00 2001 From: pymit Date: Sat, 22 Jun 2019 15:10:07 +0530 Subject: [PATCH 2/9] printing id with fetch --- src/main/Homepage/embed/index.js | 47 +++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/src/main/Homepage/embed/index.js b/src/main/Homepage/embed/index.js index b52136b..8dc4d21 100644 --- a/src/main/Homepage/embed/index.js +++ b/src/main/Homepage/embed/index.js @@ -1,31 +1,46 @@ import React, { Component } from "react"; import "./index.css"; -import axios from "axios"; import EmbedService from "./result"; -const embedservice = new EmbedService(); +const embedservice = new EmbedService(); class EmbedNow extends Component { - constructor(props) { - super(props) + super(props); + + this.state = { + contents: [], + id_name:[], + file_url:[], - this.state = { - response:null - } - } + }; + } - componentDidMount() { - var self = this; - embedservice.getEmbeddingsList().then(function (result) { - self.setState({ response: result.data}) - }); - } + componentDidMount() { + // var self = this; + embedservice + .getEmbeddingsList() + .then(result => { + let contents = result.data.map(cloudData => { + // console.log((cloudData)); + return (
{cloudData.id}
); + // return
{JSON.stringify(cloudData, null, 2)}
; + }); + this.setState({ contents: contents }); + console.log("state", this.state.contents); + }) + .catch(error => console.log(error)); + } render() { return ( -
- {JSON.stringify(this.state.response,null,2)} +
+ {this.state.contents} + + +
+ +
); } From d8f5e77b2ed4d4427fff3c3f22b8b790ec192c05 Mon Sep 17 00:00:00 2001 From: pymit Date: Sat, 22 Jun 2019 15:32:51 +0530 Subject: [PATCH 3/9] objects now in jsx --- src/main/Homepage/embed/index.js | 33 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/main/Homepage/embed/index.js b/src/main/Homepage/embed/index.js index 8dc4d21..7bf6117 100644 --- a/src/main/Homepage/embed/index.js +++ b/src/main/Homepage/embed/index.js @@ -9,35 +9,26 @@ class EmbedNow extends Component { super(props); this.state = { - contents: [], - id_name:[], - file_url:[], - + contents: [{ id: "", title: "", fileurl: "", created_on: "" }] }; } componentDidMount() { - // var self = this; - embedservice - .getEmbeddingsList() - .then(result => { - let contents = result.data.map(cloudData => { - // console.log((cloudData)); - return (
{cloudData.id}
); - // return
{JSON.stringify(cloudData, null, 2)}
; - }); - this.setState({ contents: contents }); - console.log("state", this.state.contents); - }) - .catch(error => console.log(error)); + embedservice.getEmbeddingsList().then(result => { + this.setState({ contents: result.data }); + }); } render() { + const contents = this.state.contents; return ( -
- {this.state.contents} - - +
+ { + contents.map(data => + { +

{data.id}

+ }) + }
From 9576f06fa340f98d5a3f6f76b4e67548f8ffabb2 Mon Sep 17 00:00:00 2001 From: pymit Date: Sat, 22 Jun 2019 20:08:39 +0530 Subject: [PATCH 4/9] displaying the objects attributes --- src/main/Homepage/embed/index.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/Homepage/embed/index.js b/src/main/Homepage/embed/index.js index 7bf6117..7dc33ad 100644 --- a/src/main/Homepage/embed/index.js +++ b/src/main/Homepage/embed/index.js @@ -21,17 +21,21 @@ class EmbedNow extends Component { render() { const contents = this.state.contents; + return (
- { - contents.map(data => - { -

{data.id}

- }) - } -
- -
+ {contents.map(data => { + console.log(data.id, data.fileurl); + // eslint-disable-next-line no-unused-expressions + return ( +
+
{data.title} {data.fileurl}
+
+ +
+
+ ); + })}
); } From b31574363887cf695d559d5f708ddfe711fcaf3b Mon Sep 17 00:00:00 2001 From: pymit Date: Sat, 22 Jun 2019 20:09:35 +0530 Subject: [PATCH 5/9] displaying the objects attributes --- src/main/Homepage/embed/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/Homepage/embed/index.js b/src/main/Homepage/embed/index.js index 7dc33ad..87e57fb 100644 --- a/src/main/Homepage/embed/index.js +++ b/src/main/Homepage/embed/index.js @@ -29,9 +29,9 @@ class EmbedNow extends Component { // eslint-disable-next-line no-unused-expressions return (
-
{data.title} {data.fileurl}
+
{data.title}
- +
); From 234a8340dbf7967a35bb0bd7aba88f33e7db51a1 Mon Sep 17 00:00:00 2001 From: pymit Date: Sat, 22 Jun 2019 22:38:02 +0530 Subject: [PATCH 6/9] cards for name and image of embeddings --- src/main/Homepage/embed/card.js | 46 ++++++++++++++++++++++++++++++++ src/main/Homepage/embed/index.js | 9 ++++--- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 src/main/Homepage/embed/card.js diff --git a/src/main/Homepage/embed/card.js b/src/main/Homepage/embed/card.js new file mode 100644 index 0000000..ba454e8 --- /dev/null +++ b/src/main/Homepage/embed/card.js @@ -0,0 +1,46 @@ +import React from "react"; +import { makeStyles } from "@material-ui/core/styles"; +import Card from "@material-ui/core/Card"; +import CardActionArea from "@material-ui/core/CardActionArea"; +import CardActions from "@material-ui/core/CardActions"; +import CardContent from "@material-ui/core/CardContent"; +import CardMedia from "@material-ui/core/CardMedia"; +import Typography from "@material-ui/core/Typography"; + +const useStyles = makeStyles({ + card: { + maxWidth: 100 + } +}); + +export default function ImgMediaCard(props) { + const classes = useStyles(); + const fileurl = "http://localhost:8000"+props.data.fileurl; + + return ( + + + + + + + +
{props.data.title}
+ +{/* + {props.data.created_on} + */} + + + + + + ); +} diff --git a/src/main/Homepage/embed/index.js b/src/main/Homepage/embed/index.js index 87e57fb..1611321 100644 --- a/src/main/Homepage/embed/index.js +++ b/src/main/Homepage/embed/index.js @@ -1,6 +1,9 @@ import React, { Component } from "react"; import "./index.css"; import EmbedService from "./result"; +import ImgMediaCard from "./card" + + const embedservice = new EmbedService(); @@ -28,10 +31,10 @@ class EmbedNow extends Component { console.log(data.id, data.fileurl); // eslint-disable-next-line no-unused-expressions return ( -
-
{data.title}
+
- + +

); From 59930798202def153dbb47add0a9bf8c27aa8433 Mon Sep 17 00:00:00 2001 From: pymit Date: Sat, 22 Jun 2019 23:18:37 +0530 Subject: [PATCH 7/9] horizontal aligning of the cards --- src/main/Homepage/embed/index.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/Homepage/embed/index.js b/src/main/Homepage/embed/index.js index 1611321..83cd64c 100644 --- a/src/main/Homepage/embed/index.js +++ b/src/main/Homepage/embed/index.js @@ -1,10 +1,7 @@ import React, { Component } from "react"; import "./index.css"; import EmbedService from "./result"; -import ImgMediaCard from "./card" - - - +import ImgMediaCard from "./card"; const embedservice = new EmbedService(); class EmbedNow extends Component { @@ -26,16 +23,14 @@ class EmbedNow extends Component { const contents = this.state.contents; return ( -
+
{contents.map(data => { console.log(data.id, data.fileurl); // eslint-disable-next-line no-unused-expressions return ( -
-
- -

-
+
+
+
); })} From 22925861bcfec4bc2e61a34e8441b0fa3da299f0 Mon Sep 17 00:00:00 2001 From: pymit Date: Sun, 23 Jun 2019 07:22:46 +0530 Subject: [PATCH 8/9] making navbar fixed --- src/App.js | 2 ++ src/header/index.css | 3 ++- src/header/index.js | 8 +++++--- src/main/Homepage/embed/card.js | 2 +- src/main/Homepage/embed/index.js | 11 ++++++----- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/App.js b/src/App.js index 84b58b9..479916d 100644 --- a/src/App.js +++ b/src/App.js @@ -13,6 +13,8 @@ class App extends Component {
+

+

diff --git a/src/header/index.css b/src/header/index.css index 3f6a9bd..ab02e59 100644 --- a/src/header/index.css +++ b/src/header/index.css @@ -4,6 +4,7 @@ } .gradstyle + { background-image: linear-gradient(to top, #cfd9df 0%, #e2ebf0 100%); -} \ No newline at end of file +} diff --git a/src/header/index.js b/src/header/index.js index d508e90..b2dbc6d 100644 --- a/src/header/index.js +++ b/src/header/index.js @@ -6,12 +6,14 @@ import { NavLink } from "react-router-dom"; class NavBar extends Component { render() { return ( -
- - +
+ + Rekognition +

+
); } diff --git a/src/main/Homepage/embed/card.js b/src/main/Homepage/embed/card.js index ba454e8..1ed3b96 100644 --- a/src/main/Homepage/embed/card.js +++ b/src/main/Homepage/embed/card.js @@ -22,7 +22,7 @@ export default function ImgMediaCard(props) { +
{contents.map(data => { - console.log(data.id, data.fileurl); + // console.log(data.id, data.fileurl); // eslint-disable-next-line no-unused-expressions return ( -
-
- +
+
+ +
); })} From 109d1e00dada502be59ef2f6f0816257990eee8b Mon Sep 17 00:00:00 2001 From: pymit Date: Sun, 23 Jun 2019 07:49:31 +0530 Subject: [PATCH 9/9] fixing padding --- src/App.js | 2 -- src/header/index.js | 4 +++- src/main/Homepage/embed/addnew.js | 0 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 src/main/Homepage/embed/addnew.js diff --git a/src/App.js b/src/App.js index 479916d..84b58b9 100644 --- a/src/App.js +++ b/src/App.js @@ -13,8 +13,6 @@ class App extends Component {
-

-

diff --git a/src/header/index.js b/src/header/index.js index b2dbc6d..0e34563 100644 --- a/src/header/index.js +++ b/src/header/index.js @@ -13,7 +13,9 @@ class NavBar extends Component {

- +

+

+
); } diff --git a/src/main/Homepage/embed/addnew.js b/src/main/Homepage/embed/addnew.js new file mode 100644 index 0000000..e69de29