Skip to content

Commit 8af3c43

Browse files
mendozanmartinmendozanmartin
committed
okay
2 parents 4fc8cd4 + 1546d12 commit 8af3c43

File tree

15 files changed

+206
-102
lines changed

15 files changed

+206
-102
lines changed

‎audio_recorder/public/404.html

+92-23
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,103 @@
1212
limitations under the License.
1313
-->
1414
<html>
15-
<head>
15+
16+
<head>
1617
<meta charset="utf-8">
1718
<meta name="viewport" content="width=device-width, initial-scale=1">
1819
<title>Page Not Found</title>
1920

2021
<style media="screen">
21-
body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
22-
#message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px 16px; border-radius: 3px; }
23-
#message h3 { color: #888; font-weight: normal; font-size: 16px; margin: 16px 0 12px; }
24-
#message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
25-
#message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
26-
#message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
27-
#message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
28-
#message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
29-
#load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
30-
@media (max-width: 600px) {
31-
body, #message { margin-top: 0; background: white; box-shadow: none; }
32-
body { border-top: 16px solid #ffa100; }
33-
}
22+
body {
23+
background: rgba(0, 0, 0, 0);
24+
color: rgba(0, 0, 0, 0.87);
25+
font-family: Roboto, Helvetica, Arial, sans-serif;
26+
margin: 0;
27+
padding: 0;
28+
}
29+
30+
#message {
31+
background: rgba(0, 0, 0, 0);
32+
max-width: 360px;
33+
margin: 100px auto 16px;
34+
padding: 32px 24px 16px;
35+
border-radius: 3px;
36+
}
37+
38+
#message h3 {
39+
color: #888;
40+
font-weight: normal;
41+
font-size: 16px;
42+
margin: 16px 0 12px;
43+
}
44+
45+
#message h2 {
46+
color: #ffa100;
47+
font-weight: bold;
48+
font-size: 16px;
49+
margin: 0 0 8px;
50+
}
51+
52+
#message h1 {
53+
font-size: 22px;
54+
font-weight: 300;
55+
color: rgba(0, 0, 0, 0.6);
56+
margin: 0 0 16px;
57+
}
58+
59+
#message p {
60+
line-height: 140%;
61+
margin: 16px 0 24px;
62+
font-size: 14px;
63+
}
64+
65+
#message a {
66+
display: block;
67+
text-align: center;
68+
background: #039be5;
69+
text-transform: uppercase;
70+
text-decoration: none;
71+
color: white;
72+
padding: 16px;
73+
border-radius: 4px;
74+
}
75+
76+
#message,
77+
#message a {
78+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
79+
}
80+
81+
#load {
82+
color: rgba(0, 0, 0, 0.4);
83+
text-align: center;
84+
font-size: 13px;
85+
}
86+
87+
@media (max-width: 600px) {
88+
89+
body,
90+
#message {
91+
margin-top: 0;
92+
background: rgba(0, 0, 0, 0);
93+
box-shadow: none;
94+
}
95+
96+
body {
97+
border-top: 16px solid #ffa100;
98+
}
99+
}
34100
</style>
35-
</head>
36-
<body>
101+
</head>
102+
103+
<body>
37104
<div id="message">
38-
<h2>404</h2>
39-
<h1>Page Not Found</h1>
40-
<p>The specified file was not found on this website. Please check the URL for mistakes and try again.</p>
41-
<h3>Why am I seeing this?</h3>
42-
<p>This page was generated by the Firebase Command-Line Interface. To modify it, edit the <code>404.html</code> file in your project's configured <code>public</code> directory.</p>
105+
<h2>404</h2>
106+
<h1>Page Not Found</h1>
107+
<p>The specified file was not found on this website. Please check the URL for mistakes and try again.</p>
108+
<h3>Why am I seeing this?</h3>
109+
<p>This page was generated by the Firebase Command-Line Interface. To modify it, edit the <code>404.html</code>
110+
file in your project's configured <code>public</code> directory.</p>
43111
</div>
44-
</body>
45-
</html>
112+
</body>
113+
114+
</html>

‎audio_recorder/public/css/audiodemo.css

