Skip to content

Commit 554d905

Browse files
author
Todd Appleton
committed
Merge branch 'release/1.0.3'
2 parents 2f5e3e9 + 0f8e791 commit 554d905

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

README.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,23 @@ To download and install DreamFactory, follow the instructions [here](http://wiki
3838
- Leave storage service and folder blank. It will use the default local file service named 'files'.
3939
- Click the Import button. If successful, your app will appear on the Apps tab. You may have to refresh the page to see your new app in the list.
4040

41-
- Decide if you're going to run the app locally or load it from the instance.
42-
- For running locally you clone the repo to your machine and open index.html in the browser. If running locally you need to set the URL for your instance so the app can make the API calls. Go to your local repo and edit app.js. Set the constant INSTANCE_URL to point to your DreamFactory instance such as http://localhost:8080.
43-
- For running from the instance you launch the app directly from the Apps tab in the admin console. Leave INSTANCE_URL set to empty string.
41+
- Load the app from the instance.
42+
- You can't run this app locally by opening index.html in the browser due to cross origin restrictions with loading templates.
43+
- Launch the app directly from the Apps tab in the admin console. Leave INSTANCE_URL in the code set to empty string.
4444

45-
- If running from instance make your app files public.
45+
- Make your app files public.
4646
- Figure out where your app files are stored. If you used the default storage settings to import the app, it'll be the default local file service named 'files'.
4747
- Go to the Files tab in the admin console. Find your file service. Double click and find the folder for your app, e.g., 'AddressBookForAngularJS'.
4848
- Go to the Services tab in the admin console and click the 'files' service. Click the Config tab and add the app folder name 'AddressBookForAngularJS' as a public path. Now select the relevant container from the Container drop down. If you used the default storage settings to import the app then select "local" from the drop down list. Save your changes.
4949

5050
- Edit your app API key
51-
- If you are running from instance use the file manager to edit app.js and set APP_API_KEY to the key for your new app. The API key is shown on the app details in the Apps tab of the admin console.
52-
- If you are running locally edit app.js in your local repo.
53-
51+
- Use the file manager to edit app.js and set APP_API_KEY to the key for your new app. The API key is shown on the app details in the Apps tab of the admin console.
52+
5453
- Make sure you have a SQL database service named 'db'. Most DreamFactory instances have a default 'db' service for SQLite. You can add one by going to the Services tab in the admin console and creating a new SQL service. Make sure you set the name to 'db'.
5554

5655
#Running the Address Book app
5756

58-
You can launch the app from the Apps tab in the admin console, or by opening your local index.html in your browser.
57+
You can launch the app from the Apps tab in the admin console.
5958

6059
When the app starts up you can register a new user, or log in as an existing user. Currently the app does not support registering and logging in admin users.
6160

0 commit comments

Comments
 (0)