Skip to content

Convert technical docs to Antora#6526

Merged
Leusev merged 33 commits intodevelopfrom
doc/antora-docs
Dec 2, 2020
Merged

Convert technical docs to Antora#6526
Leusev merged 33 commits intodevelopfrom
doc/antora-docs

Conversation

@andreslucena
Copy link
Copy Markdown
Member

@andreslucena andreslucena commented Sep 16, 2020

🎩 What? Why?

In the last months, I've been making some changes in the Documentation site, with the idea of having only a repository. After some discussion at #6382 I wanted to try how it'd look like to have some of the technical docs available in this repository. This is it.

It also brings some more changes to the current docs that I noticed were missing or could be improved:

There are a couple of new changes that are only in the PR preview for the branch at the documentation repository (not yet in production):

  • Order some sections inside "Advanced": Views and Concerns. As there are too many docs in this section, it's important to give some ordering:
    imatge

imatge

  • Rename some concerns so they're consistent ("-able" suffix)
  • Configuring ENV_VARS and initializer docs
  • C4 model graphics for our architecture. That means that with some plain text code we get drawings:
(Input) C4 PlantUML snippet
[plantuml]
....
@startuml
!includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Context.puml
LAYOUT_TOP_DOWN
' uncommetn the following line to make proposals
'LAYOUT_AS_SKETCH
title System Context diagram for Decidim Applications (https://decidim.org)
Person_Ext(visitor_user, "Visitor User", "Anonymous, non registered user.")
Person(participant_user, "Participant User", "A registered user. Could also be verified.")
Person(administration_user, "Administration User", "A registered user with special permissions.")
System(decidim_system, "Decidim", "Allows participants to make decisions collaboratively through participatory processes, assemblies, consultations, initiatives, etc.")
System_Ext(mail_system, "SMTP system (e-mail)", "Sends mails to users, like confirmations, reminders, notifications, etc.")
System_Ext(etherpad_system, "Etherpad-Lite system", "Optional. Allows real-time text edition in Meetings.")
System_Ext(geocoding_system, "Geocoding system", "Optional. An Open Street Maps provider, allows geographical localization of Proposals and Meetings..")
System_Ext(oauth_system, "OAUTH2 System", "Optional. Third party sign on systems. Could be Twitter, Facebook, Google or any other OAUTH2 providers.")
Rel(visitor_user, decidim_system, "Uses")
Rel(participant_user, decidim_system, "Uses")
Rel(administration_user, decidim_system, "Uses")
Rel_Back(participant_user, mail_system, "Sends e-mails to")
Rel_Back(administration_user, mail_system, "Sends e-mails to")
Rel_Neighbor(decidim_system, mail_system, "Sends e-mails", "SMTP")
Rel(decidim_system, oauth_system, "Uses")
Rel(decidim_system, geocoding_system, "Uses")
Rel(decidim_system, etherpad_system, "Embeds", "Through an Iframe")
@enduml
....
(Output) C4 PlantUML graph

imatge

There are some things that I'm not happy yet [*] but I want to get some more eyes before I continue with this.

[*] Things for improvement/discussion:

  • I think the services module should be inside of configure. configure/customize/services tree is just weird.
  • There are some things that are duplicated, for instance Contribute with CONTRIBUTING.md and Security with SECURITY.md. I think the Markdown files should be the single source of true as they're more standard and better integrated with Github and we should add an alert from docs site linking back to this repository.

📌 Related Issues

📋 Subtasks

  • Add documentation regarding the feature

@andreslucena
Copy link
Copy Markdown
Member Author

A couple of comments:

  1. I don't find any linter for AsciiDoc so we can integrate with GitHub Actions :(
  2. For consistency and not context switching between syntaxes, I think we should probably also convert the README.md to README.adoc. GitHub also parses it so it's not an issue for the end-user (see Example).

Leusev
Leusev previously requested changes Oct 6, 2020
Copy link
Copy Markdown
Contributor

@Leusev Leusev left a comment

Choose a reason for hiding this comment

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

Great and huge work here @andreslucena 👏
I either didn't found Elections Bulletin Board .md file into this PR possibly due to being recently merged.

Really interesting to take a look at this PR @tramuntanal @ivan-mr @microstudi

@@ -1,34 +1,35 @@
# Geocoding
= Geocoding
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe this section it could be reworked as due to PR #6340 made changes and restructured this section, making disappear geocoding.md in favor of maps.md

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Same as my other comment, I need to manually merge last commits

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fixed that: #6526 (comment)

@Leusev
Copy link
Copy Markdown
Contributor

Leusev commented Oct 6, 2020

Btw, the [CI] Meetings test has already been solved with PR #6595 , so with a develop's merge will be fixed here too.

@andreslucena
Copy link
Copy Markdown
Member Author

Btw, the [CI] Meetings test has already been solved with PR #6595 , so with a develop's merge will be fixed here too.

I merged with develop.

I've also manually converted the new documents. Mind that for appearing in the new site is necessary to also add the new file references at the other repository:

https://deploy-preview-30--decidim-documentation.netlify.app/en/services/elections_bulletin_board/
https://deploy-preview-30--decidim-documentation.netlify.app/en/services/maps/
https://deploy-preview-30--decidim-documentation.netlify.app/en/develop/fixing_locales/
https://deploy-preview-30--decidim-documentation.netlify.app/en/develop/maps/
https://deploy-preview-30--decidim-documentation.netlify.app/en/develop/templates/

Decidim is both and OAuth client (via https://github.com/omniauth/omniauth[omniauth]) and an OAuth provider (via https://github.com/doorkeeper-gem/doorkeeper[doorkeeper]).

Check the [Social Providers](https://github.com/decidim/decidim/blob/master/docs/services/social_providers.md) document to check the client configuration.
Check the https://github.com/decidim/decidim/blob/master/docs/services/social_providers.md[Social Providers] document to check the client configuration.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If PR #6607 is merged, then this section would have to be updated too..

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Ok, I've already migrated that (I think 😅)

@tramuntanal
Copy link
Copy Markdown
Contributor

Interesting PR @andreslucena !

Let's wait to branch off release/0.23-stable before merging this @Leusev

@tramuntanal
Copy link
Copy Markdown
Contributor

I've synced #6607

Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 6900 lines exceeds the maximum allowed for the inline comments feature.

@andreslucena
Copy link
Copy Markdown
Member Author

Let's wait to branch off release/0.23-stable before merging this @Leusev

0.23 was released already, can we please review and merge this PR @tramuntanal @Leusev?

It's especially difficult to keep track of this because docs/ files change, sometimes there are cosmetic changes, and also there's another repository and publish process involved in this change (https://github.com/decidim/documentation and https://docs.decidim.org).

Thanks!!

@andreslucena andreslucena requested a review from Leusev November 17, 2020 08:42
Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 6900 lines exceeds the maximum allowed for the inline comments feature.

@tramuntanal
Copy link
Copy Markdown
Contributor

ok @andreslucena , can you rebase with develop please so we get rid of many diffs in the "Files changed" tab, and also have the docs/services/elections_bulletin_board.md conflicts solved?

@Leusev let's prioritize this PR as we don't want to loos changes in the docs.

Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 6902 lines exceeds the maximum allowed for the inline comments feature.

@andreslucena andreslucena dismissed Leusev’s stale review November 19, 2020 11:19

I've reviewed all the review and I think I've tackled all the comments

Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 6087 lines exceeds the maximum allowed for the inline comments feature.

@andreslucena
Copy link
Copy Markdown
Member Author

ok @andreslucena , can you rebase with develop please so we get rid of many diffs in the "Files changed" tab, and also have the docs/services/elections_bulletin_board.md conflicts solved?

I've rebased it already. The conflicts in docs/services/elections_bulletin_board.md are solved.

Copy link
Copy Markdown
Contributor

@Leusev Leusev left a comment

Choose a reason for hiding this comment

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

Hi @andreslucena
in first place, congratulations on your recent good personal news 😉 😄
By other side, sorry for the delay in tackling this PR, I reviewed again, looks good now, only needs to solve new docs/advanced/releases.md conflict file
Thank you so much for this great documentation restructuring effort

Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 6087 lines exceeds the maximum allowed for the inline comments feature.

Copy link
Copy Markdown

@qlty-cloud-legacy qlty-cloud-legacy bot left a comment

Choose a reason for hiding this comment

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

The PR diff size of 6102 lines exceeds the maximum allowed for the inline comments feature.

@andreslucena
Copy link
Copy Markdown
Member Author

in first place, congratulations on your recent good personal news wink smile

Thanks! ❤️

By other side, sorry for the delay in tackling this PR, I reviewed again, looks good now, only needs to solve new docs/advanced/releases.md conflict file

OK, I merged again and resolved the conflict, it's OK now

Thank you so much for this great documentation restructuring effort

Awesome, I hope that everyone enjoy Antora/AsciiDoc also, it has a learning cure but is really well suited for documentation sites. 😄

@Leusev Leusev self-requested a review December 2, 2020 15:20
Copy link
Copy Markdown
Contributor

@Leusev Leusev left a comment

Choose a reason for hiding this comment

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

Looks good for me @andreslucena 👍
As I said before, thanks a lot for that huge effort & work. I'll merge it! 🎉

@Leusev Leusev merged commit 037b393 into develop Dec 2, 2020
@Leusev Leusev deleted the doc/antora-docs branch December 2, 2020 15:23
entantoencuanto added a commit that referenced this pull request Dec 2, 2020
…ngs_content_block

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
entantoencuanto added a commit that referenced this pull request Dec 2, 2020
…_content_block

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
entantoencuanto added a commit that referenced this pull request Dec 2, 2020
…cipatory_processes_content_block

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
entantoencuanto added a commit that referenced this pull request Dec 2, 2020
…link

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
entantoencuanto added a commit that referenced this pull request Dec 2, 2020
…ighted_groups

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
entantoencuanto added a commit that referenced this pull request Dec 2, 2020
…s_and_processes_block

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
@andreslucena andreslucena mentioned this pull request Dec 3, 2020
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Discussion] Where should the developer documentation be?

4 participants