diff --git a/client/package-lock.json b/client/package-lock.json index 2e15881..88c1d34 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -8,15 +8,11 @@ "name": "client", "version": "0.1.0", "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.4.0", - "@fortawesome/free-solid-svg-icons": "^6.4.0", - "@fortawesome/react-fontawesome": "^0.2.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "axios": "^1.4.0", "bootstrap": "^5.3.0-alpha3", - "font-awesome": "^4.7.0", "react": "^18.2.0", "react-bootstrap": "^2.7.4", "react-dom": "^18.2.0", @@ -2220,51 +2216,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", - "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==", - "hasInstallScript": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz", - "integrity": "sha512-Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", - "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/react-fontawesome": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", - "dependencies": { - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@fortawesome/fontawesome-svg-core": "~1 || ~6", - "react": ">=16.3" - } - }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -8277,14 +8228,6 @@ } } }, - "node_modules/font-awesome": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", - "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==", - "engines": { - "node": ">=0.10.3" - } - }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -19021,35 +18964,6 @@ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz", "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==" }, - "@fortawesome/fontawesome-common-types": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz", - "integrity": "sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==" - }, - "@fortawesome/fontawesome-svg-core": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz", - "integrity": "sha512-Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw==", - "requires": { - "@fortawesome/fontawesome-common-types": "6.4.0" - } - }, - "@fortawesome/free-solid-svg-icons": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", - "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", - "requires": { - "@fortawesome/fontawesome-common-types": "6.4.0" - } - }, - "@fortawesome/react-fontawesome": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", - "requires": { - "prop-types": "^15.8.1" - } - }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -23502,11 +23416,6 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" }, - "font-awesome": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", - "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==" - }, "for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", diff --git a/client/src/assets/images/test1.jpg b/client/src/assets/images/test1.jpg index c36269d..2fbb567 100644 Binary files a/client/src/assets/images/test1.jpg and b/client/src/assets/images/test1.jpg differ diff --git a/client/src/assets/images/test2.jpg b/client/src/assets/images/test2.jpg index 6343848..b0348b4 100644 Binary files a/client/src/assets/images/test2.jpg and b/client/src/assets/images/test2.jpg differ diff --git a/client/src/assets/images/test3.jpg b/client/src/assets/images/test3.jpg index 13a4161..169efac 100644 Binary files a/client/src/assets/images/test3.jpg and b/client/src/assets/images/test3.jpg differ diff --git a/client/src/assets/images/test4.jpg b/client/src/assets/images/test4.jpg new file mode 100644 index 0000000..394b1ea Binary files /dev/null and b/client/src/assets/images/test4.jpg differ diff --git a/client/src/pages/about/About.js b/client/src/pages/about/About.js index 65fbfed..3e1a736 100644 --- a/client/src/pages/about/About.js +++ b/client/src/pages/about/About.js @@ -13,13 +13,11 @@ const About = () => {

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Assumenda similique - fugiat rerum odit qui aut nisi maxime libero ab aliquam. Fugit non vitae porro dolor fugiat aliquam nemo odio ullam! + We won’t stop until we see a world where deaf people and those with hearing loss or tinnitus are fully included


- Lorem ipsum dolor sit amet consectetur adipisicing elit. Assumenda similique fugiat - rerum odit qui aut nisi maxime libero ab aliquam. Fugit non vitae porro dolor fugiat aliquam nemo odio ullam! + Where everyone is treated with respect, dignity and understanding