+26-4
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,33 @@
1414
*/
1515

1616
* {
17-
box-sizing: border-box;
17+
box-sizing: content-box;
18+
outline: none;
19+
background-color: #a46dff;
1820
}
1921

2022
.clearfix {
2123
clear: both;
2224
}
2325

26+
#microphone {
27+
overflow: hidden;
28+
border-radius: 50%;
29+
z-index: 3;
30+
}
31+
2432
.centered {
2533
position: fixed;
2634
top: 50%;
2735
left: 50%;
28-
margin-top: -200px;
36+
margin-top: -100px;
2937
margin-left: -200px;
3038
width: 400px;
3139
height: 400px;
3240
outline: none;
41+
background-color: #a46dff;
42+
overflow: hidden;
43+
border-radius: 50%;
3344
}
3445

3546
.centered-text {
@@ -45,6 +56,7 @@
4556
font-size: 400%;
4657
line-height: 50px;
4758
z-index: -1;
59+
background-color: #a46dff;
4860
}
4961

5062
.centered-canvas {
@@ -57,7 +69,15 @@
5769
height: 400px;
5870
vertical-align: text-top;
5971
text-align: center;
60-
z-index: -1;
72+
z-index: 2;
73+
/* background: rgba(0, 0, 0, 0); */
74+
background-color: #a46dff;
75+
}
76+
77+
.purp {
78+
overflow: hidden;
79+
border-radius: 50%;
80+
background-color: #a46dff;
6181
}
6282

6383
.centered-auth {
@@ -71,12 +91,14 @@
7191
vertical-align: text-top;
7292
text-align: center;
7393
z-index: 10;
94+
background-color: #a46dff;
7495
}
7596

7697
#start_button {
7798
border: 0;
78-
background-color:transparent;
99+
/* background: rgba(0, 0, 0, 0); */
79100
padding: 0;
101+
background-color: #a46dff;
80102
}
81103

