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.

Sign up for GitHub

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

Jump to bottom

Merge Develop into Main #93

Merged
merged 107 commits into from
Apr 3, 2024
Merged

Merge Develop into Main #93

merged 107 commits into from
Apr 3, 2024

Conversation

LauraJStevenson
Copy link
Owner

Merging Develop into main for our Prod environment

micamash and others added 30 commits February 3, 2024 15:55
@micamash
implemented header component test
9fa39f0
@micamash
implement credits view test
55cc2dc
@micamash
implement home view test
33ec762
@micamash
implemented changes to auth store and components using auth store to …
ae7bc8d 
…make changes in router use in store for accurate testing
@micamash
implement home view tests and added JSDoc to home view and credits vi…
16107b8 
…ew test files
@micamash
add more tests to credit view test and updated contributions on indiv…
769a900 
…idual card from ul to p
@micamash
implemented global nav test
39e5f5d
@micamash
implemented script settings component test with some changes to scrip…
66d968c 
…t and user ts objects to include scripts
@micamash
work on settings view test, moved validation logic to validation service
72cd677
@micamash
moved update logic to userService
22e8c4d
@micamash
work on interceptor in axios config
39ea1db
@micamash
implemented axios interceptor for token refresh
e3c27cd
@LauraJStevenson
Merge pull request #73 from LauraJStevenson/feature/token-refresh
aa4e082 
Feature/token refresh
@micamash
corrected mocks and ensured no type errors and correct mocking
8d72d15
@micamash
implemented behind the scenes view tests
c0b53b9
@micamash
update tests for behindthescenesview and gamelobby view
ca911c6
@micamash
implemented basic GamePlayView test
21dab09
@micamash
implemented how to play view tests
e284258
@micamash
implemented test for scripteditor view
094cb14
@micamash
implemented login view tests
7ac6598
@micamash
implemented registration view tests
7436a5e
@micamash
format corrections, added comments, corrected type errors
35ed2bb
@micamash
resolved merge conflicts
9139ccd
@micamash
removed file that was not needed
ed83143
@micamash
update message span styling and logic
aff2e06
@micamash
add rename field functionality
5028fd3
@micamash
added message for successful script deletion
5f97617
@micamash
updates to script settings
288f4f3
@yagmurmuslu
Synced frontend exception handling with recent improvments in the bac…
adfa018 
…kend
@micamash
Merge pull request #75 from LauraJStevenson/feature/exceptionHandling
1783ddf 
Synced frontend exception handling with recent improvements in the bac…
micamash and others added 25 commits March 13, 2024 18:47
@micamash
pull from develop
52a7b56
@micamash
styling
c1b3261
@micamash
styling
f3eb1af
@micamash
styling
7196a0d
@micamash
finished styling and updates packages
b28f2b7
@micamash
Update comments
b4b44e2
@micamash
add functions to script editor
a306a24
@micamash
pull from feature game play view
8102867
@micamash
logic to ensure raw data is saved properly with new lines to database
8ccac6b
@LauraJStevenson
Merge pull request #87 from LauraJStevenson/feature/game-play-view
f4d1589 
Feature/game play view
@micamash
added margin on button
9ff6d39
@micamash
commented out functions that need to be built to avoid errors in rend…
ba169a4 
…er for now
@micamash
pull from develop
b385b04
@micamash
resolved console issues with formatting and added margin to buttons
6cf944f
@micamash
modified styling on text areas and input boxes
cb5ee8e
@micamash
fixed background for rename button on settings page
b4e0d9b
@LauraJStevenson
Merge pull request #88 from LauraJStevenson/feature/script-editor
fc8c692 
Feature/script editor
@micamash
added cases for input boxes for new maps
9132095
@sbutterfield5
changes to credit pages, img files and behind the scenes
3c9bdd3
@LauraJStevenson
Merge pull request #89 from LauraJStevenson/update/credits-page
c8f8930 
Update/credits page
@LauraJStevenson
Merge pull request #90 from LauraJStevenson/hotfix/new-maze-inputs
f0fbc5a 
added cases for input boxes for new maps
@LauraJStevenson
Styled gameLobbyView to reduce number of cards and streamline game ch…
f17f013 
…oice
@LauraJStevenson
Merge pull request #91 from LauraJStevenson/feature/styling-game-lobby
5f3ca5b 
Styled gameLobbyView to reduce number of cards and streamline game ch…
@LauraJStevenson
addressed images not loading when deployed to render
e506421
@LauraJStevenson
Merge pull request #92 from LauraJStevenson/feature/styling-game-lobby
fd84601 
addressed images not loading when deployed to render
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 3, 2024