@@ -28,4 +26,5 @@ const About = () => { ); }; + export default About; \ No newline at end of file diff --git a/client/src/pages/contact/Contact.js b/client/src/pages/contact/Contact.js index 630cd70..d1c57a0 100644 --- a/client/src/pages/contact/Contact.js +++ b/client/src/pages/contact/Contact.js @@ -9,10 +9,10 @@ const Contact = () => {

Contact Us

-
+ {/*
Invalid email or password - + */}
@@ -32,7 +32,7 @@ const Contact = () => {
-
+ {/*
*/} ); }; diff --git a/client/src/pages/home/componenets/Features.js b/client/src/pages/home/componenets/Features.js index a4f64d9..d17b6f6 100644 --- a/client/src/pages/home/componenets/Features.js +++ b/client/src/pages/home/componenets/Features.js @@ -6,23 +6,23 @@ const Features = () => {
-

Tell Us Your Idea

+

Comprehensive Exams

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut lab + Our hearing assistance exams are designed to be comprehensive, ensuring that we can provide you with the most accurate diagnosis possible.

-

We Will Do All The Work

+

Qualified Professionals

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut lab + Our team of qualified professionals has the experience and knowledge necessary to provide you with the care you need.

-

Your Product is Worldwide

+

Technology

- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut lab + We use the latest technology and equipment to ensure that you receive the most accurate and effective hearing assistance possible.

diff --git a/client/src/pages/home/componenets/Landing.js b/client/src/pages/home/componenets/Landing.js index 8d7bf81..d0bc269 100644 --- a/client/src/pages/home/componenets/Landing.js +++ b/client/src/pages/home/componenets/Landing.js @@ -4,12 +4,11 @@ import './css/landing.css' const Landing = () => { return (
-
-

Welcome To Eary

-

We are Eary - Super Creative & Minimal Agency

+
+

Welcome To Eeary

+

Get the Hearing Assistance Exam You Need

); }; - export default Landing; \ No newline at end of file diff --git a/client/src/pages/home/componenets/Services.js b/client/src/pages/home/componenets/Services.js index fd082a7..02e15ce 100644 --- a/client/src/pages/home/componenets/Services.js +++ b/client/src/pages/home/componenets/Services.js @@ -1,5 +1,6 @@ import React from 'react'; import './css/services.css' +import test4 from '../../../assets/images/test4.jpg' const Services = () => { return ( @@ -11,10 +12,9 @@ const Services = () => {
-

Graphic Designk

+

Test Your Hearing from Home

- Graphic design is the process of visual communication and - problem-solving using one or more of typography, photography and illustration. + Are you concerned about your hearing ability? With our online hearing test, you can assess your hearing from the comfort of your own home. Our test is easy to use and takes just a few minutes to complete. You'll receive your results instantly and can use them to take action if necessary.

@@ -22,10 +22,9 @@ const Services = () => {
-

Web Design

+

Convenient and Affordable Hearing Testing

- Web design encompasses many different skills and disciplines - in the production and maintenance of websites. + Getting your hearing tested has never been more convenient or affordable. Our online hearing test is available 24/7, so you can take it whenever it's convenient for you. And best of all, it's affordable - our pricing is competitive and transparent, with no hidden fees or charges.

@@ -34,10 +33,9 @@ const Services = () => {
-

UI & UX

+

Take Control of Your Hearing Health

- Process of enhancing user satisfaction with a product by improving - the usability, accessibility, and pleasure provided in the interaction. + Taking our online hearing test is the first step towards taking control of your hearing health. With our personalized results and recommendations, you can make informed decisions about how to protect and improve your hearing. Don't wait until it's too late - take our online hearing test today.

@@ -45,17 +43,16 @@ const Services = () => {
-

Web Development

+

Get Personalized Recommendations

- Web development is a broad term for the work involved in developing - a web site for the Internet or an intranet. + Our online hearing test provides personalized results and recommendations based on your unique hearing profile. Our advanced algorithms take into account factors such as age, gender, and lifestyle to give you the most accurate assessment possible. Based on your results, we'll provide recommendations for how you can protect and improve your hearing.

- +
diff --git a/client/src/shared/Footer.js b/client/src/shared/Footer.js index 1169d75..05a4fdb 100644 --- a/client/src/shared/Footer.js +++ b/client/src/shared/Footer.js @@ -1,15 +1,21 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; -import './style/Footer.css' +import React from "react"; +import { Link } from "react-router-dom"; +import "./style/Footer.css"; const Footer = () => { - return ( - - ); + return ( + + ); }; -export default Footer; \ No newline at end of file +export default Footer; diff --git a/client/src/shared/Header.js b/client/src/shared/Header.js index 114ecdb..b3a80fa 100644 --- a/client/src/shared/Header.js +++ b/client/src/shared/Header.js @@ -29,11 +29,14 @@ const Header = () => {
  • Home
  • About
  • Contact
  • + {auth &&auth.role==1 && ( +
  • Dashboard
  • + )} {!auth && (
  • Login
  • )} - {auth && ( -
  • Logout
  • + {auth &&auth.role==0 && ( +
  • MyProfile
  • )} diff --git a/server/db/connection.js b/server/db/connection.js index caea8f0..8ea23cd 100644 --- a/server/db/connection.js +++ b/server/db/connection.js @@ -1,8 +1,8 @@ const mysql = require('mysql'); const connection = mysql.createConnection({ host : 'localhost', - user : 'sqluser', - password : '123456', + user : 'root', + password : '', database : 'earysystem', port : '3306' }); diff --git a/server/upload/1683564142317.mp3 b/server/upload/1683564142317.mp3 new file mode 100644 index 0000000..8313e8f Binary files /dev/null and b/server/upload/1683564142317.mp3 differ diff --git a/server/upload/1683564156928.mp3 b/server/upload/1683564156928.mp3 new file mode 100644 index 0000000..0d019f4 Binary files /dev/null and b/server/upload/1683564156928.mp3 differ diff --git a/server/upload/1683564172508.mp3 b/server/upload/1683564172508.mp3 new file mode 100644 index 0000000..9ad95a1 Binary files /dev/null and b/server/upload/1683564172508.mp3 differ diff --git a/server/upload/1683564183959.mp3 b/server/upload/1683564183959.mp3 new file mode 100644 index 0000000..158c0d7 Binary files /dev/null and b/server/upload/1683564183959.mp3 differ diff --git a/server/upload/1683564203043.mp3 b/server/upload/1683564203043.mp3 new file mode 100644 index 0000000..7e81786 Binary files /dev/null and b/server/upload/1683564203043.mp3 differ diff --git a/server/upload/1683564214867.mp3 b/server/upload/1683564214867.mp3 new file mode 100644 index 0000000..41ba724 Binary files /dev/null and b/server/upload/1683564214867.mp3 differ diff --git a/server/upload/1683564229272.mp3 b/server/upload/1683564229272.mp3 new file mode 100644 index 0000000..13d8418 Binary files /dev/null and b/server/upload/1683564229272.mp3 differ diff --git a/server/upload/1683564241280.mp3 b/server/upload/1683564241280.mp3 new file mode 100644 index 0000000..b379cb6 Binary files /dev/null and b/server/upload/1683564241280.mp3 differ diff --git a/server/upload/1683564252592.mp3 b/server/upload/1683564252592.mp3 new file mode 100644 index 0000000..5c21f21 Binary files /dev/null and b/server/upload/1683564252592.mp3 differ