Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into ritza/add-twilio-segment-guide
Browse files Browse the repository at this point in the history
# Conflicts:
#	config/vale/styles/config/vocabularies/FusionAuth/accept.txt
  • Loading branch information
rideam committed Aug 29, 2024
2 parents 9d2e0ab + af3ce2a commit 0a6c5d4
Show file tree
Hide file tree
Showing 175 changed files with 8,324 additions and 457 deletions.
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# This is a managed file. Manual changes will be overwritten.
# If you need to add codeowners to the repository please add them to the CODEOWNERS file in the scripts/files directory at
# https://github.com/FusionAuth/fusionauth-public-repos/

.github/ @fusionauth/owners @fusionauth/platform
* @fusionauth/owners @fusionauth/platform @FusionAuth/developer-relations-admins @FusionAuth/website-admins @FusionAuth/developer-relations @FusionAuth/developers @FusionAuth/customer-support
.github/ @fusionauth/owners @fusionauth/platform @FusionAuth/website-admins
10 changes: 6 additions & 4 deletions .github/workflows/contentcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ jobs:
exit `find astro/src/content/docs/ -type f -print|xargs grep 'https://[^[]*\[' astro/src/content/docs |grep -v '(' |grep -v '[200]' | wc -l | sed 's/[ ]*//g'`
# ignore the '[200]' because that is a valid case that grep picks up incorrectly
shell: bash
#- name: Check for titles/headers that have incorrect casing
#run: |
#! find astro/src/content/ -type f -name "*.md*" |grep -v swp | xargs grep title: |grep -v subtitle|sed 's/.*title: //' | sed "s/'//g" | grep -E '\b[a-z]+\b'
#shell: bash
- name: check unsorted vale keywords. error to fix because this decreases merge conflicts
run: |
# first line shows output of unsorted item, second just an exit code. this needs to be LC_ALL=C because otherwise you run into issues between how macos sorts it and how linux/GH actions sorts it
echo `LC_ALL=C sort -cu config/vale/styles/config/vocabularies/FusionAuth/accept.txt`
exit `LC_ALL=C sort -Cu config/vale/styles/config/vocabularies/FusionAuth/accept.txt`
shell: bash
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions astro/public/img/icons/hosted-vs-api-dark.svg
14 changes: 14 additions & 0 deletions astro/public/img/icons/hosted-vs-api.svg
2 changes: 1 addition & 1 deletion astro/src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const { sections = [
{
"heading": "product",
"items": [
{ "label": "features", "href": "/features/authentication" },
{ "label": "features", "href": "/platform/authentication" },
{ "label": "pricing", "href": "/pricing" },
]
},
Expand Down
9 changes: 8 additions & 1 deletion astro/src/components/Head.astro
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,20 @@ const openGraphImageUrl = openGraphImage ? new URL(openGraphImage, Astro.url): n
const normalizedUrl = Astro.url.toString().replace(/.html$/, '');
const hasDark = !Astro.url.pathname.startsWith('/blog');
const isProd = import.meta.env.PROD as boolean;
let canonical = canonicalUrl;
if (!canonical) {
canonical = Astro.url.href;
} else if (!canonical.startsWith('http')) {
canonical = new URL(canonical, Astro.url).href;
}
---
<head>
<meta charSet="UTF-8"/>
<meta name="viewport" content="width=device-width"/>
<!-- TODO: Implement favicons by following this blog post https://dev.to/masakudamatsu/favicon-nightmare-how-to-maintain-sanity-3al7 -->
<link rel="icon" type="image/png" href="/img/favicon.png"/>
{ canonicalUrl && <link rel="canonical" href={canonicalUrl} /> }
{ canonical && <link rel="canonical" href={canonical} /> }
<link rel="sitemap" href="/sitemap-index.xml">
<link rel="stylesheet" href="https://rsms.me/inter/inter.css">
<link rel="stylesheet" href="/css/brands.min.css"/>
Expand Down
2 changes: 1 addition & 1 deletion astro/src/components/api/APIField.astro
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const { name, description, type, required, optional, since, defaults, deprecated
{ deprecated && <span class="text-red-700 text-sm">DEPRECATED</span> }
{ readonly && <ReadOnly /> }
</div>
<div class="ml-4 mb-7">
<div class="ml-4 mb-7 font-normal text-sm">
<slot></slot>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph LR
subgraph I[Your server]
direction LR
subgraph G[Docker]
H[(Postgresql)]
end
subgraph C[Docker]
direction BT
A(FusionAuth)
end
end
C --> G
style I fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph LR
subgraph I[Your server]
direction LR
subgraph G[Docker]
H[(Postgresql)]
end
subgraph C[Docker]
direction BT
D(OpenTelemetry for Java) --> A(FusionAuth)
end
subgraph E[Docker]
B(Splunk OpenTelemetry collector)
end
end
C --> G
C --> E
E --> F(Splunk web server)
style I fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph TD
subgraph I[Your server]
direction LR
subgraph G[Docker]
H[(Postgresql)]
end
subgraph C[Docker]
A(FusionAuth)
end
subgraph E[Docker]
B(Custom metric getter code)
end
end
C --> G
E --> |API call| C
E --> |API call| F(Splunk web server)
style I fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph TB
subgraph I[Your server]
direction TB
subgraph G[Docker]
H[(PostgreSQL)]
end
subgraph C[Docker]
A(FusionAuth)
end
end
C --> G
style I fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph TD
subgraph E[Elastic Server]
J(Kibana) --> B[(Elasticsearch)]
J --> F(Fleet)
end
subgraph I[Your server]
subgraph G[Docker]
H[(PostgreSQL)]
end
subgraph C[Docker]
A(FusionAuth)
D(Elastic Agent)
end
end
A --> G
D --> E
style I fill:#999
style E fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph TD
subgraph E[Elastic Server]
J(Kibana) --> B[(Elasticsearch)]
J --> F(Fleet)
end
subgraph I[Your server]
H[(PostgreSQL)]
A(FusionAuth)
D(Elastic Agent)
end
A --> H
D --> E
style I fill:#999
style E fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph TD
subgraph E[Elastic Server]
J(Kibana) --> B[(Elasticsearch)]
J --> F(Fleet)
end
subgraph I[Your server]
subgraph G[Docker]
H[(PostgreSQL)]
end
subgraph C[Docker]
A(FusionAuth)
end
subgraph K[Docker]
D(Elastic Agent)
end
end
K --> E
K --> C
C --> G
style I fill:#999
style E fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
import Diagram from 'src/components/mermaid/FlowchartDiagram.astro';
const { alt } = Astro.props;
//language=Mermaid
const code = `
graph TD
subgraph Z[Elastic Server]
X(Kibana) --> W[(Elasticsearch)]
X --> Y(Fleet)
end
subgraph I[Your server]
subgraph G[Docker]
H[(PostgreSQL)]
end
subgraph C[Docker]
A(FusionAuth)
end
subgraph E[Docker]
B(Custom metric getter code)
end
end
C --> G
B --> |API call| C
B --> |API call| W
style I fill:#999
`;
---
<Diagram {code} alt={alt} />
<style is:global>
foreignObject > div {
transform: translateY(-4px);
}
</style>
Loading

0 comments on commit 0a6c5d4

Please sign in to comment.