You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by fe...@apache.org on 2024/03/07 08:01:17 UTC
(incubator-answer-website) 01/02: Merge branch 'main' into user-guides
This is an automated email from the ASF dual-hosted git repository.
fenbox pushed a commit to branch user-guides
in repository https://gitbox.apache.org/repos/asf/incubator-answer-website.git
commit e997a75e79a7d072b116031078ac697adfaf1013
Author: fen <f3...@gmail.com>
AuthorDate: Thu Mar 7 15:28:27 2024 +0800
Merge branch 'main' into user-guides
---
docs/development/api.md | 6 +-
docs/guides/users.md | 6 +-
src/components/HomepageMain/index.tsx | 15 +-
static/img/docs/users-user-status.drawio.svg | 226 +++++++++++++++++++++++++++
4 files changed, 243 insertions(+), 10 deletions(-)
diff --git a/docs/development/api.md b/docs/development/api.md
index ac53a919..997e6b63 100644
--- a/docs/development/api.md
+++ b/docs/development/api.md
@@ -13,12 +13,14 @@ Answer using swagger to generate API document automatically. Swagger can display
## Where is the API document?
### Quick Look
+
If you want to quickly view the API document, you can visit the following link:
https://meta.answer.dev/swagger/index.html
### View your own API document
+
If you already have an Answer instance, you can view the API document of your own instance by visiting the following link:
-https://example.com/swagger/index.html
+`https://example.com/swagger/index.html`
If you can't access the above link, please check the following configuration items whether they are configured correctly.
@@ -43,4 +45,4 @@ $ cd script
$ ./gen-api.sh
# the generated documentation is in the docs/api directory
-```
\ No newline at end of file
+```
diff --git a/docs/guides/users.md b/docs/guides/users.md
index 81f99029..f052e6d6 100644
--- a/docs/guides/users.md
+++ b/docs/guides/users.md
@@ -4,6 +4,10 @@ slug: /users
# Users
+## User status
+
+
+
## Top users
Show top users in the platform.
@@ -42,7 +46,7 @@ A user wants to log in. The user's login permissions are related to the status.
| User status | Normal | Inactive | Suspended | Deleted |
|---|---|---|---|---|
-| Log in | Allow | Denied | Denied | Denied |
+| Log in | Allowed | Denied | Denied | Denied |
### Log in with email and password
diff --git a/src/components/HomepageMain/index.tsx b/src/components/HomepageMain/index.tsx
index 7170520d..66fa57ee 100644
--- a/src/components/HomepageMain/index.tsx
+++ b/src/components/HomepageMain/index.tsx
@@ -60,7 +60,6 @@ const FeatureList: FeatureItem[] = [
other tools better.
</Translate>
),
- later: <Translate id="home.features.comming_soon">Coming soon</Translate>,
},
{
title: (
@@ -91,13 +90,15 @@ const settings = {
function Feature({ title, icon, description, later }: FeatureItem) {
return (
- <Col sm={12} md={6} lg={3} className="mb-4">
- <div className="mb-3">
- <img className={styles.featureSvg} role="img" src={icon} />
+ <Col sm={12} md={6} lg={3} className="mb-4">
+ <div className="border p-4 rounded h-100">
+ <div className="mb-3">
+ <img className={styles.featureSvg} role="img" src={icon} />
+ </div>
+ <h4 className="mb-3">{title}</h4>
+ <p>{description}</p>
+ {later && <div className={styles.badge}>{later}</div>}
</div>
- <h4 className="mb-3">{title}</h4>
- <p>{description}</p>
- {later && <div className={styles.badge}>{later}</div>}
</Col>
);
}
diff --git a/static/img/docs/users-user-status.drawio.svg b/static/img/docs/users-user-status.drawio.svg
new file mode 100644
index 00000000..bca70a78
--- /dev/null
+++ b/static/img/docs/users-user-status.drawio.svg
@@ -0,0 +1,226 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="539px" height="286px" viewBox="-0.5 -0.5 539 286" content="<mxfile><diagram id="k0Kbc0fjwsPFYDT4-L9f" name="Page-1">3VjbspsgFP0aXzMi5vaYk0vbh3Y6k+n09KlDlaNOERzEaPr1xYi3YEyai5nTp7AXG5HFYm2MAZdh9oGjyP/MXEwMy3QzA64MywIATOVPjuwLZAphAXg8cFVSDWyDP1iBpkKTwMVxK1EwRkQQtUGHUYod0cIQ5yxtp70x0p41Qh7WgK2DiI5+D1zhF+jMmtb4Rxx4fjkzmMyLnhCVyWolsY9cljYguD [...]
+ <defs/>
+ <g>
+ <path d="M 87 67 L 87 110.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 87 115.88 L 83.5 108.88 L 87 110.63 L 90.5 108.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <ellipse cx="87" cy="37" rx="50" ry="30" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-width="2" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 37px; margin-left: 38px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+ Sign up
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="87" y="41" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+ Sign up
+ </text>
+ </switch>
+ </g>
+ <path d="M 137 147 L 230.63 147" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 235.88 147 L 228.88 150.5 L 230.63 147 L 228.88 143.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 147px; margin-left: 187px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+ Active
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="187" y="150" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+ Active
+ </text>
+ </switch>
+ </g>
+ <path d="M 37 147 L 17 147 Q 7 147 7 157 L 7 267 Q 7 277 17 277 L 477 277 Q 487 277 487 267 L 487 243.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 487 238.12 L 490.5 245.12 L 487 243.37 L 483.5 245.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 277px; margin-left: 187px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+ ☑️ Delete
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="187" y="280" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+ ☑️ Delete
+ </text>
+ </switch>
+ </g>
+ <rect x="37" y="117" width="100" height="60" rx="7" ry="7" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-width="2" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 147px; margin-left: 38px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+ Inactive
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="87" y="151" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+ Inactive
+ </text>
+ </switch>
+ </g>
+ <path d="M 337 147 L 377 147 Q 387 147 387 137 L 387 97 Q 387 87 397 87 L 430.63 87" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 435.88 87 L 428.88 90.5 L 430.63 87 L 428.88 83.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 117px; margin-left: 387px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+ ☑️ Suspend
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="387" y="120" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+ ☑️ Suspend
+ </text>
+ </switch>
+ </g>
+ <path d="M 337 147 L 377 147 Q 387 147 387 157 L 387 197 Q 387 207 397 207 L 430.63 207" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 435.88 207 L 428.88 210.5 L 430.63 207 L 428.88 203.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 177px; margin-left: 387px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+ ☑️ Delete
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="387" y="180" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+ ☑️ Delete
+ </text>
+ </switch>
+ </g>
+ <path d="M 287 177 L 287 197 Q 287 207 277 207 L 97 207 Q 87 207 87 197 L 87 183.37" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 87 178.12 L 90.5 185.12 L 87 183.37 L 83.5 185.12 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 207px; margin-left: 187px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+ ☑️ Deactive
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="187" y="210" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+ ☑️ Deactive
+ </text>
+ </switch>
+ </g>
+ <rect x="237" y="117" width="100" height="60" rx="7" ry="7" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-width="2" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 147px; margin-left: 238px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+ Normal
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="287" y="151" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+ Normal
+ </text>
+ </switch>
+ </g>
+ <path d="M 487 117 L 487 170.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 487 175.88 L 483.5 168.88 L 487 170.63 L 490.5 168.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 147px; margin-left: 487px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+ ☑️ Delete
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="487" y="150" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+ ☑️ Delete
+ </text>
+ </switch>
+ </g>
+ <path d="M 487 57 L 487 17 Q 487 7 477 7 L 297 7 Q 287 7 287 17 L 287 110.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
+ <path d="M 287 115.88 L 283.5 108.88 L 287 110.63 L 290.5 108.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 7px; margin-left: 357px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
+ Unsuspend
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="357" y="10" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
+ Unsuspend
+ </text>
+ </switch>
+ </g>
+ <rect x="437" y="57" width="100" height="60" rx="7" ry="7" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-width="2" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 87px; margin-left: 438px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+ Suspended
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="487" y="91" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+ Suspended
+ </text>
+ </switch>
+ </g>
+ <rect x="437" y="177" width="100" height="60" rx="7" ry="7" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-width="2" pointer-events="all"/>
+ <g transform="translate(-0.5 -0.5)">
+ <switch>
+ <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+ <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 207px; margin-left: 438px;">
+ <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+ <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+ Deleted
+ </div>
+ </div>
+ </div>
+ </foreignObject>
+ <text x="487" y="211" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+ Deleted
+ </text>
+ </switch>
+ </g>
+ </g>
+ <switch>
+ <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+ <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+ <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+ Text is not SVG - cannot display
+ </text>
+ </a>
+ </switch>
+</svg>