Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify start page #310

Merged
merged 32 commits into from
Dec 7, 2017
Merged

Simplify start page #310

merged 32 commits into from
Dec 7, 2017

Conversation

abovedave
Copy link
Contributor

This PR removes Dust.js and it's dependencies from the Web core. Instead there is a simple start page powered by the ES6 template engine (rather than the previous blog configuration).

screen shot 2017-12-06 at 15 40 55

Overtime, I suggest we only recommend installing using the DADI CLI - perhaps so when you start Web without a config and/or workspace file you get a warning and a prompt to use CLI or download a workspace manually.

Thoughts?

jimlambie and others added 26 commits November 29, 2017 08:09
…adi/web into feature/datasource-parameter-extension
…6-start-page

# Conflicts:
#	dadi/lib/help.js
#	package-lock.json
#	package.json
#	workspace/utils/helpers/paginate.js
@abovedave abovedave changed the title Simplify start page Simplify start page 🚧 Dec 6, 2017
@abovedave abovedave changed the title Simplify start page 🚧 Simplify start page Dec 7, 2017
David Longworth added 2 commits December 7, 2017 12:25
@abovedave abovedave requested a review from jimlambie December 7, 2017 15:12
README.md Outdated
@@ -1,7 +1,7 @@
<img src="https://dadi.tech/assets/products/dadi-web-full.png" alt="DADI Web" height="65"/>

[![npm (scoped)](https://img.shields.io/npm/v/@dadi/web.svg?maxAge=10800&style=flat-square)](https://www.npmjs.com/package/@dadi/web)
[![coverage](https://img.shields.io/badge/coverage-81%25-yellow.svg?style=flat?style=flat-square)](https://github.com/dadi/web)
[![coverage](https://img.shields.io/badge/coverage-80%2525-yellow.svg?style=flat?style=flat-square)](https://github.com/dadi/web)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks a bit odd, Eduardo had an issue with this earlier too. Modify scripts/coverage.js to not do the badgeUrl.replace step...

Copy link
Contributor

@jimlambie jimlambie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

@abovedave abovedave merged commit 12e1a80 into develop Dec 7, 2017
@abovedave abovedave deleted the feature/es6-start-page branch December 7, 2017 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants