Skip to content
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.

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

Merging all of dev from Spring 2024 into Main #71

Closed
wants to merge 179 commits into from
Closed
Show file tree
Hide file tree
Changes from 177 commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
027d808
initial simple commit
mernaAlghannam May 2, 2023
dfbea42
Update readme
chien-ying May 5, 2023
23bb311
Update test files
chien-ying May 5, 2023
c308201
Update website title
chien-ying May 5, 2023
a941062
Add comments
chien-ying May 5, 2023
bc0b508
add comments for footer component
marsof02 May 4, 2023
27b60d6
Update README.md
mernaAlghannam May 5, 2023
9319b94
Add comment of homepage
chien-ying May 5, 2023
717cb11
made some style changes
mernaAlghannam May 5, 2023
a414519
fix import in the solution page
chien-ying May 5, 2023
eac9964
Update ComponentDocs
chien-ying May 5, 2023
1ecb063
Update README.md
mernaAlghannam May 5, 2023
7105dd2
Update README.md
mernaAlghannam May 5, 2023
33da7eb
update comments for components
marsof02 May 4, 2023
e8deed5
Sync components style with main branch
chien-ying May 5, 2023
426dbbb
Revert "Sync components style with main branch"
chien-ying May 5, 2023
56a73f5
Sync components style with main branch
chien-ying May 5, 2023
4fab85a
Import/Export
GavinXZhang Dec 11, 2023
5dd1a83
Bookmark Interaction page
GavinXZhang Dec 20, 2023
89ecc9b
Merge pull request #43 from GavinXZhang/dev
GavinXZhang Dec 20, 2023
7f51249
Update to readme
GavinXZhang Dec 20, 2023
9dfc7e3
Merge pull request #44 from GavinXZhang/dev
GavinXZhang Dec 20, 2023
b85ae93
Create CODEOWNERS
mannyakosah Mar 4, 2024
9f4f154
Reconciling dev and main branch
jacob-stein1 Mar 6, 2024
f2143bc
Fix routing errors
jacob-stein1 Mar 6, 2024
ee75a73
Merge pull request #48 from BU-Spark/reconcile-dev
DarianC26 Mar 7, 2024
c8d7b3c
Migrate bookmark to old nav version
jacob-stein1 Mar 19, 2024
42af819
Fix bookmark id duplication
jacob-stein1 Mar 20, 2024
5c640b4
Fix bookmark page nav button styling
jacob-stein1 Mar 20, 2024
4d954fe
Fix bookmark page routing error
jacob-stein1 Mar 20, 2024
15c02d5
adding framework for getting typeform questions in communication flow
chrisharris02 Mar 21, 2024
6cfee1c
Saved Progress to Local Storage
marekpinto Mar 22, 2024
e713d3a
Update prevSelectedContent to also include current page so that curre…
marekpinto Mar 22, 2024
8e6bde8
Sort bookmarks by id rather than title
jacob-stein1 Mar 22, 2024
c700cf1
Fixed bug for saving current solution state to local storage.
marekpinto Mar 22, 2024
ffb9f6c
Begin URL encoding
jacob-stein1 Mar 22, 2024
93e803a
Complete URL encoding
jacob-stein1 Mar 24, 2024
a4b5efe
Merge branch 'bookmark-feature' into sp24-dev
jacob-stein1 Mar 24, 2024
c34e9ef
Remove duplicate bookmarks on reload
jacob-stein1 Mar 24, 2024
a9ac91c
Merge pull request #49 from BU-Spark/progress-save
marekpinto Mar 24, 2024
b6e1622
Adding dependencies for copy to clipboard and fixing bug where entire…
chrisharris02 Apr 2, 2024
d65a8f6
Adding save your resources title
chrisharris02 Apr 2, 2024
fd60bf5
Update bookmarks.tsx
chrisharris02 Apr 2, 2024
0162477
Merge pull request #50 from BU-Spark/Save-URL-UI
chrisharris02 Apr 2, 2024
5dfd32c
renaming image
chrisharris02 Apr 2, 2024
4ca81f1
updating footer to be relative to rest of the page and also updated l…
chrisharris02 Apr 2, 2024
b789f65
Merge pull request #51 from BU-Spark/footer-updates
chrisharris02 Apr 2, 2024
5aaeede
adding padding to header logo to mimic figma
chrisharris02 Apr 2, 2024
15b3cdf
Merge pull request #52 from BU-Spark/footer-updates
chrisharris02 Apr 2, 2024
6951485
adding favicon
chrisharris02 Apr 2, 2024
4c7278c
Update Nav.tsx
chrisharris02 Apr 2, 2024
8eafdb6
Merge pull request #53 from BU-Spark/home-button-nav-bar
chrisharris02 Apr 2, 2024
2b832ca
Merge branch 'creating-typeform-apis' into sp24-dev
chrisharris02 Apr 2, 2024
976f7ea
Merge pull request #54 from BU-Spark/sp24-dev
chrisharris02 Apr 2, 2024
234c864
updating types to conform to typeform api
chrisharris02 Apr 9, 2024
223bc25
adding logic interface
chrisharris02 Apr 9, 2024
7e7a0f5
removing redundany
chrisharris02 Apr 9, 2024
b252da1
Delete communication.tsx
chrisharris02 Apr 9, 2024
4510c8f
updating title component to remove previous question - not needed wit…
chrisharris02 Apr 9, 2024
cb879c5
Create communication.tsx
chrisharris02 Apr 9, 2024
4a9d311
fixing toggle
chrisharris02 Apr 9, 2024
2921c1e
Adding additional types for new typeform api
chrisharris02 Apr 9, 2024
31fa8b4
updating api to transform to IQuestionList interface
chrisharris02 Apr 9, 2024
bd4f5df
Refactoring to add new interfaces and have backend api generate quest…
chrisharris02 Apr 9, 2024
5557402
adding tooltip
chrisharris02 Apr 9, 2024
b544334
fixing background color
chrisharris02 Apr 9, 2024
5d9092f
Removing previous button logic
chrisharris02 Apr 9, 2024
43b3d6f
fixing youtube footer
chrisharris02 Apr 9, 2024
109f676
adding solution checking
chrisharris02 Apr 10, 2024
1339bec
adding solution interface and regular expressions to api endpoint to …
chrisharris02 Apr 10, 2024
3824dfc
Successfully parsing JSON array from typeform
chrisharris02 Apr 10, 2024
31a76b6
showing resources on solution page
chrisharris02 Apr 11, 2024
64239fa
Showing solutions
chrisharris02 Apr 11, 2024
2d81254
Now showing YouTube video if attachment exists.
chrisharris02 Apr 11, 2024
691cdaf
Fixing youtube styling
chrisharris02 Apr 11, 2024
aa71d75
removing unused component
chrisharris02 Apr 11, 2024
df563d6
Adding styling to resource buttons and adding save these resources
chrisharris02 Apr 11, 2024
2eb1a11
update
chrisharris02 Apr 11, 2024
bafdcbe
Update QuestionairePage.tsx
chrisharris02 Apr 11, 2024
39f740f
Create resource-link-gen.tsx
chrisharris02 Apr 11, 2024
142b9d2
Merge pull request #56 from BU-Spark/Resource-URL-Snippet-Generator-u…
chrisharris02 Apr 11, 2024
f8bc415
Create resource-link-gen.tsx
chrisharris02 Apr 11, 2024
67f338e
Update resource-link-gen.tsx
chrisharris02 Apr 11, 2024
f2c27e7
Update resource-link-gen.tsx
chrisharris02 Apr 11, 2024
85f4f4a
Initial fix to bookmarks
jacob-stein1 Apr 11, 2024
e38c895
Implement bookmark categorization
jacob-stein1 Apr 11, 2024
2796dfd
Fix URL encoding to work with Tyepform API
jacob-stein1 Apr 11, 2024
7bf2519
Add unsave button to resources on resource page
jacob-stein1 Apr 11, 2024
ebf77ec
Add nav for chevron on bookmark page
jacob-stein1 Apr 11, 2024
285f97b
Add context for selected bookmark
jacob-stein1 Apr 11, 2024
c7f3190
Merge branch 'creating-bookmark-nav-typeform' into creating-typeform-…
jacob-stein1 Apr 11, 2024
c7fea90
Communication page will update state if focused bookmark exists
chrisharris02 Apr 11, 2024
d16e2b2
Merge branch 'creating-typeform-apis' of github.com:BU-Spark/se-bch-a…
jacob-stein1 Apr 11, 2024
3ce3f96
Add routing fix for saved resources
jacob-stein1 Apr 11, 2024
2b6fd66
Add loader and patch bug on bookmark page
jacob-stein1 Apr 12, 2024
c162bcb
Initial Local Storage Attempt for the new code
marekpinto Apr 14, 2024
45b2020
Added code to validate whether local storage is in sync with typeform
marekpinto Apr 15, 2024
c2a8881
Debugged overwrite glitch on first load
marekpinto Apr 15, 2024
ffcd06e
Fixed Local Storage and maintained correct questionaire order after r…
marekpinto Apr 15, 2024
5945110
Saved bookmarks on reload
marekpinto Apr 15, 2024
be76590
Established priority of url encoding over local storage
marekpinto Apr 15, 2024
48c5301
Implemented Hamburger Menu
marekpinto Apr 15, 2024
87198ae
Removed unused code and formatted code
marekpinto Apr 15, 2024
24b98c2
Merge branch 'creating-typeform-apis' of https://github.com/BU-Spark/…
marekpinto Apr 15, 2024
4272271
resolving deployment errors
chrisharris02 Apr 16, 2024
f6f556c
Update bookmarks.tsx
chrisharris02 Apr 16, 2024
e2bf892
Merge pull request #57 from BU-Spark/creating-typeform-apis
chrisharris02 Apr 16, 2024
3574140
Reset questionnaire and display alert if typeform is changed by admin.
marekpinto Apr 20, 2024
480f8f7
Merge branch 'creating-typeform-apis' of https://github.com/BU-Spark/…
marekpinto Apr 20, 2024
6b3f3f9
Merge branch 'creating-typeform-apis' into sp24-dev
marekpinto Apr 20, 2024
4794965
Merge branch 'sp24-dev' of github.com:BU-Spark/se-bch-als-resource-ap…
jacob-stein1 Apr 23, 2024
12c5a83
Restructure Strapi documentation
jacob-stein1 Apr 23, 2024
3b618ab
Refactoring bookmark page
jacob-stein1 Apr 23, 2024
8dab215
Commit changed bookmark page
jacob-stein1 Apr 23, 2024
b2640c2
Begin refactoring resource gen page
jacob-stein1 Apr 23, 2024
637276a
Fixing styles on resource link generation page
jacob-stein1 Apr 23, 2024
bc706b0
Reformat questionnaire page
jacob-stein1 Apr 23, 2024
f8ad82b
Refactor solution content
jacob-stein1 Apr 23, 2024
b50f880
Refactor communication page styling
jacob-stein1 Apr 23, 2024
21aa3b0
Refactor bookmark button component
jacob-stein1 Apr 23, 2024
2c3f744
Refactor CopyUrl component
jacob-stein1 Apr 23, 2024
8ca6417
Refactor footer component
jacob-stein1 Apr 23, 2024
dd7c634
Refactor Nav menu into component
jacob-stein1 Apr 24, 2024
8583353
Refactor ResourcesHandouts component
jacob-stein1 Apr 24, 2024
dc8101b
Refactor SolutionPage component
jacob-stein1 Apr 24, 2024
99a590e
Refactor style component
jacob-stein1 Apr 24, 2024
c60ccc2
Restructure some documentation
jacob-stein1 Apr 24, 2024
b8f866f
Remove node modules
jacob-stein1 Apr 24, 2024
2e22586
Adjust bug with copy url css
jacob-stein1 Apr 24, 2024
8d14156
Merge pull request #58 from BU-Spark/refactoring-code
marekpinto Apr 24, 2024
272fe73
Update components docs
jacob-stein1 Apr 24, 2024
d4909d2
Add context documentation
jacob-stein1 Apr 24, 2024
7aad415
Update code README
jacob-stein1 Apr 24, 2024
b7ef358
Updaye page and utils documentation
jacob-stein1 Apr 30, 2024
327b842
Update final README
jacob-stein1 May 2, 2024
e23b6e8
Merge pull request #59 from BU-Spark/refactoring-code
jacob-stein1 May 3, 2024
fb03a91
Merge branch 'sp24-dev' of github.com:BU-Spark/se-bch-als-resource-ap…
jacob-stein1 May 3, 2024
1e2659f
Testing for bookmark.tsx
jacob-stein1 May 3, 2024
8877362
Add testing to bookmark context
jacob-stein1 May 3, 2024
7a59ef2
Add focused bookmark tests
jacob-stein1 May 4, 2024
288ae15
Add tests for questionnaire page
jacob-stein1 May 4, 2024
489bb5b
Delete old tests
jacob-stein1 May 4, 2024
453b808
Fix build errors on context tests
jacob-stein1 May 4, 2024
9bb970f
Fix id test case
jacob-stein1 May 4, 2024
0695650
Remove cluttering prints
jacob-stein1 May 4, 2024
f75c4f7
Add note on testing
jacob-stein1 May 4, 2024
2648cbb
commenting old railway endpoint because not in use
chrisharris02 May 6, 2024
2d7f6ee
Making retrieve questions api more composable by moving functions int…
chrisharris02 May 6, 2024
4655600
exporting modules so import doesnt fail in retrieveQuestions
chrisharris02 May 6, 2024
ce83910
adding apiUtils test
chrisharris02 May 6, 2024
4c4a594
adding package-lock to gitignore
chrisharris02 May 6, 2024
9dfd2e6
Adding apiUtils
chrisharris02 May 6, 2024
70f320a
adding jest test yml
chrisharris02 May 6, 2024
2f0a573
Update run_jest_tests.yml
chrisharris02 May 6, 2024
526f71e
Merge branch 'Chris-Testing-and-Final-Clean-up' of https://github.com…
chrisharris02 May 6, 2024
32a252e
Fixing react-hooks build error
chrisharris02 May 6, 2024
b7ab717
updating package.json
chrisharris02 May 6, 2024
f85251c
updating next config and package.json to ignore .test.js or .test.tsx…
chrisharris02 May 6, 2024
aef5385
Moving pages test
chrisharris02 May 6, 2024
9e267e4
Update README.md
chrisharris02 May 6, 2024
6144382
Update README.md
chrisharris02 May 6, 2024
3bf668c
Merge pull request #60 from BU-Spark/Chris-Testing-and-Final-Clean-up
marekpinto May 6, 2024
32a59f9
Update run_jest_tests.yml
chrisharris02 May 6, 2024
54593fa
testing cloudflare removal
chrisharris02 May 6, 2024
9591de6
Delete unusued files on dev branch
jacob-stein1 May 6, 2024
2f74fe2
Merge in sp24-dev
jacob-stein1 May 6, 2024
a0789ee
Final changes
jacob-stein1 May 6, 2024
8c99eff
Merge branch 'sp24-dev' of github.com:BU-Spark/se-bch-als-resource-ap…
jacob-stein1 May 6, 2024
52b5095
Merge in again
jacob-stein1 May 6, 2024
7122bf1
Adding typeform sentence.
chrisharris02 May 6, 2024
d290db1
Add Test Code
marekpinto May 7, 2024
da8aef9
Merge branch 'sp24-dev' of https://github.com/BU-Spark/se-bch-als-res…
marekpinto May 7, 2024
bceacbf
Merge pull request #68 from BU-Spark/sp24-dev
DarianC26 May 7, 2024
de985c5
Moving tests outside of pages directory
chrisharris02 May 7, 2024
baa58d8
Merge pull request #69 from BU-Spark/revert-dev-jacob
DarianC26 May 7, 2024
c73d8ce
Fixing jtest import
chrisharris02 May 7, 2024
fa9edef
Merge pull request #70 from BU-Spark/revert-dev-jacob
DarianC26 May 7, 2024
1266d06
Update README.md
jacob-stein1 May 7, 2024
9a8ec0d
Merge pull request #72 from BU-Spark/jacob-stein1-patch-1
DarianC26 May 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @DarianC26
51 changes: 0 additions & 51 deletions .github/workflows/add_collaborators.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/run_jest_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Run Jest Tests


on:
push:
branches:
- main
- dev
- sp24-dev

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install dependencies
run: npm install
working-directory: ./code

- name: Run tests
run: npm test
working-directory: ./code
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,6 @@ $RECYCLE.BIN/

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

/node_modules
code/package-lock.json
34 changes: 0 additions & 34 deletions 403, 404, 405 issues.md

This file was deleted.

10 changes: 0 additions & 10 deletions Nexjs-Tests/QuestionaireBodyContent.test.tsx

This file was deleted.

26 changes: 0 additions & 26 deletions Nexjs-Tests/QuestionairePage.test.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions Nexjs-Tests/SolutionPages.test.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions Nexjs-Tests/TestDocs.md

This file was deleted.

13 changes: 0 additions & 13 deletions Nexjs-Tests/index.test.tsx

This file was deleted.

Loading
Loading