Skip to content

Commit e40ce02

Browse files
authored
Merge pull request #655 from morvaridk/master
Changing Some typos and fixes
2 parents 95b4a3d + b1decda commit e40ce02

5 files changed

Lines changed: 41 additions & 29 deletions

File tree

tutorials/yaas-create-project-backing-storefront/yaas-create-project-backing-storefront.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Use Your Own YaaS Project to Back your Storefront.
3-
description: By default, the StoreFront is wired to the YaaS Project default project (created by the StoreFront's own Team). This default project has already been wired up and populated with the Products (and Services) that you can browse. You will now use our own YaaS Project which you created earlier instead of the default one.
2+
title: Use Your Own YaaS Project to Back your Storefront
3+
description: By default, your StoreFront communicates with a default YaaS Project in the backend (created by the StoreFront's own Team). This contains the products that you have seen, banner images and much more. In this step you will point your StoreFront to your own YaaS Project instead, giving you more control of back end logistics.
44
tags: [ tutorial>intermediate, products>sap-hybris-as-a-service-on-sap-hana-cloud-platform>sap-hybris-as-a-service-on-sap-hana-cloud-platform ]
55
---
66
## Prerequisites
@@ -16,7 +16,7 @@ tags: [ tutorial>intermediate, products>sap-hybris-as-a-service-on-sap-hana-clo
1616

1717
## Details
1818
### You will learn
19-
In this tutorial you will use our own YaaS Project which you created earlier instead of the default one.
19+
In this tutorial you will use your own YaaS Project which you created earlier to serve as the backend of your StoreFront, rather than the default YaaS Project. You will then have complete control over the contents of your Storefront, allowing you to populate its products, its banners, and many more features.
2020

2121
### Time to Complete
2222
**20 Min**.
@@ -25,7 +25,7 @@ In this tutorial you will use our own YaaS Project which you created earlier ins
2525

2626
1. If you have not completed the Getting Started with YaaS tutorial, please do it now. This is necessary in order to follow the next steps.
2727

28-
2. Take note of the YaaS **Project's identifier** and the YaaS **Client's identifier** and place these as the `PROJECT_ID` and `CLIENT_ID` values in the `gruntfile.js` in the `folder(1)` directory which you created in the previous tutorials. This is the root directory of your `yaas-storefront` project.
28+
2. Open your YaaS Project in the YaaS Builder. Take note of the YaaS **Project's identifier** and the YaaS **Client's identifier** and place these as the `PROJECT_ID` and `CLIENT_ID` values in the `gruntfile.js` that already exists in the top level of your storefront `folder(1)` directory which you created in the previous tutorials. This is the root directory of your `yaas-storefront` project.
2929
- You Can find **Project's identifier** in the **Builder** under the **Administration** tab when you open your project.
3030

3131
![Project Identifier](project-identifier.PNG)
@@ -38,7 +38,7 @@ In this tutorial you will use our own YaaS Project which you created earlier ins
3838

3939
![Show Credentials](show-credentials.PNG)
4040

41-
3. Rebuild the Storefront by running the `grunt build` command from `folder(1)` directory.
41+
3. Your `Gruntfile.js` should now contain lines similar to `PROJECT_ID = 'yb0160913',` and `CLIENT_ID = 'vBji2FMBBvKVYlGn8ZZ2b4E6xFKpHhNi',`. Note the commas and the single quotes around each variable. Rebuild the Storefront by running the `grunt build` command from `folder(1)` directory.
4242

4343
4. Rerun your Storefront by running the `npm start` command from `folder(1)` directory. The client will now be talking with your YaaS Project.
4444

@@ -59,14 +59,14 @@ In this tutorial you will use our own YaaS Project which you created earlier ins
5959
> NOTE: It is important to set your products as **active**, otherwise they will not appear in your online store.
6060
6161
### Summary
62-
In this tutorial, you replaced the default storefront project credentials with your own YaaS project credentials. You added customized products to your storefront.
62+
In this tutorial, you modified your storefront to talk with your own YaaS Project in the backend rather than the default YaaS Project. This gave you complete control over the content of the Storefront, such as its products and banners, and much more that you have yet to explore.
6363

6464
## Next Steps
65-
- [Deploy a Micro Service Built on YaaS on the SAP HCP](http://go.sap.com/developer/tutorials/yaas-deploy-run-microservice-cloud.html)P
65+
- [Deploy a Micro Service Built on YaaS on the SAP HCP](http://go.sap.com/developer/tutorials/yaas-deploy-run-microservice-cloud.html)
6666

6767
### Optional
6868
6. Create a category and assign your products to it.
6969
- Go back to the Builder and open Categories.
70-
- Create a category and you can add image for it.
70+
- Create a category and you can add an image for it.
7171
- Add sub categories to your category.
7272
- Assign products to categories

tutorials/yaas-deploy-run-microservice-cloud/yaas-deploy-run-microservice-cloud.md

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ tags: [ tutorial>intermediate, topic>cloud, products>sap-hana-cloud-platform, p
1818

1919
## Details
2020
### You will learn
21-
In this tutorial you will learn how to deploy a micro service to the SAP HCP. As an example you will use the Tips micro service created in [Extend the YaaS Storefront's Functionality](http://go.sap.com/developer/tutorials/yaas-extend-storefront-functionality-webservice.html) tutorial. In order to deploy a micro service you will need to set up your Cloud Foundry Command Line interface and create a SAP HCP account. In the end you will run the micro service on the cloud.
21+
You will learn how to deploy a micro service to the SAP HCP. As an example you will use the Tips micro service created in the [Extend the YaaS Storefront's Functionality](http://go.sap.com/developer/tutorials/yaas-extend-storefront-functionality-webservice.html) tutorial. In order to deploy a micro service you will need to set up your Cloud Foundry Command Line interface and create a SAP HCP account. In the end you will run the micro service on the cloud.
2222

2323
### Time to Complete
2424
**20 Min**.
2525

2626
---
2727

28-
1. Download the **Cloud Foundry CLI**: Go to https://docs.cloudfoundry.org/cf-cli/install-go-cli.html, and install Cloud Foundry's CLI. Run `cf` commands from your command line to verify your installation.
28+
1. Run cf -v to see if you have the Cloud Foundry CLI installed. If not, download the **Cloud Foundry CLI**: Go to https://docs.cloudfoundry.org/cf-cli/install-go-cli.html, and install Cloud Foundry's CLI. Run `cf` from your command line to verify your installation.
2929

3030
![CF Command](cf-command.PNG)
3131

@@ -37,7 +37,7 @@ In this tutorial you will learn how to deploy a micro service to the SAP HCP. As
3737
- Open your YaaS Projects **Administration** page.
3838
- Click **Subscription**, select **+ Subscription**, select the *Beta Worldwide* tab, and subscribe to the package called **HCP, STARTER EDITION FOR CLOUD FOUNDRY SERVICES (BETA)** in there.
3939

40-
4. Wait 10 seconds and your package will appear in **Builder***. If your package did not appear, log out and back in to the YaaS Builder, find your project, and you should see **SAP HANA Cloud Platform** in your YaaS Project's Menu on the left side of the page.
40+
4. Wait 10 seconds and your package will appear in **Builder in your YaaS Project***. If your package did not appear, log out and back in to the YaaS Builder, find your project, and you should see **SAP HANA Cloud Platform** in your YaaS Project's Menu on the left side of the page. Select the **SAP HANA Cloud Platform** menu and click **Create** to activate your HCP account. This will trigger the email mentioned in the next step.
4141

4242
5. You should now get an email from **HCP**, guiding you through steps to **activate** your HCP account.
4343

@@ -57,10 +57,10 @@ In this tutorial you will learn how to deploy a micro service to the SAP HCP. As
5757

5858
10. Push the war file to the cloud, by running `cf push` from the same location. This will use the information in `manifest.yml` to guide the deployment.
5959

60-
11. Run `cf apps` to check whether the war file was successfully deployed and started and note the URL where it is running. It should be something like `yourAppsName.cfapps.us10.hana.ondemand.com`.
61-
6260
> NOTE: The default HCP settings require the secure, https protocol. Therefore you must use https for all calls to your deployed services and when accessing your website in the cloud @ https://
6361
62+
11. Run `cf apps` to check whether the war file was successfully deployed and started and note the URL where it is running. It should be something like `yourAppsName.cfapps.us10.hana.ondemand.com`.
63+
6464
![CF Apps](cf-apps.PNG)
6565

6666
12. Now that your service has been deployed to the cloud, you could access it directly from your StoreFront. However, YaaS is all about security, so instead we should register this service in the YaaS Builder, so that instead, we can access it via the YaaS Security Proxy. To register your service on YaaS:
@@ -74,8 +74,19 @@ In this tutorial you will learn how to deploy a micro service to the SAP HCP. As
7474

7575
> NOTE: In order to access your service at the **Generated Proxy URL** you will need to acquire an **Access Token**. This is because all calls to a service on YaaS are secured. If you are interested to learn more about this please refer to [YaaS Dev Portal](https://devportal.yaas.io/).
7676
77-
###Summary
78-
In this tutorial you learned how to deploy a micro service based on YaaS on HANA Cloud Platform and run the service.
77+
13. Now that you have deployed your service to the cloud, you need to tell your StoreFront about it. Open the file `(1) site-config.js` in `yaas-storefront/public/js/app/shared` and modify the `baseUrl` of the `tipsEndpoint` to point to the Generated Proxy URL found given in the previous step, giving you something like the code below. Rebuild your storeFront with `grunt build`, and restart the storefront with `npm start`. Your storeFront should now be communicating with your deployed service. Open your Chrome developer tools to observe the REST traffic and confirm that this is the case.
78+
79+
```
80+
tipsEndpoint: {
81+
// NEEDS_ADJUSTING : Define the end-point of your Tips Service e.g. http://localhost:8080
82+
baseUrl: 'https://yourAppsName.cfapps.us10.hana.ondemand.com'
83+
}
84+
85+
```
86+
87+
88+
### Summary
89+
In this tutorial you learned how to deploy a micro service based on YaaS to the HANA Cloud Platform, and how to modify your storefront to communicate with it.
7990

8091
## Next Steps
8192
- Select a tutorial from the [Tutorial Navigator](http://go.sap.com/developer/tutorial-navigator.html) or the [Tutorial Catalog](http://go.sap.com/developer/tutorials.html)

tutorials/yaas-download-run-default-storefront/yaas-download-run-default-storefront.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ tags: [ tutorial>intermediate, products>sap-hybris-as-a-service-on-sap-hana-clou
1616

1717
## Details
1818
### You will learn
19-
In this tutorial you will learn how to create your own e-commerce shop in minutes with the YaaS Storefront.
19+
You will learn how to create your own e-commerce shop in minutes with the YaaS Storefront.
2020

2121
### Time to Complete
2222
**10 Min**.
@@ -25,7 +25,7 @@ In this tutorial you will learn how to create your own e-commerce shop in minute
2525

2626
1. Confirm that you have **Node.js** and **Git** installed:
2727
- run the command `node -v` to see if you have **Node.js** installed. If not, download it from <https://nodejs.org/en/download/>, and confirm that the command `node -v` runs okay.
28-
- run the command `git`to see if you have **Git** installed. If not, download it from <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>, and confirm that the command `git` runs okay.
28+
- run the command `git` to see if you have **Git** installed. If not, download it from <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>, and confirm that the command `git` runs okay.
2929

3030
2. Clone the YaaS StoreFront:
3131
- Create a folder which we will refer to as `(1)` in the following steps, and `cd` into it.
@@ -34,7 +34,7 @@ In this tutorial you will learn how to create your own e-commerce shop in minute
3434

3535
3. Use Node's package manager to download the dependencies:
3636
- The YaaS StoreFront includes `npm`, **Node.js**'s package manager, for downloading dependent packages.
37-
- Run `npm install` to download all the packages the Storefront depends on. The console should show `npm` downloading many dependencies; confirm this is the case.
37+
- Run `npm install` to download all the packages the Storefront depends on. The console should show `npm` downloading many dependencies; confirm this is the case and that you have no error messages.
3838

3939
4. Start a local web server
4040
- Run the command `npm start` to start a local web server. If your command prompt looks like the following image, you will know that the server is running.

tutorials/yaas-extend-storefront-functionality-webservice/yaas-extend-storefront-functionality-webservice.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Extend the YaaS Storefront's Functionality with a Micro Service
3-
description: In this tutorial you will extend the Storefront using a micro service. The aim is to give helpful Tips to the undecided purchaser. You will run the Tips micro service locally and connect it to YaaS Storefront. The tips are communicated via REST calls to YaaS Storefront.
3+
description: In this tutorial you will extend the functionality of the Storefront to include Tips for the undecided purchaser. The logic will be implemented with a Tips REST based micro service.
44
tags: [ tutorial>intermediate, products>sap-hybris-as-a-service-on-sap-hana-cloud-platform>sap-hybris-as-a-service-on-sap-hana-cloud-platform ]
55
---
66
## Prerequisites
@@ -17,7 +17,7 @@ tags: [ tutorial>intermediate, products>sap-hybris-as-a-service-on-sap-hana-clo
1717

1818
## Details
1919
### You will learn
20-
You will learn how to customize your Storefront using a micro service. The Storefront is structured around [Angular Modules](https://docs.angularjs.org/guide/module). The aim of this tutorial is to include a button in your Storefront's Product Details page that gives helpful Tips to the undecided purchaser, such as "This would add to your overall coolness", and "One word: No". To achieve this, you will run a new micro service locally to provide the tips, and add a button to your StoreFront that calls this. The tips are communicated via REST calls to your YaaS Storefront.
20+
You will learn how to extend your Storefront using a micro service. The Storefront is structured around [Angular Modules](https://docs.angularjs.org/guide/module). The aim of this tutorial is to include a button in your Storefront's Product Details page that gives helpful Tips to the undecided purchaser, such as "This would add to your overall coolness", and "One word: No". To achieve this, you will run a new micro service locally to provide the tips, and add a button to your StoreFront that calls this. The tips are communicated via REST calls to your YaaS Storefront.
2121

2222
### Time to Complete
2323
**20 Min**.
@@ -28,9 +28,9 @@ Locate your `yaas-storefront` folder which we will refer to below as (1).
2828

2929
1. View the default Angular Modules that are included in your Storefront @ `(1)/public/js/app`. You can extend the Storefront's functionality by adding your own Angular Modules to these. In this tutorial you will add a new Angular Module to support the "Mr Tip" functionality.
3030

31-
> NOTE: Each Angular Module provides the support for a specific piece of business functionality such as Products, Customers, Cart etc. Each Angular Module contains all the different parts required for that in your application, such as controllers, services, filters, etc.
31+
> NOTE: Each Angular Module provides the support for a specific piece of business functionality such as Products, Customers, Cart etc. Each contains all the different parts required for that particular logic in your application, such as controllers, services, filters, etc.
3232
33-
2. Create a folder `(2)` somewhere outside of your `yaas-storefront` folder, and `cd` into it. Run `git clone https://github.com/SAP/yaas-getting-started-yaasbites.git`, to give you two new folders:
33+
2. Create a folder `(2)` somewhere outside of your `yaas-storefront` folder, and `cd` into it. Run `git clone https://github.com/SAP/yaas-getting-started-yaasbites.git`, to give you several new folders, two of which are relevant to us:
3434
- `(2)/yaasbite200` which contains a "Mr Tip" micro service and front-end-client for populating it, and
3535
- `(2)/yaasbitestorefrontdeltas` which contains changes that you will make to the Storefront to call it.
3636

@@ -48,7 +48,7 @@ Locate your `yaas-storefront` folder which we will refer to below as (1).
4848
> NOTE: Please keep the micro service running. You will use this in the next steps.
4949
5050
4. With the Tips micro service running locally, you can now extend your StoreFront to include a button on its product detail page, that calls this service, and thus provide tips to the undecided purchaser. To do this you need to modify some files in the `yaas-storefront` folder `(1)`. Place **all** the files that are in `(2)/yaasbitestorefrontdeltas/two` into their respective locations in the `yaas-storedfront` folder `(1)`, overwriting the original files:
51-
- For example: file `file product-detail-ctrl.js` located in `(2)/yaasbitestorefrontdeltas/two/public/js/app/products/controllers/product-detail-ctrl.js` should replace the one in `(1)/yaas-storefront/two/public/js/app/products/controllers/product-detail-ctrl.js`.
51+
- For example: file `file product-detail-ctrl.js` located in `(2)/yaasbitestorefrontdeltas/two/public/js/app/products/controllers/product-detail-ctrl.js` should replace the one in `(1)/yaas-storefront/public/js/app/products/controllers/product-detail-ctrl.js`.
5252

5353
5. Next we want to compile the modified code.
5454
- We will compile the code using the build tool grunt, which we first need to download with the help of the node package manager: run the command: `npm install -g grunt-cli` from within folder `(1)`.

0 commit comments

Comments
 (0)