Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
516a337
initial commit, server connected to frontend and database
devinfiachra Jul 18, 2023
45c4127
added fluent ui component library
devinfiachra Jul 18, 2023
2991ca2
update config to connect client with the external live database
devinfiachra Jul 19, 2023
9d019ee
update hard coded server routes to point to external backend
devinfiachra Jul 19, 2023
4967a39
update config for vite frontend deployment on netlify
devinfiachra Jul 19, 2023
19ca406
update config for external deployment of vite app
devinfiachra Jul 19, 2023
589f3c9
update git ignore
devinfiachra Jul 19, 2023
aeebe55
new basic placeholder homepage elements for testing the API call
bienenbohnenbuhnen Jul 19, 2023
3d5cb78
basic-fluent-styled-homepage-elements
bienenbohnenbuhnen Jul 19, 2023
af5a7cb
Merge remote-tracking branch 'origin/add-basic-hompage-elements-to-ho…
devinfiachra Jul 19, 2023
699240d
Merge pull request #2 from devinfiachra/release-2023-1907-1
devinfiachra Jul 19, 2023
257d412
update directory structure for readability
devinfiachra Jul 20, 2023
8ffc7d8
Merge pull request #3 from devinfiachra/feature-update-login-routing
devinfiachra Jul 20, 2023
8332211
add button from fluent ui library to navbar
devinfiachra Jul 20, 2023
e252fb0
update styles signim page using ui-library
devinfiachra Jul 20, 2023
a2197cc
update styles login/registration page using ui-library
devinfiachra Jul 20, 2023
b416885
update login page ui
devinfiachra Jul 20, 2023
0e81955
update Signup function to generate token on login and route the user…
devinfiachra Jul 20, 2023
d094af3
Merge pull request #4 from devinfiachra/release-2023-20-07-1
devinfiachra Jul 20, 2023
da1fdd8
stuck on authorization
bienenbohnenbuhnen Jul 20, 2023
a10ac75
api response sent to console, rendering not complete
bienenbohnenbuhnen Jul 20, 2023
2564ccb
remove styles
devinfiachra Jul 20, 2023
e2d507f
therapist scaffolding creation, auth path not yet clarified
bienenbohnenbuhnen Jul 21, 2023
09a3e85
fully functional therapist login and signup
bienenbohnenbuhnen Jul 21, 2023
5cc9fd9
import assestes, create basic landing page, restructures nav componen…
devinfiachra Jul 21, 2023
dfdd3ea
adjust homepage css
devinfiachra Jul 21, 2023
500ed52
add basic hompepage and routes to therapist/login
devinfiachra Jul 21, 2023
f6ae4a4
Merge pull request #6 from devinfiachra/release-2023-21-07-21-1
devinfiachra Jul 21, 2023
ec16156
release ready for merge to master, moved chat gpt api function to own…
devinfiachra Jul 21, 2023
dfb5c78
minor routing updates to ui
devinfiachra Jul 21, 2023
b583a2b
Merge pull request #7 from devinfiachra/release-2023-21-07-2-frontend
devinfiachra Jul 21, 2023
f97427c
add basic styles for login, signup
devinfiachra Jul 21, 2023
4b04a66
add css files, update basic css structure, add welcome page frontend …
devinfiachra Jul 21, 2023
328d3b0
Merge pull request #8 from devinfiachra/release-2023-21-07-frontend-2
devinfiachra Jul 21, 2023
9fb5c33
add design template page, add assets
devinfiachra Jul 23, 2023
68d1eb3
add assests
devinfiachra Jul 23, 2023
70a84d0
add basic login registraton userflow
devinfiachra Jul 23, 2023
586c553
add basic routing to welcome funnel
devinfiachra Jul 23, 2023
cb0f921
complete basic footer component, add assets
devinfiachra Jul 23, 2023
21b303c
import assest, complete basic footer component
devinfiachra Jul 23, 2023
409251e
import basic navbar component to dashboard
devinfiachra Jul 23, 2023
a5291c7
Merge pull request #9 from devinfiachra/release-2023-23-07-1
devinfiachra Jul 23, 2023
a5aad47
update footer css
devinfiachra Jul 23, 2023
9694516
therapist read and update complete
bienenbohnenbuhnen Jul 23, 2023
b83844d
update footer styles and routing
devinfiachra Jul 23, 2023
e46c41a
create footer nav pages with back links and placeholder content
devinfiachra Jul 23, 2023
524e360
delete function complete
bienenbohnenbuhnen Jul 23, 2023
c4ad8dd
update routing for exercises page
devinfiachra Jul 23, 2023
6b66178
delete action complete
bienenbohnenbuhnen Jul 23, 2023
30d3155
add placeholder images and text for checkin route
devinfiachra Jul 23, 2023
8b5ebe3
added pages and routes for frontend components
devinfiachra Jul 23, 2023
dd03b43
update logout routing
devinfiachra Jul 23, 2023
fc0d8d6
Merge pull request #11 from devinfiachra/release-2023-23-07-2-update-…
devinfiachra Jul 23, 2023
9cf4a44
ready for realease to master
devinfiachra Jul 24, 2023
489a9fd
Merge pull request #12 from devinfiachra/release-2023-24-07-1-therapi…
devinfiachra Jul 24, 2023
908c5ef
update basic homepage styles
devinfiachra Jul 24, 2023
d2a9bce
style basic fronted welcome page
devinfiachra Jul 24, 2023
eece1d2
add standin styles for login and registartion
devinfiachra Jul 24, 2023
2fac042
ai chatbot with per-defined personality complete
bienenbohnenbuhnen Jul 24, 2023
054dc71
improve styles for login, registration and home
devinfiachra Jul 24, 2023
bcde397
Merge pull request #14 from devinfiachra/release-2023-24-07-2-ai-ther…
devinfiachra Jul 24, 2023
519f813
make footer sticky to bottom of page
devinfiachra Jul 24, 2023
9c2018f
basic therapist list page rendering therapists
bienenbohnenbuhnen Jul 24, 2023
06394df
add basic nav for logout
devinfiachra Jul 24, 2023
e254418
Merge remote-tracking branch 'origin/login-registration-frontend' int…
devinfiachra Jul 24, 2023
732d872
Merge pull request #15 from devinfiachra/release-2023-24-07-3-fronten…
devinfiachra Jul 24, 2023
002c844
Merge remote-tracking branch 'origin/therapist-list-page' into releas…
devinfiachra Jul 24, 2023
8d17e7f
Merge pull request #16 from devinfiachra/release-2023-24-07-4-therapi…
devinfiachra Jul 24, 2023
b748d7f
therapist details rendered for each therapist in their own page
bienenbohnenbuhnen Jul 25, 2023
3679b45
add basic loading animation, add mood tracker page and sub components
devinfiachra Jul 25, 2023
a162659
basic feature for mood logging
devinfiachra Jul 25, 2023
a88c2e4
Merge remote-tracking branch 'origin/therapist-details-page' into rel…
devinfiachra Jul 25, 2023
77bc1cd
Merge pull request #17 from devinfiachra/release-2023-25-07-therapist…
devinfiachra Jul 25, 2023
8527175
Merge remote-tracking branch 'origin/master' into mood-tracker-and-404
devinfiachra Jul 25, 2023
0288afb
upload photo and rendering on user side complete
bienenbohnenbuhnen Jul 25, 2023
8e02edb
Merge remote-tracking branch 'origin/master' into upload-therapist-photo
bienenbohnenbuhnen Jul 25, 2023
22b9117
user crud actions in profile complete
bienenbohnenbuhnen Jul 26, 2023
ec238f7
mood tracker images and basic css, nav for mood tracker pages with logic
devinfiachra Jul 26, 2023
fe62996
css for mood feature
devinfiachra Jul 26, 2023
8e8278b
placeholder for mood tracking feature
devinfiachra Jul 26, 2023
9517c3b
Merge remote-tracking branch 'origin/upload-therapist-photo' into rel…
devinfiachra Jul 26, 2023
bf02478
Merge remote-tracking branch 'origin/user-crud-actions' into release-…
devinfiachra Jul 26, 2023
92c6c1e
Merge pull request #20 from devinfiachra/release-2023-26-07-1-mood-tr…
devinfiachra Jul 26, 2023
599cbf3
styled login
devinfiachra Jul 26, 2023
dee80ea
resistration page styled
devinfiachra Jul 26, 2023
31e5f71
login and registration completed
devinfiachra Jul 26, 2023
8b06359
user login and registration styled
devinfiachra Jul 26, 2023
1e0dde1
exercises page completed
devinfiachra Jul 26, 2023
262d437
minor css improvements
devinfiachra Jul 26, 2023
0c2ea93
talk page styles
devinfiachra Jul 26, 2023
edfa764
talk page complete
devinfiachra Jul 26, 2023
1ec71fc
breathing exercise cards complete
devinfiachra Jul 26, 2023
9aaff0d
basic styles for articles page
devinfiachra Jul 26, 2023
9cb6db3
stuck on storing the data in a form to submit
bienenbohnenbuhnen Jul 26, 2023
a600bab
placeholder for audio page
devinfiachra Jul 26, 2023
3404c1d
updated therapist login page
devinfiachra Jul 26, 2023
fdd7c27
therapist login and registration completed
devinfiachra Jul 26, 2023
267b89e
update login routing
devinfiachra Jul 26, 2023
60573de
add link class
devinfiachra Jul 26, 2023
01cf3ea
minor update of routes
devinfiachra Jul 26, 2023
48f21b0
Merge pull request #21 from devinfiachra/release-2023-26-07-2-design-…
devinfiachra Jul 26, 2023
d767db1
Merge remote-tracking branch 'origin/user-check-in-funnel' into relea…
devinfiachra Jul 26, 2023
0b91b60
Merge pull request #22 from devinfiachra/release-2023-26-07-3-daily-c…
devinfiachra Jul 26, 2023
bab5899
welcome page styled
devinfiachra Jul 26, 2023
8bae2e4
basic edit profile page styling completed
devinfiachra Jul 26, 2023
6637d55
basic user profile wip
devinfiachra Jul 26, 2023
d16813c
Merge pull request #23 from devinfiachra/release-2023-26-07-4-new-css
devinfiachra Jul 26, 2023
7467caf
user funnel almost complete, error upon submit
bienenbohnenbuhnen Jul 27, 2023
3443c9a
Merge remote-tracking branch 'origin/user-check-in-funnel' into relea…
devinfiachra Jul 27, 2023
5640827
Merge pull request #24 from devinfiachra/release-2023-27-07-check-in-…
devinfiachra Jul 27, 2023
2487d2b
update text, and back routing
devinfiachra Jul 27, 2023
e93860a
animation is complete, styling on the breathing exercises landing pag…
bienenbohnenbuhnen Jul 27, 2023
a136dc0
playable audio complete, just needs a pause button icon and the logic…
bienenbohnenbuhnen Jul 27, 2023
8110d8f
therapy card completed
devinfiachra Jul 27, 2023
769eb3a
therapist profile cards rendering on page
devinfiachra Jul 27, 2023
4ff74e8
style update therapy card
devinfiachra Jul 27, 2023
74c1abe
completed user check in
bienenbohnenbuhnen Jul 27, 2023
96652c6
update breath exercises css
devinfiachra Jul 27, 2023
29ba497
update therapist signup with success screen
devinfiachra Jul 27, 2023
1a8de38
complete basic therapist profile
devinfiachra Jul 27, 2023
1689334
therapist profile page completed
devinfiachra Jul 27, 2023
c612325
user profile populated with check in info and user info with graph, n…
bienenbohnenbuhnen Jul 27, 2023
e5aa230
update luna back button ai chat
devinfiachra Jul 27, 2023
95a1ac6
ai-chatbot-styled
devinfiachra Jul 27, 2023
dcb65c3
play and pause buttons change on click
bienenbohnenbuhnen Jul 27, 2023
3b525e6
Merge pull request #29 from devinfiachra/release-2023-27-07-3-devin-c…
devinfiachra Jul 27, 2023
47ce440
image leads to breath work page
devinfiachra Jul 27, 2023
56fd6ac
Merge remote-tracking branch 'origin/playing-audio' into release-2023…
devinfiachra Jul 27, 2023
95c6ccf
Merge remote-tracking branch 'origin/completed-user-checkin' into rel…
devinfiachra Jul 27, 2023
d35a158
Merge remote-tracking branch 'origin/user-profile-stats-population' i…
devinfiachra Jul 27, 2023
c3b331d
Merge remote-tracking branch 'origin/play-pause-button' into release-…
devinfiachra Jul 27, 2023
85b6aa4
Merge pull request #30 from devinfiachra/release-2023-27-07-5-andy-fe…
devinfiachra Jul 27, 2023
2f8215c
unstyled appointment booking page
bienenbohnenbuhnen Jul 27, 2023
5feb47e
links to other pages added from booking
bienenbohnenbuhnen Jul 27, 2023
3aa0e54
link from therapist details page to make and appointment
bienenbohnenbuhnen Jul 27, 2023
90c1876
booking partially styled with no separate booking confirmation route
bienenbohnenbuhnen Jul 27, 2023
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 .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REACT_APP_SERVER_URL=http://localhost:5005
# VITE_LIVE_SERVER=https://bookworm-backend.adaptable.app
VITE_LIVE_SERVER=http://localhost:5005
DEV_SERVER=http://localhost:5005
4 changes: 3 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
REACT_APP_SERVER_URL=http://localhost:5005
REACT_APP_SERVER_URL=http://localhost:5005
# update live server string when working locally - change to localhost:5005
VITE_LIVE_SERVER=
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ dist
dist-ssr
*.local

