Skip to content

Adding Fixed UI frontend and removed old unused files #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Adding Fixed UI frontend and removed old unused files #77

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8a67e1c
Add new UI frontend version. Peding to process the resutls from findM…
cmalfesi Apr 30, 2020
0b682a1
fixed
cmalfesi Apr 30, 2020
6a7b8a9
Fixed step 2 on contribute. Now let proceed if there was no test done.
cmalfesi May 3, 2020
21b8769
Fixed parser, converted date string into number. Need to check encla…
cmalfesi May 3, 2020
3bcf7c2
Fixed parser to calculate the date in json result.
cmalfesi May 9, 2020
eec5e15
Minor changes
cmalfesi May 14, 2020
9661a4a
Solved to show the match resutls from findMatch. Added more info to H…
cmalfesi May 17, 2020
911030d
Added home page info and pictures
cmalfesi May 17, 2020
393328c
fixed docker file
cmalfesi May 17, 2020
7ce7cb1
env updated
cmalfesi May 17, 2020
f6bb66b
fixed
cmalfesi May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions UIcode/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REACT_APP_API_URL=http://localhost:4080
REACT_APP_GOOGLE_CLIENT_ID=711253381463-l6acl9v1blh2i71jmlu01olfbg60nlj3.apps.googleusercontent.com
REACT_APP_ENCLAVE_URL=https://safetrace.enigma.co
REACT_APP_GOOGLE_MAPS_API_KEY=AIzaSyCh90IL7Ek4iDZqHUKJSeXrubCTGi4GbsQ
167 changes: 0 additions & 167 deletions UIcode/index copy.js
View file
Open in desktop

This file was deleted.

167 changes: 0 additions & 167 deletions UIcode/index.js
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions UIcode/server.js
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion UIcode/src/Pages/Contribute/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const Contribute = ({ history }) => {
});

const handleFileSubmit = (file) => {
console.log('json_file_uploaded',file);
parseJsonFile(file)
.then((json) => {
const data = convertLocationData(json, testResult === "positive");
Expand All @@ -66,7 +67,8 @@ const Contribute = ({ history }) => {

const handleTestDateChange = (date) => setTestDate(date);
const handleNextClick = () => {
if (step === 1) {
console.log('step',step, testResult);
if (step === 1 && testResult !== "not_tested") {
sendReport();
} else {
nextPage();
Expand Down
1 change: 1 addition & 0 deletions UIcode/src/Pages/Results/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const Results = () => {

if (response.length) {
findGeoLocations(response).then((res) => {
console.log(response);
return(response);
// setResults(
// res
Expand Down
Loading