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

login redirect #234

Merged
merged 4 commits into from
Sep 8, 2023
Merged

login redirect #234

merged 4 commits into from
Sep 8, 2023

Conversation

Exilliar
Copy link
Collaborator

Changed the login so that if you're going to a specific page (eg /assessment) you will be redirected to the login page, then once you've logged in you'll be redirected back to where you were trying to go. The idea was to be similar to how a lot of other sites work.

Also involved making a small update to stream reports page as if someone goes to, for example /b13799ec6e (a stream on the xyz server), but then sign into the Arup server, they'll be redirected to /b13799ec6e and get an error as the stream won't be able to be found. Changed the error message on that page to include a message saying "Stream not found, make sure you are signed into the correct server" and a link back to the dashboard.

Also made sure that this hasn't broken any of the report sharing links.

To test:

  1. Log out
  2. Go to some route like /assessment or /465e7157fe
  3. Sign in
  4. (Hopefully) be redirected

@Exilliar Exilliar requested a review from ro-sa August 31, 2023 16:51
Copy link
Collaborator

@ro-sa ro-sa left a comment

Choose a reason for hiding this comment

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

great job. just one small comment

<loading-container :error="error" :loading="loading" @retry="loadStreams">
<loading-container
:error="error"
errorMessage="Stream not found, make sure you are signed into the correct server"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Stream not found. Please make sure you are signed into the correct server.

@ro-sa ro-sa self-requested a review September 8, 2023 09:43
@Exilliar Exilliar merged commit eb117af into dev Sep 8, 2023
3 checks passed
@Exilliar Exilliar deleted the rw/dev/login-redirect branch September 8, 2023 09:45
Exilliar added a commit that referenced this pull request Oct 3, 2023
* fixed issue with material total values (#219)

* fixed issue with material total values

* updated version number

* decimals removed from materials breakdown chart

* delete report issue (#221)

* fixed delete, made it display speckle error message when the issue is out of our control

* updated vesrion #

* Rw/bug/model saving (#223)

* fixed issue with material total values

* mostly fixed, just something weird going on with uploading the objects

* some more testing

* fixed issue with models not saving properly

* updated version # and message

* clean up

* messed around with how much we send to speckle at one time so that we don't break the arup speckle server

* updated viewer version (#227)

* Rw/feat/material selection (#226)

* made most of the UI

* started to work on small-ish refactor

* very basic material selection working

* transport step working (hopefully)

* report review working (I think)

* fixed issues with carbon calc

* uploading works, updating almost works

* updating a report is now working

* custom material grouping working

* grouping by diff params working

* deleted commented out code and funcs that are no longer needed

* removed useless variables

* removed console.logs and some imports that are no longer used

* buildups work, updated models with buildups works

* cleanup

* removed some stuff that is no longer needed

* fixed bug

* updated version update messages

* chips on expandmaterialtype now filter objects in renderer

* fixed issue with large models running out of memory

* Rw/dev/parameter selection 2 (#229)

* added in 'undefined' option to filters that need it

* updated version # and dialog

* Assessment page no streams (#231)

* fixed issue

* updated for pr comments

* report sharing (#233)

* added dialog to get share link

* user given option to change server if they're on the wrong one for the report they're trying to view, user redirected to login if they're not signed in and then sent back to report once signed in

* removed console logs

* couple small last changes. Also fixed the 'no streams' page flashing up on the assessment page

* updated version #

* moved share button on report view page

* login redirect (#234)

* updated loading-container to take additional messages, updated login to redirect users back to where they wanted to go after logging in

* small change to button on assessment view button

* updated version number

* addressed comment
ro-sa added a commit that referenced this pull request Nov 14, 2023
* fixed issue with material total values (#219)

* fixed issue with material total values

* updated version number

* decimals removed from materials breakdown chart

* delete report issue (#221)

* fixed delete, made it display speckle error message when the issue is out of our control

* updated vesrion #

* Rw/bug/model saving (#223)

* fixed issue with material total values

* mostly fixed, just something weird going on with uploading the objects

* some more testing

* fixed issue with models not saving properly

* updated version # and message

* clean up

* messed around with how much we send to speckle at one time so that we don't break the arup speckle server

* updated viewer version (#227)

* Rw/feat/material selection (#226)

* made most of the UI

* started to work on small-ish refactor

* very basic material selection working

* transport step working (hopefully)

* report review working (I think)

* fixed issues with carbon calc

* uploading works, updating almost works

* updating a report is now working

* custom material grouping working

* grouping by diff params working

* deleted commented out code and funcs that are no longer needed

* removed useless variables

* removed console.logs and some imports that are no longer used

* buildups work, updated models with buildups works

* cleanup

* removed some stuff that is no longer needed

* fixed bug

* updated version update messages

* chips on expandmaterialtype now filter objects in renderer

* fixed issue with large models running out of memory

* Rw/dev/parameter selection 2 (#229)

* added in 'undefined' option to filters that need it

* updated version # and dialog

* Assessment page no streams (#231)

* fixed issue

* updated for pr comments

* report sharing (#233)

* added dialog to get share link

* user given option to change server if they're on the wrong one for the report they're trying to view, user redirected to login if they're not signed in and then sent back to report once signed in

* removed console logs

* couple small last changes. Also fixed the 'no streams' page flashing up on the assessment page

* updated version #

* moved share button on report view page

* login redirect (#234)

* updated loading-container to take additional messages, updated login to redirect users back to where they wanted to go after logging in

* small change to button on assessment view button

* updated version number

* addressed comment

* Move back button (#236)

* correct spelling error

* change back button location

* update package json

---------

Co-authored-by: Rory Webber <43271984+Exilliar@users.noreply.github.com>
Co-authored-by: Exilliar <rorywebber1000@gmail.com>
Co-authored-by: Exilliar <rory.webber@arup.com>
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.

None yet

2 participants