.env

# Editor directories and files
.vscode/*
!.vscode/extensions.json
Expand Down
68 changes: 68 additions & 0 deletions chatgpt.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import * as React from "react";
import { Button, Input } from "@fluentui/react-components";
import { useState, useEffect } from "react";
import axios from "axios";

function HomePage() {
const [prompt, setPrompt] = useState("");
const [message, setMessage] = useState("");

const handlePostReq = () => {
const url = "http://localhost:5005/api/completions";
const storedToken = localStorage.getItem("authToken");
axios
.post(
url,
{
message: prompt,
},
{
headers: { Authorization: `Bearer ${storedToken}` },
}
)
.then((resp) => console.log(resp))
.catch((error) => console.log(error));
};

// const getMessages = async () => {
// const options = {
// method: "POST",
// body: JSON.stringify({
// message: prompt,
// }),
// headers: {
// "Content-Type": "application/json",
// },
// };
// try {
// const response = await fetch(
// "http://localhost:5005/api/completions",
// options
// );
// console.log("hello");
// const data = await response.json();
// console.log(response);
// console.log(data);
// setMessage(data.choices[0].message);
// } catch (error) {
// console.error(error);
// }
// };

return (
<div class="container homepage">
<div class="homepage-1">
<img src={logo} alt="HopeMe Logo" />
</div>
<div>
<Input
onChange={(e) => setPrompt(e.target.value)}
placeholder="Add some detail"
/>
<Button onClick={handlePostReq}>Let's Book!</Button>
</div>
</div>
);
}

export default HomePage;
8 changes: 6 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link
rel="icon"
type="image/svg+xml"
href="./src/assets/logos/logohopeme.png"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React</title>
<title>Hopeme</title>
</head>
<body>
<div id="root"></div>
Expand Down
Loading