82104
@media only screen and (max-width: 600px) {

‎audio_recorder/public/index.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
-->
1414
<html>
1515
<head>
16-
<title>Audio Demo</title>
16+
<title>Health Assitant</title>
1717
<!-- Add to homescreen for Chrome on Android -->
1818
<meta name="mobile-web-app-capable" content="yes" />
1919
<link rel="icon" sizes="192x192" href="images/android-desktop.png" />
@@ -81,7 +81,7 @@
8181
width="400"
8282
height="400"
8383
></canvas>
84-
<div>
84+
<div class="purp">
8585
<button
8686
id="start_button"
8787
onclick="startButton(event);"
@@ -90,9 +90,9 @@
9090
<img src="images/microphone.png" id="microphone" class="centered" />
9191
</button>
9292
</div>
93-
<div id="auth" class="centered-auth">
94-
<!-- <div id="loading" style="display: block">Loading...</div> -->
95-
<!-- <div id="loaded" style="display: none; width:400px; height:200px;">
93+
<!-- <div id="auth" class="centered-auth"> -->
94+
<!-- <div id="loading" style="display: block">Loading...</div> -->
95+
<!-- <div id="loaded" style="display: none; width:400px; height:200px;">
9696
<div id="firebaseui-auth-container"></div>
9797
<div id="user-signed-in" style="display: none">
9898
<p>
@@ -102,7 +102,7 @@
102102
</div>
103103
<div id="user-signed-out" style="display: none"></div>
104104
</div> -->
105-
</div>
105+
<!-- </div> -->
106106
</div>
107107
</body>
108108
</html>

‎audio_recorder/public/javascript/audiodemo.js

+6-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ let canvas;
1515
let context;
1616
let fileUrl = "";
1717

18-
1918
// Initialize Cloud Firestore through Firebase
2019
const db = firebase.firestore();
2120

@@ -56,7 +55,7 @@ const animationStep = timestamp => {
5655
analyser.getByteTimeDomainData(audioData);
5756

5857
context.fillRect(0, 0, WIDTH, HEIGHT);
59-
58+
context.fillStyle = "#a46dff";
6059
context.beginPath();
6160
let xIncrement = (WIDTH * 1.0) / bufferSize;
6261
let x = 0;
@@ -157,10 +156,8 @@ const stopRecording = () => {
157156
// Upload the geneerated OGG file to cloud storage.
158157
// https://firebase.google.com/docs/storage/web/upload-files
159158
const persistFile = blob => {
160-
fileUrl = "new_files/" + new Date().toISOString() + ".wav"
161-
const uploadTask = storageRef
162-
.child(fileUrl)
163-
.put(blob, metadata);
159+
fileUrl = "new_files/" + new Date().toISOString() + ".wav";
160+
const uploadTask = storageRef.child(fileUrl).put(blob, metadata);
164161
uploadTask.on(
165162
firebase.storage.TaskEvent.STATE_CHANGED,
166163
snapshot => {
@@ -195,9 +192,9 @@ const persistFile = blob => {
195192
})
196193
.then(docRef => {
197194
console.log("Document written with ID: ", docRef.id);
198-
sendPostRequest().then((data)=> {
199-
console.log(data)
200-
})
195+
sendPostRequest().then(data => {
196+
console.log(data);
197+
});
201198
})
202199
.catch(error => {
203200
console.error("Error adding document: ", JSON.stringify(error));

‎webapp/package-lock.json

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webapp/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"@babel/core": "^7.8.3",
77
"css-loader": "^3.2.0",
88
"immutable": "^4.0.0-rc.12",
9+
"moment": "^2.24.0",
910
"npm": "^6.13.6",
1011
"react": "^16.9.0",
1112
"react-bootstrap": "^1.0.0-beta.12",

‎webapp/public/index.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
5+
<link rel="shortcut icon" href="%PUBLIC_URL%/logo.png" />
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77
<meta name="theme-color" content="#000000" />
88
<meta
99
name="description"
1010
content="Web site created using create-react-app"
1111
/>
12-
<link rel="apple-touch-icon" href="logo192.png" />
13-
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v8/mapbox-gl.css' rel='stylesheet' />
12+
<link rel="apple-touch-icon" href="logo.png" />
1413
<!--
1514
manifest.json provides metadata used when your web app is installed on a
1615
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -25,7 +24,7 @@
2524
work correctly both with client-side routing and a non-root public URL.
2625
Learn how to configure a non-root public URL by running `npm run build`.
2726
-->
28-
<title>React App</title>
27+
<title>MedExpress</title>
2928
</head>
3029
<body>
3130
<noscript>You need to enable JavaScript to run this app.</noscript>

‎webapp/src/Components/Loading/loading.css

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.loadingBG {
2-
background-color: var(--primary);
3-
color: var(--secondary);
2+
background: linear-gradient(45DEG,#2F1C53,#A46DFF,#F6D1FD);
43
display: flex;
54
flex-direction: column;
65
align-items: center;

‎webapp/src/Components/MenuBar/menubar.css

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
background-color: var(--primary) !important;
33
color: var(--quaternary) !important;
44
height: 9vh !important;
5-
z-index: 10;
6-
box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.2);
5+
width: 100vw;
6+
z-index: 1;
7+
box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.2);
78
}
89

910
#searchButton, #search {

‎webapp/src/Views/LoginView/login.css

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
}
44

55
.loginBackground {
6-
background-color: var(--secondary);
6+
background: linear-gradient(45DEG,#2F1C53,#A46DFF,#F6D1FD);
77
color: var(--quaternary);
88
display: flex;
99
flex-direction: column;
@@ -33,10 +33,13 @@
3333
.loginLogo {
3434
position: absolute;
3535
height: 25vh;
36+
width: 25vh;
3637
top: 10vh;
3738
animation-name: topToBottom;
3839
animation-duration: 1.4s;
39-
box-shadow: 5px 5px 15px rgba(0, 0, 0, 0.2), -5px -5px 15px rgba(0, 0, 0, 0.2);
40+
border-radius: 50%;
41+
object-fit: contain;
42+
/* box-shadow: 5px 5px 15px rgba(0, 0, 0, 0.2), -5px -5px 15px rgba(0, 0, 0, 0.2); */
4043
}
4144

4245
.loginHeader {

0 commit comments

Comments
 (0)