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

[Angular - NgRx - SCSS] 440: state & service refactor #527

Merged
merged 17 commits into from
Nov 3, 2022

Conversation

lindakatcodes
Copy link
Contributor

Resolves #440

@lindakatcodes lindakatcodes self-assigned this Aug 20, 2022
@aws-amplify-us-east-1
Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-527.d1190gmno2hljg.amplifyapp.com

@aws-amplify-us-east-1
Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-527.d3sqkonra6x7y9.amplifyapp.com

@lindakatcodes lindakatcodes force-pushed the 440/state-service-refactor branch 2 times, most recently from c4642e8 to e2412bf Compare September 2, 2022 19:17
@aws-amplify-us-east-1
Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-527.dbm2zhgk5abrj.amplifyapp.com

@lindakatcodes
Copy link
Contributor Author

This part of the refactor is focused on:

  • adjusting services to return the full data from the API
  • adjusting state files to shape the data into what we expect to get back
  • initial setup of the new dashboard state files
  • any small changes needed to ensure the app still works and functions exactly how it should after the cleanup changes

This does still need to be rebased, but will have to hold for awhile since the files that are conflicting will need some thorough review to match the point of this refactor.

angular-ngrx-scss/src/app/app.module.ts Outdated Show resolved Hide resolved
angular-ngrx-scss/src/app/app.module.ts Outdated Show resolved Hide resolved
angular-ngrx-scss/src/app/home/home.component.ts Outdated Show resolved Hide resolved
angular-ngrx-scss/src/app/state/auth/auth.effects.ts Outdated Show resolved Hide resolved
@lindakatcodes
Copy link
Contributor Author

This has now been rebased and is as updated as I can get it - the site still works as expected.

There is still work to do with the repository services - some things got duplicated and it's a bit too messy even with this refactor to completely unify everything, so there's a bit of overlap between some of the service calls. I unified them as best as I could, but future work would be helpful here.

Also I got most of the test files adjusted, but I've still got 4 failing tests:

  • UserEffects: the user gists test doesn't equal what it should
  • UserEffects: get user info from API has an undefined error, I'm guessing from setting up the mock store but no mock data so this could (hopefully) be easily fixed
  • RepositoryService: info on provided repository doesn't equal what it should
  • UserService: user data from API doesn't equal what it should

The 3 tests that don't seem to match visually look like they do, so perhaps it's something minor somewhere that's mixed up. Needs a bit more checking to be sure.

@lindakatcodes lindakatcodes marked this pull request as ready for review October 15, 2022 00:37
Copy link
Contributor

@ktrz ktrz left a comment

Choose a reason for hiding this comment

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

Looks great! Just a couple of housekeeping comments to make sure we have everything that we've discussed captured in tickets

Copy link
Contributor

@ktrz ktrz left a comment

Choose a reason for hiding this comment

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

🚢 🚢 🚢

@lindakatcodes lindakatcodes merged commit dc70a37 into main Nov 3, 2022
@lindakatcodes lindakatcodes deleted the 440/state-service-refactor branch November 3, 2022 22:06
hdJerry pushed a commit that referenced this pull request Nov 16, 2022
* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>
hdJerry added a commit that referenced this pull request Nov 17, 2022
* chore(solidjs): remove example components

* feat(solidjs): add signin page

* refactor(solidjs): improve auth setup

* feat(solidjs): pencil in auth flow

* feat(solidjs): add example github communication

