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

org_text adjustments #921

Merged
merged 8 commits into from
Jul 27, 2024
Merged

org_text adjustments #921

merged 8 commits into from
Jul 27, 2024

Conversation

to-sta
Copy link
Collaborator

@to-sta to-sta commented Jul 1, 2024

Contributor checklist


Description

I adjusted the org API to create the OrganizationText for POST requests.

ToDo:

  • Toast needs to be added on the frontend, for bad requests.

Related issue

Copy link
Contributor

github-actions bot commented Jul 1, 2024

Thank you for the pull request!

The activist team will do our best to address your contribution as soon as we can. The following is a checklist for maintainers to make sure this process goes as well as possible. Feel free to address the points below yourself in further commits if you realize that actions are needed :)

If you're not already a member of our public Matrix community, please consider joining! We'd suggest using Element as your Matrix client, and definitely join the General and Development rooms once you're in. Also consider joining our bi-weekly Saturday dev syncs. It'd be great to have you!

Maintainer checklist

  • The commit messages for the remote branch should be checked to make sure the contributor's email is set up correctly so that they receive credit for their contribution

    • The contributor's name and icon in remote commits should be the same as what appears in the PR
    • If there's a mismatch, the contributor needs to make sure that the email they use for GitHub matches what they have for git config user.email in their local activist repo
  • The TypeScript and formatting workflows within the PR checks do not indicate new errors in the files changed

  • The Playwright end to end and Zap penetration tests have been ran and are passing (if necessary)

  • The CHANGELOG has been updated with a description of the changes for the upcoming release and the corresponding issue (if necessary)

Copy link

netlify bot commented Jul 1, 2024

Deploy Preview for activist-org ready!

Name Link
🔨 Latest commit 9f60b4d
🔍 Latest deploy log https://app.netlify.com/sites/activist-org/deploys/66a522574906a00008ff7bbe
😎 Deploy Preview https://deploy-preview-921--activist-org.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.

@andrewtavis andrewtavis self-requested a review July 1, 2024 22:12
@andrewtavis
Copy link
Member

Thanks for this, @to-sta!

Are you planning on adding Toast yourself, or should I check this? And let me know what changes should generally happen in the organization store :)

@to-sta
Copy link
Collaborator Author

to-sta commented Jul 2, 2024

@andrewtavis I will give it a try, with vue-sonner.

We don't need the OrganizationText POST request anymore in the store. I can remove it myself while working on the toast 🤗

@andrewtavis
Copy link
Member

Sounds good! Thanks, @to-sta!

@to-sta
Copy link
Collaborator Author

to-sta commented Jul 5, 2024

Removed OrganizationText request and added in the vue sonner toast in the bottom left.

@andrewtavis
Copy link
Member

Nice, @to-sta! Should I look into the conflicts from here? Let me know :)

@to-sta
Copy link
Collaborator Author

to-sta commented Jul 6, 2024

Nice, @to-sta! Should I look into the conflicts from here? Let me know :)

Yeah, that would be great.

But I think instead of resolving 150 conflicts for versions, it would be more effective to re-compile the dependencies. You could remove the yarn.lock before merging it in and re-compile afterwards.

@andrewtavis
Copy link
Member

Ah ya, 100% @to-sta :) I don't deal with yarn.lock conflicts. Always just swap in the most recent version of things and recompile 😊

@@ -117,6 +118,8 @@

<script setup lang="ts">
import type { OrganizationCreateFormData } from "~/types/entities/organization";
import {Toaster, toast } from 'vue-sonner'
import BtnAction from "~/components/btn/action/BtnAction.vue";
Copy link
Member

Choose a reason for hiding this comment

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

Quick note that we don't need to import the component in Nuxt, but then I think this was likely an auto import? :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I didn't even realize that it was added to the imports 😄.

@andrewtavis
Copy link
Member

Quick note here, @to-sta: I'm not able to navigate to the organization about page post creation with the current state of things. I can take a look at this a bit later when I fix the yarn.lock file :)

@to-sta
Copy link
Collaborator Author

to-sta commented Jul 17, 2024

Quick note here, @to-sta: I'm not able to navigate to the organization about page post creation with the current state of things. I can take a look at this a bit later when I fix the yarn.lock file :)

What was the response? I just checked if I removed the redirect, but it is still in their and it works fine on my end. It could be the db volume since the models have changed.

@andrewtavis
Copy link
Member

I'll give it another shot on Sunday and let you know :) Thanks for the note that it's working on your end!

@andrewtavis andrewtavis merged commit 5839c00 into activist-org:main Jul 27, 2024
6 checks passed
@andrewtavis andrewtavis mentioned this pull request Jul 27, 2024
2 tasks
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.

2 participants