multiverseweb / Dataverse

This software is currently under development. It can be used to visualise data into various forms of plots ranging from primary to advanced level. It can also be used as a finance tracker.
https://multiverse-dataverse.netlify.app
MIT License
39 stars 109 forks source link

successfully redesigned login and signup pages according to website's theme #237

Closed MimanshaKaur closed 3 weeks ago

MimanshaKaur commented 4 weeks ago

Description

as earlier issue was:

therefore, to resolve this, i have :

Checklist

netlify[bot] commented 4 weeks ago

Deploy Preview for multiverse-dataverse ready!

Name Link
Latest commit c127bb81ae06aa62fcc05672b17d8f354cd1b38c
Latest deploy log https://app.netlify.com/sites/multiverse-dataverse/deploys/671f3e871c95150008476395
Deploy Preview https://deploy-preview-237--multiverse-dataverse.netlify.app
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

MimanshaKaur commented 4 weeks ago

@multiverseweb doneπŸ‘πŸ‘

jency1 commented 4 weeks ago

@MimanshaKaur Mention the issue number which you have solved and resolve all conflicts.

multiverseweb commented 3 weeks ago

Hello @MimanshaKaur, I couldn't see the same background in this PR as you showed here. Did you remove that on-purpose?

That was looking awesome, can you add it?

MimanshaKaur commented 3 weeks ago

@MimanshaKaur Mention the issue number which you have solved and resolve all conflicts. That was issue #164

MimanshaKaur commented 3 weeks ago

Hello @MimanshaKaur, I couldn't see the same background in this PR as you showed here. Did you remove that on-purpose?

That was looking awesome, can you add it?

@multiverseweb no i didn't removed it ...now check i have made some changes

jency1 commented 3 weeks ago

@MimanshaKaur Resolve all conflicts.

multiverseweb commented 3 weeks ago

@MimanshaKaur I'm having trouble merging this PR, I tried merging it and then fixing the minute problems myself but its not allowing me to merge due to conflicts: image

I found out why the images are not visible here: Screenshot 2024-10-28 072125

You have used the local paths of images instead of relative paths. Solve it by using website/web_images/2dglow.png instead of C:/Users/Mimansha/OneDrive/Documents/GitHub/Dataverse/website/web_images/2dglow.png. Do the same for the other image.

MimanshaKaur commented 3 weeks ago

ok @multiverseweb

MimanshaKaur commented 3 weeks ago

@multiverseweb now see.. done with changes...i have now used the relative path address for both the pages

jency1 commented 3 weeks ago

@multiverseweb now see.. done with changes...i have now used the relative path address for both the pages

@MimanshaKaur LGTM! Resolve all conflicts to get the PR merged.

MimanshaKaur commented 3 weeks ago

Screenshot 2024-10-28 232429

@jency1 @multiverseweb i am trying but i an not able to resolve these conflicts...i also tried finding the issue on my local device but still i am unable to find anything...so sorry for this...please you people suggest me what should i do????

should i create a new PR or anything else...what should i do!??

multiverseweb commented 3 weeks ago

@MimanshaKaur yeah go ahead, create a new PR.

jency1 commented 3 weeks ago

@MimanshaKaur You must pull all the changes, then push your changes. So that if any conflicting lines of code are there, you can see it and resolve it.

MimanshaKaur commented 3 weeks ago

gonna create new PRπŸ‘

MimanshaKaur commented 3 weeks ago

265 ..created new PR for this,,please check