From a5632f87a554be9b80c3f631f133611f663fc11b Mon Sep 17 00:00:00 2001 From: Jesse Shawl Date: Thu, 16 Feb 2023 14:32:34 -0600 Subject: [PATCH 1/2] resolve conflicts --- advanced-integration/.env | 2 -- advanced-integration/.env.example | 5 +++++ advanced-integration/.gitignore | 1 + advanced-integration/README.md | 2 +- standard-integration/.env | 2 -- standard-integration/.env.example | 5 +++++ standard-integration/.gitignore | 1 + standard-integration/README.md | 4 ++-- 8 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 advanced-integration/.env create mode 100644 advanced-integration/.env.example create mode 100644 advanced-integration/.gitignore delete mode 100644 standard-integration/.env create mode 100644 standard-integration/.env.example create mode 100644 standard-integration/.gitignore diff --git a/advanced-integration/.env b/advanced-integration/.env deleted file mode 100644 index f72af4c7..00000000 --- a/advanced-integration/.env +++ /dev/null @@ -1,2 +0,0 @@ -CLIENT_ID= -APP_SECRET= \ No newline at end of file diff --git a/advanced-integration/.env.example b/advanced-integration/.env.example new file mode 100644 index 00000000..492225d9 --- /dev/null +++ b/advanced-integration/.env.example @@ -0,0 +1,5 @@ +# Create an application to obtain credentials at +# https://developer.paypal.com/dashboard/applications/sandbox + +CLIENT_ID="YOUR_CLIENT_ID_GOES_HERE" +APP_SECRET="YOUR_SECRET_GOES_HERE" \ No newline at end of file diff --git a/advanced-integration/.gitignore b/advanced-integration/.gitignore new file mode 100644 index 00000000..2eea525d --- /dev/null +++ b/advanced-integration/.gitignore @@ -0,0 +1 @@ +.env \ No newline at end of file diff --git a/advanced-integration/README.md b/advanced-integration/README.md index d282c7c3..509315bc 100644 --- a/advanced-integration/README.md +++ b/advanced-integration/README.md @@ -2,7 +2,7 @@ ## Instructions -1. Add `CLIENT_ID` and `APP_SECRET` to the `.env` file +1. Rename `.env.example` to `.env` and update `CLIENT_ID` and `APP_SECRET`. 2. Run `npm install` 3. Run `npm start` 4. Open http://localhost:8888 diff --git a/standard-integration/.env b/standard-integration/.env deleted file mode 100644 index f72af4c7..00000000 --- a/standard-integration/.env +++ /dev/null @@ -1,2 +0,0 @@ -CLIENT_ID= -APP_SECRET= \ No newline at end of file diff --git a/standard-integration/.env.example b/standard-integration/.env.example new file mode 100644 index 00000000..492225d9 --- /dev/null +++ b/standard-integration/.env.example @@ -0,0 +1,5 @@ +# Create an application to obtain credentials at +# https://developer.paypal.com/dashboard/applications/sandbox + +CLIENT_ID="YOUR_CLIENT_ID_GOES_HERE" +APP_SECRET="YOUR_SECRET_GOES_HERE" \ No newline at end of file diff --git a/standard-integration/.gitignore b/standard-integration/.gitignore new file mode 100644 index 00000000..2eea525d --- /dev/null +++ b/standard-integration/.gitignore @@ -0,0 +1 @@ +.env \ No newline at end of file diff --git a/standard-integration/README.md b/standard-integration/README.md index 7220aea8..b40aee92 100644 --- a/standard-integration/README.md +++ b/standard-integration/README.md @@ -5,9 +5,9 @@ This folder contains example code for a standard PayPal integration using both t ## Instructions 1. [Create an application](https://developer.paypal.com/dashboard/applications/sandbox/create) -3. Add your app's `CLIENT_ID` and `APP_SECRET` to the `.env` file +3. Rename `.env.example` to `.env` and update `CLIENT_ID` and `APP_SECRET` 2. Replace `test` in `public/index.html` with your app's client-id 4. Run `npm install` 5. Run `npm start` 6. Open http://localhost:8888 -7. Click "PayPal" and log in with one of your [Sandbox test accounts](https://developer.paypal.com/dashboard/accounts). +7. Click "PayPal" and log in with one of your [Sandbox test accounts](https://developer.paypal.com/dashboard/accounts) From f3e9f8da7aa1178d0ff39f9bd9640a3567db6032 Mon Sep 17 00:00:00 2001 From: Jesse Shawl Date: Thu, 16 Feb 2023 14:31:02 -0600 Subject: [PATCH 2/2] fix newline issues --- advanced-integration/.env.example | 2 +- advanced-integration/.gitignore | 2 +- standard-integration/.env.example | 2 +- standard-integration/.gitignore | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/advanced-integration/.env.example b/advanced-integration/.env.example index 492225d9..ed50f9b7 100644 --- a/advanced-integration/.env.example +++ b/advanced-integration/.env.example @@ -2,4 +2,4 @@ # https://developer.paypal.com/dashboard/applications/sandbox CLIENT_ID="YOUR_CLIENT_ID_GOES_HERE" -APP_SECRET="YOUR_SECRET_GOES_HERE" \ No newline at end of file +APP_SECRET="YOUR_SECRET_GOES_HERE" diff --git a/advanced-integration/.gitignore b/advanced-integration/.gitignore index 2eea525d..4c49bd78 100644 --- a/advanced-integration/.gitignore +++ b/advanced-integration/.gitignore @@ -1 +1 @@ -.env \ No newline at end of file +.env diff --git a/standard-integration/.env.example b/standard-integration/.env.example index 492225d9..ed50f9b7 100644 --- a/standard-integration/.env.example +++ b/standard-integration/.env.example @@ -2,4 +2,4 @@ # https://developer.paypal.com/dashboard/applications/sandbox CLIENT_ID="YOUR_CLIENT_ID_GOES_HERE" -APP_SECRET="YOUR_SECRET_GOES_HERE" \ No newline at end of file +APP_SECRET="YOUR_SECRET_GOES_HERE" diff --git a/standard-integration/.gitignore b/standard-integration/.gitignore index 2eea525d..4c49bd78 100644 --- a/standard-integration/.gitignore +++ b/standard-integration/.gitignore @@ -1 +1 @@ -.env \ No newline at end of file +.env