Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bcf2f81
Moved an image on first guide
ag-edge Nov 8, 2023
cd808ff
removed erroneous period
ag-edge Nov 8, 2023
dc58a39
Changed script to remove uuids in add-node
ag-edge Nov 9, 2023
dc80068
changed tokens
ag-edge Nov 9, 2023
d54109b
node name change
ag-edge Nov 9, 2023
2a63eb4
README clarfications re staging
neilotoole Nov 9, 2023
2a018d7
Merge remote-tracking branch 'origin/staging' into screenshots-updated
ag-edge Nov 9, 2023
040f724
Screenshots for getting started guide updated
ag-edge Nov 10, 2023
72711e8
deploy screenshots replaced
ag-edge Nov 10, 2023
1a070f7
Updated screenshots node and vn
ag-edge Nov 10, 2023
3fb2360
changing extension
ag-edge Nov 10, 2023
d5d575f
Updated screenshot in deploy app
ag-edge Nov 11, 2023
ea7a3dc
remote not access screenshots
ag-edge Nov 13, 2023
c450158
access token screenshots
ag-edge Nov 13, 2023
feae68c
org screenshots
ag-edge Nov 13, 2023
1e867c1
Added edgeworx-logo
neilotoole Nov 13, 2023
9ca3dcd
heart rate app screenshots
ag-edge Nov 13, 2023
3e657d4
Merge branch 'staging' into screenshots-updated
ag-edge Nov 13, 2023
d568cc9
make footer same as webflow
Sophie-edgeworx Nov 14, 2023
de1f47d
Revert "make footer same as webflow"
Sophie-edgeworx Nov 14, 2023
c1e712d
test
Sophie-edgeworx Nov 14, 2023
8725587
Revert "test"
Sophie-edgeworx Nov 14, 2023
94834c6
test
Sophie-edgeworx Nov 14, 2023
4eb3b7e
Revert "test"
Sophie-edgeworx Nov 14, 2023
2f1e5c8
make footer same as webflow
Sophie-edgeworx Nov 14, 2023
e35fb17
fix lint
Sophie-edgeworx Nov 14, 2023
5f760e7
Merge pull request #284 from edgeworx/SC-20865-footer-to-webflow
Sophie-edgeworx Nov 21, 2023
059f1ef
Merge pull request #282 from edgeworx/screenshots-updated
ag-edge Nov 21, 2023
cf1702f
Made 3 guide cards
brain2626 Oct 31, 2023
9f24493
updated guide links
brain2626 Oct 31, 2023
414d18e
moved guides into cloud directory
brain2626 Oct 31, 2023
881fa8e
fixed broken links
brain2626 Oct 31, 2023
43076e7
Adjusted semi-broken layout
noramichalski Oct 31, 2023
4cf0221
added new thumbnails
brain2626 Nov 1, 2023
96b5e24
replace guide thumbnails and architecture visual
brain2626 Nov 1, 2023
498e16a
updated broken link
noramichalski Nov 9, 2023
6745d80
Merge pull request #262 from edgeworx/brian-guide-fix
Sophie-edgeworx Nov 22, 2023
955be7a
Merge branch 'master' into staging
ag-edge Dec 6, 2023
017c2f9
dynamic footer year. see params.toml line 57
ag-edge Dec 13, 2023
ce55047
might help to add edgeworx name to footer
ag-edge Dec 13, 2023
d5402ad
Update footer.html
eplewis89 Dec 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Why are we doing this? What use cases does it support? What is the expected outc
## Checks

- [ ] Run `npm run test` locally.
- [ ] Run `npm run -s lint` locally.
- [ ] Create a Pull Request (follow the [GitHub flow](https://guides.github.com/introduction/flow/)) and [Conventional Commits Specification](https://www.conventionalcommits.org/en/v1.0.0/))
- [ ] Verify any structural/CSS changes on all screen sizes (if relevant)

23 changes: 7 additions & 16 deletions assets/scss/common/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ Put CSS for custom HTML components here.
}
}

body {
// line-height: 1.5em;
}

$code-block-bg: #032332;
$border-color: #a9b2bc88;
$background-color: $edgeneutral-05;
Expand All @@ -30,14 +26,13 @@ $tab-content-bg: #f5f6f7;