* [Angular - NgRx - SCSS] 440: state & service refactor (#527)

* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>

* feat(solidjs) - Create navigation header (#840)

* fix(angular-apollo-tailwind): append protocol if missing from user url (#637)

* fix(angular-apollo-tailwind): append protocol if missing from user url

Refs: #591

* test(angular-apollo-tailwind): update with testcases

Closes: #591

* chore: repo card with story and test (#737)

* chore: repo card with story and test

* fix comments

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: gist panel UI (#741)

* chore: gist panel UI

* fix coment

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore(solidjs): remove example components

* fixed comments, clean ups

Co-authored-by: Linda Thompson <lindakt16@gmail.com>
Co-authored-by: LindaT <linda@thisdot.co>
Co-authored-by: Daian Scuarissi <scuarissid@gmail.com>
Co-authored-by: Oluwakorede Cole <asincole@gmail.com>
Co-authored-by: Jerry Hogan <jerry.hogan@thisdot.co>
Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>
hdJerry pushed a commit that referenced this pull request Nov 17, 2022
* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>
hdJerry added a commit that referenced this pull request Nov 17, 2022
* chore(solidjs): remove example components

* feat(solidjs): add signin page

* refactor(solidjs): improve auth setup

* feat(solidjs): pencil in auth flow

* feat(solidjs): add example github communication

* [Angular - NgRx - SCSS] 440: state & service refactor (#527)

* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>

* feat(solidjs) - Create navigation header (#840)

* fix(angular-apollo-tailwind): append protocol if missing from user url (#637)

* fix(angular-apollo-tailwind): append protocol if missing from user url

Refs: #591

* test(angular-apollo-tailwind): update with testcases

Closes: #591

* chore: repo card with story and test (#737)

* chore: repo card with story and test

* fix comments

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: gist panel UI (#741)

* chore: gist panel UI

* fix coment

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore(solidjs): remove example components

* fixed comments, clean ups

Co-authored-by: Linda Thompson <lindakt16@gmail.com>
Co-authored-by: LindaT <linda@thisdot.co>
Co-authored-by: Daian Scuarissi <scuarissid@gmail.com>
Co-authored-by: Oluwakorede Cole <asincole@gmail.com>
Co-authored-by: Jerry Hogan <jerry.hogan@thisdot.co>
Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>
hdJerry pushed a commit that referenced this pull request Nov 17, 2022
* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>
hdJerry added a commit that referenced this pull request Nov 17, 2022
* chore(solidjs): remove example components

* feat(solidjs): add signin page

* refactor(solidjs): improve auth setup

* feat(solidjs): pencil in auth flow

* feat(solidjs): add example github communication

* [Angular - NgRx - SCSS] 440: state & service refactor (#527)

* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>

* feat(solidjs) - Create navigation header (#840)

* fix(angular-apollo-tailwind): append protocol if missing from user url (#637)

* fix(angular-apollo-tailwind): append protocol if missing from user url

Refs: #591

* test(angular-apollo-tailwind): update with testcases

Closes: #591

* chore: repo card with story and test (#737)

* chore: repo card with story and test

* fix comments

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: gist panel UI (#741)

* chore: gist panel UI

* fix coment

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore(solidjs): remove example components

* fixed comments, clean ups

Co-authored-by: Linda Thompson <lindakt16@gmail.com>
Co-authored-by: LindaT <linda@thisdot.co>
Co-authored-by: Daian Scuarissi <scuarissid@gmail.com>
Co-authored-by: Oluwakorede Cole <asincole@gmail.com>
Co-authored-by: Jerry Hogan <jerry.hogan@thisdot.co>
Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>
hdJerry added a commit that referenced this pull request Nov 17, 2022
* in progress

* chore: get all repos api

* [Angular - NgRx - SCSS] 440: state & service refactor (#527)

* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>

* feat(solidjs) - Create navigation header (#840)

* fix(angular-apollo-tailwind): append protocol if missing from user url (#637)

* fix(angular-apollo-tailwind): append protocol if missing from user url

Refs: #591

* test(angular-apollo-tailwind): update with testcases

Closes: #591

* chore: repo card with story and test (#737)

* chore: repo card with story and test

* fix comments

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: gist panel UI (#741)

* chore: gist panel UI

* fix coment

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* [solidjs-pod] : Create component for search input and filter sort buttons (#831)

* in progress

* in progress

* in progress, paused for now

* chore: search filter sort component

* fixed comments on icons

* [solidjs-tailwinf] Add user profile card (#830)

* [SolidJS-Tailwind] Implement authentication (#734)

* chore(solidjs): remove example components

* feat(solidjs): add signin page

* refactor(solidjs): improve auth setup

* feat(solidjs): pencil in auth flow

* feat(solidjs): add example github communication

* [Angular - NgRx - SCSS] 440: state & service refactor (#527)

* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>

* feat(solidjs) - Create navigation header (#840)

* fix(angular-apollo-tailwind): append protocol if missing from user url (#637)

* fix(angular-apollo-tailwind): append protocol if missing from user url

Refs: #591

* test(angular-apollo-tailwind): update with testcases

Closes: #591

* chore: repo card with story and test (#737)

* chore: repo card with story and test

* fix comments

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: gist panel UI (#741)

* chore: gist panel UI

* fix coment

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore(solidjs): remove example components

* fixed comments, clean ups

Co-authored-by: Linda Thompson <lindakt16@gmail.com>
Co-authored-by: LindaT <linda@thisdot.co>
Co-authored-by: Daian Scuarissi <scuarissid@gmail.com>
Co-authored-by: Oluwakorede Cole <asincole@gmail.com>
Co-authored-by: Jerry Hogan <jerry.hogan@thisdot.co>
Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: updated amplify.yml file (#729)

* chore: updated amplify.yml file

* changed pnpm to npm

* chore: workflow added (#745)

* chore: workflow added

* CI setup fixes and testing

* CI setup fixes and testing

* CI setup fixes and testing

* tried everything but doesn't work, i think we have to merge this

* auth token added to header

* ..updates

* ..updates

* auth token added to header

* fix file issues

* CI adjustments

* CI adjustments

Co-authored-by: Linda Thompson <lindakt16@gmail.com>
Co-authored-by: LindaT <linda@thisdot.co>
Co-authored-by: Daian Scuarissi <scuarissid@gmail.com>
Co-authored-by: Oluwakorede Cole <asincole@gmail.com>
Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>
Co-authored-by: Maarten Bicknese <maarten.bicknese@thisdot.co>
hdJerry added a commit that referenced this pull request Nov 18, 2022
* chore: get gists api

* updated gists api function

* [Angular - NgRx - SCSS] 440: state & service refactor (#527)

* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>

* feat(solidjs) - Create navigation header (#840)

* fix(angular-apollo-tailwind): append protocol if missing from user url (#637)

* fix(angular-apollo-tailwind): append protocol if missing from user url

Refs: #591

* test(angular-apollo-tailwind): update with testcases

Closes: #591

* chore: repo card with story and test (#737)

* chore: repo card with story and test

* fix comments

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: gist panel UI (#741)

* chore: gist panel UI

* fix coment

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* [solidjs-pod] : Create component for search input and filter sort buttons (#831)

* in progress

* in progress

* in progress, paused for now

* chore: search filter sort component

* fixed comments on icons

* [solidjs-tailwinf] Add user profile card (#830)

* [SolidJS-Tailwind] Implement authentication (#734)

* chore(solidjs): remove example components

* feat(solidjs): add signin page

* refactor(solidjs): improve auth setup

* feat(solidjs): pencil in auth flow

* feat(solidjs): add example github communication

* [Angular - NgRx - SCSS] 440: state & service refactor (#527)

* setup: get branch caught up and ready for work

* feat: refactored repository service and test

* feat: refactor of user service and test

* feat: updated user service spec

* feat: created dashboard store files; updated global state files; renamed RepoState and updated all calls

* attempt to fix issues with service updates; some refactoring and adjusting so app compiles

* feat: added auth user data to auth state; updated nav component to use auth state

* feat: adjusted auth call; fixed user call so home page loads

* moved some user logic; still having reload issues and repo view issues

* feat: got app working again! cleaned out console logs

* rebased and fixed most files

* fix broken tests

* removed unused code

* fix: fix pr comments and most tests

* fix: fixed final broken unit test

* fix: updated test; removed unused code in user effect; new user mapping file

* add todo for refactor improvements; update authUser effect to use different rxjs operation

Co-authored-by: LindaT <linda@thisdot.co>

* feat(solidjs) - Create navigation header (#840)

* fix(angular-apollo-tailwind): append protocol if missing from user url (#637)

* fix(angular-apollo-tailwind): append protocol if missing from user url

Refs: #591

* test(angular-apollo-tailwind): update with testcases

Closes: #591

* chore: repo card with story and test (#737)

* chore: repo card with story and test

* fix comments

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: gist panel UI (#741)

* chore: gist panel UI

* fix coment

* fix coment

Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore(solidjs): remove example components

* fixed comments, clean ups

Co-authored-by: Linda Thompson <lindakt16@gmail.com>
Co-authored-by: LindaT <linda@thisdot.co>
Co-authored-by: Daian Scuarissi <scuarissid@gmail.com>
Co-authored-by: Oluwakorede Cole <asincole@gmail.com>
Co-authored-by: Jerry Hogan <jerry.hogan@thisdot.co>
Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>

* chore: updated amplify.yml file (#729)

* chore: updated amplify.yml file

* changed pnpm to npm

* chore: workflow added (#745)

* chore: workflow added

* CI setup fixes and testing

* CI setup fixes and testing

* CI setup fixes and testing

* tried everything but doesn't work, i think we have to merge this

* ..updates

* ..updates

* ..updates

* added auth token

* added auth token

Co-authored-by: Linda Thompson <lindakt16@gmail.com>
Co-authored-by: LindaT <linda@thisdot.co>
Co-authored-by: Daian Scuarissi <scuarissid@gmail.com>
Co-authored-by: Oluwakorede Cole <asincole@gmail.com>
Co-authored-by: Victor Chukwuebuka Umeh <41862157+vyktoremario@users.noreply.github.com>
Co-authored-by: Maarten Bicknese <maarten.bicknese@thisdot.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Angular - NgRx - SCSS] Refactor of Services, Prep for state restructuring
3 participants