Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
267 commits
Select commit Hold shift + click to select a range
984d271
fixing-eslint-again-jacob-jacob-whitman
Jacob-Whitman Apr 7, 2024
1a1dd2b
Merge pull request #50 from okarney/fixing-eslint-again-jacob-whitman
Jacob-Whitman Apr 7, 2024
79bcd4e
eslint-again-jacob-whitman
Jacob-Whitman Apr 7, 2024
0a196d9
Merge pull request #51 from okarney/eslint-again-jacob-whitman
Jacob-Whitman Apr 7, 2024
c650a94
eslint-again-jacob-whitman
Jacob-Whitman Apr 7, 2024
50fbadb
Merge pull request #52 from okarney/eslint-again-jacob-whitman
Jacob-Whitman Apr 7, 2024
b9480c3
test
rkhadija1 Apr 9, 2024
42e8b38
test2
rkhadija1 Apr 9, 2024
623a4b3
tes3
rkhadija1 Apr 9, 2024
dade788
test4
rkhadija1 Apr 9, 2024
2b0b56d
test5
rkhadija1 Apr 9, 2024
5d96990
test5
rkhadija1 Apr 9, 2024
3be3cd8
test
rkhadija1 Apr 9, 2024
72bbed6
test
rkhadija1 Apr 9, 2024
28064c9
test
rkhadija1 Apr 9, 2024
8e5489e
test
rkhadija1 Apr 9, 2024
814c6c8
test
rkhadija1 Apr 9, 2024
6c1bb55
test
rkhadija1 Apr 9, 2024
79d6e7a
test
rkhadija1 Apr 9, 2024
e11e12b
done
rkhadija1 Apr 9, 2024
3a24d74
done
rkhadija1 Apr 9, 2024
9d286fd
discription-basic-assessment
rkhadija1 Apr 9, 2024
df5f7db
Merge pull request #53 from okarney/discreption-basic-assesment
rkhadija1 Apr 9, 2024
f0095e0
yeah
Jacob-Whitman Apr 9, 2024
c4a02ff
test
rkhadija1 Apr 9, 2024
7faff34
Merge branch 'main' into weird-stuff-jacob-whitman
Jacob-Whitman Apr 9, 2024
3497784
Merge pull request #54 from okarney/weird-stuff-jacob-whitman
Jacob-Whitman Apr 9, 2024
1b13453
weird-stuff-jacob-whitman
Jacob-Whitman Apr 9, 2024
d8df1cf
Merge branch 'weird-stuff-jacob-whitman' of https://github.com/okarne…
Jacob-Whitman Apr 9, 2024
0bb3adc
Merge pull request #55 from okarney/weird-stuff-jacob-whitman
Jacob-Whitman Apr 9, 2024
a3038c0
test
rkhadija1 Apr 9, 2024
6f090e8
started working on coding the detailed question page, accidently wrot…
okarney Apr 9, 2024
7f29caf
Merge branch 'main' of https://github.com/okarney/starter_helpi
okarney Apr 9, 2024
ec49310
test
rkhadija1 Apr 9, 2024
87766e0
finished skeleton setup for basic quesitons page
okarney Apr 9, 2024
30d3921
Merge pull request #56 from okarney/detailed_questions_okarney
okarney Apr 9, 2024
ce9a659
added questions to detailed questions page
okarney Apr 9, 2024
65ee9e5
Merge pull request #57 from okarney/detailed_questions_okarney
okarney Apr 9, 2024
84d2e75
test
rkhadija1 Apr 9, 2024
4dfcb3e
basic-questions-done
rkhadija1 Apr 11, 2024
0566ead
Merge pull request #58 from okarney/Basic-Questions
rkhadija1 Apr 11, 2024
534f51a
AAAAAAAAAAAAA
Jacob-Whitman Apr 11, 2024
07ecb3b
Merge pull request #59 from okarney/one-more-button-jacob-whitman
Jacob-Whitman Apr 11, 2024
e76479b
progress bar with button
Apr 11, 2024
e354e26
Merge branch 'main' of https://github.com/okarney/starter_helpi
Apr 11, 2024
a9810d2
progress bar after khadija pull
Apr 11, 2024
987f8c1
added Get Career Choices Button
okarney Apr 11, 2024
931d5f8
update progress bar
Apr 11, 2024
b2a2e34
Merge pull request #60 from okarney/progressBar-Zahra879
okarney Apr 11, 2024
6555566
did the funny install
okarney Apr 11, 2024
b296934
Merge branch 'main' of https://github.com/okarney/starter_helpi
okarney Apr 11, 2024
9592927
disabled unused vars, change later
okarney Apr 11, 2024
dc6ebc0
saved basic
okarney Apr 11, 2024
c57435e
deletd unused react
okarney Apr 11, 2024
803c6fd
Progress Bar for detailed question
Apr 12, 2024
fc50a9b
Merge branch 'main' into progressBarDetailed-Zahra879
Zahra879 Apr 12, 2024
a44a699
Merge pull request #61 from okarney/progressBarDetailed-Zahra879
Zahra879 Apr 12, 2024
ba27fc0
test
rkhadija1 Apr 12, 2024
bf280ad
Merge pull request #62 from okarney/khadija_basic_questions
rkhadija1 Apr 12, 2024
827dbba
reformatted the homepage to have the buttons in 2 columns and took ou…
okarney Apr 14, 2024
427d970
Merge pull request #63 from okarney/formattingHomepage_okarney
okarney Apr 14, 2024
602cc79
removed logo variable to allow the website to deploy
okarney Apr 14, 2024
8645b1c
Merge pull request #64 from okarney/formattingHomepage_okarney
okarney Apr 14, 2024
aac9f6b
fixing deployment issue after formatting changes
okarney Apr 14, 2024
45afaaa
Merge pull request #65 from okarney/formattingHomepage_okarney
okarney Apr 14, 2024
92c1ede
added index.html file as per Aromando's announcement about a bootstra…
okarney Apr 15, 2024
d1dcc28
Merge pull request #66 from okarney/bootstrapFix_okarney
okarney Apr 15, 2024
4862a06
Added Router/Buttons Hopefully for the last time
Jacob-Whitman Apr 16, 2024
c90625f
Merge pull request #67 from okarney/Router-Jacob-Whitman
Jacob-Whitman Apr 16, 2024
2e81381
addedRouter/Buttons
Jacob-Whitman Apr 16, 2024
494251a
Merge pull request #68 from okarney/Router-Jacob-Whitman
Jacob-Whitman Apr 16, 2024
7b8839a
Added Router
Jacob-Whitman Apr 16, 2024
7afb66d
Merge pull request #70 from okarney/Router-Jacob-Whitman
Jacob-Whitman Apr 16, 2024
78470b5
added router
Jacob-Whitman Apr 16, 2024
c590afe
Merge pull request #71 from okarney/Router-Jacob-Whitman
Jacob-Whitman Apr 16, 2024
0da2ec7
Added Router Again
Jacob-Whitman Apr 16, 2024
ae6e69b
Merge pull request #72 from okarney/Router-Jacob-Whitman
Jacob-Whitman Apr 16, 2024
bcad895
Fixed tests
Jacob-Whitman Apr 16, 2024
bb3ecdf
Merge pull request #73 from okarney/Router-Jacob-Whitman
Jacob-Whitman Apr 16, 2024
fbf766e
Fixed tests
Jacob-Whitman Apr 16, 2024
43ee0ea
Merge pull request #74 from okarney/Router-Jacob-Whitman
Jacob-Whitman Apr 16, 2024
aaac044
added feedback text
Apr 17, 2024
bfd76c2
Merge pull request #75 from okarney/feedback-text-Zahra879
Zahra879 Apr 17, 2024
c5fe9b3
pushing again feedback text
Apr 17, 2024
ec98e48
Merge pull request #76 from okarney/feedback-text-Zahra879
Zahra879 Apr 17, 2024
192c10d
a
Jacob-Whitman Apr 18, 2024
30f83eb
a
Jacob-Whitman Apr 18, 2024
70ab3cb
a
Jacob-Whitman Apr 18, 2024
24849c9
a
Jacob-Whitman Apr 18, 2024
904fe4d
a
Jacob-Whitman Apr 18, 2024
b6c9e05
a
Jacob-Whitman Apr 18, 2024
e430995
a
Jacob-Whitman Apr 18, 2024
97cd31e
Merge pull request #78 from okarney/fix
Jacob-Whitman Apr 18, 2024
3d2a384
fixed sumbit buttons and working on header
Jacob-Whitman Apr 18, 2024
d40ac68
finished the header and such
Jacob-Whitman Apr 18, 2024
12245bd
moved buttons jacob whitman
Jacob-Whitman Apr 19, 2024
fbb8234
Merge pull request #79 from okarney/moving-buttons-jacob-whitman
Jacob-Whitman Apr 19, 2024
cd4c6f7
gpt working!!!!!!!!
okarney Apr 20, 2024
f1f13c2
Merge pull request #80 from okarney/intGPT_2nd_try_O_Z_K
okarney Apr 20, 2024
f16e4cb
removed unused openai variable for deployment
okarney Apr 20, 2024
217276f
Merge pull request #81 from okarney/intGPT_2nd_try_O_Z_K
okarney Apr 20, 2024
25f292c
removed another unused variable
okarney Apr 20, 2024
dd68bf4
Merge pull request #82 from okarney/intGPT_2nd_try_O_Z_K
okarney Apr 20, 2024
5590d1f
slight formatting adjustment 2
okarney Apr 20, 2024
ecda560
Merge pull request #83 from okarney/intGPT_2nd_try_O_Z_K
okarney Apr 20, 2024
a536a79
small changes
okarney Apr 21, 2024
1af2f26
Merge pull request #84 from okarney/intGPT_2nd_try_O_Z_K
okarney Apr 21, 2024
ab1a1f3
designed the homepage
Apr 21, 2024
9d85358
Merge pull request #85 from okarney/designHome-Zahra879
Zahra879 Apr 21, 2024
6e2ced4
Removed-Keyfrom-Home
Jacob-Whitman Apr 23, 2024
2bb932a
Removed-Keyfrom-Home
Jacob-Whitman Apr 23, 2024
2fcb672
Merge pull request #86 from okarney/Removing-Key-from=Home
Jacob-Whitman Apr 23, 2024
9e7196c
Removed-Keyfrom-Home
Jacob-Whitman Apr 23, 2024
c4cb6cb
Merge pull request #87 from okarney/Removing-Key-from=Home
Jacob-Whitman Apr 23, 2024
47f6c5e
Removed-Keyfrom-Home
Jacob-Whitman Apr 23, 2024
b7f022d
Removed-Keyfrom-Home
Jacob-Whitman Apr 23, 2024
043cae7
Merge pull request #88 from okarney/Removing-Key-from=Home
Jacob-Whitman Apr 23, 2024
5cb3f69
Removed-Keyfrom-Home
Jacob-Whitman Apr 23, 2024
f6c8e74
Merge pull request #89 from okarney/Removing-Key-from=Home
Jacob-Whitman Apr 23, 2024
73cbad1
Removed-Keyfrom-Home
Jacob-Whitman Apr 23, 2024
1e4eede
Merge pull request #90 from okarney/Removing-Key-from=Home
Jacob-Whitman Apr 23, 2024
7963f56
added a prompt for detailed questions
okarney Apr 23, 2024
8f8656f
Merge pull request #91 from okarney/detailedQuestionsPrompt_okarney_z…
okarney Apr 23, 2024
b062fed
test
rkhadija1 Apr 25, 2024
dea968e
Merge pull request #92 from okarney/chatgpt-khadija
rkhadija1 Apr 25, 2024
9f38b46
test
rkhadija1 Apr 25, 2024
f49506d
Merge pull request #93 from okarney/chatgpt-khadija
rkhadija1 Apr 25, 2024
da51e28
gpt with nice formatting for detailed questions!!!!!
okarney Apr 25, 2024
d019881
Merge pull request #94 from okarney/formatingDetailed_2nd_okarney
okarney Apr 25, 2024
bcdd0be
added gif to detailed page, removed unused var, corrected grammar error
okarney Apr 25, 2024
503ae19
Merge pull request #95 from okarney/addGifToDetailed_okarney
okarney Apr 25, 2024
6da5178
fixed progress-bar
Jacob-Whitman Apr 25, 2024
1461929
Merge pull request #96 from okarney/Fixing-PB-jacob-whitman
Jacob-Whitman Apr 30, 2024
8bcf26f
added about us page
Jacob-Whitman Apr 30, 2024
71c90c4
working on page and eslint
Jacob-Whitman Apr 30, 2024
9c21ee2
formatted the pages
Jacob-Whitman Apr 30, 2024
ad61fab
Merge pull request #97 from okarney/added-pages-jacob-whitman
Jacob-Whitman Apr 30, 2024
30fa588
commented out window.location.reload() in detailed questions to try t…
okarney May 1, 2024
2c511a8
Merge pull request #98 from okarney/fixing404Error
okarney May 1, 2024
95ed168
tried adjusting onClick/removing it to see if it will not throw 404 e…
okarney May 1, 2024
6849afd
Merge pull request #99 from okarney/fixing404Error
okarney May 1, 2024
0ea5d8e
tried changing BrowserRouter to HashRouter
okarney May 1, 2024
6e9f7d3
Merge pull request #100 from okarney/fixing404Error
okarney May 1, 2024
e669cb1
fixed headers and page layout
Jacob-Whitman May 2, 2024
fd83227
Merge pull request #101 from okarney/header-two-jacob-whitman
Jacob-Whitman May 2, 2024
882ed51
test
rkhadija1 May 2, 2024
2de398e
test
rkhadija1 May 2, 2024
2505f1d
test
rkhadija1 May 2, 2024
2bbc624
test
rkhadija1 May 2, 2024
03959c5
Merge branch 'main' into format-gpt-khadija
rkhadija1 May 2, 2024
3395300
Merge pull request #102 from okarney/format-gpt-khadija
rkhadija1 May 2, 2024
5e72127
fixed headers and page layout
Jacob-Whitman May 2, 2024
e3a99a0
Merge pull request #103 from okarney/text-boxes-jacob-whitman
Jacob-Whitman May 2, 2024
70cfb6d
fixed missing div tag issue that was preventing the code from compiling
okarney May 2, 2024
49e6ccc
made some adjustments to the GPT response formatting and other format…
okarney May 3, 2024
210883f
Merge pull request #104 from okarney/fixingCompileErrors_okarney
okarney May 3, 2024
35e2626
deleted unused var
okarney May 3, 2024
7e2d8bd
Merge pull request #105 from okarney/fixingCompileErrors_okarney
okarney May 3, 2024
f4683c0
implemented a validation check in Basic Questions for when the user d…
okarney May 4, 2024
9d5204b
added alert message for when the user hits Get Career Choices without…
okarney May 4, 2024
4015ae2
added validation for no api key in detailed questions
okarney May 4, 2024
9b837a7
Merge pull request #106 from okarney/noAPIKeyValidation_okarney
okarney May 4, 2024
519e65d
added if condition to make the gif disappear after the GPT response h…
okarney May 4, 2024
fcf0866
Merge pull request #107 from okarney/makeGIFDisappear_okarney
okarney May 4, 2024
c83ac18
test
rkhadija1 May 6, 2024
be23525
test
rkhadija1 May 6, 2024
75edfbb
Merge pull request #111 from okarney/feedback-gif-khadija
rkhadija1 May 6, 2024
2fb401b
test
rkhadija1 May 6, 2024
a44b5fd
Merge pull request #113 from okarney/feedback-gif-khadija
rkhadija1 May 6, 2024
0dbf47b
test
rkhadija1 May 6, 2024
315882a
Merge pull request #114 from okarney/feedback-gif-khadija
rkhadija1 May 6, 2024
3b0f8d8
test
rkhadija1 May 6, 2024
998d4d0
Merge pull request #115 from okarney/feedback-gif-khadija
rkhadija1 May 6, 2024
a91ec61
test
rkhadija1 May 6, 2024
4c7b565
Merge pull request #116 from okarney/feedback-gif-khadija
rkhadija1 May 6, 2024
2dc7408
trying to merge old branch to fix main
okarney May 6, 2024
79e4f2f
Merge pull request #117 from okarney/makeGIFDisappear_okarney
okarney May 6, 2024
8e410db
fixing the mess
rkhadija1 May 6, 2024
58105a4
Merge pull request #118 from okarney/feedback-gif-khadija
rkhadija1 May 6, 2024
0b29c37
fixing the little mess
rkhadija1 May 6, 2024
a325c00
Merge pull request #119 from okarney/feedback-gif-khadija
rkhadija1 May 6, 2024
281b69b
added system user for detailed
May 7, 2024
cc5c2cc
Merge pull request #120 from okarney/making-User-Zahra879
Zahra879 May 7, 2024
f7519e7
added user system to detailed question
May 7, 2024
9bac416
Merge pull request #121 from okarney/making-User-Zahra879
Zahra879 May 7, 2024
023a4d1
small change! yaygit add .
rkhadija1 May 7, 2024
3c04b6a
Merge pull request #122 from okarney/progress-bar-right-indentation
rkhadija1 May 7, 2024
3952431
worked on detailed page and designed the header buttons
May 7, 2024
b89f0fd
fixed the button design not finished yet
May 7, 2024
faefc74
Merge pull request #123 from okarney/design-question-page-Zahra879
Zahra879 May 7, 2024
9d24e22
added survey page and fixed all respective links
Jacob-Whitman May 7, 2024
d7e7d34
none of the above option added
rkhadija1 May 7, 2024
5eaee10
Merge pull request #124 from okarney/none-of-the-above-khadija
rkhadija1 May 7, 2024
c824b43
added gpt response check and key check
Jacob-Whitman May 7, 2024
af9e8ef
Merge pull request #125 from okarney/survey-page-gpt-jacob-whitman
Jacob-Whitman May 7, 2024
1c34e82
changed button hover color and aligned header
Jacob-Whitman May 7, 2024
aa62d1b
changed button hover color and aligned header
Jacob-Whitman May 7, 2024
ab9f054
changed button hover color and aligned header
Jacob-Whitman May 7, 2024
2b38eca
Merge pull request #127 from okarney/buttons-jacob-whitman
Jacob-Whitman May 7, 2024
7c58955
adjustedErrorMessages
okarney May 7, 2024
4ac0bc4
Merge branch 'main' into adjustingErrorMessages_okarney
okarney May 7, 2024
f70cd95
Merge pull request #128 from okarney/adjustingErrorMessages_okarney
okarney May 7, 2024
fa6bb23
fixed buttons color
May 8, 2024
0d2db57
fixed progress color
May 8, 2024
8638d43
worked on basic page
May 8, 2024
60c0c80
Merge pull request #129 from okarney/design-basic-Zahra879
Zahra879 May 8, 2024
097271f
changed the home import error
May 8, 2024
b3d6837
surey weird things
rkhadija1 May 8, 2024
140418b
Merge pull request #130 from okarney/survey-khadija
rkhadija1 May 8, 2024
344f175
Merge pull request #131 from okarney/design-basic-Zahra879
Zahra879 May 8, 2024
85fd812
testtttt
rkhadija1 May 8, 2024
0ec1c84
Merge pull request #132 from okarney/survey2-khadija
rkhadija1 May 8, 2024
435101a
started working on the about page
okarney May 8, 2024
0871121
made good progress on the about page
okarney May 9, 2024
0638989
Merge pull request #133 from okarney/aboutPage_okarney
okarney May 9, 2024
08dca2a
changed photo
okarney May 9, 2024
4780e52
Merge pull request #134 from okarney/aboutPage_okarney
okarney May 9, 2024
5e1b64d
removed ! from detailed question header; corrected survey spelling; r…
okarney May 9, 2024
2edcf17
Merge pull request #135 from okarney/variousAdjustments_okarney
okarney May 9, 2024
8392893
survey weird behavs gone
rkhadija1 May 9, 2024
3e77eda
Merge branch 'main' into survey2-khadija
rkhadija1 May 9, 2024
68facfe
Merge pull request #136 from okarney/survey2-khadija
rkhadija1 May 9, 2024
dd7fd31
survey weird behavs gone.yayyy
rkhadija1 May 9, 2024
e99c0f5
Merge pull request #137 from okarney/survey2-khadija
rkhadija1 May 9, 2024
3e6467c
fixed more buttons and format
May 9, 2024
cb9ce1d
Merge branch 'main' into final-format-Zahra879
Zahra879 May 9, 2024
7aef603
Merge pull request #138 from okarney/final-format-Zahra879
Zahra879 May 9, 2024
40b8001
deleted estra logo
May 9, 2024
65b9da2
added khadija's picture to about page
okarney May 9, 2024
2d3f104
Merge pull request #139 from okarney/addingKhadijaPic_okarney
okarney May 9, 2024
6079a50
test
rkhadija1 May 9, 2024
7ff5317
Merge pull request #140 from okarney/survey2-khadija
rkhadija1 May 9, 2024
2cf2091
made some formatting adjustments in basic questions
okarney May 10, 2024
9746f1a
Merge pull request #141 from okarney/adjustGPTFormat_okarney
okarney May 10, 2024
fb5c9aa
I hope this goes well
May 10, 2024
16e370f
test
rkhadija1 May 10, 2024
56e1605
Merge pull request #142 from okarney/survey2-khadija
rkhadija1 May 10, 2024
9f483d2
changed GPT formatting on detailed questions page
okarney May 11, 2024
0edcfa4
centered and aligned everything on the detailed questions page
okarney May 11, 2024
9769c90
detailed formatting
okarney May 11, 2024
82d8f62
Merge pull request #143 from okarney/gptFormatDetailed_okarney
okarney May 11, 2024
fda6ffa
matched home and about page headers
okarney May 11, 2024
79231b1
header matches on detailed and basic pages
okarney May 11, 2024
18786bd
headers on all pages match!!!!!!
okarney May 11, 2024
e04aa5a
all headers match, but I cannot figure out how to make them bigger
okarney May 11, 2024
f3d5268
Merge pull request #144 from okarney/formatHeader_okarney
okarney May 11, 2024
fadb45e
removed usused vars
okarney May 11, 2024
8c76e66
Merge pull request #145 from okarney/formatHeader_okarney
okarney May 11, 2024
38b16d6
Merge branch 'main' of https://github.com/okarney/starter_helpi
May 11, 2024
f70b373
changed background
May 14, 2024
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
111 changes: 94 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
"@types/node": "^16.18.76",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react-router-dom": "^5.3.3",
"bootstrap": "^5.3.2",
"gh-pages": "^6.1.1",
"openai": "^4.26.0",
"openai": "^4.0.0",
"react": "^18.2.0",
"react-bootstrap": "^2.10.1",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.3",
"react-scripts": "5.0.1",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
Expand Down Expand Up @@ -45,5 +47,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
}
}
Binary file added public/test_report.txt
Binary file not shown.
Loading