Coverage Report

Status Category Percentage Covered / Total
🔵 Lines 74.91% 2771 / 3699
🔵 Statements 74.91% 2771 / 3699
🔵 Functions 25.26% 24 / 95
🔵 Branches 82.53% 137 / 166
File Coverage
File Stmts % Branch % Funcs % Lines Uncovered Lines
Changed Files
src/App.vue 0% 0% 0% 0% 1-66
src/components/GlobalNav.vue 96.98% 92.1% 42.85% 96.98% 113-114, 119-120, 127-128, 131-132, 142
src/components/HeaderComponent.vue 100% 100% 100% 100%
src/components/ScriptSettingsComponent.vue 62.58% 42.85% 0% 62.58% 18-20, 54-71, 75-92, 97-102, 107-120, 124-167, 175-176, 181-188
src/config/axios.ts 0% 0% 0% 0% 1-105
src/services/authService.ts 61.9% 100% 50% 61.9% 8-15, 18-25
src/services/scriptService.ts 15.53% 100% 0% 15.53% 6-22, 25-41, 44-60, 63-81, 84-100
src/services/userService.ts 28.98% 100% 0% 28.98% 5-6, 9-28, 32-50, 53-54, 57-58, 61-62, 65-66
src/services/validationService.ts 45.71% 100% 0% 45.71% 5-13, 18-22, 27-31
src/stores/auth.ts 61.6% 80% 37.5% 61.6% 25-39, 42-58, 70-71, 85-87, 90-92, 95-97
src/stores/gameStore.ts 63.41% 100% 0% 63.41% 6-8, 12-19, 25-33, 35-39, 41-45
src/stores/scriptStore.ts 52.83% 75% 37.5% 52.83% 20-21, 24-30, 32-39, 41-48
src/views/BehindTheScenesView.vue 100% 100% 0% 100%
src/views/CreditsView.vue 100% 100% 0% 100%
src/views/GameLobbyView.vue 97.72% 87.5% 100% 97.72% 45-46
src/views/GamePlayView.vue 78.49% 50% 0% 78.49% 3-40, 67-70, 76-77, 80-81, 95-104, 108-124, 131-132, 144-145
src/views/HomeView.vue 100% 100% 66.66% 100%
src/views/LoginView.vue 75.84% 72.22% 80% 75.84% 26, 55-72, 77-94, 99-116, 122-123, 129-130, 137-138, 153-155
src/views/RegistrationView.vue 71.87% 95.23% 37.5% 71.87% 11, 21, 31, 110-169
src/views/ScriptEditorView.vue 77.58% 100% 0% 77.58% 72-110
src/views/SettingsView.vue 78.69% 66.66% 10% 78.69% 33, 40, 79, 90, 144-161, 165-182, 200-214, 220-222, 234-236, 243-261, 267-285, 291-309, 322-324
Generated in workflow #17

micamash
micamash approved these changes Apr 3, 2024
View reviewed changes
Copy link
Collaborator

@micamash micamash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

@micamash micamash merged commit b526a9b into main Apr 3, 2024
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@micamash micamash micamash approved these changes

@Viv-Valentin Viv-Valentin Awaiting requested review from Viv-Valentin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@LauraJStevenson @micamash @yagmurmuslu @Viv-Valentin @sbutterfield5