.edgeworx-card-container {
display: flex;
flex-flow: row wrap;
flex-direction: row;
gap: 1.5rem;
justify-content: space-around;
justify-content: center;
align-items: stretch;

.no-hover-link {
width: 48%;
min-width: 300px;
max-width: 400px;
}

& .edgeworx-card {
Expand Down Expand Up @@ -185,7 +180,7 @@ $tab-content-bg: #f5f6f7;
padding-top: 2rem;
display: grid;
grid-auto-flow: row;
gap: 1.5rem;
gap: 2rem;

& .link {
text-align: left;
Expand All @@ -198,14 +193,10 @@ $tab-content-bg: #f5f6f7;
}
}

@media screen and (min-width: 768px) {
@media screen and (max-width: 768px) {
.edgeworx-card-container {
grid-auto-flow: column;

.edgeworx-card {
// TODO: The below is what makes the card on the front page massive. Commenting out to resize card.
// max-width: unset;
}
flex-direction: column;
align-items: center;
}

.home {
Expand Down
100 changes: 52 additions & 48 deletions assets/scss/layouts/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
.footer {
border-top: 1px solid hsla(0, 0%, 100%, 0.1);
background-color: #e3e8f1;
padding-top: 4rem;
padding-bottom: 3rem;
background-color: $edgeneutral-1;
padding: 7rem 2.5rem;
font-size: 1rem;

.footer-layout {
padding-right: 8px;
padding-left: 8px;
border-top-color: #a9b2bc;
border-top-color: $edgeneutral-2;
text-align: center;

img {
Expand All @@ -29,7 +28,7 @@
display: grid;
margin-top: 1.5rem;
grid-auto-columns: 1fr;
color: #002131;
color: $edgeneutral-6;

.footer-navstack {
display: -webkit-box;
Expand All @@ -45,10 +44,9 @@
.footer-head {
margin-top: 0;
margin-bottom: 8px;
color: $edgeneutral-3;
font-size: 0.85em;
line-height: 1.5;
font-weight: 600;
color: $edgeneutral-4;
font-size: 1.35em;
font-weight: 500;
}

.footer-navlink {
Expand All @@ -57,7 +55,7 @@
-ms-grid-row-align: center;
align-self: center;
font-weight: 400;
font-size: 0.75em;
font-size: 1.13em;
color: $edgeneutral-3;

&:hover {
Expand All @@ -71,21 +69,21 @@
.social {
display: grid;
margin-top: 1rem;
padding-top: 1rem;
padding-top: 4px;
padding-bottom: 0;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-align: start;
-webkit-align-items: start;
-ms-flex-align: start;
align-items: start;
grid-auto-columns: 1fr;
gap: 16px;
-ms-grid-rows: auto;
grid-template-rows: auto;
border-top: 1px solid $edgeneutral-4;
border-top: 1px solid $edgeneutral-2;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
Expand All @@ -96,30 +94,19 @@

.logo {
justify-self: center;
order: -1;
}

.legal {
color: #002131;
font-size: 0.74em;
color: $edgeneutral-6;
font-size: 0.8em;
display: flex;
justify-self: center;
}

.copyright {
color: $edgeneutral-2;
text-align: right;
}

.legal-links {
display: flex;
flex-direction: row;
margin-left: 8px;
margin-top: 8px;

div {
padding-left: 4px;
color: $edgeneutral-3;
font-weight: 600;
}
}

Expand All @@ -141,30 +128,52 @@
grid-template-columns: 1fr 1fr 1fr 1fr;
-ms-grid-rows: auto;
grid-template-rows: auto;
order: -1;
margin-bottom: 16px;
opacity: 0.5;
}

.social-link-block {
width: 1.7em;
margin: 4px;
}
.social-link-block {
margin: 4px;
color: $edgeneutral-6;
}

.copyright {
margin-right: 4px;
}

.logo-container {
margin-top: 8px;
}
}
}
}

@media screen and (max-width: 820px) {
.footer {
padding: 3rem;

.footer-layout {
.footer-nav {
margin: 0;

.footer-navstack .footer-navlink {
font-size: 1rem;
}
}
}
}

.logo-container {
padding-top: 24px;
margin-bottom: 12px;
}

.legal {
flex-direction: column;
}
}

@media screen and (min-width: 480px) {
.footer {
padding-left: 16px;
padding-right: 16px;

.footer-layout {
text-align: left;
max-width: 1240px;
Expand All @@ -178,10 +187,13 @@
grid-template-columns: 1fr 1fr 1fr;
-ms-grid-rows: auto;
grid-template-rows: auto;
color: #002131;
color: $edgeneutral-6;
justify-items: start;

.footer-navstack {
border-left: 1px solid $edgeneutral-2;
padding-left: 12px;

.footer-navlink {
align-self: flex-start;
margin-top: 0;
Expand All @@ -200,25 +212,17 @@
}

.logo {
order: unset;
justify-self: end;
}

.social-buttons {
order: unset;
margin-bottom: 0;
}
}
}
}
}

@media screen and (min-width: 1200px) {
.footer-nav {
margin-right: 50%;
}
}

@media screen and (min-width: 1440px) {
.footer {
font-size: 19px;
Expand Down
5 changes: 3 additions & 2 deletions config/_default/params.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ lqipWidth = "20x"
smallLimit = "300"

# Footer
footer = "©2023 Edgeworx Inc"
Comment thread
ag-edge marked this conversation as resolved.
# The below is not in use due to the {{ time.Now.Year }} not working. I will add it directly to docs\layouts\partials\footer\footer.html
footer = "©{{ time.Now.Year }} Edgeworx"

# Feed
copyRight = "©2023 Edgeworx Inc"
copyRight = "© {year} Edgeworx"

# Alert
alert = false
Expand Down
27 changes: 17 additions & 10 deletions content/en/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,25 @@ aliases:
- /edgeworx/contact-us
cards:

- title: Get started - Edgeworx Cloud Portal
subtitle: Create your Edgeworx Cloud account.
action: Build
- title: Get started, set up your first edge project.
subtitle: Create your Edgeworx Cloud account and your first project.
action: Create project
time: Easy
link: '/docs/guides/start-portal/'
image: /images/guides/guide-thumb-deploy.jpg
link: '/docs/cloud/start-portal/'
image: /images/guides/Guide—thumb-create-account.jpg

- title: Deploy an app to the edge in under 10 minutes
subtitle: Package and deploy your app in the real world on different edge devices without changing the code.
action: Deploy
- title: Add an edge node in under 10 minutes.
subtitle: Add a node (or virtual node) to the edge in just a few minutes.
action: Add a node
time: Easy
link: '/docs/guides/deploy/'
image: /images/guides/guide-thumb-deploy.jpg
link: '/docs/cloud/adding-nodes/add-node/'
image: /images/guides/Guide—thumb-addnode.jpg

- title: Deploy an app to the edge in under 10 minutes.
subtitle: Package your app and deploy it to your edge node.
action: Deploy an app
time: Easy
link: '/docs/apps/deploy/'
image: /images/guides/Guide—thumb-deployapp.jpg

---
4 changes: 2 additions & 2 deletions content/en/docs/apps/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ linkTitle: "Building edge apps"
---

[Apps](../more/terminology#application) are groups of [microservices](./microservices.md) bundled to work together. They are defined using YAML files and can
be deployed and updated by uploading those YAML files through [Edgeworx Cloud](/docs/guides/start-portal) or through
be deployed and updated by uploading those YAML files through [Edgeworx Cloud](/docs/cloud/start-portal) or through
[edgectl]({{<ref "/docs/cloud/adding-nodes/add-node.md">}}). An app can consist of an arbitrary
number of interacting or standalone microservices that are deployed on one or may nodes.

Expand All @@ -14,7 +14,7 @@ the Edgeworx Cloud platform to connect to one or more edge nodes. Apps are defin
and can be deployed and updated by uploading those YAML files. Edgeworx nodes can be set up to interact
with applications, process information, and move data between multiple apps.

![Application view in the Edgeworx Cloud platform](</images/image (12).png>)
![Application view in the Edgeworx Cloud platform](</images/apps_full.png>)

## Application Components

Expand Down
10 changes: 5 additions & 5 deletions content/en/docs/apps/demo-apps/heart-rate.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ aliases:

![Heart Rate Demo App](/images/15done.png)

The Heart Rate app provided on the [Edgeworx Cloud](docs/guides/start-portal) platform simulates a wearable device
The Heart Rate app provided on the [Edgeworx Cloud](docs/cloud/start-portal) platform simulates a wearable device
transmitting a person's heartbeat at the edge. The Wearable sends heart rate data over bluetooth to
a data collector [microservice](/docs/apps/microservices) located on the primary [node](../../cloud/adding-nodes/_index.md). The Data collector microservice then
communicates with another microservice running a web server on the secondary node to display the
Expand Down Expand Up @@ -37,7 +37,7 @@ follow the steps below:
5. Select the node(s) where you want it to run
6. Click `DEPLOY`

![Application Deployment Page](/images/12done.png)
![Application Deployment Page](/images/heart_rate_app_modal.png)

## See Application Results

Expand All @@ -47,12 +47,12 @@ right of your screen.
If you are not already seeing the app listed, click the `APPS` tab to see all of the apps in your
current project. Click the app to access the app detail view.

![Project Details View](/images/13done.png)
![Project Details View](/images/deployed_app.png)

From the app detail view, click the linked text under the `ports` column to navigate to the app
output.

![Application Detail View](/images/14done.png)
![Application Detail View](/images/app_details.png)

You should be brought to the Heart Rate Demo App.

Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
data_label: Anonymous Person
- name: viewer
agent:
name: virtual-node-alexpc
name: nodename
images:
arm: 'edgeworx/heart-rate-demo-viewer:1.0.0'
x86: 'edgeworx/heart-rate-demo-viewer:1.0.0'
Expand Down
Loading
Loading